From db29bcb5503f4ddc3dc367a27a503e2f27f5b1d1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:10:57 +0100 Subject: stage1: Add .gitignore --- mdk-stage1/.gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 mdk-stage1/.gitignore diff --git a/mdk-stage1/.gitignore b/mdk-stage1/.gitignore new file mode 100644 index 000000000..fe2469cea --- /dev/null +++ b/mdk-stage1/.gitignore @@ -0,0 +1,13 @@ +*.o +dhcp-client +init +probe-modules +rescue-gui +stage1 +pci-resource/pci-ids.h +usb-resource/usb-ids.h +pcmcia-resource/pcmcia-ids.h +pcmcia/lex_config.c +pcmcia/libpcmcia.a +pcmcia/yacc_config.c +pcmcia/yacc_config.h -- cgit v1.2.1 From acc1cc950e31bd02fda968bb6c40f85efa7bc3a2 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:06:42 +0100 Subject: stage1: Do not hard code STAGE2 path --- mdk-stage1/ka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdk-stage1/ka.c b/mdk-stage1/ka.c index 670abe5af..7b9d98fbe 100644 --- a/mdk-stage1/ka.c +++ b/mdk-stage1/ka.c @@ -44,7 +44,7 @@ static void my_pause(void) { static enum return_type ka_wait_for_stage2(int count) { char * ramdisk = "/dev/ram3"; /* warning, verify that this file exists in the initrd*/ - char * ka_launch[] = { "/ka/ka-d-client", "-w","-s","getstage2","-e","(cd /tmp/stage2; tar -x -f - )", NULL }; /* The command line for ka_launch */ + char * ka_launch[] = { "/ka/ka-d-client", "-w","-s","getstage2","-e","(cd " STAGE2_LOCATION "; tar -x -f - )", NULL }; /* The command line for ka_launch */ char * mkfs_launch[] = { "/sbin/mke2fs", "-m", "0", ramdisk, NULL}; /* The mkfs command for formating the ramdisk */ log_message("KA: Preparing to receive stage 2...."); -- cgit v1.2.1 From 4f1bb300b5488d0d36fafc53ebb0969e51b44b8a Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:17:28 +0100 Subject: stage1: Switch to a shared stage1. Previously we would create a static stage1 for the installer, but as a dracut based initrd already includes glibc, there is very little advantage in this small, statically linked version. As a side note, it seems that if the initrd contains a /etc/modprobe.d/ folder (which can be the case with dracut) then dietlibc seems to return a ENOENT when calling readdir_r() on that folder (via the libkmod-config.c code). --- mdk-stage1/Makefile | 14 +++++++------- mdk-stage1/Makefile.common | 13 ++++++------- mdk-stage1/NEWS | 4 ++++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index ddb5cfda1..b8fcf0f2b 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -70,11 +70,14 @@ INITOBJS = $(subst .c,.o,$(INITSRC)) #- frontends NEWT_FRONTEND_SRC = newt-frontend.c +ifeq (DIETLIBC, $(L)) NEWT_FRONTEND_LIBS = libnewt.a libslang.a +else +NEWT_FRONTEND_LIBS = -lnewt -lslang +endif STDIO_FRONTEND_SRC = stdio-frontend.c STDIO_FRONTEND_LIBS = -STDIO_FRONTEND_LIBS = FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC)) @@ -84,20 +87,17 @@ else FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) endif -STAGE1_STATIC_LIBS = -STAGE1_STATIC_USR_LIBS = libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a -STAGE1_OWN_LIBS = ifeq (DIETLIBC, $(L)) -STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$(STAGE1_STATIC_USR_LIBS) $(STAGE1_STATIC_LIBS)) +STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a) else -STAGE1_OWN_LIBS = $(patsubst %,/usr/$(LIB)/%,$(STAGE1_STATIC_USR_LIBS)) $(patsubst %,/$(LIB)/%,$(STAGE1_STATIC_LIBS)) +STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs endif ifeq (DIETLIBC, $(L)) STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a else -STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a +STAGE1_NETWORK_LIBS = -lresolv endif #- stage1 itself diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 34c010905..d225da69e 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -28,12 +28,12 @@ F = NEWT endif # diet libc syscalls are broken on mips -ifneq (mips, $(ARCH)) -# diet libc eabi support is mostly broken -ifneq (arm, $(ARCH)) -DIET = $(shell test -x /usr/bin/diet && echo diet) -endif -endif +#ifneq (mips, $(ARCH)) +## diet libc eabi support is mostly broken +#ifneq (arm, $(ARCH)) +#DIET = $(shell test -x /usr/bin/diet && echo diet) +#endif +#endif ifeq ($(DIET), diet) @@ -63,7 +63,6 @@ DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a GLIBC_INCLUDES = -I. INCLUDES = $($(L)_INCLUDES) -GLIBC_LDFLAGS = -static LDFLAGS = $($(L)_LDFLAGS) STAGE1_LIBC = $($(L)_LIBC) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index ab6c848f7..3c65b1bd5 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,7 @@ +- build init and stage1 as a shared library (due to bugs in directory handling + in dietlibc as exposed in libkmod but also because glibc is already include in + dracut) + 1.82 - detect new kernel-3.12 modules -- cgit v1.2.1 From b5dd85f8099879b701b3bbdb8e7e50ab415fe789 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 20:28:31 +0100 Subject: images: Convert image generation to dracut. This converts the initrd generation from a home grown system to dracut. It uses the upstream modules where possible plus two specially written dracut modules: mgainstaller and mgakadeploy. The initrds are identical for all builds and there are lots of bits that are incomplete and unnecesary. e.g. copying the kernels to a folder and then not using them, and also the module-descriptions file is not included in the initrd itself which it should be. We can probably customise the initrd better for different use cases, e.g. perhaps network stuff is not needed for HD based installs? We may also need to install the mdraid and lvm modules for some HD support. This is the first attempt so I expect various bits need fixing --- images/Makefile | 2 +- images/NEWS | 2 ++ images/make_boot_img | 59 ++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/images/Makefile b/images/Makefile index 18956e2cf..131c604f9 100644 --- a/images/Makefile +++ b/images/Makefile @@ -26,7 +26,7 @@ tar: $(info $(PRODUCT)-$(VERSION).tar.xz is ready) clean: - rm -rf images isolinux all.kernels modules.description + rm -rf images isolinux all.kernels modules.description build find . -name "*~" -o -name ".#*" | xargs rm -f install: diff --git a/images/NEWS b/images/NEWS index c82f1e4c9..bafacbc02 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- adapt to a dracut based stage1 + Version 1.93 - 14 October 2013 by Thierry Vignaud - sync with kernel-3.12 diff --git a/images/make_boot_img b/images/make_boot_img index 35a00cc30..efd6a2fa2 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -62,10 +62,10 @@ foreach my $img (@images) { } elsif ($img =~ /boot.iso/) { boot_iso($img, \@kernels); } elsif ($extension eq 'rdz') { - initrd($type, $I, "$img-$_") foreach @kernels; + initrd($type, $I, "$img-$_", $_) foreach @kernels; } elsif ($extension eq 'img') { print STDERR "calling boot_img_$arch for $img\n"; - $::{"boot_img_$arch"}->($type, $I, "$img-$_", "all.kernels/$_/vmlinuz") foreach @kernels; + $::{"boot_img_$arch"}->($type, $I, "$img-$_", $_, "all.kernels/$_/vmlinuz") foreach @kernels; rename("$img-$kernels[0]", $img); } else { die "unknown image $img"; @@ -143,7 +143,30 @@ EOF $header . ($b_gfxboot ? $header_gfxboot : $header_non_gfxboot) . join('', @l); } +sub trim { + return $_[0] =~ s/^\s+|\s+$//rg; +} + sub initrd { + my ($type, $I, $img, $kernel) = @_; + my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : ""; + my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : ""; + my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; + my $modules = " network mgainstaller "; + + if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { + $modules="$modules busybox "; + } + $modules="$modules mgakadeploy " if ($ENV{BUILD_KA}); + + mkdir_p("build/dracut.conf.d"); + touch("build/dracut.conf"); + # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' '$img' '$kernel'" +} + + +sub initrdold { my ($type, $I, $img) = @_; my $stage1_root = $ENV{USE_LOCAL_STAGE1} ? "../mdk-stage1" : "/usr/$lib/drakx-installer-binaries"; my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; @@ -252,17 +275,17 @@ sub remove_ending_zero { } sub boot_img_i386 { - my ($type, $I, $img, $kernel) = @_; + my ($type, $I, $img, $kernel, $vmlinuz) = @_; _ "rm -rf $tmp_mnt"; mkdir $tmp_mnt; - _ "cat $kernel > $tmp_mnt/vmlinuz"; + _ "cat $vmlinuz > $tmp_mnt/vmlinuz"; output("$tmp_mnt/help.msg", syslinux_msg('help.msg.xml')); output("$tmp_mnt/advanced.msg", syslinux_msg('advanced.msg.xml')); (my $rdz = $img) =~ s/\.img/.rdz/; (my $initrd_type = $type) =~ s/-changedisk//; - initrd($initrd_type, $I, $rdz); + initrd($initrd_type, $I, $rdz, $kernel); my $short_type = substr($type, 0, 8); output("$tmp_mnt/syslinux.cfg", @@ -287,7 +310,7 @@ sub boot_img_i386 { sub boot_img_x86_64 { &boot_img_i386 } sub boot_img_alpha { - my ($type, $I, $img) = @_; + my ($type, $I, $img, $kernel, $_vmlinuz) = @_; __ "$sudo umount $tmp_mnt 2>/dev/null"; _ "dd if=/dev/zero of=$img bs=1k count=1440"; @@ -295,7 +318,7 @@ sub boot_img_alpha { _ "/sbin/e2writeboot $img /boot/bootlx"; _ "$sudo mount -t ext2 $img $tmp_mnt -o loop"; _ "cp -f vmlinux.gz $tmp_mnt"; - -f "$type.rdz" ? _ "cp -f $type.rdz $tmp_mnt" : initrd($type, $I, "$tmp_mnt/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $tmp_mnt" : initrd($type, $I, "$tmp_mnt/$type.rdz", $kernel); mkdir "$tmp_mnt/etc", 0777; output("$tmp_mnt/etc/aboot.conf", @@ -307,14 +330,14 @@ sub boot_img_alpha { } sub boot_img_ia64 { - my ($type, $_I, $img, $kernel) = @_; + my ($type, $_I, $img, $kernel, $vmlinuz) = @_; my $rdz = $img; $rdz =~ s/\.img/.rdz/; __ "$sudo umount $tmp_mnt 2>/dev/null"; _ "dd if=/dev/zero of=$img bs=1k count=16384"; _ "mkdosfs $img"; _ "$sudo mount -t vfat $img $tmp_mnt -o loop,umask=000"; - _ "$sudo cp -f $kernel $tmp_mnt/vmlinux"; + _ "$sudo cp -f $vmlinuz $tmp_mnt/vmlinux"; _ "cp -f $rdz $tmp_mnt/$type.rdz"; _ "$sudo cp -f tools/ia64/elilo.efi $tmp_mnt"; output("$tmp_mnt/elilo.conf", qq( @@ -338,7 +361,7 @@ image=vmlinux } sub boot_img_sparc { - my ($type, $I, $_img) = @_; + my ($type, $I, $_img, $kernel, $_vmlinuz) = @_; if ($type =~ /^live(.*)/) { #- hack to produce directly into /export the needed file for cdrom boot. my $dir = "/export"; @@ -347,7 +370,7 @@ sub boot_img_sparc { _ "mkdir -p $dir/$boot"; _ "cp -f /boot/cd.b /boot/second.b $dir/$boot"; _ "cp -f vmlinux$1 $dir/$boot/vmlinux$1"; - -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd($type, $I, "$dir/$boot/live$1.rdz"); + -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd($type, $I, "$dir/$boot/live$1.rdz", $kernel); output("$dir/$boot/silo.conf", qq( partition=1 @@ -427,7 +450,7 @@ To Build a Bootable CD-ROM, try: my $setarch = $1 ? "sparc64" : "sparc32"; _ "mkdir -p $dir/$boot"; - -f "$type.rdz" or initrd($type, $I, "$type.rdz"); + -f "$type.rdz" or initrd($type, $I, "$type.rdz", $kernel); _ "cp -f vmlinux$1.aout $dir/$boot/$type.img"; _ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz"; } elsif ($type =~ /^tftp(.*)/) { @@ -443,7 +466,7 @@ To Build a Bootable CD-ROM, try: _ "mkdir -p $dir"; _ "cp -f /boot/fd.b /boot/second.b $dir"; _ "cp -f vmlinuz$I $dir/vmlinux$I.gz"; - -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz", $kernel); output("$dir/boot.msg", " Welcome to Mageia $ENV{DISTRIB_VERSION} @@ -474,16 +497,16 @@ image=/vmlinux$I.gz } sub boot_img_ppc { - my ($_type, $I, $_img, $_kernel) = @_; + my ($_type, $I, $_img, $kernel, $_vmlinuz) = @_; foreach (glob("all.kernels/*")) { my $ext = basename($_); if ($ext =~ /legacy/) { - initrd("all", $I, "images/all.rdz-$ext"); + initrd("all", $I, "images/all.rdz-$ext", $kernel); _ "mv images/all.rdz-$ext images/all.rdz-legacy"; _ "cp $_/vmlinuz images/vmlinux-legacy"; } elsif ($ext =~ /2.6/) { - initrd("all", $I, "images/all.rdz-$ext"); + initrd("all", $I, "images/all.rdz-$ext", $kernel); _ "mv images/all.rdz-$ext images/all.rdz"; _ "cp $_/vmlinuz images/vmlinux"; } @@ -698,7 +721,7 @@ sub syslinux_all_files { each_index { mkdir "$dir/alt$::i", 0777; _ "cp all.kernels/$_/vmlinuz $dir/$arch"; - initrd('all', '', "images/all.rdz-$_"); + initrd('all', '', "images/all.rdz-$_", $_); rename("images/all.rdz-$_", "$dir/$arch/all.rdz"); } @$kernels; @@ -729,7 +752,7 @@ sub xbox_stage1() { eval { rm_rf($dir) }; mkdir_p($dir); _ "cp all.kernels/$xbox_kernel/vmlinuz $dir"; - initrd('all', '', "images/all.rdz-$xbox_kernel"); + initrd('all', '', "images/all.rdz-$xbox_kernel", $xbox_kernel); rename("images/all.rdz-$xbox_kernel", "$dir/initrd"); _ "cp /usr/share/cromwell/xromwell-installer.xbe $dir/default.xbe"; -- cgit v1.2.1 From 7213bee2f13e551bffb7754846726833e196719b Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:07:53 +0100 Subject: stage1: Correct path to shell --- mdk-stage1/stage1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 4bed00057..ee24bf0a1 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -121,7 +121,7 @@ static pid_t shell_pid = 0; static void spawn_shell(void) { int fd; - char * shell_name[] = { "/sbin/sh", NULL }; + char * shell_name[] = { "/bin/sh", NULL }; log_message("spawning a shell"); -- cgit v1.2.1 From c4321813f9f3cd4136203d52c0f20343d7722228 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 21:30:12 +0100 Subject: stage1: Move the symlink creation from stage1 to init. In order to run stage1 we now need to do things a little differently, namely that we move the symlinking fixups into 'init' itself which we will actually call as a kind of fake switch_root implementation to avoid hacking dracut too much[1]. As we run stage1 during dracut's 'mount' phase we should not do the symlink hacks so early otherwise it will mess up the rest of the dracut initqueue processing. Currently, the initrd's /usr is nuked and then symlinked, but to allow for easier debugging I now just bind mount the stage2 /usr over the top which allows us to unmount it again easily enough if we want to go back. We no longer touch the /bin, /sbin or /lib[64] symlinks as these are relative and simply bind mounting /usr is enough to fix all of them. 1. This scheme will have to change if we eventually swtich to a systemd based dracut invocation. --- mdk-stage1/NEWS | 1 + mdk-stage1/init.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++---- mdk-stage1/stage1.c | 31 ------------------ mdk-stage1/tools.c | 59 ---------------------------------- mdk-stage1/tools.h | 2 -- mdk-stage1/utils.c | 8 ----- mdk-stage1/utils.h | 2 -- 7 files changed, 87 insertions(+), 108 deletions(-) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 3c65b1bd5..8f2846cbd 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +- do initrd symlinking in 'init' rather than 'stage1' (stage1 is now run earlier) - build init and stage1 as a shared library (due to bugs in directory handling in dietlibc as exposed in libkmod but also because glibc is already include in dracut) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 3f912c2ac..6d571a62a 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -378,7 +379,86 @@ int in_reboot(void) return 0; } -int exit_value_proceed = 66; +int recursive_remove(char *file); +int recursive_remove(char *file) +{ + struct stat sb; + + if (lstat(file, &sb) != 0) { + printf("failed to stat %s: %d\n", file, errno); + return -1; + } + + /* only descend into subdirectories if device is same as dir */ + if (S_ISDIR(sb.st_mode)) { + char * strBuf = alloca(strlen(file) + 1024); + DIR * dir; + struct dirent * d; + + if (!(dir = opendir(file))) { + printf("error opening %s: %d\n", file, errno); + return -1; + } + while ((d = readdir(dir))) { + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) + continue; + + strcpy(strBuf, file); + strcat(strBuf, "/"); + strcat(strBuf, d->d_name); + + if (recursive_remove(strBuf) != 0) { + closedir(dir); + return -1; + } + } + closedir(dir); + + if (rmdir(file)) { + printf("failed to rmdir %s: %d\n", file, errno); + return -1; + } + } else { + if (unlink(file) != 0) { + printf("failed to remove %s: %d\n", file, errno); + return -1; + } + } + return 0; +} + + +int create_initial_fs_symlinks(char* symlinks) +{ + FILE *f; + char buf[5000]; + + if (!(f = fopen(symlinks, "rb"))) { + printf("Error opening symlink definitions file '%s'\n", symlinks); + return -1; + } + while (fgets(buf, sizeof(buf), f)) { + char oldpath[500], newpath[500]; + struct stat sb; + + buf[strlen(buf)-1] = '\0'; // trim \n + if (sscanf(buf, "%s %s", oldpath, newpath) != 2) { + sprintf(oldpath, "%s%s", STAGE2_LOCATION, buf); + sprintf(newpath, "%s", buf); + } + if (lstat(newpath, &sb) == 0) + recursive_remove(newpath); + printf("Creating symlink %s -> %s\n", oldpath, newpath); + if (symlink(oldpath, newpath)) { + printf("Error creating symlink\n"); + return -1; + } + } + fclose(f); + return 0; +} + + int exit_value_restart = 0x35; int main(int argc, char **argv) @@ -454,12 +534,12 @@ int main(int argc, char **argv) if (!testing) doklog(); - /* Go into normal init mode - keep going, and then do a orderly shutdown - when: + if (create_initial_fs_symlinks(STAGE2_LOCATION "/usr/share/symlinks") != 0) + fatal_error("Fatal error finishing initialization (could not create symlinks)."); + + if (mount(STAGE2_LOCATION "/usr", "/usr", "none", MS_BIND|MS_RDONLY, NULL)) + fatal_error("Unable to bind mount /usr filesystem from rescue or installer stage2"); - 1) install exits - 2) we receive a SIGHUP - */ do { if (counter == 1) { diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index ee24bf0a1..4439b7d37 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -344,39 +344,8 @@ static void method_select_and_prepare(void) } #endif -static enum return_type create_initial_fs_symlinks(char* symlinks) -{ - FILE *f; - char buf[5000]; - - if (scall(!(f = fopen(symlinks, "rb")), "fopen")) - return RETURN_ERROR; - while (fgets(buf, sizeof(buf), f)) { - char oldpath[500], newpath[500]; - buf[strlen(buf)-1] = '\0'; // trim \n - if (sscanf(buf, "%s %s", oldpath, newpath) != 2) { - sprintf(oldpath, "%s%s", STAGE2_LOCATION, buf); - sprintf(newpath, "%s", buf); - } - recursiveRemove_if_it_exists(newpath); - log_message("creating symlink %s -> %s", oldpath, newpath); - if (scall(symlink(oldpath, newpath), "symlink")) - return RETURN_ERROR; - } - fclose(f); - return RETURN_OK; -} - void finish_preparing(void) { - recursiveRemove("/init"); - - if (create_initial_fs_symlinks(STAGE2_LOCATION "/usr/share/symlinks") != RETURN_OK) - stg1_fatal_message("Fatal error finishing initialization."); - - /* /tmp/syslog is used by the second init, so it must be copied now, not in stage2 */ - /* we remove it to ensure the old one is not copied over it in stage2 */ - #ifdef SPAWN_SHELL if (shell_pid != 0) { int fd; diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index aca40c971..78108d6a9 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -148,65 +148,6 @@ enum return_type copy_file(char * from, char * to, void (*callback_func)(int ove } } -enum return_type recursiveRemove(char *file) -{ - struct stat sb; - - if (lstat(file, &sb) != 0) { - log_message("failed to stat %s: %d", file, errno); - return RETURN_ERROR; - } - - /* only descend into subdirectories if device is same as dir */ - if (S_ISDIR(sb.st_mode)) { - char * strBuf = alloca(strlen(file) + 1024); - DIR * dir; - struct dirent * d; - - if (!(dir = opendir(file))) { - log_message("error opening %s: %d", file, errno); - return RETURN_ERROR; - } - while ((d = readdir(dir))) { - if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) - continue; - - strcpy(strBuf, file); - strcat(strBuf, "/"); - strcat(strBuf, d->d_name); - - if (recursiveRemove(strBuf) != 0) { - closedir(dir); - return RETURN_ERROR; - } - } - closedir(dir); - - if (rmdir(file)) { - log_message("failed to rmdir %s: %d", file, errno); - return RETURN_ERROR; - } - } else { - if (unlink(file) != 0) { - log_message("failed to remove %s: %d", file, errno); - return RETURN_ERROR; - } - } - return RETURN_OK; -} - -enum return_type recursiveRemove_if_it_exists(char *file) -{ - struct stat sb; - - if (lstat(file, &sb) != 0) { - /* if file doesn't exist, simply return OK */ - return RETURN_OK; - } - - return recursiveRemove(file); -} - enum return_type mount_compressed_image(char *compressed_image, char *location_mount) { if (lomount(compressed_image, location_mount, NULL, 1)) { diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h index 1b08e42ca..87c0c1d49 100644 --- a/mdk-stage1/tools.h +++ b/mdk-stage1/tools.h @@ -29,8 +29,6 @@ int image_has_stage2(); enum return_type create_IMAGE_LOCATION(char *location_full); int ramdisk_possible(void); enum return_type copy_file(char * from, char * to, void (*callback_func)(int overall)); -enum return_type recursiveRemove(char *file); -enum return_type recursiveRemove_if_it_exists(char *file); enum return_type preload_mount_compressed_fd(int compressed_fd, int image_size, char *image_name, char *location_mount); enum return_type mount_compressed_image(char *compressed_image, char *location_mount); enum return_type mount_compressed_image_may_preload(char *image_name, char *location_mount, int preload); diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c index af5ee9af3..d861877e4 100644 --- a/mdk-stage1/utils.c +++ b/mdk-stage1/utils.c @@ -162,14 +162,6 @@ char * asprintf_(const char *msg, ...) return strdup(""); } -int scall_(int retval, char * msg, char * file, int line) -{ - char tmp[5000]; - sprintf(tmp, "%s(%s:%d) failed", msg, file, line); - if (retval) - log_perror(tmp); - return retval; -} void lowercase(char *s) { diff --git a/mdk-stage1/utils.h b/mdk-stage1/utils.h index d42c52d06..b8a77b0ad 100644 --- a/mdk-stage1/utils.h +++ b/mdk-stage1/utils.h @@ -27,9 +27,7 @@ void add_to_env(char * name, char * value); char ** list_directory(char * direct); int string_array_length(char ** a); char * asprintf_(const char *msg, ...); -int scall_(int retval, char * msg, char * file, int line); char *my_dirname(char *path); -#define scall(retval, msg) scall_(retval, msg, __FILE__, __LINE__) void lowercase(char *s); #define ptr_begins_static_str(pointer,static_str) (!strncmp(pointer,static_str,sizeof(static_str)-1)) -- cgit v1.2.1 From 49b778dec05a142690bf88ead5649fefe0adc1a6 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:58:09 +0100 Subject: install/rescue: Adapt to a dracut based stage1. The main change here is not remounting a fresh /run. Dracut does this for us and we actually need to keep this one as the initial udev database (when udev is started by dracut) is stored here and thus mounting an empty fs could see us lose some metadata. We no longer touch the /bin, /sbin or /lib[64] symlinks as these are already relative symlinks into /usr and simply bind mounting /usr is enough. --- perl-install/install/NEWS | 2 ++ perl-install/install/install2.pm | 13 ++----------- perl-install/install/share/symlinks | 6 ------ rescue/NEWS | 2 ++ rescue/tree/usr/share/symlinks | 5 ----- tools/drakx-in-chroot | 8 ++++++++ 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b56604de1..08acc5fa8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- adapt to a dracut based stage1 + Version 15.68.1 - 14 October 2013 - adapt to latest mdadm diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 02888ff2c..f6e30e8d8 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -295,15 +295,6 @@ sub exitInstall { sub start_udev() { return if fuzzy_pidofs('udevd'); - # Ensure /run is mounted - mkdir("/run", 0755); - run_program::run("mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run"); - - # Fake dracut boot (due to checks employed when running dracut during install) - # as we know that we'll have the needed metadata in udevadm db due to us - # starting udev nice and early here. - mkdir_p("/run/initramfs"); - # Start up udev: mkdir_p("/run/udev/rules.d"); $ENV{UDEVRULESD} = "/run/udev/rules.d"; @@ -316,7 +307,7 @@ sub start_udev() { sub stop_udev() { kill 15, fuzzy_pidofs('udevd'); sleep(2); - fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run'; + fs::mount::umount($_) foreach '/dev/pts', '/dev/shm'; } #-###################################################################################### @@ -618,7 +609,7 @@ sub main { } $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt"; - mkdir $::prefix, 0755; + mkdir $::prefix, 0755 if ! -d $::prefix; init_path(); diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks index 8c2432248..eb0de9b47 100644 --- a/perl-install/install/share/symlinks +++ b/perl-install/install/share/symlinks @@ -1,5 +1,3 @@ -/sbin -/bin /etc/mke2fs.conf /etc/protocols /etc/services @@ -7,7 +5,3 @@ /etc/passwd /etc/pki /etc/urpmi -/lib -/lib64 -/usr -/tmp /var/run diff --git a/rescue/NEWS b/rescue/NEWS index 57cf609ae..cf1c694d2 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,5 @@ +- adapt to a dracut based stage1 + Version 1.45.1 - 14 October 2013 by Colin Guthrie - many btrfs tools no longer exist diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks index 659a42c8c..091153872 100644 --- a/rescue/tree/usr/share/symlinks +++ b/rescue/tree/usr/share/symlinks @@ -1,9 +1,4 @@ -/bin /boot /etc/fstab /etc/inittab /etc/rc.sysinit -/lib -/lib64 -/sbin -/usr diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 1384c2e18..852792349 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -184,6 +184,14 @@ sub create_initial_symlinks() { symlink $from, $to or die "symlinking $to failed\n"; } } + $from = "$STAGE2_LOCATION_ROOTED/usr"; + $to = "$SLASH_LOCATION/usr"; + symlink $from, $to or die "symlinking $to failed\n"; + foreach ('bin', 'sbin', 'lib', 'lib64') { + $from = "usr/$_"; + $to = "$SLASH_LOCATION/$_"; + symlink $from, $to or die "symlinking $to failed\n"; + } } sub create_initial_devices() { -- cgit v1.2.1 From 63d2a603b9b2bc27090405ba4a05a4aaa8840ea2 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 28 Oct 2013 20:21:39 +0000 Subject: stage1: Don't bother mounting various API filesystems. Dracut mounts these already. --- mdk-stage1/init.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 6d571a62a..24615704a 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -484,24 +484,6 @@ int main(int argc, char **argv) printf("*** TESTING MODE *** (pid is %d)\n", getpid()); - if (!testing) { - if (mount("/proc", "/proc", "proc", 0, NULL)) - fatal_error("Unable to mount proc filesystem"); - if (mount("none", "/sys", "sysfs", 0, NULL)) - fatal_error("Unable to mount sysfs filesystem"); - if (mount("none", "/sys/kernel/debug", "debugfs", MS_NOSUID, "mode=0755")) - fatal_error("Unable to mount debugfs filesystem"); - if (mount("none", "/dev", "devtmpfs", 0, NULL)) - fatal_error("Unable to mount dev filesystem"); - mkdir("/dev/pts", 0755); - if (mount("/dev/pts", "/dev/pts", "devpts", MS_NOSUID|MS_NOEXEC, "gid=5,mode=0620")) - fatal_error("Unable to mount /dev/pts devpts filesystem"); - mkdir("/dev/shm", 0755); - if (mount("/dev/shm", "/dev/shm", "tmpfs", MS_NOSUID|MS_NODEV, "mode=1777")) - fatal_error("Unable to mount /dev/shm tmpfs filesystem"); - } - - /* ignore Control-C and keyboard stop signals */ signal(SIGINT, SIG_IGN); signal(SIGTSTP, SIG_IGN); -- cgit v1.2.1 From 065557f6287bd87a4e52bea28db5a0b9c4a98b76 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 28 Oct 2013 23:11:33 +0000 Subject: stage1: Remove the counter from init. init is now solely responsibe for running stage2 (be it install or rescue) as stage1 is now run earlier by dracut. --- mdk-stage1/init.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index 24615704a..f774484d7 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -57,7 +57,6 @@ static inline long reboot(unsigned int command) #endif -#define BINARY "/sbin/stage1" #define BINARY_STAGE2 "/usr/bin/runinstall2" @@ -466,7 +465,6 @@ int main(int argc, char **argv) pid_t installpid, childpid; int wait_status; int fd; - int counter = 0; int abnormal_termination = 0; if (argc > 1 && argv[1][0] >= '0' && argv[1][0] <= '9') { @@ -524,14 +522,12 @@ int main(int argc, char **argv) do { - if (counter == 1) { - printf("proceeding, please wait...\n"); - } + printf("proceeding, please wait...\n"); if (!(installpid = fork())) { /* child */ char * child_argv[2]; - child_argv[0] = counter == 0 ? BINARY : BINARY_STAGE2; + child_argv[0] = BINARY_STAGE2; child_argv[1] = NULL; execve(child_argv[0], child_argv, env); @@ -542,8 +538,6 @@ int main(int argc, char **argv) do { childpid = wait4(-1, &wait_status, 0, NULL); } while (childpid != installpid); - - counter++; } while (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_restart); /* allow Ctrl Alt Del to reboot */ -- cgit v1.2.1 From 33a891128a5ac6fa2c581ef4106fe569f47eb867 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 28 Oct 2013 23:35:35 +0000 Subject: stage1: Switch to a new mode of knowing when to re-exec init. Now that dracut runs stage1 earlier, we need to store it's exit code for later reuse. In this, the separate dracut module will just write a flag file in /run/drakx/ to indicate that we want to re-exec /sbin/init (after doing some symlinks and /usr bind mount) rather than run the install. As a result there is no need to return 0x35 ('procced') so just return 0 and keep 0x35 return code for when we really do need to restart stage1 (e.g. on a fatal error). The dracut module should loop if 0x35 is ever returned. --- mdk-stage1/init.c | 57 ++++++++++++++++++++++++++--------------------------- mdk-stage1/stage1.c | 4 ++-- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index f774484d7..b5fb6115b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -521,46 +521,45 @@ int main(int argc, char **argv) fatal_error("Unable to bind mount /usr filesystem from rescue or installer stage2"); - do { - printf("proceeding, please wait...\n"); - - if (!(installpid = fork())) { - /* child */ - char * child_argv[2]; - child_argv[0] = BINARY_STAGE2; - child_argv[1] = NULL; - - execve(child_argv[0], child_argv, env); - printf("error in exec of %s :-( [%d]\n", child_argv[0], errno); - return 0; - } - - do { - childpid = wait4(-1, &wait_status, 0, NULL); - } while (childpid != installpid); - } while (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_restart); + if (access("/run/drakx/run-init", R_OK) == 0) { + /* This is typically used in rescue mode */ + char * child_argv[2] = { "/sbin/init", NULL }; - /* allow Ctrl Alt Del to reboot */ - reboot(LINUX_REBOOT_CMD_CAD_ON); - - if (in_reboot()) { - // any exitcode is valid if we're in_reboot - } else if (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_proceed) { kill(klog_pid, 9); printf("proceeding, please wait...\n"); + execve(child_argv[0], child_argv, env); + fatal_error("failed to exec /sbin/init"); + } + + /* This is installer mode */ + do { + printf("proceeding, please wait...\n"); - { - char * child_argv[2] = { "/sbin/init", NULL }; + if (!(installpid = fork())) { + /* child */ + char * child_argv[2] = { BINARY_STAGE2, NULL }; execve(child_argv[0], child_argv, env); + printf("error in exec of %s :-( [%d]\n", child_argv[0], errno); + return 0; } - fatal_error("failed to exec /sbin/init"); - } else if (!WIFEXITED(wait_status) || WEXITSTATUS(wait_status) != 0) { + + do { + childpid = wait4(-1, &wait_status, 0, NULL); + } while (childpid != installpid); + } while (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_restart); + + /* allow Ctrl Alt Del to reboot */ + reboot(LINUX_REBOOT_CMD_CAD_ON); + + if (in_reboot()) { + // any exitcode is valid if we're in_reboot + } else if (!WIFEXITED(wait_status) || WEXITSTATUS(wait_status) != 0) { printf("exited abnormally :-( "); if (WIFSIGNALED(wait_status)) printf("-- received signal %d", WTERMSIG(wait_status)); printf("\n"); abnormal_termination = 1; - } + } if (!abnormal_termination) { int i; diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 4439b7d37..94bb1e0df 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -437,7 +437,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) if (IS_RESCUE) return 66; /* ask init to exec new init */ - else - return 0x35; /* ask init to run stage2 binary */ + + return 0; #endif } -- cgit v1.2.1 From 2f8c123ae7b4a4edf59c1b0435f3ffb89b08162c Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 19 Oct 2013 19:14:06 +0100 Subject: stage1: Add debugging for net device name confusion. Because dracut uses udev and because udev has likely already started the interface, we will see things out of order. Large sections of the probing code could probably be removed but for the time being we should probably consider removing this error message completely --- mdk-stage1/probing.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 1cdadd591..61a605651 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -111,7 +111,7 @@ void net_discovered_interface(char * intf_name) } if (!intf_name) { if (net_intf_too_early_ptr >= net_intf_too_early_number) { - log_message("NET: was expecting another network interface (broken net module?)"); + log_message("NET: was expecting another network interface (broken net module?) [%d >= %d]", net_intf_too_early_ptr, net_intf_too_early_number); return; } net_descriptions[net_descr_number].intf_name = net_intf_too_early_name[net_intf_too_early_ptr++]; @@ -283,6 +283,7 @@ void discovered_device(enum driver_type type, const char * description, const ch #endif #ifndef DISABLE_NETWORK if (type == NETWORK_DEVICES) { + log_message("NET: Loading driver for network device %s", description); wait_message("Loading driver for network device:\n \n%s", description); prepare_intf_descr(description); failed = my_modprobe(driver, NETWORK_DEVICES, NULL); -- cgit v1.2.1 From cb9813e62513a331a5f9c30d201ec3c1009f49f1 Mon Sep 17 00:00:00 2001 From: ennael Date: Tue, 29 Oct 2013 21:37:45 +0100 Subject: 15.69 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index d4823ff04..cb08a62d1 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.68.1 +VERSION:=15.69 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 08acc5fa8..0633ad6c6 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 15.69 - 29 October 2013 + - adapt to a dracut based stage1 Version 15.68.1 - 14 October 2013 -- cgit v1.2.1 From 3fb7a307d620cca5d29b0addae2590131f4ac1f5 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 29 Oct 2013 21:59:36 +0100 Subject: 1.83 --- mdk-stage1/Makefile | 2 +- mdk-stage1/NEWS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index b8fcf0f2b..b320a04c8 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -VERSION=1.82 +VERSION=1.83 PRODUCT=drakx-installer-binaries # diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 8f2846cbd..498850515 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +1.83 - do initrd symlinking in 'init' rather than 'stage1' (stage1 is now run earlier) - build init and stage1 as a shared library (due to bugs in directory handling in dietlibc as exposed in libkmod but also because glibc is already include in -- cgit v1.2.1 From 9ed019141f6a9aa6739028b248d5b7baa30f8f9b Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 29 Oct 2013 22:21:25 +0100 Subject: 1.94 --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 131c604f9..07168eb99 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.93 +VERSION=1.94 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index bafacbc02..11b33e10a 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 1.94 - 29 October 2013 by Colin Guthrie + - adapt to a dracut based stage1 Version 1.93 - 14 October 2013 by Thierry Vignaud -- cgit v1.2.1 From ba8750f0f9f6c836bb5cf50a0a79cb0d645120b9 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 29 Oct 2013 23:21:03 +0000 Subject: images: Fix kernel+ramdisk folder creation --- images/make_boot_img | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/make_boot_img b/images/make_boot_img index efd6a2fa2..b2dd793f6 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -719,7 +719,7 @@ sub syslinux_all_files { $default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash'; each_index { - mkdir "$dir/alt$::i", 0777; + mkdir "$dir/$arch", 0777; _ "cp all.kernels/$_/vmlinuz $dir/$arch"; initrd('all', '', "images/all.rdz-$_", $_); rename("images/all.rdz-$_", "$dir/$arch/all.rdz"); -- cgit v1.2.1 From 3afd27c8728b52985ceb538512496990ade84197 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 29 Oct 2013 23:25:52 +0000 Subject: images: Fix isolinux.bin modules path and add needed modules --- images/make_boot_img | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/images/make_boot_img b/images/make_boot_img index b2dd793f6..21cb435a0 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -738,9 +738,15 @@ sub isolinux { syslinux_all_files('isolinux', $kernels); - _ "cp $isolinux_bin ../isolinux/isolinux.bin"; - _ "cp /usr/lib/syslinux/gfxboot.c32 ../isolinux/gfxboot.c32"; - output("../isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); + _ "cp $isolinux_bin isolinux/isolinux.bin"; + _ "cp /usr/lib/syslinux/ifcpu.c32 isolinux/ifcpu.c32"; + _ "cp /usr/lib/syslinux/ldlinux.c32 isolinux/ldlinux.c32"; + _ "cp /usr/lib/syslinux/libcom32.c32 isolinux/libcom32.c32"; + _ "cp /usr/lib/syslinux/libgpl.c32 isolinux/libgpl.c32"; + _ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32"; + _ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32"; + _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32"; + output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); xbox_stage1() if arch() =~ /i.86/; } @@ -771,7 +777,13 @@ sub boot_iso { output('.boot_iso/VERSION', VERSION($kernels)); # for the boot iso, use standard isolinux - _ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin"; + _ "cp $isolinux_bin .boot_iso/isolinux/isolinux.bin"; + _ "cp /usr/lib/syslinux/ifcpu.c32 .boot_iso/isolinux/ifcpu.c32"; + _ "cp /usr/lib/syslinux/ldlinux.c32 .boot_iso/isolinux/ldlinux.c32"; + _ "cp /usr/lib/syslinux/libcom32.c32 .boot_iso/isolinux/libcom32.c32"; + _ "cp /usr/lib/syslinux/libgpl.c32 .boot_iso/isolinux/libgpl.c32"; + _ "cp /usr/lib/syslinux/libmenu.c32 .boot_iso/isolinux/libmenu.c32"; + _ "cp /usr/lib/syslinux/libutil.c32 .boot_iso/isolinux/libutil.c32"; my $with_gfxboot = 0; _ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot; -- cgit v1.2.1 From 4fcf71c999dc5970a7ecce93ea51a9a4f4058b4f Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 30 Oct 2013 20:36:51 +0000 Subject: images: Clear out some stuff that no longer used. Now that initrds are generated via dracut, there is no need to prepare kernel modules. This sadly removes support for passing in a kernel rpm file, but such is life. --- images/Makefile | 4 ++-- images/make_boot_img | 65 ---------------------------------------------------- images/update_kernel | 38 ++---------------------------- 3 files changed, 4 insertions(+), 103 deletions(-) diff --git a/images/Makefile b/images/Makefile index 07168eb99..c25e965bd 100644 --- a/images/Makefile +++ b/images/Makefile @@ -8,7 +8,7 @@ IMAGES_DEST = $(ROOTDEST)/install/images all: images -images: all.kernels +images: all.kernels/.list DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img rm -rf images/alternatives if [ `ls images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then \ @@ -16,7 +16,7 @@ images: all.kernels fi cd images ; md5sum *.{img,iso}* > MD5SUM -all.kernels: update_kernel ../kernel/list_modules.pm +all.kernels/.list: update_kernel ./update_kernel $(KERNELS) dist: tar diff --git a/images/make_boot_img b/images/make_boot_img index 21cb435a0..b096097aa 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -166,71 +166,6 @@ sub initrd { } -sub initrdold { - my ($type, $I, $img) = @_; - my $stage1_root = $ENV{USE_LOCAL_STAGE1} ? "../mdk-stage1" : "/usr/$lib/drakx-installer-binaries"; - my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; - - _ "rm -rf $tmp_initrd"; - mkdir_p("$tmp_initrd$_") foreach qw(/etc /firmware /lib /modules /sbin /tmp /var); - symlink "../modules", "$tmp_initrd/lib/modules"; - symlink "../firmware", "$tmp_initrd/lib/firmware"; - - symlink "/proc/mounts", "$tmp_initrd/etc/mtab"; - symlink "../tmp", "$tmp_initrd/var/run"; - _ "install -D /usr/share/terminfo/l/linux $tmp_initrd/usr/share/terminfo/l/linux"; - foreach ('pcitable', 'usbtable') { - _ "install -D /usr/share/ldetect-lst/$_.gz $tmp_initrd/usr/share/ldetect-lst/$_.gz"; - } - _ "install -D /usr/share/pci.ids $tmp_initrd/usr/share/pci.ids"; - foreach ("dkms-modules.alias", "fallback-modules.alias", "/lib/module-init-tools/ldetect-lst-modules.alias") { - my $file = m!^/! ? $_ : "/usr/share/ldetect-lst/$_"; - _ "install -D $file $tmp_initrd$file"; - } - foreach my $firm (glob_("all.kernels$I/$ext/firmware/*")) { - my $dest=$firm; - $dest =~ s|all.kernels$I/$ext/||; - _ "cp -a $firm $tmp_initrd/$dest"; - } - - _ "install $stage1_root/init $tmp_initrd/"; - _ "install $stage1_root/stage1 $tmp_initrd/sbin/"; - foreach ('pppd', 'pppoe') { - _ "install /usr/sbin/${_}-diet $tmp_initrd/sbin/$_"; - } - - if ($arch !~ /ppc|ia64/) { - mkdir_p("$tmp_initrd/etc/pcmcia"); - _ "cp -a /etc/pcmcia/config.opts $tmp_initrd/etc/pcmcia"; - } - { - my $modz = "all.kernels$I/$ext"; - mkdir_p("$tmp_initrd/modules/$ext"); - __ "tar xC $tmp_initrd/modules/$ext -f $modz/${type}_modules.tar"; - _ "cp -f $modz/modules.$_ $tmp_initrd/modules/$ext" foreach qw(order builtin); - substInFile { s,.*/,, } "$tmp_initrd/modules/$ext/modules.order"; - _ "depmod -b $tmp_initrd $ext"; - # depmod keeps only available modules in modules.alias, but we want them all - _ "cp -f $modz/modules.alias $modz/modules.description $tmp_initrd/modules/$ext"; - } - mkdir_p("$tmp_initrd/$_") foreach qw(dev proc sys var/tmp tmp/stage2); - # ka deploy need some files in all.rdz - if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { - symlink("/sbin", "$tmp_initrd/bin"); - cp_af("/bin/busybox.static", "$tmp_initrd/sbin/busybox"); - my @funct = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } `busybox.static`; - shift @funct; - symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct; - } - if ($ENV{BUILD_KA}) { - mkdir_p("$tmp_initrd/ka"); - cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client"); - } - - _ "(cd $tmp_initrd; find . | cpio -o -c --quiet) | xz --check=crc32 --lzma2=dict=512KiB > $img"; - _ "rm -rf $tmp_initrd"; -} - sub entries_append { my ($type) = @_; diff --git a/images/update_kernel b/images/update_kernel index 934f5195e..a16513eac 100755 --- a/images/update_kernel +++ b/images/update_kernel @@ -15,18 +15,14 @@ use list_modules; my $rpm = 'rpm --nosignature'; -@ARGV or die "usage: ./update_kernel [--move] ( ... | ...)\n"; +@ARGV or die "usage: ./update_kernel ...\n"; eval { rm_rf('all.kernels') }; #- remove old things mkdir 'all.kernels'; my @kernels = map { my $kern_ver = rpm2version($_); - if (/\.rpm$/) { - extract_kernel($_, $kern_ver); - } else { extract_installed_rpm('', $kern_ver); - } $kern_ver; } @ARGV; @@ -41,40 +37,10 @@ sub rpm2version { `$rpm $opt $kernel_rpm` =~ m!/boot/vmlinuz-(.*)! && $1 or die "can't find vmlinuz in $kernel_rpm (is it installed?)\n"; } -sub extract_kernel { - my ($kernel_rpm, $kern_ver) = @_; - - my $dir = "all.kernels/$kern_ver"; - - warn "Extracting kernel $kern_ver\n"; - - eval { rm_rf($dir) }; - mkdir_p("$dir/modules"); - sys("rpm2cpio $kernel_rpm | (cd $dir ; cpio -id)"); - - extract_installed_rpm($dir, $kern_ver); - - eval { rm_rf("$dir$_") } foreach qw(/boot /lib /usr); -} - sub extract_installed_rpm { my ($installed_dir, $kern_ver) = @_; my $local_dir = "all.kernels/$kern_ver"; - mkdir_p("$local_dir/modules"); + mkdir_p("$local_dir"); sys('cp', "$installed_dir/boot/vmlinuz-$kern_ver", "$local_dir/vmlinuz"); - sys("cp $installed_dir/lib/modules/$kern_ver/modules.* $local_dir"); - - open(my $F, "find $installed_dir/lib/modules/$kern_ver -name '*.ko.?z' |"); - my $file; while ($file = <$F>) { - chomp($file); - system('cp', $file, "$local_dir/modules/" . basename($file)) == 0 - or warn "conflict for $file\n"; - } - - sys('perl', '../kernel/modules.pl', 'remove_unneeded_modules', $kern_ver); - sys('perl', '../kernel/modules.pl', 'get_firmwares', $kern_ver); - sys('perl', '../kernel/modules.pl', 'make_modules_per_image', $kern_ver); - - rm_rf("$local_dir/modules"); } -- cgit v1.2.1 From 08224de522b278761c73d50a0bc8010abc18e855 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 30 Oct 2013 20:39:00 +0000 Subject: images: Add a short circuit rule to make boot.iso for testing --- images/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/Makefile b/images/Makefile index c25e965bd..29c20e904 100644 --- a/images/Makefile +++ b/images/Makefile @@ -8,6 +8,11 @@ IMAGES_DEST = $(ROOTDEST)/install/images all: images +boot.iso: images/boot.iso + +images/boot.iso: all.kernels/.list make_boot_img + DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img images/boot.iso + images: all.kernels/.list DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img rm -rf images/alternatives @@ -37,3 +42,5 @@ install: rm -rf $(ROOTDEST)/isolinux cp -af isolinux $(ROOTDEST) endif + +.PHONY: boot.iso install clean dist tar images -- cgit v1.2.1 From 74cc75140329a03e5ed6f952932f8ea937216209 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 30 Oct 2013 21:38:53 +0000 Subject: images: Use a generic, shared isolinux.cfg file. This then loads a x86_64 or i586 config depending on the detected arch. Anne asked for this kind of setup. --- images/isolinux.cfg | 8 ++++++++ images/make_boot_img | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 images/isolinux.cfg diff --git a/images/isolinux.cfg b/images/isolinux.cfg new file mode 100644 index 000000000..1facfc8a3 --- /dev/null +++ b/images/isolinux.cfg @@ -0,0 +1,8 @@ +default detect +label detect + com32 ifcpu.c32 + append 64 -- x86_64 -- i586 +label x86_64 + config x86_64.cfg +label i586 + config i586.cfg diff --git a/images/make_boot_img b/images/make_boot_img index b096097aa..eb2146fa2 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -681,7 +681,8 @@ sub isolinux { _ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32"; _ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32"; _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32"; - output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); + output("isolinux/$arch.cfg", syslinux_cfg_all('cdrom', 1)); + _ "cp isolinux.cfg isolinux/"; xbox_stage1() if arch() =~ /i.86/; } @@ -726,7 +727,8 @@ sub boot_iso { #_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; _ "cp /usr/lib/syslinux/gfxboot.c32 .boot_iso/isolinux/gfxboot.c32" if $with_gfxboot; - output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); + output(".boot_iso/isolinux/$arch.cfg", syslinux_cfg_all('', $with_gfxboot)); + _ "cp isolinux.cfg .boot_iso/isolinux/"; _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; _ "isohybrid -o 1 $iso"; -- cgit v1.2.1 From 284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Fri, 1 Nov 2013 10:35:03 +0000 Subject: images/kernel: Ensure the previously hand-picked modules are included in the new dracut-based initrd. This removes functions no longer called and adds a new one which will simply list the desired modules and pass them on the dracut command line. This should mean we have the same modules as before (at least) which should mean less regressions. This does increase the size of the initrd back up quite a lot (as expected) so we may want to look at optimising other areas to bring it back down a bit again. --- images/NEWS | 2 ++ images/make_boot_img | 3 ++- kernel/modules.pl | 31 +++++++------------------------ 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/images/NEWS b/images/NEWS index 11b33e10a..3cf924b06 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- include network modules as specified by kernel/list_modules.pm + Version 1.94 - 29 October 2013 by Colin Guthrie - adapt to a dracut based stage1 diff --git a/images/make_boot_img b/images/make_boot_img index eb2146fa2..2be5bbde5 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -153,6 +153,7 @@ sub initrd { my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : ""; my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; my $modules = " network mgainstaller "; + my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`; if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { $modules="$modules busybox "; @@ -162,7 +163,7 @@ sub initrd { mkdir_p("build/dracut.conf.d"); touch("build/dracut.conf"); # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream - __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' '$img' '$kernel'" + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' --add-drivers ' $drivers ' '$img' '$kernel'" } diff --git a/kernel/modules.pl b/kernel/modules.pl index b64c92fa2..3b68b4039 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -41,38 +41,21 @@ sub modules() { @nls_modules, map { category2modules($_) } split(' ', $images_cat); } -sub get_firmwares() { +sub list_needed_modules { my ($kern_ver) = @_; - foreach (all("all.kernels/$kern_ver/modules")) { - foreach(`/sbin/modinfo -Ffirmware "all.kernels/$kern_ver/modules/$_"`) { - mkdir_p(dirname("all.kernels/$kern_ver/firmware/$_")); - eval { cp_af("/lib/firmware/$_", "all.kernels/$kern_ver/firmware/$_"); }; - } - } -} - -sub remove_unneeded_modules { - my ($kern_ver) = @_; - - load_dependencies("all.kernels/$kern_ver/modules.dep"); + load_dependencies("/lib/modules/$kern_ver/modules.dep"); my @all = modules(); my @all_with_deps = map { dependencies_closure($_) } @all; - my %wanted_modules = map { (list_modules::modname2filename($_) . ".ko.xz" => 1) } @all_with_deps; - foreach (all("all.kernels/$kern_ver/modules")) { - $wanted_modules{$_} or unlink "all.kernels/$kern_ver/modules/$_"; + my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all_with_deps; + foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) { + my $modfile = basename($_); + $modfile =~ s/\.ko\.xz//; + $wanted_modules{$modfile} and print "$modfile\n"; } } -sub make_modules_per_image { - my ($kern_ver) = @_; - - my $dir = "all.kernels/$kern_ver/modules"; - - system("cd $dir ; tar cf ../all_modules.tar *.ko.*") == 0 or die "tar failed\n"; -} - sub get_main_modules() { my $base = dirname($0); my $main = chomp_(cat_("$base/RPMS/.main")); -- cgit v1.2.1 From bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 10:11:01 +0000 Subject: images: Split dracut options out into a config file. Also ensure that the compression method is xz -9 for much better compression (was previously defaulting to gzip) --- images/NEWS | 2 ++ images/dracut.conf | 4 ++++ images/make_boot_img | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 images/dracut.conf diff --git a/images/NEWS b/images/NEWS index 3cf924b06..84ab15c8a 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- add a dracut.conf rather than adding lots of command line options +- ensure initrd is xz compressed - include network modules as specified by kernel/list_modules.pm Version 1.94 - 29 October 2013 by Colin Guthrie diff --git a/images/dracut.conf b/images/dracut.conf new file mode 100644 index 000000000..61b2e5636 --- /dev/null +++ b/images/dracut.conf @@ -0,0 +1,4 @@ +hostonly=no +nofscks=yes +omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown " +compress=xz diff --git a/images/make_boot_img b/images/make_boot_img index 2be5bbde5..b0e3eec70 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -161,9 +161,8 @@ sub initrd { $modules="$modules mgakadeploy " if ($ENV{BUILD_KA}); mkdir_p("build/dracut.conf.d"); - touch("build/dracut.conf"); # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream - __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' --add-drivers ' $drivers ' '$img' '$kernel'" + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'" } -- cgit v1.2.1 From 2df68d93aa83b7d2165bb1df42b39523f80d8052 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 11:45:34 +0000 Subject: images: Omit the dracut network module now that we include our own networking kernel modules --- images/NEWS | 1 + images/dracut.conf | 2 +- images/make_boot_img | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/NEWS b/images/NEWS index 84ab15c8a..3d8935d60 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,4 @@ +- omit the dracut network module now that we include our own networking kernel modules - add a dracut.conf rather than adding lots of command line options - ensure initrd is xz compressed - include network modules as specified by kernel/list_modules.pm diff --git a/images/dracut.conf b/images/dracut.conf index 61b2e5636..a1fd05e18 100644 --- a/images/dracut.conf +++ b/images/dracut.conf @@ -1,4 +1,4 @@ hostonly=no nofscks=yes -omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown " +omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown network " compress=xz diff --git a/images/make_boot_img b/images/make_boot_img index b0e3eec70..5325d2cf6 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -152,7 +152,7 @@ sub initrd { my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : ""; my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : ""; my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; - my $modules = " network mgainstaller "; + my $modules = " mgainstaller "; my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`; if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { -- cgit v1.2.1 From 4cada761d6b112291f021dd9dffb4fd5c97ac99b Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 11:49:59 +0000 Subject: 1.95 --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 29c20e904..7aa589a19 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.94 +VERSION=1.95 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 3d8935d60..9e8aaf357 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 1.95 - 2 November 2013 by Colin Guthrie + - omit the dracut network module now that we include our own networking kernel modules - add a dracut.conf rather than adding lots of command line options - ensure initrd is xz compressed -- cgit v1.2.1 From addfd6769673ba661498183a220769144f758f5a Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 14:05:52 +0000 Subject: images: Fix 32-bit isolinux wrapper (s/i586/i386) --- images/NEWS | 2 ++ images/isolinux.cfg | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images/NEWS b/images/NEWS index 9e8aaf357..bdb7d0f16 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- fix 32-bit isolinux wrapper (s/i586/i386) + Version 1.95 - 2 November 2013 by Colin Guthrie - omit the dracut network module now that we include our own networking kernel modules diff --git a/images/isolinux.cfg b/images/isolinux.cfg index 1facfc8a3..70fa19d0a 100644 --- a/images/isolinux.cfg +++ b/images/isolinux.cfg @@ -1,8 +1,8 @@ default detect label detect com32 ifcpu.c32 - append 64 -- x86_64 -- i586 + append 64 -- x86_64 -- i386 label x86_64 config x86_64.cfg -label i586 - config i586.cfg +label i386 + config i386.cfg -- cgit v1.2.1 From 45f2ab87fb19afc8de91c47f2ad103721a20b24c Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 15:31:03 +0000 Subject: images: Ensure initrd is created with 644 perms (normally 600 for security reasons) --- images/NEWS | 1 + images/make_boot_img | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/NEWS b/images/NEWS index bdb7d0f16..507525b24 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,4 @@ +- ensure initrd is created with 644 perms (normally 600 for security reasons) - fix 32-bit isolinux wrapper (s/i586/i386) Version 1.95 - 2 November 2013 by Colin Guthrie diff --git a/images/make_boot_img b/images/make_boot_img index 5325d2cf6..ed4c5baec 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -162,7 +162,8 @@ sub initrd { mkdir_p("build/dracut.conf.d"); # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream - __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'" + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'"; + chmod(0644, $img); } -- cgit v1.2.1 From 36a7f2494dd62dfa28c755419dad3aef753515e7 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sat, 2 Nov 2013 19:26:11 +0200 Subject: Update Ukrainian translation --- perl-install/install/share/po/uk.po | 437 ++++++++++++++++++++---------------- 1 file changed, 244 insertions(+), 193 deletions(-) diff --git a/perl-install/install/share/po/uk.po b/perl-install/install/share/po/uk.po index d92d362c1..1e2af004e 100644 --- a/perl-install/install/share/po/uk.po +++ b/perl-install/install/share/po/uk.po @@ -1,13 +1,13 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2013 Mageia developers +# This file is distributed under the same license as the drakx package. # # Yuri Chornoivan , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" -"PO-Revision-Date: 2013-05-03 14:52+0300\n" +"POT-Creation-Date: 2013-10-21 19:31+0300\n" +"PO-Revision-Date: 2013-10-10 15:24+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "Чи маєте ви доступ до вказаних нижче додаткових носіїв?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,90 +87,90 @@ msgstr "" "\n" "Чи маєте ви диск підтримки для налаштування?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Мережа (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Мережа (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Мережа (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Посилання на дзеркало?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Посилання має починатися з ftp:// або http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Встановлення зв’язку з веб-сайтом %s для отримання списку доступних дзеркал…" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Не вдалося встановити зв’язок з веб-сайтом %s для отримання списку доступних " "дзеркал" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Виберіть сервер, з якого звантажити пакунки" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Встановлення NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Введіть назву машини або теку з носієм NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Немає назви машини" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Назва каталогу має починатися з «/»" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Назва комп'ютера для монтування NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Каталог" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Додатковий" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -179,22 +179,22 @@ msgstr "" "На цьому дзеркалі не вдалося знайти перелік пакунків. Переконайтеся, що його " "розташування вказано правильно." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Основне (випуск)" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Сумнівні (випуск)" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Невільні (випуск)" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -204,26 +204,26 @@ msgstr "" "мікропрограми з закритим кодом, потрібні для роботи драйверів з відкритим " "кодом." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Вам слід уможливити встановлення зі сховища «%s»" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" "У сховищі «%s» містяться різноманітні частини операційної системи та її " "програм" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" "У сховищі «%s» містяться пакунки з програмним забезпеченням, яке не є " "вільним.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -233,7 +233,7 @@ msgstr "" "пристроїв (наприклад деяких відеокарток ATI/AMD, деяких мережевих карток, " "деяких карток RAID…)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -243,7 +243,7 @@ msgstr "" "вільно поширювати у деяких країнах через порушення патентних прав на це " "програмне забезпечення." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." @@ -251,33 +251,33 @@ msgstr "" "Також у сховищі «%s» містяться пакунки, які зібрано з додатковими " "можливостями, використання яких обмежується патентним законодавством." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Тут ви можете увімкнути додаткові сховища, якщо це вам потрібно." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "У цьому сховищі містяться оновлення пакунків зі сховища «%s»" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Переглядається список вже встановлених пакунків…" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Шукаємо пакунки для поновлення…" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Вилучаємо пакунків перед поновленням…" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -291,72 +291,72 @@ msgstr "" "\n" "Ви справді хочете вилучити ці пакунки?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Помилка при читанні файла %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Назву наступних дисків було змінено:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (попередня назва %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Мережа" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Будь ласка, виберіть носій" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Файл вже існує. Перезаписати його?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Доступ заборонено" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Неправильна назва NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Пошкоджений носій %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Не можна робити знімки екрана перед розбиттям на розділи" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Знімки екрана стануть можливими після встановлення до %s" @@ -366,7 +366,7 @@ msgstr "Знімки екрана стануть можливими після msgid "Installation" msgstr "Встановлення" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Налаштовування" @@ -468,42 +468,42 @@ msgstr "" "Деякі пакунки, необхідні для варіанта %s, неможливо встановити:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Сталася помилка:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Сталася невиправна помилка: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Більше не питати" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d запит на встановлення завершився невдало" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Встановлення пакунку невдале:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Робоча станція" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Офісна робоча станція" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -512,32 +512,32 @@ msgstr "" "Програми для офісу: текстові процесори (LibreOffice Writer, Kword), " "електронні таблиці (LibreOffice Calc, Kspread), переглядачі файлів PDF, тощо" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Ігрова станція" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Програми для розваг: ігри-перегони, ігри на дошці, стратегічні, тощо" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мультимедійна станція" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Звукові та відео програвачі та редактори" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Станція для Інтернету" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -546,193 +546,193 @@ msgstr "" "Набір засобів для читання та передавання електронної пошти та груп новин " "(pine, mutt, tin…), а також для перегляду сторінок інтернету" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Мережевий комп'ютер (клієнт)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Клієнти для різних протоколів (ssh включно)" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Засоби для полегшення налаштування комп'ютера" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Засоби для консолі" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Редактори, командні оболонки, файлові засоби та термінали" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Розробка" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Бібліотеки для програмування в C, C++, програми та файли include" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документація" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Книжки та поради з Linux та вільного програмного забезпечення" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Стандартна база Linux. Підтримка програм сторонніх виробників" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб-сервер" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Групова робота" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Сервер Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Захисний шлюз/Маршрутизатор" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Інтернет-шлюз" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Пошта/Новини" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Поштовий сервер postfix, сервер новин Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Сервер тек" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Сервер FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Сервер назв домену і мережевий інформаційний сервер" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Сервер доступу до файлів і друкарок" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Сервер NFS, сервер Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "База даних" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Сервери баз даних PostgreSQL і MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Тенета/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Пошта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Поштовий сервер postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Сервери баз даних PostgreSQL або MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Мережевий комп'ютер (сервер)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Сервер NFS, сервер SMB, проксі-сервер, сервер ssh" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Графічне середовище" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Робоча станція KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -741,12 +741,12 @@ msgstr "" "Робоче середовище K (KDE) — основне графічне середовище з набором допоміжних " "засобів" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Робоча станція Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -754,12 +754,41 @@ msgid "" msgstr "" "Графічне середовище з дружнім інтерфейсом та програмами, засоби для стільниці" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, c-format +msgid "XFCE Workstation" +msgstr "Робоча станція XFCE" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Полегшене графічне середовище з дружнім інтерфейсом та програмами, засоби " +"для стільниці" + +#: share/meta-task/compssUsers.pl:167 +#, c-format +msgid "MATE Workstation" +msgstr "Робоча станція MATE" + +#: share/meta-task/compssUsers.pl:172 +#, c-format +msgid "Cinnamon Workstation" +msgstr "Робоча станція Cinnamon" + +#: share/meta-task/compssUsers.pl:173 +#, c-format +msgid "A graphical environment based on GNOME" +msgstr "Графічне середовище на основі GNOME" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Стільниця LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -768,52 +797,74 @@ msgstr "" "Легке і швидке графічне середовище з дружнім інтерфейсом та програмами, " "засоби для стільниці" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, c-format +msgid "RazorQT Desktop" +msgstr "Стільниця RazorQT" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" +"Швидке, невибагливе до ресурсів, але менш розвинене графічне середовище" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "Стільниця Enlightenment e17" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Швидке, невибагливе до ресурсів графічне середовище з відданими прихильниками" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Інші графічні стільниці" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, тощо" +msgid "Window Maker, Fvwm, etc" +msgstr "Window Maker, Fvwm, тощо" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Інструменти" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Сервер SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Сервер віддаленого налаштування Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Мережеві інструменти/Слідкування за мережею" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Інструменти для слідкування, облік процесів, tcpdump, nmap…" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Помічники Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Помічники для налаштування сервера" @@ -827,7 +878,7 @@ msgstr "" "Сталася помилка, але спосіб належного усування її наслідків невідомий.\n" "Ви можете ризикнути і продовжити встановлення." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -882,107 +933,107 @@ msgstr "Вибір носія" msgid "Install %s KDE Desktop" msgstr "Встановити робочу станцію %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Встановити робочу станцію %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Вибіркове встановлення" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Стільниця KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Стільниця GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Нетипова стільниця" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Попередній перегляд стільниці «%s»." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Натисніть на зображення, щоб побачити більший розмір" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Вибір груп пакунків" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Індивідуальний вибір пакунків" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Скасувати весь вибір" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Загальний розмір: %d / %d МБ" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Версія: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Розмір: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d кБ\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Важливість: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ви не можете вибрати або скасувати вибір цього пакунка." -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "через відсутність %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "через незадоволеність %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "намагаємося задіяти %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "щоб залишити %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -991,87 +1042,87 @@ msgstr "" "Ви не можете вибрати цей пакунок, бо для його встановлення не залишилося " "достатньо вільного місця." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ці пакунки буде встановлено" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Наступні пакунки буде вилучено" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Цей пакунок необхідний, його вибір не можна скасовувати" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Вибір цього пакунка не можна скасовувати. Його вже встановлено." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Вибір цього пакунка не можна скасовувати. Його слід поновити." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Показувати автоматично вибрані пакунки" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Встановлення" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" -msgstr "Завантажити/зберегти виділене" +msgstr "Завантажити/зберегти позначене" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Поновлення вибору пакунків" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Мінімальне встановлення" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Менеджер програм" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Виберіть пакунки, які ви хочете встановити" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Встановлення" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Без подробиць" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Залишилося часу:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(наближене обчислення…)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1080,17 +1131,17 @@ msgstr[1] "%d пакунки" msgstr[2] "%d пакунків" msgstr[3] "%d пакунків" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Підсумки" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Налаштувати" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "не налаштовано" @@ -1104,7 +1155,7 @@ msgstr "" "Було знайдено наступні носії встановлення.\n" "Якщо ви не хочете використовувати деякі з них, зніміть з них позначку вибору." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1117,7 +1168,7 @@ msgstr "" "Після цього встановлення продовжиться з твердого диска і пакунки залишаться " "доступними після повного встановлення системи." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Копіювати компакт-диски повністю." @@ -1427,28 +1478,28 @@ msgstr "" "Ви хочете встановити ці поновлення?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Обладнання" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Звукова картка" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Чи маєте ви звукові карти ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1457,73 +1508,73 @@ msgstr "" "Виконайте \"alsaconf\" або \"sndconfig\" після встановлення, щоб налаштувати " "звукову карту" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Звукових карт не виявлено. Спробуйте \"harddrake\" після встановлення" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графічний інтерфейс" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Мережа та Інтернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Проксі" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "налаштовано" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Рівень безпеки" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Захисний шлюз" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "увімкнено" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "вимкнено" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Ви не налаштувати X. Ви впевнені, що дійсно цього хочете?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Готуємо завантажувач…" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Приготування початкової програми запуску…" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Зачекайте, це може тривати довго…" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1536,7 +1587,7 @@ msgstr "" "завантаження, вам слід використати BootX чи якийсь інший спосіб завантаження " "вашої машини. Параметр ядра для кореневої файлової системи: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1545,17 +1596,17 @@ msgstr "" "На цьому рівні безпеки доступ до файлів на розділі Windows дозволений тільки " "адміністратору." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Вставте чисту дискету в дисковод %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Створення дискети для автоматичного встановлення…" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1566,12 +1617,12 @@ msgstr "" "\n" "Ви дійсно хочете припинити зараз?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Вітання" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Перезавантажити" -- cgit v1.2.1 From 9d8b9a7114fb75e354667245937aa18561ed5d95 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 2 Nov 2013 20:38:12 +0159 Subject: switch to 2.00 to mark the big changes to dracut intrd and syslinux --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 7aa589a19..3d54152f8 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.95 +VERSION=2.00 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 507525b24..43c9ef30c 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 2.00 - 2 November 2013 by Thomas Backlund + - ensure initrd is created with 644 perms (normally 600 for security reasons) - fix 32-bit isolinux wrapper (s/i586/i386) -- cgit v1.2.1 From 38b1c61d967becc2de60646e89577516367ff2de Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 3 Nov 2013 12:20:04 +0200 Subject: Update translation catalog --- perl-install/install/share/po/DrakX.pot | 470 +++++++----------- perl-install/install/share/po/af.po | 427 +++++++++------- perl-install/install/share/po/am.po | 423 +++++++++------- perl-install/install/share/po/ar.po | 445 +++++++++-------- perl-install/install/share/po/ast.po | 429 +++++++++------- perl-install/install/share/po/az.po | 425 +++++++++------- perl-install/install/share/po/be.po | 427 +++++++++------- perl-install/install/share/po/bg.po | 425 +++++++++------- perl-install/install/share/po/bn.po | 427 +++++++++------- perl-install/install/share/po/br.po | 425 +++++++++------- perl-install/install/share/po/bs.po | 429 +++++++++------- perl-install/install/share/po/ca.po | 429 +++++++++------- perl-install/install/share/po/cs.po | 429 +++++++++------- perl-install/install/share/po/cy.po | 429 +++++++++------- perl-install/install/share/po/da.po | 427 +++++++++------- perl-install/install/share/po/de.po | 428 +++++++++------- perl-install/install/share/po/el.po | 427 +++++++++------- perl-install/install/share/po/eo.po | 425 +++++++++------- perl-install/install/share/po/es.po | 429 +++++++++------- perl-install/install/share/po/et.po | 427 +++++++++------- perl-install/install/share/po/eu.po | 429 +++++++++------- perl-install/install/share/po/fa.po | 423 +++++++++------- perl-install/install/share/po/fi.po | 428 +++++++++------- perl-install/install/share/po/fr.po | 718 +++++++++++++++------------ perl-install/install/share/po/fur.po | 423 +++++++++------- perl-install/install/share/po/ga.po | 423 +++++++++------- perl-install/install/share/po/gl.po | 429 +++++++++------- perl-install/install/share/po/he.po | 425 +++++++++------- perl-install/install/share/po/hi.po | 425 +++++++++------- perl-install/install/share/po/hr.po | 427 +++++++++------- perl-install/install/share/po/hu.po | 428 +++++++++------- perl-install/install/share/po/id.po | 429 +++++++++------- perl-install/install/share/po/is.po | 426 +++++++++------- perl-install/install/share/po/it.po | 429 +++++++++------- perl-install/install/share/po/ja.po | 425 +++++++++------- perl-install/install/share/po/ko.po | 423 +++++++++------- perl-install/install/share/po/ky.po | 429 +++++++++------- perl-install/install/share/po/lt.po | 427 +++++++++------- perl-install/install/share/po/ltg.po | 429 +++++++++------- perl-install/install/share/po/lv.po | 427 +++++++++------- perl-install/install/share/po/mk.po | 431 +++++++++------- perl-install/install/share/po/mn.po | 423 +++++++++------- perl-install/install/share/po/ms.po | 423 +++++++++------- perl-install/install/share/po/mt.po | 423 +++++++++------- perl-install/install/share/po/nb.po | 429 +++++++++------- perl-install/install/share/po/nl.po | 429 +++++++++------- perl-install/install/share/po/nn.po | 428 +++++++++------- perl-install/install/share/po/pa_IN.po | 423 +++++++++------- perl-install/install/share/po/pl.po | 429 +++++++++------- perl-install/install/share/po/pt.po | 429 +++++++++------- perl-install/install/share/po/pt_BR.po | 428 +++++++++------- perl-install/install/share/po/ro.po | 427 +++++++++------- perl-install/install/share/po/ru.po | 681 ++++++++++++++----------- perl-install/install/share/po/sc.po | 425 +++++++++------- perl-install/install/share/po/sk.po | 425 +++++++++------- perl-install/install/share/po/sl.po | 428 +++++++++------- perl-install/install/share/po/sq.po | 427 +++++++++------- perl-install/install/share/po/sr.po | 429 +++++++++------- perl-install/install/share/po/sr@Latn.po | 429 +++++++++------- perl-install/install/share/po/sv.po | 428 +++++++++------- perl-install/install/share/po/ta.po | 423 +++++++++------- perl-install/install/share/po/tg.po | 427 +++++++++------- perl-install/install/share/po/th.po | 423 +++++++++------- perl-install/install/share/po/tl.po | 427 +++++++++------- perl-install/install/share/po/tr.po | 431 +++++++++------- perl-install/install/share/po/uk.po | 2 +- perl-install/install/share/po/uz.po | 429 +++++++++------- perl-install/install/share/po/uz@cyrillic.po | 429 +++++++++------- perl-install/install/share/po/vi.po | 427 +++++++++------- perl-install/install/share/po/wa.po | 429 +++++++++------- perl-install/install/share/po/zh_CN.po | 425 +++++++++------- perl-install/install/share/po/zh_TW.po | 425 +++++++++------- 72 files changed, 17197 insertions(+), 13718 deletions(-) diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot index 3b49afc86..aebca3526 100644 --- a/perl-install/install/share/po/DrakX.pot +++ b/perl-install/install/share/po/DrakX.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -83,177 +83,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -262,72 +262,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -337,7 +337,7 @@ msgstr "" msgid "Installation" msgstr "" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "" @@ -431,262 +431,262 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "" @@ -703,7 +703,7 @@ msgstr "" msgid "GNOME Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:156 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -742,22 +742,21 @@ msgstr "" msgid "LXDE Desktop" msgstr "" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:177 +#: share/meta-task/compssUsers.pl:183 #, c-format msgid "RazorQT Desktop" msgstr "" #: share/meta-task/compssUsers.pl:185 #, c-format -msgid "" -"A less developed lightweight fast graphical environment " +msgid "A less developed lightweight fast graphical environment" msgstr "" #: share/meta-task/compssUsers.pl:188 @@ -767,8 +766,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:190 #, c-format -msgid "" -"A lightweight fast graphical environment with a dedicated following" +msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" #: share/meta-task/compssUsers.pl:193 @@ -781,42 +779,42 @@ msgstr "" msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "" @@ -828,7 +826,7 @@ msgid "" "Continue at your own risk." msgstr "" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -870,276 +868,216 @@ msgstr "" msgid "Media Selection" msgstr "" -#: steps_gtk.pm:252 +#: steps_gtk.pm:251 #, c-format msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:253 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:254 -#, c-format -msgid "Install %s MATE Desktop" -msgstr "" - -#: steps_gtk.pm:255 -#, c-format -msgid "Install %s Cinnamon Desktop" -msgstr "" - -#: steps_gtk.pm:256 -#, c-format -msgid "Install %s XFCE Desktop" -msgstr "" - -#: steps_gtk.pm:257 -#, c-format -msgid "Install %s LXDE Desktop" -msgstr "" - -#: steps_gtk.pm:258 -#, c-format -msgid "Install %s RazorQT Desktop" -msgstr "" - -#: steps_gtk.pm:259 -#, c-format -msgid "Install %s E17 Desktop" -msgstr "" - -#: steps_gtk.pm:260 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "" -#: steps_gtk.pm:286 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "" -#: steps_gtk.pm:287 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "" -#: steps_gtk.pm:288 -#, c-format -msgid "MATE Desktop" -msgstr "" - -#: steps_gtk.pm:289 -#, c-format -msgid "Cinnamon Desktop" -msgstr "" - -#: steps_gtk.pm:290 -#, c-format -msgid "XFCE Desktop" -msgstr "" - -#: steps_gtk.pm:291 -#, c-format -msgid "LXDE Desktop" -msgstr "" - -#: steps_gtk.pm:292 -#, c-format -msgid "RazorQT Desktop" -msgstr "" - -#: steps_gtk.pm:293 -#, c-format -msgid "E17 Desktop" -msgstr "" - -#: steps_gtk.pm:294 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "" -#: steps_gtk.pm:300 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "" msgstr[1] "" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "" @@ -1151,7 +1089,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1160,7 +1098,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1312,46 +1250,14 @@ msgstr "" msgid "GNOME" msgstr "" -#: steps_interactive.pm:485 -#, c-format -msgid "MATE" -msgstr "" - -#: steps_interactive.pm:486 -#, c-format -msgid "CINNAMON" -msgstr "" - #: steps_interactive.pm:487 #, c-format -msgid "XFCE" -msgstr "" - -#: steps_interactive.pm:488 -#, c-format -msgid "LXDE" -msgstr "" - -#: steps_interactive.pm:489 -#, c-format -msgid "RAZOR" -msgstr "" - -#: steps_interactive.pm:490 -#, c-format -msgid "E17" -msgstr "" - -#: steps_interactive.pm:494 -#, c-format msgid "Desktop Selection" msgstr "" -#: steps_interactive.pm:495 +#: steps_interactive.pm:488 #, c-format -msgid "" -"You can choose your workstation desktop profile.\n" -"Select 'Custom' for more choices." +msgid "You can choose your workstation desktop profile." msgstr "" #: steps_interactive.pm:576 @@ -1470,101 +1376,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1573,24 +1479,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1598,12 +1504,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "" diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po index cdbee19ee..016a7e5fc 100644 --- a/perl-install/install/share/po/af.po +++ b/perl-install/install/share/po/af.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-af\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-04-21 17:33+0200\n" "Last-Translator: Dirk van der Walt \n" "Language-Team: Afrikaans\n" @@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?" msgstr "Beskik u oor nog?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,177 +87,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CDROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Netwerk %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Netwerk %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Kies 'n spieël waar die pakkette verkry kan word" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Gids" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Kan nie %s op %s vind nie" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Ondersoek pakette wat reeds geïnstalleer is..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Soek vir pakkette om op te gradeer..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -270,73 +270,73 @@ msgstr "" "\n" "Wil u werklik dat ons hulle verwyder?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fout met die lees van lêer %s" # -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Die volgende pakkette geïnstalleer word:\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "Ftp" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "PFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Netwerk" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Kies asseblief" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Lêer bestaan alreeds. Moet dit gebruik word?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Toegang verbied" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan nie skermfoto's neem voor partisie skep nie" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s" @@ -346,7 +346,7 @@ msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s" msgid "Installation" msgstr "Besig met installasie" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurasie" @@ -442,42 +442,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "'n Fout het voorgekom" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "'n Ernstige fout het voorgekom: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "onsuksesvolle installasie" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Installeer pakket %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Werkstasie" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kantoorwerkstasie" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -486,32 +486,32 @@ msgstr "" "Kantoorprogramme: Woordverwerkers(LibreOffice Writer, Kword), spreistate " "(LibreOffice Calc, Kspread), PDF-sigprogramme, ens." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Speletjiesrekenaar" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Vermaak: Arkade, Bordspel, Strategie ens." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimediastasie" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Klank- en videospelers/redigeerders" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internetstasie" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -520,195 +520,195 @@ msgstr "" "Stel hulpprogramme om e-pos en netnuus te lees en te stuur (mutt, tin) en om " "ook die web deur te blaai." -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Netwerkrekenaar (kliënt)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konsole Hulpprogramme" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" "Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-" "programme" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Ontwikkeling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentasie" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Derdeparty ondersteuning van programme" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web-bediener" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Groep:" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-bediener" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Vuurmuur/Netwerkroteerder" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internetpoort" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Lêer/_Nuut" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix e-pos-bediener" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Herstel vanaf CD" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-bediener" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Drukkerbediener" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "Samba-bediener" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Databasis" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL of MariaDB databasisbediener" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "e-Pos" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix e-pos-bediener" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL of MariaDB databasisbediener" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Netwerkrekenaar-bediener" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS, SMB, Instaan- , SSH (Bedieners)" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafiese Omgewing" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Werkstasie" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -717,12 +717,12 @@ msgstr "" "Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n " "versameling bygaande hulpprogramme" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-werkstasie" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -731,12 +731,41 @@ msgstr "" "'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " "werkskerm-hulpprogramme" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Werkstasie" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " +"werkskerm-hulpprogramme" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-werkstasie" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Werkstasie" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafiese Omgewing" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "'n Werkstasie" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -745,52 +774,74 @@ msgstr "" "'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " "werkskerm-hulpprogramme" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "'n Werkstasie" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en " +"werkskerm-hulpprogramme" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Ander Grafiese Werkskerms" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Nutsprogramme" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-bediener" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webkamera" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Terminal Server Konfigurasie" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Monitor van Netwerk" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Store" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Probleme met die konfigurasie van drukker \" %s\"!" @@ -804,7 +855,7 @@ msgstr "" "'n Fout het plaasgevind en ek weet nie hoe om dit veilig te hanteer\n" "nie. Gaan op u eie risiko voort." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -861,107 +912,107 @@ msgstr "Kies Pakketgroepe" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimale installasie" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "'n Werkstasie" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Kies Pakketgroepe" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuele pakket-seleksie" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Herstel Keuses" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Totale grootte: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Weergawe: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Grootte: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Belangrikheid: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "U kan nie hierdie pakket selekteer/deselekteer nie" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "deur %s wat soek is" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "deur problematiese %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "probeer promosie van %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "om %s te kan behou" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -970,104 +1021,104 @@ msgstr "" "U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie " "beskikbaar is nie" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ons gaan die volgende pakette installeer" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Die volgende pakkette gaan verwyder word" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Hierdie is 'n verpligte pakket. Dit kan nie uitgehaal word nie." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "U kan nie heirdie pakket verwyder nie. Dis alreeds geïnstalleer" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "U kan nie hierdie pakket deselekteer nie. Dit moet opgradeer word." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Wys outogeselekteerde pakkette." -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installasie" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Pakketkeuse" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Pakketseleksie word opgedateer" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimale installasie" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Sagteware Beheer" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Kies die pakkette wat u wil installeer" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Besig met installasie" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Geen Detail" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Tyd oor " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Skatting" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakket" msgstr[1] "%d pakkette" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Opsomming" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigureer" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nie gekonfigureer nie" @@ -1079,7 +1130,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1088,7 +1139,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1388,102 +1439,102 @@ msgstr "" "Wil u dit nou installeer?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s op %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardeware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Klankkaart" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Beskik u oor 'n ISA klankkaart?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "Loop \"sndconfig\" na die installasie om u klankkaart te konfigureer" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafiese-koppelvlak" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Netwerk & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Instaan bedieners" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "gekonfigureer" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sekuriteitsvlak" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Vuurmuur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ge-aktiveer" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ge-deaktiveer" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "U het nog nie 'X' opgestel nie. Verlang u dit regtig?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Herlaaistelsel word voorberei..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Berei installasie voor" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1496,7 +1547,7 @@ msgstr "" "Ons sal voortgaan met die installasie, maar u sal\n" "BootX of 'n ander manier moet gedruik om u rekenaar te selflaai" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1505,17 +1556,17 @@ msgstr "" "Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie " "vernou na slegs die administrateur" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Sit 'n leë floppie in aandrywer %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Outoinstallasieskyf word geskep." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1526,12 +1577,12 @@ msgstr "" "\n" "Wil u werklik nou eindig?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Geluk" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Herlaai" diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po index 478862e1c..da98d5a6a 100644 --- a/perl-install/install/share/po/am.po +++ b/perl-install/install/share/po/am.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-06-01 03:36+0100\n" "Last-Translator: Alemayehu \n" "Language-Team: Amharic \n" @@ -71,7 +71,7 @@ msgid "Do you have further supplementary media?" msgstr "ሌላ አለ?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -80,177 +80,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "ሲዲ-ሮም" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "መረብ" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "መረብ" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ዶሴ" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -259,72 +259,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%sን በማንበብ ላይ ስህተት ተፈጥሯል" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "መረብ" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "እባክዎ ያለ ሰነድን ይምረጡ" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "ፈቃድ አልተሰጠም" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "ፋይል ተጭኗል %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -334,7 +334,7 @@ msgstr "" msgid "Installation" msgstr "በመትከል ላይ" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "ስየማ" @@ -428,343 +428,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "ስህተት ተፈጥሯል" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "%s አልተገኘም" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "የ%s ጥቅል በመትከል ላይ" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "የቅርብ መረብ ምርጫ" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "የመገናኛ ብዙሃን" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "ፈጣን መልእክት" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "ኮምፒውተር ሳይንስ" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, fuzzy, c-format msgid "Console Tools" msgstr "የፋይል መሳሪያዎች" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "እድገት" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "ማስረጃ" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "የመረብ ሰርቨር" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, fuzzy, c-format msgid "Apache" msgstr "መተላለፊያ" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "የውይይት መድረክ" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, fuzzy, c-format msgid "Kolab Server" msgstr "የሳምባ ተጠሪ" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "አዲስ ፋይል።" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "የመልዕክት ተጠሪ ሚስጢራዊ ቃል ያስፈልጋል" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "በዝርዝር ውስጥ ዶሴ ጨምር" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "የFTP ተጠሪ" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "የዘርፍ ስም ሰርቨር" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "የማተሚያ ሰርቨር" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "የሳምባ ሰርቨር" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "ዳታቤዝ" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "ፖስታ" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "ኮምፒውተር ሳይንስ" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "የቅርብ መረብ ምርጫ" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "የቅርብ መረብ ምርጫ" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "የቅርብ መረብ ምርጫ" + +#: share/meta-task/compssUsers.pl:173 +#, c-format +msgid "A graphical environment based on GNOME" +msgstr "" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "ሰሌዳ" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "ሰሌዳ" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "ፊሊፒንስ" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "ስለተጠሪ መረጃ" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "ዌብ-ካም" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "ቀዳሚ ተጠሪ ይጠቀም" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Name=መረብ" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "የMageia ባለሞያ" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "የባሕር-መዝገብ እሴት '%s' ወደ '%s' እንደገና መሰየም አልተቻለም።" @@ -776,7 +823,7 @@ msgid "" "Continue at your own risk." msgstr "" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -823,211 +870,211 @@ msgstr "የጥቅል ቡድን ምርጫ" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "አነስተኛ ተከላ" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "ሰሌዳ" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "ሰሌዳ" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "ሰሌዳ" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "የጥቅል ቡድን ምርጫ" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "የነጠላ ጥቅል ምርጫ" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, fuzzy, c-format msgid "Unselect All" msgstr "ሁሉንም &ተዉት" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "አጠቃላይ መጠን: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "ዝርያ: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "መጠን: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "አስፈላጊነት: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "ይህን ጥቅል መምረጥ/አለመምረጥ አይችሉም" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s ባለመገኘቱ ምክንያት" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s አጥጋቢ ባለመሆኑ ምክንያት" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%sን ለማስተዋወቅ በመሞከር ላይ" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%sን ለማቆየት" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "የሚከተሉት ጥቅሎች ሊተከሉ ነው" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "ይህንን ጥቅል መምረጥ አይችሉም። ቀደም ብሎ ተተክሏል።" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "ትከል" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "የጥቅል ምርጫ" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "የጥቅል ምርጫ በማሻሻል ላይ" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "አነስተኛ ተከላ" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, fuzzy, c-format msgid "Software Management" msgstr "ማውጫዎች &አስተዳዳሪ" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "ለመትከል የሚፈልጉትን ጥቅል ይምረጡ" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "በመትከል ላይ" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "ያለ ዝርዝሮች" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr " ይቀራል" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "በግምት" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d ጥቅሎች" msgstr[1] "%d ጥቅሎች" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "ማጠቃለያ" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "ለውጥ" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "አልተስተካከለም" @@ -1039,7 +1086,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1048,7 +1095,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1326,101 +1373,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s %s ላይ ነው" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "ሀርድዌር" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "የድምፅ ካርድ" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "የISA ድምጽ ካርድ አለዎት?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "ንድፋዊ እይታ" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "መረብ እና ኢንተርኔት" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "ወኪሎች" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ተስተካክሏል" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "የደህንነት ደረጃ" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "የእሳት ግድግዳ" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "መስራት ጀምሯል" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "መስራት አቁሟል" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "አስጀማሪ በማዘጋጀት ላይ..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "ተከላ በማዘጋጀት ላይ" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1429,24 +1476,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1454,12 +1501,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "እንኳን ደስ ያለዎ!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "እንደገና ጀምር" diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po index d3f401e41..89ab8345b 100644 --- a/perl-install/install/share/po/ar.po +++ b/perl-install/install/share/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2011-05-19 13:12+0000\n" "Last-Translator: salim salim \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "هل لديك وسائط إضافية أخرى؟" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,177 +87,183 @@ msgstr "" "\n" "هل لديك وسيط تثبيت إضافي لضبطه؟" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "القرص المدمج" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "الشبكة (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "الشبكة (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "الشبكة (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "مسار المرآة؟" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "يجب أن يبدأ المسار بـ http:// أو بـ ftp://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "جاري الاتصال بموقع %s للحصول على قائمة بالمرايا المتوفرة..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "فشل الاتصال بموقع %s للحصول على قائمة بالمرايا المتوفرة" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "اختر مرآة لتحصيل الحزم" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "تثبيت NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "فضلا أدخل اسم المضيف والدليل لوسائط NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "اسم المضيف غير موجود" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "يجب أن يبدأ الدليل بـ \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "اسم مضيف نقطة وصل NFS ؟" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "الدليل" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "إضافي" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "لم يمكن العثور على ملف لائحة الحزم على هذه المرآة. تأكد من صحة الموقع." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "مخزن Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "مخزن Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "مخزن Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." -msgstr "بعض قطع العتاد في جهازك تحتاج بعض المكتبات الغير حرة لتتمكن التعاريف الحرة من العمل." +msgstr "" +"بعض قطع العتاد في جهازك تحتاج بعض المكتبات الغير حرة لتتمكن التعاريف الحرة " +"من العمل." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "يجب أن تفعل \"%s\"" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "\"%s\" يحتوي على مختلف مكونات النظام وتطبيقاته" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" يحتوي على برمجيات غير حرة. \n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" -msgstr "يحتوى أيضا على بعض المكتبات الضرورية لتشغيل قطع عتاد معينة ( على سبيل المثال: كروت الشاشة ATI/AMD، بعض كروت الشبكة، بعض كروت RAID، ...)" +msgstr "" +"يحتوى أيضا على بعض المكتبات الضرورية لتشغيل قطع عتاد معينة ( على سبيل " +"المثال: كروت الشاشة ATI/AMD، بعض كروت الشبكة، بعض كروت RAID، ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." -msgstr "\"%s\" يحتوى على برمجيات لا يمكن إعادة نشرها في جميع بقاع العالم بسبب براءات الاختراع. " +msgstr "" +"\"%s\" يحتوى على برمجيات لا يمكن إعادة نشرها في جميع بقاع العالم بسبب " +"براءات الاختراع. " -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "يحتوي أيضا على برمجيات من \"%s\" تم إعادة بنائها بإمكانيات إضافية." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "هنا يمكنك تفعيل وسائط أكثر إن أردت." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "هذا الوسيط يوفر تحديثات للبرمجيات للوسيط \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "جاري البحث عن الحزم المثبتة مسبقا..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "جاري العثور على الحزم التي يمكن ترقيتها... " -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "جاري إزالة الحزم قبيل ترقيتها" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -270,72 +276,72 @@ msgstr "" "\n" "هل تريد حذف هذه الحزم فعلا؟\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "خطأ في قراءة الملف %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "لقد تم تغيير أسماء الأقراص التالية:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (المسمى %s سابقاً)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "الشبكة" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "الرجاء اختيار وسيط" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "الملف موجود مسبقا. هل تريد استبداله؟" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "تم رفض الإذن" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "اسم NFS غير صالح" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "الوسيط %s سيء" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "لا يمكن عمل لقطات للشاشة قبل التجزئة" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr " لقطات الشاشة ستكون متوفرة بعد التثبيت في %s" @@ -345,7 +351,7 @@ msgstr " لقطات الشاشة ستكون متوفرة بعد التثبيت msgid "Installation" msgstr "التثبيت" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "الضبط" @@ -444,42 +450,42 @@ msgstr "" "بعض الحزم التي يتطلبها %s لا يمكن تثبيتها:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "حدث خطأ:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "حدث خطأ فادح: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "لا تسأل مرة أخرى" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "فشلت عملية تثبيت %d" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "فشل تثبيت الحزمة:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "محطة عمل" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "محطة عمل مكتبية" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -488,32 +494,32 @@ msgstr "" "برامج مكتبية: معالجات نصوص (OpenOffice.org Writer، Kword)، جداول ممتدة " "(OpenOffice.org Calc، Kspread)، برامج عرض pdf، إلخ" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "محطة ألعاب" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "برامج تسلية: ألعاب فيديو، ألعاب لوحات، ألعاب استراتيجية، إلخ" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "محطة وسائط متعددة" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "برامج تحرير/تشغيل مرئيات وصوتيات" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "محطة إنترنت" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -521,193 +527,193 @@ msgid "" msgstr "" "مجموعة أدوات لقراءة وإرسال البريد والأخبار (mutt، tin..) ولتصفح الإنترنت" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "جهاز شبكة (عميل)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "عملاء لبروتوكولات مختلفة بما فيها ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "أدوات لتسهيل ضبط حاسبك" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "أدوات الطرفيات" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "محررات نصوص، صدفات، أدوات ملفات، طرفيات" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "تطوير" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "مكتبات تطوير خاصة بلغة C وC++، برامج وملفات مضمنة" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "توثيق" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "كتب ودلائل إرشادية حول لينكس والبرامج الحرة" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "القاعدة القياسية للينكس (LSB). دعم تطبيقات الطرف الثالث" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "خادم وب" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "برامج مجموعات" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "خادم Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "جدار ناري/روتر" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "بوابة إنترنت" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "بريد/أخبار" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "خادم بريد Postfix، خادم أخبار Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "خادم مجلدات" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "خادم FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "خادم أسماء النطاقات ومعلومات الشبكة" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "خادم مشاركة الملفات والطابعات" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "خادم NFS، خادم سامبا" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "قواعد بيانات" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "خادم قواعد بيانات PostgreSQL و MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "وب/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache، Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "البريد" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "خادم بريد Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "خادم قواعد بيانات PostgreSQL أو MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "خادم شبكات" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "خادم NFS، خادم SMB، خادم وسيط، خادم ssh" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "بيئات رسومية" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "محطة عمل كدي" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -715,12 +721,12 @@ msgid "" msgstr "" "بيئة سطح مكتب كدي، البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "محطة عمل جنوم" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -729,66 +735,117 @@ msgstr "" "بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين " "العاديين" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "محطة عمل كدي" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين " +"العاديين" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "محطة عمل جنوم" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "محطة عمل" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "بيئات رسومية" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "سطح مكتب LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين " -"العاديين" +"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة " +"للمستخدمين العاديين" + +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "سطح مكتب مخصص" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة " +"للمستخدمين العاديين" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "أسطح مكتب رسومية أخرى" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Icewm، Window Maker، Enlightenment، Fvwm، إلخ" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "أدوات" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "خادم SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "خادم الضبط البعيد Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "وسائل الشبكة/المراقبة" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "أدوات مراقبة، محاسبة عمليات، tcpdump، nmap، ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "مرشدو ماجيا" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "مرشدو ضبط الخادم" @@ -802,7 +859,7 @@ msgstr "" "حدث خطأ ولا أعرف كيف أتعامل معه جيدأ. \n" "تابع على مسؤوليتك." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -855,194 +912,194 @@ msgstr "انتقاء الوسائط" msgid "Install %s KDE Desktop" msgstr "تثبيت %s بسطح مكتب كدي" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "تثبيت %s بسطح مكتب جنوم" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "تثبيت مخصص" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "سطح مكتب كدي" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "سطح مكتب جنوم" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "سطح مكتب مخصص" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "هذه معاينة لشكل سطح مكتب %s" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "اضغط على الصور لتشاهد المعاينة بحجم أكبر" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "انتقاء مجموعات الحزم" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "انتقاء مفرد للحزم" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "إلغاء اختيار الكل" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "الحجم الإجمالي: %d / %d م.ب" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "الإصدار: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "الحجم: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d ك.ب\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "الأهمية: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "لا يمكنك انتقاء/إلغاء انتقاء هذه الحزمة" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "بسبب نقص %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "بسبب عدم إرضاء %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "السعي إلى ترويج %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "من أجل الاحتفاظ بـ %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "لا يمكنك انتقاء هذه الحزمة لأنه لا يوجد مساحة كافية لتثبيتها" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "ستثبت الحزم التالية" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "ستحذف الحزم التالية" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "هذه الحزمة إلزامية؛ لا يمكن إلغاء انتقائها" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "لا يمكن إلغاء انتقاء هذه الحزمة؛ لأنها مثبتة مسبقاً" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "لا يمكنك إلغاء انتقاء هذه الحزمة. لأن ترقيتها ضرورية" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "إظهار الحزم المنتقاة آليا" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "تثبيت" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "تحميل/حفظ الانتقاء" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "تحديث انتقاء الحزم" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "تثبيت مصغر" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "إدارة البرامج" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "اختر الحزم التي تريد تثبيتها" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "التثبيت" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "لا تفاصيل" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "الوقت المتبقي:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(حساب تقديري...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1053,17 +1110,17 @@ msgstr[3] "%d حزم" msgstr[4] "%d حزم" msgstr[5] "%d حزم" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "ملخص" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "اضبط" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "غير مضبوط" @@ -1077,7 +1134,7 @@ msgstr "" "تم العثور على وسائط التثبيت التالية.\n" "إن كنت تريد تخطي بعضها، فيمكنك إلغاء انتقائها الآن." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1088,7 +1145,7 @@ msgstr "" "لديك الخيار بنسخ محتويات الأقراص المدمجة إلى قرصك الصلب قبل التثبيت.\n" "حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متوفرة حتى يثبت النظام كاملا." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "نسخ الأقراص كاملة" @@ -1391,101 +1448,101 @@ msgstr "" "هل تريد تثبيت هذه التحديثات؟" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s على %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "العتاد" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "بطاقة الصوت" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "هل لديك بطاقة صوت ISA؟" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لضبط بطاقة الصّوت" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "لم يتم التعرف على أي بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "الواجهة الرسومية" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "الشبكة والإنترنت" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "الخوادم الوسيطة" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "تم ضبطه" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "مستوى الأمن" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "جدار ناري" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "مفعلة" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "معطلة" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "لم تقم بضبط خادم (X). هل أنت متأكد أنك تريد ذلك؟" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "تحضير محمل الإقلاع..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "تحضير برنامج بدء التشغيل الأولي..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "كن صبورا، ستستغرق العملية بعض الوقت..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1497,7 +1554,7 @@ msgstr "" "نظامك. ستستمر عملية التثبيت، لكنك بحاجة إلى استخدام BootX أو طريقة ما أخرى " "لإقلاع نظامك. معطى النواة لنظام الملفات الجذر هو: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1506,17 +1563,17 @@ msgstr "" "في هذا المستوى الأمني، الوصول إلى الملفات في قسم وندوز سيكون مقصوراً على " "المدير." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "أدخل قرصا مرنا فارغا في محرك الأقراص %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "إنشاء قرص مرن للتثبيت الآلي..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1527,12 +1584,12 @@ msgstr "" "\n" "هل تريد الخروج الآن حقا؟" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "تهانينا" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "إعادة اﻹقلاع" diff --git a/perl-install/install/share/po/ast.po b/perl-install/install/share/po/ast.po index ea9f19eec..adb47b87a 100644 --- a/perl-install/install/share/po/ast.po +++ b/perl-install/install/share/po/ast.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-11-04 19:22+0100\n" "Last-Translator: astur \n" "Language-Team: Asturian \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "¿Tienes dalgún soporte d'instalación suplementariu?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,90 +87,90 @@ msgstr "" "\n" "¿Tienes dalgún sofitu suplementariu que configurar?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rede(HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rede(FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rede(NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "¿URL del espeyu?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "La URL tien d'entamar con ftp:// o http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Contautando col sitiu web de %s p'algamar la llista d'espeyos disponibles" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Nun pudo coneutase col sitiu web de %s p'algamar la llista d'espeyos " "disponibles" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Escueye un espeyu del qu'algamar los paquetes" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuración NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Introduz el nome de sirvidor y el direutoriu del to preséu NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Falta'l nome del sirvidor" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "El direutoriu tien qu'entamar con \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "¿Nome del sirvidor del montaxe NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direutoriu" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Suplementariu" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -179,90 +179,90 @@ msgstr "" "Nun pudo alcontrase'l ficheru hdlist nesti espeyu. Asegúrate que " "l'allugamientu ye correutu." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Omitir tolos paquetes del preséu \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Guetando paquetes ya instalaos..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Alcontrando los paquetes a anovar..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Desaniciando paquetes enantes d'anovar..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -276,72 +276,72 @@ msgstr "" "\n" "¿De xuro que quies desanciar estos paquetes?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fallu al lleer el ficheru %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Renomáronse los siguientes discos:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (enantes conocíu como %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rede" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Por favor, escueye un soporte" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "El ficheru yá existe. ¿Quies sobroscribilu?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permisu torgáu" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nome NFS incorreutu" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Mediu %s incorreutu" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nun pueden facese captures de pantalla enantes del particionáu" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -353,7 +353,7 @@ msgstr "" msgid "Installation" msgstr "Instalación" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuración" @@ -454,42 +454,42 @@ msgstr "" "Dalgunos paquetes que necesites %s nun pueden instalase:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Hebo un fallu:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Hebo un fallu grave: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Fallaron %d tresaiciones d'instalación" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Falló la instalación de paquetes:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Estación de trabayu" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Estación de trabayu d'Oficina" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -498,32 +498,32 @@ msgstr "" "Programes d'Oficina: procesadores de testu (LibreOffice Writer, Kword), " "fueyes de cálculu (LibreOffice Calc, Kspread), visualizadores PDF, etc" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Estación de Xuegos" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Programes d'entretenimientu: arcade, tableros, estratexía, etc" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Estación Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programes de reproducción/edición de soníu y vidéu" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Estación d'Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -532,193 +532,193 @@ msgstr "" "Conxuntu de ferramientes pa lleer y unviar corréu y noticies (mutt, tin...) " "y pa restolar pola Web" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Ordenador de Rede (veceru)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Veceros pa los distintos protocolos incluyendo a SSH" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Ferramientes pa facilitar la configuración del to ordenador" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Ferramientes pa la consola" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Editores, shells, manipulación de ficheros, terminales" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desendolcu" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Biblioteques de desendolcu C y C++, programes y ficheros *.h" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentación" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Llibros y aides sobro Linux y Software Llibre" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Sofitu d'aplicaciones de terceros" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Sirvidor web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grupos de trabayu" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Sirvidor Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Tornafuegos/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Pasarela d'accesu a Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Corréu/Noticies" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Sirvidor de corréu Postfix, sirvidor de noticies Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Sirvidor de direutorios" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Sirvidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Sirvidor de nomes de dominiu y sirvidor d'información de rede" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Sirvidor de ficheros ya impresión" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Sirvidor NFS, sirvidor Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Base de Datos" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Sirvidor de base de datos PostgreSQL y MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache y Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Corréu" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Sirvidor de corréu Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Sirvidor de base de datos PostgreSQL o MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Sirvidor de rede" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Sirvidor NFS, sirvidor SMB, sirvidor proxy, sirvidor SSH" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Entornu gráficu" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Estación de trabayu KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -727,12 +727,12 @@ msgstr "" "L'entornu d'Escritoriu K, l'entornu gráficu básicu con una coleición de " "ferramientes que lu acompañen" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Estación de trabayu GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -741,12 +741,41 @@ msgstr "" "Entornu gráficu con un conxuntu de ferramientes d'escritoriu y aplicaciones " "amigables" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Estación de trabayu KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Entornu gráficu con un conxuntu de ferramientes d'escritoriu y aplicaciones " +"amigables" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Estación de trabayu GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estación de trabayu" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Entornu gráficu" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Escritoriu LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -755,52 +784,74 @@ msgstr "" "Un entornu gráficu llixeru y rápidu con un conxuntu de ferramientes " "d'escritoriu y aplicaciones amigables" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Escritoriu personalizáu" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un entornu gráficu llixeru y rápidu con un conxuntu de ferramientes " +"d'escritoriu y aplicaciones amigables" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Otros entornos gráficos" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilidaes" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Sirvidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Sirvidor de configuración remota Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilidaes/Supervisión de rede" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Ferramientes de supervisión, control de procesos, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Asistentes de Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Asistentes pa configurar el sirvidor" @@ -814,7 +865,7 @@ msgstr "" "Hebo un fallu y nun puede resolvese de mou adecuáu.\n" "Sigui baxo'l to propiu riesgu." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -868,107 +919,107 @@ msgstr "Seleición de preseos" msgid "Install %s KDE Desktop" msgstr "Instalar l'escritoriu KDE de %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalar l'escritoriu GNOME de %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalación personalizada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Escritoriu KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Escritoriu GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Escritoriu personalizáu" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Equí tienes una previsualización del escritoriu '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Calca nes semeyes p'agrandales" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Seleición de grupos de paquetes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Seleición de paquetes individuales" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tamañu total: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versión: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamañu: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importancia: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Nun puede seleicionase/deseleicionase esti paquete" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "debíu a que falta %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "debíu a que nun se satisfizo %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "intentando promover a %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "pa caltener %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -976,104 +1027,104 @@ msgid "" msgstr "" "Nun pudo seleicionase esti paquete porque nun hai espaciu abondo pa instalalu" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Van instalase los paquetes siguientes" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Van desaniciase los paquetes siguientes" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Esti ye un paquete obligatoriu, nun puedes desmarcalu" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Nun puedes desmarcar esti paquete. Yá ta instaláu" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Nun puedes desmarcar esti paquete. Tien d'anovase" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Amosar los paquetes esbillaos automáticamente" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalar" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Cargar/Guardar seleición" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Anovando la seleición de paquetes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalación mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Alministración de software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Escueyi los paquetes que quies instalar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalando" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ensin detalles" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tiempu restante:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(estimando...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paquete" msgstr[1] "%d paquetes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resume" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurar" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "non configuráu" @@ -1087,7 +1138,7 @@ msgstr "" "Alcontrarónse los siguientes preseos d'instalación.\n" "Si quies saltate dalgún d'ellos, puedes deseleicionalos agora." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1100,7 +1151,7 @@ msgstr "" "La mesma siguirá dende'l discu duru y los paquetes tarán disponibles una " "vegada que'l sistema tea instaláu ensembre." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiar los CD por completu" @@ -1411,28 +1462,28 @@ msgstr "" "¿Quies instalar los anovamientos?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s en %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Tarxeta de soníu" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "¿Tienes una tarxeta de soníu ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1441,75 +1492,75 @@ msgstr "" "Usa \"alsaconf\" o \"sndconfig\" dempués de la instalación pa configurar la " "to tarxeta de soníu" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Nun se deteutó tarxeta de soníu. Preba \"harddrake\" dempués de la " "instalación" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interface gráfica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Redes ya Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configuráu" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel de seguridá" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Tornafueos" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activáu" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "desactiváu" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "X Ensin configurar ¿De xuru que quies esto daveres?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Tresnando'l cargador d'arranque" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Tresnando la instalación" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Aposenta por favor, pues esto puede llevar un ratu." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1522,7 +1573,7 @@ msgstr "" "necesitará usar BootX o dalguna otra manera p'arrancar la to máquina. El " "parámetru del kernel pal sistema de ficheros raíz ye: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1531,17 +1582,17 @@ msgstr "" "Nesti nivel de seguridá, l'accesu a los ficheros na partición Windows ta " "restrinxíu sólo al alministrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Inxerta un disquete en blancu na unidá %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Criando'l disquete d'instalación automática" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1552,12 +1603,12 @@ msgstr "" "\n" "¿De xuru quies colar agora?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Felicidaes" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reaniciar" diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po index 6e752e7c0..ecb597003 100644 --- a/perl-install/install/share/po/az.po +++ b/perl-install/install/share/po/az.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-az\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-03-31 14:21+0200\n" "Last-Translator: Mətin Əmirov \n" "Language-Team: Azerbaijani \n" @@ -77,7 +77,7 @@ msgid "Do you have further supplementary media?" msgstr "Başqası var?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -86,177 +86,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Şəbəkə %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Şəbəkə %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Mövcud əkslərin siyahısını almaq üçün %s səhifəsi ilə təmas qurulur..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Mövcud əkslərin siyahısını almaq üçün %s səhifəsi ilə təmas qurulur..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Paketleri almaq üçün bir əks ünvanı seçin" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Qovluq" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "%s, %s üstündə tapıla bilmir" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Qurulu olan paketlər yoxlanır..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Güncəllənəcək paketlar tapılır" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -269,72 +269,72 @@ msgstr "" "\n" "Bu paketləri həqiqətən də silmək istəyirsiniz?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s faylı oxunurkan xəta oldu" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Aşağıdakı paketlər qurulmalıdır:\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Şəbəkə" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Xahiş edirik seçin" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Səlahiyyət yoxdur" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "%s medyası əlavə edildi" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Bölmələmədən əvvəl görüntü alına bilməz" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır" @@ -344,7 +344,7 @@ msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır" msgid "Installation" msgstr "Qurulur" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Quraşdırma" @@ -441,42 +441,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Bir xəta oldu" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ölümcül xəta yarandı: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Qurulum bacarılmadı" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s paketi qurulur" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "İş Stansiyası" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Ofis İş Stansiyası" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -485,32 +485,32 @@ msgstr "" "İdarə proqramları: kəlmə işləyənlər (LibreOffice Writer, Kword), " "hesablayıcılar və pdf göstəriciləri, vs." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Oyun stansiyası" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimedya stansiyası" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Səs və video çalınması/düzəliş proqramları" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "İnternet stansiyası" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -519,205 +519,205 @@ msgstr "" "Elektronik məktub və xəbər oxuyucu vasitələr dəstəsi (pine, mutt, tin..) və " "Veb səyyahları" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Şəbəkə Kompüteri (alıcı)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "SSH daxil bir çox protokolların alıcıları" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Kompüter qurğularını asandlaşdıran vasitələr" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konsol Vasitələri" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Editorlar, rəflər, fayl vasitələri, terminallar" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "İnkişaf" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Sənədlər" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Veb Vericisi" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Qrup" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab Vericisi" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Atəş Divarı/İstiqamətləndirici" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "İnternet keçidi" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Fayl/_Təze" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix poçt vericisi" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "CD'dən Geri Yüklə" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "NTP Verici" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Domen Adı Vericisi" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Çapçı Vericisi" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "Samba vericisi" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Mə'lumat Bazası" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL ya da MariaDB mə'lumat bazası vericisi" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Veb/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Poçt" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix poçt vericisi" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ya da MariaDB mə'lumat bazası vericisi" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Şəbəkə Kompüter vericisi" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Qrafiki Mühit" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE iş stansiyası" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME iş stansiyası" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -725,12 +725,40 @@ msgid "" msgstr "" "İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE iş stansiyası" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME iş stansiyası" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "İş Stansiyası" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Qrafiki Mühit" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Masa üstü" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -738,52 +766,73 @@ msgid "" msgstr "" "İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Masa üstü" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Başqa qrafiki ara üzlər" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Vasitələr" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Vericisi" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Veb kamerası" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Terminal Server Quraşdırılması" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Şəbəkə İzlənməsi" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Store" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "\"%s\" çapçısı quraşdırıla bilmədi!" @@ -797,7 +846,7 @@ msgstr "" "Bir xəta oldu, yalnız necə düzəldiləcəyi bilinmir.\n" "Davam edin, riski sizə aitdir!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -853,210 +902,210 @@ msgstr "Paket Qruplarının Seçimi" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimal qurulum" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Masa üstü" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Masa üstü" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Masa üstü" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Paket Qruplarının Seçimi" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Fərdi paket seçimi" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Seçili olmayan hamısını" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Ümumi böyüklük: %d / %d Mb" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Buraxılış: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Böyüklük: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Əhəmiyyət:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Bu paketi seçə bilməzsiniz/sistemdən çıxarda bilməzsınız" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s əksik olduğuna görə" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s razı qalmadığına görə" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s irəliləndirməyə çalışılır" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s-i saxlamaq üçün" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Bu paketi seçə bilməzsiniz, çünki qurmaq üçün yer çatmır." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Aşağıdakı paketlər qurulacaq" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Aşağıdakı paketlər sistemdən silinəcəklər" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Bu lazımlı bir paketdir, sistemdən çıxardıla bilməz" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Bu paketi sistemdən çıxarda bilməzsınız. Artıq qurulmuşdur." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Bu paketi sistemdən çıxarda bilməzsiniz. Yenilənməlidir" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Avtomatik seçili paketləri göstər" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Qur" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Seçili olanı qeyd et" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Paket seçkiləri yenilənir" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal qurulum" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Proqram Tə'minatı İdarəsi" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Qurmaq istədiyiniz paketləri seçin" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Qurulur" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Təfsilatsız" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Qalan müddət" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Təxmini olaraq hesaplanır" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paket" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "İcmal" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Qur" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "quraşdırılmayıb" @@ -1068,7 +1117,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1077,7 +1126,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1378,28 +1427,28 @@ msgstr "" "Yeniləmələri qurmaq istəyirsiniz ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%2$s üstündə %1$s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Avadanlıq" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Səs kartı" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Heç İSA səs kartınız var?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1407,73 +1456,73 @@ msgid "" msgstr "" "Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Səs kartı tapılmadı. Qurulumdan sonra \"harddrake\"ni işə salın" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Qrafiki ara üz" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Şəbəkə və İnternet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Vəkil vericiləri" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "quraşdırılıb" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Təhlükəsizlik Səviyyəsi" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Atəş Divarı" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "fəal" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "qeyri-fəal" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Siz X-i quraşdırmadınız. Bundan əminsinizmi?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Açılış yükləyici hazırlanır" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Qurulum hazırlanır" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1486,24 +1535,24 @@ msgstr "" "Qurulum davam edəcək ancaq kompüterinizi aça bilmək üçün\n" " BootX ya da başqa vasitədən istifadə etməlisiniz" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "%s sürücüsünə boş bir disket yerləşdirin" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Avtomatik qurulum disketi hazırlanır" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1514,12 +1563,12 @@ msgstr "" "\n" "Həqiqətən də çıxmaq istəyirsiniz?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Təbriklər" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Yenidən başlat" diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po index a8526b727..1a91a7595 100644 --- a/perl-install/install/share/po/be.po +++ b/perl-install/install/share/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2000-09-24 12:30 +0100\n" "Last-Translator: Alexander Bokovoy \n" "Language-Team: be\n" @@ -71,7 +71,7 @@ msgid "Do you have further supplementary media?" msgstr "Ці ёсць у вас іншы?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -80,177 +80,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Сетка" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Сетка" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў" -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Выбар люстра для атрымання пакетаў" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Каталёг" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Не знойздены праграмы\n" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, fuzzy, c-format msgid "Looking at packages already installed..." msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Пошук пакетаў для абнаўлення" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -259,72 +259,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Памылка чытання файлу %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Наступныя пакеты будуць даданы да сістэмы" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "ФС" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Сетка" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Калі ласка выбярыце відарыс відэа" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Файл ужо йснуе. Перапісаць?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Адмоўлена ў доступе" -#: any.pm:1290 +#: any.pm:1320 #, fuzzy, c-format msgid "Bad NFS name" msgstr "Бяз назвы" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "Загружаецца файл %s" -#: any.pm:1355 +#: any.pm:1385 #, fuzzy, c-format msgid "Cannot make screenshots before partitioning" msgstr "Дадаць раздзел немагчыма" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -334,7 +334,7 @@ msgstr "" msgid "Installation" msgstr "Усталёўваем" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Канфігурацыя" @@ -430,44 +430,44 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Адбылася памылка" -#: pkgs.pm:401 +#: pkgs.pm:402 #, fuzzy, c-format msgid "A fatal error occurred: %s." msgstr "" "ПАМЫЛАЧКА АТРЫМАЛАСЯ: \n" "%s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Усталяванне SILO" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Усталяванне пакету %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "Канфігурацыя" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, fuzzy, c-format msgid "Office Workstation" msgstr "Працоўныя мейсцы" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -476,225 +476,225 @@ msgstr "" "Офісныя праграмы: працэсары словаў (LibreOffice Writer, Kword), электроныя " "табліцы, аглядальнікі pdf-файлаў, і г.д." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, fuzzy, c-format msgid "Game station" msgstr "Аўтэнтыфікацыя" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Мульцімедыя" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Рэдактары і прайгравальнікі гуку і відэа" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "Інтэрнэт" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Сеткавы прынтэр (TCP/Socket)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, fuzzy, c-format msgid "Tools to ease the configuration of your computer" msgstr "Ці жадаеце пратэсціраваць настройкі?" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Кансольныя інструментальныя сродкі" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Рэдактары, абалонкі, тэрміналы" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Распрацоўка" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Дакумэнтацыя" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "нігі і Howto па Linux і Free Software" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, fuzzy, c-format msgid "Web Server" msgstr "Сервак" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, fuzzy, c-format msgid "Apache" msgstr "Шлях:" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Групы" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, fuzzy, c-format msgid "Kolab Server" msgstr "NIS сэервер:" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, fuzzy, c-format msgid "Firewall/Router" msgstr "Рэстарт" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, fuzzy, c-format msgid "Internet gateway" msgstr "Інтэрнэт" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Файл/_Стварыць" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Каталог %s Так" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "NIS сэервер:" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Імя дамену" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Сервер друку" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "X сэервер" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "База даньняў" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Пошта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Сеткавыя інтэрфэйсы" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, fuzzy, c-format msgid "Graphical Environment" msgstr "Абалонка" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, fuzzy, c-format msgid "KDE Workstation" msgstr "Канфігурацыя" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -703,12 +703,12 @@ msgstr "" "The K Desktop Environment - асноўнае графічнае асяродзе з калекцыяй " "інструментальных сродкаў" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, fuzzy, c-format msgid "GNOME Workstation" msgstr "Інфармацыя аб памяці" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -717,12 +717,41 @@ msgstr "" "Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і " "інструментальных сродкаў" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Канфігурацыя" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і " +"інструментальных сродкаў" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Інфармацыя аб памяці" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Канфігурацыя" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Абалонка" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Працоўны стол" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -731,52 +760,74 @@ msgstr "" "Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і " "інструментальных сродкаў" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Працоўны стол" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і " +"інструментальных сродкаў" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Іншыя графічныя Працоўныя сталы" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Карыснасьці" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "NIS сэервер:" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Прылады" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Сістэмнае адміністраваньне" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Канфігурацыя сеткі" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Цэнтар кіраваньня" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Немагчыма выдаліць \"%s\": %s." @@ -790,7 +841,7 @@ msgstr "" "Узнікла памылка, якую не атрымліваецца карэктна апрацаваць,\n" "таму працягвайце на сваю рызыку." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -845,107 +896,107 @@ msgstr "Выбар групы пакетаў" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Ахоўнік экрану" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Працоўны стол" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Працоўны стол" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Працоўны стол" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Выбар групы пакетаў" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Асабісты выбар пакетаў" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, fuzzy, c-format msgid "Unselect All" msgstr "Дадаць выбраныя файлы" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Агульны памер: %d / %d Мб" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Вэрсія: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Памер: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, fuzzy, c-format msgid "Importance: " msgstr "важна" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Вы не можаце вылучаць і адмяняць вылучэнне гэтага пакету" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, fuzzy, c-format msgid "in order to keep %s" msgstr "Уласьцівасьці акна" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -953,104 +1004,104 @@ msgid "" msgstr "" "Вы не можаце выбраць гэты пакет, таму як не хапае месца для яго ўсталявання" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Наступныя пакеты будуць даданы да сістэмы" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Наступныя пакеты будуць выдалены" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Гэта абавязковы пакет, яго вылучэнне нельга адмяніць" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Яго патрэбна абнавіць" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Усталёўка" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Перанесьці вылучэньне" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, fuzzy, c-format msgid "Updating package selection" msgstr "Асабісты выбар пакетаў" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, fuzzy, c-format msgid "Minimal install" msgstr "Ахоўнік экрану" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, fuzzy, c-format msgid "Software Management" msgstr "Мэнэджэр сэрвісаў" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Выбар пакетаў для ўсталявання" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Усталёўваем" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Падрабязнасці" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Засталося часу " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Чакаецца" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d пакетаў" msgstr[1] "%d пакетаў" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Агульныя зьвесткі" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Настройка" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "Настроіць панэль" @@ -1062,7 +1113,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1071,7 +1122,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1355,101 +1406,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Абсталяваньне" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, fuzzy, c-format msgid "Sound card" msgstr "Праграма гуказапісу" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, fuzzy, c-format msgid "Do you have an ISA sound card?" msgstr "Ці ёсць у вас іншы?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, fuzzy, c-format msgid "Graphical interface" msgstr "Запуск X пры старце сістэмы" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, fuzzy, c-format msgid "Network & Internet" msgstr "Сеткавы інтэрфейс" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Проксі" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "Настроіць панэль" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Узровень бясьпекі" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "выключаны" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, fuzzy, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Меню не было захавана. Ці сапраўды вы жадаеце выйсці?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Падрыхтоўка загрузчыка" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Падрыхтоўка ўсталяваньня" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1458,24 +1509,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Устаўце дыскету ў дыскавод %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Стварэнне дыскеты для ўсталявання" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1485,12 +1536,12 @@ msgstr "" "Некаторыя крокі не завершаны.\n" "Вы сапраўды жадаеце выйсці зараз?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, fuzzy, c-format msgid "Congratulations" msgstr "Прыміце віншаванні!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Перазагрузка" diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po index 122364ba9..321067a5c 100644 --- a/perl-install/install/share/po/bg.po +++ b/perl-install/install/share/po/bg.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-03-20 23:42+0200\n" "Last-Translator: Kolio Kolev \n" "Language-Team: Bulgarian \n" "Language-Team: Bangla \n" @@ -76,7 +76,7 @@ msgid "Do you have further supplementary media?" msgstr "আপনার কি আরও একটি সম্পুরক মাধ্যম আছে?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,177 +89,177 @@ msgstr "" "\n" "আপনার কি কনফিগার করার জন্য কোনো সম্পুরক ইনস্টলেশন মিডিয়াম আছে?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "সিডি-রম" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "নেটওয়ার্ক (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "নেটওয়ার্ক (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "নেটওয়ার্ক (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "mirror এর ইউ-আর-এল?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "ইউআরএল অবশ্যই ftp:// অথবা http:// দিয়ে শুরু হবে" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "উপস্থিত মিররের তালিকার জন্য %s-এ সংযুক্ত করা হচ্ছে..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "উপস্থিত মিররের তালিকার জন্য %s-এ যোগাযোগ করতে ব্যর্থ হয়েছে..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "আপনি একটি মিরর পছন্দ করুন যেখান থেকে প্যাকেজগুলি নেবেন" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS সেটআপ" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "অনুগ্রহ করে আপনার NFS মিডিয়ার হোস্টনাম এবং ডিরেক্টরী প্রবেশ করান" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "হোস্টনাম পাওয়া যাচ্ছে না" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "ডিরেক্টরী অবশ্যই \"/\" দিয়ে শুরু হবে" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS মাউন্টের জন্য হোস্টনাম ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ডিরেক্টরি" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "সম্পুরক" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "এই mirror এ কোন hdlist ফাইল পাওয়া যাচ্ছে না" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\" মাধ্যমের সব প্যাকেজ এড়িয়ে যাও" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "যে সমস্থ প্যাকেজ ইনস্টল হয়ে আছে সেগুলি পর্যবেক্ষন করা হচ্ছে..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "আপগ্রেড করার জন্য প্যাকেজ খোঁজা হচ্ছে..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "আপগ্রেডের পূর্বে প্যাকেজ মুছে ফেলা হচ্ছে..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -272,72 +272,72 @@ msgstr "" "\n" "আপনি কি আসলেই এই প্যাকেজগুলো মুছে ফেলতে চান?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s ফাইল পড়াতে ত্রুটি" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "নিম্নলিখিত ডিস্কগুলো নামান্তর করা হয়েছে:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (পূর্বের নাম %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "এইচ-টি-টি-পি" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "এফ-টি-পি" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "নেটওয়ার্ক" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "অনুগ্রহ করে একটি মিডিয়া নির্বাচন করুন" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "এই ফাইলটি আগে থেকেই আছে। করব?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "অনুমতি প্রদান করা হয়নি" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "ত্রুটিপূর্ণ NFS নাম" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "অগ্রহণযোগ্য মিডিয়া %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "পার্টিশন করার আগে স্ক্রিনশট তৈরী করা যায়নি" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "%s -এ ইনস্টল করার পরে স্ক্রিনশট পাওয়া যাবে" @@ -347,7 +347,7 @@ msgstr "%s -এ ইনস্টল করার পরে স্ক্রিন msgid "Installation" msgstr " ইনস্টলেশন" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "কনফিগারেশন" @@ -443,42 +443,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "একটি ত্রুটি সম্পাদিত হয়েছে" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "একটি মারাত্মক ত্রুটি ঘটেছে: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "ইনস্টলেশন বিফল হয়েছে" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "ওয়ার্কষ্টেশন" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "অফিস ওয়ার্কষ্টেশন" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -487,32 +487,32 @@ msgstr "" "অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (LibreOffice Writer, Kword), স্প্রেডসিট " "(LibreOffice Calc, Kspread), PDF ফাইল প্রদর্শক ইত্যাদী" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "গেশ ষ্টেশন" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "উদ্দীপনামূলক প্রোগ্রামসমূহ: আর্কেড, বোর্ড, স্ট্রেটেজি, ইত্যাদি" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "মাল্টিমিডিয়া ষ্টেশন" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "সাউন্ড এবং ভিডিও দেখার/এডিট করার প্রোগ্রামসমূহ" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "ইন্টারনেট ষ্টেশন" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -520,205 +520,205 @@ msgid "" msgstr "" "মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং (mutt, tin..) এর জন্য কিছু টুলের সেট" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "SSH সহ বিভিন্ন প্রোটকলের জন্য ক্লাইন্টসমূহ" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "আপনার কম্পিউটারের কনফিগারেশন সহজ করার জন্য কিছু টুল" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "কনসল টুল" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "এডিটর, শেল, ফাইল টুল, টার্মিনাল সমূহ" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "ডেভলপমেন্ট" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C এবং C++ ডেভলপমেন্টের লাইব্রেরী, প্রগ্রাম এবং include ফাইলসমূহ" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "ডকুমেন্টেশন" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "লিনাক্সের সাধারণ আধার। তৃতীয়পক্ষ এপ্লিকেশন সমূহের সাপোর্ট" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "ওয়েব সার্ভার" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "এ্যপাচি" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "গ্রুপওয়্যার" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "কোলাব সার্ভার" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "ফায়ারওয়াল/রাউটার" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "ইন্টারনেট গেটওয়ে" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "মেইল/সংবাদ" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix মেইল সার্ভার, Inn সংবাদ সার্ভার" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "ডিরেক্টরি সার্ভার" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP সার্ভার" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "ডিএনএস/এনআইএস" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "ডোমেইন নেম এবং নেটওয়ার্ক ইনফরমেশন সার্ভার" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "ফাইল এবং প্রিন্টার শেয়ারিং সার্ভার" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS সার্ভার, Samba সার্ভার" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "ডেটাবেস" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার্ভার" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "ওয়েব/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "এ্যপাচি, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "মেইল" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix মেইল সার্ভার" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার্ভার" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS সার্ভার, SMB সার্ভার, Proxy সার্ভার, ssh সার্ভার" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "গ্রাফিকাল পরিবেশ" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE ওয়ার্কষ্টেশন" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "K ডেক্সটপ, কিছু সহযোগীমূলক টুলের সমন্বয়ে একটি সাধারণ গ্রাফিকাল পরিবেশ" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "গুহনোম ওয়ার্কষ্টেশন" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -726,12 +726,40 @@ msgid "" msgstr "" "ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE ওয়ার্কষ্টেশন" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "গুহনোম ওয়ার্কষ্টেশন" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "ওয়ার্কষ্টেশন" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "গ্রাফিকাল পরিবেশ" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm ডেস্কটপ" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -739,52 +767,73 @@ msgid "" msgstr "" "ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm ডেস্কটপ" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, ইত্যাদি" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "ইউটিলিটিসমূহ" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH সার্ভিস" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "ওয়েবমিন" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "ওয়েবমিন দূরবর্তী কনফিগারেশন সার্ভার" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "নেটওয়ার্ক ইউটিলিটিসমূহ/পর্যবেক্ষণ" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবরক্ষণ প্রসেস করে, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia উইজার্ডসমূহ" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "সার্ভার কনফিগার করার জন্য উইজার্ডসমূহ" @@ -799,7 +848,7 @@ msgstr "" "কিভাবে এটা সন্দরভাবে হ্যান্ডল করবো।\n" "আপনি নিজের ঝুঁকিতে অগ্রসর হতে পারেন।" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -855,107 +904,107 @@ msgstr "প্যাকেজ গ্রুপ নির্বাচন" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "সর্বনিম্ন ইনস্টল" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm ডেস্কটপ" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm ডেস্কটপ" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm ডেস্কটপ" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "প্যাকেজ গ্রুপ নির্বাচন" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "আলাদাভাবে প্যাকেজ নির্বাচন" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "সব কিছু অনির্বাচিতকরণ" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "মোট সাইজ: %d / %d এমবি" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "ভার্সন:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "সাইজ:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "প্রাধান্য:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "আপনি এই প্যাকেজটি নির্বাচন/অ-নির্বাচন করতে পারবেন না" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s না থাকার কারনে" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s যথেষ্ট না হবার কারনে" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s প্রচারের চেষ্টা চলছে" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s রাখার কারণে" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -964,105 +1013,105 @@ msgstr "" "আপনি এই প্যাকেজটি নির্বাচন করতে পারবেননা যেহেতু এটা ইনস্টল করার জন্য যথেষ্ট জায়গা " "ফাঁকা নেই" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "এই প্যাকেজগুলি ইনস্টল হতে যাচ্ছে" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "এই প্যাকেজগুলি অপসরিত হতে যাচ্ছে" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "এটি একটি বাধ্যতামূলাক প্যাকেজ, এটি কোনভাবেই বাদ দেয়া যাবেনা" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" "আপনি এই প্যাকেজটির অ-নির্বাচন করতে পারবেন না, এটা আগে থেকেই ইনস্টল হয়ে আছে" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "আপনি এই প্যাকেজটি অ-নির্বাচন করতে পারবেন না। এটা অবশ্যই আপগ্রেড হতে হবে" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "সংয়-নির্বাচিত প্যাকেজগুলি দেখাও" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "ইনস্টল" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "নির্বাচনসমূহ লোড/সংরক্ষণ করো" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "প্যাকেজের নির্বাচন আপগ্রেড করা হচ্ছে" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "সর্বনিম্ন ইনস্টল" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "সফটওয়্যার ম্যানেজমেন্ট" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "আপনি যেই প্যাকেজগুলি ইনস্টল করতে চান তা পছন্দ করুন" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "ইনস্টলেশন" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "কোন বিস্তারিত ছাড়া" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "সময় বাকী আছে" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "নির্ধারণ চলছে" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d প্যাকেজ সমূহ" msgstr[1] "%d প্যাকেজ সমূহ" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "সারাংশ" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "কনফিগার" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "কনফিগার করা হয়নি" @@ -1076,7 +1125,7 @@ msgstr "" "নিম্নলিখিত ইনস্টলেশন মিডিয়া পাওয়া গেছে।\n" "যদি আপনি এগুলোর মধ্যকার কিছু এড়িয়ে যেতে চান, তাহলে এখন সেগুলোকে অনির্বাচিত করুন।" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1088,7 +1137,7 @@ msgstr "" " এরপর হার্ডডিস্ক থেকে ইনস্টলেশন চলতে থাকবে এবং সিস্টেম সম্পূর্ন ইনস্টলেশনের পরও " "প্যাকেজগুলো রয়ে যাবে।" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "CD গুলো সম্পুর্ন কপি করো " @@ -1388,28 +1437,28 @@ msgstr "" "আপনি কি ইনস্টল আপডেট করতে চান?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s -এ %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "হার্ডওয়্যার" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "সাউন্ডকার্ড" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "আপনার কি একটি ISA সাউন্ড কার্ড আছে?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1418,73 +1467,73 @@ msgstr "" "ইনস্টল শেষ হবার পরে সাউন্ড কার্ড কনফিগার করার জন্য \"alsaconf\" অথবা \"sndconfig" "\" চালাও" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "কোন সাউন্ডকার্ড সনাক্ত হয়নি, ইনস্টলের পরে \"harddrake\" দিয়ে চেষ্টা করুন" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "গ্রাফিকাল ইন্টারফেস" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "নেটওয়ার্ট এবং ইন্টারনেট" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "প্রক্সিসমূহ" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "কনফিগার করা হয়েছে" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "সিকউরিটি লেভেল" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "ফায়ারওয়াল" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "সক্রিয় হয়েছে" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "অকার্যকর করা হয়েছে" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "আপনি X কনফিগার করেননি। আপনি কি নিশ্চিত এরকমটি চান?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Bootloader প্রস্তুত করা হচ্ছে..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "ইনস্টলেশনের প্রস্তুতি চলছে" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1497,7 +1546,7 @@ msgstr "" "BootX বা অন্য কোন কিছু ব্যবহার করতে হবে। root fs এর জন্য কার্নেল প্রেরিত মান হবে: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1505,17 +1554,17 @@ msgid "" msgstr "" "এই নিরাপত্তা লেভেলে, উইন্ডোজ পার্টিশনের ফাইলে প্রবেশ শুধুমাত্র অ্যাডমিনিস্ট্রেটরের আছে।" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "%s ড্রাইভে একটি ফাঁকা ফ্লপি ঢোকান" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "সয়ং ইনস্টল ফ্লপি তৈরী করা হচ্ছে..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1526,12 +1575,12 @@ msgstr "" "\n" "আপনি কি এখন বের হতে চান?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "স্বাগতম" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "রিবুট" diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po index 365e2d260..2b80f490d 100644 --- a/perl-install/install/share/po/br.po +++ b/perl-install/install/share/po/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 10.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-03 10:54+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "Hag ur media all hoc'h eus ?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,88 +82,88 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rouedad (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rouedad (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rouedad (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL ar melezour ?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Dao en deus an URL kregiñ gant ftp:// pe http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "O taremprediñ lec'hienn %s evit kaout roll ar melezourioù hegerz ..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Sac'het en ur zaremprediñ lec'hienn %s evit kaout roll ar melezourioù hegerz " -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Dibabit ur melezour da dapout ar pakadoù diwarnañ" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Kefluniadur NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Roit anv ostiz ha renkell ho media NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Mank ar ra anv an ostiz" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Anv ostiz ar marc'hañ NFS ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Renkell" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "A-gresk" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -172,90 +172,90 @@ msgstr "" "N’em eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ. Kit da wiriañ " "al lec'hiadur-mañ zo mad." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Tremen e-biou pep pakad eus ar vediom « %s »" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "O klask ar pakadoù staliet ..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "O klask ar pakadoù da vremanaat ..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "O tilemel ar pakadoù a-raok bremanaat ..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -269,72 +269,72 @@ msgstr "" "\n" "Ha fellout a ra deoc'h da vat lemel anezho ?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fazi en ur lenn ar restr %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Adenvelet e oa ar bladenn/pladennoù-mañ :" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (a vez graet %s dioutañ diaraok)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rouedad" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Dibabit ur media, mar plij" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Ar restr zo endeo. Rasklañ anezhañ ?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Aotre nac'het" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "N'eo ket un anv NFS mat" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "N'eo ket mat ar media %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s" @@ -344,7 +344,7 @@ msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s" msgid "Installation" msgstr "O staliañ" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Kefluniadur" @@ -440,42 +440,42 @@ msgstr "" "N’em eus ket gallet staliañ un darn pakad goulennet gant %s :\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Ur fazi zo bet :" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Degouezhet ez eus ur fazi sac'hus : %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Na c'houlenn ket adarre" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d gra zo bet sac'het" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Sac'het eo bet staliañ ar pakadoù :" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Post labour" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Post labour burevek" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -484,301 +484,348 @@ msgstr "" "Programmoù burev : skridtreterezhioù (LibreOffice Writer, Kword), logerioù " "(LibreOffice Calc, Kspread), gwelerien PDF, ..." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Arsav c'hoarioù" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Arsav liesvedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programmoù evit seniñ/aozañ tonioù ha videoù" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Arsav internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Urzhiataer rouedad (kliant)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Pratikoù evit meur a gomenad (da skouer ssh)" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Ostilhoù evit kefluniañ hoc'h urzhiataer dre aes" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Ostilhoù letrin" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Aozerien, shelloù, ostilhoù restr, termenelloù" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Diorren" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Teuliadur" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servijer Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Strollant" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Servijer Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Moger tan/Henter" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Dreuzell an Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Posteloù/keleier" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Servijer posteloù Postfix, servijer keleier Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Levr-bloaz" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servijer FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Servijer DNS ha NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Servijer rannañ restroù ha moullerez" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Servijer NFS, servijer Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Stlennvon" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Servijer stlennvon PostgreSQL ha MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servijer postel Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Servijer stlennvon PostgreSQL pe MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Servijer rouedad" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Servijer NFS, servijer SMB, servijer proksi, servijer SSH" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Endeo grafikel" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Post burevek KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "An Endro Burev K gant hec’h ostilhoù" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Post burevek GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Post burevek KDE" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Post burevek GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Post labour" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Endeo grafikel" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Burev LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Burev diouzhoc'h" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Burevioù c'hrafek all" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Mavegoù" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servijer SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servijer Webmin ar gefluniadur a-bell" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Ostilhoù ar rouedad/diwall" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Skoazellerien Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Skoazellerien evit kefluniañ ar servijer" @@ -792,7 +839,7 @@ msgstr "" "Degouezhet ez eus ur fazi, hogen n'ouzon ket e verañ naet.\n" "Kendalc'hit war ho mar." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -839,107 +886,107 @@ msgstr "Diuzadenn ar media" msgid "Install %s KDE Desktop" msgstr "Staliañ burev KDE %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Staliañ burev GNOME %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Staliadur diouzhoc'h" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Burev KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Burev GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Burev diouzhoc'h" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Setu ur rakwel eus burev « %s »." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Diuzadenn strollad pakadoù" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Diuz pakadoù unan hag unan" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Andiuz an holl re" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Ment hollek : %d / %d Mo" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Stumm : " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Ment : " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Ko\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Talvoudegezh : " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "N'hellit ket diuz/andiuz ar pakad-mañ" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "peogwir e vank %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "peogwir e vank %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "evit mirout %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -948,103 +995,103 @@ msgstr "" "N'hellit ket dibab ar pakad-mañ peogwir n'eus ket a-walc'h a egor evit " "staliañ anezhañ" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ar pakadoù a-heul zo war-nes bezañ staliet" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Ar pakadoù a-heul zo war-nes bezañ lamet" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Hemañ zo ur pakad ret, n'hell ket bezañ andiuzet" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "N'hellit ket andiuz ar pakad-mañ. Staliet eo endeo" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "N'hellit ket andiuz ar pakad-mañ. Ret eo dezhañ bezañ bremanaet" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Diskouez ar pakadoù a zo dibabet emgefreek" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Staliañ" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Kargañ/Enrollañ an dibab" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "O bremanaat diuzadenn ar pakadoù" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Staliadur bihan" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Merañ ar pakadoù" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Dibabit ar pakadoù a vennit staliañ" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "O staliañ" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Munud ebet" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Amzer a chom :" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(o vrasjediñ ...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakad" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Diverradenn" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Kefluniañ" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "n'eo ket kefluniet" @@ -1056,7 +1103,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1065,7 +1112,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Eilañ tout ar CDoù" @@ -1359,28 +1406,28 @@ msgstr "" "Mennout a rit staliañ anezho ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s war %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Periantel" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Kartenn gwelet" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Hag ur gartenn gwelet ISA hoc'h eus ?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1389,74 +1436,74 @@ msgstr "" "Seveniñ « alsaconf » pe « sndconfig » goude staliañ evit kefluniañ ho " "kartenn klevet" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "N'eus kartenn gwelet kavet ebet. Kargañ « harddrake » goude ar staliadur" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Ketal kevregañ" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rouedad hag Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proksioù" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "kefluniet" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Live an surentez" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Moger tan" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "bevaatet" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "diweredekaet" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "N'eo ket kefluniet X. Ha fellout a ra deoc'h da vat ober an dra-mañ ?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "O prientiñ ar c'harger loc'hañ ..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "O prientiñ ar programm loc'hañ ..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Gortozit mar plij ; gellout a rafe bezañ hir ..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1465,24 +1512,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Lakait ur bladennig gwerc'h el lenner %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "O krouiñ ur bladennig staliañ emgefreek ..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1493,12 +1540,12 @@ msgstr "" "\n" "Mennout a rit kuitaat da vat bremañ ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Brav" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Adlañsañ" diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po index 89e822a85..07003955a 100644 --- a/perl-install/install/share/po/bs.po +++ b/perl-install/install/share/po/bs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: bs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2006-09-16 10:33+0200\n" "Last-Translator: Vedran Ljubovic \n" "Language-Team: Bosnian \n" @@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?" msgstr "Imate li neke dodatne medije?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -91,87 +91,87 @@ msgstr "" "\n" "Imate li još neke dodatne medije koje želite podesiti?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "sa CDROMa" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Mreža (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Mreža (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Mreža (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL mirrora?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL mora počinjati sa ftp:// ili http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontaktiram %s web stranicu da bih saznao listu dostupnih mirrora..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Nisam uspio kontaktirati %s web stranicu radi liste dostupnih mirrora" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Izaberite mirror sa kojeg će biti dobavljeni paketi" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Podešavanje NFS-a" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Molim unesite ime računara i direktorij vašeg NFS medija" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Ime računara sa NFS serverom?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktorij" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,90 +180,90 @@ msgstr "" "Ne mogu pronaći hdlist datoteku na ovom mirroru. Provjerite da li je " "lokacija ispravna." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Tražim već instalirane pakete..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Pronalazim pakete za unaprjeđenje..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Uklanjam pakete prije unaprjeđenja..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -277,72 +277,72 @@ msgstr "" "\n" "Želite li zaista deinstalirati ove pakete?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Greška u čitanju datoteke %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Sljedeći diskovi su preimenovani:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ranije pod imenom %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Mreža" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Molim izaberite medij" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Datoteka već postoji. Želite li pisati preko nje?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Nemate dozvolu" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Neispravan NFS naziv" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Neispravan medij %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ne mogu napraviti snimak ekrana prije particioniranja" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s" @@ -352,7 +352,7 @@ msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s" msgid "Installation" msgstr "Instalacija" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Podešavanje" @@ -449,42 +449,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Došlo je do greške" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Došlo je do fatalne greške: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Instalacija nije uspjela" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instaliram paket %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Radna stanica" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Uredska radna stanica" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -493,32 +493,32 @@ msgstr "" "Uredski programi: obrada teksta (LibreOffice Write, KWord), tablični " "proračun (LibreOffice Calc, KSpread), PDF preglednici itd." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Stanica za igru" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Zabavni programi: arkadne igre, stolne igre, strategije itd." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimedijalna stanica" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programi za pregled i editovanje zvuka i videa" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internet stanica" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -527,193 +527,193 @@ msgstr "" "Skup alata za čitanje i slanje pošte i news-a (mutt, tin...) i pregledanje " "Weba" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Mrežni računar (klijent)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Klijenti za razne protokole uključujući ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Alati za lakše podešavanje računara" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Alati za konzolu" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Editori, shellovi, alati za datoteke, terminali" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Programiranje" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C i C++ biblioteke, programi i include datoteke" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacija" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Podrška za programe trećih lica" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web server" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Mail/News" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix mail server, Inn news server" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Imenički server" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Serveri domenskih imena i mrežnih informacija" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Server za dijeljenje datoteka i štampača" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS server, Samba server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Baze podataka" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Server PostgreSQL ili MariaDB baze podataka" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix mail server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ili MariaDB baza podataka" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Mrežni server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, ssh server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafičko okruženje" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE radna stanica" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -721,12 +721,12 @@ msgid "" msgstr "" "K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME radna stanica" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -735,12 +735,41 @@ msgstr "" "Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu " "površinu" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE radna stanica" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu " +"površinu" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME radna stanica" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Radna stanica" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafičko okruženje" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm okruženje" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -749,52 +778,74 @@ msgstr "" "Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu " "površinu" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm okruženje" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu " +"površinu" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Ostale grafičke okoline" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm itd." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Alati" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin server za podešavanje sistema" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Mrežni alati i nadzor" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Alati za nadzor, praćenje procesa, tcpdump, nmap..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia čarobnjaci" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Čarobnjaci (wizardi) za podešavanje serverâ" @@ -808,7 +859,7 @@ msgstr "" "Došlo je do greške, ali ne znam kako da postupim u vezi toga.\n" "Nastavite na vlastiti rizik." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -862,194 +913,194 @@ msgstr "Izbor grupe paketa" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimalna instalacija" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm okruženje" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm okruženje" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm okruženje" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Izbor grupe paketa" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Izbor pojedinačnih paketa" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Ništa izabrano" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Ukupna veličina: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verzija: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Veličina: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Značaj: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ne možete izabrati/isključiti ovaj paket" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "zbog nedostajućeg %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "zbog nezadovoljenog %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "pokušavam promovirati %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "kako biste zadržali %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Ne možete izabrati ovaj paket jer nema dovoljno prostora za njega" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ovo je obavezan paket, ne može biti isključen" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automatski prikaži izabrane pakete" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalacija" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Učitajte ili snimite izbor paketa" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ažuriram spisak paketa" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimalna instalacija" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programi" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Izaberite pakete koje želite instalirati" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instaliram" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Sakrij detalje" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Preostalo vremena " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Procjenjujem" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1057,17 +1108,17 @@ msgstr[0] "%d paketa" msgstr[1] "%d paketa" msgstr[2] "%d paketa" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Ukratko" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Podesi" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nije podešeno" @@ -1081,7 +1132,7 @@ msgstr "" "Pronađeni su sljedeći instalacioni mediji.\n" "Ako želite preskočiti neke od njih, možete ih isključiti sada." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1093,7 +1144,7 @@ msgstr "" "Zatim će instalacija biti nastavljena sa hard diska, a paketi će ostati " "dostupni nakon što sistem bude instaliran." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiraj čitave CDove" @@ -1393,28 +1444,28 @@ msgstr "" "Da li želite instalirati ažurirane pakete ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Zvučna kartica" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Imate li ISA zvučnu karticu?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1423,74 +1474,74 @@ msgstr "" "Pokrenite \"alsaconf\" ili \"sndconfig\" poslije instalacije kako biste " "podesili vašu zvučnu karticu" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Nije otkrivena zvučna kartica. Probajte \"harddrake\" poslije instalacije" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafički interfejs" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Mreža i Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy-ji" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "podešeno" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sigurnosni nivo" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiviran" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "isključen" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Pripremam bootloader..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pripremam instalaciju" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1503,7 +1554,7 @@ msgstr "" "neki drugi način za bootanje vašeg računara. Argument kernela za root fs je: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1512,17 +1563,17 @@ msgstr "" "Na ovom sigurnosnom nivou, pristup datotekama na Windows particijama je " "dozvoljen samo administratoru." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Ubacite praznu disketu u jedinicu %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Pravim auto instalacijsku disketu..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1533,12 +1584,12 @@ msgstr "" "\n" "Da li zaista želite izaći sada?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Čestitamo" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Restartuj" diff --git a/perl-install/install/share/po/ca.po b/perl-install/install/share/po/ca.po index 3b98893f0..c483cf2ec 100644 --- a/perl-install/install/share/po/ca.po +++ b/perl-install/install/share/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-12 21:32+0200\n" "Last-Translator: Francesc Pinyol\n" "Language-Team: Catalan \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "Teniu més suports addicionals?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,91 +87,91 @@ msgstr "" "\n" "Teniu algun suport d'instal·lació addicional per a configurar?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Xarxa (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Xarxa (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Xarxa (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL de la rèplica?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "La URL ha de començar amb ftp:// o bé http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "S'està contactant amb el servidor %s per obtenir la llista de rèpliques " "disponibles..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Ha fallat la connexió amb el lloc web %s per a obtenir la llista de " "rèpliques disponibles" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuració NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Introduïu el nom de l'ordinador i del directori del suport NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Falta el nom de l'ordinador" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "El directori ha de començar amb «/»" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nom de l'ordinador del muntatge NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directori" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Addicional" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,22 +180,22 @@ msgstr "" "No s'ha pogut trobat el fitxer hdlist en aquest rèplica. Assegureu-vos que " "la localització és correcta." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -204,23 +204,23 @@ msgstr "" "Algun maquinari de l'ordinador requereix microprogramari no lliure perquè " "els controladors lliures funcionin." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Hauríeu d'habilitar «%s»" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "«%s» conté programari no lliure.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -230,7 +230,7 @@ msgstr "" "dispositius (per exemple: algunes targetes gràfiques ATI/AMD, algunes " "targetes de xarxa, algunes targetes RAID, ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -239,40 +239,40 @@ msgstr "" "«%s» conté programari que no es pot distribuir a tots els països degut a " "patents de programari." -#: any.pm:359 +#: any.pm:381 #, 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:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Aquí podeu habilitar més suports si voleu." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" "Aquest suport proporciona actualitzacions de paquets per al suport «%s»" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "S'estan cercant els paquets ja instal·lats..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "S'estan cercant els paquets a actualitzar" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -285,72 +285,72 @@ msgstr "" "\n" "Voleu realment suprimir aquests paquets?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "S'ha produït un error en llegir el fitxer %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "El(s) següent(s) disc(s) ha(n) estat reanomenat(s)" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (abans anomenat %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Xarxa" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Escolliu un suport" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "El fitxer ja existeix. El voleu sobreescriure?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "S'ha denegat el permís" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nom NFS incorrecte" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Suport incorrecte %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "No es poden fer captures de pantalla abans de fer les particions" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Les captures estaran disponibles després d'instal·lar a %s" @@ -360,7 +360,7 @@ msgstr "Les captures estaran disponibles després d'instal·lar a %s" msgid "Installation" msgstr "Instal·lació" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuració" @@ -460,42 +460,42 @@ msgstr "" "Alguns paquets sol·licitats per %s no es poden instal·lar:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "S'ha produït un error:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "S'ha produït un error fatal: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "No tornar a preguntar" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Han fallat %d transaccions d'instal·lació" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "La instal·lació de paquets ha fallat:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Estació de treball" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Estació de treball d'oficina" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -504,32 +504,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Estació de jocs" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Estació multimèdia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programes de reproducció/edició de so i vídeo" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Estació d'Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -538,193 +538,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:40 #, c-format msgid "Network Computer (client)" msgstr "Ordinador de xarxa (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Clients per a diferents protocols, incloent l'ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Eines per facilitar la configuració de l'ordinador" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Eines de consola" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desenvolupament" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Biblioteques de 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentació" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servidor Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Passarel·la a Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Correu/Notícies" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Servidor de correu Postfix, Servidor de noticies Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Servidor de directori" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Base de dades" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache i Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Correu" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servidor de correu Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Servidor d'ordinador de xarxa" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Entorn gràfic" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Estació de treball KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -733,12 +733,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:156 #, c-format msgid "GNOME Workstation" msgstr "Estació de treball GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -747,12 +747,41 @@ msgstr "" "Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil " "d'utilitzar" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Estació de treball KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil " +"d'utilitzar" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Estació de treball GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estació de treball" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Entorn gràfic" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Escriptori LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -761,52 +790,74 @@ msgstr "" "Un entorn gràfic lleuger i ràpid amb un conjunt d'aplicacions i eines " "d'escriptori amigables" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Escriptori personalitzat" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un entorn gràfic lleuger i ràpid amb un conjunt d'aplicacions i eines " +"d'escriptori amigables" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Altres escriptoris gràfics" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilitats" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servidor remot de configuració de Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilitats de xarxa/Monitorització" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Eines de monitoratge, comptabilitat de processos, tcpdump, nmap..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Auxiliars de Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Auxiliars per configurar el servidor" @@ -820,7 +871,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -875,107 +926,107 @@ msgstr "Selecció de suports" msgid "Install %s KDE Desktop" msgstr "Instal·la %s l'escriptori KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instal·la %s l'escriptori GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instal·lació personalitzada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Escriptori KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Escriptori GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Escriptori personalitzat" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Aquesta és una previsualització de l'escriptori '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Feu clic a les imatges per a veure una previsualització més gran." -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selecció del grup de paquets" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selecció individual de paquets" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Desselecciona-ho tot" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Mida total: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versió: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Mida: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d kB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importància: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "No podeu seleccionar/desseleccionar aquest paquet" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "degut que falten %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "degut a %s no satisfetes" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "s'està intentant promoure %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "per tal de mantenir %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -984,104 +1035,104 @@ msgstr "" "No podeu seleccionar aquest paquet perquè no queda prou espai per instal·lar-" "lo" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Aquest paquet és obligatori; no es pot desseleccionar" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "No podeu desseleccionar aquest paquet; ja està instal·lat" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "No podeu desseleccionar aquest paquet; s'ha d'actualitzar" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostra automàticament els paquets seleccionats" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instal·la" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Carrega/Desa la selecció" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "S'està actualitzant la selecció de paquets" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instal·lació mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gestió de programari" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Escolliu els paquets que voleu instal·lar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "S'està instal·lant" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Sense detalls" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Temps restant:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(s'està estimant...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paquet" msgstr[1] "%d paquets" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resum" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configura" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "no configurat(da)" @@ -1095,7 +1146,7 @@ msgstr "" "S'han trobat els següents suports d'instal·lació.\n" "Si en voleu ometre alguns, els podeu desseleccionar ara." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1108,7 +1159,7 @@ msgstr "" "Llavors es continuarà des del disc dur i els paquets continuaran disponibles " "un cop el sistema estigui instal·lat." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copia els CDs sencers" @@ -1418,28 +1469,28 @@ msgstr "" "Voleu instal·lar les actualitzacions?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s a %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Maquinari" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Targeta de so" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Teniu una targeta de so ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1448,75 +1499,75 @@ msgstr "" "Executeu «alsacont» o bé «sndconfig» després de la instal·lació per " "configurar la targeta de so" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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 " "instal·lació" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfície gràfica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Xarxa i Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Intermediaris" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurat" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivell de seguretat" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Tallafoc" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activat" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "inhabilitat" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "S'està preparant el carregador de l'arrencada..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "S'està preparant el programa d'arrencada..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Tingueu paciència, això pot trigar una estona..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1529,7 +1580,7 @@ msgstr "" "de fer servir BootX o bé algun altre mecanisme per a iniciar la vostra " "màquina. L'argument del nucli per al sistema de fitxers arrel és: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1538,17 +1589,17 @@ msgstr "" "En aquest nivell de seguretat, l'accés a les particions de Windows està " "restringit a l'administrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Inseriu un disquet en blanc a la unitat %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "S'està creant el disquet d'instal·lació automàtica..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1559,12 +1610,12 @@ msgstr "" "\n" "Esteu segur que voleu sortir ara?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Felicitats" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reinicia" diff --git a/perl-install/install/share/po/cs.po b/perl-install/install/share/po/cs.po index 3345f4005..6c6e27a1d 100644 --- a/perl-install/install/share/po/cs.po +++ b/perl-install/install/share/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2012-03-10 14:44+0000\n" "Last-Translator: Oliver Burger \n" "Language-Team: LANGUAGE \n" @@ -73,7 +73,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -86,87 +86,87 @@ msgstr "" "\n" "Chcete nastavit ještě nějaké další doplňující instalační zdroje?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Síť (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Síť (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Síť (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL zrcadla?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL musí začínat na ftp:// nebo http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Navazuji spojení se stránkami %s za účelem získání seznamu zrcadel..." -#: any.pm:193 +#: any.pm:195 #, c-format 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Zvolte si zrcadlo (mirror) pro stahování balíčků" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Nastavení NFS" -#: any.pm:234 +#: any.pm:236 #, 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" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Chybí název počítače" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Adresář musí začínat znakem \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Název počítače připojení NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Adresář" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Dodatečný" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -175,90 +175,90 @@ msgstr "" "Nelze nalézt soubor hdlist na tomto zrcadle. Ujistěte se, že umístění je " "správné." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Vynechat všechny balíčky ze zdroje \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Prohledávám již instalované balíčky..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Vyhledávám balíčky pro aktualizaci..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -271,72 +271,72 @@ msgstr "" "\n" "Opravdu chcete odebrat tyto balíčky?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Chyba při čtení souboru %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Následující disk(y) byly přejmenovány:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (předchozí název %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Síť" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Prosím vyberte zdroj" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Soubor již existuje. Přepsat?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Přístup odepřen" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Chybný název NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Chybný zdroj %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nelze provést sejmutí obrazovky před rozdělením disků" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Sejmuté obrazovky budou dostupné po instalaci v adresáři %s" @@ -346,7 +346,7 @@ msgstr "Sejmuté obrazovky budou dostupné po instalaci v adresáři %s" msgid "Installation" msgstr "Instalace" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Nastavení" @@ -446,42 +446,42 @@ msgstr "" "Některé z balíčků vyžádaných od %s nelze nainstalovat:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Nastala chyba:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Vyskytla se fatální chyba: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Více se již neptat" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d instalačních procesů selhalo" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Instalace balíčků selhala:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Pracovní stanice" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kancelářská stanice" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -490,32 +490,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Hry" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediální stanice" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programy pro přehrávání/editaci zvuku a videa" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internetová stanice" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -524,193 +524,193 @@ msgstr "" "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" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Síťový počítač (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konzolové nástroje" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Vývoj" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentace" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Knihy a Howto o Linuxu a Svobodném Software" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webový server" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Server Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internetová brána" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Pošta/Diskusní skupiny" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Server adresářových služeb" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server pro domény a síťové informace" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Databáze" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Databázové servery PostgreSQL a MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache a Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Pošta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Poštovní server Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Databázové servery PostgreSQL nebo MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Síťový server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, SSH server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafické prostředí" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Pracovní stanice s KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -719,12 +719,12 @@ msgstr "" "K Desktop Environment, základní grafické prostředí s kolekcí doprovodných " "nástrojů" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Pracovní stanice s GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -733,12 +733,41 @@ msgstr "" "Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní " "plochou" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Pracovní stanice s KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní " +"plochou" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Pracovní stanice s GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Pracovní stanice" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafické prostředí" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -747,52 +776,74 @@ msgstr "" "Jednoduché a rychlé grafické prostředí s uživatelsky přívětivou sadou " "aplikací a nástrojů" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Vlastní desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Jednoduché a rychlé grafické prostředí s uživatelsky přívětivou sadou " +"aplikací a nástrojů" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Další grafické desktopy" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm a další" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, 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:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Server pro vzdálené nastavení Webminu" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Síťové nástroje/Sledování" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Průvodce nastavením Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Průvodci nastavením serverů" @@ -806,7 +857,7 @@ msgstr "" "Stala se chyba, ale nevím, jak jí správně interpretovat.\n" "Pokračujte na vlastní riziko." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -859,107 +910,107 @@ msgstr "Výběr zdrojů" msgid "Install %s KDE Desktop" msgstr "Instalovat %s KDE Desktop" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalovat %s GNOME Desktop" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Vlastní instalace" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Vlastní desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, 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:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Výběr skupiny balíčků" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Výběr jednotlivých balíčků" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Zrušit celý výběr" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Celková velikost: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verze: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Velikost: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Důležitost: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Nemůžete vybrat/nevybrat tento balíček" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "protože chybí %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "díky nesplněné závislosti %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "pokus o postoupení %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "aby bylo zachováno %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -967,87 +1018,87 @@ msgid "" msgstr "" "Nemůžete vybrat tento balíček, protože pro jeho instalaci není dost místa" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Nemůžete odznačit tento balíček, je už nainstalovaný" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Ukázat automaticky vybrané balíčky" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalovat" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Načíst/Uložit výběr" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Aktualizuji výběr balíčků" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimální instalace" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Správa softwaru" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Vyberte si balíčky, které chcete nainstalovat" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instaluji" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Bez podrobností" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Zbývající čas:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(odhaduji...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1055,17 +1106,17 @@ msgstr[0] "%d balíček" msgstr[1] "%d balíčky" msgstr[2] "%d balíčků" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Souhrn" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Nastavit" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nenastaveno" @@ -1079,7 +1130,7 @@ 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:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1091,7 +1142,7 @@ msgstr "" "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:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopírovat celá CD" @@ -1401,28 +1452,28 @@ msgstr "" "Chcete nainstalovat aktualizace?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Zvuková karta" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Máte nějakou zvukovou kartu na ISA sběrnici?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1431,75 +1482,75 @@ msgstr "" "Pro nastavení zvukové karty spusťte po instalaci \"alsaconf\" nebo " "\"sndconfig\"" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Nebyla nalezena zvuková karta. Zkuste spustit po instalaci \"harddrake\"." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafické rozhraní" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Síť & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "nastaveno" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Úroveň zabezpečení" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivováno" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "vypnuto" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Připravuji zaváděcí program..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Připravuji instalaci" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Prosím o strpení, může to chvíli trvat…" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1512,7 +1563,7 @@ msgstr "" "BootX nebo jiný nástroj pro zavedení systému. Parametr jádra pro kořenový " "souborový systém je: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1521,17 +1572,17 @@ msgstr "" "V této úrovní zabezpečení je přístup k souborům na oddíle s Windows omezena " "pouze na uživatele administrátor." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Vložte prázdnou disketu do %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Vytvářím disketu pro automatickou instalaci..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1542,12 +1593,12 @@ msgstr "" "\n" "Chcete opravdu nyní skončit?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulujeme" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Restartovat" diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po index 7cf5c6434..60a1242ac 100644 --- a/perl-install/install/share/po/cy.po +++ b/perl-install/install/share/po/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-10-01 16:09+0100\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Meddal.com\n" @@ -77,7 +77,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -91,87 +91,87 @@ msgstr "" "\n" "A oes gennych gyfrwng gosod ychwanegol i'w ffurfweddu?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rhwydwaith (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rhwydwaith (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rhwydwaith (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL y drych?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Rhaid i'r URL gychwyn gyda ftp:// neu http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Dewiswch ddrych lle mae modd estyn y pecynnau" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Ffurfweddiad NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Enw gwesteiwr ar goll" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Rhaid i gyfeiriadur gychwyn gyda \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Enw gwesteiwr arosod NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Cyfeiriadur" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Atodol" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,90 +180,90 @@ msgstr "" "Methu canfod ffeil hdlist ar y drych. Gwnewch yn siwr fod y lleoliad yn " "gywir." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Hepgor pob pecyn o gyfrwng \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Edrych ar becynnau wedi eu gosod yn barod..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Canfod pecynnau i'w uwchraddio..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -277,72 +277,72 @@ msgstr "" "\n" "Ydych chi am dynnu'r pecynnau hyn?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Gwall wrth ddarllen ffeil %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Mae'r disg(iau) canlynol wedi eu hail enwi:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ei enw blaenorol oedd %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rhwydwaith" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Dewiswch gyfrwng" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Caniatâd wedi ei wrthod." -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Enw NFS gwael" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Cyfrwng %s gwael" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Meth creu lluniau o'r sgrin cyn rhannu" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s" @@ -352,7 +352,7 @@ msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s" msgid "Installation" msgstr "Gosod" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Ffurfweddiad" @@ -452,42 +452,42 @@ msgstr "" "Nid yw'n bosib gosod rhai pecynnau gofynnwyd gan %s:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Digwyddodd gwall:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Digwyddodd gwall terfynol:%s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Methodd trafod gosod %d" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Methodd gosod pecynnau:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Gweithfan" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Gweithfan Swyddfa" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,32 +496,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Man chwarae" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Man aml-gyfrwng" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Man rhyngrwyd" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -530,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:40 #, c-format msgid "Network Computer (client)" msgstr "Cyfrifiadur Rhwydwaith (cleient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Offer y Consol" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Datblygiad" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dogfennau" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Gweinydd Gwe" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grwpwar" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Porth i'r rhyngrwyd" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-bost/Newyddion" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Cyfeiriadur Gweinydd" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Gweinydd FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Gweinydd Enw Parth a Gwybodaeth Rhwydwaith" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Cronfa Ddata" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Gweinydd CronfaDdata PostgreSQL a MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Gwe/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-bost" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Gweinydd e-bost Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Gweinydd cronfa data PostgreSQL neu MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Gweinydd Cyfrifiadur Rhwydwaith" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Amgylchedd Graffig" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Man Gwaith KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -725,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:156 #, c-format msgid "GNOME Workstation" msgstr "Man Gwaith Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -739,12 +739,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Man Gwaith KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu " +"defnyddio." + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Man Gwaith Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Gweithfan" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Amgylchedd Graffig" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Bwrdd Gwaith LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -753,52 +782,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Bwrdd Gwaith Addasu" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Amgylchedd graffig ysgafn a chyflym gyda chasgliad o raglenni ac offer bwrdd " +"gwaith hawdd eu defnyddio." + +#: share/meta-task/compssUsers.pl:193 #, 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:194 +#, 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:217 #, c-format msgid "Utilities" msgstr "Gwasanaethau" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Gweinydd SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Gweinydd Ffurfweddiad Pell Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Gwasanaethau Rhwydwaith/Monitro" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Dewiniaid Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Dewiniaid i ffurfweddu gweinydd" @@ -812,7 +863,7 @@ msgstr "" "Digwyddodd gwall ond wn i ddim sut i ddelio ag ef yn dwt.\n" "Mae'n beryglus i barhau." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -867,211 +918,211 @@ msgstr "Dewis Cyfrwng" msgid "Install %s KDE Desktop" msgstr "Gosod Bwrdd Gwaith %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Gosod Bwrdd Gwaith %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Gosodiad addasu" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Bwrdd Gwaith KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Bwrdd Gwaith GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Bwrdd Gwaith Addasu" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Dyma ragolwg o fwrdd gwaith '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Dewis Grŵp y Pecyn" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Dewis pecynnau unigol." -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Dad ddewis Popeth" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Cyfanswm maint: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Fersiwn:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Maint:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Pwysigrwydd: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Does dim modd i chi ddewis/dad-ddewis y pecyn" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "oherwydd %s coll" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "oherwydd %s annigonol" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "ceisio hyrwyddo %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "er mwyn cadw %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Nid oes modd i chi ddewis y pecyn hwn - does dim lle ar ôl i'w osod" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Dangoswch y pecynnau dewis awtomatig" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Gosod" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Llwytho/Cadw'r dewis" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Diweddaru'r dewis o becynnau" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Gosodiad lleiaf" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Rheoli Meddalwedd" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Dewiswch y pecynnau yr hoffech chi eu gosod" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Gosod" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Dim manylion" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Amser yn weddill:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(amcangyfrif...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pecyn" msgstr[1] "%d pecyn" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Crynodeb" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Ffurfweddu" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "heb ffurfweddu" @@ -1085,7 +1136,7 @@ msgstr "" "Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n" "Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1098,7 +1149,7 @@ 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:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copïo'r CDau cyfan" @@ -1404,28 +1455,28 @@ msgstr "" "Ydych chi am osod y diweddariadau?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s ar %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Caledwedd" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Cerdyn sain" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "A oes gennych gerdyn sain ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1434,73 +1485,73 @@ msgstr "" "Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich " "cerdyn sain" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Rhyngwyneb graffigol" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rhwydwaith a'r Rhyngrwyd" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Dirprwyon" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ffurfweddwyd" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Lefel Diogelwch" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Mur Cadarn" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "gweithredwyd" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "anablwyd" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Paratoi cychwynnwr..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Paratoi'r gosod" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Amynedd, gall hyn gymryd amser..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1513,7 +1564,7 @@ msgstr "" "bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn " "ar gyfer y gwraidd yw: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1522,17 +1573,17 @@ msgstr "" "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu " "cyfyngu i'r Gweinyddwr." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Rhowch ddisg meddal yng ngyrrwr %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Creu disg meddal awto gosod..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1543,12 +1594,12 @@ msgstr "" "\n" "Ydych chi wir eisiau gorffen?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Llongyfarchiadau" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Ail gychwyn" diff --git a/perl-install/install/share/po/da.po b/perl-install/install/share/po/da.po index 6fa470eb9..337faf7ee 100644 --- a/perl-install/install/share/po/da.po +++ b/perl-install/install/share/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-07-06 21:38+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -76,7 +76,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,88 +89,88 @@ msgstr "" "\n" "Har du et supplerende installationsmedium, der skal konfigureres?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Cd-rom" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Netværk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Netværk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Netværk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL på spejlet?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL skal starte med ftp:// eller http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Kunne ikke kontakte %s' netsted for at hente listen over tilgængelige spejle" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Vælg det spejl hvorfra pakkerne skal hentes" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-opsætning" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Værtsmaskinenavn mangler" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Katalog skal begynde med \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Værtsnavn på NFS-monteringen?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalog" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Supplerende" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -179,90 +179,90 @@ msgstr "" "Kan ikke finde en pakkelistefil på dette spejl. Kontrollér at placeringen er " "korrekt." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Overspring alle pakker fra medie '%s'" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Leder efter pakker der allerede er installeret..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Leder efter pakker som skal opgraderes..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -275,72 +275,72 @@ msgstr "" "\n" "Ønsker du virkelig at fjerne disse pakker?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fejl ved læsning af filen %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "De følgende diske blev omdøbt:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (tidligere kaldet %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Netværk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Vælg et medie" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fil eksisterer allerede. Skal den overskrives?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Adgang nægtet" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Dårligt NFS-navn" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Dårligt medie %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan ikke lave øjebliksbilleder før partitionering" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Øjebliksbilleder vil være tilgængelige efter installation i %s" @@ -350,7 +350,7 @@ msgstr "Øjebliksbilleder vil være tilgængelige efter installation i %s" msgid "Installation" msgstr "Installation" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguration" @@ -449,42 +449,42 @@ msgstr "" "Visse pakker forespurgt af %s kan ikke installeres:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Der opstod en fejl:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "En fatal fejl skete: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Spørg ikke igen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d installationstransaktioner mislykkedes" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installation af pakker mislykkedes:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Arbejdsmaskine" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kontor-arbejdsmaskine" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -493,32 +493,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Spillemaskine" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediecenter" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet-computer" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -527,193 +527,193 @@ msgstr "" "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:40 #, c-format msgid "Network Computer (client)" msgstr "Netværksmaskine (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsolværktøjer" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Udvikling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentation" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Understøttelse for tredjeparts-programmer" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webserver" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Samarbejdsprogrammel (Groupware)" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Brandmur/ruter" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet-adgangspunkt" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Post og nyheder" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Katalogserver" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server for domænenavne (DNS) og netværksinformation (NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Fil- og Printerdelings-server" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS-server, Samba-server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- og MariaDB-databaseserver" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache og Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix-postserver" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- eller MariaDB-databaseserver" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Netværksmaskine-server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-server, SMB-server, proxy-server, SSH-server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafisk miljø" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-arbejdsmaskine" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -722,24 +722,51 @@ 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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome-arbejdsmaskine" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Et grafisk miljø med brugervenlig samling af programmer og værktøjer" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-arbejdsmaskine" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome-arbejdsmaskine" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Arbejdsmaskine" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafisk miljø" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-skrivebord" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -748,52 +775,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Tilpasset skrivebord" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Et let og hurtigt grafisk miljø med brugervenlig samling af programmer og " +"skrivebordsværktøjer" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Andre grafiske miljøer" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, osv." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Nytteprogrammer" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin ekstern konfigurationsserver" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, 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:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Konfigurationsprogrammer for Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Hjæpeprogrammer til at konfigurere server" @@ -808,7 +857,7 @@ msgstr "" "pæn måde.\n" "Fortsæt på eget ansvar!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -862,107 +911,107 @@ msgstr "Valg af pakkemedie" msgid "Install %s KDE Desktop" msgstr "Installér %ss KDE-skrivebord" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installér %ss GNOME-skrivebord" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Tilpasset installation" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-skrivebord" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME-skrivebord" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Tilpasset skrivebord" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Her er et smugkig på '%s'-skrivebordet." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Valg af pakkegrupper" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuelt pakkevalg" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Fravalgte alt" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Total størrelse: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Størrelse: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Vigtighed: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Du kan ikke vælge/fravælge denne pakke" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "grundet manglende %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "grundet uopfyldt %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "prøver at forfremme %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "for at beholde %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -971,106 +1020,106 @@ msgstr "" "Du kan ikke vælge denne pakke, da der ikke er nok plads tilbage til at " "installere den" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Du kan ikke fravælge denne pakke. Den skal opgraderes" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Vis automatisk valgte pakker" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installér" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Indlæs eller gem det markerede" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Opdaterer pakkevalg" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal installation" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "" "Administration\n" "af programmer" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Vælg pakker som skal installeres" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installerer" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ingen detaljer" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Resterende tid:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(beregner...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakke" msgstr[1] "%d pakker" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Oversigt" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurér" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ikke konfigureret" @@ -1084,7 +1133,7 @@ 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:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1097,7 +1146,7 @@ msgstr "" "Installationen vil så fortsætte fra disken og pakkerne vil forblive " "tilgængelige, når systemet er fuldt installeret." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiér hele cd'er" @@ -1408,28 +1457,28 @@ msgstr "" "Ønsker du at installere opdateringerne?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s på %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Udstyr" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Lydkort" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Har du et ISA-lydkort?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1438,74 +1487,74 @@ msgstr "" "Kør \"alsaconf\" eller \"sndconfig\" efter installation for at konfigurere " "dit lydkort" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafisk grænseflade" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Netværk og Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxyer " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfigureret" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sikkerhedsniveau" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Brandmur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiveret" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "deaktiveret" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Forbereder opstartsindlæser..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Forbereder installationen" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Vær tålmodig, dette kan tage et stykke tid..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1518,7 +1567,7 @@ msgstr "" "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:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1527,17 +1576,17 @@ msgstr "" "I dette er sikkerhedsniveau er adgang til Windows-partitionen forbeholdt " "administratoren." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Indsæt en tom diskette i drev %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Laver autoinstallations-diskette..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1548,12 +1597,12 @@ msgstr "" "\n" "Er du sikker på du ønsker du at lukke nu?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Tillykke" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Genstart" diff --git a/perl-install/install/share/po/de.po b/perl-install/install/share/po/de.po index 4f1cfc267..05364a2b6 100644 --- a/perl-install/install/share/po/de.po +++ b/perl-install/install/share/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-01-16 15:56+0100\n" "Last-Translator: Oliver Burger \n" "Language-Team: German \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "Haben Sie weitere zusätzliche Medien?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,114 +87,114 @@ msgstr "" "\n" "Haben Sie noch weitere Installationsmedien zu konfigurieren?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Netzwerk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Netzwerk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Netzwerk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL des Spiegel-Servers?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Die URL muss mit ftp:// oder http:// beginnen" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Die %s-Webseite wird kontaktiert, um eine Liste der verfügbaren Spiegel-" "Server zu erhalten..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Die %s-Webseite kann nicht erreicht werden, um die Liste der verfügbaren " "Spiegel-Server zu erhalten" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-Einrichtung" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Hostname fehlt" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Verzeichnis muss mit \"/\" beginnen" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Rechnername der NFS-Einbindung?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Verzeichnis" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Ergänzend" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Kann keine Paketliste auf diesem Spiegel-Server finden." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core-Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted-Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree-Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -203,24 +203,24 @@ msgstr "" "Ihre Maschine beinhaltet Hardware, die nicht-freie Firmware-Dateien " "benötigt, damit die freien Treiber funktionieren." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Sie sollten „%s“ aktivieren" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "„%s“ enthält nicht-freie Software.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -230,7 +230,7 @@ msgstr "" "funktionieren zu köpnnen. (z.B. einige ATI/AMD-Grafikkarten, einige " "Netzwerkkarten, einige RAID-Karten,...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -239,7 +239,7 @@ msgstr "" "„%s“ enthält Software, die aufgrund von Software-Patenten nicht in jedem " "Land verbreitet werden darf." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." @@ -247,33 +247,33 @@ msgstr "" "Es enthält auch Software aus „%s“, die mit zusätzlichen Fähigkeiten neu " "gebaut wurde." -#: any.pm:363 +#: any.pm:387 #, 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:378 +#: any.pm:404 #, 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:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Bereits installierte Pakete werden gesucht ..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Zu aktualisierenden Pakete werden gesucht..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Pakete vor der Aktualisierung entfernen..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -287,72 +287,72 @@ msgstr "" "\n" "Wollen Sie diese Pakete wirklich entfernen?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fehler beim Lesen der Datei %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Die folgenden Datenträger wurden umbenannt:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (vorher als %s bezeichnet)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Netzwerk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Bitte wählen Sie ein Medium" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Die Datei existiert bereits. Überschreiben?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Erlaubnis verweigert" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Fehlerhafter NFS-Name" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Fehlerhaftes Medium %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Vor der Partitionierung können keine Screenshots erstellt werden" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Die Screenshots finden sich nach der Installation unter „%s“" @@ -362,7 +362,7 @@ msgstr "Die Screenshots finden sich nach der Installation unter „%s“" msgid "Installation" msgstr "Installation" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguration" @@ -462,42 +462,42 @@ msgstr "" "Einige der ausgewählten Programme von %s können nicht installiert werden:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Ein Fehler ist aufgetreten:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Fataler Fehler aufgetreten: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Nicht erneut fragen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d Installationstransaktionen schlugen fehl" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installieren der Pakete ist fehlgeschlagen:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Arbeitsplatzrechner" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Büro-Arbeitsplatz" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -506,32 +506,32 @@ msgstr "" "Office-Programme: Textverarbeitung (LibreOffice Writer, KWord), " "Tabellenkalkulation (LibreOffice Calc, KSpread), PDF-Betrachter, usw." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Spiele-Station" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Spiele: Arkade-, Brett-, Strategiespiele, usw." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimedia-Station" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programme, um Audio und Video abzuspielen und zu bearbeiten" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internet-Station" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -540,193 +540,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:40 #, c-format msgid "Network Computer (client)" msgstr "Netzwerk-Computer (Client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsolen-Werkzeuge" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Entwicklung" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C- und C++-Entwicklungsbibliotheken, Programme und Include-Dateien" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentation" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux-Standard-Base. Drittanbieterunterstützung" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webserver" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-Server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet-Gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-Mail/News" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix-Mail-Server, Inn-News-Server" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Verzeichnisdienst" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-Server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domänennamen- und Netzwerk-Informations-Server" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Datei- und Druckerserver" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS-Server, Samba-Server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Datenbank" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- und MariaDB-Datenbankserver" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix-Mail-Server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- oder MariaDB-Datenbankserver" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Netzwerkrechner-Server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafische Arbeitsoberfläche" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-Arbeitsplatz" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -735,12 +735,12 @@ 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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome-Arbeitsplatz" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -748,12 +748,40 @@ msgid "" msgstr "" "Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-Arbeitsplatz" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome-Arbeitsplatz" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Arbeitsplatzrechner" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafische Arbeitsoberfläche" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -762,52 +790,74 @@ msgstr "" "Eine leichtgewichtige und schnelle grafische Umgebung mit " "anwenderfreundlichen Anwendungen und Werkzeugen" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Benutzerdefinierter Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Eine leichtgewichtige und schnelle grafische Umgebung mit " +"anwenderfreundlichen Anwendungen und Werkzeugen" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Andere grafische Arbeitsflächen" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, usw." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Werkzeuge" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-Server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin-Fernkonfigurationsserver" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Netzwerkwerkzeuge/-überwachung" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia-Assistenten" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Assistenten zur Servereinrichtung" @@ -821,7 +871,7 @@ msgstr "" "Es trat ein Fehler auf. Ich weiß jedoch nicht, wie ich damit umgehen soll. " "Sie können fortfahren, jedoch auf eigenes Risiko!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -877,107 +927,107 @@ msgstr "Auswahl der Installationsmedien" msgid "Install %s KDE Desktop" msgstr "Den %s-KDE-Desktop installieren" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Den %s-GNOME-Desktop installieren" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Benutzerdefinierte Installation" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME-Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Benutzerdefinierter Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Hier sehen Sie eine Vorschau des „%s“-Desktops" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Auswahl der Paketgruppen" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuelle Paketauswahl" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Auswahl aufheben" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Gesamtgröße: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Größe: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d kB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Wichtigkeit: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Sie können dieses Paket nicht auswählen/abwählen." -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "da %s fehlt" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "da %s unerfüllt ist" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "Versuche %s voranzutreiben" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "um %s beizubehalten" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -986,108 +1036,108 @@ msgstr "" "Sie können dieses Paket nicht auswählen, da Sie nicht genug Plattenplatz " "haben." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Die folgenden Pakete werden installiert" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Die folgenden Pakete werden entfernt" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automatisch markierte Pakete anzeigen" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installation" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Auswahl laden/speichern" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Erneuere Paket Auswahl" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal-Installation" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Software verwalten" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Zu installierende Pakete auswählen" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installation" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Keine Details" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Verbleibende Zeit " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(Schätzen...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d Paket" msgstr[1] "%d Pakete" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Zusammenfassung" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurieren" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "Nicht eingerichtet" @@ -1101,7 +1151,7 @@ msgstr "" "Die folgenden Installationsmedien wurden gefunden.\n" "Wählen Sie die Medien ab, die Sie überspringen wollen." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1114,7 +1164,7 @@ msgstr "" "fortgeführt und die Softwarepakete bleiben verfügbar, nachdem das System " "fertig installiert ist." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiere die CDs" @@ -1423,28 +1473,28 @@ msgstr "" "Möchten Sie die Aktualisierungen vornehmen?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s auf %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Soundkarte" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Verfügen Sie über eine ISA-Soundkarte?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1453,75 +1503,75 @@ msgstr "" "Starten Sie „sndconfig“ oder „alsaconf“ nach der Installation, um Ihre " "Soundkarte einzurichten." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafikumgebung" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Netzwerk & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfiguriert" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sicherheitsebene" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiviert" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "deaktiviert" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Bootloader wird vorbereitet ..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Initiale Systemstartprogramme vorbereiten..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Ein wenig Geduld, dies kann einige Zeit dauern..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1535,7 +1585,7 @@ msgstr "" "müssen um Ihren Rechner zu starten. Der Kernelparameter für das Root-" "Dateisystem ist: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1544,17 +1594,17 @@ msgstr "" "In dieser Sicherheitseinstellung ist der Zugriff auf Dateien der " "Windowspartition nur dem Administrator erlaubt" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Legen Sie eine leere Diskette in das Laufwerk %s ein." -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Erstelle eine Auto-Installationsdiskette" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1565,12 +1615,12 @@ msgstr "" "\n" "Wollen Sie DrakX wirklich beenden?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Herzlichen Glückwunsch!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Neustart" diff --git a/perl-install/install/share/po/el.po b/perl-install/install/share/po/el.po index fab4194f9..55216d792 100644 --- a/perl-install/install/share/po/el.po +++ b/perl-install/install/share/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-03 13:04+0200\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" @@ -77,7 +77,7 @@ msgid "Do you have further supplementary media?" msgstr "Έχετε άλλα πρόσθετα μέσα ενημέρωσης;" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -90,91 +90,91 @@ msgstr "" "\n" "Έχετε κάποιο συμπληρωματικό μέσο εγκατάστασης για ρύθμιση;" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Δίκτυο (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Δίκτυο (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Δίκτυο (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Το URL του καθρεπτισμού;" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Το URL πρέπει να ξεκινά με ftp:// ή http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Σύνδεση με την ιστοσελίδα της %s για λήψη της λίστας με τους διαθέσιμους " "καθρεπτισμούς..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Αδυναμία σύνδεσης με την ιστοσελίδα της %s για λήψη της λίστας με τους " "διαθέσιμους καθρεπτισμούς" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Επιλέξτε έναν καθρεπτισμό από τον οποίο θα γίνει η λήψη των πακέτων" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Ρύθμιση NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Παρακαλώ εισάγετε το όνομα υπολογιστή και τη διαδρομή του μέσου NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Λείπει το όνομα υπολογιστή" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Ο κατάλογος πρέπει να αρχίζει με «/»" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Το όνομα υπολογιστή της προσάρτησης NFS;" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Κατάλογος" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Συμπληρωματικά" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -183,22 +183,22 @@ msgstr "" "Δεν βρέθηκε το αρχείο με την λίστα των πακέτων σε αυτόν τον καθρεπτισμό. " "Σιγουρευτείτε ότι η τοποθεσία είναι σωστή." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -207,23 +207,23 @@ msgstr "" "Στο μηχάνημά σας υπάρχει υλικό που απαιτεί μη ελεύθερο firmware ώστε να " "λειτουργούν οι οδηγοί ανοιχτού κώδικα. " -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Θα πρέπει να ενεργοποιήσετε το «%s»" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" "Το «%s» περιέχει τα διάφορα τμήματα του συστήματος και τις εφαρμογές του" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "Το «%s» περιέχει μη ελεύθερο λογισμικό.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -233,7 +233,7 @@ msgstr "" "συσκευών (πχ: μερικές κάρτες γραφικών ATI/AMD, μερικές κάρτες δικτύου, " "μερικές κάρτες RAID, ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -242,7 +242,7 @@ msgstr "" "Το «%s» περιέχει λογισμικό που δεν μπορεί να διανεμηθεί σε όλες τις χώρες " "λόγω περιορισμού των διπλωμάτων ευρεσιτεχνίας." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." @@ -250,35 +250,35 @@ msgstr "" "Επίσης, περιέχει λογισμικό από το «%s» επαναδημιουργημένο με επιπλέον " "χαρακτηριστικά." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" "Αν το επιθυμείτε, εδώ μπορείτε να ενεργοποιήσετε περισσότερες πηγές " "λογισμικού." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Αυτό το μέσο παρέχει ενημερώσεις πακέτων για το μέσο «%s»" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Αναζήτηση στα ήδη εγκατεστημένα πακέτα..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Αναζήτηση πακέτων προς αναβάθμιση..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Αφαίρεση των πακέτων, πριν την αναβάθμιση..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -291,72 +291,72 @@ msgstr "" "\n" "Θέλετε πραγματικά να αφαιρέστε αυτά τα πακέτα;\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Σφάλμα κατά την ανάγνωση του αρχείου %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Έγινε μετονομασία των παρακάτω δίσκων:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (η προηγούμενη ονομασία ήταν %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Δίκτυο" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Παρακαλώ επιλέξτε ένα μέσο" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Άρνηση αδείας" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Μη έγκυρο όνομα NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Μη έγκυρο μέσο %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Αδύνατη η λήψη στιγμιοτύπων πριν από την δημιουργία κατατμήσεων" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Τα στιγμιότυπα θα είναι διαθέσιμα μετά την εγκατάσταση στο %s" @@ -366,7 +366,7 @@ msgstr "Τα στιγμιότυπα θα είναι διαθέσιμα μετά msgid "Installation" msgstr "Εγκατάσταση" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Ρύθμιση" @@ -467,42 +467,42 @@ msgstr "" "Κάποια πακέτα που ζητήθηκαν από το %s, δεν μπορούν να εγκατασταθούν:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Παρουσιάστηκε ένα σφάλμα :" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Παρουσιάστηκε ένα κρίσιμο σφάλμα: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Να μην ξαναγίνει η ερώτηση" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d συναλλαγές εγκατάστασης απέτυχαν" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Η εγκατάσταση των πακέτων απέτυχε :" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Σταθμός εργασίας" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Σταθμός εργασίας γραφείου" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -511,33 +511,33 @@ msgstr "" "Εργαλεία γραφείου: επεξεργαστές κειμένου (LibreOffice Writer, Kword), " "λογιστικών φύλλων (LibreOffice Calc, Kspread), προβολείς pdf, κλπ" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Παιχνίδια" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" "Προγράμματα διασκέδασης: ηλεκτρονικά παιχνίδια, επιτραπέζια, στρατηγικής, κλπ" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Πολυμέσα" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Προγράμματα αναπαραγωγής και επεξεργασίας βίντεο και ήχου" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Διαδίκτυο" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -546,194 +546,194 @@ msgstr "" "Εργαλεία για αποστολή και λήψη αλληλογραφίας και ειδήσεων (mutt, tin...) και " "για περιήγηση στο διαδίκτυο" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Υπολογιστής δικτύου (πελάτης)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Πελάτες για διαφορετικά πρωτόκολλα συμπεριλαμβανομένου του ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Εργαλεία για διευκόλυνση της ρύθμισης του υπολογιστή σας" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Εργαλεία τερματικού" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Επεξεργαστές, κελύφη, εργαλεία αρχείων, τερματικά" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Ανάπτυξη" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Βιβλιοθήκες ανάπτυξης C και C++, προγράμματα και αρχεία ενσωμάτωσης" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Τεκμηρίωση" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Βιβλία και οδηγίες για το Linux και το ελεύθερο λογισμικό" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "«Linux Standard Base». Υποστήριξη εφαρμογών τρίτων" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Εξυπηρετητής ιστού" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Εξυπηρετητής Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Τείχος προστασίας/Δρομολογητής" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Πύλη διαδικτύου" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Αλληλογραφία/Ειδήσεις" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix εξυπηρετητής ταχυδρομείου, εξυπηρετητής ειδήσεων Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Εξυπηρετητής καταλόγων" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Εξυπηρετητής FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Εξυπηρετητής ονομάτων τομέα και πληροφοριών δικτύου" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Εξυπηρετητής κοινής χρήσης αρχείων και εκτυπωτών" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Εξυπηρετητής NFS, εξυπηρετητής Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Βάση δεδομένων" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Εξυπηρετητής βάσης δεδομένων PostgreSQL και MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Ιστός/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Αλληλογραφία" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Εξυπηρετητής αλληλογραφίας Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Εξυπηρετητής βάσης δεδομένων PostgreSQL ή MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Εξυπηρετητής υπολογιστών δικτύου" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" "Εξυπηρετητής NFS, εξυπηρετητής SMB, εξυπηρετητής Proxy, εξυπηρετητής ssh" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Γραφικό περιβάλλον" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Σταθμός εργασίας KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -741,24 +741,51 @@ msgid "" msgstr "" "Το βασικό περιβάλλον εργασίας KDE με μια συλλογή συνοδευτικών εργαλείων" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Σταθμός Εργασίας Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Ένα γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Σταθμός εργασίας KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "Ένα γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Σταθμός Εργασίας Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Σταθμός εργασίας" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Γραφικό περιβάλλον" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Περιβάλλον εργασίας LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -767,52 +794,74 @@ msgstr "" "Ένα ελαφρύ & γρήγορο γραφικό περιβάλλον με ένα σύνολο φιλικών εργαλείων και " "εφαρμογών" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Προσαρμοσμένο περιβάλλον εργασίας" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Ένα ελαφρύ & γρήγορο γραφικό περιβάλλον με ένα σύνολο φιλικών εργαλείων και " +"εφαρμογών" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Άλλα γραφικά περιβάλλοντα" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, κλπ" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Εργαλεία" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Εξυπηρετητής SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin εξυπηρετητής απομακρυσμένης ρύθμισης" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Εργαλεία δικτύου/εποπτεία δικτύου" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Εργαλεία εποπτείας, απολογισμός διεργασιών, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Οδηγοί Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Οδηγοί για τη ρύθμιση του εξυπηρετητή" @@ -826,7 +875,7 @@ msgstr "" "Παρουσιάστηκε ένα σφάλμα αλλά δεν ξέρω πώς να το χειριστώ.\n" "Συνεχίστε με δική σας ευθύνη." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -883,107 +932,107 @@ msgstr "Επιλογή μέσων" msgid "Install %s KDE Desktop" msgstr "Εγκατάσταση του περιβάλλοντος KDE της %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Εγκατάσταση του περιβάλλοντος GNOME της %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Προσαρμοσμένη εγκατάσταση" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Περιβάλλον εργασίας KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Περιβάλλον εργασίας GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Προσαρμοσμένο περιβάλλον εργασίας" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Αυτή είναι μια προεπισκόπηση του περιβάλλοντος εργασίας «%s»." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Κάντε κλικ στις εικόνες, για να δείτε μια μεγαλύτερη προεπισκόπηση" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Επιλογή ομάδων πακέτων" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Επιλογή μεμονωμένων πακέτων" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Αποεπιλογή όλων" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Συνολικό μέγεθος: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Έκδοση: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Μέγεθος: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Σπουδαιότητα: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Δεν είναι δυνατή η επιλογή/αποεπιλογή του συγκεκριμένου πακέτου" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "λόγω έλλειψης του %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "λόγω μη ικανοποίησης του %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "προσπάθεια προώθησης του %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "για να κρατηθεί το %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -992,104 +1041,104 @@ msgstr "" "Δεν μπορείτε να επιλέξετε αυτό το πακέτο διότι δεν υπάρχει αρκετός ελεύθερος " "χώρος για να το εγκαταστήσετε." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Θα εγκατασταθούν τα παρακάτω πακέτα" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Θα αφαιρεθούν τα παρακάτω πακέτα " -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Αυτό το πακέτο είναι απαραίτητο, δεν μπορεί να αποεπιλεγεί" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Δεν μπορείτε να αποεπιλέξετε αυτό το πακέτο. Είναι ήδη εγκατεστημένο" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Δεν μπορείτε να αποεπιλέξετε αυτό το πακέτο. Πρέπει να αναβαθμιστεί" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Εμφάνιση των επιλεγμένων πακέτων αυτόματα" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Εγκατάσταση" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Φόρτωση/αποθήκευση της επιλογής" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ενημέρωση της επιλογής των πακέτων" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Ελάχιστη εγκατάσταση" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Διαχείριση λογισμικού" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Επιλέξτε τα πακέτα που θέλετε να εγκαταστήσετε" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Εγκατάσταση" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Χωρίς λεπτομέρειες" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Χρόνος που απομένει:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(εκτίμηση...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d πακέτο" msgstr[1] "%d πακέτα" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Σύνοψη" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Ρύθμιση" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "δεν ρυθμίστηκε" @@ -1103,7 +1152,7 @@ msgstr "" "Βρέθηκαν τα ακόλουθα μέσα εγκατάστασης.\n" "Αν θέλετε να παραλείψετε κάποια από αυτά, μπορείτε να τα αποεπιλέξετε τώρα." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1116,7 +1165,7 @@ msgstr "" "Αυτή θα συνεχιστεί από τον σκληρό δίσκο και τα πακέτα θα παραμείνουν " "διαθέσιμα και μετά το τέλος της." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Αντιγραφή ολόκληρων των CD" @@ -1436,28 +1485,28 @@ msgstr "" "Θέλετε να εγκαταστήσετε τις ενημερώσεις ;" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s σε %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Υλικό" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Κάρτα ήχου" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Έχετε κάρτα ήχου ISA;" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1466,73 +1515,73 @@ msgstr "" "Εκτελέστε την εντολή «alsaconf» ή «sndconfig», μετά την εγκατάσταση για να " "ρυθμίσετε την κάρτα ήχου" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Δεν βρέθηκε κάρτα ήχου. Δοκιμάστε το «harddrake» μετά την εγκατάσταση" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Γραφικό περιβάλλον" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Δίκτυο & Διαδίκτυο" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Διαμεσολαβητές" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ρυθμισμένο" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Επίπεδο ασφαλείας" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Τείχος προστασίας" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ενεργοποιημένο" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "απενεργοποιημένο" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Δεν έχετε ρυθμίσει τον Χ. Είστε σίγουρος/η ότι θέλετε πραγματικά αυτό;" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Προετοιμασία του προγράμματος εκκίνησης..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Προετοιμασία του αρχικού προγράμματος εκκίνησης..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Παρακαλώ περιμένετε, η διαδικασία μπορεί να διαρκέσει μερικά λεπτά ..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1545,7 +1594,7 @@ msgstr "" "θα χρειαστεί να χρησιμοποιήσετε το BootX ή μια άλλη μέθοδο για την εκκίνηση " "του υπολογιστή σας. Η παράμετρος πυρήνα για το root fs είναι: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1554,17 +1603,17 @@ msgstr "" "Σε αυτό το επίπεδο ασφαλείας, μόνο ο διαχειριστής έχει πρόσβαση στα αρχεία " "στην κατάτμηση των Windows." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Εισάγετε μια άδεια δισκέτα στον οδηγό %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Δημιουργία δισκέτας αυτόματης εγκατάστασης..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1576,12 +1625,12 @@ msgstr "" "Θέλετε σίγουρα να εγκαταλείψετε τώρα;" # Απαλοιφή τόνου, μετατρέπεται αυτόματα σε κεφαλαία #5755. -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "ΣΥΓΧΑΡΗΤΗΡΙΑ" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Επανεκκίνηση" diff --git a/perl-install/install/share/po/eo.po b/perl-install/install/share/po/eo.po index 4ae4e8221..0bff4a5f5 100644 --- a/perl-install/install/share/po/eo.po +++ b/perl-install/install/share/po/eo.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: eo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2007-12-29 05:55+0100\n" "Last-Translator: Vilhelmo Lutermano \n" "Language-Team: Esperanto \n" @@ -76,7 +76,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,91 +89,91 @@ msgstr "" "\n" "Ĉu vi havas kroman instalan datenportilon por konfiguri? " -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "KD-ROMo" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Reto (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Reto (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Reto (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL de la spegulo?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL devas komenci per ftp:// aŭ http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Mi kontaktas la %s Linuksan retpaĝon por havigi la liston de disponeblaj " "speguloj..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Mi malsukcesis kontakti la %s Linuksan retpaĝon por havigi la liston de " "disponeblaj speguloj..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Elektu spegulon de kiu havigi la pakaĵojn" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-agordo" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Nomo mankas" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Dosierujo devas komenci per \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nomo de la NFS surmeto?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Dosierujo" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Kroma" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -182,90 +182,90 @@ msgstr "" "Mi ne trovas pakaĵlistan dosieron sur tiu spegulo. Certiĝu ke la adreso " "estas ĝusta." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Transsalti ĉiujn pakaĵojn de la datenportilo \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Rigardante jam instalitajn pakaĵojn..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Trovadas pakaĵojn por promocii" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -278,72 +278,72 @@ msgstr "" "\n" "Ĉu vi vere deziras forigi tiujn pakaĵojn?\n" -#: any.pm:932 +#: any.pm:962 #, fuzzy, c-format msgid "Error reading file %s" msgstr "Mi deŝutas dosieron %s..." -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "La sekva(j) disko(j) estas alinomitaj:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (antaŭe nomitaj kiel %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Reto" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Bonvole elektu datenportilon" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Dosiero jam ekzistas. Ĉu surskribi ĝin?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permeso rifuzita" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Malĝusta NFS-nomo" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Malbona datenportilo %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Mi ne povas fari ekranfotojn antaŭ ol subdiskigi" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekranfotoj haveblos post instalado en %s" @@ -353,7 +353,7 @@ msgstr "Ekranfotoj haveblos post instalado en %s" msgid "Installation" msgstr "Instalado" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurado" @@ -453,42 +453,42 @@ msgstr "" "Kelkaj pakaĵoj bezonataj de %s ne instaleblas:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Eraro okazis" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Okazis fatala eraro: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d instal-transakcioj malsukcesis" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instalanta pakaĵo %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Laborstacio" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Oficeja laborstacio" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -497,32 +497,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Ludstacio" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Plurmediaj stacio" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Interreta stacio" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -531,269 +531,316 @@ 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:40 #, c-format msgid "Network Computer (client)" msgstr "Reta computilo (kliento)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsoliloj" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Programado" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentaro" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Subteno por triaflankaj aplikaĵoj" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Interret-servilo" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grupa programaro" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Interreta kluzo" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Poŝto/Novaĵoj" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Dosierujo-servilo" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Servilo" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domajn-noma kaj ret-informa servilo" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Datumbazoj" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Datenbaz-serviloj PostgreSQL kaj MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "TTT/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Poŝto" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix poŝta servilo" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Datenbaz-servilo PostgreSQL aŭ MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Reta computilo (servilo)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-servilo, SMB-servilo, prokur-servilo, ssh-servilo" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafika medio" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Laborstacio" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "La tabula medio K, la baza grafika medio kun kolekto da akompanaj iloj" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Gnoma Laborstacio" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Laborstacio" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnoma Laborstacio" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Laborstacio" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafika medio" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Labortabulo IceWm" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Labortabulo IceWm" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Aliaj grafikaj labortabuloj" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, ktp." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Iloj" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH servilo" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servilo de fora konfigurado Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Retaj utilaĵoj/monitorado" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Sorĉiloj de Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Sorĉiloj por konfiguri servilon" @@ -807,7 +854,7 @@ msgstr "" "Eraro okazis, sed mi ne scias kiel trakti ĝin bone.\n" "Daŭri je via propra risko." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -862,107 +909,107 @@ msgstr "Elektado de Pakaĵaj Grupoj" msgid "Install %s KDE Desktop" msgstr "Instalo de la labortablo %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalo de la labortablo %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Persona instalado" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Labortabulo IceWm" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Labortabulo IceWm" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Labortabulo IceWm" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Elektado de Pakaĵaj Grupoj" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Elektado de individuaj pakaĵoj" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tuta grandeco: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versio: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Grandeco: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Graveco: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Vi ne povas elektu/malelektu ĉi tiun pakaĵon" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "pro mankanta %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "pro neplenumita %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "mi provas disponigi %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "por konservi %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -971,104 +1018,104 @@ msgstr "" "Vi ne povas elekti ĉi tiun pakaĵon ĉar ne estas sufiĉe da spaco por instali\n" "ĝin." -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Montru aŭtomate elektitajn pakaĵojn" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalu" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Ŝargi/Konservi selekton" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ĝisdatigo de pakaĵ-elekto" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimuma instalado" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programar-mastrumilo" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Elektu la pakaĵojn kiuj vi deziras instali" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalanta" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Neniaj detaloj" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Tempo restanta " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Taksas" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resumo" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfiguru" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ne konfigurita" @@ -1082,7 +1129,7 @@ msgstr "" "La sekva instal-datenportilo(j) estas trovita(j).\n" "Se vi deziras transsalti kelkajn de ili, vi povas tiujn nun malselekti." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1095,7 +1142,7 @@ msgstr "" "Tiam la instalado daŭrigas el la fiksdisko kaj la pakaĵoj restos atingeblaj " "post kiam la sistemo estos plene instalita." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopii kompletajn KD-ojn" @@ -1401,28 +1448,28 @@ msgstr "" "Ĉu vi deziras instali tiujn ĝisdatigojn?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s sur %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Aparataro" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Sonkarto" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Ĉu vi havas ISA-sonkarton?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1431,73 +1478,73 @@ msgstr "" "Rulu \"alsaconf\" aŭ \"sndconfig\" post instalado por konfiguri vian " "sonkarton" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Ne detektis sonkarto. Provu \"harddrake\" post instalado" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafika interfaco" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Reto kaj Interreto" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Prokuraj Serviloj" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfigurita" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "sekurnivelo" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Fajromuro (Firewall)" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiva" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "malebligita" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Preparas startŝargilon" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Preparas instaladon" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1510,7 +1557,7 @@ msgstr "" "rimedon por startigi vian maŝinon. La kerno-argumento por la root fs " "[dosiersistemo] estas: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1519,17 +1566,17 @@ msgstr "" "Sur tiu ĉi sekurec-nivelo, la aliro al dosieroj en la Vindozaj subdiskoj " "estas limigitaj al la mastrumanto." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Enŝovu malplenan disketon en drajvo %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Kreas aŭtoinstalan disketon" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1540,12 +1587,12 @@ msgstr "" "\n" "Ĉu vi vere volas ĉesi nun?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulojn" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Restarto" diff --git a/perl-install/install/share/po/es.po b/perl-install/install/share/po/es.po index d53cd717a..2e8759847 100644 --- a/perl-install/install/share/po/es.po +++ b/perl-install/install/share/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-04 23:27-0500\n" "Last-Translator: Diego Bello \n" "Language-Team: Spanish \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "¿Tiene usted otros medios complementarios?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,91 +88,91 @@ msgstr "" "\n" "¿Tiene otro medio de instalación complementario que configurar?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Red (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Red (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Red (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "¿Cuál es la URL del servidor espejo?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "La URL debe comenzar con ftp:// o http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Contactando al sitio web %s para obtener la lista de servidores espejo " "disponibles..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "No se ha podido contactar con el sitio web %s para obtener la lista de " "espejos disponibles" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Elija un servidor espejo desde el cual obtener los paquetes" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuración NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Por favor, introduzca el nombre de equipo y directorio de su medio NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Falta nombre de equipo" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "El directorio debe comenzar con \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "¿Cuál es el nombre de equipo del montaje NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directorio" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Complementario" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -181,22 +181,22 @@ msgstr "" "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:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Versión Core" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Versión Tainted" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Versión Nonfree" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -205,22 +205,22 @@ msgstr "" "Hardware de su máquina necesita de firmware no libre para que los " "controladores de software libre funcionen." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Debería habilitar \"%s\"" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" contiene software no libre.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -230,7 +230,7 @@ msgstr "" "(ej: algunas tarjetas gráficas ATI/AMD, algunas tarjetas de red, algunas " "tarjetas RAID, etc)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -239,40 +239,40 @@ msgstr "" "\"%s\" contiene software que no puede ser distribuido en todos los países " "debido a patentes de software." -#: any.pm:359 +#: any.pm:381 #, 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:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Aquí puede habilitar mas medios si así lo desea." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Este medio provee actualizaciones de paquetes para el medio \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Buscando paquetes ya instalados..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Encontrando los paquetes a actualizar..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -286,72 +286,72 @@ msgstr "" "\n" "¿Está seguro de que quiere eliminar estos paquetes?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Error al leer el archivo %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "El o los siguientes discos fueron renombrados:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (antes conocido como %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Red" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Por favor, elija un medio" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "El archivo ya existe. ¿Sobrescribirlo?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permiso denegado" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nombre NFS erróneo" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Medio %s erróneo" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "No se puede hacer capturas de pantalla antes de particionar" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -362,7 +362,7 @@ msgstr "" msgid "Installation" msgstr "Instalación" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuración" @@ -463,42 +463,42 @@ msgstr "" "Algunos paquetes requeridos por %s no se pueden instalar:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Se produjo un error:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ocurrió un error fatal: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "No preguntar de nuevo" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Fallaron %d operaciones de instalación" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Falló la instalación de paquetes:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Estación de trabajo" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Estación de trabajo de oficina" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -507,32 +507,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Estación de juegos" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Programas de diversión: arcade, tableros, estrategia, etc." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Estación Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programas de reproducción y edición de sonido y video" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Estación de Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -541,193 +541,193 @@ msgstr "" "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:40 #, c-format msgid "Network Computer (client)" msgstr "Computador de red (cliente)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Clientes para diferentes protocolos, incluyendo ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Herramientas para facilitar la configuración de su computador" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Herramientas de consola" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desarrollo" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentación" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Base estándar de Linux. Soporte de aplicaciones de terceros" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servidor Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Cortafuegos/Enrutador" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Puerta de enlace de Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Correo/Noticias" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Servidor de correo Postfix, Servidor de noticias Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Servidor de directorio" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Nombre de dominio y Servidor de Información de Red" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Servidor de compartición de archivos e impresoras" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Bases de datos" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Correo" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servidor de correo Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Servidor de computador de red" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Entorno gráfico" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Estación de trabajo KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -736,12 +736,12 @@ msgstr "" "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:156 #, c-format msgid "GNOME Workstation" msgstr "Estación de trabajo GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -750,12 +750,41 @@ msgstr "" "Un entorno gráfico con un conjunto de aplicaciones y herramientas de " "escritorio amigables con el usuario" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Estación de trabajo KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Un entorno gráfico con un conjunto de aplicaciones y herramientas de " +"escritorio amigables con el usuario" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Estación de trabajo GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estación de trabajo" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Entorno gráfico" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Escritorio LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -764,53 +793,75 @@ msgstr "" "Un ambiente gráfico liviano y rápido, con un conjunto de aplicaciones " "amigables y herramientas de escritorio" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Escritorio personalizado" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un ambiente gráfico liviano y rápido, con un conjunto de aplicaciones " +"amigables y herramientas de escritorio" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Otros escritorios gráficos" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, FVWM, etc." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilidades" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servidor de Configuración Remota Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilidades y monitoreo de red" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" "Herramientas de supervisión, contabilidad de procesos, tcpdump, nmap, etc." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Asistentes de Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Asistentes para configurar el servidor" @@ -824,7 +875,7 @@ msgstr "" "Se produjo un error, pero no sé cómo manejarlo bien.\n" "Continúe bajo su propio riesgo." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -880,107 +931,107 @@ msgstr "Selección de medios" msgid "Install %s KDE Desktop" msgstr "Instalar escritorio KDE %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalar escritorio GNOME %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalación personalizada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Escritorio KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Escritorio GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Escritorio personalizado" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Aquí hay una vista previa del escritorio '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Haga clic en las imágenes para ver una vista previa más grande" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selección de Grupo de paquetes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selección individual de paquetes" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Deseleccionar todas." -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tamaño total: %d/%d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versión: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamaño: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importancia: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "No se puede seleccionar/des-seleccionar de este paquete" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "debido a que falta %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "debido a que no se satisfizo %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "tratando de promover %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "para mantener %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -989,104 +1040,104 @@ msgstr "" "No se puede seleccionar el paquete ya que no hay suficiente espacio para " "instalarlo" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Los siguientes paquetes se van a instalar" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Los siguientes paquetes se van a quitar" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Este es un paquete obligatorio, no puede ser des-seleccionado" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "No se puede des-seleccionar este paquete. Ya está instalado" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "No se puede des-seleccionar este paquete. Debe ser actualizado" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostrar los paquetes seleccionados automáticamente" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalar" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Cargar/Guardar selección" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Actualizando la selección de paquetes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalación mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Administración de Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Seleccione los paquetes que desea instalar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalando" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "No hay detalles" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tiempo restante:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(Estimando...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paquete" msgstr[1] "%d paquetes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resumen" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurar" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "no configurado" @@ -1100,7 +1151,7 @@ msgstr "" "Se han encontrado los siguientes medios de instalación.\n" "Si desea omitir algunos de ellos, puede desseleccionar algunos ahora." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1113,7 +1164,7 @@ msgstr "" "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:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiar todos los CDs" @@ -1426,28 +1477,28 @@ msgstr "" "¿Desea instalar las actualizaciones?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s en %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Tarjeta de sonido" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "¿Tiene una tarjeta de sonido ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1456,75 +1507,75 @@ msgstr "" "Ejecute \"alsaconf\" o \"sndconfig\" después de la instalación para " "configurar la tarjeta de sonido" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "No se detectó tarjeta de sonido. Trate \"HardDrake\" después de la " "instalación" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaz gráfica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Redes e Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Servidores proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurado" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel de seguridad" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Cortafuegos" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activado" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "deshabilitado" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "No se ha configurado X. ¿Está seguro de que desea esto?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Preparando el cargador de arranque..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Preparando el programa de instalación inicial..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Sea paciente, esto puede tardar un tiempo..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1537,7 +1588,7 @@ msgstr "" "tendrá que utilizar BootX o algún otro medio para arrancar su máquina. El " "argumento del núcleo para el sistema de ficheros raíz es: root =%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1546,17 +1597,17 @@ msgstr "" "En este nivel de seguridad, el acceso a los archivos en la partición de " "Windows está restringido al administrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Inserte un disquete en blanco en la unidad %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Creando disquete de instalación automática..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1567,12 +1618,12 @@ msgstr "" "\n" "¿Está seguro que desea salir ahora?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Felicitaciones" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reiniciar" diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po index 66b4177df..603a4c372 100644 --- a/perl-install/install/share/po/et.po +++ b/perl-install/install/share/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-03 14:04+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,90 +87,90 @@ msgstr "" "\n" "Kas Teil on veel paigaldusandmekandjaid?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Võrk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Võrk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Võrk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Peegli URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL-i alguses peab seisma ftp:// või http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Ühendumine %s veebileheküljega saadaolevate peeglite nimekirja hankimiseks..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Ühendumine %s veebileheküljega saadaolevate peeglite nimekirja hankimiseks " "nurjus" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Valige peegel, millelt lugeda pakettide nimekiri" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-i seadistamine" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Palun andke NFS-andmekandja masinanimi ja kataloog" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Masinanimi puudub" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Kataloogi alguses peab olema \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS-i andmekandja masinanimi?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Kataloog" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Täiendav" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -179,22 +179,22 @@ msgstr "" "Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt nurjus. " "Kontrollige palun asukohta." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Tuumiktarkvara (core)" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Piirangutega tarkvara (tainted)" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Mittevaba tarkvara (non-free)" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -203,22 +203,22 @@ msgstr "" "Osa Teie masina riistvarast vajab mittevaba püsivara, et vaba tarkvara " "draiverid saaksid korralikult töötada." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Teil tuleks lubada \"%s\" kasutamine" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" sisaldab, nagu nimigi ütleb, mittevaba tarkvara.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -227,7 +227,7 @@ 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:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -236,39 +236,39 @@ msgstr "" "\"%s\" sisaldab tarkvara, mida ei ole tarkvarapatentide tõttu võimalik " "kõigis riikides vabalt levitada." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "Samuti sisaldab see lisaomaduste huvides ümber ehitatud \"%s\"." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Siin saab soovi korral lubada rohkemate andmekandjate kasutamist." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "See andmekandja sisaldab \"%s\" uuendusi" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Juba paigaldatud pakettide tuvastamine..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Uuendatavate pakettide otsimine..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -281,72 +281,72 @@ msgstr "" "\n" "Kas tõesti eemaldada need paketid?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Viga faili %s lugemisel" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Järgmistele ketastele anti uus nimi:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (varem oli %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Võrk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Palun valige andmekandja" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fail on juba olemas. Kas kirjutada see üle?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Ligipääs keelatud" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Vigane NFS-i nimi" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Vigane andmekandja %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ekraanipilte ei saa teha enne partitsioneerimist" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s" @@ -356,7 +356,7 @@ msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s" msgid "Installation" msgstr "Paigaldamine" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Seadistamine" @@ -455,42 +455,42 @@ msgstr "" "Mõningaid pakette, mida nõuab %s, ei saa paigaldada:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Tekkis viga:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Tekkis saatuslik viga: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Rohkem ei küsita" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d paigaldamistehingut nurjus" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Pakettide paigaldamine nurjus:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Tööjaam" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kontori-tööjaam" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -499,32 +499,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Mänguvahend" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimeedia-tööjaam" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Interneti-tööjaam" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -533,217 +533,244 @@ msgstr "" "Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi " "lehitsemiseks" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Võrguarvuti (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsoolitööriistad" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Arendus" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C ja C++ arendusteegid, rakendused ja päisefailid" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentatsioon" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Veebiserver" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grupitöö" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-post/Uudistegrupid" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Kataloogiserver" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Nimeserver ja võrguteabeserver" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Faili- ja printserver" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS-server, Samba-server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Andmebaasid" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- ja MariaDB-andmebaasiserver" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Veeb/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache ja Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfixi e-posti server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- või MariaDB-andmebaasiserver" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Võrguserver" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Graafiline keskkond" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE tööjaam" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME tööjaam" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE tööjaam" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME tööjaam" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Tööjaam" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Graafiline keskkond" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE töölaud" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -752,52 +779,74 @@ msgstr "" "Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike " "rakenduste ja tööriistadega" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Kohandatud töölaud" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike " +"rakenduste ja tööriistadega" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Muud graafilised töölauad" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "WindowMaker, Enlightenment, Fvwm jt" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utiliidid" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin võrguseadistusserver" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, 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:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia nõustajad" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Serverite seadistamise nõustajad" @@ -811,7 +860,7 @@ msgstr "" "Tekkis tõrge, mida programm ei suuda ise klaarida.\n" "Jätkake omal vastutusel." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -864,211 +913,211 @@ msgstr "Andmekandjate valik" msgid "Install %s KDE Desktop" msgstr "%s KDE töölaua paigaldamine" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "%s GNOME töölaua paigaldamine" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Kohandatud paigaldamine" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE töölaud" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME töölaud" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Kohandatud töölaud" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Siin näeb '%s' töölaua eelvaatlust." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Klõpsake piltidel suurema eelvaatluse nägemiseks" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Paketigruppide valik" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Valik paketthaaval" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Tühista kõigi valimine" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Suurus kokku: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versioon: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Suurus: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Tähtsus: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Seda paketti ei saa valida/valimata jätta" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "puuduva %s tõttu" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "rahuldamata %s tõttu" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "püüdes välja pakkuda %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "säilitamaks %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Seda paketti ei saa valida, sest paigaldamiseks napib kettaruumi" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "See pakett on kohustuslik" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "See pakett on juba paigaldatud" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automaatselt valitud pakettide näitamine" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Paigalda" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Valiku laadimine/salvestamine" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Paketivaliku uuendamine" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimaalne paigaldus" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Tarkvarahaldur" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Valige paketid, mida soovite paigaldada" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Paigaldamine" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Üksikasjadeta" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Aega jäänud:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(arvutatakse...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakett" msgstr[1] "%d paketti" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Kokkuvõte" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Seadista" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "seadistamata" @@ -1082,7 +1131,7 @@ msgstr "" "Leiti järgmised paigaldusandmekandjad.\n" "Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1094,7 +1143,7 @@ msgstr "" "Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal " "kättesaadav ka pärast süsteemi paigaldamist." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopeeri kõik CD-d" @@ -1399,28 +1448,28 @@ msgstr "" "Kas soovite uuendusi paigaldada?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s asukohas %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Riistvara" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Helikaart" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Kas Teil on ISA helikaart?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1429,75 +1478,75 @@ msgstr "" "Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või " "\"sndconfig\"" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Graafiline kasutajaliides" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Kohtvõrk ja internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Puhverserverid" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "seadistatud" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Turvatase" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Tulemüür" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiveeritud" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "keelatud" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Alglaaduri ettevalmistamine..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Alglaadimisprogrammi ettevalmistamine..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Varuge kannatust, see võib võtta veidi aega..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1510,7 +1559,7 @@ msgstr "" "tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument " "juurfailisüsteemi jaoks on root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1519,17 +1568,17 @@ msgstr "" "Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi " "ainult administraator." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Pange palun tühi diskett seadmesse %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Kiirpaigaldusdisketi loomine..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1540,12 +1589,12 @@ msgstr "" "\n" "Kas soovite tõesti praegu lõpetada ja väljuda?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Õnnitleme!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Taaskäivitus" diff --git a/perl-install/install/share/po/eu.po b/perl-install/install/share/po/eu.po index b13d985dd..73c2b39d8 100644 --- a/perl-install/install/share/po/eu.po +++ b/perl-install/install/share/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-09-19 08:21+0200\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque \n" @@ -75,7 +75,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,180 +88,180 @@ msgstr "" "\n" "Badaukazu konfiguratu beharreko gainerako instalazio euskarririk?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Sarea (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Sarea (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Sarea (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Ispiluaren URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL-ak ftp:// edo http:// aurretik izan behar du" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "%s web gunearekin konektatzen, ispilu erabilgarrien zerrenda lortzeko..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "%s web gunearekin eskuragarri dauden ispiluen zerrenda lortzeko harremanak " "huts egin du" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Aukeratu ispilu bat paketeak bertatik hartzeko" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS ezarpena" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Ostalari izena falta da" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Direktorioa honekin \"/\" hasi behar da" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS muntaiaren ostalari izena?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktorioa" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Osagarria" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Ezin aurkitu hdlist fitxategia ispilu honetan" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\" euskarriko pakete guztiak utzi" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Instalatutako paketeak bilatzen..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Bertsio berritzeko paketeak bilatzen..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -274,72 +274,72 @@ msgstr "" "\n" "Ziur zaude pakete hauek kendu nahi dituzula?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Errorea %s fitxategia irakurtzean" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Ondoko diskoa(k) berrizendatu egin d(ir)a:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (lehenago %s deitua)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Sarea" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Aukeratu euskarri bat mesedez" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fitxategia badago lehendik ere. Gainidatzi?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Baimena ukatuta" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "NFS izen okerra" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "%s okerreko euskarria" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ezin da pantaila-argazkirik egin partizioak egin aurretik" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -350,7 +350,7 @@ msgstr "" msgid "Installation" msgstr "Instalaketa" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurazioa" @@ -450,42 +450,42 @@ msgstr "" "%s-k eskatutako pakete batzuk ezin dira instalatu:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Akats bat gertatu da:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Akats larria gertatu da: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d instaketa eragiketek huts egin dute" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Paketeen instalaketak huts egin du:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Lanpostua" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Bulegoko lanpostua" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -494,33 +494,33 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Jokoak" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -529,193 +529,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:40 #, c-format msgid "Network Computer (client)" msgstr "Sare-ordenagailua (bezeroa)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Kontsola-tresnak" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Garapena" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentazioa" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web zerbitzaria" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Taldelanerako Aplikazioak" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Interneteko atebidea" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Posta/Berriak" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Direktorio Zerbitzara" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Zerbitzaria" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domeinu Izen eta Sare Informazio Zerbitzaria" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Datu-basea" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL eta MariaDB Datubase Zerbitzaria" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Posta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix posta-zerbitzaria" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL edo MariaDB datu-baseen zerbitzaria" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Sare-zerbitzaria" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Ingurune grafikoa" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE lanpostua" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -723,12 +723,12 @@ msgid "" msgstr "" "K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME lanpostua" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -737,12 +737,41 @@ msgstr "" "Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen " "ingurune grafikoa" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE lanpostua" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen " +"ingurune grafikoa" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME lanpostua" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Lanpostua" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ingurune grafikoa" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE Idaztegia" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -751,52 +780,74 @@ msgstr "" "Ingurune grafiko arin eta azkarra aplikazio multzo eta mahaigaineko tresna " "erabilerrazak dituena" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Idaztegia pertsonalizatua" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Ingurune grafiko arin eta azkarra aplikazio multzo eta mahaigaineko tresna " +"erabilerrazak dituena" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Beste mahaigain grafiko batzuk" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etab." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilitateak" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH zerbitzaria" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin Urruneko Konfigurazio Zerbitzaria" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Sare Utilitateak/Gainbegiraketa" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Morroiak" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Zerbitzaria konfiguratzeko morroiak" @@ -810,7 +861,7 @@ msgstr "" "Errore bat gertatu da, baina ez dakit behar bezala maneiatzen.\n" "Jarraitu zure ardurapean." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -864,211 +915,211 @@ msgstr "Euskarri hautaketa" msgid "Install %s KDE Desktop" msgstr "Instalatu %s KDE Idaztegia" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalatu %s GNOME Idaztegia" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalaketa pertsonalizatua" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE Idaztegia" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME Idaztegia" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Idaztegia pertsonalizatua" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Hemen duzu '%s' idaztegiaren aurrebista bat." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Klikatu irudietan aurrebista haundiago ikusteko" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakete-taldearen hautapena" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Pakete indibidualen hautapena" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Desautatutako guztiak" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Guztizko tamaina: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Bertsioa: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamaina: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Garrantzia: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ezin duzu pakete hau hautatu/desautatu" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s falta delako" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s bete gabe dagoelako" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s jaso nahian" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s gordetzeko" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Ezin duzu pakete hori hautatu: ez dago instalatzeko lekurik" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ondorengo pakete hauek instalatuko dira" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Ondorengo pakete hauek kenduko dira" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Nahitaezko paketea da, ezin da desautatu" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Ezin duzu pakete hau desautatu. Dagoeneko instalatuta dago" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Ezin duzu pakete hau desautatu. Bertsio berritu egin behar da" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Erakutsi automatikoki hautatutako paketeak" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalatu" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Hautapena Zamatu/Gorde" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Pakete-hautapena eguneratzen" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Gutxieneko instalazioa" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Software kudeaketa" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Aukeratu instalatu nahi dituzun paketeak" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalatzen" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Xehetasunik ez" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Geratzen den denbora:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(Kalkulatzen...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "pakete %d" msgstr[1] "%d pakete" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Laburpena" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfiguratu" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "konfiguratu gabe" @@ -1082,7 +1133,7 @@ msgstr "" "Ondorengo instalazio euskarriak aurkitu dira.\n" "Horietako batzuk erabiltzerik nahi ez baduzu, haututik kendu ditzakezu orain." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1094,7 +1145,7 @@ msgstr "" "Disko zurrunetik jarraituko du orduan eta paketeak eskuragarri egongo dira " "sistema osorik instalatu ondoren." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiatu CD osoak" @@ -1404,28 +1455,28 @@ msgstr "" "Eguneratzeak instalatu nahi dituzu?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s - %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardwarea" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Soinu-txartela" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "ISA soinu-txartela duzu?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1434,75 +1485,75 @@ msgstr "" "Instalazioa egindakoan, exekutatu \"alsaconf\" edo \"sndconfig\" soinu-" "txartela konfiguratzeko" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaze grafikoa" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Sarea eta Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy-ak" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfiguratuta" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Segurtasun-maila" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Suebakia" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktibatuta" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "desgaituta" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "X ez duzu konfiguratu. Ziur zaude hori dela egin nahi duzuna?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Abioko kargatzailea prestatzen..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Instalazioa prestatzen" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Pazientzia izan, pixka baterako dauka..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1515,7 +1566,7 @@ msgstr "" "abiatzeko beste bide bat erabili beharko duzu zure makina abiarazteko. Erro " "fitxategi sistemarentzako nukleo argumentua honakoa da: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1524,17 +1575,17 @@ msgstr "" "Segurtasun-maila honetan, administratzaileak soilik du Windows partizioko " "fitxategiak atzitzeko eskubidea." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Sartu diskete huts bat %s unitatean" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Auto-instalazioko disketea sortzen..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1545,12 +1596,12 @@ msgstr "" "\n" "Ziur zaude orain irten nahi duzula?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Zorionak" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Berrabiarazi" diff --git a/perl-install/install/share/po/fa.po b/perl-install/install/share/po/fa.po index c3482837e..36d264b8c 100644 --- a/perl-install/install/share/po/fa.po +++ b/perl-install/install/share/po/fa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-fa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-02-26 06:31+0100\n" "Last-Translator: Abbas Izad \n" "Language-Team: Persian\n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "آیا رسانه مکمل دیگری دارید؟" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,181 +82,181 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "شبکه (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "شبکه (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "نشانی اینترنتی آینه؟" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های " "آینه‌های موجود..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های " "آینه‌های موجود..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "انتخاب آینه‌ای برای گرفتن بسته‌ها" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "شاخه" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "نمیتوان پرونده hdlist را بر این آینه پیدا کرد" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "بررسی بسته‌های از قبل نصب شده..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "یافتن بسته‌های برای ارتقاء..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -269,72 +269,72 @@ msgstr "" "\n" "آیا واقعاً می‌خواهید این بسته‌ها را بردارید؟\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "خطا در خواندن پرونده‌ی %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "دیسک(های) بدنبال تغییر نام داده شده‌اند:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (قبلا نامش %s بود(" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "شبکه" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "لطفاً رسانه‌ای را انتخاب کنید" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "پرونده از قبل وجود دارد. بازنویسی شود؟" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "اجازه داده نشد" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "رسانه بد %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "نمی‌توان قبل از قسمت‌بندی عکس‌صفحه گرفت" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "عکس‌صفحه‌ها بعد از نصب در %s در دسترس خواهند بود" @@ -344,7 +344,7 @@ msgstr "عکس‌صفحه‌ها بعد از نصب در %s در دسترس خو msgid "Installation" msgstr "نصب کردن" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "پیکربندی" @@ -440,42 +440,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "خطائی رخ داد" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "یک خطای مهلک رخ داد: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "نصب شکست خورد" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "نصب کردن بسته‌ی %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "ایستگاه‌کار" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "ایستگاه‌کار دفتری" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -484,301 +484,348 @@ msgstr "" "برنامه های دفتری: واژه پردازان (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "ایستگاه بازی" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "ایستگاه چندرسانه‌ای" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "ایستگاه اینترنت" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "رایانه‌ی شبکه (کارگیر)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "ابزارهای کنسول" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "برنامه‌سازی" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "کتابخانه‌های برنامه‌سازی C و C++، برنامه‌ها و پرونده‌های شامل" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "نوشتار" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "کارگزار‌ وب" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "آپاچ" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "گروه افزار" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "کارگزار Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "دیوار‌آتش/مسیریاب" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "دروازه‌ی اینترنت" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "پست/اخبار" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "کارگزار پست Postfix، کارگزار اخبار Inn " -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "کارگزار شاخه" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "کارگزار FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "نام دامنه و کارگزار اطلاعات شبکه" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "کارگزاراشتراک چاپگر و پرونده" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "کارگزار NFS، کارگزار Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "بانک ‌اطلاعات" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "کارگزار پایگاه داده‌ی PostgreSQL و MariaDB " -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "پست" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "کارگزار پست Postfix " -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MariaDB " -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "کارگزار شبکه‌ی رایانه" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "کارگزار NFS , کارگزار SMB , کارگزار Proxy , کارگزار ssh " -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "محیط گرافیکی" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "ایستگاه‌کار KDE " -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "ایستگاه‌کار گنوم" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "ایستگاه‌کار KDE " + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "ایستگاه‌کار گنوم" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "ایستگاه‌کار" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "محیط گرافیکی" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "رومیزی Plucker" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "رومیزی Plucker" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "دیگر رومیزی‌های گرافیکی" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, 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:217 #, c-format msgid "Utilities" msgstr "وسایل" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "کارگزار‌ SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "کارگزار پیکربندی از راه دور Webmin " -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "پایشگری/وسایل شبکه" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "جادوگران نرم افزار ماندریبا" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "جادوگران برای پیکربندی کارگزار" @@ -792,7 +839,7 @@ msgstr "" "خطائی رخ داد، اما نمی‌دانم چگونه آن را بخوبی اداره کنم.\n" "با مسئولیت خودتان ادامه دهید." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -848,107 +895,107 @@ msgstr "گزینش گروه بسته" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "نصب حداقل" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "رومیزی Plucker" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "رومیزی Plucker" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "رومیزی Plucker" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "گزینش گروه بسته" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "انتخاب بسته‌ی تکی" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "همه انتخاب نشده‌اند" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "اندازه‌ی کل: %d / %d مگابایت" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "نسخه: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "اندازه: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d کیلوبایت\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "اهمیت: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "نمی‌توانید این بسته را انتخاب/غیر انتخاب کنید" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "بدلیل فقدان %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "بدلیل عدم ارضای %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "تلاش برای تبلیغ %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "بمنظور نگهداشتن %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -957,103 +1004,103 @@ msgstr "" "نمی‌توانید این بسته را انتخاب کنید چرا که فضای کافی برای نصب آن باقی نمانده " "است" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "بسته‌های بدنبال آمده نصب خواهند شد" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "بسته‌های بدنبال آمده برداشته خواهند شد" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "این بسته‌ای ضروری است، نمی‌تواند که گزیده نشود." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "نمی‌توانید این بسته را انتخاب نکنید. آن از قبل نصب شده است " -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "نمی‌توانید این بسته را انتخاب نکنید. این باید ارتقاء داده شود" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "نشان دادن خودکار بسته‌های انتخاب شده" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "نصب" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "بارگذاری/ذخیره انتخاب" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "بروزسازی مجموعه بسته" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "نصب حداقل" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "مدیریت نرم‌افزار" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "بسته‌هایی را که می‌خواهید نصب کنید انتخاب کنید" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "نصب کردن" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "بدون جزئیات" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "زمان باقیمانده " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "تخمین زدن" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "بسته‌های %d" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "خلاصه" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "پیکربندی" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "پیکربندی نشده است" @@ -1067,7 +1114,7 @@ msgstr "" "رسانه نصب بدنبال آمده یافت شد.\n" "اگر میخواهید بعضی از آنها را نادیده بگیرید میتوانید آنها را اکنون نگزینید." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1079,7 +1126,7 @@ msgstr "" "سپس آن از دیسک سخت ادامه یافته و بسته‌ها وقتی که سیستم کاملا نصب گردید در " "دسترس خواهند بود." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "کپی کردن تمام سی‌دی‌ها" @@ -1376,28 +1423,28 @@ msgstr "" "آیا می‌خواهید بروزسازی‌ها را نصب کنید؟" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s بر %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "سخت‌افزار" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "کارت صوتی" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "آیا کارت صوتی ISA دارید؟" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1406,73 +1453,73 @@ msgstr "" "برای پیکربندی کارت صوتی خود بعد از نصب برنامه‌ی \"sndconfig\" یا \"alsaconf" "\" را اجرا کنید" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "هیچ کارت صوتی شناسایی نشد. \"harddrake\" را بعد از نصب امتحان کنید" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "واسط گرافیکی" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "شبکه و اینترنت" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "پراکسی‌ها" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "پیکربندی شده" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "سطح امنیتی" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "دیوارآتش" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "فعال شده" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "از کار افتاده" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "شما ایکس را پیکربندی نکرده‌اید. آیا واقعاً مطمئنید که این را می‌خواهید؟" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "آماده کردن بارگذار آغازگر..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "آماده کردن نصب" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1486,7 +1533,7 @@ msgstr "" "از BootX یا طریق دیگری برای آغازگری استفاده کنید. آرگومان هسته برای سیستم " "پرونده ریشه: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1494,17 +1541,17 @@ msgid "" msgstr "" "در این سطح امنیتی، دستیابی به پرونده‌های قسمت‌بندی ویندوز محدود به مدیر است." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "یک دیسکچه‌ی خالی را در گرداننده‌ی %s داخل کنید" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "ایجاد کردن دیسکچه‌ی نصب خودکار..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1515,12 +1562,12 @@ msgstr "" "\n" "واقعاً می‌خواهید اکنون ترک کنید؟" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "تبریک می‌گوئیم!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "آغازگری مجدد" diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po index 9d09b4f9e..d625e35c6 100644 --- a/perl-install/install/share/po/fi.po +++ b/perl-install/install/share/po/fi.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2011-05-21 23:25+0300\n" "Last-Translator: Jani Välimaa \n" "Language-Team: Finnish \n" @@ -83,7 +83,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -96,88 +96,88 @@ msgstr "" "\n" "Onko käytettävissä muita asennusmedioita?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD/DVD-levy" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Verkko (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Verkko (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Verkko (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Peilipalvelimen osoite?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Osoitteen täytyy alkaa etuliitteellä ftp:// tai http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Otetaan yhteys %sin sivustolle peilipalvelinlistan hakemiseksi..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Yhteydenotto %sin sivustolle peilipalvelinlistan hakemiseksi epäonnistui" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Valitse peilipalvelin, jolta paketit haetaan" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-asetukset" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Syötä NFS-palvelimen nimi ja hakemistopolku" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Palvelimen osoite puuttuu" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Hakemistopolun täytyy alkaa \"/\"-merkillä" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS-palvelimen nimi?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Hakemisto" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Lisämedia" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -186,90 +186,90 @@ msgstr "" "Peilipalvelimelta ei löydy tiedostolistausta. Varmista tiedostopolun " "oikeellisuus." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Ohita kaikki paketit medialta \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Etsitään asennettuja paketteja..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Etsitään paketteja päivitettäväksi..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -282,72 +282,72 @@ msgstr "" "\n" "Poistetaanko paketit?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Virhe luettaessa tiedostoa %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Seuraavat levyt nimettiin uudelleen:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ennen: %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Verkko" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Valitse media" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Tiedosto jo olemassa. Korvaa?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Ei oikeuksia" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Virheellinen NFS-nimi" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Virheellinen media %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kuvakaappauksia ei voida ottaa ennen osiointia" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s" @@ -357,7 +357,7 @@ msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s" msgid "Installation" msgstr "Asennus" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Asetukset" @@ -456,42 +456,42 @@ msgstr "" "Joitakin paketin %s vaatimia paketteja ei voida asentaa:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Virhe:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Tapahtui ohittamaton virhe: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Älä kysy uudelleen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d asennustapahtumaa epäonnistui" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Pakettien asennus epäonnistui:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Työasema" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Toimistotyöasema" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -500,32 +500,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Peliasema" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediatyöasema" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet-työasema" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -534,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:40 #, c-format msgid "Network Computer (client)" msgstr "Verkkopääte (asiakas)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Komentorivityökalut" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Kehitysympäristö" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentaatio" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" "Linux Standard Base (LSB)\n" " - Tuki kolmannen osapuolen ohjelmistoille" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "WWW-palvelin" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-palvelin" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Palomuuri / Reititin" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internetin yhdyskäytävä" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Sähköposti / Uutiset" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Hakemisto-palvelin" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-palvelin" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS / NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS- ja NIS-palvelin" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Tiedosto- ja tulostuspalvelin" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Tietokanta" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- ja MariaDB-tietokantapalvelin" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "WWW / FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, 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:126 #, c-format msgid "Mail" msgstr "Sähköposti" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix-sähköpostipalvelin" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- tai MariaDB-tietokantapalvelin" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Verkkotietokone (palvelin)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-, SMB-, SSH- ja välityspalvelin" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Graafinen ympäristö" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-työasema" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -731,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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-työasema" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -744,12 +744,40 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-työasema" + +#: share/meta-task/compssUsers.pl:163 +#, 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-työasema" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Työasema" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Graafinen ympäristö" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-työpöytä" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -758,52 +786,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Mukautettu" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"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:193 #, 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:194 +#, 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:217 #, c-format msgid "Utilities" msgstr "Työkalut" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-palvelin" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin etäasetuspalvelin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Verkkotyökalut ja verkon valvonta" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageian asetusvelhot" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Velhoja palvelinten asettamiseksi" @@ -817,7 +867,7 @@ msgstr "" "Ilmeni virhe, eikä sitä ei voida käsitellä kunnolla.\n" "Jatka omalla vastuullasi." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -873,110 +923,110 @@ msgstr "Asennusmedioiden valinta" msgid "Install %s KDE Desktop" msgstr "Asenna %s KDE-työpöytäympäristöllä" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Asenna %s GNOME-työpöytäympäristöllä" # Asennuksen sivuvalikko -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Mukautettu asennus" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-työpöytä" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME-työpöytä" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Mukautettu" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "%s-työpöydän esikatselu." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Kuvaa napsauttamalla aukeaa isompi esikatselukuva." -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakettiryhmien valinta" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Yksittäisten pakettien valinta" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Poista valinnat" # mat -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Koko yhteensä: %d / %d Mt" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versio: " # mat -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Koko: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d kt\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Tärkeys: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Pakettia ei voida valita tai poistaa" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "puuttuvan riippuvuuden %s vuoksi" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "täyttämättömistä riippuvuuksista %s johtuen" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "yritetään asentaa %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "jotta %s voitaisiin säilyttää" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -985,88 +1035,88 @@ msgstr "" "Pakettia ei voida asentaa, koska levyllä ei ole tarpeeksi tilaa sen " "asentamiseen" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Seuraavat paketit asennetaan" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Seuraavat paketit poistetaan" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Tämä on pakollinen paketti, sitä ei voida poistaa valinnoista" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Paketin valintaa ei voi poistaa, koska se on jo asennettu" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Paketin valintaa ei voi poistaa, koska se pitää päivittää" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Näytä automaattisesti valitut paketit" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Asenna" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Lataa / tallenna pakettivalinnat" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Päivitetään pakettien valintoja" # Asennuksen sivuvalikko -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Vähimmäisasennus" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Ohjelmistojen hallinta" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Valitse asennettavat paketit" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Asennus käynnissä" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ei yksityiskohtia" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Aikaa jäljellä:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(arvioidaan...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1074,17 +1124,17 @@ msgstr[0] "%d paketti" msgstr[1] "%d pakettia" # Asennuksen sivuvalikko -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Yhteenveto" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Aseta" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ei asetettu" @@ -1098,7 +1148,7 @@ msgstr "" "Löydettiin seuraavat asennusmediat.\n" "Poista median valinta, jos et halua käyttää sitä." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1110,7 +1160,7 @@ msgstr "" "Asennus jatkuu tämän jälkeen kovalevyltä ja paketit ovat käytettävissä myös " "asennuksen jälkeen." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopioi asennuslevyt" @@ -1419,28 +1469,28 @@ msgstr "" "Asennetaanko päivitykset?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s kohteessa %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Laitteisto" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Äänikortti" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Onko koneessa ISA-väylään liitettävä äänikortti?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1449,76 +1499,76 @@ msgstr "" "Suorita asennuksen jälkeen komento \"alsaconf\" tai \"sndconfig\" " "asettaaksesi äänikortin." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Graafinen käyttöliittymä" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Verkko ja Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Välityspalvelimet" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "asetettu" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Turvallisuustaso" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Palomuuri" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivoitu" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ei käytössä" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" "X-palvelinta ei ole asetettu, haluatko varmasti jättää sen asettamatta?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Valmistellaan käynnistyslatainta..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Valmistellaan asennusta" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Ole kärsivällinen, valmistelussa voi kestää hetki..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1531,7 +1581,7 @@ msgstr "" "tai jotain muuta keinoa. Ytimen parametrit root-tiedostojärjestelmälle ovat " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1541,17 +1591,17 @@ msgstr "" "pääkäyttäjälle." # mat -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Aseta tyhjä levyke levykeasemaan %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Luodaan automaattiasennuslevykettä..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1562,12 +1612,12 @@ msgstr "" "\n" "Haluatko todella lopettaa?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Onnittelut" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Käynnistä uudelleen" diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po index c412b7995..7bb7cd67a 100644 --- a/perl-install/install/share/po/fr.po +++ b/perl-install/install/share/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-17 05:24+0200\n" "Last-Translator: Rémi Verschelde \n" "Language-Team: LANGUAGE \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -81,175 +81,197 @@ msgid "" "\n" "Do you have a supplementary installation medium to configure?" msgstr "" -"Les médias suivants ont été trouvés et seront utilisés pendant l'installation : %s.\n" +"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:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Réseau (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Réseau (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Réseau (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL du miroir ?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "L'URL doit commencer par ftp:// ou http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" -msgstr "La tentative de récupération de la liste des miroirs disponibles sur le site Web %s a échoué" +msgstr "" +"La tentative de récupération de la liste des miroirs disponibles sur le site " +"Web %s a échoué" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuration NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Veuillez entrer le nom d'hôte et le répertoire de votre média NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Il manque le nom d'hôte" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Le répertoire doit commencer par « / »" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nom d'hôte du montage NFS ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Répertoire" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Supplémentaire" -#: any.pm:301 +#: any.pm:303 #, c-format -msgid "Can't find a package list file on this mirror. Make sure the location is correct." -msgstr "Ne peut trouver le fichier de liste des paquetages sur ce miroir. Vérifiez que l'emplacement est correct." +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 des paquetages sur ce miroir. Vérifiez " +"que l'emplacement est correct." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format -msgid "Some hardware on your machine needs some non free firmwares in order for the free software drivers to work." +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:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Vous devriez activer « %s »" -#: any.pm:355 +#: any.pm:377 #, 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" +msgstr "" +"« %s » contient les différentes parties du système ainsi que ses applications" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "« %s » contient des logiciels non libres.\n" -#: any.pm:357 +#: any.pm:379 #, c-format -msgid "It also contains firmwares needed for certain devices to operate (eg: some ATI/AMD graphic cards, some network cards, some RAID cards, ...)" -msgstr "Il contient égalemtn des firmwares nécessaires au bon fonctionnement de certains périphériques (ex : certaines cartes ATI/AMD, certaines cartes réseau, certaines cartes RAID, ...)" +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 égalemtn 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:358 +#: any.pm:380 #, 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." +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:359 +#: any.pm:381 #, 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." +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:363 +#: any.pm:387 #, 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:378 +#: any.pm:404 #, 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:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Recherche des paquetages déjà installés…" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Recherche des paquetages à mettre à jour…" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Suppression des paquetages avant la mise à jour…" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -257,78 +279,78 @@ msgid "" "\n" "Do you really want to remove these packages?\n" msgstr "" -"Les paquetages suivants seront désinstallés pour permettre la mise à jour : %s\n" +"Les paquetages suivants seront désinstallés pour permettre la mise à jour : " +"%s\n" "\n" "\n" "Souhaitez-vous réellement les désinstaller ?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Erreur lors de la lecture du fichier %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Les disques suivants ont été renommés :" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (précédemment nommé %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 -#: steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Réseau" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Veuillez choisir un média" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Le fichier existe déjà. Voulez-vous l'écraser ?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permission refusée" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Mauvais nom NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Média %s incorrect" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Impossible de faire des captures d'écran avant le partitionnement" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Les captures d'écran seront disponibles après l'installation dans %s" @@ -338,8 +360,7 @@ msgstr "Les captures d'écran seront disponibles après l'installation dans %s" msgid "Installation" msgstr "Installation" -#: gtk.pm:132 -#: share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuration" @@ -355,7 +376,8 @@ 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 requièrent des pilotes « propriétaires » pour pouvoir fonctionner.\n" +"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 @@ -381,7 +403,8 @@ msgstr "impossible d'ajouter le média" #: media.pm:757 #, c-format msgid "Copying some packages on disks for future use" -msgstr "Copie de certains paquetages sur les disques pour une utilisation future" +msgstr "" +"Copie de certains paquetages sur les disques pour une utilisation future" #: media.pm:810 #, c-format @@ -421,7 +444,9 @@ 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" +msgstr "" +"Pas d'info xml pour le média « %s », seulement un résultat partiel pour le " +"paquetage %s" #: pkgs.pm:119 #, c-format @@ -437,345 +462,406 @@ msgstr "" "Certains paquetages requis par %s ne peuvent être installés :\n" "%s" -#: pkgs.pm:382 -#: pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Une erreur est survenue :" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Une erreur fatale est survenue : %s." -#: pkgs.pm:891 -#: pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Ne plus me demander" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transactions ont échoué" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "L'installation des paquetages a échoué :" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Station de travail" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Poste bureautique" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format -msgid "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc" -msgstr "Programmes pour la bureautique : traitements de texte (LibreOffice Writer, Kword), tableurs (LibreOffice Calc, Kspread), visualiseur PDF, etc" +msgid "" +"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " +"(LibreOffice Calc, Kspread), PDF viewers, etc" +msgstr "" +"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:24 #, c-format msgid "Game station" msgstr "Jeux" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" -msgstr "Programmes de divertissement : jeux d'arcade, de plateau, de stratégie, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimédia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programmes de lecture/édition du son et de la vidéo" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format -msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web" -msgstr "Ensemble d'outils pour lire et envoyer des courriers électroniques et des messages de forums (mutt, tin, …), ainsi que pour naviguer sur Internet" +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" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Ordinateur réseau (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Utilitaires console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Développement" -#: share/meta-task/compssUsers.pl:54 -#: share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" -msgstr "Bibliothèques de développement C et C++, programmes et fichiers d'en-tête" +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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentation" -#: share/meta-task/compssUsers.pl:58 -#: share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 -#: share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "« Linux Standard Base ». Support des programmes tiers" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Serveur Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Logiciel de groupe de travail" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Passerelle Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Courriel/Nouvelles" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Serveur d'annuaire" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Serveur FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Serveur de nom de domaine et d'information réseau" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Base de données" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Courriel" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Serveur de courrier Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Serveur d'ordinateur réseau" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Environnement graphique" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Station de travail KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format -msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" -msgstr "L'environnement de bureau graphique KDE (K Desktop Environment) avec sa collection d'outils" +msgid "" +"The K Desktop Environment, the basic graphical environment with a collection " +"of accompanying tools" +msgstr "" +"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:156 #, c-format msgid "GNOME Workstation" msgstr "Station de travail GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format -msgid "A graphical environment with user-friendly set of applications and desktop tools" -msgstr "Un environnement de bureau avec un ensemble de programmes et d'outils intuitifs" +msgid "" +"A graphical environment with user-friendly set of applications and desktop " +"tools" +msgstr "" +"Un environnement de bureau avec un ensemble de programmes et d'outils " +"intuitifs" + +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Station de travail KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Un environnement de bureau avec un ensemble de programmes et d'outils " +"intuitifs" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Station de travail GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Station de travail" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Environnement graphique" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Bureau LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 +#, c-format +msgid "" +"A lightweight & fast graphical environment with user-friendly set of " +"applications and desktop tools" +msgstr "" +"Un environnement graphique léger et rapide avec un ensemble de programmes et " +"d'outils intuitifs" + +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Bureau personnalisé" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 #, c-format -msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools" -msgstr "Un environnement graphique léger et rapide avec un ensemble de programmes et d'outils intuitifs" +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un environnement graphique léger et rapide avec un ensemble de programmes et " +"d'outils intuitifs" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Autres environnements de bureau" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilitaires" -#: share/meta-task/compssUsers.pl:175 -#: share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Serveur SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Serveur de configuration distante Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, 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:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Outils de surveillance, gestion des processus, tcpdump, nmap, …" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Assistants Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Assistants pour configurer le serveur" @@ -789,19 +875,20 @@ msgstr "" "Une erreur est survenue et semble difficile à résoudre correctement.\n" "Vous pouvez continuer, mais à vos risques et périls." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" +"\"\n" msgstr "" "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" +"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 +#: steps_auto_install.pm:71 steps_stdio.pm:27 #, c-format msgid "Entering step `%s'\n" msgstr "Démarrage de l'étape « %s »\n" @@ -828,12 +915,14 @@ msgid "" "%s. If that occurs, you can try a text install instead. For this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" -"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 »." +"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:240 -#: steps_gtk.pm:757 +#: steps_gtk.pm:240 steps_gtk.pm:757 #, c-format msgid "Media Selection" msgstr "Sélection des médias" @@ -843,246 +932,241 @@ msgstr "Sélection des médias" msgid "Install %s KDE Desktop" msgstr "Installer le bureau KDE %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installer le bureau GNOME %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Installation personnalisée" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Bureau KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Bureau GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Bureau personnalisé" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Voici un aperçu du bureau « %s »." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Cliquez sur l'image afin d'agrandir l'aperçu" -#: steps_gtk.pm:319 -#: steps_interactive.pm:633 -#: steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Sélection des groupes de paquetages" -#: steps_gtk.pm:344 -#: steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Sélection individuelle des paquetages" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Désélectionner tout" -#: steps_gtk.pm:370 -#: steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Taille totale : %d / %d Mo" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version : " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Taille : " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Ko\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importance : " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Vous ne pouvez pas sélectionner/désélectionner ce paquetage" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "parce que %s manque" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "car %s n'est pas résolu" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "tentative de promouvoir %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "afin de conserver %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format -msgid "You cannot select this package as there is not enough space left to install it" -msgstr "Il n'y a pas assez d'espace disque disponible pour installer ce paquetage" +msgid "" +"You cannot select this package as there is not enough space left to install " +"it" +msgstr "" +"Il n'y a pas assez d'espace disque disponible pour installer ce paquetage" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" -msgstr "Vous ne pouvez pas désélectionner ce paquetage, car il doit être mis à jour" +msgstr "" +"Vous ne pouvez pas désélectionner ce paquetage, car il doit être mis à jour" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Montrer les paquetages sélectionnés automatiquement" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installation" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Charger/Sauvegarder la sélection" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Mise à jour de la sélection des paquetages" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Installation minimale" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gestion des logiciels" -#: steps_gtk.pm:531 -#: steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Choisissez les paquetages que vous voulez installer" -#: steps_gtk.pm:548 -#: steps_interactive.pm:670 -#: steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installation" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Pas de détails" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Temps restant :" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(estimation en cours…)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paquetage" msgstr[1] "%d paquetages" -#: steps_gtk.pm:683 -#: steps_interactive.pm:834 -#: steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Résumé" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurer" -#: steps_gtk.pm:719 -#: steps_interactive.pm:830 -#: steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "non configuré" -#: steps_gtk.pm:766 -#: steps_interactive.pm:343 +#: steps_gtk.pm:766 steps_interactive.pm:343 #, 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é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." +"Si vous ne désirez pas utiliser certains d'entre eux, vous pouvez les " +"désélectionner maintenant." -#: steps_gtk.pm:778 -#: steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" -"You have the option to copy the contents of the CDs onto the hard disk drive before installation.\n" -"It will then continue from the hard disk drive and the packages will remain available once the system is fully installed." +"You have the option to copy the contents of the CDs onto the hard disk drive " +"before installation.\n" +"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 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é." +"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:780 -#: steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copier entièrement les CD" @@ -1175,14 +1259,23 @@ msgstr "Configuration IDE" #: steps_interactive.pm:301 #, 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 de 1 Mo ! L'installation va continuer, mais pour que votre système puisse démarrer, vous aurez besoin de créer la partition d'amorçage avec DiskDrake" +msgid "" +"No free space for 1MB bootstrap! Install will continue, but to boot your " +"system, you'll need to create the bootstrap partition in DiskDrake" +msgstr "" +"Pas de place libre pour la partition d'amorçage de 1 Mo ! L'installation va " +"continuer, mais pour que votre système puisse démarrer, vous aurez besoin de " +"créer la partition d'amorçage avec DiskDrake" #: steps_interactive.pm:306 #, 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" +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 "" -"Vous devez créer une partition d'amorçage (PPC PReP Boot bootstrap) ! L'installation va continuer, mais pour que\n" +"Vous devez créer une partition d'amorçage (PPC PReP Boot bootstrap) ! " +"L'installation va continuer, mais pour que\n" "votre système puisse démarrer, vous aurez besoin de\n" "créer la partition d'amorçage avec DiskDrake" @@ -1190,12 +1283,15 @@ msgstr "" #, c-format msgid "" "Change your Cd-Rom!\n" -"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n" +"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when " +"done.\n" "If you do not have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" "Changez de CD-ROM !\n" -"Veuillez insérer le CD-ROM nommé « %s » dans votre lecteur puis cliquez sur « OK ».\n" -"Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien installer à partir de ce CD-ROM." +"Veuillez insérer le CD-ROM nommé « %s » dans votre lecteur puis cliquez sur " +"« OK ».\n" +"Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien " +"installer à partir de ce CD-ROM." #: steps_interactive.pm:400 #, c-format @@ -1204,8 +1300,12 @@ msgstr "Recherche des paquetages disponibles…" #: steps_interactive.pm:408 #, 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 l'installation ou la mise à jour (%dMo > %dMo)" +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 l'installation ou la mise à " +"jour (%dMo > %dMo)" #: steps_interactive.pm:456 #, c-format @@ -1213,7 +1313,8 @@ 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 sélection des paquetages.\n" +"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:458 @@ -1348,10 +1449,10 @@ msgstr "Configuration post-installation" #: steps_interactive.pm:739 #, 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" +msgstr "" +"Assurez-vous que le média de mise à jour des modules est dans le lecteur %s" -#: steps_interactive.pm:767 -#: steps_list.pm:47 +#: steps_interactive.pm:767 steps_list.pm:47 #, c-format msgid "Updates" msgstr "Mises à jour" @@ -1368,7 +1469,8 @@ msgid "" "\n" "Do you want to install the updates?" msgstr "" -"Vous avez maintenant la possibilité de télécharger les paquetages mis à jour\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" @@ -1377,126 +1479,139 @@ msgstr "" "Souhaitez-vous installer les mises à jour ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s sur %s" -#: steps_interactive.pm:910 -#: steps_interactive.pm:917 -#: steps_interactive.pm:930 -#: steps_interactive.pm:947 -#: steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Matériel" -#: steps_interactive.pm:931 -#: steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Carte son" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Possédez-vous une carte son ISA ?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format -msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card" -msgstr "Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la carte son" +msgid "" +"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " +"card" +msgstr "" +"Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la " +"carte son" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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" +msgstr "" +"Aucune carte son détectée. Essayez avec « harddrake » après l'installation" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interface graphique" -#: steps_interactive.pm:969 -#: steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Réseau et Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies (serveurs mandataires)" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configuré" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Niveau de sécurité" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Pare-feu" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activé" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "désactivé" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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 X. Êtes-vous sûr que c'est ce que vous désirez ?" +msgstr "" +"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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Préparation du chargeur d'amorçage…" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Préparation du chargeur d'amorçage..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Merci d'être patient, cela peut prendre quelques minutes…" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, 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 "" +"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 ». Le programme d'amorçage « yaboot » ne fonctionnera pas. 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" +"Il semble que votre machine ne soit pas dotée de l'architecture " +"« NewWorld ». Le programme d'amorçage « yaboot » ne fonctionnera pas. " +"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" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format -msgid "In this security level, access to the files in the Windows partition is restricted to the administrator." -msgstr "A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera restreint à l'administrateur." +msgid "" +"In this security level, access to the files in the Windows partition is " +"restricted to the administrator." +msgstr "" +"A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera " +"restreint à l'administrateur." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Insérez une disquette vierge dans le lecteur %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Création de la disquette d'auto-installation…" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1507,12 +1622,12 @@ msgstr "" "\n" "Souhaitez-vous vraiment quitter maintenant ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Félicitations" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Redémarrage" @@ -1525,8 +1640,7 @@ msgid "" "Language" msgstr "Langue" -#: steps_list.pm:16 -#: steps_list.pm:23 +#: steps_list.pm:16 steps_list.pm:23 #, c-format msgid "Localization" msgstr "Localisation" @@ -1545,16 +1659,14 @@ msgid "" "Mouse" msgstr "Souris" -#: steps_list.pm:19 -#: steps_list.pm:20 +#: steps_list.pm:19 steps_list.pm:20 #, c-format msgid "" "_: Keep these entry short\n" "Hard drive detection" msgstr "Détection des disques durs" -#: steps_list.pm:21 -#: steps_list.pm:22 +#: steps_list.pm:21 steps_list.pm:22 #, c-format msgid "" "_: Keep these entry short\n" @@ -1582,8 +1694,7 @@ msgid "" "Partitioning" msgstr "Partitionnement" -#: steps_list.pm:27 -#: steps_list.pm:28 +#: steps_list.pm:27 steps_list.pm:28 #, c-format msgid "" "_: Keep these entry short\n" @@ -1611,16 +1722,14 @@ msgid "" "Users" msgstr "Utilisateurs" -#: steps_list.pm:38 -#: steps_list.pm:39 +#: steps_list.pm:38 steps_list.pm:39 #, c-format msgid "" "_: Keep these entry short\n" "Bootloader" msgstr "Amorçage" -#: steps_list.pm:40 -#: steps_list.pm:41 +#: steps_list.pm:40 steps_list.pm:41 #, c-format msgid "" "_: Keep these entry short\n" @@ -1634,8 +1743,7 @@ msgid "" "Summary" msgstr "Résumé" -#: steps_list.pm:44 -#: steps_list.pm:45 +#: steps_list.pm:44 steps_list.pm:45 #, c-format msgid "" "_: Keep these entry short\n" diff --git a/perl-install/install/share/po/fur.po b/perl-install/install/share/po/fur.po index 18311bc48..359abbe75 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-06-28 17:41+0200\n" "Last-Translator: Andrea Gracco \n" "Language-Team: furlan \n" @@ -72,7 +72,7 @@ msgid "Do you have further supplementary media?" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -81,177 +81,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Rêt" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Rêt" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Cartele" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -260,72 +260,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "HFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rêt" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Par plasè sielç" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permès dineât" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "font zontade %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Installation" msgstr "Instale" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configurazion" @@ -429,343 +429,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Al è intravignût un fal" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "A si è verificât un fal fatâl: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Instalazion falade" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instale atualizazions" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "Viôt le Configurazion" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "Internazionalizazion" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Informatiche" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, fuzzy, c-format msgid "Console Tools" msgstr "Console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Svilup" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentazion" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Grop" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/File/_Gnûf" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Ferme Server" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "Server NTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, fuzzy, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Informatiche" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Ambient Grafic" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Viôt le Configurazion" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Viôt le Configurazion" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Viôt le Configurazion" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambient Grafic" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, fuzzy, c-format msgid "Other Graphical Desktops" msgstr "Desktop grafic" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "Filipinis" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Viôt le Configurazion" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Expert" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "" @@ -779,7 +826,7 @@ msgstr "" "Al è intravignût un fal, ma no sai ben cemût gjestîlu.\n" "Continue a to azard." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -826,211 +873,211 @@ msgstr "Selezion dal percors" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Dimension: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Entitât: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "cause cal mancje %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "cause che %s no l'è sodisfat" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "ricercje dal miôr pachet %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "par tignî %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instale" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Selezion dal percors" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gjestôr Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configure" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "" @@ -1042,7 +1089,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1051,7 +1098,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1329,101 +1376,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rêt & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel di Sigurece" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "disabilitât" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1432,24 +1479,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1457,12 +1504,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Congratulazions" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Torne a inviâ" diff --git a/perl-install/install/share/po/ga.po b/perl-install/install/share/po/ga.po index 30e438901..4af6eeb97 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-09-12 18:04+0200\n" "Last-Translator: Alastair McKinstry \n" "Language-Team: Irish \n" @@ -70,7 +70,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -79,177 +79,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Líonra (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Líonra (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Líonra (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Cumraigh NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Comhadlann" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Earráid ag oscailt %s do scríobh: %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, fuzzy, c-format msgid "Looking at packages already installed..." msgstr "Roghnaigh pacáistí ..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Ag cúrdach pacáistí le húasgrádú..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -258,72 +258,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Earráid ag léamh comhad %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Roghnaigh pacáistí ..." -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Líonra" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Roghnaight do theangam le do thoil." -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Tá an comhad ann cheana. Forscríobh?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Cead diúltaithe" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "Tá comhad %s lódailte." -#: any.pm:1355 +#: any.pm:1385 #, fuzzy, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ní féidir liom rann eile a cur isteach" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "Installation" msgstr "Suiteáil" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "cumraíocht" @@ -427,343 +427,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Tharla earráid" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Theip ag feistiú" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Stáisiún Oibre" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Stáisiún Oibre" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Stáisiún Cluichí" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Stáisiún ilmheánach" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Stáisiún Idirlíon" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Printéir Gréasán (lpd)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, fuzzy, c-format msgid "Tools to ease the configuration of your computer" msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Uirlisí Consóil" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Forbairt" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Doiciméadú" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Freastalaí Lín" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grúpearraí" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, fuzzy, c-format msgid "Internet gateway" msgstr "suimiúil" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Ríomhphost/Nuacht" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Freastalaí Eolaire" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Freastalaí FTP:" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS/NIS " -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Ainm Fearannas" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Freastalaí Printéir" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Bunachar Sonraí" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Greasan/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "Freastalaí Printéir" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Cláréadan Gréasán" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Timpeallacht Ghrafach" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Stáisiún KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Stáisiún Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Stáisiún KDE" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Stáisiún Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Stáisiún Oibre" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Timpeallacht Ghrafach" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Deasc" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Deasc" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Deasc Graphaicí Eile" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Uirlisí" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Freastalaí SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Seirbishí" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Cumraigh Idirlíon" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Cumraíocht Gréasánú" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Bainteach le hIdirlíon" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Cumraigh printéir" @@ -777,7 +824,7 @@ msgstr "" "Ta earraid ann, níl a fhios agam conas é a cheartú.\n" "Lean ort, ar do phriacal féin." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -824,211 +871,211 @@ msgstr "Roghnú Grúpa Pacáistí" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Eirigh as Feistiú" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Deasc" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Deasc" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Deasc" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Roghnú Grúpa Pacáistí" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Méid iomlán: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Leagan: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Méid: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Tábhacht: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, fuzzy, c-format msgid "due to missing %s" msgstr "kdesu ar iarraidh" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Feistiú" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Roghnú Grúpa Pacáistí" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, fuzzy, c-format msgid "Updating package selection" msgstr "Roghnú Grúpa Pacáistí" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, fuzzy, c-format msgid "Minimal install" msgstr "Eirigh as Feistiú" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Bainistíocht Bhogearraí" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Ag Feistiú" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Sonraí" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Am fagtha " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Ag meastú" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Coimriú" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Cumraigh" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "Cumraigh" @@ -1040,7 +1087,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1049,7 +1096,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1327,101 +1374,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s ar %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Crua-earraí" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Carta Fuaim" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, fuzzy, c-format msgid "Do you have an ISA sound card?" msgstr "An bhfuil ceann eile agat?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Comhéadan grafach" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Gréasán agus Idirlíon" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Ionadaithe" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "cumraithe" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Leibhéal Slándála" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Bac slándála" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "díchumasaithe" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Ag Ullmhaigh feistiú" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1430,24 +1477,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Cur isteach diosca folamh sa dioscthiomant %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1455,12 +1502,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Comhghairdeas" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Atosaigh" diff --git a/perl-install/install/share/po/gl.po b/perl-install/install/share/po/gl.po index 314297061..cbc1fa04e 100644 --- a/perl-install/install/share/po/gl.po +++ b/perl-install/install/share/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-09-24 18:30+0200\n" "Last-Translator: Alejo Pacín Jul \n" "Language-Team: Galician \n" @@ -77,7 +77,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -90,91 +90,91 @@ msgstr "" "\n" "Ten algún soporte de instalación suplementario para configurar?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rede (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rede (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rede (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Cal é o URL do sitio espello?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "O URL debe comezar por ftp:// ou por http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Contactando co sitio web de %s para obte-la lista de sitios espello " "dispoñibles..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Erro ó contactar co sitio web de %s para obte-la lista de sitios espello " "dispoñibles" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuración de NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Falta o nome de máquina" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "O directorio debe comezar por \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Cal é o nome de máquina da montaxe NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directorio" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Suplementario" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -183,90 +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:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Omitir tódolos paquetes do soporte \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Buscando os paquetes que xa están instalados..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Buscando paquetes para actualizar..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -280,72 +280,72 @@ msgstr "" "\n" "Desexa eliminar estes paquetes?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Erro ó le-lo ficheiro %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Renomeáronse os seguintes discos:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (chamado anteriormente %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rede" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Escolla un soporte" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "O ficheiro xa existe. ¿Desexa sobreescribilo?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permiso denegado" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nome NFS incorrecto" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "O soporte %s é incorrecto" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Non se pode captura-la pantalla antes de face-las particións" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Poderanse facer capturas de pantalla despois de instalar en %s" @@ -355,7 +355,7 @@ msgstr "Poderanse facer capturas de pantalla despois de instalar en %s" msgid "Installation" msgstr "Instalación" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuración" @@ -455,42 +455,42 @@ msgstr "" "Non se pode instalar algúns paquetes solicitados por %s:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Ocorreu un erro:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ocorreu un erro moi grave: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Erraron %d transaccións de instalación" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Estación de traballo" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Estación de Traballo de Oficina" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -499,32 +499,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Estación de xogos" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Estación multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programas de reproducción e edición de son e vídeo" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Estación de Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -533,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:40 #, c-format msgid "Network Computer (client)" msgstr "Ordenador de Rede (cliente)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Ferramentas de Consola" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desenvolvemento" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentación" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Soporte para aplicacións de terceiros" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servidor Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Pasarela de Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Correo/Novas" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Servidor de Directorio" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Servidor de Nomes de Dominio e Información de Rede" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Servidor de Compartimento de Impresoras e Ficheiros" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Bases de datos" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Correo-e" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servidor de correo Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Servidor de Redes de Ordenadores" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Ambiente Gráfico" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Estación de Traballo KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -729,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:156 #, c-format msgid "GNOME Workstation" msgstr "Estación de Traballo GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -743,12 +743,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Estación de Traballo KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de " +"escritorio" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Estación de Traballo GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estación de traballo" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambiente Gráfico" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Escritorio LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -757,53 +786,75 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Escritorio Personalizado" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un 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:193 #, c-format msgid "Other Graphical Desktops" msgstr "Outros Escritorios Gráficos" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilidades" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servidor de Configuración Remota Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Monitorización/Utilidades de Rede" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Asistentes de Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Asistentes para configurar o servidor" @@ -817,7 +868,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -872,107 +923,107 @@ msgstr "Selección de Soportes" msgid "Install %s KDE Desktop" msgstr "Instalar o Escritorio KDE de %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalar o Escritorio GNOME de %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalación personalizada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Escritorio KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Escritorio GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Escritorio Personalizado" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Aquí ten unha vista previa do escritorio '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selección de Grupos de Paquetes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selección individual de paquetes" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Deseleccionar Todo" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tamaño total: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versión: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamaño: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importancia: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Non pode seleccionar/deseleccionar este paquete" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "debido a que falta %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "debido a %s non satisfeitas" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "tratando de promover %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "para manter %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -981,104 +1032,104 @@ msgstr "" "Non pode seleccionar este paquete xa que non hai espacio dabondo para " "instalalo" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Vanse instala-los seguintes paquetes" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Vanse elimina-los seguintes paquetes" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Este é un paquete obrigatorio, non se pode deseleccionar" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Non pode deseleccionar este paquete. Xa está instalado" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Non pode deseleccionar este paquete. Ten que ser actualizado" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Amosa-los paquetes seleccionados automáticamente" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalar" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Cargar/Gardar a selección" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Actualizando a selección de paquetes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalación mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Xestión do Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Escolla os paquetes que desexa instalar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalando" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Sen detalles" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tempo restante:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(estimando...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paquete" msgstr[1] "%d paquetes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resumo" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurar" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "non configurado" @@ -1092,7 +1143,7 @@ msgstr "" "Atopáronse os seguintes soportes de instalación.\n" "Se desexa saltar algún deles, pode deseleccionalo agora." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1105,7 +1156,7 @@ msgstr "" "Esta continuará despois dende o disco duro e os paquetes permanecerán " "dispoñibles unha vez que o sistema xa estea instalado." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiar CDs enteiros" @@ -1414,28 +1465,28 @@ msgstr "" "Desexa instala-las actualizacións?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s en %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Tarxeta de son" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Ten unha tarxeta de son ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1444,75 +1495,75 @@ msgstr "" "Execute \"alsaconf\" ou \"sndconfig\" despois da instalación para configura-" "la tarxeta de son" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interface Gráfica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rede & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxys" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurado" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel de Seguridade" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Cortalumes" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activado" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "desactivado" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Preparando o cargador de arrinque..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Preparando a instalación" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Sexa paciente, isto pode levar un anaco..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1525,7 +1576,7 @@ msgstr "" "continuar, pero ha ter que usar BootX ou algún outro recurso para arrincar a " "máquina. O argumento do kernel para o sistema de ficheiros raíz é: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1534,17 +1585,17 @@ msgstr "" "Con este nivel de seguridade, o acceso ós ficheiros da partición Windows " "está restrinxido ó administrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Insira un disquete baleiro na unidade %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Creando un disquete de instalación automática..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1555,12 +1606,12 @@ msgstr "" "\n" "Desexa saír agora?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Noraboa" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reiniciar" diff --git a/perl-install/install/share/po/he.po b/perl-install/install/share/po/he.po index 679c4ee2f..948fb5d6f 100644 --- a/perl-install/install/share/po/he.po +++ b/perl-install/install/share/po/he.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2008-09-30 18:23+0200\n" "Last-Translator: Dotan Kamber \n" "Language-Team: Hebrew\n" @@ -81,7 +81,7 @@ msgid "Do you have further supplementary media?" msgstr "האם יש לך מקורות התקנה נוספים?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -94,87 +94,87 @@ msgstr "" "\n" "האם יש לך מקורות נוספים להתקנה שברצונך להגדיר?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "תקליטור" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "רשת (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "רשת (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "רשת (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "כתובת URL של אתר המראה?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "על הכתובת להתחיל ב-//:ftp או ב-//:http" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "מתחבר לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "כשל בחיבור לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "עליך לבחור את אתר המראה ממנו יורדו החבילות" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "הגדרת NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "נא להזין את שם המארח ואת התיקיה בה נמצא מקור ה-NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "שם המארח חסר" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "על התיקיה להתחיל ב=\"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "שם המארח של עיגון ה-NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ספרייה" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "תוספים" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -182,90 +182,90 @@ msgid "" msgstr "" "אין אפשרות למצוא קובץ המכיל רשימת חבילות במקור זה. נא לוודא שהכתובת תקינה." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "דלג על כל החבילות ממקור \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "מחפש חבילות שכבר מותקנות..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "מאתר חבילות שיש לשדרג..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "מסיר חבילות לפני השדרוג..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -278,72 +278,72 @@ msgstr "" "\n" "האם באמת ברצונך להסיר חבילות אלה?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "שגיאה בקריאת הקובץ %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "שמות הכוננ(ים) הבאים שונו:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (השם הקודם הוא %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "רשת" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "עליך לבחור מקור" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "הקובץ כבר קיים. לשכתב?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "הגישה נדחתה" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "שם NFS לא-תקין" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "המקור %s אינו תקין" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "אין אפשרות לשמור תמונות מסך לפני חלוקה למחיצות" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "ניתן למצוא את תמונות המסך אחרי התקנה ב%s" @@ -353,7 +353,7 @@ msgstr "ניתן למצוא את תמונות המסך אחרי התקנה ב%s" msgid "Installation" msgstr "התקנה" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "הגדרות" @@ -451,42 +451,42 @@ msgstr "" "לא ניתן להתקין חלק מהחבילות המבוקשות על ידי %s:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "חלה שגיאה" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "שגיאה חמורה אירעה : %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "אל תשאל שוב" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d התקנות נכשלו" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "מתקין חבילה %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "תחנת עבודה" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "תחנת עבודה משרדית" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -495,32 +495,32 @@ msgstr "" "תוכנות משרד: מעבדי תמלילים (כתבן אופן אופיס, Kword), גיליונות אלקטרונים " "(גיליון אופן אופיס, Kspread),מציגי pdf, ועוד" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "תחנת עבודה למשחקים" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "תוכנות לבידור: ארקייד, לוח, אסטרטגיה, ועוד" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "תחנת עבודה למולטימדיה" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "תוכנות להשמעה או עריכה של קול ווידאו" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "תחנת עבודה לאינטרנט" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -528,269 +528,316 @@ msgid "" msgstr "" "ערכת כלים לקריאה וכתיבת דוא\"ל וחדשות (pine, mutt, tin..) ולגלישה באינטרנט" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "מחשב רשת (לקוח)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "לקוחות לפרוטוקולים שונים כולל ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "כלי עזר לביצוע הגדרות המחשב שלך" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "כלי מסוף" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "עורכים, מעטפות, כלי קבצים, מסופים" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "פיתוח" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "ספריות פיתוח בC וC++, תוכנות וקבצי include" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "מסמכים" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "ספרים ומדריכים לשימוש בלינוקס ותוכנה חופשית" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "שרת איחסון אתרים" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "עבודה בקבוצה" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "שרת Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "חומת אש/נתב" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "הגנת המערכת בעת חיבור לאינטרנט" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "דואר/קבוצות דיון" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "שרת דואר Postfix, שרת קבוצות דיון Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "שרת ספרייה" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "שרת FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "שרת שמות מתחם ומידע רשת" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "שרת שיתוף קבצים ומדפסות" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "שרת NFS, שרת סמבה" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "מסדי נתונים" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "שרת מסד נתונים MariaDB או PostgreSQL" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "דואר" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "שרת דואר Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "שרת מסד נתונים MariaDB או PostgreSQL" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "שרת מחשב רשת" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "שרת NFS, שרת SMB, שרת Proxy, שרת ssh" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "סביבה גרפית" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "סביבת העבודה KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "סביבת העבודה GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "סביבת העבודה KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "סביבת העבודה GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "תחנת עבודה" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "סביבה גרפית" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "שולחן עבודה IceWm" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "שולחן עבודה IceWm" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "סביבות עבודה אחרות" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "סביבות עבודה קלילות כגון Window Maker, Enlightenment, Fvwm, ועוד" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "תוכנות שרות" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "שרת SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "שרת הגדרה תצורה מרחוק Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "כלי הגדרת וניטור רשת" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "כלי ניטור, בקרת תהליכים, tcpdump , nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "אשפי מנדריבה" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "אשפים להגדרת השרת שלך" @@ -804,7 +851,7 @@ msgstr "" "חלה תקלה, אך איני יודע איך לפתור אותה.\n" "המשך הפעולה הינו באחריותך בלבד." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -857,211 +904,211 @@ msgstr "בחירת קבוצת חבילות לפי נושא" msgid "Install %s KDE Desktop" msgstr "התקנת שולחן העבודה KDE של מנדריבה" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, fuzzy, c-format msgid "Install %s GNOME Desktop" msgstr "התקנת שולחן העבודה GNOME של מנדריבה" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "התקנה מותאמת אישית" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "שולחן עבודה IceWm" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "שולחן עבודה IceWm" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "שולחן עבודה IceWm" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "בחירת קבוצת חבילות לפי נושא" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "בחירת חבילות באופן פרטני" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "בטל בחירת הכל" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "גודל כללי: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "גרסה: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "גודל: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "חשיבות: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "אי אפשר לבחור/לבטל את החבילה הזו" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "בגלל שחסר %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "עקב תלות שלא מולאה %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "מנסה לקדם %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "בכדי לשמור %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "אי אפשר לבחור בחבילה זו מכיוון שלא נותר מספיק מקום פנוי להתקינה" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "החבילות הבאות עומדות להיות מותקנות" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "החבילות הבאות עומדות להיות מוסרות" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "זוהי חבילה בסיסית, אי אפשר לבטל את בחירתה" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "אין אפשרות לבטל חבילה זו מכיוון שהיא כבר מותקנת" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "לא ניתן לבטל את בחירת חבילה זו, חובה לשדרג אותה" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "הראה חבילות שנבחרו באופן אוטומטי" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "התקנה" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "טעינת/שמירת אזור נבחר" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "עדכון בחירת חבילות" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "התקנה מינימלית" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "תוכנות" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "עליך לבחור את החבילות שברצונך להתקין:" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "מתקין" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "ללא פרטים" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "זמן נותר:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(מעריך...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d חבילה" msgstr[1] "%d חבילות" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "סיכום ובדיקת הגדרות" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "הגדרות" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "לא מוגדר" @@ -1075,7 +1122,7 @@ msgstr "" "מקורות התוכנה הבאים זמינים להתקנה.\n" "באפשרותך לדלג על חלק מהמקורות על ידי ביטול הסימונים המתאימים." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1087,7 +1134,7 @@ msgstr "" "אם אפשרות זו מופעלת, ההתקנה תמשיך מהכונן הקשיח, וכל החבילות מתקליטורי ההתקנה " "יהיו זמינות אחרי סיום ההתקנה מהכונן הקשיח." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "העתקת תקליטורים שלמים" @@ -1385,28 +1432,28 @@ msgstr "" "זה ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s על %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "חומרה" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "כרטיס קול" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "האם יש לך כרטיס קול ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1415,73 +1462,73 @@ msgstr "" "עליך להריץ את \"alsaconf\" או \"sndconfig\" אחרי ההתקנה בכדי להגדיר את כרטיס " "הקול שלך" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "לא זוהו כרטיסי קול. יש לנסות את האשף \"harddrake\" לאחר ההתקנה" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "ממשק גרפי" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "רשת ואינטרנט" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "שרתים מתווכים" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "מוגדר" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "סף האבטחה המבוקש:" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "חומת אש" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "פועל" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "מנותק" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "לא הוגדר ממשק גרפי (X). האם אכן ברצונך לבחור אפשרות זו?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "מכין את מנהל האתחול..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "מכין את ההתקנה" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1493,24 +1540,24 @@ msgstr "" "במקרה זה. ההתקנה תמשך אבל יהיה עליך להשתמש ב-BootX או באמצעי אחר לאתחול " "המערכת. משנה גלעין המערכת למערכת קבצי השורש הוא: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "ברמת אבטחה זו, גישה לקבצים במחיצת החלונות תתאפשר רק למנהל המערכת." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "נא להכניס תקליטון ריק לכונן %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "יוצר תקליטון הפעלה אוטומטית..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1521,12 +1568,12 @@ msgstr "" "\n" "האם באמת ברצונך לצאת עכשיו?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "ברכותינו!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "הפעלה מחדש" diff --git a/perl-install/install/share/po/hi.po b/perl-install/install/share/po/hi.po index 29e1a497e..c42bdc262 100644 --- a/perl-install/install/share/po/hi.po +++ b/perl-install/install/share/po/hi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-hi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-04-04 21:54+0530\n" "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) \n" "Language-Team: हिन्दी (Hindi) \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "कया आपके पास एक और है ?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,181 +82,181 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "सीडी-रॉम" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "%s नेटवर्क" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "%s नेटवर्क" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा " "रहा है..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा " "रहा है..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "एक मिरर का चयन करें जहाँ से पैकेजों को प्राप्त करना है" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "डिरेक्ट्री" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "%s को %s पर नहीं पाया जा सका" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "पहिले से संसाधित पैकेजों को देखा जा रहा है..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "उन्नयन के लिये पैकेजों को खोजा जा रहा है..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -269,72 +269,72 @@ msgstr "" "\n" "क्या वास्तव में इन पैकेजों को हटाना चाहते है?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s संचिका को पढ़ने में त्रुटि" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "निम्नलिखित पैकेजों का संसाधन करना आवश्यक है:\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "एचटीटीपी" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "एफटीपी" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "एनएफ़एस" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "नेटवर्क" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "कृपया चयन करें" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "फाईल पहले से है पुन बनाएँ" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "अनुमति नहीं है" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "%s माध्यम को जोड़ा गया" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "विभाजनीकरण के पूर्व स्क्रीन-चित्र-माला को नहीं लिया जा सकता है" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "%s में संसाधन के उपरान्त स्क्रीन चित्र-माला उपलब्ध होगी" @@ -344,7 +344,7 @@ msgstr "%s में संसाधन के उपरान्त स्क msgid "Installation" msgstr "संसाधन हो रहा है" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "संरचना" @@ -441,42 +441,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "एक त्रुटि हो गयी है" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "एक घातक त्रुटि घटित हुई है: %s " -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d संसाधन क्रिया-कलाप असफ़ल" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s पैकेज का संसाधन हो रहा है" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "कार्यकेंद्र" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "ऑफ़िस कार्यकेन्द्र" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, fuzzy, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -485,32 +485,32 @@ msgstr "" "ऑफ़िस के कार्यक्रम: शब्दसंसाधक (केवर्ड, आबीवर्ड), स्प्रेडशीट (केस्प्रेड, जीन्यूमेरिक), पीडीएफ़ " "अवलोक्क, इत्यादि" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "खेल स्टेशन" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "मनोरंजक कार्यक्रम: आरकेड, बोर्ड, व्यूह-रचना, इत्यादि " -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "मल्टीमीडीया केन्द्र" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "ध्वनि और वीडीयो के खेलने वाले/संपादन करने वाले कार्यक्रम" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "इन्टरनेट केन्द्र" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -519,205 +519,205 @@ msgstr "" "विपत्र और समाचारों को पढ़ने और भेजने के लिए (मट, टिन...) और वेब को ब्राउज़ करने के लिए " "औज़ारों का समूह" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "नेटवर्क कम्प्यूटर (ग्राहक)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "एस०एस०एच० को शामिल करते हुए विभिन्न प्रोटोकॉलों के लिए ग्राहक" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "आपके कम्प्यूटर की संरचना कार्य को सहज बनाने हेतु अनेक औजार" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "कन्सोल के औज़ार" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "अनेकों संपादक, कोश, संचिका औजार, टर्मिनल" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "विकास" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "सी और सी++ विकास लेखागार, कार्यक्रम और इन्क्लूड संचिकायें" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "प्रलेखन" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "लिनक्स और मुक्त सॉफ़्टवेयर पर किताबें और कैसे-करेंअस्तकें" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "एल०एस०बी०" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "लिनक्स मानकीकरण आधार ! त्रितीय पक्ष कार्यक्रमों को समर्थन" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "वेब सर्वर" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, fuzzy, c-format msgid "Apache" msgstr "रास्ता" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "ग्रुपवेयर" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "कोलाब सर्वर" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "अग्नि-भीतिका/रूटर" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "इन्टरनेट गेटवे" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/संचिका (F)/नवीन (_N)" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "पोस्टफ़िक्स विपत्र सर्वर" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "निर्देशिका जिससे पुनःस्थापन करना है" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "एन०टी०पी० सर्वर" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "डीएनएस" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "डोमेन नाम सर्वर" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "प्रिंटर सर्वर" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "सॉबा सर्वर" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "डाटाबेस" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "वेब/एफ़०टी०पी०" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "आपाचे, प्रो-एफ़०टी०पी०डी०" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "विपत्र" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "पोस्टफ़िक्स विपत्र सर्वर" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "नेटवर्क कम्प्यूटर सर्वर" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "एन०एफ़०एस० सर्वर, एस०एम०बी० सर्वर, प्रोक्सी सर्वर, एस०एस०एच० सर्वर" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "सचित्र वातावरण" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "केडीई कार्यकेन्द्र" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "के डेस्कटाप वातावरण, मूलभूत सचित्र वातावरणसंलग्न औजारों के एक समूह के साथ" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "गनोम कार्यकेन्द्र" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -725,12 +725,40 @@ msgid "" msgstr "" "एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "केडीई कार्यकेन्द्र" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "गनोम कार्यकेन्द्र" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "कार्यकेंद्र" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "सचित्र वातावरण" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "डेस्कटाप" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -738,52 +766,73 @@ msgid "" msgstr "" "एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "डेस्कटाप" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "अन्य सचित्र डेस्कटाप" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, 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:217 #, c-format msgid "Utilities" msgstr "यूटिलिटीज़" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "एसएसएच सर्वर" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "वेबकैम" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "टर्मिनल सर्वर संरचना" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "नेटवर्क मॉनीट्रिंग" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "मैनड्रिव स्टोर" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "\"%s\" प्रिंटर की संरचना में असफ़ल !" @@ -798,7 +847,7 @@ msgstr "" "किया जायें ।\n" "अपने जोखिम पर जारी रहें । " -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -853,211 +902,211 @@ msgstr "पैकेज समूह चयन" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "निम्नतम संसाधन" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "डेस्कटाप" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "डेस्कटाप" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "डेस्कटाप" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "पैकेज समूह चयन" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "अलग-अलग पैकेजों का चयन" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "सभी को अचयनित करें" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "कुल आकार: %d / %d एम०बी०" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "संस्मरण: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "आकार:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d केबी\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "महत्ता: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "आप इस पैकज को चयनित/अचयनित नहीं कर सकते है" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s विलुप्त होने के कारण" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "असन्तुष्ट %s के कारण" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s को प्रोत्साहित करने का प्रयास" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s को रखने के लिए" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "आप इस पैकज का चयन नहीं कर सकते है क्योंकि और अधिक स्थान संसाधन के लिए नहीं बचा है" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "निम्नलिखित पैकजों का संसाधन होने जा रहा है" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "निम्नलिखित पैकेजों को हटाया जाने वाला है" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "यह एक अति आवश्यक पैकेज है, इसे अचयनित नहीं किया जा सकता है" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "आप इस पैकेज को अचयनित नहीं कर सकते है । इसे पहिले से ही संसाधित किया जा चुका है" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "इस पैकज को अचयनित नहीं करा जा सकता है । इसे उन्नयन किया जाना चाहिए" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "स्वतः चयनित पैकेजों को दिखायें" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "संसाधन" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "पैकेज चयन" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "चयनित पैकेजों का उन्नयन किया जा रहा है" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "निम्नतम संसाधन" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "सॉफ़्टवेयर प्रबंधक" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "उन पैकेजों का चयन करें जिन्हें आप संसाधित करना चाहते है" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "संसाधन हो रहा है" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "कोई विवरण नहीं" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "शेष समय" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "अनुमान लगाया जा रहा है" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d पैकेज" msgstr[1] "%d पैकेज" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "सारांश" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "संरचना" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "संरचित नहीं" @@ -1069,7 +1118,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1078,7 +1127,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1377,102 +1426,102 @@ msgstr "" "क्या आप इन अपडेटों को संसाधित करना चाहते है ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s पर %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "हार्डवेयर" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "सांउड कार्ड" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "क्या आपके पास एक आई०एस०ऐ० सांउड कार्ड है?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "संसाधन के उपरान्त \"sndconfig\" को अपने साउण्ड कार्ड को संरचित करने के लिए चलायें" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "कोई साउण्ड कार्ड नहीं खोजा जा सका । संसाधन के उपरान्त \"harddrake\" को उपयोग करके देखें" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "सचित्र इन्टरफ़ेस" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "नेटवर्क और इन्टरनेट" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "प्रोक्सियां" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "संरचित" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "सुरक्षा स्तर" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "अग्नि-भीतिका" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "सक्रिय है" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "निष्क्रिय" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "आपने एक्स को संरचित नहीं किया है । क्या आप वास्तव में ऐसा चाहते है?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "बूटलोडर को तैयार किया जा रहा है..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "संसाधन का निर्माण किया जा रहा है" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1485,24 +1534,24 @@ msgstr "" "संसाधन जारी रहेगा, परन्तु आपको अपनी मशीन को बूट करने के लिए, \n" "बूट-एक्स या किसी अन्य साधन की आवश्यकता होगी" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "इस सुरक्षा स्तर में, विण्डो विभाजन में संचिकाओं तक पहुँच सिर्फ़ प्रबंधक को हीप्राप्त है।" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "%s में एक खाली फ़्लापी डालें" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "स्वतः संसाधन फ़्लापी का निर्माण किया जा रहा है..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1513,12 +1562,12 @@ msgstr "" "\n" "क्या आप वास्तव में बाहर निकलना चाहते है?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "बधाई हो" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "रीबूट" diff --git a/perl-install/install/share/po/hr.po b/perl-install/install/share/po/hr.po index 62a1ddf10..8f3e4e698 100644 --- a/perl-install/install/share/po/hr.po +++ b/perl-install/install/share/po/hr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-01-04 21:25+CET\n" "Last-Translator: auto\n" "Language-Team: Croatian \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "Da li imate još koji?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,177 +82,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Mreža" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Mreža" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontaktiram %s web site za dobivanje popisa raspoloživih mirrora" -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "Kontaktiram %s web site za dobivanje popisa raspoloživih mirrora" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Izaberite mirror sa kojeg želite skinuti pakete" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktorij" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Ne mogu otvoriti %s: %s\n" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, fuzzy, c-format msgid "Looking at packages already installed..." msgstr "Ne možete odznačiti ovaj paket budući da je već instaliran" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Tražim pakete koje mogu nadograditi" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -261,72 +261,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Greška prilikom čitanja datoteke %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Slijedeći paketi će biti instalirani" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "FS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Mreža" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Molim odaberite" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Datoteka već postoji. Da li da nju upotrijebim?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Pristup odbijen" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "dodan medij %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ne mogu napraviti screenshotove prije particioniranja" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Screenshotovi će biti raspoloživi poslije instalaciju u %s" @@ -336,7 +336,7 @@ msgstr "Screenshotovi će biti raspoloživi poslije instalaciju u %s" msgid "Installation" msgstr "Instaliram" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Postavke" @@ -432,42 +432,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Pojavila se greška" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Nastupila je kobna pogreška: %s. " -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Ne pitaj ponovo" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "instalacijske intrukcije" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instaliram paket %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Radna stanica" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Uredska radna stanica" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -476,32 +476,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Igračka radna stanica" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedijska stanica" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet stanica" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -510,193 +510,193 @@ msgstr "" "Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za " "pregled Web-a" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Mrežno računalo (klijent)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Klijenti za razne protokole uključujući ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Alati za lako podešavanje vašeg računala" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konzolni Alati" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Razvoj" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C i C++ 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacija" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Posljužitelj weba" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, fuzzy, c-format msgid "Kolab Server" msgstr "NIS Poslužitelj" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Vatrozid/Ruter" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Datoteka/_Nova" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Poslužitelj imenika" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "NTP Poslužitelj" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS/NIS " -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, 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 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Ispisni poslužitelj" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "NIS Poslužitelj" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Baza podataka" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL ili MariaDB poslužitelj baza" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache i Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Pošta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix poslužitelj pošte" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ili MariaDB poslužitelj baza" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Mrežni računalni poslužitelj" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafičko Okružje" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE radna stanica" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -704,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome radna stanica" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -718,12 +718,41 @@ msgstr "" "Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za " "radno okružje" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE radna stanica" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za " +"radno okružje" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome radna stanica" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Radna stanica" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafičko Okružje" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Radna površina" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -732,52 +761,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Radna površina" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za " +"radno okružje" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Druga grafička radna okružja" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Pomoćni programi" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "NIS Poslužitelj" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Servisi" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Prebaci postavke pisača" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Mrežne postavke" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Kontrolni Centar" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Podešavam pisač \"%s\" ..." @@ -791,7 +842,7 @@ msgstr "" "Dogodila se greška, ali neznam kako s njom lijepo rukovati.\n" "Nastavite dalje na vlastiti rizik." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -845,107 +896,107 @@ msgstr "Odabir grupe paketa" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimalna instalacija" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Radna površina" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Radna površina" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Radna površina" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Odabir grupe paketa" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individualan odabir paketa" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Odselektiraj sve" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Ukupna veličina: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Inačica: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Veličina: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, fuzzy, c-format msgid "%d KB\n" msgstr "Veličina: %d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Značaj: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ne možete označiti/odznačiti ovaj paket" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, fuzzy, c-format msgid "due to missing %s" msgstr "kdesu nedostaje" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "zbog nezadovoljavajućeg %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "odabirem %s izabiranjem datoteka" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "kako bi se zadržalo %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -954,87 +1005,87 @@ msgstr "" "Ne možete označiti ovaj paket budući da nema dovoljno mjesta gdje ga se može " "instalirati" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Prikaži automatski odabrane pakete" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instaliraj" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Premjesti označeno" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Dograđujem izbor paketa" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimalna instalacija" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Upravitelj Softwareom" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Odaberite pakete koje želite instalirati" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instaliram" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Detalji" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Preostalo vrijeme" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Procjenjujem" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1042,17 +1093,17 @@ msgstr[0] "%d paketa" msgstr[1] "%d paketa" msgstr[2] "%d paketa" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sažetak" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Podešavanje" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "ponovno postavi" @@ -1064,7 +1115,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1073,7 +1124,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1374,28 +1425,28 @@ msgstr "" "Da li želite instalirati dogradnju?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Sklopovlje" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Zvučna kartica" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Da li imate ISA zvučnu karticu?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1404,74 +1455,74 @@ msgstr "" "Pokrenite \"sndconfig\" poslije instalacije za podešavanje vaše zvučne " "kartice" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, fuzzy, c-format msgid "Graphical interface" msgstr "X kod pokretanja sustava" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Mreža i Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Profil: " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "ponovno postavi" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sigurnosna Razina" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Vatrozid" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, fuzzy, c-format msgid "activated" msgstr "Aktiviraj sada" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "onemogućeno" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Pripremam bootloader" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pripremam instalaciju" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1484,24 +1535,24 @@ msgstr "" "Instalacija će nastaviti, ali ćete morati\n" " koristiti BootX da podignete vaše računalo" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Umetnite praznu disketu u pogon %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Pravim auto instalacijsku disketu" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1512,12 +1563,12 @@ msgstr "" "\n" "Želite li zaista završiti?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Čestitamo, pobijedili ste!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Ponovno pokretanje sustava" diff --git a/perl-install/install/share/po/hu.po b/perl-install/install/share/po/hu.po index ff12f09ea..411195a38 100644 --- a/perl-install/install/share/po/hu.po +++ b/perl-install/install/share/po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-2010.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-10-06 09:55+0100\n" "Last-Translator: Gergely Lónyai \n" "Language-Team: Hungarian \n" @@ -79,7 +79,7 @@ msgid "Do you have further supplementary media?" msgstr "Van további kiegészítő adathordozója?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -93,181 +93,181 @@ msgstr "" "\n" "Van beállítandó kiegészítő telepítési adathordozója?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Hálózat (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Hálózat (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Hálózat (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "A tükörkiszolgáló címe?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Az URL-nek ftp:// vagy http:// előtaggal kell kezdődnie" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "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:193 +#: any.pm:195 #, c-format 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 %s " "webkiszolgálójától" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-beállítás" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Gépnév hiányzik" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "A könyvtárnak \"/\" jellel kell kezdődnie" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Az NFS-csatolás gépneve?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Könyvtár" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Kiegészítő" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "A tükörkiszolgálón nem található fejléclista" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "A(z) \"%s\" adathordozón levő összes csomag kihagyása" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "A már telepített csomagok vizsgálata..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "A frissítendő csomagok keresése..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -280,72 +280,72 @@ msgstr "" "\n" "Szeretné eltávolítani ezeket a csomagokat?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Hiba a(z) %s fájl olvasása közben" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "A következő lemezek át lettek nevezve:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (korábbi név: %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Hálózat" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Válasszon egy adatforrást" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "A fájl már létezik. Felülírja?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Hozzáférés megtagadva" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Helytelen NFS-név" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "\"%s\": hibás adatforrás" -#: any.pm:1355 +#: any.pm:1385 #, 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:1363 +#: any.pm:1393 #, 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" @@ -355,7 +355,7 @@ msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s" msgid "Installation" msgstr "Telepítés" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Beállítás" @@ -461,42 +461,42 @@ msgstr "" "A(z) %s által kért bizonyos csomagok nem telepíthetők:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Hiba lépett fel:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Végzetes hiba történt: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Ne kérdezze mégegyszer" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d telepítési művelet nem sikerült" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Sikertelen csomagtelepítések:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Munkaállomás" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Irodai munkaállomás" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -505,32 +505,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Játékgép" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimédiás munkaállomás" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internetes munkaállomás" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -538,193 +538,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:40 #, 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:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Parancssori eszközök" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Fejlesztés" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C/C++ 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentáció" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webkiszolgáló" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Csoportmunka-alkalmazás" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet átjáró" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Levelezés/hírek" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Címtárkiszolgáló" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP kiszolgáló" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS és NIS kiszolgáló" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Adatbázis" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Levelezés" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix email kiszolgáló" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, 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:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Grafikus környezet" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE munkaállomás" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -733,12 +733,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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME munkaállomás" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -746,12 +746,40 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE munkaállomás" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME munkaállomás" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Munkaállomás" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafikus környezet" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE munkaasztal" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -760,52 +788,74 @@ msgstr "" "Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és " "segédprogramokkal" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Egyéni munkaasztal" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és " +"segédprogramokkal" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Más grafikus környezetek" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "WindowMaker, Enlightenment, Fvwm, ..." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Segédprogramok" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH kiszolgáló" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin kiszolgáló távoli beállításhoz" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, 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:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia varázslók" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Varázslók a kiszolgáló beállítására" @@ -819,7 +869,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -875,92 +925,92 @@ msgstr "Adathordozó kiválasztása" msgid "Install %s KDE Desktop" msgstr "A %s KDE asztalának telepítése" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "A %s GNOME asztalának telepítése" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Egyéni telepítés" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE munkaasztal" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME munkaasztal" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Egyéni munkaasztal" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Így fog kinézni a '%s' munkaasztala." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Csomagcsoportok kiválasztása" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Csomagok egyedi kiválasztása" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Kijelölések megszüntetése" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Összméret: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verzió: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Méret: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Fontosság: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format 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:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "\"%s\" hiánya miatt" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "\"%s\" igényei miatt" @@ -978,17 +1028,17 @@ msgstr "\"%s\" igényei miatt" # 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:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "a legalkalmasabb \"%s\" keresése" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "\"%s\" megtartása érdekében" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -996,105 +1046,105 @@ msgid "" msgstr "" "Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen." -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automatikusan kijelölt csomagok mutatása" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Telepítés" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Kijelölés betöltése/mentése" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "A csomagkiválasztás frissítése" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimális telepítés" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Szoftverkezelés" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Válassza ki a telepítendő csomagokat" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Telepítés" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Részletek nélkül" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Hátralevő idő:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(becslés...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d csomag" msgstr[1] "%d csomag" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Összefoglalás" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Beállítás" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nincs beállítva" @@ -1108,7 +1158,7 @@ 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:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1121,7 +1171,7 @@ 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:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Teljes CD-k másolása" @@ -1431,28 +1481,28 @@ msgstr "" "Szeretné feltelepíteni a frissítéseket?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s ezen: %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardver" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Hangkártya" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Van ISA hangkártyája?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1461,75 +1511,75 @@ 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:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafikus felület" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Hálózat és internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxyk" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "beállítva" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Biztonsági szint" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Tűzfal" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiválva" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "kikapcsolva" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Rendszerbetöltő előkészítése..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "A telepítés előkészítése" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Egy kis türelmét kérem..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1542,7 +1592,7 @@ msgstr "" "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:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1551,17 +1601,17 @@ msgstr "" "Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos " "partíción levő fájlokat." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Automatikus telepítőfloppy készítése..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1572,12 +1622,12 @@ msgstr "" "\n" "Biztos, hogy ki akar lépni?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulálunk" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Újraindítás" diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po index e1c5a0759..66c528ee7 100644 --- a/perl-install/install/share/po/id.po +++ b/perl-install/install/share/po/id.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-04 12:55+0700\n" "Last-Translator: Kiki Syahadat \n" "Language-Team: Indonesia , Translation list \n" "Language-Team: Icelandic \n" @@ -77,7 +77,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -90,88 +90,88 @@ msgstr "" "\n" "Hefur þú einhverja aðra miðla sem þarf að stilla?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Geisladrif" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Net (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Net (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Net (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Vefslóð að spegli?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Slóð verður að byrja á ftp:// eða http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Mistókst að tengjast við %s vefinn til að sækja lista yfir fáanlega spegla" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS uppsetning" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Vélarnafn vantar" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Möppunafn verður að byrja á \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Vélarnafn á NFS tengipunkti?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Mappa" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Aukalegt" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,90 +180,90 @@ msgstr "" "Finn ekki pakkalista-skrá á þessum spegli. Athugaðu hvort staðsetningin sé " "rétt." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Sleppa ölum pökkum af miðli \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Athuga þegar uppsetta pakka..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Leita að pökkum til að uppfæra..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -276,72 +276,72 @@ msgstr "" "\n" "Viltu í alvöru fjarlægja þessa pakka?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Villa við lestur úr skránni %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Eftirfarandi diskar voru endurnefndir:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (áður nefnt %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Net" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Veldu miðil" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Skráin er þegar til. Skrifa yfir hana?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Aðgangi hafnað" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Rangt NFS nafn" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Gallaður miðill %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s" @@ -351,7 +351,7 @@ msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s" msgid "Installation" msgstr "Set inn" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Stillingar" @@ -452,42 +452,42 @@ msgstr "" "Suma pakka sem %s þarfnast, er ekki hægt að setja inn:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Villa kom upp:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Banvæn villa kom upp: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d Innsetningarfærslur brugðust" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Innsetning pakka tókst ekki:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Vinnustöð" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Skrifstofu-vinnustöð" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,32 +496,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Leikja-(vinnu)stöð" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Margmiðlunar-vinnustöð" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet-vinnustöð" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -530,217 +530,244 @@ 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:40 #, c-format msgid "Network Computer (client)" msgstr "Netbiðlarar" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Skjától" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Forritun" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Handbækur" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Stuðningur fyrir forrit þriðja aðila" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Vefmiðlari" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Hópvinnuforrit" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet netgátt" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Póstur/Fréttir" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Upplýsingaveita" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Miðlari" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Nafnaþjónustur og net-upplýsingaveitur" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Gagnagrunnar" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL og MariaDB gagnagrunns-miðlarar" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Vefur/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Póstur" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix póstþjónusta" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Netþjónustur" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-þjónusta, SMB-þjónusta, Staðgengils-þjónusta, ssh-þjónusta" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Myndrænt umhverfi" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Vinnustöð" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome vinnustöð" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Gluggastjóri með notendavænum forritum og skjáborðs-tólum" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Vinnustöð" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome vinnustöð" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Vinnustöð" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Myndrænt umhverfi" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE Skjáborð" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -748,52 +775,73 @@ msgid "" 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Sérsniðið Skjáborð" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Aðrir gluggastjórar" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, o.s.frv" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Tól" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Miðlari" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin, stillingar á fjartengdri tölvu um vef" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Netforrit/Neteftirlit" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Ráðgjafar" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Ráðgjafar til að stilla miðlara" @@ -807,7 +855,7 @@ msgstr "" "Óþekkt villa kom upp sem ekki er hægt að meðhöndla.\n" "Haltu áfram á eigin ábyrgð." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -863,211 +911,211 @@ msgstr "Val á miðlum" msgid "Install %s KDE Desktop" msgstr "Setja inn %s KDE umhverfi" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Setja inn %s GNOME umhverfi" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Sérsniðin uppsetning" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE Skjáborð" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME Skjáborð" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Sérsniðið Skjáborð" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, 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:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Val á pakkahóp" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Val á einstökum pökkum" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Afvelja allt" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Heildarstærð: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Útgáfa: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Stærð: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Mikilvægi: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Þú getur ekki valið/af-valið þennan pakka" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "vegna þess að %s vantar" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "vegna þess að %s er ekki uppfyllt" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "reyni að hækka vægi %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "til þess að halda %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Þú getur ekki valið þennan pakka því það er ekki nægilegt pláss" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Þú getur ekki af-valið þennan pakka hann er þegar uppsettur" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Sýna sjálfvirkt valda pakka" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Setja inn" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Sækja/Vista val" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Uppfæri val á pökkum" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Lágmarks uppsetning" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Hugbúnaðarumsýsla" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Veldu pakkana sem þú vilt setja inn" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Set inn" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Engar upplýsingar" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tími eftir:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(áætla...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakki" msgstr[1] "%d pakkar" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Yfirlit" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Stilla" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ekki stillt" @@ -1081,7 +1129,7 @@ msgstr "" "Eftirfarandi uppsetningar-miðlar hafa fundist.\n" "Ef þú vilt sleppa einhverjum af þeim, þá getur þú af-valið þá núna." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1094,7 +1142,7 @@ msgstr "" "Síðan mun uppsetning halda áfram frá disknum og pakkarnir verða til staðar " "þegar kerfið er að fullu uppsett." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Afrita alla geisladiska" @@ -1401,28 +1449,28 @@ msgstr "" "Viltu sækja uppfærslurnar?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s á %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Vélbúnaður" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Hljóðkort" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Er kannski ISA hljóðkort í vélinni?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1431,74 +1479,74 @@ msgstr "" "Keyrðu \"alsaconf\" eða \"sndconfig\" eftir uppsetningu til að stilla " "hljóðkortið þitt" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Myndrænt viðmót" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Staðarnet og Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Sel" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "stillt" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Öryggisþrep" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Eldveggur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "virkt" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "óvirkt" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Set upp ræsistjórann..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Undirbý innsetningu" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Verið þolinmóð þetta getur tekið nokkra stund..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1511,7 +1559,7 @@ msgstr "" "verður að nota BootX eða aðrar leiðir til að ræsa vélina. kjarna-viðfangið " "fyrir rótarsneiðina er: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1520,17 +1568,17 @@ msgstr "" "Í þessu öryggisþrepi er aðgangur að Windows disksneiðum takmarkaður við " "kerfisstjóra." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Settu tóman diskling í drif %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1541,12 +1589,12 @@ msgstr "" "\n" "Viltu virkilega hætta núna?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Til hamingju" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Endurræsa" diff --git a/perl-install/install/share/po/it.po b/perl-install/install/share/po/it.po index 08850bdf7..1ad47cdd7 100644 --- a/perl-install/install/share/po/it.po +++ b/perl-install/install/share/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-01-12 17:16+0100\n" "Last-Translator: Matteo Pasotti \n" "Language-Team: Italian \n" @@ -73,7 +73,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,91 +87,91 @@ msgstr "" "\n" "Disponi di altre fonti di installazione da configurare?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rete (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rete (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rete (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL del mirror?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "L'URL deve iniziare con ftp:// o http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Contattando il sito web %s per ottenere l'elenco dei mirror disponibili..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "È fallito il contatto col sito web %s per ottenere la lista dei mirror " "disponibili" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Scegli un mirror da cui recuperare i pacchetti" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configurazione NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Manca il nome dell'host" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Una directory deve iniziare con \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nome dell'host da montare con NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directory" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Aggiuntivo" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,22 +180,22 @@ msgstr "" "Impossibile trovare su questo mirror il file con l'elenco dei pacchetti. " "Assicurati che l'indirizzo sia esatto." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -204,22 +204,22 @@ msgstr "" "Alcuni dispositivi hardware sul tuo elaboratore necessitano di firmware " "proprietari affinché il software libero dei driver possa funzionare." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Dovresti abilitare \"%s\"" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" contiene software non libero.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -229,7 +229,7 @@ msgstr "" "(eg: qualche scheda grafica ATI/AMD, qualche scheda di rete, qualche scheda " "RAID, ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -238,41 +238,41 @@ msgstr "" "\"%s\" contiene software che non può essere distribuito in qualsiasi paese a " "causa di brevetti software." -#: any.pm:359 +#: any.pm:381 #, 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:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Qui puoi abilitare più fonti se lo desideri." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" "Questa fonte fornisce aggiornamenti dei pacchetti provenienti da \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Ricerca dei pacchetti già installati..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Ricerca dei pacchetti da aggiornare..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -286,72 +286,72 @@ msgstr "" "\n" "Vuoi davvero rimuoverli?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Errore nel leggere il file %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Questi dischi hanno cambiato nome:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (che prima si chiamava %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rete" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Scegli una fonte" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Il file esiste già. Lo sovrascrivo?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permesso negato" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nome NFS non valido" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Fonte non valida %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Non è possibile fare schermate prima di partizionamento" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Gli screenshot saranno disponibili in %s dopo l'installazione." @@ -361,7 +361,7 @@ msgstr "Gli screenshot saranno disponibili in %s dopo l'installazione." msgid "Installation" msgstr "Installazione" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configurazione" @@ -461,42 +461,42 @@ msgstr "" "Alcuni pacchetti richiesti da %s non possono essere installati:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Si è verificato un errore:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Si è verificato un errore fatale: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Non chiedere più" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transazioni dell'installazione fallite" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installazione dei pacchetti non riuscita:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Postazione di lavoro" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Postazione per lavoro da ufficio" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -505,32 +505,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Computer per giocare" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Postazione multimediale" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Postazione Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -539,193 +539,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:40 #, c-format msgid "Network Computer (client)" msgstr "Computer in rete (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Programmi da riga di comando" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Sviluppo" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentazione" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Supporto per applicazioni di terze parti" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Gateway per Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Mail/News" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Server di posta Postfix, server di news Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Server di Directory" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server per Domain Name e Network Information" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Server di database PostgreSQL e MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache e Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Posta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Server di posta Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Server di database PostgreSQL o MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Server di rete" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Ambiente grafico" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Postazione di lavoro grafica con KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -734,12 +734,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:156 #, c-format msgid "GNOME Workstation" msgstr "Postazione di lavoro grafica con GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -748,12 +748,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Postazione di lavoro grafica con KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Un ambiente grafico con un gruppo di applicazioni e di strumenti per il " +"desktop di facile utilizzo" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Postazione di lavoro grafica con GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Postazione di lavoro" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambiente grafico" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Desktop LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -762,52 +791,74 @@ msgstr "" "Un ambiente grafico leggero e veloce con un gruppo di applicazioni e di " "strumenti per il desktop di facile utilizzo" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Desktop personalizzato" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un ambiente grafico leggero e veloce con un gruppo di applicazioni e di " +"strumenti per il desktop di facile utilizzo" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Altri desktop grafici" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, ecc." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilità" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Server Webmin per la configurazione remota" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilità/Monitoraggio della rete" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Assistenti Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Procedure guidate per la configurazione del server" @@ -821,7 +872,7 @@ msgstr "" "Si è verificato un errore non gestibile automaticamente.\n" "Puoi continuare a tuo rischio e pericolo." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -876,107 +927,107 @@ msgstr "Selezione delle fonti d'installazione" msgid "Install %s KDE Desktop" msgstr "Installa il desktop KDE %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installa il desktop GNOME %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Installazione personalizzata" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Desktop KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Desktop GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Desktop personalizzato" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Ecco l'anteprima del desktop '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selezione per gruppi di pacchetti" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selezione individuale dei pacchetti" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Deseleziona tutti" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Dimensione totale: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versione: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Dimensione:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importanza: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Non puoi selezionare/deselezionare questo pacchetto" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "per la mancanza di %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "perché %s non è soddisfatto" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "Ricerca del miglior pacchetto per %s..." -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "per conservare %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -985,104 +1036,104 @@ msgstr "" "Non puoi selezionare questo pacchetto perché non c'è spazio sufficiente per " "installarlo" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Questo è un pacchetto obbligatorio, non puoi deselezionarlo" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Non puoi deselezionare questo pacchetto. È già installato" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Non puoi deselezionare questo pacchetto. Deve essere aggiornato" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostra i pacchetti selezionati automaticamente" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installa" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Carica/salva selezione" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Aggiornamento scelta pacchetti" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Installazione minimale" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gestione software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Scegli i pacchetti che vuoi installare" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installazione" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Senza dettagli" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tempo restante:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(stima in corso...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pacchetto" msgstr[1] "%d pacchetti" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Riepilogo" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configura" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "non configurata" @@ -1096,7 +1147,7 @@ msgstr "" "Sono state trovate queste fonti d'installazione.\n" "Se vuoi ignorarne qualcuna, la puoi deselezionare ora." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1109,7 +1160,7 @@ msgstr "" "Si proseguirà così dal disco rigido e i pacchetti rimarranno disponibili una " "volta che il sistema è completamente installato." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copia tutti i CD" @@ -1419,28 +1470,28 @@ msgstr "" "Vuoi installare gli aggiornamenti?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s in %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Scheda audio" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Hai una scheda audio ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1449,74 +1500,74 @@ msgstr "" "Lancia \"alsaconf\" o \"sndconfig\" dopo l'installazione per configurare la " "scheda audio" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaccia grafica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rete e Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurato" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Livello di sicurezza" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "attivato" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "disabilitato" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Preparazione del bootloader..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Sto preparando l'installazione..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Sii paziente, potrebbe servire un po' di tempo..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1529,7 +1580,7 @@ msgstr "" "BootX o qualche altro metodo per avviare il tuo computer. L'argomento da " "passare al kernel per il fs radice è: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1538,17 +1589,17 @@ msgstr "" "A questo livello di sicurezza, l'accesso ai file delle partizioni Windows è " "riservato all'amministratore." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Inserisci un floppy vuoto nell'unità %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Sto creando il floppy di installazione automatica..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1559,12 +1610,12 @@ msgstr "" "\n" "Vuoi veramente interrompere adesso?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Congratulazioni" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Riavvia" diff --git a/perl-install/install/share/po/ja.po b/perl-install/install/share/po/ja.po index d04f9b906..fb10ee59a 100644 --- a/perl-install/install/share/po/ja.po +++ b/perl-install/install/share/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-03-22 21:11+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -76,7 +76,7 @@ msgid "Do you have further supplementary media?" msgstr "他に補助的なメディアがありますか?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,89 +89,89 @@ msgstr "" "\n" "他に設定するメディアはありますか?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "ネットワーク (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "ネットワーク (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "ネットワーク (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "ミラーの URL" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL は ftp:// または http:// で始まらなければなりません" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "%s のサイトに接続してミラーのリストを取得しています..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "%s ウェブサイトへの接続に失敗したため、利用可能なミラーのリストを取得できませ" "んでした" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "パッケージを取得するミラーを選択" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS の設定" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "NFS メディアのホスト名とディレクトリを入力してください" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "ホスト名がありません" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "ディレクトリは \"/\" で始まらなければなりません" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS マウントのホスト名" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ディレクトリ" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "補助" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -180,90 +180,90 @@ msgstr "" "パッケージリストのファイルが見つかりません。ミラーの場所が正しいか確認してく" "ださい。" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "メディア %s のすべてのパッケージを飛ばす" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "インストール済みパッケージを探しています..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "更新するパッケージを探しています..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "アップグレードする前にパッケージを削除しています..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -276,72 +276,72 @@ msgstr "" "\n" "これらのパッケージを削除してよろしいですか?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "ファイル %s を読み込み中にエラー" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "次のディスクの名前は変更されました:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (変更前の名前は %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "ネットワーク" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "メディアを選んでください" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "ファイルが既に存在します。上書きしますか?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "アクセス許可がありません" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "不正な NFS 名" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "不正なメディア %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "パーティション設定が終わるまでスクリーンショットは撮れません" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -352,7 +352,7 @@ msgstr "" msgid "Installation" msgstr "インストール" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "設定" @@ -451,42 +451,42 @@ msgstr "" "%s が要求するいくつかのパッケージをインストールできません:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "エラーが発生しました" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "致命的なエラーが発生: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "次回から確認しない" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d 件のインストールが失敗しました" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "パッケージ %s をインストール" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "ワークステーション" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "オフィスワークステーション" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -495,301 +495,348 @@ msgstr "" "オフィスソフト: ワープロ (LibreOffice Writer, Kword), 表計算 (OpenOffice.org " "Calc, Kspread), PDF ビューアなど" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "ゲームステーション" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "ゲームプログラム: アーケードゲーム, ボードゲーム, 戦略ゲームなど" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "マルチメディアステーション" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "サウンドと動画の再生/編集ソフト" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "インターネットステーション" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "メールとニュースの送受信用ツール (mutt,tin..) とウェブブラウズ用ツール" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "ネットワーク (クライアント)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "ssh などの各種プロトコル用クライアント" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "コンピュータの設定を簡単にするツール" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "コンソールツール" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "エディタ, シェル, ファイル関連ツール, ターミナル" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "開発用" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C/C++ の開発ライブラリ, プログラム, include ファイル" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "ドキュメント" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Linux/フリーソフト関連の文書とHowto" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base, サードパーティのアプリケーションをサポート" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web サーバ" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "グループウェア" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolabサーバ" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "ファイアウォール/ルータ" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "インターネットゲートウェイ" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "メール/ニュース" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix メールサーバ, Inn ニュースサーバ" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "ディレクトリサーバ" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP サーバ" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "ドメイン名/ネットワークインフォメーションサーバ" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "ファイル/プリンタ共有サーバ" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS サーバ/Samba サーバ" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "データベース" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL/MariaDBデータベースサーバ" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "メール" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix メールサーバ" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL/MariaDB データベースサーバ" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "ネットワークコンピュータサーバ" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS サーバ, SMB サーバ, プロキシサーバ, SSH サーバ" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "グラフィカル環境" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE ワークステーション" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE - さまざまなツールを含む定番グラフィカル環境" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME ワークステーション" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE ワークステーション" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME ワークステーション" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "ワークステーション" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "グラフィカル環境" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE デスクトップ" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "カスタムデスクトップ" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "その他のグラフィカルデスクトップ" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm など" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "ユーティリティ" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH サーバ" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin リモート設定サーバ" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "ネットワークユーティリティ/モニタリング" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "モニタリングツール, プロセス管理, tcpdump, nmap..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia ウィザード" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "サーバ設定ウィザード" @@ -803,7 +850,7 @@ msgstr "" "エラーが発生しました。しかし対処する方法がわかりません。\n" "自己責任で続けてください。" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -857,109 +904,109 @@ msgstr "メディアの選択" msgid "Install %s KDE Desktop" msgstr "%s KDE デスクトップをインストール" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "%s GNOME デスクトップをインストール" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "カスタムインストール" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE デスクトップ" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME デスクトップ" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "カスタムデスクトップ" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "%s デスクトップのプレビューです。" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "画像をクリックすると大きなプレビューが表示されます" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "パッケージグループを選択" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "パッケージを個別に選択" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "すべて選択解除" # Changed "total size" to "total", due to problem of available # space on screen. -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "合計: %d/%d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "バージョン: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "サイズ: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "重要性: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "このパッケージの選択/非選択は変更できません" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s がないために" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s が依存を満たしていないために" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s をアップグレードするために" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s を維持するために" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -967,103 +1014,103 @@ msgid "" msgstr "" "このパッケージは選択できません。インストールに必要な空き容量がありません。" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "以下のパッケージをインストールします" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "以下のパッケージを削除します" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "これは必須パッケージです。選択を解除することはできません。" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "このパッケージの選択は解除できません。既にインストールされています。" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "このパッケージの選択は解除できません。アップグレードが必要です。" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "自動的に選択されたパッケージを表示" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "インストール" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "選択を読み込む/保存する" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "パッケージの選択を更新" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "最小インストール" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "ソフトウェアの管理" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "インストールするパッケージを選んでください" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "インストール中" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "詳細なし" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "残り時間:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(試算しています...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d 個のパッケージ" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "まとめ" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "設定" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "設定されていません" @@ -1077,7 +1124,7 @@ msgstr "" "次のインストールメディアを検出しました。\n" "使用しないものがあればここで選択を解除してください。" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1089,7 +1136,7 @@ msgstr "" "そうするとインストーラはハードドライブからインストールを続けます。コピーされ" "たパッケージはインストール完了後も利用できます。" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "CD 全体をコピー" @@ -1396,28 +1443,28 @@ msgstr "" "更新されたパッケージをインストールしますか?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%2$s の %1$s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "ハードウェア" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "サウンドカード" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "ISA サウンドカードをお使いですか?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1426,75 +1473,75 @@ msgstr "" "インストール後に alsaconf か sndconfig を実行してサウンドカードを設定してくだ" "さい。" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "サウンドカードが見つかりません。インストール後に harddrake で再度設定を試みて" "ください。" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "グラフィカルインターフェース" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "ネットワークとインターネット" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "プロキシ" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "設定済み" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "セキュリティレベル" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "ファイアウォール" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "有効" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "無効" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "X が設定されていません。本当によろしいですか?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "ブートローダを準備中..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "インストールの準備" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "しばらく時間がかかります。お待ちください。" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1506,7 +1553,7 @@ msgstr "" "は yaboot は動きません。インストールを続けますが、マシンを起動するには、" "BootX もしくは他の方法が必要です。'root fs' のカーネル引数は 'root=%s' です。" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1515,17 +1562,17 @@ msgstr "" "このセキュリティレベルでは、Windows パーティションのファイルへのアクセスが管" "理者のみに限定されます。" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "空のフロッピーをドライブ %s に入れてください" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "インストール自動化フロッピーを作成中..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1536,12 +1583,12 @@ msgstr "" "\n" "本当に終了しますか?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "おめでとうございます" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "再起動" diff --git a/perl-install/install/share/po/ko.po b/perl-install/install/share/po/ko.po index 342b2592f..3463c78de 100644 --- a/perl-install/install/share/po/ko.po +++ b/perl-install/install/share/po/ko.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ko(metanav)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2007-06-18 14:54+0900\n" "Last-Translator: meta \n" "Language-Team: ahb hong-bae \n" @@ -77,7 +77,7 @@ msgid "Do you have further supplementary media?" msgstr "추가할 미디어가 있습니까?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -90,87 +90,87 @@ msgstr "" "\n" "설정할 추가 설치 매체가 있습니까?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "망(HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "망(FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "망(NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "미러사이트의 (URL)주소를 적어주십시오." -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL 주소는 ftp:// 또는 http:// 로 시작되어야 합니다." -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "유효한 미러 목록을 받기 위해 %s 홈페이지에 접속 중..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "%s 홈페이지에 접속하여 미러사이트목록을 받는 데 실패했습니다." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "패키지를 받을 미러 사이트를 선택하시오." -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "망 파일 시스템 (NFS) 구성" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "NFS 매체의 호스트 이름과 디렉토리를 입력해 주십시요." -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "호스트 이름을 찾을 수 없습니다" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "디렉토리는 \"/\"로 시작되어야 합니다." -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "망 파일 시스템(NFS)의 호스트 이름을 설치합니까?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "디렉토리" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "추가" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -178,90 +178,90 @@ msgid "" msgstr "" "미러 사이트에서 패키지 리스트를 찾을 수 없습니다. 이 위치에 만드시겠습니까?" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\"에서 모든 패키지를 설치하지 않음" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "이미 설치된 패키지 찾는 중..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "업그레이드할 패키지를 검색중..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "업그레이드된 패키지를 제거하는 중..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -274,72 +274,72 @@ msgstr "" "\n" "정말 이 패키지들을 제거 하시겠습니까?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s 파일을 읽는중 오류가 발생했습니다." -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "다음 디스크이름이 변경되었습니다. :" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (이전 이름은 %s였음.)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP(하이퍼텍스트 전송 규약)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP(파일 전송규약)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS(망 파일 시스템)" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "망" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "매체를 선택하시오" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "파일이 이미 존재합니다. 덮어쓸까요?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "권한이 없습니다." -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "부정확한 NFS 이름입니다" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "알 수 없는 미디어 %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "파티션을 나누기 전에는 스크린샷을 만들 수 없습니다." -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "스크린샷은 설치 이후에 %s에 위치 할 것입니다." @@ -349,7 +349,7 @@ msgstr "스크린샷은 설치 이후에 %s에 위치 할 것입니다." msgid "Installation" msgstr "설치중" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "설정" @@ -445,42 +445,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "오류 발생" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "설치 실패." -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s 패키지 설치중" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "워크스테이션" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "오피스 워크스테이션" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -489,301 +489,348 @@ msgstr "" "오피스 프로그램들: 워드프로세서 (LibreOffice Writer, Kword), 스프레드쉬트 " "(LibreOffice Calc, Kspread), PDF 뷰어, 등등" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "게임 스테이션" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "간단한 게임모음: 아케이드, 보드, 전략 등등" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "멀티미디어 스테이션" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "사운드 및 비디오 연주/편집 프로그램" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "인터넷 스테이션" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "메일/뉴스를 읽고 보내며 (mutt, tin..) 웹검색을 하기 위한 도구모음" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "망 컴퓨터 (클라이언트)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "SSH를 포함한 여러 프로토콜의 클라이언트" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "쉽게 컴퓨터 설정을 하기 위한 도구" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "콘솔 도구" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "에디터, 쉘, 파일도구, 터미널" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "개발" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C/C++ 개발 라이브러리, 프로그램 및 헤더파일" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "문서" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "리눅스 기본 규격(Linux Standard Base)" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "리눅스 기본 규격. 외부 애플리케이션 지원" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "웹 서버" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "아파치" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "그룹웨어" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab 서버" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "방화벽/라우터" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "인터넷 게이트웨이" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/파일(F)/새로 만들기(_N)" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "포스트픽스 메일 서버" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "디렉토리 서버" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP 서버" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "도메인 이름 서버/망 정보 서버" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "도메인 이름 및 망 정보 서버" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "프린터 서버" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS 서비스, 삼바 서비스" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "데이터베이스" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL 또는 MariaDB 데이터베이스 서버" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "웹/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "아파치와 프로FTPD" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "메일" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "포스트픽스 메일 서버" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL 또는 MariaDB 데이터베이스 서버" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "망 컴퓨터 서버" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS 서버, 삼바 서버, 프록시 서버, SSH 서버" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "그래픽 환경" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "K 데스크탑 환경 기반 워크스테이션" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "K Desktop 환경, 여러가지 도구를 수반한 기본 그래픽 환경" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME 워크스테이션" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "K 데스크탑 환경 기반 워크스테이션" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME 워크스테이션" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "워크스테이션" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "그래픽 환경" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm 데스크탑" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm 데스크탑" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "기타 그래픽 데스크탑" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, 윈도우 메이커, 인라이튼먼트, Fvwm, 등등" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "유틸리티" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH 서비스" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "웹민 서비스" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin 원격 설정 서버" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "망 유틸리티들/감시" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "감시 도구, 프로세스 관리, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "맨드리바 제어 센터" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "서버 설정 도우미" @@ -797,7 +844,7 @@ msgstr "" "오류가 발생했지만, 처리할 수 없습니다.\n" "위험을 감수하려면 계속하세요." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -853,211 +900,211 @@ msgstr "패키지 그룹 선택" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "최소 설치" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm 데스크탑" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm 데스크탑" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm 데스크탑" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "패키지 그룹 선택" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "개별 팩키지 선택" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "모든 선택 해제" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "전체 크기: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "판" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "크기: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d 킬로 바이트\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "중요도: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "이 패키지를 선택/버림 할 수 없습니다." -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s 가 없음" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s 비충족" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s 를 활성화하기 위해 시도중" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s를 유지하기 위해" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "이 패키지 선택할 수 없음 - 디스크 공간 부족" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "다음 패키지들을 설치합니다." -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "다음 패키지들을 제거합니다." -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "이것은 필수 패키지이므로 제거할 수 없습니다." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "선택해제할 수 없음 - 이미 설치된 패키지입니다." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "선택해제할 수 없음 - 업그레이드 필." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "자동 선택 패키지들 보기" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "설치" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "열기/저장 선택" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "선택된 패키지 목록 업데이트 중" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "최소 설치" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "소프트웨어 관리" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "설치할 패키지를 선택하시오." -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "설치중" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "상세설명 생략" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "남은 시간 " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "계산 중" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d 패키지" msgstr[1] "%d 패키지" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "요약설명" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "설정" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "설정되지 않음" @@ -1071,7 +1118,7 @@ msgstr "" "다음 설치 매체를 찾았습니다.\n" "설치 하지 않으려면 설치해제하십시오." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1083,7 +1130,7 @@ msgstr "" "그러면 하드 드라이브에 설치한 후에도 패키지는 시스템에 남아서 재설치가 가능합" "니다." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "전체 CD 복사" @@ -1382,28 +1429,28 @@ msgstr "" "업데이트를 설치 하시겠습니까?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s (%s 컴퓨터)" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "하드웨어" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "사운드 카드" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "ISA 사운드 카드가 있습니까?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1412,75 +1459,75 @@ msgstr "" "사운드 카드를 설정하려면 설치 후에\n" "「alsaconf」 또는 「sndconfig」명령을 실행해주십시요." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "사운드 카드가 발견되지 않았습니다.\n" "설치 후에「harddrake」명령을 실행해주십시요." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "시작시 바로 X-Window 실행" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "망과 인터넷" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "프록시" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "재설정되었습니다." -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "보안 등급" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "방화벽" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "활성화" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "금지" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "X 설정이 되지 않았습니다. 설정하시겠습니까?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "부트 로더 준비중" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "설치 준비중입니다" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1494,7 +1541,7 @@ msgstr "" "BootX나 또는 몇몇 방법을 써야 될수도 있습니다. \n" "root fs를 위한 kernel argument : root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1503,17 +1550,17 @@ msgstr "" "이 보안 등급에서는 윈도우즈 파티션에서의 파일 접근이 관리자에 의해 제한 됩니" "다." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "%s 드라이브에 빈 플로피 디스크를 넣으세요" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "자동 설치 플로피 디스크 생성 중" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1524,12 +1571,12 @@ msgstr "" "\n" "정말 지금 종료 하시겠습니까?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "축하합니다." -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "다시 시작" diff --git a/perl-install/install/share/po/ky.po b/perl-install/install/share/po/ky.po index 216c6f16b..1129a1a28 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-04-18 19:08+0600\n" "Last-Translator: Ilyas Bakirov \n" "Language-Team: Kyrgyz\n" @@ -75,7 +75,7 @@ msgid "Do you have further supplementary media?" msgstr "Сизде кийинки кезектеги кошумча алып жүрүүчү барбы?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,88 +88,88 @@ msgstr "" "\n" "Ырастоолор үчүн кошумча булагы дагы барбы?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Желе (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Желе (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Тармак (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Күзгүсүнүн URL'и?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL ftp:// же http:// менен башталышы керек" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Бар болгон күзгүлөр тизмесин %s веб сайтындан алынууда..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Бар болгон күзгүлөр тизмесин %s веб сайтындан алынууда ийгиликсиз айяктады..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Пакеттерди алуучу күзгүнү тандаңыз" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS орнотуу" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "NFS топтомунун компьютер атын жана директориясын кириңиз" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Түйюндүн аты көрсөтүлгөн жок" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Директория \"/\" белги менен башталышы керек" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS туташуунун түйюн аты ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Каталог" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Кошумча" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -178,90 +178,90 @@ msgstr "" "Бул күзгүдө пакеттердин тизмеси атбылган жок. Жайгашуусунун тууралыгын " "текшериңиз." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\" ичинен бардык пакеттерди аттап өтүү" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Орнотулган пакеттер изделип жатат..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Жаңыланычуу пакеттер изделип жатат..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Жаңылоодон мурда пакеттер өчүрүлүп жатат..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -275,72 +275,72 @@ msgstr "" "\n" "Бул пакеттердин алынып ташталуусун каалайсызбы?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s файлын окуудагы ката" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Төмөнкү диск(тер)дин аты өзгөртүлдү:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (мурунку аты %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Желе" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Алып жүрүүчүнү тандаңыз" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Файл алдагачан бар. Үстүнө кайра жазылсынбы?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Кирүү укугу четке кагылды" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Жаман NFS аты" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "%s жараксыз алып жүрүүчү" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Бөлүмдөрдү жаратууга чейин скриншотторду түзүүгө болбойт" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Орнотуудан кийин скриншоттор %s ичинде болот" @@ -350,7 +350,7 @@ msgstr "Орнотуудан кийин скриншоттор %s ичинде msgid "Installation" msgstr "Орнотуу" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Конфигурациялоо" @@ -451,42 +451,42 @@ msgstr "" "%s менен талап кылынган кээбир пакеттер орнотула алган жок:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Жаңылыштык орун алды:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Фаталдык ката пайда болду: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d орнотуу транзакциялары ишке ашпады" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Пакеттердин орнотулушу ийгиликсиз аяктады:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Иш станциясы" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Офис станциясы" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,34 +496,34 @@ msgstr "" "электрондук таблицалар (LibreOffice Calc, Kspread), pdf файлдарын көрүү " "программалары, ж.б." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Оюн станциясы" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" "Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж." "б." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мультимедиа станциясы" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Үн жана видео ойнотуу/терүү программалары" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Интернет станциясы" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -532,196 +532,196 @@ msgstr "" "Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде " "иштөөгө арналган куралдар тобу" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Тармак компьютери (клиент)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Ар түрдүү протоколдор клиенттери, ssh да кошулган" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Компьютериңизди жеңил конфигурациялоо куралдары" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Консоль куралдары" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Редакторлор, шелдер, файл куралдары, терминалдар" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Иштеп түзүү" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" "C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документация" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Linux жана Free Software жөнүндөгү китептер жана HOWTOлар" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" "Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин " "колдоо" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб-сервери" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab сервери" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Файрволл/Маршруттагыч" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет дарбазасы" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Почта/Жаңылыктар" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix почта сервери, Inn жаңылыктар сервери" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Каталогдор сервери" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP сервери" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS жана NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Файл жана принтер бөлүшүү сервери" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS сервери, Samba сервери" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Берилиштер базасы" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL жана MariaDB берилиштер базасынын сервери" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Почта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix почта сервери" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL же MariaDB берилиштер базасынын сервери" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Тармак сервери" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS сервери, SMB сервери, Proxy сервери, ssh сервери" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Графикалык чөйрө" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE иш станциясы" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -730,12 +730,12 @@ msgstr "" "K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар " "коллекциясы менен" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME иш станциясы" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -744,12 +744,41 @@ msgstr "" "Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган " "графикалык чөйрө" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE иш станциясы" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган " +"графикалык чөйрө" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME иш станциясы" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Иш станциясы" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Графикалык чөйрө" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE иш столу" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -758,52 +787,74 @@ msgstr "" "Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган " "графикалык чөйрө" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Менчик иш столу" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган " +"графикалык чөйрө" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Башка графикалык иш столдору" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, ж.б. " -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Утилиталар" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH сервери" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin узактан башкаруу сервери" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Тармак аспаптары/Мониторинг" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Мониторинг аспаптар, процесс эсептүүчүлөр, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Усталары" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Серверди ырастоо усталары" @@ -817,7 +868,7 @@ msgstr "" "Жаңылыштык орун алды, бирок мен аны кантип туура иштетүүнү билбейм.\n" "Мындан ары тобокелге салып өзүңүз улантыңыз." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -872,107 +923,107 @@ msgstr "Пакеттердин группасын тандоо" msgid "Install %s KDE Desktop" msgstr "%s KDE иш столун орнотуу" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "%s GNOME иш столун орнотуу" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Менчик орнотуу" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE иш столу" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME иш столу" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Менчик иш столу" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Мына '%s' иш столдун алдын ала көрүнүшү." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Чоң көрүнүштү көрүү үчүн сүрөткө басыңыз" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Пакеттердин группасын тандоо" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Пакеттерди өз алдынча тандоо" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Жалпы көлөмү: %d / %d Мб" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Версиясы: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Көлөмү: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Кб\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Маанилүүлүгү:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Сиз бул пакетти тандап/тандабай албайсыз" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s жоктугунан" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s канаатанбагандыгынан" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s активдештирүү аракети" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s сактоо үчүн" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -981,103 +1032,103 @@ msgstr "" "Сиз бул пакетти тандап алалбайсыз, анткени аны орнотуу үчүн жетеринче бош " "боштук жок" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Төмөнкү пакеттер орнотуулат" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Төмөнкү пакеттер өчүрүлөт" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Бул орнотууга шарт болгон пакет, пакетти тандап алалбайсыз" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Бул пакетти тандап алалбайсыз. Пакет алда качан орнотулган" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Бул пакетти белгилөөдөн алып салууга болбойт. Ал жаңыланышы керек" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Автоматтык түрдө тандалган пакеттерди көрсөтүү" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Орнотуу" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Тандалгандарды Жүктөө/Сактоо" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Пакеттерди тандоо жаңыланууда" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Минималдык орнотуу" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Пакеттерди башкаруу" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Сиз орнотууну каалаган пакеттерди тандаңыз" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Орнотуу" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Кеңири маалыматсыз" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Калган убакыт:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(болжолдуу убакыт..)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d- пакет" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Жыйынтык" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Конфигурация" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "конфигурацияланбаган" @@ -1091,7 +1142,7 @@ msgstr "" "Төмөнкү орнотуу булактары табылды.\n" "Эгерде кээбирин аттап өтүүнү кааласаңыз, анда аларды тандабай өтүңүз." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1104,7 +1155,7 @@ msgstr "" "Андан кийин орнотуу компьютер дискинен улантылат жана пакеттер толук " "системанын орнотулуп бүткөндөн кийин калышат." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "CD дискти толугу менен көчүрүү" @@ -1412,28 +1463,28 @@ msgstr "" "Пакеттер орнотулсунбу?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s %s'да" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Техникалык жабдуу" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Добуш картасы" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Сизде ISA добуш карточкасы барбы?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1442,75 +1493,75 @@ msgstr "" "Үн картасын ырастоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" " "коммандаларын аткарыңыз" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Эч кандай добуш карточкасы табылган жок. Орнотуудан кийин \"harddrake\" " "кайталап көрүңүз" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графикалык интерфейс" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Тармак жана Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Проксилер" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ырасталды" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Коосуздук деңгээли" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Файервол" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "активдештирилди" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "өчүк" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Сиз X'ти ырастаган жоксуз.Чындап ушуну каалайсызбы?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Система жүктөөгүч даярдалууда..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Орнотуу даярдалууда" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Күтө туруңуз, бул бир нече убакытты алышы мүмкүн..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1523,7 +1574,7 @@ msgstr "" "системанын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. " "Ядронун тамырдык файл системанын параметри: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1532,17 +1583,17 @@ msgstr "" "Бул коопсудук деңгээлде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз " "гана администраторга уруксат берилген." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "%s ичине бош флоппи дискти киргизиңиз" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Авто орнотуу флоппини түзүү..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1553,12 +1604,12 @@ msgstr "" "\n" "Сиз чындап азыр чыгууну каалайсызбы?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Конфигурациялар" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Кайра жүктөө" diff --git a/perl-install/install/share/po/lt.po b/perl-install/install/share/po/lt.po index c95e2ed99..887c992f0 100644 --- a/perl-install/install/share/po/lt.po +++ b/perl-install/install/share/po/lt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2000-12-23 13:50+0200\n" "Last-Translator: Mykolas Norvai­as \n" "Language-Team: Lithuanian \n" @@ -72,7 +72,7 @@ msgid "Do you have further supplementary media?" msgstr "Ar turi dar vieną?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -81,179 +81,179 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Tinklo interfeisas" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Tinklo interfeisas" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą" -#: any.pm:193 +#: any.pm:195 #, fuzzy, 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Pasirink atvaizdį (mirror), iš kurio imti paketus" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Aplankas" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Adapteris %s: %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, fuzzy, c-format msgid "Looking at packages already installed..." msgstr "Tu negali atžymėti šio paketo. Jis jau yra įdiegtas" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Ieškoma atnaujintinų paketų" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -262,72 +262,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Klaida skaitant bylą %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Ruošiamasi įdiegti šiuos paketus" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Tinklas" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Pasirinkite kitą vardą." -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Jau yra tokia byla. Užrašyti ant jos?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Priėjimas draudžiamas" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, fuzzy, c-format msgid "Cannot make screenshots before partitioning" msgstr "Aš daugiau negaliu pridėti nė vieno skirsnio" -#: any.pm:1363 +#: any.pm:1393 #, fuzzy, c-format msgid "Screenshots will be available after install in %s" msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo" @@ -337,7 +337,7 @@ msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo" msgid "Installation" msgstr "Įdiegiama" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Nustatymai" @@ -435,42 +435,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Įvyko klaida" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Kitą kartą nebeklausti" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d įdiegimo operacijos nepavyko" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Įdiegiamas paketas %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "KDE darbo stotis" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Biuro darbo stotis" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -479,33 +479,33 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Žaidimų stotis" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedija stotis" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Interneto stotis" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -514,193 +514,193 @@ msgstr "" "Rinkinys įrankių skaityti ir siųsti paštą bei naujienas (pine, mutt, tin) ir " "naršyti žiniatinklį (WWW)" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Tinklo Kompiuteris, X klientas" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, fuzzy, c-format msgid "Tools to ease the configuration of your computer" msgstr "Ar tu nori išbandyti nustatymus?" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konsolės įrankiai" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Redaktoriai, shell'ai, bylų į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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Programavimas" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacija" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, fuzzy, c-format msgid "Web Server" msgstr "serveris" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grupinis darbas" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Serveris, Firewall/Routeris" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, fuzzy, c-format msgid "Internet gateway" msgstr "Priėjimas prie Interneto" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Byla/_Nauja" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Serveris, Duomenų bazių" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Atstatyti iš diskelio" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP serveris" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Domeno vardas" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Spausdinimo serveris" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "NIS serveris" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Serveris, Duomenų bazių" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Serveris, Tinklapių/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Paštas" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "Serveris, Duomenų bazių" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Serveris, Tinklo Kompiuterio serveris" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE darbo stotis" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -709,12 +709,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome darbo stotis" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -723,12 +723,41 @@ msgstr "" "Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių " "rinkiniu" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE darbo stotis" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių " +"rinkiniu" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome darbo stotis" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "KDE darbo stotis" + +#: share/meta-task/compssUsers.pl:173 +#, c-format +msgid "A graphical environment based on GNOME" +msgstr "" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Darbastalis" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -737,52 +766,74 @@ msgstr "" "Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių " "rinkiniu" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Darbastalis" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių " +"rinkiniu" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Kiti grafiniai darbalaukiai" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Naudės" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "NIS serveris" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "įrenginys" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Interneto konfigūravimas" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Tinklo konfigūravimas" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Prisijungti prie interneto" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Nustatyti spausdintuvą" @@ -796,7 +847,7 @@ msgstr "" "Įvyko klaida, bet aš nežinau, kaip su ja gražiai susitvarkyti.\n" "Tęsk darbą savo paties rizika." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -850,107 +901,107 @@ msgstr "Paketų grupių pasirinkimas" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Išmesti" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Darbastalis" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Darbastalis" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Darbastalis" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Paketų grupių pasirinkimas" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Atskirų paketų pasirinkimas" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Bendras dydis: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versija: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Dydis: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, fuzzy, c-format msgid "%d KB\n" msgstr "Dydis: %d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, fuzzy, c-format msgid "Importance: " msgstr "Svarba: %s\n" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Tu negali pažymėti/atžymėti šio paketo" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "dėl trūkstamo %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "dėl nepatenkinto %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "bandau paaukštinti %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s išlaikymui" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -958,87 +1009,87 @@ msgid "" msgstr "" "Tu negali pasirinkti šio paketo, kadangi nebėra pakankamai vietos jam įdiegti" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ruošiamasi įdiegti šiuos paketus" -#: steps_gtk.pm:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Įdiegti" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Išsaugoti pažymėjimą" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, fuzzy, c-format msgid "Updating package selection" msgstr "Išsaugoti paketų pasirinkimą" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, fuzzy, c-format msgid "Minimal install" msgstr "Išmesti" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programinės įrangos tvarkyklė" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Pasirink paketus, kuriuos tu nori įdiegti" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Įdiegiama" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Detalės" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Liko laiko " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Skaičiuojama" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1046,17 +1097,17 @@ msgstr[0] "%d paketų" msgstr[1] "%d paketų" msgstr[2] "%d paketų" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Apibendrinimas" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Nustatyti" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "iš naujo nustatyti" @@ -1068,7 +1119,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1077,7 +1128,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1359,101 +1410,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s iš %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Geležis" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, fuzzy, c-format msgid "Sound card" msgstr "Standartinė" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, fuzzy, c-format msgid "Do you have an ISA sound card?" msgstr "Ar turi dar vieną?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, fuzzy, c-format msgid "Graphical interface" msgstr "X paleidžiant" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Tinklas & Internetas" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Tarpinės stotys (proxies)" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "iš naujo nustatyti" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Saugumo lygis" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Ugniasienė" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, fuzzy, c-format msgid "activated" msgstr "Aktyvus" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "uždraustas" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Ruošiama įkrovos tvarkyklė" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Ruošiamas įdiegimas" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1462,24 +1513,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Įdėk tuščią diskelį į kaupiklį %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Kuriamas automatinio įdiegimo diskelis" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1490,12 +1541,12 @@ msgstr "" "\n" "Ar tu nori išeiti dabar?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Sveikinimai" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Perkrauti" diff --git a/perl-install/install/share/po/ltg.po b/perl-install/install/share/po/ltg.po index 1f1195773..718133c2d 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2006-09-24 17:51+0200\n" "Last-Translator: Māris Laureckis \n" "Language-Team: Latgalian \n" @@ -71,7 +71,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -85,89 +85,89 @@ msgstr "" "\n" "Voi jiusim ir papyldus datu nesieji deļ uzstuodeišonys?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Teiklys (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Teiklys (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Teiklys (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Voi spūguļservera URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL juosasuoc ar ftp:// voi http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Dasasliegšona %s teimekļam cīta naveiksmi, lai sajimtu pīejamū spūguļserveru " "sarokstu" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Izavielejit spūguļserveri, nu kura jimt pakūtnis" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS uzstuodeišona" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Kaids ir NFS monteišonys hosta vuords?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalogs" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -176,90 +176,90 @@ msgstr "" "Iz ituo spūguļservera navar atrast pakūtņu saroksta failu. Puorbaudit, voi " "atsarūn pareizā vītā." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Mekleju jau īprīkš uzinstaleituos pakūtnis..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Mekleju uzlobuojamuos pakūtnis" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -272,72 +272,72 @@ msgstr "" "\n" "Voi teišom gribit nūjimt ituos pakūtnis?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Kliuda, nūlosūt failu %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Sekojūši diski tika puorsaukti:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (īprīkš tika saukta kai %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Teiklys" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Lyudzu, izavielejit datu nesieju" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fails jau eksistej. Voi puorrakstēt pa viersu?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Pīeja līgta" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Naveiksmeigs NFS vuords" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Napareizs datu nesiejs %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Navar izveiduot ekrana attālus pyrms sadaļu izveidis" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekrana attāli byus pīejami piec instaleišonys %s" @@ -347,7 +347,7 @@ msgstr "Ekrana attāli byus pīejami piec instaleišonys %s" msgid "Installation" msgstr "Instalaceja" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguraceja" @@ -443,42 +443,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Atkluota kliuda" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Nūtikuse fatala kliuda: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d instalacejis transakcejis naizadeve" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instaleju pakūtni %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Dorba staceja" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Biroja dators" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -487,32 +487,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Spēļu dators" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedeju dators" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Interneta dators" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -521,193 +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:40 #, c-format msgid "Network Computer (client)" msgstr "Teikla dators (klients)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsolis reiki" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Izstruode" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentaceja" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linuks Standarta Bāze. Trešū izstruoduoju aplikaceju atbolsts" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Puorstaipteikla (Web) servers" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab servers" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Gunsmyurs/Maršrutizators" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Interneta vuorteja" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Posts/Jauns" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Katalogu Servers" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP servers" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS i NIS servers" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Datubāzis" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL i MariaDB datubāžu servers" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Teimeklis/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Posts" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix posta servers" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL voi MariaDB datubāžu servers" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Teikla datoru servers" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafiskuo vide" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE dorba staceja" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -716,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome dorba staceja" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -730,12 +730,41 @@ msgstr "" "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba " "viersmys reikim" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE dorba staceja" + +#: share/meta-task/compssUsers.pl:163 +#, 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome dorba staceja" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Dorba staceja" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafiskuo vide" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm Dorba viersma" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -744,52 +773,74 @@ msgstr "" "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba " "viersmys reikim" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm Dorba viersma" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba " +"viersmys reikim" + +#: share/meta-task/compssUsers.pl:193 #, 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:194 +#, 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:217 #, c-format msgid "Utilities" msgstr "Utilitys" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH servers" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin attuolynuotuos konfiguracejis servers " -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Teikla utilitys/puorraudzeiba" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia paleigi" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Servera konfiguracejis paleigi" @@ -803,7 +854,7 @@ msgstr "" "Nūtyka klaida, bet es nazynu, kai tū korekti apstruoduot.\n" "Turpynuot iz jiusu poša riska." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -858,107 +909,107 @@ msgstr "Pakūtņu grupu izviele" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimala instaleišona" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm Dorba viersma" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm Dorba viersma" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm Dorba viersma" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakūtņu grupu izviele" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Atsevišku pakūtņu izviele" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Kūpejais izmārs: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verseja: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Izmārs: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Svareigums: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Jius varit izavielēt/atsateikt nu ituos pakūtnis" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "tryukuma dieļ %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "deļ naapmīrynuojuma %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "teik mieginuots aktivizēt %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "lai saglobuot %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -967,104 +1018,104 @@ msgstr "" "Jius navarit izavielēt itū pakūtni, par tū ka napīteik vītys tuos " "instaleišonai" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Itei ir obligata pakūtne, nu tuos navar atsateikt" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Paruodeit automatiski izvālātuos pakūtnis" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalēt" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Īluodēt/Saglobuot izviele" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Teik atjaunynuota pakūtņu izviele" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimala instaleišona" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programmaturys puorvaļdeišona" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Izavielejit pakūtnis, kū gribit instalēt" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Teik instaleits" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Nav detaļu" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Atlykušais laiks" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Aptuvenais nūviertiejums" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Kūpsavylkums" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurēt" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nav konfigurāts" @@ -1078,7 +1129,7 @@ msgstr "" "Atrosti sekojūši instalacejis datu nesieji.\n" "Ja jius gribit izlaist dažus nu tim, jius tagad varit nūjimt atzeimi nu tim." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1091,7 +1142,7 @@ msgstr "" "Taidā veidā turpynuosīs nu cītuo diska un pakūtnis byus pīejamys cikom " "sistema tiks piļneibā uzinstaleita." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopēt vysu kompaktdisku" @@ -1393,28 +1444,28 @@ msgstr "" "Voi jius gribit instalēt atjaunynuojumus?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s iz %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Aparatura" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Skanis karte" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Vai jiusim ir ISA skanis karte?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1423,75 +1474,75 @@ msgstr "" "Piec instaleišonys palaidit \"alsaconf\" voi \"sndconfig\", lai konfigurātu " "jiusu skanis karti" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Nav atrosta skanis karte. Piec instaleišonys izmieginit \"harddrake\"" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafiskuo saskarne" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Teiklys & Internets" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Storpnīkserveri" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfigurāts" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Drūšeibys leimiņs" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Guņsmyurs" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivizāts" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "atslāgts" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Sagataveju suokneituoju" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Sagataveju instaleišonu" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1504,7 +1555,7 @@ msgstr "" "juoizmontoj BootX voi kas cyts, lai īluodātu datoru. Kūdula arguments deļ " "root fs ir: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1513,17 +1564,17 @@ msgstr "" "Šymā drūšeibys leiminī, pīeeja Windows sadalis failim ir tikai " "administratoram." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Īlicit tukšu disketi īkuortā %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Sagataveju auto instaleišonys disketi" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1534,12 +1585,12 @@ msgstr "" "\n" "Voi tīšom gribit izīt tagad?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Apsveicam" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Puorsuoknēt" diff --git a/perl-install/install/share/po/lv.po b/perl-install/install/share/po/lv.po index ab1c35867..df51470c0 100644 --- a/perl-install/install/share/po/lv.po +++ b/perl-install/install/share/po/lv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2002-09-27 17:45+0200\n" "Last-Translator: Raivo Saars \n" "Language-Team: Latvian \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "Vai ir vēl kāds?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,181 +82,181 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Tīkls" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Tīkls" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Pieslēdzos %s tīmeklim, lai saņemtu pieejamo spoguļserveru sarakstu " "sarakstu..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Pieslēdzos %s tīmeklim, lai saņemtu pieejamo spoguļserveru sarakstu " "sarakstu..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Izvēlieties spoguļserveri, no kura ņemt pakotnes" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalogs" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Nevar atrast %s uz %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Meklēju jau iepriekš uzinstalētās pakotnes..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Meklēju uzlabojamās pakotnes" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -269,72 +269,72 @@ msgstr "" "\n" "Vai tiešām vēlaties noņemt šīs pakotnes?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Kļūda, nolasot failu %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Tiks instalētas sekojošas pakotnes" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Tīkls" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Lūdzu izvēlieties" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Fails jau eksistē. Pārrakstīt?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Pieeja liegta" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "pievienoju datu nesēju %s." -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nevar izveidot ekrāna attēlus pirms sadaļu izveides" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekrāna attēli būs pieejami pēc instalēšanas %s." @@ -344,7 +344,7 @@ msgstr "Ekrāna attēli būs pieejami pēc instalēšanas %s." msgid "Installation" msgstr "Instalēju" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurācija" @@ -440,42 +440,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Atklāta kļūda" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Instalēšana neizdevās" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instalēju pakotni %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Darbastacija" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Biroja dators" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -484,32 +484,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Spēļu dators" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimēdiju dators" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Interneta dators" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -518,193 +518,193 @@ msgstr "" "Rīku komplekts, lai lasītu un sūtītu pastu vai jaunumus (pine, mutt, tin..) " "un pārlūkotu Tīmekli" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Tīkla dators (klients)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsoles rīki" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Izstrāde" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentācija" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web serveris" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "grupa" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Interneta vārteja" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Fails/_Jauns" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix pasta serveris" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Atjanot no CD" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP serveris" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Domēna nosaukumu serveris" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Printera serveris" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "Samba serveris" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Datubāzes" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL vai MariaDB datubāzu serveris" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Tīmeklis/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Pasts" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "Postfix pasta serveris" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL vai MariaDB datubāzu serveris" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Tīkla datoru serveris" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafiskā vide" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE darbastacija" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -712,12 +712,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome darbastacija" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -726,12 +726,41 @@ msgstr "" "Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas " "rīkiem" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE darbastacija" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas " +"rīkiem" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome darbastacija" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Darbastacija" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafiskā vide" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Darbavirsma" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -740,52 +769,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Darbavirsma" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas " +"rīkiem" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Citas grafiskās darbavirsmas" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilites" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH serveris" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webmin serviss" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Mageia termināļu servera konfigurācija" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Tīkla konfigurācija" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia kontroles centrs" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Konfigurēju printeri \"%s\"..." @@ -799,7 +850,7 @@ msgstr "" "Atklāta kļūda, bet es nezinu, kā ar to pareizi apieties.\n" "Turpiniet, ja vēlaties riskēt." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -854,107 +905,107 @@ msgstr "Pakotņu grupu izvēle" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimāla instalēšana" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Darbavirsma" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Darbavirsma" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Darbavirsma" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakotņu grupu izvēle" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Atsevišķu pakotņu izvēle" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Kopējais izmērs: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versija: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Apjoms: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, fuzzy, c-format msgid "%d KB\n" msgstr "Apjoms: %d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Svarīgums: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Jūs varat izvēlēties/atteikties no šīs pakotnes" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, fuzzy, c-format msgid "due to missing %s" msgstr "trūkstošs kdesu" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -962,87 +1013,87 @@ msgid "" msgstr "" "Jūs nevarat izvēlēties šo pakotni, jo nepietiek vietas tās instalēšanai" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Šī ir obligāta pakotne, no tās nevar atteikties" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: 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:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalēt" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Saglabāt iezīmēto" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Atjaunoju pakotņu izvēli" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimāla instalēšana" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Software Management" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Izvēlieties pakotnes, ko vēlaties instalēt" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalēju" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Detaļas" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Atlikušais laiks" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Aprēķinu" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1050,17 +1101,17 @@ msgstr[0] "%d pakotnes" msgstr[1] "%d pakotnes" msgstr[2] "%d pakotnes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Kopsavilkums" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurēt" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "pārkonfigurēt" @@ -1072,7 +1123,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1081,7 +1132,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1381,101 +1432,101 @@ msgstr "" "Vai Jūs vēlaties instalēt jauninājumus?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s uz %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Dzelži" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Skaņas karte" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Vai Jums ir ISA skaņas karte?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "Pēc instalēšanas palaidiet \"sndconfig\", lai konfigurētu skaņu karti" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, fuzzy, c-format msgid "Graphical interface" msgstr "X pēc startēšanas" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Tīkls & Internets" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Profils: " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "pārkonfigurēt" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Drošības Līmenis" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Ugunssiena" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, fuzzy, c-format msgid "activated" msgstr "aktivizēt" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "aizliegts" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Sagatavoju sāknētāju" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Sagatavoju instalēšanu" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1488,24 +1539,24 @@ msgstr "" "Instalēšana turpināsies, bet Jums būs jāizmanto\n" "BootX, lai ielādētu datoru" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Ielieciet tukšu disketi iekārtā %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Sagatavoju auto instalēšanas disketi" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1516,12 +1567,12 @@ msgstr "" "\n" "Vai tiešām vēlaties iziet tūlīt?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Apsveicam" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Pārstartēt" diff --git a/perl-install/install/share/po/mk.po b/perl-install/install/share/po/mk.po index c0dcd4ce7..c79f06742 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2006-09-24 20:39-0700\n" "Last-Translator: Zoran Dimovski \n" "Language-Team: Macedonian \n" @@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?" msgstr "Дали имате уште додатни медиуми?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -92,183 +92,181 @@ msgstr "" "\n" "Дали имате додатен инсталационен медиум за конфигурирање?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Мрежа (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Мрежа (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Мрежа (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL на огледалото?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL-то мора да започнува со „ftp://“ или „http://“" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." -msgstr "" -"Контактирање со веб сајтот на %s за добивање на листата на " -"огледала..." +msgstr "Контактирање со веб сајтот на %s за добивање на листата на огледала..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Не може да се воспостави врска веб страница на „%s“ за да се добие листата " "на достапни огледала" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Изберете огледало од кое да се преземат пакетите" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Поставување на „NFS“" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" "Ве молиме внесете го името на домаќинот и директориумот на вашиот „NFS“ " "медиум" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Име на домаќинот каде е монтиран „NFS“ ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Директориум" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Не мојажам да ја пронајдам hdlist датотеката на ова огледало" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Барање пакети што се веќе инсталирањен..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Барање пакети за надградба..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Отстранување на пакети поради надградување..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -282,72 +280,72 @@ msgstr "" "\n" "Дали навистина сакате да се избришат овие пакети?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Грешка при читање на датотеката %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Следниве дискови се преименувани:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (претходно именувано како %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Мрежа" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Ве молиме изберете медиум" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Датотеката веќе постои. Да се запише врз неа?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Недозволен пристап" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Лошо „NFS“ име" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Невалиден медиум %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Не можат да се прават снимки на екран пред партицирање" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Екранските снимки ќе бидат достапни по инсталацијата во %s" @@ -357,7 +355,7 @@ msgstr "Екранските снимки ќе бидат достапни по msgid "Installation" msgstr "Инсталација" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Конфигурација" @@ -454,42 +452,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Се случи грешка" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Се случи фаталната грешка: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d неуспешни трансакциии на инсталацијата" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Инсталирање на пакетот %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Работна станица" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Канцелариски" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -498,32 +496,32 @@ msgstr "" "Канцелариски програми: обработка на текст (LibreOffice Writer, Kword), " "табеларни пресметки (LibreOffice Calc, Kspread), прегледувачи на „PDF“ итн." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Станица за игри" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Забавни програми: аркадни, на табла, стратегија, итн." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мултимедијална станица" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Програми за пуштање и уредување на звук и видео" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Интернет станица" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -532,193 +530,193 @@ msgstr "" "Комплет алатки за читање и пракање е-пошта и вести (mutt, tin..) и " "прелистување на Интернет" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Мрежен компјутер (клиент)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Клиенти за различни протоколи, вклучувајќи и „ssh“" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Алатки за лесно конфигурирање на вашиот компјутер" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Конзолски алатки" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Уредувачи, школки, алатки за датотеки, терминали" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Развој" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Развивачки датотеки за „C“ и „C++“, програми и „include“ датотеки" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документација" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Книги и „Како да“ за „Linux“ и слободен софтвер" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "„Linux Standard Base“. Поддршка за апликации од други фирми" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб сервер" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Групи" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab Сервер" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Пошта/Вести" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "„Postfix“ сервер за пошта, „Inn“ сервер за вести" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Директориумски сервер" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "„FTP“ сервер" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Име на доменот и сервер за мрежни информации" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Сервер за споделување на датотеки и печатач" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "„NFS“ сервер, „Samba“ сервер" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "База на податоци" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "„PostgreSQL“ и „MariaDB“ сервер за бази на податоци" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Пошта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix сервер за пошта" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "„PostgreSQL“ или „MariaDB“ сервер за бази на податоци" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Мрежен компјутер-сервер" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "„NFS“ сервер, „SMB“ сервер, „Proxy“ сервер, „ssh“ сервер" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Графичка околина" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "„KDE“ работна станица" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -727,12 +725,12 @@ msgstr "" "„К“ работна околина, основната графичка околина со додатна колекција на " "придружни алатки" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "„GNOME“ работна станица" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -740,12 +738,40 @@ msgid "" msgstr "" "Графичка околина со кориснички пакет на алатки и алатки за работната површина" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "„KDE“ работна станица" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Графичка околина со кориснички пакет на алатки и алатки за работната површина" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "„GNOME“ работна станица" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Работна станица" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Графичка околина" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "„IceWm“ работна површина" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -753,52 +779,73 @@ msgid "" msgstr "" "Графичка околина со кориснички пакет на алатки и алатки за работната површина" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "„IceWm“ работна површина" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Графичка околина со кориснички пакет на алатки и алатки за работната површина" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Други графички работни околини" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, итн." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Помошни алатки" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Сервер" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "„Webmin“" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "„Webmin“ оддалечен сервер за конфигурирање" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Мрежни помошни алатки/надгледување" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Алатки за надгледување, раководење на процеси, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "„Mageia“ волшебници" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Волшебници за конфигурирање на сервер" @@ -812,7 +859,7 @@ msgstr "" "Се случи грешка, но не знам како добро да се справам со неа.\n" "Продолжете на сопствен ризик." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -867,107 +914,107 @@ msgstr "Групна селекција на пакети" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Минимална инсталација" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "„IceWm“ работна површина" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "„IceWm“ работна површина" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "„IceWm“ работна површина" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Групна селекција на пакети" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Подделна селекција на пакети" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Сите се неселектирани" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Вкупна големина: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Верзија:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Големина: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Важност: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Не можете да (не) го изберете овој пакет" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "поради недостасување на %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "поради незадоволување на %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "се обидувам да промовирам %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "за да се задржи %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -976,105 +1023,105 @@ msgstr "" "Не можете да го изберете овој пакет, зашто нема доволно простор да се " "инсталира" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Ќе бидат инсталирани следниве пакети" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Следниве пакети ќе бидат отстранети" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ова е неопходен пакет, и не може да не се избере" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Не може да не го изберете овој пакет. Веќе е инсталиран" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" "Не можете да не го изберете овој пакет. Тој мора да се надгради (upgrade)" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Прикажи ги автоматски избраните пакети" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Инсталирај" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Вчитај/зачувај избор" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Освежување на изборот на пакети" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Минимална инсталација" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Менаџмент на софтвер" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Изберете ги пакетите што сакате да се инсталираат" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Инсталирање" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Без детали" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Преостанато време " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Проценка" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d пакети" msgstr[1] "%d пакети" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Резиме" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Конфигурирај" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "не е конфигурирано" @@ -1088,7 +1135,7 @@ msgstr "" "Пронајдени се следниве инсталациски медиуми.\n" "Ако сакате да отстранете некои, можете сега да ги дештиклирате." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1101,7 +1148,7 @@ msgstr "" "Потоа, инсталацијата ќе продолжи од хард дискот и пакетите ќе бидат достапни " "се додека системот е целосно инсталиран." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Копирај ги сите CD-а" @@ -1402,28 +1449,28 @@ msgstr "" "Дали сакате да ги инсталирате надградбите?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Хардвер(машински дел)" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Звучна картичка" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Дали имате ISA звучна картичка?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1432,75 +1479,75 @@ msgstr "" "По инсталацијата вклучете \"alsaconf\" или \"sndconfig\" за да ја " "конфигурирате звучаната картичка" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Не е детектирана звучна картичка. Обидете се со \"harddrake\" по " "инсталацијата" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графички интерфејс" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Мрежа и Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Прокси" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "конфигурирано" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Ниво на сигурност" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "активиран" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "оневозможено" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Се уште го ш конфигурирано Х. Дали навистина сакаш да го направиш ова?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Подговтвување на подигачот..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Подготовка на инсталацијата" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1513,7 +1560,7 @@ msgstr "" "или некои други средства за подигнување на вашата машина. Аргументот на " "кернелот за „root fs“ е следниов: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1522,17 +1569,17 @@ msgstr "" "Во ова безбедносно ниво, пристап до датотеките кои се наоѓаат на „Windows“ " "партицијата е дозволен само на администраторот." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Внесете празна дискета во %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Создавање дискета за авто-инсталација..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1543,12 +1590,12 @@ msgstr "" "\n" "Дали навистина сакате сега да напуштите?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Честитки" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Рестартирај" diff --git a/perl-install/install/share/po/mn.po b/perl-install/install/share/po/mn.po index d6ab5293d..643de5a67 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-01-02 00:35+0100\n" "Last-Translator: Sanlig Badral \n" "Language-Team: Mongolian \n" @@ -75,7 +75,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -84,177 +84,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "КД-РОМ" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Сүлжээ" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Сүлжээ" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "сайт жигсаалт аас." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "сайт жигсаалт аас." -#: any.pm:203 +#: any.pm:205 #, fuzzy, c-format msgid "Choose a mirror from which to get the packages" msgstr "Сонгох" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Лавлах" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "%s: %s-ийг холбож чадахгүй: %s\n" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -263,74 +263,74 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, fuzzy, c-format msgid "Error reading file %s" msgstr "Файл уншихад алдаа\n" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Дараах багцууд суулгагдах гэж байна" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "ТЭ" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Сүлжээ" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "" "Нөөцлөх зөөврийн төхөөрөмжөө\n" "сонгоно уу." -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Файл?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Хандалт нурлаа" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Хуваалт үүсгэхийн өмнө агшин дэлгэцүүдийг хийж чадахгүй" -#: any.pm:1363 +#: any.pm:1393 #, fuzzy, c-format msgid "Screenshots will be available after install in %s" msgstr "ямх" @@ -340,7 +340,7 @@ msgstr "ямх" msgid "Installation" msgstr "Суулгалт" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Тохиргоо" @@ -434,343 +434,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Суулгалт боломжтой" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Суулгалтын ангилалыг сонгох" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "LAN Тохируулга" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, fuzzy, c-format msgid "Office Workstation" msgstr "Албан газар" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, fuzzy, c-format msgid "Game station" msgstr "Тоглоом" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, fuzzy, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Зугаа цэнгэл" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Мультимедиа" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, fuzzy, c-format msgid "Sound and video playing/editing programs" msgstr "Дуу" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "Интернэт" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, 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:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Сүлжээ" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, fuzzy, c-format msgid "Tools to ease the configuration of your computer" msgstr "аас" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Хөгжүүлэл" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Баримтжуулалт" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, fuzzy, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Стандарт" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, fuzzy, c-format msgid "Web Server" msgstr "Вэб" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "бүлэг" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, fuzzy, c-format msgid "Kolab Server" msgstr "Самба" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернэт гарц" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Файл/_Шинэ" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Мэйл" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Сэргээх Илгээгч" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Сервер" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Домэйн Нэрний Сервер" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Хэвлэгч" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "Самба" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Өгөгдлийн сан" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Мэйл" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "Мэйл" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Сүлжээ" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, fuzzy, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Итгэмжилэгч" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, fuzzy, c-format msgid "KDE Workstation" msgstr "KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, 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:156 #, fuzzy, c-format msgid "GNOME Workstation" msgstr "KDE" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "аас" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "KDE" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "LAN Тохируулга" + +#: share/meta-task/compssUsers.pl:173 +#, c-format +msgid "A graphical environment based on GNOME" +msgstr "" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Ширээний компьютер" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "аас" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Ширээний компьютер" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "аас" + +#: share/meta-task/compssUsers.pl:193 #, fuzzy, c-format msgid "Other Graphical Desktops" msgstr "Бусад" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Цонх" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "Филлипинни" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Вэб дуран" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Терминал Сервер" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Сүлжээ толидох" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Мандрива удирдлагын төв" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "\"%s\" хэвлэгч дээр хэвлэж байна" @@ -782,7 +829,7 @@ msgid "" "Continue at your own risk." msgstr "" -#: steps.pm:461 +#: steps.pm:458 #, fuzzy, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -829,211 +876,211 @@ msgstr "Пакет Групп" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Төрөл аас" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Ширээний компьютер" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Ширээний компьютер" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Ширээний компьютер" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, fuzzy, c-format msgid "Package Group Selection" msgstr "Пакет Групп" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Тусдаа дан багц сонгох" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, fuzzy, c-format msgid "Total size: %d / %d MB" msgstr "Нийт хэмжээ" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Хувилбар: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Хэмжээ: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d КБ\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, fuzzy, c-format msgid "Importance: " msgstr "Цонтууд импортлох" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, fuzzy, c-format msgid "You cannot select/unselect this package" msgstr "Та" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, fuzzy, c-format msgid "trying to promote %s" msgstr "Юу ч үгүй" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, fuzzy, c-format msgid "in order to keep %s" msgstr "ямх" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, fuzzy, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Та бол зүүн" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Дараах багцууд суулгагдах гэж байна" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, fuzzy, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Та бол" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, fuzzy, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Та" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Автоматаар сонгогдсон багцуудыг харуулах" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Суулга" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Пакет" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, fuzzy, c-format msgid "Software Management" msgstr "Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Сонгохыг хүсэж буй багцаа сонгоно уу" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Суулгалт" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Үгүй" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Үлдэж буй хугацаа" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "Тааруухан багц" msgstr[1] "Тааруухан багц" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Дүгнэлт" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Тохируулах" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "" @@ -1045,7 +1092,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1054,7 +1101,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1332,101 +1379,101 @@ msgid "" msgstr "Та г вы Интернэт г вы?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s -д %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Техник хангамж" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Дууны карт" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Та ISA дууны карттай юу?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "Ажиллуулах" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, fuzzy, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Үгүй Reyna" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, fuzzy, c-format msgid "Network & Internet" msgstr "Сүлжээ" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Польш" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "Тохируулах" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Хамгаалалтын төвшин" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "хаалттай" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Та Х-г тохируулаагүй байна. Та үүнийг хийхдээ итгэлтэй байна уу?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Суулгалтын бэлтгэл" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1435,24 +1482,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, fuzzy, c-format msgid "Insert a blank floppy in drive %s" msgstr "Оруулах ямх" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, fuzzy, c-format msgid "Creating auto install floppy..." msgstr "Үүсгэж байна." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, fuzzy, c-format msgid "" "Some steps are not completed.\n" @@ -1460,12 +1507,12 @@ msgid "" "Do you really want to quit now?" msgstr "г вы?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, fuzzy, c-format msgid "Congratulations" msgstr "Баяр хүргэе!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Дахин ачаал" diff --git a/perl-install/install/share/po/ms.po b/perl-install/install/share/po/ms.po index d83c2b659..cb83d2677 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2008-05-01 14:16+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: Malay \n" @@ -71,7 +71,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -80,177 +80,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Pelayan Rangkaian" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Pelayan FTP" -#: any.pm:124 +#: any.pm:125 #, fuzzy, c-format msgid "Network (NFS)" msgstr "Pelayan Rangkaian" -#: any.pm:171 +#: any.pm:173 #, fuzzy, c-format msgid "URL of the mirror?" msgstr "URL untuk IG" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, fuzzy, c-format msgid "NFS setup" msgstr "Tetapan Halaman" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, fuzzy, c-format msgid "Hostname missing" msgstr "Pakej Hilang" -#: any.pm:239 +#: any.pm:241 #, fuzzy, c-format msgid "Directory must begin with \"/\"" msgstr "Nama Direktori mesti dimulakan dengan slash" -#: any.pm:243 +#: any.pm:245 #, fuzzy, c-format msgid "Hostname of the NFS mount ?" msgstr "Perkongsian NFS Terlekap" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktori" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Ralat pada baris %d: %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Langkau semua pakej dari media \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" -#: any.pm:485 +#: any.pm:514 #, fuzzy, c-format msgid "Finding packages to upgrade..." msgstr "Mencari pakej untuk dinaiktaraf..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -259,72 +259,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, fuzzy, c-format msgid "Error reading file %s" msgstr "Ralat mengimport fail %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Peranti audio berikut telah dikesan." -#: any.pm:1142 +#: any.pm:1172 #, fuzzy, c-format msgid "%s (previously named as %s)" msgstr "&Simpan Imej Sebagai" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rangkaian" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Utiliti Media Mudah Alih" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Fail Khas peranti telah wujud dalam gugusan" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Izin ditolak" -#: any.pm:1290 +#: any.pm:1320 #, fuzzy, c-format msgid "Bad NFS name" msgstr "Tetap Nama Imej" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "Media Storan" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "" -#: any.pm:1363 +#: any.pm:1393 #, fuzzy, c-format msgid "Screenshots will be available after install in %s" msgstr "dalam" @@ -334,7 +334,7 @@ msgstr "dalam" msgid "Installation" msgstr "Pemasangan sekecil mungkin" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurasikan" @@ -430,343 +430,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Ralat telah berlaku" -#: pkgs.pm:401 +#: pkgs.pm:402 #, fuzzy, c-format msgid "A fatal error occurred: %s." msgstr "Ralat berlaku bila cuba menyalin cekupan skrin." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "Pelaksanaan gpg gagal (%d)\n" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Memasang pakej %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "StesyenKerja" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, fuzzy, c-format msgid "Office Workstation" msgstr "Pejabat/Produktiviti" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, fuzzy, c-format msgid "Game station" msgstr "Permainan memori" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Kekunci Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, fuzzy, c-format msgid "Sound and video playing/editing programs" msgstr "Bunyi dan" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "Internet Bergrafik" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "dan dan dan" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Klien Pelayan Terminal" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, fuzzy, c-format msgid "Clients for different protocols including ssh" msgstr "protokol" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, fuzzy, c-format msgid "Tools to ease the configuration of your computer" msgstr "Ujian" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, fuzzy, c-format msgid "Console Tools" msgstr "Alatan Pentadbiran" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Pembangunan" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentasi" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, 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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, fuzzy, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Asas" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Pelayan Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, fuzzy, c-format msgid "Internet gateway" msgstr "Internet Bergrafik" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "Pelayan Berita" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Pelayan Direktori" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Pelayan FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, 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:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "(%ld)PELAYAN >>> %s" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Pangkalan Data" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mel" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "Pelayan Nama DNS" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Pelayan Rangkaian Lama" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, fuzzy, c-format msgid "Graphical Environment" msgstr "Internet Bergrafik" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, fuzzy, c-format msgid "KDE Workstation" msgstr "Menu KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, 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:156 #, fuzzy, c-format msgid "GNOME Workstation" msgstr "Gnome-Breakout" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Menu KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "A pengguna dan" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome-Breakout" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "StesyenKerja" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Internet Bergrafik" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Persekitaran Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "A pengguna dan" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Persekitaran Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "A pengguna dan" + +#: share/meta-task/compssUsers.pl:193 #, fuzzy, c-format msgid "Other Graphical Desktops" msgstr "Pada Semua Desktop" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utiliti" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "Pelayan FTP" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, 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:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Aplet pengawas rangkaian" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Galaxy" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Sila tetapkan pelayan PXE" @@ -781,7 +828,7 @@ msgstr "" "dengan baik.\n" "Teruskan atas risiko anda." -#: steps.pm:461 +#: steps.pm:458 #, fuzzy, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -828,215 +875,215 @@ msgstr "Barisatas pilihan (toggle)" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, fuzzy, c-format msgid "Install %s GNOME Desktop" msgstr "Sistem aplet desktop bagi GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Kamus Lazim:" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Persekitaran Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Persekitaran Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Persekitaran Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, fuzzy, c-format msgid "Package Group Selection" msgstr "Barisatas pilihan (toggle)" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, fuzzy, c-format msgid "Individual package selection" msgstr "Barisatas pilihan (toggle)" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, fuzzy, c-format msgid "Unselect All" msgstr "Aba&i Semua" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, fuzzy, c-format msgid "Total size: %d / %d MB" msgstr "Saiz lajur automatik" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versi: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Saiz: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "kerana kehilangan %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "kerana ketidakpuasan %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "cuba untuk menaikkan %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "untuk menyimpan %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Pasang" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Barisatas pilihan (toggle)" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, fuzzy, c-format msgid "Updating package selection" msgstr "Barisatas pilihan (toggle)" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, fuzzy, c-format msgid "Minimal install" msgstr "Pasang plugin baru" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Pengurusan Perisian" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, fuzzy, c-format msgid "Choose the packages you want to install" msgstr "Pilih alatan yang anda hendak guna" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Memasang" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "Maklumat lanjut Susunatur" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Masa Himpun" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "Pelihat Pakej" msgstr[1] " Pakej" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Ringkasan" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Buat konfigurasi" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "Tiada" @@ -1048,7 +1095,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1057,7 +1104,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, fuzzy, c-format msgid "Copy whole CDs" msgstr "Main CD audio" @@ -1346,101 +1393,101 @@ msgstr "" "Adakah anda mahu memasang kemaskini tersebut?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s pada %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Perkakasan" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Kad bunyi" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Tiada kad bunyi dikesan. Cuba \"harddrake\" selepas pemasangan." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Antaramuka Bergrafik" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rangkaian & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proksi" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ditetapkan" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Tahap Keselamatan" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "dimatikan" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Menyediakan pemuatboot..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pemasangan sekecil mungkin" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1453,24 +1500,24 @@ msgstr "" "anda perlu menggunakan BootX atau sebarang cara lain untuk memboot mesin " "anda. Hujah kernel untuk sistemfail root adalah: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Masukkan cakera liut kosong dalam pemacu %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Mencipta cakera liut auto pasang..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1478,12 +1525,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Tahniah" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Boot semula" diff --git a/perl-install/install/share/po/mt.po b/perl-install/install/share/po/mt.po index f56214561..2fc03ad22 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-10-04 18:45+0200\n" "Last-Translator: Ramon Casha \n" "Language-Team: Maltese \n" @@ -74,7 +74,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -83,179 +83,179 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Network (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Network (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL tal-mera?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Qed nikkuntattja l-website ta' %s biex nikseb lista tal-mirja disponibbli" -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Qed nikkuntattja l-website ta' %s biex nikseb lista tal-mirja disponibbli" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direttorju" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Ma nistax insib fajl hdlist fuq din il-mera" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Qed naqra l-pakketti diġà nstallati..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Qed insib pakketti x'naġġorna" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -268,72 +268,72 @@ msgstr "" "\n" "Żgur li trid tneħħi dawn il-pakketti?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Problema fil-qari tal-fajl %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "- %s tneħħa\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "PFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Network" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Jekk jogħġbok agħżel wieħed" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Fajl diġà jeżisti. Tuża lilu?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permess miċħud" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "ġie miżjud is-sors %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ma nistax nieħu ritratti tal-iskrin qabel toħloq il-partizzjonijiet" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ir-ritratti jkunu disponibbli wara l-installazzjoni f' %s" @@ -343,7 +343,7 @@ msgstr "Ir-ritratti jkunu disponibbli wara l-installazzjoni f' %s" msgid "Installation" msgstr "Qed ninstalla" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurazzjoni" @@ -439,42 +439,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Inqalgħet problema" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Inqalgħet problema fatali: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d tranżazzjonijiet ta' installazzjoni fallew" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Workstation" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kompjuter tal-Uffiċċju" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -483,32 +483,32 @@ msgstr "" "Programmi tal-uffiċċju: wordprocessors (LibreOffice Writer, Kword), " "spreadsheet (LibreOffice Calc, Kspread) eċċ" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Logħob" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedja" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -516,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:40 #, c-format msgid "Network Computer (client)" msgstr "Kompjuter fuq network (klijent)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Għodda tal-konsol" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Żviluppar" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentazzjoni" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server tal-web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Grupp" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Gateway tal-internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/File/_Ġdid" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Direttorju minn fejn trid tirrestawra" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Server tal-ismijiet tad-dominji" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Server tal-printer" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Server tad-database PostgreSQL jew MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Imejl" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Server tal-imejl Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Server tad-database PostgreSQL jew MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Kompjuter Server tan-Network" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Ambjent Grafiku" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Stazzjon KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -711,76 +711,123 @@ 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:156 #, c-format msgid "GNOME Workstation" msgstr "Stazzjon GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Stazzjon KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Stazzjon GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Workstation" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambjent Grafiku" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Desktops Grafiċi Oħrajn" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "Filippini" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webcam" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Konfigurazzjoni tat-Terminal Server" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Monitoraġġ tan-network" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Prodotti Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Ma stajtx nikkonfigura l-printer \"%s\"!" @@ -794,7 +841,7 @@ msgstr "" "Inqalgħet problema, imma ma nafx kif nieħu ħsieba sew.\n" "Tista' tkompli b'riskju tiegħek" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -848,107 +895,107 @@ msgstr "Għażla ta' gruppi ta' pakketti" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Installazzjoni minima" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Għażla ta' gruppi ta' pakketti" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Agħżel pakketti individwalment" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Xejn magħżul" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Daqs totali: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verżjoni: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Daqs: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importanza: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ma tistax tagħżel/tneħħi dan il-pakkett" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "minħabba %s nieqes" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "minħabba %s mhux sodisfatt" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "qed nipprova nippromwovi %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "sabiex inżomm %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -956,104 +1003,104 @@ msgid "" msgstr "" "Ma tistax tagħżel dan il-pakkett għax ma fadalx biżżejjed spazju għalih" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Dan il-pakkett huwa kruċjali, ma jistax jitneħħa" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Uri l-pakketti magħżula awtomatikament" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installa" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Għażla ta' pakketti" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Qed naġġorna l-għażla ta' pakketti" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Installazzjoni minima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Maniġġjar ta' softwer" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Agħżel il-pakketti li trid tinstalla" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Qed ninstalla" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ebda dettalji" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Ħin li fadal " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Qed nieħu stima" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sommarju" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Ikkonfigura" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "mhux konfigurat" @@ -1067,7 +1114,7 @@ msgstr "" "Dawn is-sorsi ta' installazzjoni instabu.\n" "Jekk trid taqbeż uħud minnhom, tista' tneħħi l-marka issa." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1076,7 +1123,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1378,28 +1425,28 @@ msgstr "" "Trid tinstalla dawn l-aġġornamenti?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s fuq %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Ħardwer" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Kard awdjo" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Għandek kard tal-awdjo ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1408,75 +1455,75 @@ msgstr "" "Ħaddem \"alsaconf\" jew \"sndconfig\" wara l-installazzjoni biex " "tikkonfigura l-kard awdjo." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaċċja grafika" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Network u internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfigurat" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Livell ta' sigurtà" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewallr" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "attivat" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "mitfi" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Qed nipprepara l-bootloader" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Qed nipprepara l-installazzjoni" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1489,7 +1536,7 @@ msgstr "" "L-installazzjoni se tkompli, imma trid tuża BootX biex \n" "ittella' l-Linux." -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1498,17 +1545,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:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Daħħal flopi vojta fid-drajv %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Qed jinħoloq flopi awto-installazzjoni" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1519,12 +1566,12 @@ msgstr "" "\n" "Trid toħroġ issa?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Prosit" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Irributja" diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po index 868aa7ede..b98fed527 100644 --- a/perl-install/install/share/po/nb.po +++ b/perl-install/install/share/po/nb.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-03-17 05:45+0100\n" "Last-Translator: Olav Dahlum \n" "Language-Team: Norwegian Bokmål \n" @@ -88,7 +88,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -101,90 +101,90 @@ msgstr "" "\n" "Har du flere installasjonsmedier å sette opp?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Nettverk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Nettverk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Nettverk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Nettadresse til speilet?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL må starte med ftp:// eller http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Kontakter nettstedet til %s for å få listen over tilgjengelige speil … " -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Klarte ikke å kontakte nettstedet til %s for å få listen over tilgjengelige " "speil" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Velg et speil som pakkene kan hentes fra" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-oppsett" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Vertsnavn mangler" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Mappenavnet må starte med \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Vertsnavn til NFS-monteringen ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Mappe" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Ekstra" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -193,90 +193,90 @@ msgstr "" "Kan ikke finne pakkelistefil på dette speilet. Kontrollér at adressen er " "riktig." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Hopp over alle pakker fra media \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Ser på pakker som allerede er installert … " -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Finner pakker som skal oppgraderes … " -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -290,72 +290,72 @@ msgstr "" " \n" "Ønsker du å fjerne disse pakkene?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Feil ved lesing av fil %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "De(n) følgende disken(e) fikk nytt navn:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (tidligere kalt %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Nettverk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Velg et medie" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Filen eksisterer allerede. Overskriv?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Adgang nektet" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Ugyldig NFS-navn" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Feil på media %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Jeg kan ikke ta skjembilder før partisjonering." -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s" @@ -365,7 +365,7 @@ msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s" msgid "Installation" msgstr "Installasjon" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Oppsett" @@ -463,42 +463,42 @@ msgstr "" "Noen pakker krevet av %s kan ikke installeres\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "En feil oppstod:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Det oppsto en kritisk feil: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Ikke spør igjen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d mislykket installasjonstransaksjon" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installasjon av pakker feilet:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Arbeidsstasjon" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kontorarbeidsstasjon" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -507,32 +507,32 @@ msgstr "" "Kontorstøtteprogrammer: tekstbehandlere (LibreOffice Writer, Kword), " "regneark (LibreOffice Calc, Kspread), PDF-framvisere, etc" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Spillstasjon" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediastasjon" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internettstasjon" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -541,193 +541,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:40 #, c-format msgid "Network Computer (client)" msgstr "Nettverksmaskin (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsollverktøy" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Utvikling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C- og C++-utviklingsbibliotek, -programmer og include-filer" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentasjon" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Støtte for tredjeparts programvare" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webtjener" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Gruppevare" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internett-gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-post/Njus" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Katalogtjener" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-tjener" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domenenavn- og nettverksinformasjons-tjener" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Fil- og Skriverdelingstjener" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- og MariaDB-databasetjener" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix e-posttjener" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL eller MariaDB-databasetjener" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Nettverksmaskintjener" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafisk miljø" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-arbeidsstasjon" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -736,12 +736,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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-arbeidsstasjon" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -750,12 +750,41 @@ msgstr "" "Et grafisk miljø med et brukervennlig sett av programmer og " "skrivebordsverktøy" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-arbeidsstasjon" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Et grafisk miljø med et brukervennlig sett av programmer og " +"skrivebordsverktøy" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-arbeidsstasjon" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Arbeidsstasjon" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafisk miljø" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-skrivebord" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -764,52 +793,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Tilpasset skrivebord" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer " +"og skrivebordsverktøy" + +#: share/meta-task/compssUsers.pl:193 #, 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:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Verktøy" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-tjener" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin Fjernadministrasjonstjener" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Nettverks-verktøy/overvåkning" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia-veivisere" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Veivisere til å sette opp tjener" @@ -824,7 +875,7 @@ msgstr "" "måte.\n" "Fortsett på eget ansvar." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -878,107 +929,107 @@ msgstr "Medievalg" msgid "Install %s KDE Desktop" msgstr "Installer %s KDE-skrivebord" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installer %s GNOME-skrivebord" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Skreddersydd installasjon" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-skrivebord" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME-skrivebord" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Tilpasset skrivebord" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Her er en forhåndsvisning av skrivebordet «%s»." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Valg pakkegruppe" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuelt pakkevalg" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Velg bort alle" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Total størrelse: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versjon: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Størrelse: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Viktighet: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Du kan ikke velge (bort) denne pakken" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "pga. manglende %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "pga. utilfredsstilt %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "prøver å promotere %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "for å beholde %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -987,104 +1038,104 @@ msgstr "" "Du kan ikke velge denne pakken da det ikke er igjen nok plass til å " "installere den" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Dette er en obligatorisk pakke, den kan ikke fjernes" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Du kan ikke fjerne denne pakken. Den er allerede installert" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Du kan ikke fjerne denne pakken. Den må oppgraderes" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Vis automatisk valgte pakker" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installer" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Last inn/lagre utvalg" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Oppdaterer pakkevalg" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal installasjon" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programvarehåndtering" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Velg pakkene du ønsker å installere" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installerer" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ingen detaljer" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tid som gjenstår:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(beregner … )" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakke" msgstr[1] "%d pakker" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Oppsummering" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Sett opp" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ikke satt opp" @@ -1098,7 +1149,7 @@ msgstr "" "Følgende installasjonsmedia har blitt funnet.\n" "Hvis du vill hoppe over noen av de kan du velge de vekk nå." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1111,7 +1162,7 @@ msgstr "" "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når " "systemet er fullstendig installert." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiér hele CDer" @@ -1419,28 +1470,28 @@ msgstr "" "Ønsker du å installere oppdateringene?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s på %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Maskinvare" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Lydkort" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Har du et ISA-lydkort?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1449,75 +1500,75 @@ msgstr "" "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp " "lydkortet ditt" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafisk grensesnitt" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Nettverk & internett" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Mellomtjenere" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "satt opp" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Sikkerhetsnivå" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Brannmur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivert" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "deaktiver" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Klargjør oppstartslaster … " #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Forbereder installasjon" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Vennligst vær tålmodig, dette kan ta en stund … " -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1530,7 +1581,7 @@ msgstr "" "du må bruke BootX eller andre måter for å starte din maskin. " "Kjerneargumentet for root-filsystemet er: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1539,17 +1590,17 @@ msgstr "" "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt " "administratoren." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Sett inn en tom diskett i stasjon %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Oppretter diskett for autoinstallasjon … " -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1560,12 +1611,12 @@ msgstr "" "\n" "Ønsker du virkelig å avslutte nå?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulerer" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Restart" diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po index 3eb130656..c7fa06452 100644 --- a/perl-install/install/share/po/nl.po +++ b/perl-install/install/share/po/nl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-03-07 18:23+0100\n" "Last-Translator: Remco Rijnders \n" "Language-Team: Dutch \n" @@ -79,7 +79,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -93,91 +93,91 @@ msgstr "" "\n" "Heeft u een aanvullend installatiemedium in te stellen?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "cd-rom" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Netwerk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Netwerk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Netwerk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL van de mirror?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL dient te starten met ftp:// of http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Er wordt verbinding gemaakt met de %s website om een lijst met beschikbare " "spiegelservers te verkrijgen..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Er kon geen verbinding gemaakt worden met %s website om een lijst met " "beschikbare spiegelservers te verkrijgen" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-configuratie" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Hostnaam ontbreekt" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Map dient te beginnen met \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Hostnaam van het NFS-koppelpunt?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Map" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Aanvullend" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -186,22 +186,22 @@ msgstr "" "Kan hdlist-bestand op deze mirror niet vinden. Controleer of de locatie " "klopt." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core-uitgave" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted-uitgave" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree-uitgave" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -210,22 +210,22 @@ msgstr "" "Bepaalde hardware in uw machine behoeft niet-vrije firmware alvorens de " "vrije stuurprogrammatuur kan werken." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "U dient \"%s\" in te schakelen" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" bevat niet-vrije software.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -235,7 +235,7 @@ msgstr "" "laten werken (bijv: bepaalde ATI/AMD-grafische kaarten, bepaalde " "netwerkkaarten, bepaalde RAID-kaarten, ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -244,7 +244,7 @@ msgstr "" "\"%s\" bevat software welke niet in alle landen vrijelijk gedistribueerd kan " "worden als gevolg van software patenten." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." @@ -252,33 +252,33 @@ msgstr "" "Het bevat ook software uit \"%s\" welke herbouwd is met additionele " "mogelijkheden." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Hier kunt u indien gewenst meerdere media inschakelen." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Dit medium biedt updates voor \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Inventarisatie van reeds geïnstalleerde pakketten…" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Zoeken naar pakketten om op te waarderen…" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -292,72 +292,72 @@ msgstr "" "\n" "Weet u zeker dat u deze pakketten wilt verwijderen?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fout bij het lezen van bestand %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "De volgende schijf/schijven zijn hernoemd:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (heette voorheen %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Netwerk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Kies een medium" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Bestand bestaat reeds. Overschrijven?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Toegang geweigerd" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Slechte NFS naam" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Ongeldig medium %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan geen schermafdruk maken voor het partitioneren" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Schermafdrukken zullen beschikbaar zijn na installatie in %s" @@ -367,7 +367,7 @@ msgstr "Schermafdrukken zullen beschikbaar zijn na installatie in %s" msgid "Installation" msgstr "Installatie" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuratie" @@ -466,42 +466,42 @@ msgstr "" "Sommige door %s gevraagde pakketten kunnen niet worden geïnstalleerd:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Er is een fout opgetreden:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Er is een fatale fout opgetreden: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Vraag niet nogmaals" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d installatie-transacties mislukt" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installatie van pakketten mislukt:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Werkstation" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kantooromgeving" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -510,32 +510,32 @@ msgstr "" "Kantoorprogramma's: tekstverwerkers (LibreOffice Writer, Kword), rekenbladen " "(LibreOffice Calc, Kspread), PDF-lezers, etc" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Game-station" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedia-station" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet-station" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -544,193 +544,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:40 #, c-format msgid "Network Computer (client)" msgstr "Netwerk-computer (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Hulpprogramma's voor de opdrachtregel" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Ontwikkeling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentatie" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webserver" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-mail/nieuws" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Gidsserver" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domeinnaam- en Network Information Server" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Gedeelde bestands- en printerserver" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS-server, Samba-server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL en MariaDB database-server" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix e-mailserver" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL of MariaDB database-server" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Netwerk-computer server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, ssh server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafische omgeving" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-werkomgeving" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -739,12 +739,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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-werkomgeving" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -753,12 +753,41 @@ msgstr "" "Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen " "en bureaublad-programma's" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-werkomgeving" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen " +"en bureaublad-programma's" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-werkomgeving" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Werkstation" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafische omgeving" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-werkomgeving" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -767,52 +796,74 @@ msgstr "" "Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set " "toepassingen en bureaublad-programma's" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Aangepaste werkomgeving" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set " +"toepassingen en bureaublad-programma's" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Andere grafische omgevingen" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Hulpprogramma's" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin-server voor configuratie op afstand" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Netwerk-hulpprogramma's/observatie" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia-wizards" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Wizards om server te configureren" @@ -826,7 +877,7 @@ msgstr "" "Er is een fout opgetreden waarvoor de juiste afhandeling onbekend is.\n" "Als u verdergaat, is dit op eigen risico." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -881,107 +932,107 @@ msgstr "Mediaselectie" msgid "Install %s KDE Desktop" msgstr "Installeer de %s KDE Desktop" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installeer de %s GNOME Desktop" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Aangepaste installatie" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-werkomgeving" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Gnome-werkomgeving" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Aangepaste werkomgeving" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Hier is een voorproefje van de '%s'-werkomgeving." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakketgroepselectie" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individuele pakketselectie" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Alle gedeselecteerd" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Totale grootte: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versie: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Grootte: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d kB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Belang: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "U kunt dit pakket niet (de)selecteren" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "ten gevolge van ontbrekende %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "ten gevolge van onvoldane %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "proberen om %s te promoveren" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "om %s te kunnen behouden" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -990,104 +1041,104 @@ msgstr "" "U kunt dit pakket niet selecteren omdat er te weinig ruimte over is om het " "te installeren" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Dit is een verplicht pakket, het kan niet gedeselecteerd worden" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "U kunt dit pakket niet deselecteren. Het moet opgewaardeerd worden." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automatisch geselecteerde pakketten tonen" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installatie" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Selectie laden/opslaan" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Verversen van pakketselectie" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimale installatie" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Softwarebeheer" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Kies de pakketten die u wenst te installeren" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installeren" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Geen details" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Resterende tijd:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(schatten…)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakket" msgstr[1] "%d pakketten" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Overzicht" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configureren" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "niet geconfigureerd" @@ -1101,7 +1152,7 @@ msgstr "" "De volgende installatiemedia zijn gevonden.\n" "Indien u sommige wilt overslaan, kunt u ze nu deselecteren." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1114,7 +1165,7 @@ msgstr "" "De installatie gaat dan door vanaf de harde schijf en de pakketten blijven " "beschikbaar zodra het systeem volledig geïnstalleerd is." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Hele cd's kopiëren" @@ -1424,28 +1475,28 @@ msgstr "" "Wenst u de bijgewerkte pakketten te installeren?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s op %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Apparatuur" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Geluidskaart" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Heeft u een ISA geluidskaart?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1454,73 +1505,73 @@ msgstr "" "Voer \"alsaconf\" of \"sndconfig\" na de installatie uit om uw geluidskaart " "te configureren" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Geen geluidskaart bespeurd. Probeer \"harddrake\" na de installatie" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafische interface" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Netwerk & internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy's" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "geconfigureerd" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Beveiligingsniveau" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "geactiveerd" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "uitgeschakeld" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "U heeft X niet geconfigureerd. Weet u zeker dat u dit wilt?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Klaarmaken van opstartlader…" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Bezig met voorbereiden van het initiële startprogramma..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Een moment geduld, dit kan even duren…" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1534,7 +1585,7 @@ msgstr "" "starten. Het argument om aan de kernel mee te geven voor het root-" "bestandssysteem is: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1543,17 +1594,17 @@ msgstr "" "In dit beveiligingsniveau wordt toegang tot de bestanden op de Windows-" "partitie voorbehouden aan de systeembeheerder." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Plaats een lege diskette in station %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Aanmaken van auto-installatiediskette…" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1564,12 +1615,12 @@ msgstr "" "\n" "Weet u zeker dat u op dit moment wilt afsluiten?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gefeliciteerd" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Herstarten" diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po index cad78cb11..e833fba4c 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-02-07 16:39+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -72,7 +72,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -85,89 +85,89 @@ msgstr "" "\n" "Har du fleire installasjonsmedium du ønskjer å bruka?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Nettverk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Nettverk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Nettverk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Adresse til spegelen?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Adresser må starta med «ftp://» eller «http://»." -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontaktar %s-nettstaden for oversikt over speglar …" -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Klarte ikkje få kontakt med %s-nettstaden for å henta oversikt over " "tilgjengelege speglar." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Vel spegelen du vil installera pakkar frå" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS-oppsett" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Skriv inn vertsnamn og mappe til NFD-media" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Manglar vertsnam" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Mappa må begynna med «/»" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Vertsnamn til NFS-montering:" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalog" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Tillegg" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -175,90 +175,90 @@ msgid "" msgstr "" "Finn ikkje pakkelistfila på denne spegelen. Sjå til at adressa er rett." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Hopp over alle pakkar frå mediet «%s»" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Ser på allereie installerte pakkar …" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Ser etter pakkar å oppgradera …" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -271,72 +271,72 @@ msgstr "" "\n" "Er du sikker på at du vil fjerna pakkane?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Klarte ikkje lesa fila «%s»" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Desse diskane fekk nye namn:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "«%s» (tidlegare namn: «%s»)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Nettverk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Vel medium" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fila finst allereie. Vil du skriva over ho?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Nekta løyve" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Ugyldig NFS-namn" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Ugyldig medium: %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan ikkje ta skjermbilete før partisjonering" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig" @@ -346,7 +346,7 @@ msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig" msgid "Installation" msgstr "Installering" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Oppsett" @@ -445,42 +445,42 @@ msgstr "" "Nokre pakkar som %s krev kan ikkje installerast:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Det oppstod ein feil:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Det oppstod ein kritisk feil: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Ikkje spør igjen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "feil med %d installasjonstransaksjonar" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Feil ved installering av pakkar:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Arbeidstasjon" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kontormaskin" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -489,32 +489,32 @@ msgstr "" "Kontorprogramvare: Teksthandsamarar (LibreOffice Writer, Kword), rekneark " "(LibreOffice Calc, Kspread), PDF-viseprogram, med meir" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Spelmaskin" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediemaskin" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internett-maskin" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -523,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:40 #, c-format msgid "Network Computer (client)" msgstr "Nettverksmaskin (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsollverktøy" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Utvikling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Hjelpetekst" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base – støtte for tredjepartsprogram" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Vevtenar" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Gruppevare" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internett-portnar" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-post og temagrupper" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Katalogtenar" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-tenar" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domenenamn og nettverksinformasjonstenar." -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Fil- og skrivardeling-tenar" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- og MariaDB-databasetenar" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Vev/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix-e-posttenar" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- eller MariaDB-databasetenar" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Nettverkstenar" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafisk miljø" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-arbeidsstasjon" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME-arbeidsstasjon" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -729,12 +729,40 @@ msgid "" msgstr "" "Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-arbeidsstasjon" + +#: share/meta-task/compssUsers.pl:163 +#, 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME-arbeidsstasjon" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Arbeidstasjon" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafisk miljø" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE-skrivebord" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -743,52 +771,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Sjølvvalt skrivebord" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege " +"program og skrivebordsverktøy" + +#: share/meta-task/compssUsers.pl:193 #, 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:194 +#, 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:217 #, c-format msgid "Utilities" msgstr "Verktøy" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-tenar" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin-fjernoppsettenar" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Nettverksverktøy og -overvaking" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia-vegvisarar" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Vegvisarar for tenaroppsett" @@ -801,7 +851,7 @@ msgid "" msgstr "Det oppstod ein kritisk feil. Hald fram på eige ansvar." # skip-rule: passiv -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -855,107 +905,107 @@ msgstr "Medieval" msgid "Install %s KDE Desktop" msgstr "Installer %s KDE-skrivebord" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installer %s GNOME-skrivebord" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Anna installering" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE-skrivebord" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME-skrivebord" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Sjølvvalt skrivebord" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Slik ser skrivebordsmiljøet %s ut." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Trykk på bileta for å forstørra dei" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pakkegruppeval" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Direkte pakkeval" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Valde vekk alle" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Totalstorleik: %d / %d MiB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versjon: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Storleik: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KiB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Prioritet: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Du kan ikkje velja eller fjerna denne pakken" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "på grunn av manglande «%s»" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "då «%s» ikkje er tilfredsstilt" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "Prøver å prioritera «%s»" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "for å kunna behalda «%s»" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -964,104 +1014,104 @@ msgstr "" "Du kan ikkje velja denne pakken, då det ikkje er nok ledig plass til å " "installera han." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Desse pakkane vert installerte" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Desse pakkane vert fjerna" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Kan ikkje velja vekk pakken. Han må oppgraderast." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Vis automatiske valde pakkar" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installer" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Opna/lagra utval" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Oppdaterer pakkeval" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal installering" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programvarehandsaming" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Vel pakkane du ønskjer å installera" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installerer" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Gøym detaljar" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tid igjen:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(estimerer …)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakke" msgstr[1] "%d pakkar" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Samandrag" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Set opp" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ikkje sett opp" @@ -1075,7 +1125,7 @@ msgstr "" "Fann desse installasjonsmedia.\n" "Om du ikkje ønskjer å bruka alle, kan du velja vekk dei du ikkje treng no." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1088,7 +1138,7 @@ msgstr "" "Installasjonen vil då helda fram frå harddisken, og pakkane vil vera lett " "tilgjengeleg òg etter at systemet er installert og sett opp." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopier CD-ane" @@ -1398,28 +1448,28 @@ msgstr "" "Ønskjer du å installera oppdateringane?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s på %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Maskinvare" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Lydkort" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Har du eit ISA-lydkort?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1427,75 +1477,75 @@ msgid "" msgstr "" "Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafisk grensesnitt" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Nettverk og Internett" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Mellomtenarar" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "oppsett" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Tryggleiksnivå" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Brannmur" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "påslått" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "avslått" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Førebur oppstartslastar …" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Førebur installasjon" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Ver tålmodig. Dette kan ta ei stund …" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1508,7 +1558,7 @@ msgstr "" "annan måte å starta maskina di på. Kjerneargumentet for rotfilsystemet er: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1517,17 +1567,17 @@ msgstr "" "Med dette tryggleiksnivået er det berre administratoren som får tilgang til " "filer på Windows-partisjonen." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Set inn ein tom diskett i stasjon «%s»" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Lagar diskett for automatisk installasjon …" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1538,12 +1588,12 @@ msgstr "" "\n" "Er du sikker på at du vil avslutta?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulerer" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Start på nytt" diff --git a/perl-install/install/share/po/pa_IN.po b/perl-install/install/share/po/pa_IN.po index 9a11a2c3e..1f76ccd52 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-03-27 17:55+0530\n" "Last-Translator: Jaswinder Singh Phulewala \n" "Language-Team: Punjabi \n" @@ -75,7 +75,7 @@ msgid "Do you have further supplementary media?" msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਅੱਗੇ ਅਨੁਪੂਰਕ ਮਾਧਿਅਮ ਹੈ?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -84,177 +84,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "ਨੈੱਟਵਰਕ (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "ਨੈੱਟਵਰਕ (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "ਪ੍ਰਤਿਬਿੰਬ ਦਾ URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਬਿੰਬ ਚੁਣੋ" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "ਡਾਇਰੈਕਟਰੀ" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "ਇਸ ਪ੍ਰਤੀਬਿੰਬ ਤੇ ਪੈਕੇਜ ਸੂਚੀ ਫਾਇਲ ਨਹੀਂ ਲੱਭ ਸਕੀ। ਜਾਂਚ ਕਰੋ ਕਿ ਸਥਿਤੀ ਠੀਕ ਹੈ।" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "ਪਹਿਲਾਂ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਸੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -267,72 +267,72 @@ msgstr "" "\n" "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਪੈਕੇਜ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "ਫਾਇਲ %s ਪੜਨ ਵਿੱਚ ਗਲਤੀ" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "ਹੇਠਲੀਆਂ ਡਿਸਕਾਂ ਦੇ ਨਾਂ ਤਬਦੀਲ ਕੀਤੇ ਹਨ:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ਪਹਿਲਾਂ %s ਨਾਂ ਸੀ)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "FTP" msgstr "ਵੈਬ/FTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "PFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "ਨੈੱਟਵਰਕ" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "ਕਿਰਪਾ ਕਰਕੇ ਬੈਕਅੱਪ ਲਈ ਮਾਧਿਅਮ ਚੁਣੋ।" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਮੌਜੂਦ ਹੈ, ਇਹ ਵਰਤੋ?" -#: any.pm:1242 +#: any.pm:1272 #, fuzzy, c-format msgid "Permission denied" msgstr "ਅਧਿਕਾਰ" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "ਵਿਭਾਗੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਰਦਾ-ਤਸਵੀਰ ਨਹੀਂ ਬਣਾ ਸਕਦਾ" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "ਪਰਦਾ-ਤਸਵੀਰਾਂ %s ਵਿੱਚ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਬਾਅਦ ਉਪਲੱਬਧ ਹੋਣਗੀਆਂ" @@ -342,7 +342,7 @@ msgstr "ਪਰਦਾ-ਤਸਵੀਰਾਂ %s ਵਿੱਚ ਇੰਸਟਾਲੇ msgid "Installation" msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "ਸੰਰਚਨਾ" @@ -438,42 +438,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "ਘਾਤਕ ਗਲਤੀ ਆਈ: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "ਵਰਕਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -482,301 +482,348 @@ msgstr "" "ਦਫਤਰੀ ਪ੍ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (LibreOffice Writer, Kword), ਸਾਰਣੀਕਾਰ (OpenOffice.org " "Calc, Kspread), PDF ਦਰਸ਼ਕ, ਆਦਿ" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "ਖੇਡ ਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "ਮਨੋਰੰਜਨ ਪ੍ਰੋਗਰਾਮ: ਆਰਕੇਡ, ਬੋਰਡ, ਨੀਤੀ, ਆਦਿ" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "ਮਲਟੀਮੀਡੀਆ ਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "ਸਾਊਂਡ ਅਤੇ ਵੀਡੀਓ ਚਲਾਉਣ/ਸੋਧਣ ਵਾਲੇ ਪ੍ਰੋਗਰਾਮ" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "ਇੰਟਰਨੈੱਟ ਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "ਪੱਤਰ ਅਤੇ ਖਬਰਾਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ (mutt, tin..) ਅਤੇ ਵੈਬ ਝਾਤੀ ਲਈ ਸੰਦਾਂ ਦਾ ਸਮੂਹ" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ (ਕਲਾਂਈਟ)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "ssh ਸਮੇਤ ਵੱਖ-ਵੱਖ ਪਰੋਟੋਕਾਲਾਂ ਲਈ ਕਲਾਂਈਟ" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਸਾਫ ਕਰਨ ਲਈ ਸੰਦ" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "ਕੰਸੋਲ ਸੰਦ" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "ਸੰਪਾਦਕ, ਸ਼ੈੱਲ, ਫਾਇਲ ਸੰਦ, ਟਰਮੀਨਲ" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "ਵਿਕਾਸ" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C ਅਤੇ C++ ਵਿਕਾਸ ਲਾਇਬ੍ਰੇਰੀਆਂ, ਪ੍ਰੋਗਰਾਮ ਅਤੇ ਸ਼ਾਮਿਲ ਫਾਇਲਾਂ" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "ਦਸਤਾਵੇਜ਼" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "ਲੀਨਕਸ ਅਤੇ ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਉੱਪਰ ਕਿਤਾਬਾਂ ਅਤੇ Howto's" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "ਲੀਨਕਸ ਮਿਆਰੀ ਮੁੱਢ। ਤੀਜੀ ਪਾਰਟੀ ਕਾਰਜ ਸਹਿਯੋਗ" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "ਵੈਬ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "ਗਰੁੱਪਵੇਅਰ" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "ਫਾਇਲਵਾਲ/ਰਾਊਟਰ" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "ਇੰਟਰਨੈੱਟ ਗੇਟਵੇ" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "ਪੱਤਰ/ਖਬਰ" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix ਪੱਤਰ ਸਰਵਰ, Inn ਖਬਰ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "ਡੋਮੇਨ ਨਾਂ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "ਫਾਇਲ ਅਤੇ ਪ੍ਰਿੰਟਰ ਸ਼ੇਅਰਿੰਗ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS ਸਰਵਰ, ਸਾਂਬਾ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "ਡਾਟਾਬੇਸ " -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL ਅਤੇ MariaDB ਡਾਟਾਬੇਸ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "ਵੈਬ/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "ਪੱਤਰ" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix ਪੱਤਰ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ਜਾਂ MariaDB ਡਾਟਾਬੇਸ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS ਸਰਵਰ, SMB ਸਰਵਰ, ਪਰਾਕਸੀ ਸਰਵਰ, ssh ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "ਕੇ ਵਿਹੜਾ ਵਾਤਾਵਰਨ, ਸਾਥੀ ਸੰਦਾਂ ਦੇ ਭੰਡਾਰ ਨਾਲ ਮੁੱਢਲਾ ਗਰਾਫਿਕਲ ਵਾਤਾਵਰਨ" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "ਵਰਕਸਟੇਸ਼ਨ" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "ਵਿਹੜਾ" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "ਵਿਹੜਾ" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "ਹੋਰ ਗਰਾਫੀਕਲ ਵਿਹੜੇ" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ਆਦਿ" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "ਸਹੂਲਤਾਂ" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin ਰਿਮੋਟ ਸੰਰਚਨਾ ਸਰਵਰ" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "ਨੈੱਟਵਰਕ ਸਹੂਲਤਾਂ/ਪ੍ਰਬੰਧਨ" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "ਪ੍ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰਗ, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਤਖਤੀ" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "ਸਰਵਰ ਸੰਰਚਨਾ ਲਈ ਤਖਤੀ" @@ -790,7 +837,7 @@ msgstr "" "ਗਲਤੀ ਹੋਈ ਹੈ, ਪਰ ਮੈਂ ਨਹੀਂ ਜਾਣਦਾ ਕਿ ਇਸ ਦਾ ਕਿਸ ਤਰਾਂ ਪ੍ਰਬੰਧਨ ਕਰਨਾ ਹੈ।\n" "ਆਪਣੇ ਖਤਰੇ ਤੇ ਜਾਰੀ ਕਰੋ।" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -843,211 +890,211 @@ msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "ਵਿਹੜਾ" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "ਵਿਹੜਾ" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "ਵਿਹੜਾ" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "ਵੱਖ-ਵੱਖ ਪੈਕੇਜ ਚੋਣ" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "ਸਭ ਨਾ-ਚੁਣੋ" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "ਕੁੱਲ ਅਕਾਰ: %d / %d ਮੈਬਾ" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "ਵਰਜਨ:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "ਅਕਾਰ:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d ਕਿਬਾ\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "ਖਾਸੀਅਤ:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "ਤੁਸੀਂ ਇਹ ਪੈਕੇਜ ਚੁਣ/ਨਾ-ਚੁਣ ਨਹੀਂ ਸਕਦੇ" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s ਗੁੰਮ ਹੋਣ ਕਾਰਨ" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s ਲੋੜ ਪੂਰੀ ਨਾ ਹੋਣ ਕਰਕੇ" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s ਵਰਤੋਂ ਦੀ ਸਿਫਾਰਸ਼ ਕੀਤੀ ਜਾਂਦੀ ਹੈ" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s ਰੱਖਣ ਲਈ" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "ਤੁਸੀਂ ਇਹ ਪੈਕੇਜ ਨਹੀਂ ਚੁਣ ਸਕਦੇ ਕਿਉਂਕਿ ਇੱਥੇ ਇਸ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਥਾਂ ਨਹੀਂ ਹੈ।" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "ਹੇਠਲੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "ਹੇਠਲੇ ਪੈਕੇਜ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "ਇਹ ਲਾਜ਼ਮੀ ਪੈਕੇਜ ਹੈ, ਇਸ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾਈ ਜਾ ਸਕਦੀ" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "ਤੁਸੀਂ ਇਸ ਪੈਕੇਜ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾ ਸਕਦੇ। ਇਹ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ।" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "ਤੁਸੀਂ ਇਸ ਪੈਕੇਜ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾ ਸਕਦੇ। ਇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਜਰੂਰੀ ਹੈ।" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "ਚੁਣੇ ਪੈਕੇਜ ਸਵੈ ਹੀ ਵਿਖਾਓ" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "ਇੰਸਟਾਲ" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "ਪੈਕੇਜ ਚੋਣ" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "ਪੈਕੇਜ ਚੋਣ ਨਵੀਨੀਕਰਨ ਜਾਰੀ ਹੈ" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "ਸਾਫਟਵੇਅਰ ਪ੍ਰਬੰਧਨ" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ ਚੁਣੋ" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "ਬਾਕੀ ਸਮਾਂ" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "ਅਨੁਮਾਨ ਜਾਰੀ ਹੈ" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d ਪੈਕੇਜ" msgstr[1] "%d ਪੈਕੇਜ" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "ਸਾਰ" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "ਸੰਰਚਨਾ" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "ਸੰਰਚਿਤ ਨਹੀਂ" @@ -1061,7 +1108,7 @@ msgstr "" "ਹੇਠਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਨ ਲੱਭੇ ਹਨ।\n" "ਜੇ ਤੁਸੀਂ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਛੱਡਣੇ ਚਾਹੁੰਦੇ ਹੋ, ਤੁਸੀਂ ਹੁਣ ਰੱਦ ਕਰ ਸਕਦੇ ਹੋ।" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1073,7 +1120,7 @@ msgstr "" "ਇਹ ਫਿਰ ਹਾਰਡ ਡਰਾਈਵ ਤੋਂ ਜਾਰੀ ਕਰੇਗਾ ਅਤੇ ਪੈਕੇਜ ਸਿਸਟਮ ਪੂਰੀ ਤਰਾਂ ਇੰਸਟਾਲ ਹੋਣ ਤੋਂ ਬਾਅਦ ਵੀ ਉਪਲੱਬਧ " "ਰਹਿਣਗੇ।" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "ਪੂਰੀ CDs ਨਕਲ ਕਰੋ" @@ -1362,101 +1409,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s, %s ਉੱਪਰ" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "ਜੰਤਰ" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "ਸਾਊਂਡ ਕਾਰਡ" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ISA ਸਾਊਂਡ ਕਾਰਡ ਹੈ?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "ਆਪਣੀ ਸਾਊਂਡ ਕਾਰਡ ਸੰਰਚਨਾ ਲਈ ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"alsaconf\" ਜਾਂ \"sndconfig\" ਚਲਾਓ" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "ਕੋਈ ਸਾਊਂਡ ਕਾਰਡ ਨਹੀਂ ਲੱਭਿਆ। ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"harddrake\" ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "ਗਰਾਫੀਕਲ ਇੰਟਰਫੇਸ" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "ਨੈੱਟਵਰਕ ਤੇ ਇੰਟਰਨੈੱਟ" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "ਪਰਾਕਸੀ" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "ਸੰਰਚਿਤ" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "ਸੁਰੱਖਿਆ ਪੱਧਰ" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "ਫਾਇਰਵਾਲ" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ਸਰਗਰਮ" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ਅਯੋਗ" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "ਤੁਸੀਂ X ਸੰਰਚਿਤ ਨਹੀਂ ਕੀਤਾ। ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਸ ਨੂੰ ਚਾਹੁੰਦੇ ਹੋ?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1468,24 +1515,24 @@ msgstr "" "ਜਾਰੀ ਰਹੇਗਾ, ਪਰ ਤੁਹਾਨੂੰ ਆਪਣੀ ਮਸ਼ੀਨ ਬੂਟ ਕਰਨ ਲਈ BootX ਜਾਂ ਹੋਰ ਢੰਗ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਰੂਟ " "ਫਾਇਲ ਸਿਸਟਮ ਲਈ ਕਰਨਲ ਆਰਗੂਮੈਂਟ ਹਨ: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "ਇਸ ਸੁਰੱਖਿਆ ਪੱਧਰ ਵਿੱਚ, Windows ਭਾਗ ਵਿਚਲੀ ਫਾਇਲਾਂ ਵਰਤਣ ਲਈ ਪ੍ਰਬੰਧਕ ਨੂੰ ਮਨਾਹੀ ਹੈ।" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "ਡਰਾਈਵ %s ਵਿੱਚ ਖਾਲੀ ਫਲਾਪੀ ਪਾਓ" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "ਸਵੈ ਇੰਸਟਾਲ ਫਲਾਪੀ ਬਣਾ ਰਿਹਾ ਹੈ..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1496,12 +1543,12 @@ msgstr "" "\n" "ਕੀ ਤੁਸੀਂ ਹੁਣ ਯਕੀਨਨ ਬਾਹਰ ਜਾਣਾ ਹੈ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "ਮੁਬਾਰਕਾਂ" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "ਮੁੜ-ਚਾਲੂ" diff --git a/perl-install/install/share/po/pl.po b/perl-install/install/share/po/pl.po index 8fc10b237..5cbe442d8 100644 --- a/perl-install/install/share/po/pl.po +++ b/perl-install/install/share/po/pl.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-04-06 13:21+0200\n" "Last-Translator: Daniel Napora \n" "Language-Team: Polish \n" @@ -87,7 +87,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -101,87 +101,87 @@ msgstr "" "\n" "Czy chcesz skonfigurować dodatkowe nośniki instalacyjne?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Sieć (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Sieć (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Sieć (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Adres URL dla serwera zwierciadlanego?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Adres URL musi zaczynać się od ftp:// lub http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Wybierz serwer lustrzany, z którego chcesz pobrać pakiety" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Konfiguracja NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Wprowadź nazwę komputera i katalog nośnika NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Brak nazwy hosta" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Oznaczenie katalogu musi się zaczynać od znaku \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nazwa komputera udostępniające udziały NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalog" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Dodatkowe" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -190,22 +190,22 @@ msgstr "" "Nie można znaleźć listy pakietów na tym serwerze. Sprawdź poprawność " "lokalizacji." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -214,22 +214,22 @@ msgstr "" "Niektóre urządzenia w twoim komputerze wymagają nie-wolnego firmware, aby " "wolne sterowniki mogły działać." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Warto włączyć \"%s\"" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" zawiara nie-wolne oprogramowanie.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -238,7 +238,7 @@ 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:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -247,39 +247,39 @@ msgstr "" "\"%s\" zawiara oprogramowanie, które w niektórych krajach nie może być " "dystrybuowane ze względu na patenty." -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "Zawiera również oprogramowanie z \"%s\" " -#: any.pm:363 +#: any.pm:387 #, 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:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Pomiń wszystkie pakiety z nośnika \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Wyszukiwanie już zainstalowanych pakietów..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Wyszukiwanie pakietów do uaktualnienia..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -292,72 +292,72 @@ msgstr "" "\n" "Czy naprawdę chcesz usunąć te pakiety?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Błąd odczytu pliku %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Zmieniono nazwy następujących dysków:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (wcześniejsza nazwa: %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Sieć" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Proszę wybrać nośnik" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Plik już istnieje. Nadpisać?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Dostęp zabroniony" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Niepoprawna nazwa NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Nieprawidłowy nośnik %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nie można pobrać zrzutu ekranu przed partycjonowaniem" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Zrzuty ekranu będą dostępne po instalacji w %s" @@ -367,7 +367,7 @@ msgstr "Zrzuty ekranu będą dostępne po instalacji w %s" msgid "Installation" msgstr "Instalacja" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguracja" @@ -467,42 +467,42 @@ msgstr "" "Niektóre pakiety wymagane przez %s nie mogą zostać zainstalowane:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Wystąpił błąd:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Wystąpił poważny błąd: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Nie pytaj ponownie" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Stacja robocza" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Stacja biurowa" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -511,32 +511,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Stacja rozrywkowa (gry)" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Stacja multimedialna" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Stacja internetowa" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -545,193 +545,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:40 #, c-format msgid "Network Computer (client)" msgstr "Komputer sieciowy (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Narzędzia konsolowe" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Programowanie" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacja" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Serwer WWW" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "System do pracy grupowej" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Bramka internetowa" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Poczta/wiadomości" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Serwer katalogowy" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Serwer FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Serwer nazw domenowych i informacji sieciowych" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Baza danych" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Serwer bazodanowy PostgreSQL i MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Poczta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Serwer pocztowy Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Serwer bazodanowy PostgreSQL i MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Serwer sieciowy" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Środowisko graficzne" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Stacja KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -740,12 +740,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:156 #, c-format msgid "GNOME Workstation" msgstr "Stacja GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -754,12 +754,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Stacja KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i " +"narzędzi graficznych" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Stacja GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Stacja robocza" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Środowisko graficzne" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Pulpit LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -768,52 +797,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Dowolny pulpit" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Lekkie i szybkie środowisko graficzne z przyjaznym dla użytkownika zbiorem " +"aplikacji i narzędzi graficznych" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Inne środowiska graficzne" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, itd." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Narzędzia" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Serwer SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Serwer konfiguracji zdalnej Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Narzędzia sieciowe/monitorowanie" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Druidy Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Druidy do konfiguracji serwera" @@ -827,7 +878,7 @@ msgstr "" "Wystąpił jakiś błąd i nie wiadomo, jak poprawnie go obsłużyć.\n" "Kontynuuj na własną odpowiedzialność." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -881,194 +932,194 @@ msgstr "Wybór nośników" msgid "Install %s KDE Desktop" msgstr "Zainstaluj środowisko graficzne %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Zainstaluj środowisko graficzne %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalacja dowolna" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Pulpit KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Pulpit GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Dowolny pulpit" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Przegląd pulpitu '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Wybór grup pakietów" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Samodzielny wybór pakietów" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Odznacz wszystko" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Rozmiar: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Wersja: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Rozmiar: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Ważność: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Nie można zmienić statusu tego pakietu" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "z powodu brakującego %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "na skutek niespełnienia %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "próba aktualizacji wersji %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "w celu utrzymania %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Nie możesz wybrać tego pakietu. Nie ma już miejsca, by go zainstalować" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ten pakiet jest wymagany, nie można go pominąć" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Nie można odznaczyć tego pakietu. Został już zainstalowany" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Nie można odznaczyć tego pakietu. Musi zostać zaktualizowany" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Pokaż automatycznie wybrane pakiety" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Zainstaluj" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Wczytanie/Zapis zaznaczenia" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Uaktualnianie listy wybranych pakietów" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimalna instalacja" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Zarządzanie oprogramowaniem" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Wybierz pakiety do zainstalowania" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalowanie" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Bez szczegółów" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Pozostały czas:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(szacowanie...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1076,17 +1127,17 @@ msgstr[0] "pakiet" msgstr[1] "%d pakietów" msgstr[2] "%d pakietów" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Różne" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfiguruj" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nie skonfigurowano" @@ -1100,7 +1151,7 @@ msgstr "" "Znaleziono poniższe nośniki instalacyjne.\n" "Jeśli chcesz pominąć któreś z nich, możesz je teraz odznaczyć." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1113,7 +1164,7 @@ msgstr "" "Instalacja będzie kontynuowana z dysku twardego a skopiowane pakiety będą " "dostępne po zakończeniu instalacji." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Skopiuj wszystkie płyty CD" @@ -1422,28 +1473,28 @@ msgstr "" "Czy chcesz zainstalować uaktualnienia ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Sprzęt" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Karta dźwiękowa" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Czy posiadasz kartę dźwiękową ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1452,75 +1503,75 @@ msgstr "" "Uruchom \"alsaconf\" lub \"sndconfig\" po zakończeniu instalacji aby " "skonfigurować kartę dźwiękową" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfejs graficzny" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Sieć i Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Serwery pośredniczące" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "skonfigurowano" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Poziom bezpieczeństwa" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Zapora sieciowa" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktywowano" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "wyłączono" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Przygotowywanie programu rozruchowego..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Przygotowywanie programu rozruchowego..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Proszę o cierpliwość, to może potrwać chwilę..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1533,7 +1584,7 @@ msgstr "" "kontynuowana, lecz konieczne jest użycie programu BootX, aby uruchomić " "komputer. Argument jądra dla głównego systemu plików \"/\": root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1542,17 +1593,17 @@ msgstr "" "W tym poziomie zabezpieczeń, dostęp do plików na partycji Windows jest " "ograniczony do administratora." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Włóż pustą dyskietkę do stacji %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Tworzenie dyskietki automatycznej instalacji..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1563,12 +1614,12 @@ msgstr "" "\n" "Czy na pewno chcesz teraz zakończyć?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulacje" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Uruchom ponownie" diff --git a/perl-install/install/share/po/pt.po b/perl-install/install/share/po/pt.po index 0e5041b40..116bd5335 100644 --- a/perl-install/install/share/po/pt.po +++ b/perl-install/install/share/po/pt.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2012-05-22 21:55+0100\n" "Last-Translator: Pedro \n" "Language-Team: Portuguese <>\n" @@ -81,7 +81,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -94,90 +94,90 @@ msgstr "" "\n" "Tem alguma média de instalação suplementar para configurar?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rede (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rede (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rede (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL do espelho?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "O URL deve começar por ftp:// ou http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "A contactar o sítio 'web' %s para obter a lista de espelhos disponíveis..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Falha ao contactar o sítio 'web' %s para obter a lista de espelhos " "disponíveis" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Escolha um espelho para transferir os pacotes" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuração NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Por favor indique o nome da máquina e o directório da sua média NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Nome da máquina em falta" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "O directório deve começar por \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Nome da máquina da montagem NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directório" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Suplementar" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -186,90 +186,90 @@ msgstr "" "Não é possível encontrar o ficheiro hdlist neste espelho. Certifique-se que " "a localização está correcta." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Saltar todos os pacotes da média \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "A verificar os pacotes já instalados..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "A procurar pacotes para actualizar..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -283,72 +283,72 @@ msgstr "" "\n" "Deseja realmente remover estes pacotes ?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Erro ao ler o ficheiro %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Os seguintes discos foram renomeados:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (anteriormente conhecido por %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rede" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Por favor escolha uma média" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "O ficheiro já existe. Deseja substituir o ficheiro?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permissão negada" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nome NFS inválido" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Média inválida %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Não é possível capturar imagens do ecrã antes de particionar" -#: any.pm:1363 +#: any.pm:1393 #, 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" @@ -358,7 +358,7 @@ msgstr "As capturas de ecrã estarão disponíveis após instalar em %s" msgid "Installation" msgstr "Instalação" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuração" @@ -457,42 +457,42 @@ msgstr "" "Alguns pacotes pedidos por %s não podem ser instalados:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Ocorreu um erro:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ocorreu um erro fatal: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Não perguntar novamente" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transacções de instalação falhadas" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Instalação dos pacotes falhada:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Estação de Trabalho" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Estação de Trabalho de Escritório" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -501,32 +501,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Estação de Jogo" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Estação multimédia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Estação internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -535,194 +535,194 @@ msgstr "" "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:40 #, c-format msgid "Network Computer (client)" msgstr "Computador de Rede (cliente)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Ferramentas de Consola" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desenvolvimento" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentação" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Base Padrão do Linux (LSB). Suporte a aplicações terceiras." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servidor Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Correio/Noticias" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Servidor de Directório" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Nome do Domínio e Servidor de Informação da Rede" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Base de Dados" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Servidor de Base de Dados PostgreSQL e MySQL" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Correio Electrónico" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servidor de correio electrónico Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, fuzzy, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Servidor de Base de Dados PostgreSQL ou MySQL" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Servidor/Computador de Rede" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Ambiente Gráfico" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Estação de Trabalho KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -731,12 +731,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:156 #, c-format msgid "GNOME Workstation" msgstr "Estação de Trabalho GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -745,12 +745,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Estação de Trabalho KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Um ambiente gráfico com um conjunto de aplicações amigáveis e ferramentas de " +"ecrâ" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Estação de Trabalho GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estação de Trabalho" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambiente Gráfico" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Ecrâ LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -759,53 +788,75 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Ecrâ Personalizado" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"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:193 #, c-format msgid "Other Graphical Desktops" msgstr "Outros Ambientes Gráficos" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilidades" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servidor de Configuração Remota Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilidades de Rede/Monitorização" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Assistentes Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Assistentes para configurar o servidor" @@ -819,7 +870,7 @@ msgstr "" "Ocorreu um erro, mas é possível saber como resolver correctamente.\n" "Continue a seu próprio risco." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -873,107 +924,107 @@ msgstr "Selecção de Média" msgid "Install %s KDE Desktop" msgstr "Instalar Ecrã KDE %s" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalar Ecrã GNOME %s" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalação personalizada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Ecrâ KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Ecrâ GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Ecrâ Personalizado" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Aqui está uma previsão do ecrã '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selecção dos Grupos de Pacotes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selecção individual de pacotes" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Desmarcar Tudo" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tamanho total: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versão: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamanho: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importância: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Não pode seleccionar/desseleccionar este pacote" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "devido a faltar %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "devido a %s insatisfeitas" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "a tentar promover %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "para manter %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -981,104 +1032,104 @@ msgid "" msgstr "" "Não pode seleccionar este pacote pois não existe espaço livre para o instalar" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Este é um pacote obrigatório, não pode ser desmarcado" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Não pode desmarcar este pacote. Já se encontra instalado" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Não pode desmarcar este pacote. Tem que ser actualizado" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostrar pacotes seleccionados automaticamente" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalar" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Carregar/Gravar selecção" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "A actualizar selecção de pacotes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalação mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gestão de Programas" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Escolha os pacotes que deseja instalar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalação" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Sem detalhes" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Tempo restante:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(a estimar...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pacote" msgstr[1] "%d pacotes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sumário" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurar" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "não configurado" @@ -1092,7 +1143,7 @@ msgstr "" "A seguinte média de instalação foi encontrada.\n" "Se quer evitar alguns deles, pode desmarcá-los agora." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1105,7 +1156,7 @@ msgstr "" "Continuará a partir do disco rígido e os pacotes permanecerão disponíveis " "assim que o sistema estiver instalado." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiar todos os CDs" @@ -1414,28 +1465,28 @@ msgstr "" "Deseja instalar as actualizações ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s em %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Material" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Placa de Som" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Tem alguma placa de som ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1444,73 +1495,73 @@ msgstr "" "Execute \"alsaconf\" ou \"sndconfig\" após a instalação para configurar a " "sua placa de som" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interface gráfico" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rede e Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurado" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nível de Segurança" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activado" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "desactivado" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Não configurou o X. Tem certeza que deseja fazer isto?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "A preparar o carregador de arranque..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "A preparar o programa inicial de arranque..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Seja paciente, isto pode demorar algum tempo..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1523,7 +1574,7 @@ msgstr "" "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:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1532,17 +1583,17 @@ msgstr "" "Neste nível de segurança, o acesso aos ficheiros na partição do Windows é " "limitado ao administrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Insira uma disquete vazia no dispositivo %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "A criar disquete de auto-instalação..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1553,12 +1604,12 @@ msgstr "" "\n" "Deseja realmente sair agora?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Parabéns" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reiniciar" diff --git a/perl-install/install/share/po/pt_BR.po b/perl-install/install/share/po/pt_BR.po index 434b32cdd..365e441c8 100644 --- a/perl-install/install/share/po/pt_BR.po +++ b/perl-install/install/share/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-05-11 17:34-0300\n" "Last-Translator: Sergio Rafael Lemke \n" "Language-Team: Brazilian Portuguese \n" @@ -87,7 +87,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -101,88 +101,88 @@ msgstr "" "\n" "Deseja configurar alguma mídia adicional ?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rede (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rede (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rede (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL do Servidor?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "A URL deve começar com ftp:// ou http://" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Falha acessando o site do %s em busca da lista de servidores disponíveis" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Escolha um servidor de onde pegar os pacotes " -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configuração NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Hostname faltando" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "O diretório deve começar com \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Hostname do ponto de montagem NFS" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Diretório" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Suplementar" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -191,90 +191,90 @@ msgstr "" "Não encontro uma lista de pacotes neste servidor. Verifique se a localização " "está correta." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Pular todos os pacotes da mídia \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Verificando pacotes já instalados..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Encontrando pacotes para atualizar..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -287,72 +287,72 @@ msgstr "" "\n" "Realmente deseja remover estes pacotes?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Erro ao ler arquivo %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "O seguinte disco(s) foi renomeado:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (previamente chamado %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rede" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Escolha uma mídia" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "O arquivo já existe. Sobrescrevê-lo?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permissão negada" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nome NFS inválido" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Mídia %s ruim" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Não foi possível capturar telas antes de particionar" -#: any.pm:1363 +#: any.pm:1393 #, 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" @@ -362,7 +362,7 @@ msgstr "As captura de tela ficarão disponíveis depois da instalação em %s" msgid "Installation" msgstr "Instalação" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuração" @@ -461,42 +461,42 @@ msgstr "" "Alguns pacotes requeridos por %s não podem ser instalados:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Um erro ocorreu:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ocorreu um erro fatal: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Não pergunte novamente" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d Instalação Falhou" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Instalação dos programas falhou:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Estação de Trabalho" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Ambiente de Escritório" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -505,32 +505,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Estação de Jogos" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Estação Multimídia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Estação de Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -539,194 +539,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:40 #, c-format msgid "Network Computer (client)" msgstr "Computador de rede (cliente)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Ferramentas de Console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Desenvolvimento" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentação" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Suporte a aplicativos de terceiros" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Servidor Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Gateway Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-mail/Notícias" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Servidor de Diretório" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Servidor FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "" "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:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Banco de dados" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Servidor de e-mail Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Servidor de Rede" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Ambiente Gráfico" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Ambiente KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -735,12 +735,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:156 #, c-format msgid "GNOME Workstation" msgstr "Ambiente GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -748,12 +748,40 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Ambiente KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Um ambiente gráfico com um conjunto de aplicativos e ferramentas amigáveis" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Ambiente GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Estação de Trabalho" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambiente Gráfico" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Ambiente de Trabalho LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -762,53 +790,75 @@ msgstr "" "Um ambiente gráfico leve & rápido com uma coleção amigável de programas e " "ferramentas de desktop" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Desktop personalizado" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Um ambiente gráfico leve & rápido com uma coleção amigável de programas e " +"ferramentas de desktop" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Outros ambientes de Área de trabalho" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilitários" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Servidor SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Servidor de Configuração Remota Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilitários de Rede/Monitoramento" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Assistentes Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Assistentes para configurar o servidor" @@ -822,7 +872,7 @@ msgstr "" "Um erro ocorreu, mas não é possível tratá-lo.\n" "Continue por sua própria conta e risco." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -876,107 +926,107 @@ msgstr "Seleção de Mídia" msgid "Install %s KDE Desktop" msgstr "Instalar Desktop %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalar Desktop %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalação personalizada" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Desktop KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Desktop GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Desktop personalizado" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Aqui está uma prévia do ambiente '%s'." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Clique nas imagens para ampliá-las" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Seleção de Grupo de Pacotes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Seleção individual de pacotes" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Desmarcar Tudo" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Tamanho total: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versão: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Tamanho: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importância: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Você não pode selecionar/desmarcar este pacote" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "devido a falta de %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "devido a %s não-satisfeito(a)" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "tentando promover %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "a fim de manter %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -985,104 +1035,104 @@ msgstr "" "Você não pode selecionar esse pacote pois não existe espaço livre para " "instalá-lo" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostrar automaticamente os pacotes selecionados" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalar" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Carregar/Salvar seleção" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Atualizando seleção de pacotes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalação mínima" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gerenciamento de Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Escolha os pacotes que você quer instalar" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalando" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Sem detalhes" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Restam:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(estimando...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pacote" msgstr[1] "%d pacotes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Resumo" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurar" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "não configurado" @@ -1096,7 +1146,7 @@ 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:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1109,7 +1159,7 @@ msgstr "" "A instalação irá continuar a partir do seu disco rígido e os pacotes " "continuarão disponíveis após a instalação ser finalizada." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiar todos os CDs" @@ -1420,28 +1470,28 @@ msgstr "" "Você deseja instalar estas atualizações?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s em %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Placa de som" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Você tem alguma placa de som ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1450,74 +1500,74 @@ msgstr "" "Execute \"alsaconf\"ou \"sndconfig\" após a instalação para configurar sua " "placa de som" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interface gráfica" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rede & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurado" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nível de Segurança" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "Ativado" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "Desativado" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Preparando gerenciador de inicialização" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Preparando a instalação" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Aguarde, pode demorar um pouco..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1530,7 +1580,7 @@ msgstr "" "você precisará usar o BootX ou outros meios para inicializar sua máquina. O " "argumento do kernel para o sistema de arquivos raiz é: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1539,17 +1589,17 @@ msgstr "" "Neste nível de segurança, o acesso aos arquivos em partições Windows é " "restrita apenas para o administrador." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Insira um disquete vazio no drive %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Criando disquete de instalação automática..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1560,12 +1610,12 @@ msgstr "" "\n" "Você realmente quer sair agora?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Parabéns" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reiniciar" diff --git a/perl-install/install/share/po/ro.po b/perl-install/install/share/po/ro.po index 29e315fde..76f833c13 100644 --- a/perl-install/install/share/po/ro.po +++ b/perl-install/install/share/po/ro.po @@ -39,7 +39,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-04-05 10:00+0000\n" "Last-Translator: Florin Cătălin RUSSEN \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia-test/" @@ -107,7 +107,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -121,91 +121,91 @@ msgstr "" "\n" "Aveți un mediu de instalare suplimentar pe care doriți să-l configurați?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rețea (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rețea (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rețea (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Adresa URL a serverului alternativ?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Adresa URL trebuie să înceapă cu ftp:// sau http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Se contactează situl %s pentru obținerea listei de servere alternative " "disponibile ..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Nu s-a putut contacta situl %s pentru obținerea listei de servere " "alternative disponibile" -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Configurare NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Introduceți numele gazdei și directorului mediului NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Lipsește numele gazdei" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Directorul trebuie să înceapă cu \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Numele de gazdă al montajului NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Director" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Suplimentar" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -214,22 +214,22 @@ msgstr "" "Nu s-a găsit lista de pachete pe acest server alternativ. Asigurați-vă că " "adresa este corectă." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Ediția de bază" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Ediția nuanțată" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Ediția proprietară" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -238,22 +238,22 @@ msgstr "" "Anumite componente materiale din configurația de față necesită un microcod " "proprietar pentru funcționarea corectă a piloților." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Ar trebui să activați „%s”" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "„%s” conține aplicații proprietare.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -263,7 +263,7 @@ msgstr "" "(ex: unele plăci grafice ATI/AMD, unele plăci de rețea, unele plăci " "RAID, ...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -272,40 +272,40 @@ msgstr "" "„%s” conține aplicații care nu pot fi distribuite în toate țările din cauza " "brevetelor." -#: any.pm:359 +#: any.pm:381 #, 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:363 +#: any.pm:387 #, 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:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Acest mediu furnizează actualizări pentru mediul „%s”" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Se caută pachetele deja instalate..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Se caută pachetele de actualizat..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -319,72 +319,72 @@ msgstr "" "\n" "Chiar doriți înlăturarea acestor pachete?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Eroare la citirea fișierului %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Următoarele discuri au fost redenumite:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (denumit anterior %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rețea" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Alegeți un mediu" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fișierul există deja. Se suprascrie?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permisiune respinsă" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nume NFS greșit" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Mediu incorect %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nu se pot face capturi de ecran înainte de partiționare" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Capturile de ecran vor fi disponibile după instalare în %s" @@ -394,7 +394,7 @@ msgstr "Capturile de ecran vor fi disponibile după instalare în %s" msgid "Installation" msgstr "Instalare" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configurare" @@ -495,42 +495,42 @@ msgstr "" "Unele pachete cerute de %s nu pot fi instalate:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "S-a produs o eroare:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "A apărut o eroare fatală: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Nu mai întreba" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d operațiuni de instalare eșuate" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Instalarea pachetelor a eșuat:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Stație de lucru" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Calculator de birou" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -539,32 +539,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Stație de jocuri" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Stație multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Stație de Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -573,193 +573,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:40 #, c-format msgid "Network Computer (client)" msgstr "Calculator în rețea (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Unelte pentru a vă ușura configurarea calculatorului" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Unelte de consolă" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Dezvoltare" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentație" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Baza standard Linux. Suport pentru aplicații terțe." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Lucru colaborativ" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Pasarelă Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Poștă/Știri" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Server de anuar" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server de DNS și NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Bază de date" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Poștă electronică" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Serverul de poștă electronică Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Server în rețea" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Mediu grafic de lucru" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Stație de lucru KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -767,24 +767,51 @@ 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:156 #, c-format msgid "GNOME Workstation" msgstr "Stație de lucru Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Stație de lucru KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "Un mediu grafic cu un set de aplicații prietenoase și unelte de birou" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Stație de lucru Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Stație de lucru" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Mediu grafic de lucru" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Birou LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -793,52 +820,74 @@ msgstr "" "Un mediu grafic lejer și rapid cu un set de aplicații prietenoase și unelte " "de birou" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Birou personalizat" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Un mediu grafic lejer și rapid cu un set de aplicații prietenoase și unelte " +"de birou" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Alte medii grafice" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utilitare" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Serverul de configurare distantă Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Utilitare rețea/Supraveghere" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Asistenții Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Asistenți pentru configurarea de server" @@ -852,7 +901,7 @@ msgstr "" "S-a produs o eroare, dar nu poate fi interpretată în mod corect.\n" "Continuați pe propriul risc." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -908,107 +957,107 @@ msgstr "Selectare mediu" msgid "Install %s KDE Desktop" msgstr "Instalează biroul %s KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Instalează biroul %s GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Instalare personalizată" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Birou KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Birou GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Birou personalizat" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Iată o previzualizare a biroului „%s”." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Selectare grupuri de pachete" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Selectare individuală a pachetelor" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Deselectează tot" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Mărime totală: %d / %d Mo" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versiune: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Mărime: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Ko\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importanță: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Nu puteți selecta/deselecta acest pachet" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "datorită lipsei lui %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "datorită dependenței nesatisfăcute %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "se încearcă promovarea lui %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "pentru a păstra %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -1017,87 +1066,87 @@ msgstr "" "Nu puteți selecta acest pachet pentru că nu este destul spațiu pentru a-l " "instala" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Următoarele pachetele vor instalate" -#: steps_gtk.pm:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Acesta este un pachet indispensabil și nu poate fi deselectat" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Nu puteți deselecta acest pachet. Este deja instalat" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Nu puteți deselecta acest pachet. Trebuie actualizat." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Arată pachetele selectate automat" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalare" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Încarcă/Salvează selecția" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Actualizare pachete selectate" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalare minimalistă" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Gestionare aplicații" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Alegeți pachetele pe care doriți să le instalați" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Se instalează" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Fără detalii" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Timp rămas: " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(se estimează...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" @@ -1105,17 +1154,17 @@ msgstr[0] "%d pachete" msgstr[1] "%d pachet" msgstr[2] "%d pachete" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sumar" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configurează" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "neconfigurat" @@ -1129,7 +1178,7 @@ msgstr "" "Au fost găsite următoarele medii de instalare.\n" "Dacă doriți să săriți peste unele din ele, le puteți deselecta acum." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1142,7 +1191,7 @@ msgstr "" "Se va continua de pe discul dur, iar pachetele vor rămîne disponibile după " "instalarea sistemului." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copiază CD-urile în întregime" @@ -1453,28 +1502,28 @@ msgstr "" "Doriți să instalați actualizările?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s pe %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Componente materiale" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Placă de sunet" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Aveți o placă de sunet ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1483,74 +1532,74 @@ msgstr "" "Lansați „alsaconf” sau „sndconfig” după instalare pentru a vă configura " "placa de sunet" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfață grafică" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rețea & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Servere proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "configurat" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel de securitate" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Parafoc" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "activat" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "dezactivat" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Se pregătește încărcătorul de sistem..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Se pregătește pornirea programului inițial..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Aveți răbdare, va dura ceva timp..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1563,7 +1612,7 @@ msgstr "" "utilizați BootX sau alte mijloace pentru a porni sistemul. Argumentul de " "nucleu pentru sistemul de fișiere rădăcină este: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1572,17 +1621,17 @@ msgstr "" "La acest nivel de securitate, accesul la fișierele de pe partiția Windows " "este permis doar administratorului." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Introduceți o dischetă goală în unitatea %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Se creează discheta de auto-instalare..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1593,12 +1642,12 @@ msgstr "" "\n" "Chiar vreți să abandonați acum?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Felicitări" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Repornește" diff --git a/perl-install/install/share/po/ru.po b/perl-install/install/share/po/ru.po index b50e4db8d..d0f5c5005 100644 --- a/perl-install/install/share/po/ru.po +++ b/perl-install/install/share/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-03 17:37-0000\n" "Last-Translator: AlexL \n" "Language-Team: Russian \n" @@ -80,7 +80,7 @@ msgid "Do you have further supplementary media?" msgstr "Есть дополнительный носитель?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,173 +88,200 @@ msgid "" "\n" "Do you have a supplementary installation medium to configure?" msgstr "" -"Был найден следующий носитель, который будет использован во время установки: %s.\n" +"Был найден следующий носитель, который будет использован во время установки: " +"%s.\n" "\n" "\n" "Если ли дополнительный носитель для настройки?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Сеть (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Сеть (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Сеть (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Адрес зеркала?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Адрес должен начинаться с ftp:// или http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." -msgstr "Устанавливается соединение с веб-сайтом %s для загрузки списка доступных пакетов..." +msgstr "" +"Устанавливается соединение с веб-сайтом %s для загрузки списка доступных " +"пакетов..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" -msgstr "Не удалось соединиться с веб-сайтом %s, чтобы загрузить список доступных зеркал" +msgstr "" +"Не удалось соединиться с веб-сайтом %s, чтобы загрузить список доступных " +"зеркал" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Выберите зеркало, с которого будут загружены пакеты" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Настройка NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Укажите имя компьютера и каталог ресурса NFS" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Не указано имя компьютера" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Имя каталога должно начинаться с \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Имя компьютера для монтирования NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Каталог" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Дополнительный" -#: any.pm:301 +#: any.pm:303 #, c-format -msgid "Can't find a package list file on this mirror. Make sure the location is correct." -msgstr "Невозможно найти список пакетов на этом зеркале. Проверьте правильность адреса." +msgid "" +"Can't find a package list file on this mirror. Make sure the location is " +"correct." +msgstr "" +"Невозможно найти список пакетов на этом зеркале. Проверьте правильность " +"адреса." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format -msgid "Some hardware on your machine needs some non free firmwares in order for the free software drivers to work." -msgstr "Для работы части оборудования на компьютере следует установить микропрограммы с закрытым кодом, необходимые для работы драйверов с открытым кодом." +msgid "" +"Some hardware on your machine needs some non free firmwares in order for the " +"free software drivers to work." +msgstr "" +"Для работы части оборудования на компьютере следует установить " +"микропрограммы с закрытым кодом, необходимые для работы драйверов с открытым " +"кодом." -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "Следует включить \"%s\"" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "В \"%s\" содержатся различные части операционной системы и её программ" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "В \"%s\" содержатся несвободные программы.\n" -#: any.pm:357 +#: any.pm:379 #, c-format -msgid "It also contains firmwares needed for certain devices to operate (eg: some ATI/AMD graphic cards, some network cards, some RAID cards, ...)" -msgstr "Там также содержатся пакеты с микрокодом, необходимым для работы некоторых устройств (например, некоторых видеокарт ATI/AMD, некоторых сетевых карт, некоторых карт RAID, ...)" +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:358 +#: any.pm:380 #, c-format -msgid "\"%s\" contains software that can not be distributed in every country due to software patents." -msgstr "В \"%s\" содержатся пакеты с программным обеспечением, которое нельзя свободно распространять в некоторых странах из-за нарушения патентных прав на это программное обеспечение." +msgid "" +"\"%s\" contains software that can not be distributed in every country due to " +"software patents." +msgstr "" +"В \"%s\" содержатся пакеты с программным обеспечением, которое нельзя " +"свободно распространять в некоторых странах из-за нарушения патентных прав " +"на это программное обеспечение." -#: any.pm:359 +#: any.pm:381 #, c-format -msgid "It also contains software from \"%s\" rebuild with additional capabilities." -msgstr "Также в \"%s\" содержатся пакеты, собранные с дополнительными возможностями, использование которых ограничивается патентами." +msgid "" +"It also contains software from \"%s\" rebuild with additional capabilities." +msgstr "" +"Также в \"%s\" содержатся пакеты, собранные с дополнительными возможностями, " +"использование которых ограничивается патентами." -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "Здесь вы можете включить дополнительные хранилища, если это вам нужно." -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "В этом источнике содержатся обновления пакетов из источника \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Выполняется поиск установленных пакетов..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Выполняется поиск пакетов для обновления..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Удаляются пакеты перед обновлением..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -267,73 +294,72 @@ msgstr "" "\n" "Удалить эти пакеты?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Ошибка при чтении файла %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Следующие диски были переименованы:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ранее назывался %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 -#: steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Сеть" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Выберите носитель" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Файл уже существует. Переписать его?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Доступ запрещён" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Неверное имя NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Неверный источник %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Невозможно создать скриншоты перед разметкой диска" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "После установки скриншоты будут находиться в каталоге %s" @@ -343,8 +369,7 @@ msgstr "После установки скриншоты будут находи msgid "Installation" msgstr "Установка" -#: gtk.pm:132 -#: share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Настройка" @@ -427,7 +452,9 @@ msgstr "Получения данных о пакетах из метаданн #: pkgs.pm:111 #, c-format msgid "No xml info for medium \"%s\", only partial result for package %s" -msgstr "для источника «%s» отсутствует xml-info; для пакета %s получен только частичный результат" +msgstr "" +"для источника «%s» отсутствует xml-info; для пакета %s получен только " +"частичный результат" #: pkgs.pm:119 #, c-format @@ -443,345 +470,404 @@ msgstr "" "Некоторые пакеты, запрошенные %s, не могут быть установлены:\n" "%s" -#: pkgs.pm:382 -#: pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Произошла ошибка:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Произошла критическая ошибка: %s." -#: pkgs.pm:891 -#: pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Больше не спрашивать" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d установочных транзакций не удались" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Не удалось установить пакет:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Рабочая станция" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Офисная рабочая станция" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format -msgid "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc" -msgstr "Офисные программы: текстовые процессоры (LibreOffice Writer, Kword), электронные таблицы (LibreOffice Calc, Kspread), программы для просмотра pdf и т.д." +msgid "" +"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " +"(LibreOffice Calc, Kspread), PDF viewers, etc" +msgstr "" +"Офисные программы: текстовые процессоры (LibreOffice Writer, Kword), " +"электронные таблицы (LibreOffice Calc, Kspread), программы для просмотра pdf " +"и т.д." -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Игровой компьютер" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Развлекательные программы: аркады, настольные игры, стратегии и т.д." -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мультимедийный компьютер" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Программы для воспроизведения/редактирования звука и видео" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Интернет-компьютер" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format -msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web" -msgstr "Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга" +msgid "" +"Set of tools to read and send mail and news (mutt, tin..) and to browse the " +"Web" +msgstr "" +"Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Сетевой компьютер (клиент)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Клиенты для различных протоколов, включая ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Утилиты для облегчения настройки компьютера" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Утилиты для консоли" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Редакторы, командные оболочки, файловые утилиты, терминалы" -#: share/meta-task/compssUsers.pl:53 -#: share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Разработка" -#: share/meta-task/compssUsers.pl:54 -#: share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Библиотеки для разработки на C и C++, программы и заголовочные файлы" -#: share/meta-task/compssUsers.pl:57 -#: share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документация" -#: share/meta-task/compssUsers.pl:58 -#: share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Книги и документация по Linux и свободному программному обеспечению" -#: share/meta-task/compssUsers.pl:62 -#: share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 -#: share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Поддержка приложений сторонних разработчиков." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб-сервер" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "ПО для совместной работы" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Сервер Kolab" -#: share/meta-task/compssUsers.pl:80 -#: share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Файервол/Маршрутизатор" -#: share/meta-task/compssUsers.pl:81 -#: share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет-шлюз" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Почта/Новости" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Почтовый сервер Postfix, сервер новостей Inn" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Служба каталогов" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Сервер FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Сервер доменных имен и сетевые информационные службы (NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Сервер общего доступа к файлам и принтерам" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Сервер NFS, сервер Samba" -#: share/meta-task/compssUsers.pl:104 -#: share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "База данных" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Сервер баз данных PostgreSQL и MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Веб/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Почта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Почтовый сервер Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Сервер баз данных PostgreSQL или MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Сетевой сервер" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "Cервер NFS, сервер SMB, прокси-сервер, сервер SSH" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Графическое окружение" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Рабочая станция KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format -msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" -msgstr "K Desktop Environment - основная графическая среда с коллекцией сопроводительных утилит" +msgid "" +"The K Desktop Environment, the basic graphical environment with a collection " +"of accompanying tools" +msgstr "" +"K Desktop Environment - основная графическая среда с коллекцией " +"сопроводительных утилит" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Рабочая станция Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format -msgid "A graphical environment with user-friendly set of applications and desktop tools" -msgstr "Графическая среда с удобным для пользователя набором приложений и утилит рабочего стола" +msgid "" +"A graphical environment with user-friendly set of applications and desktop " +"tools" +msgstr "" +"Графическая среда с удобным для пользователя набором приложений и утилит " +"рабочего стола" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Рабочая станция KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Графическая среда с удобным для пользователя набором приложений и утилит " +"рабочего стола" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Рабочая станция Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Рабочая станция" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Графическое окружение" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "Рабочий стол LXDE" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 +#, c-format +msgid "" +"A lightweight & fast graphical environment with user-friendly set of " +"applications and desktop tools" +msgstr "" +"Простая и быстрая графическая среда с удобным для пользователя набором " +"приложений и настольными программами" + +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Другой рабочий стол" + +#: share/meta-task/compssUsers.pl:185 #, c-format -msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools" -msgstr "Простая и быстрая графическая среда с удобным для пользователя набором приложений и настольными программами" +msgid "A less developed lightweight fast graphical environment" +msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Простая и быстрая графическая среда с удобным для пользователя набором " +"приложений и настольными программами" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Другие графические рабочие столы" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm и т.п." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Утилиты" -#: share/meta-task/compssUsers.pl:175 -#: share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Сервер SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Сервер удалённой настройки Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Сетевые утилиты/Мониторинг" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Утилиты мониторинга, учёт процессов, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Мастеры настройки Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Мастеры настройки сервера" @@ -795,19 +881,20 @@ msgstr "" "Произошла ошибка, но я не знаю, как её корректно обработать.\n" "Продолжайте на свой собственный страх и риск." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" +"\"\n" msgstr "" "Некоторые важные пакеты установились некорректно.\n" "Повреждён привод CDROM или компакт-диск.\n" -"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/main/*.rpm\"\n" +"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/" +"main/*.rpm\"\n" -#: steps_auto_install.pm:71 -#: steps_stdio.pm:27 +#: steps_auto_install.pm:71 steps_stdio.pm:27 #, c-format msgid "Entering step `%s'\n" msgstr "Выполняется переход на этап `%s'\n" @@ -839,8 +926,7 @@ msgstr "" "текстовом режиме. Для этого после загрузки с диска нажмите `F1',\n" "а затем наберите 'text'." -#: steps_gtk.pm:240 -#: steps_gtk.pm:757 +#: steps_gtk.pm:240 steps_gtk.pm:757 #, c-format msgid "Media Selection" msgstr "Выбор источника" @@ -850,226 +936,216 @@ msgstr "Выбор источника" msgid "Install %s KDE Desktop" msgstr "Установить %s рабочий стол KDE" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Установить %s рабочий стол GNOME" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Выборочная установка" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "Рабочий стол KDE" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Рабочий стол GNOME" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Другой рабочий стол" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Это предварительный вид рабочего стола '%s." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Щёлкните картинку, чтобы увеличить её" -#: steps_gtk.pm:319 -#: steps_interactive.pm:633 -#: steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Выбор групп пакетов" -#: steps_gtk.pm:344 -#: steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Выбор отдельных пакетов" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Снять выделение со всех" -#: steps_gtk.pm:370 -#: steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Общий объём: %d / %d МБ" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Версия:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Размер:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d КБ\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Важность: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Этот пакет нельзя выбрать/отменить" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "из-за отсутствия %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "из-за неудовлетворенных %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "выполняется попытка активизировать %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "чтобы сохранить %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format -msgid "You cannot select this package as there is not enough space left to install it" +msgid "" +"You cannot select this package as there is not enough space left to install " +"it" msgstr "Этот пакет нельзя выбрать, т.к. для его установки не хватает места" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Будут установлены следующие пакеты " -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Будут удалены следующие пакеты " -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Этот пакет является обязательным, его нельзя пропустить" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Этот пакет нельзя убрать, потому что он уже установлен" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Этот пакет нельзя убрать, потому что он должен быть обновлен" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Показывать автоматически выбранные пакеты" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Установить" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Загрузить/Сохранить выбор" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Обновляется выбор пакетов" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Минимальная установка" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Управление ПО" -#: steps_gtk.pm:531 -#: steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Выберите пакеты, которые нужно установить" -#: steps_gtk.pm:548 -#: steps_interactive.pm:670 -#: steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Установка" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Убрать подробности" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Оставшееся время:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(вычисляется...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d пакет" msgstr[1] "%d пакетов" -#: steps_gtk.pm:683 -#: steps_interactive.pm:834 -#: steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Сводка" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Настройка" -#: steps_gtk.pm:719 -#: steps_interactive.pm:830 -#: steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "не настроен" -#: steps_gtk.pm:766 -#: steps_interactive.pm:343 +#: steps_gtk.pm:766 steps_interactive.pm:343 #, c-format msgid "" "The following installation media have been found.\n" @@ -1078,18 +1154,20 @@ msgstr "" "Найдены следующие источники для установки.\n" "Если нужно пропустить некоторые из них, сейчас с них можно снять флажки." -#: steps_gtk.pm:778 -#: steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" -"You have the option to copy the contents of the CDs onto the hard disk drive before installation.\n" -"It will then continue from the hard disk drive and the packages will remain available once the system is fully installed." +"You have the option to copy the contents of the CDs onto the hard disk drive " +"before installation.\n" +"It will then continue from the hard disk drive and the packages will remain " +"available once the system is fully installed." msgstr "" -"Содержимое компакт-диска перед установкой можно скопировать на жёсткий диск.\n" -"После этого установка продолжится с жёсткого диска, и пакеты будут доступны после полной установки системы." +"Содержимое компакт-диска перед установкой можно скопировать на жёсткий " +"диск.\n" +"После этого установка продолжится с жёсткого диска, и пакеты будут доступны " +"после полной установки системы." -#: steps_gtk.pm:780 -#: steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Целиком скопировать компакт-диски" @@ -1167,7 +1245,8 @@ msgstr "" "\n" "Рекомедуется заново установить систему, заменив существующую.\n" "\n" -"Внимание: вы должны сделать копию всех ваших персональных данных, перед выбором \"Новая\n" +"Внимание: вы должны сделать копию всех ваших персональных данных, перед " +"выбором \"Новая\n" "Установка\"." #: steps_interactive.pm:264 @@ -1182,25 +1261,38 @@ msgstr "Настраивается IDE" #: steps_interactive.pm:301 #, c-format -msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" -msgstr "Недостаточно свободного места для программы самозагрузки! Установка продолжится, но для загрузки системы будет необходимо создать раздел начальной загрузки в DiskDrake" +msgid "" +"No free space for 1MB bootstrap! Install will continue, but to boot your " +"system, you'll need to create the bootstrap partition in DiskDrake" +msgstr "" +"Недостаточно свободного места для программы самозагрузки! Установка " +"продолжится, но для загрузки системы будет необходимо создать раздел " +"начальной загрузки в DiskDrake" #: steps_interactive.pm:306 #, c-format -msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" -msgstr "Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но для загрузки системы нужно будет создать раздел начальной загрузки в DiskDrake" +msgid "" +"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but " +"to boot your system, you'll need to create the bootstrap partition in " +"DiskDrake" +msgstr "" +"Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но " +"для загрузки системы нужно будет создать раздел начальной загрузки в " +"DiskDrake" #: steps_interactive.pm:382 #, c-format msgid "" "Change your Cd-Rom!\n" -"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n" +"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when " +"done.\n" "If you do not have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" "Смените компакт-диск!\n" "\n" "Вставьте в привод компакт-диск под названием \"%s\", а затем нажмите 'ОК'.\n" -"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого диска." +"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого " +"диска." #: steps_interactive.pm:400 #, c-format @@ -1209,8 +1301,12 @@ msgstr "Поиск доступных пакетов..." #: steps_interactive.pm:408 #, c-format -msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)" -msgstr "В вашей системе недостаточно свободного дискового пространства для установки или обновления (%d МБ > %d МБ)" +msgid "" +"Your system does not have enough space left for installation or upgrade " +"(%dMB > %dMB)" +msgstr "" +"В вашей системе недостаточно свободного дискового пространства для установки " +"или обновления (%d МБ > %d МБ)" #: steps_interactive.pm:456 #, c-format @@ -1355,8 +1451,7 @@ msgstr "Настройка после установки" msgid "Please ensure the Update Modules media is in drive %s" msgstr "Проверьте наличие носителя 'Update Modules' в устройстве %s" -#: steps_interactive.pm:767 -#: steps_list.pm:47 +#: steps_interactive.pm:767 steps_list.pm:47 #, c-format msgid "Updates" msgstr "Обновления" @@ -1383,124 +1478,137 @@ msgstr "" "Установить эти обновления?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:910 -#: steps_interactive.pm:917 -#: steps_interactive.pm:930 -#: steps_interactive.pm:947 -#: steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Оборудование" -#: steps_interactive.pm:931 -#: steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Звуковая карта" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Есть ли у вас звуковая карта ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format -msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card" -msgstr "Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" или \"sndconfig\"." +msgid "" +"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " +"card" +msgstr "" +"Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" " +"или \"sndconfig\"." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" -msgstr "Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту \"harddrake\" " +msgstr "" +"Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту " +"\"harddrake\" " -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графический интерфейс" -#: steps_interactive.pm:969 -#: steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Сеть и Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Прокси" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "настроен" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Уровень безопасности" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Файервол" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "включен" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "выключен" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Х-сервер ещё не настроен. Вы точно уверены в своих действиях?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Подготавливается начальный загрузчик..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Подготовка начального загрузчика..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Подождите, это может занять некоторое время..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format -msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s" -msgstr "Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на которой начальный загрузчик 'yaboot' не будет работать. Установка продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или какой-то другой. Параметр ядра для корневой файловой системы: root=%s" +msgid "" +"You appear to have an OldWorld or Unknown machine, the yaboot bootloader " +"will not work for you. The install will continue, but you'll need to use " +"BootX or some other means to boot your machine. The kernel argument for the " +"root fs is: root=%s" +msgstr "" +"Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на " +"которой начальный загрузчик 'yaboot' не будет работать. Установка " +"продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или " +"какой-то другой. Параметр ядра для корневой файловой системы: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format -msgid "In this security level, access to the files in the Windows partition is restricted to the administrator." -msgstr "На данном уровне безопасности доступ к файлам на разделе Windows разрешён только администратору. " +msgid "" +"In this security level, access to the files in the Windows partition is " +"restricted to the administrator." +msgstr "" +"На данном уровне безопасности доступ к файлам на разделе Windows разрешён " +"только администратору. " -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Вставьте чистую дискету в дисковод %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Создается дискета автоматической установки..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1511,12 +1619,12 @@ msgstr "" "\n" "Действительно завершить работу?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Поздравляем" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Перезагрузка" @@ -1529,8 +1637,7 @@ msgid "" "Language" msgstr "Выбор языка" -#: steps_list.pm:16 -#: steps_list.pm:23 +#: steps_list.pm:16 steps_list.pm:23 #, c-format msgid "Localization" msgstr "Локализация" @@ -1549,16 +1656,14 @@ msgid "" "Mouse" msgstr "Мышь" -#: steps_list.pm:19 -#: steps_list.pm:20 +#: steps_list.pm:19 steps_list.pm:20 #, c-format msgid "" "_: Keep these entry short\n" "Hard drive detection" msgstr "Поиск жёсткого диска" -#: steps_list.pm:21 -#: steps_list.pm:22 +#: steps_list.pm:21 steps_list.pm:22 #, c-format msgid "" "_: Keep these entry short\n" @@ -1586,8 +1691,7 @@ msgid "" "Partitioning" msgstr "Разметка диска" -#: steps_list.pm:27 -#: steps_list.pm:28 +#: steps_list.pm:27 steps_list.pm:28 #, c-format msgid "" "_: Keep these entry short\n" @@ -1615,16 +1719,14 @@ msgid "" "Users" msgstr "Пользователи" -#: steps_list.pm:38 -#: steps_list.pm:39 +#: steps_list.pm:38 steps_list.pm:39 #, c-format msgid "" "_: Keep these entry short\n" "Bootloader" msgstr "Загрузчик" -#: steps_list.pm:40 -#: steps_list.pm:41 +#: steps_list.pm:40 steps_list.pm:41 #, c-format msgid "" "_: Keep these entry short\n" @@ -1638,8 +1740,7 @@ msgid "" "Summary" msgstr "Сводка" -#: steps_list.pm:44 -#: steps_list.pm:45 +#: steps_list.pm:44 steps_list.pm:45 #, c-format msgid "" "_: Keep these entry short\n" diff --git a/perl-install/install/share/po/sc.po b/perl-install/install/share/po/sc.po index 32b2df0b9..9752c7f4c 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-09-14 11:29+0100\n" "Last-Translator: Antoni Pistis \n" "Language-Team: Sardu\n" @@ -72,7 +72,7 @@ msgid "Do you have further supplementary media?" msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -81,177 +81,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Arretza (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Arretza (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Arretza (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL de su sprigu?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Cuntatu su jassu web de %s po tenni sa lista de is sprigus..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Assètiu NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directory" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Càstiu is pakitus jai aposentaus..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Agatu is pakitus po ajorronai..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -260,72 +260,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Faddina ligendi su file %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Apu arrenominau is discus ki sighint:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (innantis nominau %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Arretza" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Sçobera unu suportu, po praxeri" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Su file esistit jai. Nci scriu apitzus?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permissu dennegau" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "No fait a fai fotografias innantis de pratzidurai" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "As a podi biri is fotografias apustis de s'aposentada in %s" @@ -335,7 +335,7 @@ msgstr "As a podi biri is fotografias apustis de s'aposentada in %s" msgid "Installation" msgstr "Seu aposentendi" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Assètiu" @@ -431,343 +431,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Faddina" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Faddina mortali: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transatzionis de aposentadura faddias" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Workstation" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "Intrenatzionallisadura" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "Informàtiga" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, fuzzy, c-format msgid "Console Tools" msgstr "Console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Adelantamentu" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documentadura" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Traballu in Grupu" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Gateway po Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Curreu/Noas" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Server de Directory" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Server NFS, server Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Server po Database PostGreSQL e MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Curreu" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Server de curreu Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Server po Database PostGreSQL e MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "Informàtiga" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Ambienti Gràfigu" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Workstation" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME Workstation" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Workstation" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME Workstation" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Workstation" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Ambienti Gràfigu" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Atras scrianias gràfigas" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "" @@ -781,7 +828,7 @@ msgstr "" "Faddina. No sciu comenti ndi bessiri beni.\n" "Sighi a perìgulu tuu." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -828,107 +875,107 @@ msgstr "Càrriga/Sarva su sçoberu" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Aposentadura minimali" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Sçoberu pakitus unu a unu" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Mesura totali: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versioni: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Mesura: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Importu: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "No podis scerai/disiscerai custu pakitu" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "ca amancat %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "ca no est satisfatu %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "provu a sçoberai %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "po podi apoderai %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -936,104 +983,104 @@ msgid "" msgstr "" "No podis sçoberai custu pakitu, ca no dui at spàtziu abasta po d'aposentai" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "No fait a disiscerai custu pakitu. Est jai aposentau" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "No fait a disiscerai custu pakitu. Bolit ajorronau" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Amosta in automàtigu is pakitus sçoberaus" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Aposenta" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Càrriga/Sarva su sçoberu" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ajorronu su sçoberu de is pakitus" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Aposentadura minimali" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Maniju de is programas" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Sçobera is pakitus ki bolis aposentai" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Seu aposentendi" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Tempus ki abarrat " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Seu carculendi" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Arresùmini" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Assètia" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "no assetiau" @@ -1045,7 +1092,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1054,7 +1101,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Còpia totu is CD" @@ -1335,101 +1382,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s in %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Skeda de Sonu" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Tenis una skeda de sonu ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaci Gràfiga" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Arretza & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "assetiau" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Arrasu de Siguresa" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "abivau" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "disabivau" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Apariçu su bootloader..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Apariçu s'aposentadura" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1438,24 +1485,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Intra unu floppy sbuidu in su trastu %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1463,12 +1510,12 @@ msgid "" "Do you really want to quit now?" msgstr "" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Cumprimentus" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Torra a allui" diff --git a/perl-install/install/share/po/sk.po b/perl-install/install/share/po/sk.po index 44235fb5d..9752f6e00 100644 --- a/perl-install/install/share/po/sk.po +++ b/perl-install/install/share/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-09-21 14:03+0100\n" "Last-Translator: Tibor Pittich \n" "Language-Team: \n" @@ -73,7 +73,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,177 +82,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Sieť (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Sieť (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Sieť (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL zrkadliaceho servera" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Pripájam sa k web stránke %s pre stiahnutie zoznamu zrkadiel..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Vyberte miror, z ktorého si chcete stiahnuť balíky" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Nastavenie NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Meno hostiteľa pre NFS bod pripojenia ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Priečinok" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Nie je možné nájsť súbor hdlist na tomto zrkadliacom servery" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Hľadám balíky, ktoré sú už nainštalované..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Hľadám balíky pre aktualizáciu..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -266,72 +266,72 @@ msgstr "" "\n" "Chcete naozaj tieto balíky odinštalovať?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "chyba pri čítaní zo súboru %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Nasledovné disky boli premenované:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (predtým ako %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Sieť" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Vyberte si zdroj" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Súbor už existuje. Prepísať?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Prístup zamietnutý" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Nesprávne NFS meno" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Zlý zdroj %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Nemôžem spraviť kópie obrazovky pred rozdelením disku" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Kópie obrazovky budú po inštalácii dostupné v %s" @@ -341,7 +341,7 @@ msgstr "Kópie obrazovky budú po inštalácii dostupné v %s" msgid "Installation" msgstr "Inštalujem" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurácia" @@ -437,42 +437,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Vyskytla sa chyba" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Nastala fatálna chyba: %s" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Nepýtať sa znovu" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d inštalačná transakcia zlyhala" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Inštaluje sa balík %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Pracovná stanica" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kancelárska stanica" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -481,32 +481,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Hracia stanica" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediálna stanica" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internetová stanica" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -515,193 +515,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:40 #, c-format msgid "Network Computer (client)" msgstr "Sieťovy počítač (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Klientovia pre rôzne protokoly vrátane ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Nástroje na jednoduchú konfiguráciu vášho počítača" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konzolové nástroje" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, 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:57 share/meta-task/compssUsers.pl:203 #, 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentácia" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Aplikačná podpora od tretej strany" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web server" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Brána k Internetu" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Mail/News" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix poštový systém, Inn news server" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Adresárový server" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server doménových mien a sieťový informačný server (NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS server, Samba server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Databázy" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Databázový server PostgreSQL a MariaDB" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache a Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix mail server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL, alebo MariaDB databázový server" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Sieťový server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, SSH server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafické prostredie" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE pracovná stanica" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -709,76 +709,123 @@ msgid "" msgstr "" "K Desktop Enviroment, grafické prostredie s množstvom pribalených programov" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME pracovná stanica" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE pracovná stanica" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME pracovná stanica" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Pracovná stanica" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafické prostredie" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Pracovná plocha IceWm" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Pracovná plocha IceWm" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Iné grafické prostredia" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, atď" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Utility" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Vzdialená konfigurácia servera pomocou Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Sieťové utility/Monitoring" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Sprievodcovia Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Sprievodcovia pre konfiguráciu servera" @@ -792,7 +839,7 @@ msgstr "" "Vyskytla sa chyba a neviem ju úplne vyriešiť.\n" "Pokračujte na vlastnú zodpovednosť." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -845,107 +892,107 @@ msgstr "Výber skupín balíkov" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimálna inštalácia" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Pracovná plocha IceWm" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Pracovná plocha IceWm" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Pracovná plocha IceWm" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Výber skupín balíkov" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Osobitná voľba balíkov" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Odznačiť všetky" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Celková veľkosť: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verzia:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Veľkosť:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Dôležitosť:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Môžete označiť/odznačiť tento balík" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "kôli chýbajúcemu %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "z dôvodu neuspokojenia %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "pokus o povýšenie %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "v prípade zachovania %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -953,87 +1000,87 @@ msgid "" msgstr "" "Nemôžete označiť tento balík pretože na jeho inštaláciu nie je dosť miesta." -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Nemôžete odznačiť tento balík. Musíte pridať novú verziu" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Zobraziť automaticky zvolené balíky" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Inštalácia" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Načítať/Uložiť výber " -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Aktualizácia výberu balíkov" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimálna inštalácia" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Správa softvéru" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Zvoľte balíky, ktoré si želáte nainštalovať" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Inštalujem" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Bez detailov" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Zvyšný čas " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Odhadujem" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1041,17 +1088,17 @@ msgstr[0] "%d balíky" msgstr[1] "%d balíky" msgstr[2] "%d balíky" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Zhrnutie" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurovať" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nenakonfigurované" @@ -1065,7 +1112,7 @@ msgstr "" "Nasledovné inštalačné médiá boli nájdené.\n" "Ak nechcete niektoré z nich použiť, odznačte ich teraz." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1077,7 +1124,7 @@ msgstr "" "Potom bude inštalácia pokračovať z pevného disku a balíky budú dostupné aj " "po kompletnej inštalácii." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopírovať kompletné CD" @@ -1379,28 +1426,28 @@ msgstr "" "Želáte si nainštalovať aktualizácie balíčkov?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardvér" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Zvuková karta" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Máte nejakú ISA zvukovú kartu?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1409,73 +1456,73 @@ msgstr "" "Po inštalácii spustite \"alsaconf\" alebo \"sndconfig\" ak chcete nastaviť " "zvukovú kartu" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafické rozhranie" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Sieť a Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "nakonfigurované" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Úroveň bezpečnosti" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivované" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "zakázané" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Pripravuje sa zavádzač..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pripravuje sa inštalácia" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1488,7 +1535,7 @@ msgstr "" "BootX pre štartovanie vášho počítača. Argument pre jadro s umiestnením " "koreňového súborového systému je: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1497,17 +1544,17 @@ msgstr "" "Vrámci tejto bezpečnostnej úrovne je prístup k súborom na Windows oblasti " "umožnený iba pre administrátora." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Vložte čistú disketu do mechaniky %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Pripravuje sa autoinštalačná disketa..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1518,12 +1565,12 @@ msgstr "" "\n" "Naozaj chcete teraz skončiť?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulujeme" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Reštart" diff --git a/perl-install/install/share/po/sl.po b/perl-install/install/share/po/sl.po index b5d2599bf..65a0eabfe 100644 --- a/perl-install/install/share/po/sl.po +++ b/perl-install/install/share/po/sl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-04 12:10+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" "Language-Team: Albanian \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "A posedoni ndonjë tjetër?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,177 +82,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Rrjeti %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Rrjeti %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Lidhje në sitin %s për të pranuar listën e lirë të pasqyreve..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed 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:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Repertori" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Nuk mund ta gjejë %s në %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Kërkimi i pakove veqse të instaluara..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Gjetja pakove azhurnuese..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -265,72 +265,72 @@ msgstr "" "\n" "Me të vërtetë dëshironi ti zhdukni?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Gabim gjatë leximit të skedares %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "Pakot e radhitura duhet të instalohen:\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rrjeti" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Ju lutemi zgjedheni" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Skedarje është veqse prezente. Përdoreni atë?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Autorizim i pa pranuar" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "shtuarja e burimit %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "E pa mundur grabitja e ekranit (screenshots) para ndarjeve" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -341,7 +341,7 @@ msgstr "" msgid "Installation" msgstr "Instalimi" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfigurimi" @@ -438,42 +438,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Një gabim është paraqitur" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Një gabim fatal është paraqitur: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Mos pyesni përsëri" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "Instalimi i transmetimit të %d dështio" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instalimi i pakove %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Stacion punues" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Stacioni Punues në Tryezë" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -482,32 +482,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Stacion Lojërash" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Stacion Multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Stacion Interneti" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -516,193 +516,193 @@ msgstr "" "Përgjithësia a veglave të leximit, dërgimit të letrave elektronike të " "lajmeve (pine, mutt, tin...) dhe për të lundruar në internet." -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Kompjuter Rrjeti (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Vegla në konsolë" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Zhvillimi" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacioni" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Server Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "Grupi" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Portë kaluese Interneti" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/Skedare/_E Re" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "Server i letrave (mail) Postfix" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Riparoje Nga CD" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Server FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Server i Emrit (DNS) dhe Server i Informacionit (NIS)" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Server Stampues" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Bazë e të dhënave" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "Server PostgreSQL apo MariaDB i bazës së të dhënave" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Server i letrave (mail) Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Server Kompjuter Rrjeti" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Mjedis Grafikë" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Stacioni punues KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -710,12 +710,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:156 #, c-format msgid "GNOME Workstation" msgstr "Stacioni punues Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -724,12 +724,41 @@ 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 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Stacioni punues KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe " +"vegla në tryezë" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Stacioni punues Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Stacion punues" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Mjedis Grafikë" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Tryeza" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -738,52 +767,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Tryeza" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe " +"vegla në tryezë" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Mjedise të Tjera Grafike në Tryezë" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etj." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "Filipinet" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Server SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webcam" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Konfigurim i Serverit me Terminale Mageia" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Vështrimi i Rrjetit (Network)" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Qendra Kontrolluese Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Dështim gjatë konfigurim të stampuesit %s\"!" @@ -797,7 +848,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -853,107 +904,107 @@ msgstr "Zgjedhni Grupet e Pakove" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Instalim minimal" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Tryeza" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Tryeza" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Tryeza" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Zgjedhni Grupet e Pakove" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Zgjedhni pakot individualisht" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Gjitha të Çzgjedhurat" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Madhësia totale: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versioni: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Madhësia: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Me rëndësi: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ju nuk mund ti zgjedhni/çzgjedhni këtë pako" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "ka arritur nga mungesa %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "ka arritur gjatë mosmarrëveshjes %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "tentim në gradimin e %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "në urdhër për ta mbajturë %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -962,104 +1013,104 @@ msgstr "" "Nu nuk mund ta zgjidhni këtë pako, sepse nuk ka vend të mjaftueshëm për ta " "instaluar" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Kjo është një pako e nevojshme, dhe nuk mund çzgjedhet" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Paraqiti automatikisht pakot e zgjedhura" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instalim" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Zgjedhja e pakos" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Azhurnimi i pakove të zgjedhura" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Instalim minimal" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Menagjuesi Softver" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Zgjedhi pakot të cilat dëshironi t'instaloni" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instalimi" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Asnjë detaj" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Koha e mbetur" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Vlerësimi në sipër" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pakot" msgstr[1] "%d pakot" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Përmbledhje" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfiguroje" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "i pa konfiguruar" @@ -1071,7 +1122,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1080,7 +1131,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1382,28 +1433,28 @@ msgstr "" "A dëshironi t'instaloni këto azhurnime ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s mbi %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardver" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Kartelë zëri" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "A posedoni një kartelë zëri ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1411,74 +1462,74 @@ msgid "" msgstr "" "Nise \"sndconfig\" mbasë instalimit për ta konfiguruar kartëlën e zërit" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Asnjë kartelë e zbuluar. Provo \"harddrake\" mbasë instalimit" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Interfaci grafik" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rrjeti & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Profili " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "rikonfiguroje" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivel i Sigurisë" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Mur i Zjarrt" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktivizuar" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "i nxënë" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Pregatitja e bootloader..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pregatitje për instalim" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1491,24 +1542,24 @@ msgstr "" "Dhe instalimi do të vazhdoj më tutje, mirëpo ju\n" " duhet të posedoni BootX që ta nisni sistemin tuaj" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Futni një disketë të zbrazët në lexuesin e disketave %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Krijimi i një diskete auto instaluese..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1519,12 +1570,12 @@ msgstr "" "\n" "A dëshironi me të vërtetë ti braktisni tani?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Urime" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Rinise (riboot)" diff --git a/perl-install/install/share/po/sr.po b/perl-install/install/share/po/sr.po index d65931441..c747a46fd 100644 --- a/perl-install/install/share/po/sr.po +++ b/perl-install/install/share/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-09-15 13:33+0200\n" "Last-Translator: Toma Jankovic \n" "Language-Team: Serbian \n" @@ -75,7 +75,7 @@ msgid "Do you have further supplementary media?" msgstr "Да ли имате још додатних медија?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,88 +88,88 @@ msgstr "" "\n" "Да ли имате додатних инсталационих медија које треба подесити?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Мрежа (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Мрежа (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Мрежа (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "УРЛ мирора?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "УРЛ мора почињати са ftp:// или http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Контактирајте %s web сајт да би добили листу доступних mirror-а..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Неуспешно успостављање везе са %s web сајт ради листе доступних mirror-а" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Изаберите mirror са ког ћете скинути пакете" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Подешавање NFS-а" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Унесите име домаћина-hostname и директоријум вашег NFS медија" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Недостаје име домаћина-hostname" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Директоријум мора почети са \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Име домаћина-hostname за монтирање NFS ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Директоријум" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Додатни" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -178,90 +178,90 @@ msgstr "" "Не могу пронађем листу пакета на овом мирору. проверите да ли локација " "исправна." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Тражим већ инсталиране пакете..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Тражим пакете за ажурирање..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Уклањам старе пакете..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -274,72 +274,72 @@ msgstr "" "\n" "Да ли заиста желите да уклоните ове пакете?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Грешка код отварања датотека %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Следећи диск(ови) ће бити преименовани:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (раније са именом %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Мрежа" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Изаберите медиј" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Датотека већ постоји. Да ли препишем преко постојеће?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Приступ одбијен" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Погрешно NFS име" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Лош медиј %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Не могу да направим снимак пре партиционирања" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Снимци ће бити доступни након инсталације у %s" @@ -349,7 +349,7 @@ msgstr "Снимци ће бити доступни након инсталац msgid "Installation" msgstr "Инсталација" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Конфигурација" @@ -446,42 +446,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Хм,појавила се грешка" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Појавила се фатална грешка: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d инстлациона трансакција није успела" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Инсталирам пакет %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Радна станица" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Радна(Office) станица" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -490,32 +490,32 @@ msgstr "" "Office програми: текст процесори (LibreOffice Writer, Kword), табеле " "(LibreOffice Calc, Kspread), pdf прегледници, итд" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Станица за игру" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Забавни програми: аркаде, иге на табли, стратегије, итд" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мултимедијална станица" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Програми за пуштање звука и видеа" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Интернет станица" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -524,193 +524,193 @@ msgstr "" "Скуп алата за читање и слање ел.поште и вести (mutt, tin..) и за " "претраживање Интернета" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Мрежни компјутер (клијент)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Клијенти за различите протоколе укључујући и ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Алати за лако конфигурисање компјутера" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Конзолни алати" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "едитори,шелови, алати за датотеке, терминали" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Развојна" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C и C++ развојне библиотеке, програми и пропратне датотеке" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документација" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб Сервер" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Софтвер за групни рад" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab Сервер" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Сервер, Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Ел.пошта/вести" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix сервер за ел.пошту,Inn сервер за вести " -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Сервер директоријума" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Сервер" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Име Домена и Мрежни Информациони Сервер" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Фајл Сервер и сервер за дељење штампача" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS Сервер, Samba Сервер" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Сервер,Базе података" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL или MariaDB сервер за базу података" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Сервер, Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Пошта" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix mail сервер" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL или MariaDB сервер за базу података" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Мрежни Сервер" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS сервер, SMB сервер, Proxy сервер, SSH сервер" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Графичко Окружење" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE падна станица" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -718,12 +718,12 @@ msgid "" msgstr "" "K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome радна станица" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -732,12 +732,41 @@ msgstr "" "Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, " "NFS server, SMB server, Proxy серверих апликација и десктопалата" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE падна станица" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, " +"NFS server, SMB server, Proxy серверих апликација и десктопалата" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome радна станица" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Радна станица" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Графичко Окружење" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm Десктоп" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -746,52 +775,74 @@ msgstr "" "Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, " "NFS server, SMB server, Proxy серверих апликација и десктопалата" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm Десктоп" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, " +"NFS server, SMB server, Proxy серверих апликација и десктопалата" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Други графички десктопови" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr " Window Maker, Enlightenment, Fvwm, итд" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Алати" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Сервер" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin сервер за даљинску контролу" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Мрежни алати/Мониторинг" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Алати за мониторинг, управљање процесима, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Чаробњаци" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Чаробњаци за подешавање сервера" @@ -805,7 +856,7 @@ msgstr "" "Грешка, али незнам како да је разрешим.\n" "Наставите на ваш ризик!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -861,194 +912,194 @@ msgstr "Одабир група пакета" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Минимално инсталирај" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm Десктоп" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm Десктоп" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm Десктоп" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Одабир група пакета" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Појединачно бирање пакета" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Деселектуј Све" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Укупна величина: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Верзија: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Величина: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Важност: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Не можете селектовати/деселектовати овај пакет" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "због не постојања %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "због не задовољеног %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "покушавам да прикажем %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "да бих задржао %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Не можете селектовати овај пакет јер нема више слободног простора" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Следећи пакети треба да буду инсталирани" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Следећи пакети ће бити избрисани" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ово је обавезни пакет,и не може бити деселектован" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Можете деселектовати овај пакет јер је већ инсталиран" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Не можете деселектовати овај пакет.Он мора бити ажуриран" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Аутоматски прикажи изабране пакете" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Инсталирај" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Учитај/Сачувај избор" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ажурирање селекције пакета" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Минимално инсталирај" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Подешавање Софтвера" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Изабери пакете за инсталацију" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Инсталирам" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Без детаља" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Преостало време" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Процењујем" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1056,17 +1107,17 @@ msgstr[0] "%d пакета" msgstr[1] "%d пакета" msgstr[2] "%d пакета" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Сажетак" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Подеси" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "није подешено" @@ -1080,7 +1131,7 @@ msgstr "" "Пронађени су следећи инсталациони медији.\n" "Уколико желите да прескочите неке од њих, деселектујте их сада." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1092,7 +1143,7 @@ msgstr "" "Након тога ће инсталција наставити са хард диска а пакети ће остати доступни " "и када се заврши инсталација." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Копирање целог CDа" @@ -1393,28 +1444,28 @@ msgstr "" "да ли желите да инсталирате update-ове ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Хардвер" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Звучна картица" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Да ли имате ISA звучну картицу?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1423,74 +1474,74 @@ msgstr "" "Покрените \"alsaconf\" или \"sndconfig\" након иснталације да би подесили " "своју звучну картицу" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Није детектована звучна картица. Покрените \"harddrake\" након инсталације" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графички интерфејс" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Мрежа и Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Проксији" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "подешено" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Ниво сигурности" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Заштитни зид (Firewall)" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "Активирано" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "онемогућено" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Нисте подесили X. Да ли сте сигурни да желите то?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Припремам стартер..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Припремам инсталацију" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1503,7 +1554,7 @@ msgstr "" "BootX или нешто друго да би подигли систем. Аргумент кернела заroot fs je: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1512,17 +1563,17 @@ msgstr "" "У овом сугурносном нивоу приступ фајловима на Windows партицији је дозвољен " "само администраторима." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Убаците празну дискету у уређај %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Креирам ауто инсталациони флопи" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1533,12 +1584,12 @@ msgstr "" "\n" "Да ли стварно желите да завршите ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Честитке" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Рестарт" diff --git a/perl-install/install/share/po/sr@Latn.po b/perl-install/install/share/po/sr@Latn.po index f21ff5357..1a36dc5f6 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-09-15 13:33+0200\n" "Last-Translator: Toma Jankovic_\n" "Language-Team: Serbian \n" @@ -75,7 +75,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -88,88 +88,88 @@ msgstr "" "\n" "Da li imate dodatnih instalacionih medija koje treba podesiti?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Mreža (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Mreža (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Mreža (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL mirora?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL mora počinjati sa ftp:// ili http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Kontaktirajte %s web sajt da bi dobili listu dostupnih mirror-a..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Neuspešno uspostavljanje veze sa %s web sajt radi liste dostupnih mirror-a" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Izaberite mirror sa kog ćete skinuti pakete" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Podešavanje NFS-a" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Unesite ime domaćina-hostname i direktorijum vašeg NFS medija" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Nedostaje ime domaćina-hostname" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Direktorijum mora početi sa \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Ime domaćina-hostname za montiranje NFS ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktorijum" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Dodatni" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -178,90 +178,90 @@ msgstr "" "Ne mogu pronađem listu paketa na ovom miroru. proverite da li lokacija " "ispravna." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Tražim već instalirane pakete..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Tražim pakete za ažuriranje..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -274,72 +274,72 @@ msgstr "" "\n" "Da li zaista želite da uklonite ove pakete?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Greška kod otvaranja datoteka %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Sledeći disk(ovi) će biti preimenovani:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (ranije sa imenom %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Mreža" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Izaberite medij" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Datoteka već postoji. Da li prepišem preko postojeće?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Pristup odbijen" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Pogrešno NFS ime" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Loš medij %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Ne mogu da napravim snimak pre particioniranja" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Snimci će biti dostupni nakon instalacije u %s" @@ -349,7 +349,7 @@ msgstr "Snimci će biti dostupni nakon instalacije u %s" msgid "Installation" msgstr "Instalacija" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguracija" @@ -446,42 +446,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Hm,pojavila se greška" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Pojavila se fatalna greška: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d instlaciona transakcija nije uspela" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Instaliram paket %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Radna stanica" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Radna(Office) stanica" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -490,32 +490,32 @@ msgstr "" "Office programi: tekst procesori (LibreOffice Writer, Kword), tabele " "(LibreOffice Calc, Kspread), pdf preglednici, itd" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Stanica za igru" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Multimedijalna stanica" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Programi za puštanje zvuka i videa" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internet stanica" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -524,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:40 #, c-format msgid "Network Computer (client)" msgstr "Mrežni kompjuter (klijent)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Klijenti za različite protokole uključujući i ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Alati za lako konfigurisanje kompjutera" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konzolni alati" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Razvojna" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C i C++ razvojne biblioteke, programi i propratne datoteke" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentacija" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Knjige i 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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux-ova Standardna Baza. Podrška za Third party aplikaicje" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Veb Server" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Softver za grupni rad" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab Server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Server, Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "El.pošta/vesti" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Server direktorijuma" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Ime Domena i Mrežni Informacioni Server" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS Server, Samba Server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Server,Baze podataka" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Server, Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Pošta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix mail server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ili MariaDB server za bazu podataka" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Mrežni Server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, SSH server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafičko Okruženje" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE padna stanica" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -718,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome radna stanica" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -732,12 +732,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE padna stanica" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafička 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome radna stanica" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Radna stanica" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafičko Okruženje" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -746,52 +775,74 @@ msgstr "" "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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Grafička 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:193 #, 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:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr " Window Maker, Enlightenment, Fvwm, itd" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Alati" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin server za daljinsku kontrolu" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Mrežni alati/Monitoring" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Čarobnjaci" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Čarobnjaci za podešavanje servera" @@ -805,7 +856,7 @@ msgstr "" "Greška, ali neznam kako da je razrešim.\n" "Nastavite na vaš rizik!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -861,194 +912,194 @@ msgstr "Odabir grupa paketa" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Minimalno instaliraj" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Odabir grupa paketa" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Pojedinačno biranje paketa" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Deselektuj Sve" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Ukupna veličina: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Verzija: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Veličina: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Važnost: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Ne možete selektovati/deselektovati ovaj paket" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "zbog ne postojanja %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "zbog ne zadovoljenog %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "pokušavam da prikažem %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "da bih zadržao %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Ne možete selektovati ovaj paket jer nema više slobodnog prostora" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ovo je obavezni paket,i ne može biti deselektovan" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Možete deselektovati ovaj paket jer je već instaliran" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Automatski prikaži izabrane pakete" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Instaliraj" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Učitaj/Sačuvaj izbor" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ažuriranje selekcije paketa" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimalno instaliraj" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Podešavanje Softvera" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Izaberi pakete za instalaciju" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Instaliram" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Bez detalja" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Preostalo vreme" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Procenjujem" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" @@ -1056,17 +1107,17 @@ msgstr[0] "%d paketa" msgstr[1] "%d paketa" msgstr[2] "%d paketa" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sažetak" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Podesi" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nije podešeno" @@ -1080,7 +1131,7 @@ msgstr "" "Pronađeni su sledeći instalacioni mediji.\n" "Ukoliko želite da preskočite neke od njih, deselektujte ih sada." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1092,7 +1143,7 @@ msgstr "" "Nakon toga će instalcija nastaviti sa hard diska a paketi će ostati dostupni " "i kada se završi instalacija." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiranje celog CDa" @@ -1393,28 +1444,28 @@ msgstr "" "da li želite da instalirate update-ove ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s na %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardver" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Zvučna kartica" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Da li imate ISA zvučnu karticu?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1423,74 +1474,74 @@ msgstr "" "Pokrenite \"alsaconf\" ili \"sndconfig\" nakon isntalacije da bi podesili " "svoju zvučnu karticu" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Nije detektovana zvučna kartica. Pokrenite \"harddrake\" nakon instalacije" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafički interfejs" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Mreža i Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proksiji" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "podešeno" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Nivo sigurnosti" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Zaštitni zid (Firewall)" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "Aktivirano" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "onemogućeno" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Pripremam starter..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Pripremam instalaciju" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1503,7 +1554,7 @@ msgstr "" "BootX ili nešto drugo da bi podigli sistem. Argument kernela zaroot fs je: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1512,17 +1563,17 @@ msgstr "" "U ovom sugurnosnom nivou pristup fajlovima na Windows particiji je dozvoljen " "samo administratorima." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Ubacite praznu disketu u uređaj %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Kreiram auto instalacioni flopi" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1533,12 +1584,12 @@ msgstr "" "\n" "Da li stvarno želite da završite ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Čestitke" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Restart" diff --git a/perl-install/install/share/po/sv.po b/perl-install/install/share/po/sv.po index 8e476474a..e526d9ceb 100644 --- a/perl-install/install/share/po/sv.po +++ b/perl-install/install/share/po/sv.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2011-05-24 21:55+0200\n" "Last-Translator: \n" "Language-Team: Swedish \n" @@ -83,7 +83,7 @@ msgid "Do you have further supplementary media?" msgstr "Har du fler tilläggs-installationskällor?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -97,180 +97,180 @@ msgstr "" "\n" "Har du några tilläggs-medier du vill konfigurera?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Cd-rom" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Nätverk (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Nätverk (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Nätverk (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Spegelns URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL måste starta med ftp:// eller http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Kontaktar %s webbplats för att hämta listan över tillgängliga speglar..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Misslyckades kontakta %s webbplats för att hämta listan över tillgängliga " "speglar" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Välj en webbplats från vilken du vill hämta paketen" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS konfigurering" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "Ange namn och katalog för ditt NFS medium" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Värdnamn saknas" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Katalogen måste börja med \"/\"" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "Maskinnamn för NFS anslutning ?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Katalog" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Tillägg" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Kan inte hitta hdlist filen på denna spegel" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Hoppa över alla paket från mediet \"%s\"" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Söker efter paket som redan är installerade..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Söker efter paket att uppdatera..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -283,72 +283,72 @@ msgstr "" "\n" "Vill du verkligen ta bort dessa paket?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Fel vid läsning av fil %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Följande disk(ar) har döpts om:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (gamla namnet %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Nätverk" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Välj media" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Filen finns redan. Skriv över?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Åtkomst nekad" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Felaktigt NFS namn" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Oanvändbart media %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Kan inte ta skärmdumpar före partitionering" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Skärmdumpar kommer att finnas tillgängliga efter installationen i %s" @@ -358,7 +358,7 @@ msgstr "Skärmdumpar kommer att finnas tillgängliga efter installationen i %s" msgid "Installation" msgstr "Installation" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Konfiguration" @@ -457,42 +457,42 @@ msgstr "" "Vissa paket som krävs av %s kan inte installeras:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Ett fel inträffade:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Ett allvarligt fel inträffade: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Fråga inte igen" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d installationstransaktioner misslyckades" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Installation av paket misslyckades:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Arbetsstation" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Kontorsarbetsstation" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -501,32 +501,32 @@ msgstr "" "Kontorsprogram: ordbehandlare (LibreOffice Writer, Kword), kalkylprogram " "(LibreOffice Calc, Kspread), PDF-visare, etc" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Spelstation" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimediastation" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internetstation" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -535,193 +535,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:40 #, c-format msgid "Network Computer (client)" msgstr "Nätverksdator (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Klienter för olika protokoll inkluderande SSH" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Verktyg för att underlätta konfigurationen av datorn" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Konsollverktyg" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Utveckling" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentation" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Stöd för tredjepartsprogram" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Webbserver" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab-server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Brandvägg/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet-gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "E-post/Nyheter" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Katalog-server" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP-server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Domännamnserver och Nätverksinformationsserver" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Fil och Skrivarserver" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS-server, Samba-server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Databas" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL- och MariaDB-databasserver" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Webb/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "E-post" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "E-postservern Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL- eller MariaDB-databasserver" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Nätverksserver" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS-server, SMB-server, Proxyserver, SSH-server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafisk miljö" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE-arbetsstation" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -730,12 +730,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:156 #, c-format msgid "GNOME Workstation" msgstr "Gnome-arbetsstation" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -743,12 +743,40 @@ msgid "" msgstr "" "Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE-arbetsstation" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Gnome-arbetsstation" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Arbetsstation" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafisk miljö" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE Skrivborsmiljö" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -757,52 +785,74 @@ msgstr "" "En lätt & snabb grafisk miljö med en samling användarvänliga program och " "skrivbordsverktyg" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Anpassad Skrivborsmiljö" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"En lätt & snabb grafisk miljö med en samling användarvänliga program och " +"skrivbordsverktyg" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Andra grafiska skrivbordsmiljöer" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Verktyg" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH-server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Fjärrkonfigurationsserver" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Nätverksverktyg/Övervakning" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Övervakningsverkty, processhantering, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Guider" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Guider för att konfigurera servern" @@ -816,7 +866,7 @@ msgstr "" "Ett fel uppstod och jag vet inte hur det kan hanteras på ett\n" "bra sätt. Fortsätt på egen risk." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -871,107 +921,107 @@ msgstr "Val av medium" msgid "Install %s KDE Desktop" msgstr "Installera %s KDE Skrivbordsmiljö" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "Installera %s GNOME Skrivbordsmiljö" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Anpassad installation" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE Skrivborsmiljö" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME Skrivborsmiljö" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Anpassad Skrivborsmiljö" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Här är en demo av '%s' skrivbord." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Val av paketgrupper" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Välj enskilda paket" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Avmarkera alla" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Total storlek: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Storlek: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Betydelsegrad: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Du kan inte välja/välja bort detta paket." -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "pga saknande %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "på grund av otillräckliga %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "försöker befordra %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "för att behålla %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -980,104 +1030,104 @@ msgstr "" "Du kan inte välja detta paket eftersom det inte finns tillräckligt med " "utrymme." -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Detta är ett obligatoriskt paket som inte kan väljas bort." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Du kan inte välja bort detta paket. Det är redan installerat." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Visa automatiskt valda paket" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Installera" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Ladda/Spara markering" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Uppdaterar paketval" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal installation" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Programhantering" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Välj paketen som du vill installera" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Installerar" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Inga detaljer" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Återstående tid:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(uppskattar...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paketet" msgstr[1] "%d paket" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Sammanfattning" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Konfigurera" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "Inte inställt" @@ -1091,7 +1141,7 @@ msgstr "" "Följande installationskällor har hittats.\n" "Du kan välja bort dom du inte önskar använda dig av." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1104,7 +1154,7 @@ msgstr "" "Installationen kommer att fortsätta från hårddisken och paketen kommer att " "fortsätta vara tillgängliga när systemet är färdiginstallerat." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Kopiera hela CD skivor" @@ -1412,28 +1462,28 @@ msgstr "" "Vill du installera uppdateringarna?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s på %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hårdvara" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Ljudkort" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Har du ett ISA-ljudkort?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1442,73 +1492,73 @@ msgstr "" "Kör \"alsaconf\" eller \"sndconfig\" efter installationen för att " "konfigurera ljudkortet." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Inget ljudkort hittades. Prova \"harddrake\" efter installationen." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafiskt gränssnitt" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Nätverk & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxyservrar" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "konfigurerad" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Säkerhetsnivå:" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Brandvägg" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "aktiverad" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "inaktiverad" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Förbereder starthanterare..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Förbereder installation" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Ha tålamod, detta kan ta en stund..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1521,7 +1571,7 @@ msgstr "" "eller något liknande för att starta datorn. Kernelargumentet för roten är " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1530,17 +1580,17 @@ msgstr "" "På den här säkerhetsnivån är tillgång till Windowspartitionen förbehållen " "administratören." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Sätt in en tom diskett i diskettenhet %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Skapar automatisk installationsdiskett" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1551,12 +1601,12 @@ msgstr "" "\n" "Vill du verkligen avbryta nu?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Gratulerar" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Starta om" diff --git a/perl-install/install/share/po/ta.po b/perl-install/install/share/po/ta.po index 6ecaea76a..b3688b279 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2002-09-06 00:35+0800\n" "Last-Translator: prabu anand \n" "Language-Team: Tamil \n" @@ -76,7 +76,7 @@ msgid "Do you have further supplementary media?" msgstr "மேலும் உள்ளனவா?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -85,177 +85,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "சிடி இயக்கி" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "வலையமைப்பு %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "வலையமைப்பு %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது" -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "பொதிகளை எங்கிருந்து இறக்க விரும்புகிறீர்கள்" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "அடைவு" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "இதை திறக்க முடியவில்ைல%s: %s\n" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "ஏற்கனவே நிறுவப்பட்டுள்ள பொதிகள் பார்ைவயிடப்படுகின்றன" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "மேம்படுத்தப்பட வேண்டிய பொதிகள் அறியப்படுகின்றன" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -264,72 +264,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s என்ற கோப்ேபா படிப்பதில் பிழை நேர்ந்துள்ளது" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "கிழ்கானும் பொதிகள் நிறுவுவதற்கு தேர்வுச் செய்யப்பட்டுள்ளது" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "வலையமைப்பு" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "தயவுசெய்து ேதர்ந்ெதடுக்கவும்" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "இந்த கோப்பு ஏற்கனவே உள்ளது. பயன்பாடுத்தி கொள்ளலாமா?" -#: any.pm:1242 +#: any.pm:1272 #, fuzzy, c-format msgid "Permission denied" msgstr "அனுமதிகள்" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "கெட்ட தகவல்" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "வகிர்தல் முடிவதற்கு முன் திரைவேட்டு எடுக்க முடியாது" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "நிறுவி முடித்தவுடன் திரைவேட்டுகள் %s என்ற அடைவில் கிடைக்கும்" @@ -339,7 +339,7 @@ msgstr "நிறுவி முடித்தவுடன் திரைவ msgid "Installation" msgstr "நிறுவப்படுகிறது" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "வடிவமைப்புகள்" @@ -435,343 +435,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "%s பொதி நிறுவப்படுகிறது" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "வேலைக்களம்" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "அலுவல் கருவிகள்" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, fuzzy, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "அலுவல் கருவிகள்(விாிதாள், நிகழ்த்தி,வரைபடக் கருவிகள்)" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "விளையாட்டுகள்" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "விளையாட்டுகள்" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "பல்லூடக கணினி" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "பல்லூடக இயக்கிகள்/உருவாக்க நிரல்கள்" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "இணையக் கணினி" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, 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:40 #, c-format msgid "Network Computer (client)" msgstr "வலையமைப்புக் கணினி(வேண்டி)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "ssh முதலிய வலையமைப்புக் கருவிகள்" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "உங்கள் கணினியை எளிதாக வடிவமைக்க உதவுங்கருவிகள்" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "முனையக் கருவிகள்" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "முனையம்,தொகுப்பாளர்கள், கோப்பு மேலாளர்கள் மற்றும் ஓடுகள்" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "உருவாக்கம்" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C மற்றும் C++ நூலக நிரல்கள்" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "உதவிநூல்" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "புத்தகங்கள் மற்றும் எப்படிச் செய்வது போன்ற உதவி நூல்" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "LSB- லினக்ஸ் தரக்கட்டுப்பாட்டுக்கு தேவையான நிரல்கள்." -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "இணையத்தள சேவையகம்" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "கிரப்" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "கோலாப் சேவகன்" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "நெருப்புச்சுவர்/வழிப்படுத்தி" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "இணைய நுழைவாயில்" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/கோப்பு/_புதியது" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "மின்னஞ்சல் பரிமாறி" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "RAID இருந்து நீக்கு" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "NTP சேவையகம்" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS/NIS " -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "அச்சுப்ெபாறி சேவையகம்" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "ஒலிப் பரிமாறி" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "தரவுதளங்கள்" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL/MariaDB தரவுத்தள பரிமாறிகள்" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "இணையதள/கோப்புப் பாிமாற்றம்" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "அப்பாச்சி, ftpd போன்ற பரிமாற்று நிரல்கள்" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "மின்னஞ்சல்" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "மின்னஞ்சல் பரிமாறி" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL/MariaDB தரவுத்தள பரிமாறிகள்" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "வலையமைப்பக பரிமாறி" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS /சம்பா/பினாமி/ssh பரிமாறிகள்" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "வரைவியல்வழி சூழல்கள்" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Kசாளரமைப்பு பணிக்கணினி" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "Kசாளரமைப்பு- ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "குேனாம் பணிக்கணினி" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Kசாளரமைப்பு பணிக்கணினி" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "குேனாம் பணிக்கணினி" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "வேலைக்களம்" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "வரைவியல்வழி சூழல்கள்" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "மேசைசெயலி" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "மேசைசெயலி" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "மற்ற வரைவியல்வழி மேலாளர்கள்" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, 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:217 #, c-format msgid "Utilities" msgstr "உதவிக்கருவிகள்" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "சேவையகம்" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "வலைபடக் கருவி" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "பரிமாறி வடிவமைப்பு" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "வலையமைப்பாக்க வடிவமைப்பு " -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "அச்சுப்ெபாறி \"%s\" வடிவமைப்பு ெவற்றியடையவில்ைல" @@ -785,7 +832,7 @@ msgstr "" "பிழை நேர்ந்துள்ளது மன்னிக்கவும் எனக்கு என்ன செய்வதென்று தெரியவில்ைல\n" "தொடர்ந்து செல்வது உங்கள் பொறுப்பு" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -839,211 +886,211 @@ msgstr "பொதிகள் குழுத் தேர்வு" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "குறைந்தபட்ச நிறுவல்" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "மேசைசெயலி" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "மேசைசெயலி" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "மேசைசெயலி" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "பொதிகள் குழுத் தேர்வு" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "தனித்னி பொதியாக தேர்வுச் செய்" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "மெகா பைட்டில் மொத்த அளவு %d / %d" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "வெளியீடு: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "அளவு: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, fuzzy, c-format msgid "%d KB\n" msgstr "கிலோ பைட்டில் அளவு %d \n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "முக்கியத்துவம்: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "நீங்கள் இந்த பொதியை தேர்வு/நீக்க முடியாது" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, fuzzy, c-format msgid "due to missing %s" msgstr "kdesu இல்ைல" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "இடமில்ைல என்பதால் நீங்கள் இந்த பொதியைத் தே`ர்வுச் செய்ய முடியாது" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "கிழ்கானும் பொதிகள் நிறுவுவதற்கு தேர்வுச் செய்யப்பட்டுள்ளது" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "கிழ்கானும் பொதிகள் நீக்கப்படுகிறது" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "இது கட்டாய பொதி. இதனை நீக்க முடியாது" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "இந்த பொதியை.நீக்க முடியாது. இது ஏற்கனவே நிறுவப்பட்டள்ளது" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "இந்த பொதியை.நீக்க முடியாது. இது நிகழ்நிலைப்படுத்த வேண்டிய பொதி" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "தானாக தேர்வுச் செய்யப்பட்டுள்ள பொதிகளைக் காட்டு" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "நிறுவு" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "பொதிகள் தேர்வு" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "பொதிகள் தேர்ைவ நிகழ்நிலைப் படுத்து" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "குறைந்தபட்ச நிறுவல்" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "நிரல் மேலாண்மை" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "நிறுவ வேண்டிய பொதிகளை தேர்வுச் செய்யுங்கள் " -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "நிறுவப்படுகிறது" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "விவரங்கள்" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "தேவைப்படும் நேரம்" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "கணக்கிடப்படுகிறது" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d பொதிகள்" msgstr[1] "%d பொதிகள்" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "உரை" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "வடிவமை" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "வடிவமைக்கப்படவில்ைல" @@ -1055,7 +1102,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1064,7 +1111,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1363,102 +1410,102 @@ msgstr "" "இவற்ைற நிறுவ விருப்பமா ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s இல் %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "வன்பொருள்" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "ஒலியட்ைட" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "உங்களிடம் ISA ஒலியட்ைட ஏதேனும் உள்ளனவா?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, fuzzy, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "\"sndconfig\" என்ற நிரல் மூலம் உங்கள் ஒலியட்ைடயை வடிவமைக்க முடியும்" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "ஒலியட்ைட ஏதும் கண்டுபிடிக்க முடியவில்ைல. டிரேக்வன்ெபாருள் மாயாவியை பயன்படுத்துங்கள்" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "வரைவியல்வழி" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "வலையமைப்பும் இணையமும்" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "பயனர்குறிப்பு: " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "மறுவடிவமை" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "பாதுகாப்பு நிலை" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "நெருப்புச்சுவர்" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, fuzzy, c-format msgid "activated" msgstr "இப்போது துவக்கு" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "முடமாக்கப்பட்டுள்ளது" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "துவங்குநிரலை உருவாக்குகிறேன்..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "நிறுவுதல் தொடங்குகிறது" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1467,24 +1514,24 @@ msgid "" "root fs is: root=%s" msgstr "தயவுசெய்து நிறுவுவதற்கு ஆங்கிலத்ைத பயன்படுத்துங்கள்" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "வெற்று நெகிழ்வட்ைட %s இயக்கியில் உள்ளிடவும்" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "தானியங்கி நிறுவல்வட்ைட உருவாக்கவும்" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1495,12 +1542,12 @@ msgstr "" "\n" "நீங்கள் நிச்சயம் நிறுவுதலை விட்டு வெளியேற விரும்புகிறீர்களா?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "வாழ்த்துக்கள்" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "மறுெதாடக்கம்" diff --git a/perl-install/install/share/po/tg.po b/perl-install/install/share/po/tg.po index 6f31855a6..53cfa69ee 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-09-17 16:03+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" @@ -82,7 +82,7 @@ msgid "Do you have further supplementary media?" msgstr "Шумо боз дигар расонаи иловагиро доред?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -91,182 +91,182 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Шабака (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Шабака (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Шабакаи (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL-и оина?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба %s " "Linuxweb site ба роҳ монда шудааст..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба %s " "Linuxweb site ба роҳ монда шудааст..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Оинаро интихоб намоед, ки аз он қуттиҳоро гирифта мешавад" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Танзими NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Феҳрист" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Пайдо кардани файли hdlist дар ин оина нашуда истодааст." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "" "Ҷустуҷи бастаи барномаҳои аллакай коргузорӣ шуда иҷро шуда истодааст..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Ҷустуҷӯи қуттиҳо барои нав намудан иҷро мешавад..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -280,72 +280,72 @@ msgstr "" "\n" "Дар ҳақиқат мехоҳед, ки ин бастаи барномаҳоро хориҷ кунед?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Хатогӣ ҳангоми хониши файл %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "- %s хориҷ карда шуд\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Шабака" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Илтимос интихоб кунед" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Файл аллакай вуҷуд дорад. Истифода барем?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Рухсат инкор шуд" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "миёнаи иловашуда %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Сохтани экранаксҳо пеш аз тақсимкунӣ номумкин" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "ЭкранАксҳо баъд аз коргузориш дар %s дастрас мешаванд" @@ -355,7 +355,7 @@ msgstr "ЭкранАксҳо баъд аз коргузориш дар %s дас msgid "Installation" msgstr "Коргузорӣ шуда истодааст" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Батанзимдарорӣ" @@ -452,42 +452,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Хатогӣ рух дод" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Хатогии ҷиддӣ рӯй дод: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d коргузорӣ амалӣ нагардид" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Интихоби синфи коргузорӣ" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Истгоҳи корӣ" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Истгоҳи Кории Идораӣ" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,32 +496,32 @@ msgstr "" "Барномаҳои идорӣ: пардозандаҳои матнӣ (LibreOffice Writer, Kword), ҷадвалҳои " "густурда (LibreOffice Calc, Kspread), азназаргузарҳои PDF ва ғайра" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Истгоҳи бозӣ" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Барномаҳои шавқовар: аркадаҳо, бозиҳои рӯи мизӣ, стратегия ва ғайра" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Истгоҳи бисёрмуҳита" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Барномаҳо барои бозикунии/таҳрири овоз ва видео" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Истгоҳи Интернет" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -530,193 +530,193 @@ msgstr "" "Маҷмӯи асбобҳо барои хондан ва фиристодани пост ва ахборот (mutt, tin..) ва " "баррасии Web" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Компютери Шабакавӣ (мизоҷ)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Мизоҷон барои қарордодҳои гуногун, аз он ҷумла ssh" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Асбобҳо барои осоннамоии танзими компютери шумо" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Асбобҳои Нозиргоҳ" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Муҳаррирон, пардозандаи фармонҳо, асбобҳои файлӣ, поёнаҳо" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Коркард" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Китобхонаи коркарди C ва C++, барномаҳо ва файлҳои дохилшаванда" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Санадсозӣ" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Китобҳо ва Чӣ тавр дар Linux ва Таъминоти Барномавии Озод" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Манбаи Низоммеъёри Linux. Пуштибонии замимаҳои коргардонони сеюм" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Хидматгори Веб" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Хидматрасони Kolab" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Фейрвол/Масиргузор" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Даричаи тадохули Интернет" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Пост/Ахборот" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Хидматрасони постии Postfix, Inn хидматрасони ахборотӣ" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Хидматрасони Феҳрист" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Хидматрасони FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Номи Доменӣ ва Хидматрасони Ахбороти Шабакавӣ" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Хидматрасони Истифодабарандаи Файл ва Чопгар" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "Хидматрасони NFS, хидматрасони Samba" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Манбаи маълумот" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL ва MariaDB Хидматрасони Манбаи Додаҳо" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Пост" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Хидматрасони пости Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "Хидматрасони манбаи маълумоти PostgreSQL ё MariaDB" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Хидматрасони Компютери Шабакавӣ" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS хидматрасон, SMB хидматрасон, Proxy хидматрасон, ssh хидматрасон" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Муҳити Графикӣ" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Истгоҳи кории KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -724,12 +724,12 @@ msgid "" msgstr "" "K Муҳити Мизи Корӣ, ин муҳити графикии асосӣ бо маҷмӯи асбобҳои ҳамроҳкунанда" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Истгоҳи кории Gnome" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -738,12 +738,41 @@ msgstr "" "Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона " "дошта" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Истгоҳи кории KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона " +"дошта" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Истгоҳи кории Gnome" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Истгоҳи корӣ" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Муҳити Графикӣ" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Мизи Кории Ғалатёб" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -752,52 +781,74 @@ msgstr "" "Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона " "дошта" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Мизи Кории Ғалатёб" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона " +"дошта" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Дигар Мизҳои Кории Графикӣ" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ғайра" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Дастгоҳҳо" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Хидматгори SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Батанзимдарори Хидматрасони Дурдасти Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Дастгоҳҳои Шабака/Дидабонӣ" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Дидабонии асбобҳо, ҳисоботи ҷараёнҳо, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Устодҳои Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Устод барои танзимдарории хидматрасон" @@ -812,7 +863,7 @@ msgstr "" "бароям.\n" "Мувофиқи таваккали худ давом диҳед." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -867,107 +918,107 @@ msgstr "Интихоби Гурӯҳи Қуттиҳо" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Коргузории хурдтарин" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Мизи Кории Ғалатёб" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Мизи Кории Ғалатёб" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Мизи Кории Ғалатёб" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Интихоби Гурӯҳи Қуттиҳо" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Интихоби қуттиҳои алоҳида" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Ноинтихоби Ҳама" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Андозаи умумӣ: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Нусха: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Ҳаҷм: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Кб\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Ҳатмӣ: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Шумо интихоб/рад кардани ин бастаи барномаҳоро, карда наметавонед" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "мувофиқи мавҷуд набудани %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "аз сабаби %s-и қонеънагашта" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "барои пешравӣ кӯшиш намудан %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "Барои нигоҳ доштани %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -976,106 +1027,106 @@ msgstr "" "Шумо ин қуттиро интихоб карда наметавонед, зеро барои кор гузоштани он ҷой " "кофӣнест" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Қуттиҳои зерин коргузорӣ хоҳад шуд" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Қуттиҳои навбатӣ бояд хориҷ гардад" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ин қуттии зарур мебошад, онро бекор карда намешавад" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "" "Шумо интихоби ин бастаи барномаҳоро рад карда наметавонед. Он аллакай " "коргузорӣ шудааст" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Шумо интихоби ин қуттиро бекор карда наметавонед. он бояд нав гардад" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Ба таври автоматӣ қуттиҳои интихобшударо нишон диҳед" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Коргузоштан" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Интихоби қуттӣ" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Интихоби қуттиҳо нав карда мешавад" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Коргузории хурдтарин" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Идоракунии Нармафзор" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Бастаи барномаҳоеро, ки коргузорӣ кардан мехоҳед, интихоб намоед" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Коргузорӣ шуда истодааст" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Тафсилот нест" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Вақти боқимонда " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Баҳодиҳии тахминӣ" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, fuzzy, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d қуттиҳо" msgstr[1] "%d қуттиҳо" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Ҷамбаст" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Танзим додан" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "танзимдода нашуда" @@ -1090,7 +1141,7 @@ msgstr "" "Агар баъзеи онҳоро партофтан хоҳед, онҳоро дар айни замон интихоб накарда " "метавонед." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1099,7 +1150,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1403,28 +1454,28 @@ msgstr "" "Оё шумо хоҳиши коргузорӣ намудани ин навигариҳо ҳастед?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s дар %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Сахтафзор" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Корти овоздор" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Шумо карти садои ISA доред?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1433,74 +1484,74 @@ msgstr "" "Барои батанзимдарории корти овозии шумо баъди коргузорӣ \"alsaconf\" ё " "\"sndconfig\"-ро корандозӣ намоед" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Корти овозӣ муайян нагардид. \"harddrake\"-ро баъди коргузорӣ кӯшиш намоед" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Интерфейси графикӣ" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Шабака ва Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Боваринок" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "танзимшуда" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Сатҳи Амният" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Фейрвол" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "фаъолшуда" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ғайрифаъол" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Шумо X-ро ба танзим надаровардаед. Шумо дар ҳақиқат инро мехоҳед?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Корандози худборшави аввала тайёр мешавад..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Коргузорӣ тайёр шуда истодааст" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1513,7 +1564,7 @@ msgstr "" "BootX ё ин ки воситаҳои дигарро барои худборшавии мошини худ истифода баред. " "Нишонванди ҳаста барои решаи fs ин: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1522,17 +1573,17 @@ msgstr "" "Дар ин сатҳи бехатарӣ дастрасӣ ба файлҳо дар қисматҳои Windows таҳо ба " "идоракунанда иҷозат дода мешаванд." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Дискети холиро ба гардон дохил намоед %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Диски нарми худкоргузорӣ офарида шуда истодааст..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1543,12 +1594,12 @@ msgstr "" "\n" "Шумо дар ҳақиқат баромадан мехоҳед?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Табрикот" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Бозхудборшавӣ" diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po index f8a62908d..d52811be9 100644 --- a/perl-install/install/share/po/th.po +++ b/perl-install/install/share/po/th.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2001-09-10 14:24GMT+7\n" "Last-Translator: Wachara Chinsettawong \n" "Language-Team: Thai \n" @@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?" msgstr "คุณมีอันอื่นๆอีกหรือไม่?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,177 +82,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "ซีดี-รอม" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Network interface" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Network interface" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, fuzzy, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้" -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "สารบัญ" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Adapter %s: %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, fuzzy, c-format msgid "Looking at packages already installed..." msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว" -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -261,72 +261,72 @@ msgid "" "Do you really want to remove these packages?\n" msgstr "" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "ระบบเครือข่าย" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "กรุณาเลือก" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "สิทธิการทำงานถูกปฎิเสท" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s" -#: any.pm:1355 +#: any.pm:1385 #, fuzzy, c-format msgid "Cannot make screenshots before partitioning" msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก" -#: any.pm:1363 +#: any.pm:1393 #, fuzzy, c-format msgid "Screenshots will be available after install in %s" msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง" @@ -336,7 +336,7 @@ msgstr "คุณสามารถเลือกภาษาอื่นซึ msgid "Installation" msgstr "กำลังติดตั้ง" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "ปรับแต่งค่า" @@ -432,343 +432,390 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "มีปัญหาเกิดขึ้น" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, fuzzy, c-format msgid "%d installation transactions failed" msgstr "การติดตั้งไม่สำเร็จ" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "กำลังติดตั้งแพ็คเก็จ %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, fuzzy, c-format msgid "Workstation" msgstr "Workstation ที่ทำงาน" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Workstation ที่ทำงาน" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" msgstr "" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, fuzzy, c-format msgid "Game station" msgstr "Workstation ที่ทำงาน" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, fuzzy, c-format msgid "Multimedia station" msgstr "Multimedia - เขียน CD " -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, fuzzy, c-format msgid "Internet station" msgstr "การเชื่อมต่อกับ Internet แบบ sharing" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, fuzzy, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, fuzzy, c-format msgid "Network Computer (client)" msgstr "เครื่องพิมพ์ในระบบ Network (Socket)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, fuzzy, c-format msgid "Console Tools" msgstr "ปิด" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "พัฒนาซอฟท์แวร์ (Development)" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "คู่มือ" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, fuzzy, c-format msgid "Web Server" msgstr "เซิร์ฟเวอร์" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, fuzzy, c-format msgid "Groupware" msgstr "เวิร์กกรุ๊ป (workgroup)" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, fuzzy, c-format msgid "Kolab Server" msgstr "เซิร์ฟเวอร์ NIS" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, fuzzy, c-format msgid "Internet gateway" msgstr "การติดต่อ internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/ไฟล์/_ใหม่" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, fuzzy, c-format msgid "Postfix mail server, Inn news server" msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, fuzzy, c-format msgid "Directory Server" msgstr "เรียกคืนจากแผ่นฟล้อปปี้" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, fuzzy, c-format msgid "FTP Server" msgstr "เซิร์ฟเวอร์ NIS" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "ใช้ NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "ชื่อโดเมน" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, fuzzy, c-format msgid "NFS Server, Samba server" msgstr "เซิร์ฟเวอร์ NIS" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "ฐานข้อมูล" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "จดหมาย" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, fuzzy, c-format msgid "Postfix mail server" msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, fuzzy, c-format msgid "Network Computer server" msgstr "เครื่องพิมพ์ในระบบ Network (Socket)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "การทำงานแบบกราฟฟิก" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, fuzzy, c-format msgid "KDE Workstation" msgstr "Workstation ที่ทำงาน" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, fuzzy, c-format msgid "GNOME Workstation" msgstr "Workstation ที่ทำงาน" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Workstation ที่ทำงาน" + +#: share/meta-task/compssUsers.pl:163 +#, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Workstation ที่ทำงาน" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Workstation ที่ทำงาน" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "การทำงานแบบกราฟฟิก" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "พื้นที่ทำงาน" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "พื้นที่ทำงาน" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Graphical Desktops อื่นๆ" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "อรรถประโยชน์" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, fuzzy, c-format msgid "SSH Server" msgstr "เซิร์ฟเวอร์ NIS" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "อุปกรณ์" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "การคอนฟิก Internet" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "การคอนฟิกระบบเน็ตเวิร์ก" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Control Center" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "การคอนฟิกเครื่องพิมพ์" @@ -782,7 +829,7 @@ msgstr "" "มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n" "หากทำงานต่ออาจเกิดความเสียหายได้" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -836,210 +883,210 @@ msgstr "เลือกกลุ่มแพ็คเก็จ" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "ออกจากการติดตั้ง" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "พื้นที่ทำงาน" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "พื้นที่ทำงาน" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "พื้นที่ทำงาน" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "เลือกกลุ่มแพ็คเก็จ" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Individual package selection" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "ขนาดรวม: %d / %d MB " -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "เวอร์ชัน:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "ขนาด:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, fuzzy, c-format msgid "%d KB\n" msgstr "ขนาด: %d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "ความสำคัญ:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "คุณไม่สามารถเลือก/ไม่เลือกแพกเกจนี้" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, fuzzy, c-format msgid "due to missing %s" msgstr "ไม่มี kdesu " -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "คุณไม่สามารถเลือก package นี้เนื่องจากคุณมีพื้นที่ไม่เพียงพอ" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "นี่คือแพกเกจที่ต้องติดตั้ง ไม่สามารถไม่เลือก" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้ มันจำเป็นที่จะต้องถูก upgrade" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "ติดตั้ง" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "เลือกกลุ่มแพ็คเก็จ" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, fuzzy, c-format msgid "Updating package selection" msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, fuzzy, c-format msgid "Minimal install" msgstr "ออกจากการติดตั้ง" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "การบริหารโปรแกรม" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "กำลังติดตั้ง" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, fuzzy, c-format msgid "No details" msgstr "รายละเอียด" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "เวลาที่เหลือ " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "การประเมิน" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "แพ็คเก็จ %d ชุด" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "รวมความ" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "การปรับแต่ง" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, fuzzy, c-format msgid "not configured" msgstr "คอนฟิกใหม่" @@ -1051,7 +1098,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1060,7 +1107,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1342,101 +1389,101 @@ msgid "" msgstr "" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s บน %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "ฮาร์ดแวร์" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Sound card" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, fuzzy, c-format msgid "Do you have an ISA sound card?" msgstr "คุณมีอันอื่นๆอีกหรือไม่?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, fuzzy, c-format msgid "Graphical interface" msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, fuzzy, c-format msgid "Proxies" msgstr "Profile: " -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, fuzzy, c-format msgid "configured" msgstr "คอนฟิกใหม่" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "ระดับความปลอดภัย" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, fuzzy, c-format msgid "activated" msgstr "แอ็คทีฟ" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ไม่ใช้งาน" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "กำลังเตรียมบูตโหลดเดอร์" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "กำลังเตรียมการติดตั้ง" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1445,24 +1492,24 @@ msgid "" "root fs is: root=%s" msgstr "" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s " -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "กำลังเตรียมการติดตั้งลงบน floppy" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1473,12 +1520,12 @@ msgstr "" "\n" "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, fuzzy, c-format msgid "Congratulations" msgstr "ขอแสดงความยินดี" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "" diff --git a/perl-install/install/share/po/tl.po b/perl-install/install/share/po/tl.po index d9f362175..b18d12201 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2004-09-15 13:35+0200\n" "Last-Translator: Arys P. Deloso \n" "Language-Team: Filipino \n" @@ -73,7 +73,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,181 +82,181 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, fuzzy, c-format msgid "Network (HTTP)" msgstr "Network %s" -#: any.pm:123 +#: any.pm:124 #, fuzzy, c-format msgid "Network (FTP)" msgstr "Network %s" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Nakikipag-alam sa web site ng %s para makuha ang talaan ng mga available na " "mirror..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Nakikipag-alam sa web site ng %s para makuha ang talaan ng mga available na " "mirror..." -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Pumili ng mirror kung saan kukunin ang mga package" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Directory" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, fuzzy, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Hindi mahanap ang %s sa %s" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Naghahanap ng mga package na naka-install..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Naghahanap ng mga package na i-a-upgrade..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -270,72 +270,72 @@ msgstr "" "\n" "Gusto ninyo ba talagang tanggalin ang mga package na ito?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "May error sa pagbabasa ng file na %s" -#: any.pm:1140 +#: any.pm:1170 #, fuzzy, c-format msgid "The following disk(s) were renamed:" msgstr "- %s ay tinanggal\n" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "FTP" msgstr "gFTP" -#: any.pm:1199 +#: any.pm:1229 #, fuzzy, c-format msgid "NFS" msgstr "PFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Network" -#: any.pm:1222 +#: any.pm:1252 #, fuzzy, c-format msgid "Please choose a media" msgstr "Pumili ka" -#: any.pm:1238 +#: any.pm:1268 #, fuzzy, c-format msgid "File already exists. Overwrite it?" msgstr "Mayroon ng file. Gamitin ito?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Pahintulot ipinagkaila" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, fuzzy, c-format msgid "Bad media %s" msgstr "idinagdag ang medium na %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Hindi makagawa ng mga screenshot bago mag-partisyon" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ang mga screenshot ay magiging available matapos ang install sa %s" @@ -345,7 +345,7 @@ msgstr "Ang mga screenshot ay magiging available matapos ang install sa %s" msgid "Installation" msgstr "Nag-i-install" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Configuration" @@ -442,42 +442,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "May \"error\" na nangyari" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "May nangyaring fatal error: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d transaksyong pag-i-install ay nabigo" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "Workstation" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Pang-opisina na Workstation" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -486,32 +486,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Pang-laro na istasyon" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Pang-multimedia na istasyon" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Pang-internet na istasyon" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -520,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:40 #, c-format msgid "Network Computer (client)" msgstr "Network Computer (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Kagamitang Pang-Console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Paglinang (Development)" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Dokumentasyon" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Suporta para sa mga third party application" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web Server" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab Server" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Firewall/Router" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet gateway" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, fuzzy, c-format msgid "Mail/News" msgstr "/File/_Bago" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, fuzzy, c-format msgid "Directory Server" msgstr "Directory Kung Saan Kukunin ang Ibabalik" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP Server" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, fuzzy, c-format msgid "DNS/NIS" msgstr "DNS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, fuzzy, c-format msgid "Domain Name and Network Information Server" msgstr "Domain Name Server" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, fuzzy, c-format msgid "File and Printer Sharing Server" msgstr "Printer Server" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS server, Samba server" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Database" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, fuzzy, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL o MariaDB database server" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Mail" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix mail server" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL o MariaDB database server" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Network Computer server" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS server, SMB server, Proxy server, ssh server" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Graphical na Kapaligiran" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE Workstation" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -715,12 +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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME Workstation" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -729,12 +729,41 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE Workstation" + +#: share/meta-task/compssUsers.pl:163 +#, 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME Workstation" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Workstation" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Graphical na Kapaligiran" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -743,52 +772,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Isang graphical environment na may kumpol ng mga user-friendly (madaling " +"gamitin) na application at kagamitang pang-desktop" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Ibang Mga Graphical Desktop" -#: share/meta-task/compssUsers.pl:150 +#: share/meta-task/compssUsers.pl:194 #, fuzzy, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +msgid "Window Maker, Fvwm, etc" msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, fuzzy, c-format msgid "Utilities" msgstr "Philippines" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Server" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, fuzzy, c-format msgid "Webmin" msgstr "Webcam" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, fuzzy, c-format msgid "Webmin Remote Configuration Server" msgstr "Configuration ng Terminal Server" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, fuzzy, c-format msgid "Network Utilities/Monitoring" msgstr "Pagmo-monitor ng Network" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, fuzzy, c-format msgid "Mageia Wizards" msgstr "Mageia Store" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, fuzzy, c-format msgid "Wizards to configure server" msgstr "Nabigong i-configure ang printer na \"%s\"!" @@ -802,7 +853,7 @@ msgstr "" "May \"error\" na nangyari, pero hindi ko alam kung paano ayusin\n" "ng maganda. Mapanganib magpatuloy." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -858,107 +909,107 @@ msgstr "Pagpili ng Pangkat ng mga Package" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Maliitang install" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Pagpili ng Pangkat ng mga Package" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Isa-isang pagpili ng package" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Di-nakapili Lahat" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Kabuuang laki: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Version: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Laki: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Kahalagahan: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Maaari ninyong piliin/di-piliin ang package na ito" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "dahil sa nawawalang %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "dahil sa hindi na-satisfy na %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "sinusubukang i-promote ang %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "para maitago ang %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -966,105 +1017,105 @@ msgid "" msgstr "" "Hindi ninyo maaaring piliin ang package na ito dahil walang sapat na puwang" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Ito ay kinakailangang package, hindi ito maaring di-piliin" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Ipakita kaagad ang mga napiling package" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "I-install" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, fuzzy, c-format msgid "Load/Save selection" msgstr "Pagpili ng package" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Ina-update ang pagpili ng package" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Maliitang install" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Pangangasiwa ng Software" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Piliin ang mga package na gusto ninyong i-install" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Nag-i-install" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Walang detalye" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Nalalabing oras " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Nagkukuro-kuro" -#: steps_gtk.pm:628 +#: 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:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Kabuuan" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Configure" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "hindi na-configure" @@ -1076,7 +1127,7 @@ msgid "" "If you want to skip some of them, you can unselect them now." msgstr "" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1085,7 +1136,7 @@ msgid "" "available once the system is fully installed." msgstr "" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "" @@ -1388,28 +1439,28 @@ msgstr "" "Gusto ninyong i-install ang mga update ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s sa %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Hardware" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Sound card" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Mayroon ba kayong ISA na sound card?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1418,76 +1469,76 @@ msgstr "" "Patakbuhin ang \"alsaconf\" o \"sndconfig\" pagkatapos mag-install para i-" "configure ang iyong sound card" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Graphical interface" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Network & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Mga Proxy" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "na-configure" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Level ng Seguridad" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Firewall" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "na-activate" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "na-disable" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Inihahanda ang bootloader..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Inihahanda ang pag-i-install" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, fuzzy, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1500,7 +1551,7 @@ msgstr "" "Ang install ay magpapatuloy, ngunit kakailanganin ninyong\n" "gamitin ang BootX o ibang paraan para i-boot ang inyong makina" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1509,17 +1560,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:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Magsuksok ng blangkong floppy sa drive %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Lumilikha ng auto install floppy..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1530,12 +1581,12 @@ msgstr "" "\n" "Gusto ninyo ba talagang sumuko ngayon?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Maligayang bati" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "I-reboot" diff --git a/perl-install/install/share/po/tr.po b/perl-install/install/share/po/tr.po index a2ef8e048..6eba712f0 100644 --- a/perl-install/install/share/po/tr.po +++ b/perl-install/install/share/po/tr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-05-09 01:31+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Mageia Turkish Translation Team \n" @@ -81,7 +81,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -94,87 +94,87 @@ msgstr "" "\n" "Yapılandırılacak tamamlayıcı bir veri kaynağınız var mı?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Ağ (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Ağ (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Ağ (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Yansının URL bağlantı adresi?" -#: any.pm:177 +#: any.pm:179 #, 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:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format 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:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Paketleri alacağınız bir yansı adresi seçiniz" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS kurulumu" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Makine adı yok" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Dizin \"/\" ile başlamalıdır." -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS bağı için sunucu adı?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Dizin" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Tamamlayıcı" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -183,22 +183,22 @@ msgstr "" "Bu yansı üzerinde paket listesi bulunamadı. Yerinin doğru olduğundan emin " "olun." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "Core Release" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "Tainted Release" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "Nonfree Release" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " @@ -207,22 +207,22 @@ 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:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "\"%s\" etkinleştirmelisiniz" -#: any.pm:355 +#: any.pm:377 #, 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:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" özgür olmayan yazılım içerir.\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -231,7 +231,7 @@ 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:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " @@ -239,39 +239,39 @@ msgid "" msgstr "" "\"%s\" yazılım patentlerinden dolayı her ülkede dağıtılamayan yazılım içerir." -#: any.pm:359 +#: any.pm:381 #, 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:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "İsterseniz burada daha fazla ortam etkinleştirebilirsiniz." -#: any.pm:378 +#: any.pm:404 #, 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:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Kurulu paketler inceleniyor..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Yükseltilecek paketler bulunuyor" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -284,72 +284,72 @@ msgstr "" "\n" "Bu paketleri kaldırmak istiyor musunuz?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s dosyası okunurken hata oluştu" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Şu diskler yeniden adlandırılacak:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (eski adı %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Ağ" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Lütfen bir medya seçin" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Bu dosya zaten var. Üzerine yazılsın mı?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "İzin verilmedi" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Kötü NFS adı" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Kötü veri kaynağı %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Disk bölümlemesi yapılmadan ekran örnekleri alınamaz." -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "Ekran örnekleri %s kurulduktan sonra mümkün olacak" @@ -359,7 +359,7 @@ msgstr "Ekran örnekleri %s kurulduktan sonra mümkün olacak" msgid "Installation" msgstr "Kurulum" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Yapılandırma" @@ -458,42 +458,42 @@ msgstr "" "%s tarafından istenen bazı paketler kurulamaz:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Bir hata oluştu:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Bir ölümcül hata oluştu: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Yeniden sorma" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d kurulum yönergesi başarısız oldu" -#: pkgs.pm:908 +#: pkgs.pm:913 #, 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:14 #, c-format msgid "Workstation" msgstr "İş istasyonu" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Ofis iş istasyonu" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -502,32 +502,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Oyun Konsolu" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Çoklu ortam konsolu" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet konsolu" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -536,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:40 #, c-format msgid "Network Computer (client)" msgstr "Ağ Makinası (client)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsol Araçları" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Geliştirme" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Belgeler" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web Sunucu" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Grup" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet ağ geçidi" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Posta/Haber" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Dizin Sunucusu" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP sunucusu" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Alan adı ve Ağ Bilgileri Sunucusu" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Veritabanı" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL veya MariaDB veritabanı sunucusu" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache ve Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Posta" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix posta sunucu" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL veya MariaDB veritabanı sunucusu" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Ağ Makinası sunucusu" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafik Ortamı" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE İş istasyonu" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME İş istasyonu" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -742,12 +742,40 @@ 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:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE İş istasyonu" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, 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 görsel bir ortam " + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME İş istasyonu" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "İş istasyonu" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafik Ortamı" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE Masaüstü" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -756,52 +784,74 @@ msgstr "" "Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel " "ortam" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Kişisel Masaüstü" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel " +"ortam" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Diğer Görsel Masaüstleri" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, etc" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Araçlar" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH Sunucu" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin Uzak Yapılandırma Sunucusu" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Ağ Araçları/İzleme" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia Sihirbazları" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Sunucuyu yapılandırmak için Sihirbazlar" @@ -815,7 +865,7 @@ msgstr "" "Bir hata oluştu, ancak sebebi saptanamadı.\n" "Devam edebilirsiniz, ama risk size ait!" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -870,210 +920,210 @@ msgstr "Paket Grubu Seçimi" msgid "Install %s KDE Desktop" msgstr "%s KDE Masaüstünü Kur" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "%s GNOME Masaüstünü Kur" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Kişisel kurulum" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE Masaüstü" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME Masaüstü" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Kişisel Masaüstü" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, 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:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Paket Grubu Seçimi" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Tek tek paket seçimi" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Tümünü Seçimden Çıkar" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Toplam boyut: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Sürüm: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Boyut: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Önem: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Bu paket seçimlik değildir" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s paketinin kayıplığından" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "%s' den dolayı yetersiz" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s yükseltmesi deneniyor" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s'i korumak için" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "Yeterli yeriniz kalmadığından bu paketi seçemezsiniz" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Bu zorunlu bir pakettir, seçmemek olmaz" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Bu paketi seçimlerinizden çıkaramazsınız. Zaten kurulmuş." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Bu paketi seçimlerinizden çıkaramazsınız. Yükseltilmek zorunda" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Kendiliğinden seçilen paketleri göster" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Kur" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Seçimi kaydet/yükle" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Paket seçimini güncelleniyor" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "En ufak kurulum" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Yazılım Yöneticisi" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Kurmak istediğiniz paketleri seçin" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Kuruluyor" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Ayrıntısız" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Kalan süre :" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(tahminen...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d paket" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Özet" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Yapılandır" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "yapılandırılmamış" @@ -1087,7 +1137,7 @@ msgstr "" "Şu kurulum medyası bulundu.\n" "Bu bazılarını geçmek isterseniz, şimdi seçimden çıkarabilirsiniz." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1099,7 +1149,7 @@ msgstr "" "Sabit diskten kuruluma devam edilecek ve paketler sistem tamamen " "kurulduğunda da hazır olacaktır." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "CD'lerin tamamını kopyala" @@ -1134,8 +1184,7 @@ msgstr "Bu bir yükleme mi yoksa yükseltme mi ?" msgid "" "_: This is a noun:\n" "Install" -msgstr "" -"Kurulum" +msgstr "Kurulum" #: steps_interactive.pm:161 #, c-format @@ -1412,28 +1461,28 @@ msgstr "" "Güncellemeleri kurmak istiyor musunuz ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s üstündeki %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Donanım" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Ses Kartı" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Bir ISA ses kartınız var mı?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1442,73 +1491,73 @@ msgstr "" "Ses kartınızı yapılandırmak için kurulumdan sonra \"sndconfig\" aracını " "çalıştırın." -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "Ses kartı bulunamadı. Kurulumdan sonra \"harddrake\" ile deneyin." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafiksel arabirim" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Ağ & İnternet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Vekil Sunucular" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "yapılandırıldı" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Güvenlik Seviyesi" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Güvenlik Duvarı" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "etkinleştirilmiş" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "pasifleştirilmiş" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "X'i yapılandırmadınız. Bunu yapmak istediğinizden emin misiniz?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Önyükleyici hazırlanıyor" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "Birincil başlangıç uygulaması hazırlanıyor..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Sabredin, bu biraz zaman alabilir..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1521,7 +1570,7 @@ msgstr "" "açmak için BootX veya benzeri araçlar kullanmak zorunda kalacaksınız. root " "fs için kernel argümanı: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1530,17 +1579,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:1119 +#: steps_interactive.pm:1122 #, 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:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Otomatik kurulum disketi hazırlanıyor" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1551,12 +1600,12 @@ msgstr "" "\n" "Gerçekten çıkmak istiyormusunuz?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Tebrikler" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Yeniden başlat" diff --git a/perl-install/install/share/po/uk.po b/perl-install/install/share/po/uk.po index 1e2af004e..d70e0ecf2 100644 --- a/perl-install/install/share/po/uk.po +++ b/perl-install/install/share/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-21 19:31+0300\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2013-10-10 15:24+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff --git a/perl-install/install/share/po/uz.po b/perl-install/install/share/po/uz.po index bc707a256..b15482273 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-01-07 11:35+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: American English \n" @@ -76,7 +76,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,91 +89,91 @@ msgstr "" "\n" "Moslanishi kerak boʻlgan qoʻshimcha oʻrnatish manbasi bormi?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Kompakt-disk" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Tarmoq (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Tarmoq (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Tarmoq (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Oynaning manzili (URL)" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Manzil ftp:// yoki http:// bilan boshlanishi kerak" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Mavjud boʻlgan oynalarning roʻyxatini olish uchun %s sayti bilan aloqa " "oʻrnatilmoqda..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Mavjud boʻlgan oynalarning roʻyxatini olish uchun %s sayti bilan aloqa " "oʻrnatib boʻlmadi" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Paketlarni olish uchun oynani tanlang" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS orqali oʻrnatish" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "NFS toʻplamining kompyuter nomini va direktoriyani kiriting" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Kompyuterning nomi koʻrsatilmagan" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Direktoriya \"/\" belgi bilan boshlashi kerak" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS serverining xost nomi" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Direktoriya" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Qoʻshimcha" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -182,90 +182,90 @@ msgstr "" "Oynada paketlar roʻyxatini topib boʻlmadi. Manzil (URL) toʻgʻri " "koʻrsatilganligini tekshiring." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\" toʻplamidan hamma paketlarga eʼtibor berilmasin" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Allaqachon oʻrnatilgan paketlar qidirilmoqda..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Yangilash uchun paketlar qidirilmoqda..." -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -278,72 +278,72 @@ msgstr "" "\n" "Davom etishni istaysizmi?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s faylini oʻqishda xato roʻy berdi" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Quyidagi disk(lar)ning nomi oʻzgartirildi:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (oldingi nomi %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Tarmoq" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Iltimos toʻplamni tanlang" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Fayl allaqachon mavjud. Uni almashtirishni istaysizmi?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Ruxsat yoʻq" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "NFS nomi notoʻgʻri" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Notoʻgʻri toʻplam %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Skrinshotlarni diskni boʻlishdan avval olib boʻlmaydi" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "Installation" msgstr "Oʻrnatish" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Moslash" @@ -452,42 +452,42 @@ msgstr "" "%s talab qiladigan baʼzi paketlarni oʻrnatib boʻlmaydi:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Xato roʻy berdi:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Juda jiddiy xato roʻy berdi: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d oʻrnatish tranzaksiyasi muvaffaqiyatsiz tugadi" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Paketlarni oʻrnatib boʻlmadi:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Ish stansiyasi" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Idora stansiyasi" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,32 +496,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Oʻyin stansiyasi" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Multimedia stansiyasi" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet stansiyasi" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -530,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:40 #, c-format msgid "Network Computer (client)" msgstr "Tarmoqdagi kompyuter (klient)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Konsol vositalari" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Tuzish" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Qoʻllanmalar" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Uchinchi tomon dastur tuzuvchilari qoʻllanuvi" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Veb-serveri" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab serveri" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Fayervol/Ruter" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet geytveyi" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Xat-xabar/Yangiliklar" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Direktoriya serveri" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP serveri" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS va NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Maʼlumot bazasi" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL va MariaDB maʼlumot bazasi" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Xat-xabar" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix xat-xabar serveri" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL yoki MariaDB maʼlumot bazasi" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Tarmoqdagi kompyuter (server)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS serveri, SMB serveri, Proxy serveri, SSH serveri" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "Grafik muhit" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE stansiyasi" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE - vositalar toʻplami bilan birga asosiy grafik muhit" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME stansiyasi" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -737,12 +737,41 @@ msgstr "" "Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat " "grafik muhit" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE stansiyasi" + +#: share/meta-task/compssUsers.pl:163 +#, 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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME stansiyasi" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Ish stansiyasi" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Grafik muhit" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE ish stoli" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -751,53 +780,75 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Boshqa ish stoli" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Foydalanuvchi uchun qulay dasturlar va ish stoli vosilari mavjud boʻlgan " +"yengil va tez ishlovchi grafik muhit" + +#: share/meta-task/compssUsers.pl:193 #, 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:194 +#, 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:217 #, c-format msgid "Utilities" msgstr "Vositalar" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH serveri" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin masofadan boshqarish serveri" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Tarmoq vositalari/Nazorat qilish" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia yordamchilari" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Serverni moslash uchun yordamchilar" @@ -811,7 +862,7 @@ msgstr "" "Xatolik yuz berdi ammo uning sababi aniqlanmadi.\n" "Tavvakkal qilgan holda davom etishingiz mumkin." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -867,107 +918,107 @@ msgstr "Manbani tanlash" msgid "Install %s KDE Desktop" msgstr "KDE ish stoli" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, fuzzy, c-format msgid "Install %s GNOME Desktop" msgstr "GNOME ish stoli" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Boshqa" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE ish stoli" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME ish stoli" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Boshqa ish stoli" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Bu '%s' ish stolining koʻrinishi." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, 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:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Paketlarni guruh boʻyicha tanlash" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Paketlarni bittama-bitta tanlash" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Hech qaysi tanlanmasin" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Jami: %d / %d Mb" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Versiyasi: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Hajmi: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Kb\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Muhimligi: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Bu paketni tanlolmaysiz/tanlashni bekor qilolmaysiz" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s yetishmagani uchun" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s ativlashtirishga harakat qilinmoqda" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s'ni qoldirish uchun" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -975,104 +1026,104 @@ msgid "" msgstr "" "Bu paketni tanlolmaysiz, chunki uni oʻrnatish uchun yetarli joy mavjud emas." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Quyidagi paketlar oʻrnatiladi" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Quyidagi paketlar olib tashlaniladi." -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Bu paketni tanlashni bekor qilolmaysiz. U allaqachon oʻrnatilgan." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Bu paketni tanlashni bekor qilolmaysiz. U yangilanishi shart." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Avtomatik ravishda tanlangan paketlarni koʻrsatish" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Oʻrnatish" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Tanlanganni yuklash/saqlash" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Paketlar tanlovi yangilanmoqda" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Minimal oʻrnatish" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Dasturlar boshqaruvi" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Siz oʻrnatmoqchi boʻlgan paketlarni tanlang" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Oʻrnatilmoqda" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Tafsilotlarsiz" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Qolgan vaqt:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(chamalanmoqda)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d-ta paket" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Hisobot" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Moslash" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "moslanmagan" @@ -1086,7 +1137,7 @@ msgstr "" "Quyidagi oʻrnatish manbalari aniqlandi.\n" "Faqat tanlangan manbalar oʻrnatish uchun ishlatiladi." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1098,7 +1149,7 @@ msgstr "" "nusxa olish mumkin.\n" "Oʻrnatish toʻliq tugagandan soʻng ular tizimga maʼlum boʻladi." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Butun diskdan nusxa olish" @@ -1396,28 +1447,28 @@ msgstr "" "Yangilanishlarni oʻrnatishni istaysizmi?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s %s'da" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Asbob-uskunalar" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Tovush karta" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Sizda ISA tovush kartasi bormi?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1426,75 +1477,75 @@ msgstr "" "Oʻrnatishdan keyin, tovush kartangizni moslash uchun, \"sndconfig\" yoki " "\"alsaconf\" dasturini ishga tushiring" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Grafik interfeys" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Tarmoq va Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proksilar" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "moslangan" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Xavfsizlik darajasi" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Fayervol" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ishlayapti" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "oʻchirilgan" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Siz X'ni moslamadingiz. Rostdan buni istaysizmi?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "OT yuklagichi tayyorlanmoqda..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Oʻrnatishga tayyorlanmoqda" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Kutib turing, bu biroz vaqt olishi mumkin..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1507,7 +1558,7 @@ msgstr "" "tizimni yuklash uchun BootX yoki boshqa usuldan foydalanishingiz lozim " "boʻladi. Root fayl tizimi uchun uchun kernel argumenti: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1516,17 +1567,17 @@ msgstr "" "Ushbu xavfsizlik daraja qoʻllanilganda diskning Windows qismidagi fayllarga " "faqat administrator murojaat qilishi mumkin." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Boʻsh disketni %s uskunasiga qoʻying" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Avto-oʻrnatish disketi yaratilmoqda..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1537,12 +1588,12 @@ msgstr "" "\n" "Rostdan chiqishni istaysizmi?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Tabriklaymiz!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Oʻchirib-yoqish" diff --git a/perl-install/install/share/po/uz@cyrillic.po b/perl-install/install/share/po/uz@cyrillic.po index 21bfc9d16..74cb13a79 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: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2010-01-07 11:35+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: American English \n" @@ -76,7 +76,7 @@ msgid "Do you have further supplementary media?" msgstr "Сизда қўшимча компакт-диск борми?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -89,91 +89,91 @@ msgstr "" "\n" "Мосланиши керак бўлган қўшимча ўрнатиш манбаси борми?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Компакт-диск" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Тармоқ (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Тармоқ (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Тармоқ (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Ойнанинг манзили (URL)" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Манзил ftp:// ёки http:// билан бошланиши керак" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "" "Мавжуд бўлган ойналарнинг рўйхатини олиш учун %s сайти билан алоқа " "ўрнатилмоқда..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Мавжуд бўлган ойналарнинг рўйхатини олиш учун %s сайти билан алоқа ўрнатиб " "бўлмади" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Пакетларни олиш учун ойнани танланг" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS орқали ўрнатиш" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "NFS тўпламининг компьютер номини ва директорияни киритинг" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "Компьютернинг номи кўрсатилмаган" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Директория \"/\" белги билан бошлаши керак" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS серверининг хост номи" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Директория" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Қўшимча" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -182,90 +182,90 @@ msgstr "" "Ойнада пакетлар рўйхатини топиб бўлмади. Манзил (URL) тўғри " "кўрсатилганлигини текширинг." -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "\"%s\" тўпламидан ҳамма пакетларга эътибор берилмасин" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Аллақачон ўрнатилган пакетлар қидирилмоқда..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Янгилаш учун пакетлар қидирилмоқда..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "Янгилашдан аввал пакетлар олиб ташланмоқда..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -278,72 +278,72 @@ msgstr "" "\n" "Давом этишни истайсизми?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "%s файлини ўқишда хато рўй берди" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Қуйидаги диск(лар)нинг номи ўзгартирилди:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (олдинги номи %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Тармоқ" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Илтимос тўпламни танланг" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Файл аллақачон мавжуд. Уни алмаштиришни истайсизми?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Рухсат йўқ" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "NFS номи нотўғри" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Нотўғри тўплам %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "Скриншотларни дискни бўлишдан аввал олиб бўлмайди" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "Installation" msgstr "Ўрнатиш" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Мослаш" @@ -452,42 +452,42 @@ msgstr "" "%s талаб қиладиган баъзи пакетларни ўрнатиб бўлмайди:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Хато рўй берди:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Жуда жиддий хато рўй берди: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d ўрнатиш транзакцияси муваффақиятсиз тугади" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "Пакетларни ўрнатиб бўлмади:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Иш станцияси" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Идора станцияси" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -496,32 +496,32 @@ msgstr "" "Идора учун дастурлар: матн процессорлари (LibreOffice Writer, Kword), " "электрон жадваллар (LibreOffice Calc, Kspread), PDF кўрувчилар ва ҳоказо" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "Ўйин станцияси" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "Мултимедиа станцияси" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Интернет станцияси" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -530,205 +530,205 @@ msgstr "" "Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр " "қилиш учун воситалар тўплами" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "Тармоқдаги компьютер (клиент)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "Компьютерни мослашни енгилаштириш учун воситалар" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Консол воситалари" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Тузиш" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C ва C++ тузиш кутубхоналари, воситалар ва хедер файллар" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Қўлланмалар" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Учинчи томон дастур тузувчилари қўллануви" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Веб-сервери" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab сервери" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Файервол/Рутер" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет гейтвэйи" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Хат-хабар/Янгиликлар" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix хат-хабар сервери, Inn янгиликлар сервери" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Директория сервери" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP сервери" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "DNS ва NIS" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "Файл ва принтерни бўлишиш сервери" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS сервери, Samba сервери" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Маълумот базаси" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL ва MariaDB маълумот базаси" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache, Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Хат-хабар" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix хат-хабар сервери" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL ёки MariaDB маълумот базаси" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "Тармоқдаги компьютер (сервер)" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "График муҳит" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE станцияси" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME станцияси" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -737,12 +737,41 @@ msgstr "" "Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график " "муҳит" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE станцияси" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график " +"муҳит" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME станцияси" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Иш станцияси" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "График муҳит" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE иш столи" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -751,52 +780,74 @@ msgstr "" "Фойдаланувчи учун қулай дастурлар ва иш столи восилари мавжуд бўлган енгил " "ва тез ишловчи график муҳит" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Бошқа иш столи" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Фойдаланувчи учун қулай дастурлар ва иш столи восилари мавжуд бўлган енгил " +"ва тез ишловчи график муҳит" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Бошқа график иш столлари" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, ва ҳоказо" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Воситалар" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH сервери" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin масофадан бошқариш сервери" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Тармоқ воситалари/Назорат қилиш" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "Назорат қилиш воситалари, вазифалар ҳисоботчилари, tcpdump, nmap, ..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia ёрдамчилари" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Серверни мослаш учун ёрдамчилар" @@ -810,7 +861,7 @@ msgstr "" "Хатолик юз берди аммо унинг сабаби аниқланмади.\n" "Тавваккал қилган ҳолда давом этишингиз мумкин." -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -865,107 +916,107 @@ msgstr "Манбани танлаш" msgid "Install %s KDE Desktop" msgstr "KDE иш столи" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, fuzzy, c-format msgid "Install %s GNOME Desktop" msgstr "GNOME иш столи" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "Бошқа" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE иш столи" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME иш столи" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "Бошқа иш столи" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "Бу '%s' иш столининг кўриниши." -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "Иш столини яқинроқдан кўриш учун расмни сичқонча билан босинг" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Пакетларни гуруҳ бўйича танлаш" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Пакетларни биттама-битта танлаш" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Ҳеч қайси танланмасин" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Жами: %d / %d Мб" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Версияси: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Ҳажми: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Кб\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Муҳимлиги: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Бу пакетни танлолмайсиз/танлашни бекор қилолмайсиз" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "%s етишмагани учун" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "%s ативлаштиришга ҳаракат қилинмоқда" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "%s'ни қолдириш учун" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -973,103 +1024,103 @@ msgid "" msgstr "" "Бу пакетни танлолмайсиз, чунки уни ўрнатиш учун етарли жой мавжуд эмас." -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "Қуйидаги пакетлар ўрнатилади" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "Қуйидаги пакетлар олиб ташланилади." -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "Бу ўрнатилиши шарт бўлган пакет, уни танлашни бекор қилиб бўлмайди." -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "Бу пакетни танлашни бекор қилолмайсиз. У аллақачон ўрнатилган." -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "Бу пакетни танлашни бекор қилолмайсиз. У янгиланиши шарт." -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Автоматик равишда танланган пакетларни кўрсатиш" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Ўрнатиш" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Танланганни юклаш/сақлаш" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Пакетлар танлови янгиланмоқда" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Минимал ўрнатиш" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Дастурлар бошқаруви" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Ўрнатилмоқда" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Тафсилотларсиз" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "Қолган вақт:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(чамаланмоқда)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d-та пакет" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Ҳисобот" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Мослаш" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "мосланмаган" @@ -1083,7 +1134,7 @@ msgstr "" "Қуйидаги ўрнатиш манбалари аниқланди.\n" "Фақат танланган манбалар ўрнатиш учун ишлатилади." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1095,7 +1146,7 @@ msgstr "" "олиш мумкин.\n" "Ўрнатиш тўлиқ тугагандан сўнг улар тизимга маълум бўлади." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Бутун дискдан нусха олиш" @@ -1391,28 +1442,28 @@ msgstr "" "Янгиланишларни ўрнатишни истайсизми?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s %s'да" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Асбоб-ускуналар" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Товуш карта" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Сизда ISA товуш картаси борми?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1421,75 +1472,75 @@ msgstr "" "Ўрнатишдан кейин, товуш картангизни мослаш учун, \"sndconfig\" ёки \"alsaconf" "\" дастурини ишга туширинг" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "" "Товуш картаси топилмади. Ўрнатишдан кейин \"harddrake\" дастурини синаб " "кўринг." -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "График интерфейс" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Тармоқ ва Интернет" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Проксилар" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "мосланган" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Хавфсизлик даражаси" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Файервол" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "ишлаяпти" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "ўчирилган" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "ОТ юклагичи тайёрланмоқда..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Ўрнатишга тайёрланмоқда" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "Кутиб туринг, бу бироз вақт олиши мумкин..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1502,7 +1553,7 @@ msgstr "" "учун BootX ёки бошқа усулдан фойдаланишингиз лозим бўлади. Root файл тизими " "учун учун кернел аргументи: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1511,17 +1562,17 @@ msgstr "" "Ушбу хавфсизлик даража қўлланилганда дискнинг Windows қисмидаги файлларга " "фақат администратор мурожаат қилиши мумкин." -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Бўш дискетни %s ускунасига қўйинг" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Авто-ўрнатиш дискети яратилмоқда..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1532,12 +1583,12 @@ msgstr "" "\n" "Ростдан чиқишни истайсизми?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Табриклаймиз!" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Ўчириб-ёқиш" diff --git a/perl-install/install/share/po/vi.po b/perl-install/install/share/po/vi.po index a0a97c12c..24c89f552 100644 --- a/perl-install/install/share/po/vi.po +++ b/perl-install/install/share/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-vi version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-06-02 21:17+0700\n" "Last-Translator: Larry Nguyen \n" "Language-Team: \n" @@ -73,7 +73,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -82,177 +82,177 @@ msgid "" "Do you have a supplementary installation medium to configure?" msgstr "" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Mạng (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Mạng (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "URL của mirror?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "Đang kết nối với website của %s để lấy danh sách các mirrors hiệncó..." -#: any.pm:193 +#: any.pm:195 #, fuzzy, 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 %s để lấy danh sách các mirrors hiệncó..." -#: any.pm:203 +#: any.pm:205 #, 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:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Thư mục" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "Không thể tìm tập tin hdlist trên mirror này" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Kiểm tra các gói đã được cài đặt..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Đang tìm các gói để nâng cấp" -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -265,72 +265,72 @@ msgstr "" "\n" "Bạn có thật sự muốn gỡ bỏ các gói tin này không?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "Lỗi khi đọc tập tin %s" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Đã đổi tên (các) đĩa sau:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (tên cũ là %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Mạng" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Hãy chọn phương tiện" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Tập tin tồn tại. Có ghi đè nó không?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Quyền hạn bị từ chối" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Phương tiện hỏng %s" -#: any.pm:1355 +#: any.pm:1385 #, 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:1363 +#: any.pm:1393 #, 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" @@ -340,7 +340,7 @@ msgstr "Sẽ có ảnh chụp sau quá trình cài đặt trong %s" msgid "Installation" msgstr "Đang cài đặt" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Cấu hình" @@ -436,42 +436,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Lỗi xảy ra" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "Xả ra lỗi trầm trọng: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Đừng hỏi nữa " -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d phiên giao dịch cài đặt lỗi" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Đang cài đặt gói %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Máy trạm" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Văn phòng" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -480,226 +480,226 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Trò chơi" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Đa phương tiện" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Internet" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "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:40 #, 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:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Các công cụ console" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, 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:57 share/meta-task/compssUsers.pl:203 #, 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:61 share/meta-task/compssUsers.pl:207 #, 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:62 share/meta-task/compssUsers.pl:208 #, 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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "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:77 #, c-format msgid "Web Server" msgstr "Máy chủ Web" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Groupware" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Cổng kết nối Internet" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Mail/News" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix mail server, Inn news server" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "Máy chủ thư mục" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Máy chủ FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Máy chủ thông tin mạng và tên miền" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Cơ sở dữ liệu" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache và Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Thư" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Máy chủ thư Postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Máy chủ mạng" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Môi trường đồ hoạ" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -707,12 +707,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:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME Workstation" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -720,12 +720,40 @@ 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 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"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:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME Workstation" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Máy trạm" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Môi trường đồ hoạ" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "IceWm Desktop" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -733,52 +761,73 @@ 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:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "IceWm Desktop" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"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:193 #, c-format msgid "Other Graphical Desktops" msgstr "Các màn hình nền đồ hoạ khác" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, v.v..." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, 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:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Máy chủ SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Cấu hình máy chủ từ xa Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, 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:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Đồ thuật Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Đồ thuật cấu hình máy chủ" @@ -792,7 +841,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -846,210 +895,210 @@ msgstr "Nhóm gói tin được chọn" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Cài đặt tối thiểu" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "IceWm Desktop" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Nhóm gói tin được chọn" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Chọn các gói riêng" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Mọi thứ không được chọn" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Kích thước toàn bộ: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Phiên bản:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Kích thước:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Quan trọng:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format 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:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "vì thiếu %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "vì không thỏa mãn %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "thử xúc tiến %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "để giữ %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "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:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: 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:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Cài đặt" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Nạp/Lưu lựa chọn" -#: steps_gtk.pm:513 +#: 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:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Cài đặt tối thiểu" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Quản Lý Phần Mềm" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Chọn các gói bạn muốn cài đặt " -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Đang cài đặt" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Không có thông tin" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Thời gian còn lại" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Đang ước lượng" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d các gói" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Tóm tắt" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Cấu hình" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "chưa được cấu hình" @@ -1063,7 +1112,7 @@ msgstr "" "Phát hiện thấy phương tiện cài đặt sau đây.\n" "Nếu không dùng, hãy bỏ chọn chúng." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1076,7 +1125,7 @@ msgstr "" "Sau đó tiếp tục tiến hành cài đặt từ đĩa cứng và các gói vẫn sẵn dùng ngay " "sau khi cài đặt xong hệ thống." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Sao chép toàn bộ CD" @@ -1373,28 +1422,28 @@ msgstr "" "Bạn có muốn cài đặt các gói cập nhật không ?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s trên %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Phần cứng" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Card âm thanh" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Bạn có card âm thanh ISA không ?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1403,74 +1452,74 @@ msgstr "" "Chạy lệnh \"alsaconf\" hoặc \"sndconfig\" sau khi cài đặt để cấu hìnhcard âm " "thanh" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Giao diện đồ họa" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Mạng & Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Proxies" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "đã cấu hình" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Mức Bảo Mật" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Tường lửa" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "Đã kích hoạt" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "Đã tắt" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Đang chuẩn bị trình khởi động" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Chuẩn bị cài đặt" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1483,7 +1532,7 @@ msgstr "" "phương tiện khác để khởi động máy tính. Đối số của kernel cho root fs là: " "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1492,17 +1541,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:1119 +#: steps_interactive.pm:1122 #, 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:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Đang tạo đĩa mềm cài đặt tự động" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1513,12 +1562,12 @@ msgstr "" "\n" "Bạn thực sự muốn thoát ra bây giờ?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Chúc mừng" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Khởi động lại" diff --git a/perl-install/install/share/po/wa.po b/perl-install/install/share/po/wa.po index 029f10d5a..4aa08f1d7 100644 --- a/perl-install/install/share/po/wa.po +++ b/perl-install/install/share/po/wa.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2005-02-24 21:42+0100\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: Walloon \n" @@ -76,7 +76,7 @@ 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:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -90,89 +90,89 @@ msgstr "" "\n" "Avoz vs cor on sopoirt d' astalaedje a-z apontyî?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "Plake lazer" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "Rantoele (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "Rantoele (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "Rantoele (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "Hårdêye do muroe?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "Li hårdêye doet cmincî avou «ftp://» ou «http://»" -#: any.pm:188 +#: any.pm:190 #, c-format 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:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "" "Dji n' a savou atôtchî l' waibe da %s po-z aveur li djivêye des muroes k' i " "gn a" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "Tchoezixhoz on muroe po nd aberweter des pacaedjes foû" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "Apontiaedje NFS" -#: any.pm:234 +#: any.pm:236 #, 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:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "I manke li no d' lodjoe" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "Li ridant doet cmincî avou «/»" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "No d' lodjoe do montaedje NFS?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "Ridant" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "Di rawete" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " @@ -181,90 +181,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:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "Passer houte di tos les pacaedjes do sopoirt «%s»" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "Dji cwir après les pacaedjes ki sont ddja astalés..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "Dji cwir après les pacaedjes a mete a djoû" -#: any.pm:498 +#: any.pm:527 #, 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:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -278,72 +278,72 @@ msgstr "" "\n" "Voloz vs vormint oister ces pacaedjes la?\n" -#: any.pm:932 +#: any.pm:962 #, 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:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "Les plakes shuvantes ont candjî d' no:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (lomêye divant %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Rantoele" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "Tchoezixhoz on sopoirt s' i vs plait" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "Li fitchî egzistêye dedja. El voloz vs sipotchî?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "Permission rfuzêye" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "Måva no NFS" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "Måva sopoirt %s" -#: any.pm:1355 +#: any.pm:1385 #, 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:1363 +#: any.pm:1393 #, 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" @@ -353,7 +353,7 @@ msgstr "Les waitroûlêyes seront metowes el ridant %s après l' astalaedje" msgid "Installation" msgstr "Astalaedje" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Apontiaedje" @@ -449,42 +449,42 @@ msgid "" "%s" msgstr "" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, fuzzy, c-format msgid "An error occurred:" msgstr "Dj' aroke so ene sacwè" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "I gn a-st avou èn aroke moirt: %s." -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete" -#: pkgs.pm:908 +#: pkgs.pm:913 #, fuzzy, c-format msgid "Installation of packages failed:" msgstr "Dj' astale li pacaedje %s" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "Posse éndjolrece" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "Posse di buro" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -493,32 +493,32 @@ msgstr "" "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:24 #, c-format msgid "Game station" msgstr "Posse di djeus" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, 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:28 #, c-format msgid "Multimedia station" msgstr "Posse multimedia" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, 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:34 #, c-format msgid "Internet station" msgstr "Posse pol rantoele daegnrece" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " @@ -527,193 +527,193 @@ msgstr "" "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:40 #, c-format msgid "Network Computer (client)" msgstr "Copiutrece rantoele (cliyint)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, 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:47 #, 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:51 #, c-format msgid "Console Tools" msgstr "Usteyes pol conzôle" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Programaedje" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "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:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Documintåcion" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "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:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Sierveu waibe" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "Ovraedje e groupe" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, 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:86 share/meta-task/compssUsers.pl:136 #, 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:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Pasrele pol rantoele daegnrece" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "Emilaedje/Copinreyes" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, 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:95 #, c-format msgid "Directory Server" msgstr "Sierveu d' botins" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "Sierveu FTP" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "Sierveu di nos d' dominne eyet d' informåcion rantoele" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, 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:111 #, 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:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "Sierveu, båzes di dnêyes" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format 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:121 #, c-format msgid "Web/FTP" msgstr "Sierveu, Waibe/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache eyet Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "Emilaedje" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Sierveu d' emilaedje postfix" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format 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:140 #, c-format msgid "Network Computer server" msgstr "Copiutrece sierveu sol rantoele" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, 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:148 #, c-format msgid "Graphical Environment" msgstr "Evironmint grafike" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "Posse éndjolrece KDE" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " @@ -722,12 +722,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:156 #, c-format msgid "GNOME Workstation" msgstr "Posse éndjolrece GNOME" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " @@ -736,12 +736,41 @@ msgstr "" "Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol " "sicribanne" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "Posse éndjolrece KDE" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "" +"Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol " +"sicribanne" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "Posse éndjolrece GNOME" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "Posse éndjolrece" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "Evironmint grafike" + +#: share/meta-task/compssUsers.pl:177 #, fuzzy, c-format msgid "LXDE Desktop" msgstr "Sicribanne IceWm" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, fuzzy, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " @@ -750,52 +779,74 @@ 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:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "Sicribanne IceWm" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "" +"Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol " +"sicribanne" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "Ôtes sicribannes grafikes" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker, Enlightenment, Fvwm, evnd." -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Usteyes" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Sierveu SSH" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Sierveu d' apontiaedje då lon Webmin" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "Usteyes rantoele/Corwaitaedje" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, 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:234 #, c-format msgid "Mageia Wizards" msgstr "Macreas Mageia" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "Macreas po-z apontyî on sierveu" @@ -809,7 +860,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:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -865,107 +916,107 @@ msgstr "Tchoezi les groupes di pacaedjes" msgid "Install %s KDE Desktop" msgstr "" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, fuzzy, c-format msgid "Custom install" msgstr "Astalåcion minimåle" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, fuzzy, c-format msgid "KDE Desktop" msgstr "Sicribanne IceWm" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, fuzzy, c-format msgid "GNOME Desktop" msgstr "Sicribanne IceWm" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, fuzzy, c-format msgid "Custom Desktop" msgstr "Sicribanne IceWm" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Tchoezi les groupes di pacaedjes" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Tchoezi tchaeke pacaedje sepårumint" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "Distchoezi tot" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Grandeu å totå: %d / %d Mo" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "Modêye: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "Grandeu: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d Ko\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "Impôrtance: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "Vos n' poloz nén tchoezi/distchoezi ci pacaedje chal" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "cåze di %s ki manke" -#: steps_gtk.pm:457 +#: 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:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "dji saye di promouvwer %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "po wårder %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " @@ -974,104 +1025,104 @@ msgstr "" "Vos n' poloz tchoezi ci pacaedje chal ca n' a nén del plaece assez ki po " "l' astaler" -#: steps_gtk.pm:467 +#: 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:468 +#: 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:494 +#: steps_gtk.pm:500 #, c-format 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:496 +#: steps_gtk.pm:502 #, c-format 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:498 +#: steps_gtk.pm:504 #, c-format 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:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "Mostrer les pacaedjes tchoezis otomaticmint" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "Astalaedje" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "Tcherdjî/schaper li tchuze des pacaedjes" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "Metaedje a djoû del tchuze des pacaedjes" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "Astalåcion minimåle" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "Manaedjaedje di programes" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Tchoezixhoz les pacaedjes k' vos voloz astaler" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "Astalant" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "Po vey les rclames" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, fuzzy, c-format msgid "Time remaining:" msgstr "Tins ki dmeure " -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, fuzzy, c-format msgid "(estimating...)" msgstr "Dj' asteme" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d pacaedje" msgstr[1] "%d pacaedjes" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "Rascourti éndjolreye" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "Apontyî" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "nén apontyî" @@ -1086,7 +1137,7 @@ msgstr "" "Si vos vloz passer houte di sacwants d' zels, vos les ploz asteure " "distchoezi." -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1099,7 +1150,7 @@ msgstr "" "L' astalaedje si frè-st adon a pårti del deure plake, eyet les pacaedjes " "vont dmorer disponibes on côp ki l' sistinme serè astalé." -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Copyî les plakes lazer en etir" @@ -1404,28 +1455,28 @@ msgstr "" "Voloz vs astaler les pacaedjes metous a djoû?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%s so %s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Éndjolreye" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Cåte son" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "Avoz vs ene cåte son ISA?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " @@ -1434,75 +1485,75 @@ msgstr "" "Enondez «alsaconf» ou «sndconfig» après l' astalåcion po-z apontyî vosse " "cåte son" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, 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:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Eterface grafike" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Rantoele locåle & daegnrece" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "Procsis" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "apontyî" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "Livea di såvrité" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "Côpe feu" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "metou en alaedje" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "dismetou" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, 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:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "Dj' aprestêye l' enondrece" #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, fuzzy, c-format msgid "Preparing initial startup program..." msgstr "Dj' aprestêye l' astalaedje" -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "" -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1515,7 +1566,7 @@ msgstr "" "mins vos dvroz eployî BootX ou ôte tchoi po-z enonder voste éndjole. " "L' årgumint a passer å nawea pol pårticion raecene est: root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " @@ -1524,17 +1575,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:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "Metoz ene blanke plakete divins li lijheu %s" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "Dji fé li plakete d' enondaedje otomatike" -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1545,12 +1596,12 @@ msgstr "" "\n" "Voloz vs vormint cwiter asteure?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "Complumints" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "Renonder l' éndjole" diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po index de233a8b7..2b05ea4d4 100644 --- a/perl-install/install/share/po/zh_CN.po +++ b/perl-install/install/share/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 2008 Spring\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2009-04-09 11:49+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: Mageia i18n Team \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "您有其它赠品介质吗?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,177 +87,177 @@ msgstr "" "\n" "您是否想要配置赠品安装介质?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "网络 (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "网络 (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "网络 (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "镜像的 URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL 必须以 ftp:// 或 http:// 开始" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "正在连接 %s 网站获得可用镜像的列表..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "连接 %s 网站以获得可用镜像的列表失败" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "选择一个镜像网站来取得软件包" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "NFS 设置" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "请输入您 NFS 介质的主机名和目录" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "缺少主机名" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "目录必须以“/”开头" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS 挂载的主机名?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "目录" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "赠品" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确。" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "" -#: any.pm:378 +#: any.pm:404 #, fuzzy, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "跳过介质“%s”中的全部软件包" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "正在查找已经安装过的软件包..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "正在寻找可升级的程序..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "正在删除由于更新所致的软件包..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -270,72 +270,72 @@ msgstr "" "\n" "您确定要删除这些软件包吗?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "请取文件 %s 出错" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "下列盘片已重命名:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s(以前的名称为 %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "网络" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "请选择介质" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "文件已经存在。覆盖吗?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "没有权限" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "无效的 NFS 名称" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "无效的介质 %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "无法在分区完成之前进行屏幕捕捉" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中" @@ -345,7 +345,7 @@ msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中" msgid "Installation" msgstr "安装" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "配置" @@ -443,42 +443,42 @@ msgstr "" "%s 所请求的某些软件包无法安装:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "发生了一个错误:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "发生了一个致命错误: %s。" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "不要再次询问" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d 个安装交易失败" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "安装软件包失败:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "工作站" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "办公工作站" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -487,301 +487,348 @@ msgstr "" "办公程序: 字处理(LibreOffice Writer、Kword), 电子表格(LibreOffice Calc、" "Kspread)、PDF 阅读器等" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "游戏机" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "游戏程序: 街机、棋盘、战略等等" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "多媒体工作站" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "声音和视频播放/编辑程序" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "Internet 工作站" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "一组工具, 用于收发电子邮件及新闻组(mutt, tin..), 浏览网站" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "网络计算机(客户端)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "SSH 等不同协议客户端" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "简化计算机配置的工具" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "控制台工具" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, c-format msgid "Editors, shells, file tools, terminals" msgstr "编辑器, shell, 文件工具, 终端" -#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156 -#: share/meta-task/compssUsers.pl:158 +#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "开发" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C 和 C++ 开发库, 程序及头文件" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "文档" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "有关 Linux 和自由软件的书籍和指南" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base。第三方应用程序支持" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "Web 服务器" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "群件" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab 服务器" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "防火墙/路由器" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Internet 网关" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "邮件/新闻" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix 邮件服务器、Inn 新闻服务器" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "目录服务器" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP 服务器" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "域名和网络信息服务器" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "文件和打印机共享服务器" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS 服务器、Samba 服务器" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "数据库" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL 和 MariaDB 数据库服务" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache 和 Pro-ftpd" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "邮件" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix 邮件服务器" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL 或 MariaDB 数据库服务" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "网络计算机服务器" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS 服务器, SMB 服务器, 代理服务器, SSH 服务器" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "图形环境" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE 工作站" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "KDE 桌面环境, 基本的图形环境和一组配套的工具" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME 工作站" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "配备了用户友善的应用程序与桌面工具的图形环境" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE 工作站" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "配备了用户友善的应用程序与桌面工具的图形环境" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME 工作站" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "工作站" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "图形环境" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE 桌面" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "配备了用户友善的应用程序与桌面工具的轻量级图形环境" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "自定义桌面" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "配备了用户友善的应用程序与桌面工具的轻量级图形环境" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "其它图形桌面" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker、Enlightenment、Fvwm 等" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "工具" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH 服务器" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin 远程配置服务器" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "网络工具/监视" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "监视工具、进程统计、tcpdump、nmap……" -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia 向导" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "服务器配置向导" @@ -795,7 +842,7 @@ msgstr "" "发生错误, 可是我不知道该怎样处理才好。\n" "继续下去会怎样就看您的运气了。" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -848,210 +895,210 @@ msgstr "介质选择" msgid "Install %s KDE Desktop" msgstr "安装 %s KDE 桌面" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "安装 %s GNOME 桌面" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "自定义安装" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE 桌面" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "GNOME 桌面" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "自定义桌面" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "这是“%s”桌面的预览。" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "单击图像可查看更大的预览" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "程序组选择" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "选择单个软件包" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "全部不选" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "总共大小: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "版本: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "大小: " -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "重要程度: " -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "您不能改变这个软件包的选定" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "由于缺少 %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "由于不满足的 %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "尝试推广 %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "为了保留 %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "您不可以选择这个软件包。没有足够空间安装它。" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "即将安装下列软件包" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "即将卸载下列软件包" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "这个软件包是必需的, 不能取消选定" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "您不可以取消选择这个软件包。它已经安装过了" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "您不能不选择这个软件包。它必须升级" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "自动显示选中的软件包" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "安装" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "装入/保存选择" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "更新软件包选择" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "最小安装" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "软件管理" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "选择您想要安装的软件包" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "安装" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "无细节" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "剩余时间:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(正在估计...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d 个软件包" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "摘要" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "配置" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "未配置" @@ -1065,7 +1112,7 @@ msgstr "" "找到了下列安装介质。\n" "如果您想要跳过其中一些, 请不要选中。" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1077,7 +1124,7 @@ msgstr "" "然后,安装将会从硬盘继续进行。当系统安装完成后,软件包仍然保留,以供日后添加" "软件使用。" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "复制整张光盘" @@ -1376,101 +1423,101 @@ msgstr "" "您是否要安装升级包?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "位于 %2$s 上的 %1$s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "硬件" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "声卡" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "您有 ISA 声卡吗?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "图形界面" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "网络和 Internet" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "代理服务器" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "已配置" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "安全级别" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "防火墙" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "已激活" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "已禁用" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "您还没有配置过 X。您真的想要这样吗?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "正在准备引导程序..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "正在准备安装初始安装程序..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "请稍候,这可能需要一会儿..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1482,24 +1529,24 @@ msgstr "" "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是:" "root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "请在驱动器 %s 中插入一张空白软盘" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "正在创建自动安装软盘..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1510,12 +1557,12 @@ msgstr "" "\n" "您真的要现在退出吗?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "恭喜" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "重新启动" diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po index e8edda9ee..5032e3bdc 100644 --- a/perl-install/install/share/po/zh_TW.po +++ b/perl-install/install/share/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-03 10:51+0200\n" +"POT-Creation-Date: 2013-11-03 12:08+0200\n" "PO-Revision-Date: 2012-12-20 10:25+0800\n" "Last-Translator: You-Cheng Hsieh \n" "Language-Team: Traditional Chinese \n" @@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?" msgstr "您還有其他的補充媒介嗎?" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:113 +#: any.pm:114 #, c-format msgid "" "The following media have been found and will be used during install: %s.\n" @@ -87,131 +87,131 @@ msgstr "" "\n" "您有其他的安裝媒介需要設定嗎?" -#: any.pm:121 +#: any.pm:122 #, c-format msgid "CD-ROM" msgstr "CD-ROM" -#: any.pm:122 +#: any.pm:123 #, c-format msgid "Network (HTTP)" msgstr "網路 (HTTP)" -#: any.pm:123 +#: any.pm:124 #, c-format msgid "Network (FTP)" msgstr "網路 (FTP)" -#: any.pm:124 +#: any.pm:125 #, c-format msgid "Network (NFS)" msgstr "網路 (NFS)" -#: any.pm:171 +#: any.pm:173 #, c-format msgid "URL of the mirror?" msgstr "映像站的 URL?" -#: any.pm:177 +#: any.pm:179 #, c-format msgid "URL must start with ftp:// or http://" msgstr "URL 開頭必須是 ftp:// 或 http://" -#: any.pm:188 +#: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." msgstr "請到 %s 網站取得映射站台清單..." -#: any.pm:193 +#: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" msgstr "到 %s 網站取得映射站台清單失敗" -#: any.pm:203 +#: any.pm:205 #, c-format msgid "Choose a mirror from which to get the packages" msgstr "選取要用來抓取程式套件檔的 FTP 映射站台" -#: any.pm:233 +#: any.pm:235 #, c-format msgid "NFS setup" msgstr "設定 NFS" -#: any.pm:234 +#: any.pm:236 #, c-format msgid "Please enter the hostname and directory of your NFS media" msgstr "請輸入您的 NFS 媒介的主機和目錄名稱" -#: any.pm:238 +#: any.pm:240 #, c-format msgid "Hostname missing" msgstr "沒有主機名稱" -#: any.pm:239 +#: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" msgstr "目錄必須以「/」開始" -#: any.pm:243 +#: any.pm:245 #, c-format msgid "Hostname of the NFS mount ?" msgstr "NFS 掛載點的主機名稱?" -#: any.pm:244 +#: any.pm:246 #, c-format msgid "Directory" msgstr "目錄" -#: any.pm:266 +#: any.pm:268 #, c-format msgid "Supplementary" msgstr "補充" -#: any.pm:301 +#: any.pm:303 #, c-format msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." msgstr "無法在這個映像站上找到套件列表檔。請確定位址是正確的。" -#: any.pm:317 +#: any.pm:319 #, c-format msgid "Core Release" msgstr "" -#: any.pm:319 +#: any.pm:321 #, c-format msgid "Tainted Release" msgstr "" -#: any.pm:321 +#: any.pm:323 #, c-format msgid "Nonfree Release" msgstr "" -#: any.pm:335 +#: any.pm:351 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." msgstr "您的機器上的某些硬體需要非自由的軔體才能夠讓自由的驅動程式運作。" -#: any.pm:336 +#: any.pm:352 #, c-format msgid "You should enable \"%s\"" msgstr "您應該啟用 \"%s\"" -#: any.pm:355 +#: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" msgstr "\"%s\" 包含各種系統元件和應用程式" -#: any.pm:356 +#: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" msgstr "\"%s\" 包含非自由的軟體套件。\n" -#: any.pm:357 +#: any.pm:379 #, c-format msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " @@ -220,46 +220,46 @@ msgstr "" "它也包含某些裝置運作時所需要的軔體(如:某些 ATI/AMD 顯示卡、網路卡、RAID介面" "卡...)" -#: any.pm:358 +#: any.pm:380 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." msgstr "\"%s\" 包含因為軟體專利而無法在所有國家散佈的軟體套件。" -#: any.pm:359 +#: any.pm:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." msgstr "它也包含了 \"%s\" 中以不同方式編譯的軟體套件。" -#: any.pm:363 +#: any.pm:387 #, c-format msgid "Here you can enable more media if you want." msgstr "您可以在這裡啟用更多媒體。" -#: any.pm:378 +#: any.pm:404 #, c-format msgid "This medium provides package updates for medium \"%s\"" msgstr "這個媒體包含 \"%s\" 媒體的套件更新" -#: any.pm:451 +#: any.pm:480 #, c-format msgid "Looking at packages already installed..." msgstr "正在查看已經安裝過的套件..." -#: any.pm:485 +#: any.pm:514 #, c-format msgid "Finding packages to upgrade..." msgstr "正在搜尋要升級的套件..." -#: any.pm:498 +#: any.pm:527 #, c-format msgid "Removing packages prior to upgrade..." msgstr "移除套件以更新..." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: any.pm:713 +#: any.pm:743 #, c-format msgid "" "The following packages will be removed to allow upgrading your system: %s\n" @@ -272,72 +272,72 @@ msgstr "" "\n" "您確定要移除這些套件嗎?\n" -#: any.pm:932 +#: any.pm:962 #, c-format msgid "Error reading file %s" msgstr "讀取檔案 %s 時發生錯誤" -#: any.pm:1140 +#: any.pm:1170 #, c-format msgid "The following disk(s) were renamed:" msgstr "下列磁碟已經改名:" -#: any.pm:1142 +#: any.pm:1172 #, c-format msgid "%s (previously named as %s)" msgstr "%s (原本為 %s)" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "HTTP" msgstr "HTTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "FTP" msgstr "FTP" -#: any.pm:1199 +#: any.pm:1229 #, c-format msgid "NFS" msgstr "NFS" -#: any.pm:1218 steps_interactive.pm:970 +#: any.pm:1248 steps_interactive.pm:973 #, c-format msgid "Network" msgstr "網路" -#: any.pm:1222 +#: any.pm:1252 #, c-format msgid "Please choose a media" msgstr "請選擇一個媒介" -#: any.pm:1238 +#: any.pm:1268 #, c-format msgid "File already exists. Overwrite it?" msgstr "檔案已經存在了。要覆蓋它嗎?" -#: any.pm:1242 +#: any.pm:1272 #, c-format msgid "Permission denied" msgstr "權限不足" -#: any.pm:1290 +#: any.pm:1320 #, c-format msgid "Bad NFS name" msgstr "錯誤的 NFS 名稱" -#: any.pm:1311 +#: any.pm:1341 #, c-format msgid "Bad media %s" msgstr "損壞的媒介 %s" -#: any.pm:1355 +#: any.pm:1385 #, c-format msgid "Cannot make screenshots before partitioning" msgstr "在尚未進行分割前無法提供畫面捕捉功能" -#: any.pm:1363 +#: any.pm:1393 #, c-format msgid "Screenshots will be available after install in %s" msgstr "在安裝後您可以於 %s 取得螢幕截圖" @@ -347,7 +347,7 @@ msgstr "在安裝後您可以於 %s 取得螢幕截圖" msgid "Installation" msgstr "安裝" -#: gtk.pm:132 share/meta-task/compssUsers.pl:43 +#: gtk.pm:132 share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "組態設定" @@ -445,42 +445,42 @@ msgstr "" "無法安裝 %s 要求的某些套件:\n" "%s" -#: pkgs.pm:382 pkgs.pm:409 +#: pkgs.pm:383 pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "發生一個錯誤:" -#: pkgs.pm:401 +#: pkgs.pm:402 #, c-format msgid "A fatal error occurred: %s." msgstr "發生了一個致命的錯誤:%s。" -#: pkgs.pm:891 pkgs.pm:928 +#: pkgs.pm:896 pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "不要再詢問" -#: pkgs.pm:907 +#: pkgs.pm:912 #, c-format msgid "%d installation transactions failed" msgstr "%d 個安裝執行失敗" -#: pkgs.pm:908 +#: pkgs.pm:913 #, c-format msgid "Installation of packages failed:" msgstr "安裝套件失敗:" -#: share/meta-task/compssUsers.pl:13 +#: share/meta-task/compssUsers.pl:14 #, c-format msgid "Workstation" msgstr "工作站" -#: share/meta-task/compssUsers.pl:15 +#: share/meta-task/compssUsers.pl:16 #, c-format msgid "Office Workstation" msgstr "辦公軟體平台" -#: share/meta-task/compssUsers.pl:17 +#: share/meta-task/compssUsers.pl:18 #, c-format msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " @@ -489,301 +489,348 @@ msgstr "" "辦公軟體:文書處理軟體 (LibreOffice Writer、Kword)、試算表 (OpenOffice.org " "Calc、Kspread)、PDF 檢視器等等" -#: share/meta-task/compssUsers.pl:22 +#: share/meta-task/compssUsers.pl:24 #, c-format msgid "Game station" msgstr "遊戲平台" -#: share/meta-task/compssUsers.pl:23 +#: share/meta-task/compssUsers.pl:25 #, c-format msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "娛樂的一些程式:紙牌、益智、動作、策略等" -#: share/meta-task/compssUsers.pl:26 +#: share/meta-task/compssUsers.pl:28 #, c-format msgid "Multimedia station" msgstr "多媒體平台" -#: share/meta-task/compssUsers.pl:27 +#: share/meta-task/compssUsers.pl:29 #, c-format msgid "Sound and video playing/editing programs" msgstr "音效以及影像撥放編輯程式" -#: share/meta-task/compssUsers.pl:32 +#: share/meta-task/compssUsers.pl:34 #, c-format msgid "Internet station" msgstr "網際網路平台" -#: share/meta-task/compssUsers.pl:33 +#: share/meta-task/compssUsers.pl:35 #, c-format msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" msgstr "包含讀信、寄信和閱讀新聞群組 (mutt、tin ..) 以及網路瀏覽的工具" -#: share/meta-task/compssUsers.pl:38 +#: share/meta-task/compssUsers.pl:40 #, c-format msgid "Network Computer (client)" msgstr "網路電腦 (客戶端)" -#: share/meta-task/compssUsers.pl:39 +#: share/meta-task/compssUsers.pl:41 #, c-format msgid "Clients for different protocols including ssh" msgstr "包含 ssh 等其他不同通訊協定的用戶端程式" -#: share/meta-task/compssUsers.pl:44 +#: share/meta-task/compssUsers.pl:47 #, c-format msgid "Tools to ease the configuration of your computer" msgstr "讓您方便設定您系統的工具" -#: share/meta-task/compssUsers.pl:48 +#: share/meta-task/compssUsers.pl:51 #, c-format msgid "Console Tools" msgstr "Console 工具" -#: share/meta-task/compssUsers.pl:49 +#: share/meta-task/compssUsers.pl:52 #, 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:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "程式開發" -#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159 +#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "C/C++ 發展環境,包含編譯器、程式庫與及一些引入檔" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163 +#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "文件檔案" -#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164 +#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Linux 系統與自由軟體的書籍、HOWTO 文件" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167 +#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "LSB 的支援,包含第三類協力廠商軟體支援" -#: share/meta-task/compssUsers.pl:72 +#: share/meta-task/compssUsers.pl:77 #, c-format msgid "Web Server" msgstr "網頁伺服器 (Web)" -#: share/meta-task/compssUsers.pl:73 +#: share/meta-task/compssUsers.pl:78 #, c-format msgid "Apache" msgstr "Apache" -#: share/meta-task/compssUsers.pl:76 +#: share/meta-task/compssUsers.pl:82 #, c-format msgid "Groupware" msgstr "群組軟體" -#: share/meta-task/compssUsers.pl:77 +#: share/meta-task/compssUsers.pl:83 #, c-format msgid "Kolab Server" msgstr "Kolab 伺服器" -#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121 +#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "防火牆/路由器" -#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122 +#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "網際網路閘道器" -#: share/meta-task/compssUsers.pl:84 +#: share/meta-task/compssUsers.pl:90 #, c-format msgid "Mail/News" msgstr "郵件/新聞" -#: share/meta-task/compssUsers.pl:85 +#: share/meta-task/compssUsers.pl:91 #, c-format msgid "Postfix mail server, Inn news server" msgstr "Postfix 郵件伺服器,Inn 新聞伺服器" -#: share/meta-task/compssUsers.pl:88 +#: share/meta-task/compssUsers.pl:95 #, c-format msgid "Directory Server" msgstr "目錄伺服器" -#: share/meta-task/compssUsers.pl:92 +#: share/meta-task/compssUsers.pl:100 #, c-format msgid "FTP Server" msgstr "FTP 伺服器" -#: share/meta-task/compssUsers.pl:93 +#: share/meta-task/compssUsers.pl:101 #, c-format msgid "ProFTPd" msgstr "ProFTPd" -#: share/meta-task/compssUsers.pl:96 +#: share/meta-task/compssUsers.pl:105 #, c-format msgid "DNS/NIS" msgstr "DNS/NIS" -#: share/meta-task/compssUsers.pl:97 +#: share/meta-task/compssUsers.pl:106 #, c-format msgid "Domain Name and Network Information Server" msgstr "網域名稱與網路資訊伺服器" -#: share/meta-task/compssUsers.pl:100 +#: share/meta-task/compssUsers.pl:110 #, c-format msgid "File and Printer Sharing Server" msgstr "檔案與列印分享伺服器" -#: share/meta-task/compssUsers.pl:101 +#: share/meta-task/compssUsers.pl:111 #, c-format msgid "NFS Server, Samba server" msgstr "NFS 伺服器、Samba 伺服器" -#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117 +#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "資料庫軟體" -#: share/meta-task/compssUsers.pl:105 +#: share/meta-task/compssUsers.pl:116 #, c-format msgid "PostgreSQL and MariaDB Database Server" msgstr "PostgreSQL 與 MariaDB 資料庫伺服器" -#: share/meta-task/compssUsers.pl:109 +#: share/meta-task/compssUsers.pl:121 #, c-format msgid "Web/FTP" msgstr "Web/FTP" -#: share/meta-task/compssUsers.pl:110 +#: share/meta-task/compssUsers.pl:122 #, c-format msgid "Apache, Pro-ftpd" msgstr "Apache、ProFTPD" -#: share/meta-task/compssUsers.pl:113 +#: share/meta-task/compssUsers.pl:126 #, c-format msgid "Mail" msgstr "電子郵件" -#: share/meta-task/compssUsers.pl:114 +#: share/meta-task/compssUsers.pl:127 #, c-format msgid "Postfix mail server" msgstr "Postfix 郵件伺服器" -#: share/meta-task/compssUsers.pl:118 +#: share/meta-task/compssUsers.pl:132 #, c-format msgid "PostgreSQL or MariaDB database server" msgstr "PostgreSQL、MariaDB 資料庫" -#: share/meta-task/compssUsers.pl:125 +#: share/meta-task/compssUsers.pl:140 #, c-format msgid "Network Computer server" msgstr "網路伺服器" -#: share/meta-task/compssUsers.pl:126 +#: share/meta-task/compssUsers.pl:141 #, c-format msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "NFS 伺服器、SMB 伺服器、Proxy 伺服器、SSH 伺服器" -#: share/meta-task/compssUsers.pl:132 +#: share/meta-task/compssUsers.pl:148 #, c-format msgid "Graphical Environment" msgstr "圖形環境" -#: share/meta-task/compssUsers.pl:134 +#: share/meta-task/compssUsers.pl:150 #, c-format msgid "KDE Workstation" msgstr "KDE 工作站" -#: share/meta-task/compssUsers.pl:135 +#: share/meta-task/compssUsers.pl:151 #, c-format msgid "" "The K Desktop Environment, the basic graphical environment with a collection " "of accompanying tools" msgstr "K 桌面環境,包含許多好用的圖型介面工具程式" -#: share/meta-task/compssUsers.pl:139 +#: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "GNOME 工作站" -#: share/meta-task/compssUsers.pl:140 +#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 #, c-format msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境" -#: share/meta-task/compssUsers.pl:144 +#: share/meta-task/compssUsers.pl:162 +#, fuzzy, c-format +msgid "XFCE Workstation" +msgstr "KDE 工作站" + +#: share/meta-task/compssUsers.pl:163 +#, fuzzy, c-format +msgid "" +"A lighter graphical environment with user-friendly set of applications and " +"desktop tools" +msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境" + +#: share/meta-task/compssUsers.pl:167 +#, fuzzy, c-format +msgid "MATE Workstation" +msgstr "GNOME 工作站" + +#: share/meta-task/compssUsers.pl:172 +#, fuzzy, c-format +msgid "Cinnamon Workstation" +msgstr "工作站" + +#: share/meta-task/compssUsers.pl:173 +#, fuzzy, c-format +msgid "A graphical environment based on GNOME" +msgstr "圖形環境" + +#: share/meta-task/compssUsers.pl:177 #, c-format msgid "LXDE Desktop" msgstr "LXDE 桌面" -#: share/meta-task/compssUsers.pl:146 +#: share/meta-task/compssUsers.pl:179 #, c-format msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" msgstr "包含友善的應用程式、桌面軟體的輕量級圖型化使用環境" -#: share/meta-task/compssUsers.pl:149 +#: share/meta-task/compssUsers.pl:183 +#, fuzzy, c-format +msgid "RazorQT Desktop" +msgstr "自訂桌面" + +#: share/meta-task/compssUsers.pl:185 +#, c-format +msgid "A less developed lightweight fast graphical environment" +msgstr "" + +#: share/meta-task/compssUsers.pl:188 +#, c-format +msgid "Enlightenment e17 Desktop" +msgstr "" + +#: share/meta-task/compssUsers.pl:190 +#, fuzzy, c-format +msgid "A lightweight fast graphical environment with a dedicated following" +msgstr "包含友善的應用程式、桌面軟體的輕量級圖型化使用環境" + +#: share/meta-task/compssUsers.pl:193 #, c-format msgid "Other Graphical Desktops" msgstr "其他圖型桌面軟體" -#: share/meta-task/compssUsers.pl:150 -#, c-format -msgid "Window Maker, Enlightenment, Fvwm, etc" +#: share/meta-task/compssUsers.pl:194 +#, fuzzy, c-format +msgid "Window Maker, Fvwm, etc" msgstr "Window Maker、Enlightenment、Fvwm 等" -#: share/meta-task/compssUsers.pl:173 +#: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "工具軟體" -#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176 +#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "SSH 伺服主機" -#: share/meta-task/compssUsers.pl:180 +#: share/meta-task/compssUsers.pl:224 #, c-format msgid "Webmin" msgstr "Webmin" -#: share/meta-task/compssUsers.pl:181 +#: share/meta-task/compssUsers.pl:225 #, c-format msgid "Webmin Remote Configuration Server" msgstr "Webmin 遠端設定伺服器" -#: share/meta-task/compssUsers.pl:185 +#: share/meta-task/compssUsers.pl:229 #, c-format msgid "Network Utilities/Monitoring" msgstr "網路工具/監控" -#: share/meta-task/compssUsers.pl:186 +#: share/meta-task/compssUsers.pl:230 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." msgstr "監控工具、程序管理、tcpdump、nmap..." -#: share/meta-task/compssUsers.pl:190 +#: share/meta-task/compssUsers.pl:234 #, c-format msgid "Mageia Wizards" msgstr "Mageia 精靈" -#: share/meta-task/compssUsers.pl:191 +#: share/meta-task/compssUsers.pl:235 #, c-format msgid "Wizards to configure server" msgstr "用來設定伺服器的精靈" @@ -797,7 +844,7 @@ msgstr "" "發生了一個錯誤,但我不知道該如何妥善處置它。\n" "要繼續安裝工作的話請小心。" -#: steps.pm:461 +#: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" @@ -849,210 +896,210 @@ msgstr "選擇安裝媒介" msgid "Install %s KDE Desktop" msgstr "安裝 %s KDE 桌面系統" -#: steps_gtk.pm:244 +#: steps_gtk.pm:252 #, c-format msgid "Install %s GNOME Desktop" msgstr "安裝 %s GNOME 桌面系統" -#: steps_gtk.pm:245 +#: steps_gtk.pm:253 #, c-format msgid "Custom install" msgstr "自訂安裝" -#: steps_gtk.pm:266 +#: steps_gtk.pm:274 #, c-format msgid "KDE Desktop" msgstr "KDE 桌面" -#: steps_gtk.pm:267 +#: steps_gtk.pm:275 #, c-format msgid "GNOME Desktop" msgstr "Gnome 桌面" -#: steps_gtk.pm:268 +#: steps_gtk.pm:276 #, c-format msgid "Custom Desktop" msgstr "自訂桌面" -#: steps_gtk.pm:274 +#: steps_gtk.pm:282 #, c-format msgid "Here's a preview of the '%s' desktop." msgstr "這是 '%s' 桌面的預覽。" -#: steps_gtk.pm:301 +#: steps_gtk.pm:309 #, c-format msgid "Click on images in order to see a bigger preview" msgstr "在影像上點選以觀看較大的預覽畫面" -#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "套件群組選擇" -#: steps_gtk.pm:344 steps_interactive.pm:650 +#: steps_gtk.pm:350 steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "單一套件選取" -#: steps_gtk.pm:351 +#: steps_gtk.pm:357 #, c-format msgid "Unselect All" msgstr "取消選取所有項目" -#: steps_gtk.pm:370 steps_interactive.pm:562 +#: steps_gtk.pm:376 steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "總共大小: %d / %d MB" -#: steps_gtk.pm:415 +#: steps_gtk.pm:421 #, c-format msgid "Version: " msgstr "版本:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "Size: " msgstr "大小:" -#: steps_gtk.pm:416 +#: steps_gtk.pm:422 #, c-format msgid "%d KB\n" msgstr "%d KB\n" -#: steps_gtk.pm:417 +#: steps_gtk.pm:423 #, c-format msgid "Importance: " msgstr "重要性:" -#: steps_gtk.pm:452 +#: steps_gtk.pm:458 #, c-format msgid "You cannot select/unselect this package" msgstr "您不可以選擇/取消選擇這個套件" -#: steps_gtk.pm:456 +#: steps_gtk.pm:462 #, c-format msgid "due to missing %s" msgstr "因為遺失 %s" -#: steps_gtk.pm:457 +#: steps_gtk.pm:463 #, c-format msgid "due to unsatisfied %s" msgstr "由於沒有滿足 %s" -#: steps_gtk.pm:458 +#: steps_gtk.pm:464 #, c-format msgid "trying to promote %s" msgstr "正在嘗試促進 %s" -#: steps_gtk.pm:459 +#: steps_gtk.pm:465 #, c-format msgid "in order to keep %s" msgstr "為了保留 %s" -#: steps_gtk.pm:464 +#: steps_gtk.pm:470 #, c-format msgid "" "You cannot select this package as there is not enough space left to install " "it" msgstr "您不可以選取這個套件,因為剩餘的空間不足以安裝它。" -#: steps_gtk.pm:467 +#: steps_gtk.pm:473 #, c-format msgid "The following packages are going to be installed" msgstr "下列的套件將會被安裝上" -#: steps_gtk.pm:468 +#: steps_gtk.pm:474 #, c-format msgid "The following packages are going to be removed" msgstr "下列的套件將會被移除" -#: steps_gtk.pm:494 +#: steps_gtk.pm:500 #, c-format msgid "This is a mandatory package, it cannot be unselected" msgstr "這是一個必要的套件,您不能不選取它" -#: steps_gtk.pm:496 +#: steps_gtk.pm:502 #, c-format msgid "You cannot unselect this package. It is already installed" msgstr "您不能不選這個套件。它已經被安裝上了。" -#: steps_gtk.pm:498 +#: steps_gtk.pm:504 #, c-format msgid "You cannot unselect this package. It must be upgraded" msgstr "您不能不選這個套件,它一定要更新才行。" -#: steps_gtk.pm:502 +#: steps_gtk.pm:508 #, c-format msgid "Show automatically selected packages" msgstr "顯示自動被選取的套件" -#: steps_gtk.pm:509 +#: steps_gtk.pm:512 #, c-format msgid "Install" msgstr "安裝" -#: steps_gtk.pm:512 +#: steps_gtk.pm:515 #, c-format msgid "Load/Save selection" msgstr "載入/儲存選取" -#: steps_gtk.pm:513 +#: steps_gtk.pm:516 #, c-format msgid "Updating package selection" msgstr "正在更新套件的選擇" -#: steps_gtk.pm:518 +#: steps_gtk.pm:521 #, c-format msgid "Minimal install" msgstr "最小安裝" -#: steps_gtk.pm:531 +#: steps_gtk.pm:534 #, c-format msgid "Software Management" msgstr "軟體套件管理" -#: steps_gtk.pm:531 steps_interactive.pm:443 +#: steps_gtk.pm:534 steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "選擇您想要安裝的套件" -#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 #, c-format msgid "Installing" msgstr "正在安裝" -#: steps_gtk.pm:578 +#: steps_gtk.pm:581 #, c-format msgid "No details" msgstr "不看詳細資訊" -#: steps_gtk.pm:597 +#: steps_gtk.pm:600 #, c-format msgid "Time remaining:" msgstr "剩餘時間:" -#: steps_gtk.pm:598 +#: steps_gtk.pm:601 #, c-format msgid "(estimating...)" msgstr "(正在估計...)" -#: steps_gtk.pm:628 +#: steps_gtk.pm:631 #, c-format msgid "%d package" msgid_plural "%d packages" msgstr[0] "%d 個套件" -#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43 +#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format msgid "Summary" msgstr "總結" -#: steps_gtk.pm:702 +#: steps_gtk.pm:706 #, c-format msgid "Configure" msgstr "設定" -#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983 +#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "未被設定" @@ -1066,7 +1113,7 @@ msgstr "" "已經找到下列的安裝媒介。\n" "如果您想略過它們,您現在可以將它們取消選取。" -#: steps_gtk.pm:778 steps_interactive.pm:349 +#: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" "You have the option to copy the contents of the CDs onto the hard disk drive " @@ -1078,7 +1125,7 @@ msgstr "" "件\n" "在安裝完畢之後仍然可以繼續使用。" -#: steps_gtk.pm:780 steps_interactive.pm:351 +#: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "複製整張光碟" @@ -1378,101 +1425,101 @@ msgstr "" "您想要安裝更新嗎?" #. -PO: example: lilo-graphic on /dev/hda1 -#: steps_interactive.pm:878 +#: steps_interactive.pm:881 #, c-format msgid "%s on %s" msgstr "%2$s 上的 %1$s" -#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930 -#: steps_interactive.pm:947 steps_interactive.pm:962 +#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 +#: steps_interactive.pm:950 steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "硬體" -#: steps_interactive.pm:931 steps_interactive.pm:948 +#: steps_interactive.pm:934 steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "音效卡" -#: steps_interactive.pm:951 +#: steps_interactive.pm:954 #, c-format msgid "Do you have an ISA sound card?" msgstr "您有 ISA 音效卡嗎?" -#: steps_interactive.pm:953 +#: steps_interactive.pm:956 #, c-format msgid "" "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " "card" msgstr "請在安裝完畢後,執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡" -#: steps_interactive.pm:955 +#: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" msgstr "沒偵測到任何音效卡。請在安裝後嘗試 \"harddrake\" 進行設定" -#: steps_interactive.pm:963 +#: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "圖形介面" -#: steps_interactive.pm:969 steps_interactive.pm:981 +#: steps_interactive.pm:972 steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "網路與網際網路" -#: steps_interactive.pm:982 +#: steps_interactive.pm:985 #, c-format msgid "Proxies" msgstr "代理伺服器" -#: steps_interactive.pm:983 +#: steps_interactive.pm:986 #, c-format msgid "configured" msgstr "已設定" -#: steps_interactive.pm:993 +#: steps_interactive.pm:996 #, c-format msgid "Security Level" msgstr "安全層級" -#: steps_interactive.pm:1013 +#: steps_interactive.pm:1016 #, c-format msgid "Firewall" msgstr "防火牆" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "activated" msgstr "已啟用" -#: steps_interactive.pm:1017 +#: steps_interactive.pm:1020 #, c-format msgid "disabled" msgstr "已停用" -#: steps_interactive.pm:1031 +#: steps_interactive.pm:1034 #, c-format msgid "You have not configured X. Are you sure you really want this?" msgstr "您尚未設定 X。您確定您真的要這樣做?" -#: steps_interactive.pm:1060 +#: steps_interactive.pm:1063 #, c-format msgid "Preparing bootloader..." msgstr "正在準備開機載入程式..." #. -PO: This is NOT the boot loader!!!! -#: steps_interactive.pm:1062 +#: steps_interactive.pm:1065 #, c-format msgid "Preparing initial startup program..." msgstr "正在準備初始化啟動程式..." -#: steps_interactive.pm:1063 +#: steps_interactive.pm:1066 #, c-format msgid "Be patient, this may take a while..." msgstr "請耐心等候,這要花一些時間..." -#: steps_interactive.pm:1074 +#: steps_interactive.pm:1077 #, c-format msgid "" "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " @@ -1485,24 +1532,24 @@ msgstr "" "安裝還是會繼續下去,不過您將需要使用 bootX 或某些其他方法來啟動您的機器。" "root fs 的核心參數是:root=%s" -#: steps_interactive.pm:1087 +#: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." msgstr "在這個安全層級中,只有管理者能夠存取位於 Windows 分割區的檔案。" -#: steps_interactive.pm:1119 +#: steps_interactive.pm:1122 #, c-format msgid "Insert a blank floppy in drive %s" msgstr "請在 %s 中插入一片空白磁片" -#: steps_interactive.pm:1121 +#: steps_interactive.pm:1124 #, c-format msgid "Creating auto install floppy..." msgstr "正在製作自動安裝磁片..." -#: steps_interactive.pm:1132 +#: steps_interactive.pm:1135 #, c-format msgid "" "Some steps are not completed.\n" @@ -1513,12 +1560,12 @@ msgstr "" "\n" "您確定要結束安裝程式?" -#: steps_interactive.pm:1142 +#: steps_interactive.pm:1145 #, c-format msgid "Congratulations" msgstr "恭喜" -#: steps_interactive.pm:1145 +#: steps_interactive.pm:1148 #, c-format msgid "Reboot" msgstr "重新開機" -- cgit v1.2.1 From 596bc56352b5112005218973b620b38c7627c56c Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 3 Nov 2013 17:26:58 +0200 Subject: Russian translation update by Alex Loginov --- perl-install/install/share/po/ru.po | 355 +++++++++++++++--------------------- 1 file changed, 150 insertions(+), 205 deletions(-) diff --git a/perl-install/install/share/po/ru.po b/perl-install/install/share/po/ru.po index d0f5c5005..0e53a2983 100644 --- a/perl-install/install/share/po/ru.po +++ b/perl-install/install/share/po/ru.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-03 17:37-0000\n" +"PO-Revision-Date: 2013-11-03 19:09+0300\n" "Last-Translator: AlexL \n" "Language-Team: Russian \n" "Language: ru\n" @@ -88,8 +88,7 @@ msgid "" "\n" "Do you have a supplementary installation medium to configure?" msgstr "" -"Был найден следующий носитель, который будет использован во время установки: " -"%s.\n" +"Был найден следующий носитель, который будет использован во время установки: %s.\n" "\n" "\n" "Если ли дополнительный носитель для настройки?" @@ -127,16 +126,12 @@ msgstr "Адрес должен начинаться с ftp:// или http://" #: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." -msgstr "" -"Устанавливается соединение с веб-сайтом %s для загрузки списка доступных " -"пакетов..." +msgstr "Устанавливается соединение с веб-сайтом %s для загрузки списка доступных пакетов..." #: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" -msgstr "" -"Не удалось соединиться с веб-сайтом %s, чтобы загрузить список доступных " -"зеркал" +msgstr "Не удалось соединиться с веб-сайтом %s, чтобы загрузить список доступных зеркал" #: any.pm:205 #, c-format @@ -180,12 +175,8 @@ msgstr "Дополнительный" #: any.pm:303 #, c-format -msgid "" -"Can't find a package list file on this mirror. Make sure the location is " -"correct." -msgstr "" -"Невозможно найти список пакетов на этом зеркале. Проверьте правильность " -"адреса." +msgid "Can't find a package list file on this mirror. Make sure the location is correct." +msgstr "Невозможно найти список пакетов на этом зеркале. Проверьте правильность адреса." #: any.pm:319 #, c-format @@ -204,13 +195,8 @@ msgstr "Nonfree Release" #: any.pm:351 #, c-format -msgid "" -"Some hardware on your machine needs some non free firmwares in order for the " -"free software drivers to work." -msgstr "" -"Для работы части оборудования на компьютере следует установить " -"микропрограммы с закрытым кодом, необходимые для работы драйверов с открытым " -"кодом." +msgid "Some hardware on your machine needs some non free firmwares in order for the free software drivers to work." +msgstr "Для работы части оборудования на компьютере следует установить микропрограммы с закрытым кодом, необходимые для работы драйверов с открытым кодом." #: any.pm:352 #, c-format @@ -229,31 +215,18 @@ msgstr "В \"%s\" содержатся несвободные программы #: any.pm:379 #, c-format -msgid "" -"It also contains firmwares needed for certain devices to operate (eg: some " -"ATI/AMD graphic cards, some network cards, some RAID cards, ...)" -msgstr "" -"Там также содержатся пакеты с микрокодом, необходимым для работы некоторых " -"устройств (например, некоторых видеокарт ATI/AMD, некоторых сетевых карт, " -"некоторых карт RAID, ...)" +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:380 #, c-format -msgid "" -"\"%s\" contains software that can not be distributed in every country due to " -"software patents." -msgstr "" -"В \"%s\" содержатся пакеты с программным обеспечением, которое нельзя " -"свободно распространять в некоторых странах из-за нарушения патентных прав " -"на это программное обеспечение." +msgid "\"%s\" contains software that can not be distributed in every country due to software patents." +msgstr "В \"%s\" содержатся пакеты с программным обеспечением, которое нельзя свободно распространять в некоторых странах из-за нарушения патентных прав на это программное обеспечение." #: any.pm:381 #, c-format -msgid "" -"It also contains software from \"%s\" rebuild with additional capabilities." -msgstr "" -"Также в \"%s\" содержатся пакеты, собранные с дополнительными возможностями, " -"использование которых ограничивается патентами." +msgid "It also contains software from \"%s\" rebuild with additional capabilities." +msgstr "Также в \"%s\" содержатся пакеты, собранные с дополнительными возможностями, использование которых ограничивается патентами." #: any.pm:387 #, c-format @@ -324,7 +297,8 @@ msgstr "FTP" msgid "NFS" msgstr "NFS" -#: any.pm:1248 steps_interactive.pm:973 +#: any.pm:1248 +#: steps_interactive.pm:973 #, c-format msgid "Network" msgstr "Сеть" @@ -369,7 +343,8 @@ msgstr "После установки скриншоты будут находи msgid "Installation" msgstr "Установка" -#: gtk.pm:132 share/meta-task/compssUsers.pl:46 +#: gtk.pm:132 +#: share/meta-task/compssUsers.pl:46 #, c-format msgid "Configuration" msgstr "Настройка" @@ -452,9 +427,7 @@ msgstr "Получения данных о пакетах из метаданн #: pkgs.pm:111 #, c-format msgid "No xml info for medium \"%s\", only partial result for package %s" -msgstr "" -"для источника «%s» отсутствует xml-info; для пакета %s получен только " -"частичный результат" +msgstr "для источника «%s» отсутствует xml-info; для пакета %s получен только частичный результат" #: pkgs.pm:119 #, c-format @@ -470,7 +443,8 @@ msgstr "" "Некоторые пакеты, запрошенные %s, не могут быть установлены:\n" "%s" -#: pkgs.pm:383 pkgs.pm:410 +#: pkgs.pm:383 +#: pkgs.pm:410 #, c-format msgid "An error occurred:" msgstr "Произошла ошибка:" @@ -480,7 +454,8 @@ msgstr "Произошла ошибка:" msgid "A fatal error occurred: %s." msgstr "Произошла критическая ошибка: %s." -#: pkgs.pm:896 pkgs.pm:938 +#: pkgs.pm:896 +#: pkgs.pm:938 #, c-format msgid "Do not ask again" msgstr "Больше не спрашивать" @@ -507,13 +482,8 @@ msgstr "Офисная рабочая станция" #: share/meta-task/compssUsers.pl:18 #, c-format -msgid "" -"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " -"(LibreOffice Calc, Kspread), PDF viewers, etc" -msgstr "" -"Офисные программы: текстовые процессоры (LibreOffice Writer, Kword), " -"электронные таблицы (LibreOffice Calc, Kspread), программы для просмотра pdf " -"и т.д." +msgid "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc" +msgstr "Офисные программы: текстовые процессоры (LibreOffice Writer, Kword), электронные таблицы (LibreOffice Calc, Kspread), программы для просмотра pdf и т.д." #: share/meta-task/compssUsers.pl:24 #, c-format @@ -542,11 +512,8 @@ msgstr "Интернет-компьютер" #: share/meta-task/compssUsers.pl:35 #, c-format -msgid "" -"Set of tools to read and send mail and news (mutt, tin..) and to browse the " -"Web" -msgstr "" -"Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга" +msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web" +msgstr "Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга" #: share/meta-task/compssUsers.pl:40 #, c-format @@ -573,33 +540,39 @@ msgstr "Утилиты для консоли" msgid "Editors, shells, file tools, terminals" msgstr "Редакторы, командные оболочки, файловые утилиты, терминалы" -#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200 +#: share/meta-task/compssUsers.pl:56 +#: share/meta-task/compssUsers.pl:200 #: share/meta-task/compssUsers.pl:202 #, c-format msgid "Development" msgstr "Разработка" -#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203 +#: share/meta-task/compssUsers.pl:57 +#: share/meta-task/compssUsers.pl:203 #, c-format msgid "C and C++ development libraries, programs and include files" msgstr "Библиотеки для разработки на C и C++, программы и заголовочные файлы" -#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207 +#: share/meta-task/compssUsers.pl:61 +#: share/meta-task/compssUsers.pl:207 #, c-format msgid "Documentation" msgstr "Документация" -#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208 +#: share/meta-task/compssUsers.pl:62 +#: share/meta-task/compssUsers.pl:208 #, c-format msgid "Books and Howto's on Linux and Free Software" msgstr "Книги и документация по Linux и свободному программному обеспечению" -#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211 +#: share/meta-task/compssUsers.pl:66 +#: share/meta-task/compssUsers.pl:211 #, c-format msgid "LSB" msgstr "LSB" -#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212 +#: share/meta-task/compssUsers.pl:67 +#: share/meta-task/compssUsers.pl:212 #, c-format msgid "Linux Standard Base. Third party applications support" msgstr "Linux Standard Base. Поддержка приложений сторонних разработчиков." @@ -624,12 +597,14 @@ msgstr "ПО для совместной работы" msgid "Kolab Server" msgstr "Сервер Kolab" -#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136 +#: share/meta-task/compssUsers.pl:86 +#: share/meta-task/compssUsers.pl:136 #, c-format msgid "Firewall/Router" msgstr "Файервол/Маршрутизатор" -#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137 +#: share/meta-task/compssUsers.pl:87 +#: share/meta-task/compssUsers.pl:137 #, c-format msgid "Internet gateway" msgstr "Интернет-шлюз" @@ -679,7 +654,8 @@ msgstr "Сервер общего доступа к файлам и принте msgid "NFS Server, Samba server" msgstr "Сервер NFS, сервер Samba" -#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131 +#: share/meta-task/compssUsers.pl:115 +#: share/meta-task/compssUsers.pl:131 #, c-format msgid "Database" msgstr "База данных" @@ -736,55 +712,44 @@ msgstr "Рабочая станция KDE" #: share/meta-task/compssUsers.pl:151 #, c-format -msgid "" -"The K Desktop Environment, the basic graphical environment with a collection " -"of accompanying tools" -msgstr "" -"K Desktop Environment - основная графическая среда с коллекцией " -"сопроводительных утилит" +msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" +msgstr "K Desktop Environment - основная графическая среда с коллекцией сопроводительных утилит" #: share/meta-task/compssUsers.pl:156 #, c-format msgid "GNOME Workstation" msgstr "Рабочая станция Gnome" -#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168 +#: share/meta-task/compssUsers.pl:157 +#: share/meta-task/compssUsers.pl:168 #, c-format -msgid "" -"A graphical environment with user-friendly set of applications and desktop " -"tools" -msgstr "" -"Графическая среда с удобным для пользователя набором приложений и утилит " -"рабочего стола" +msgid "A graphical environment with user-friendly set of applications and desktop tools" +msgstr "Графическая среда с удобным для пользователя набором приложений и утилит рабочего стола" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Рабочая станция KDE" +msgstr "Рабочая станция XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format -msgid "" -"A lighter graphical environment with user-friendly set of applications and " -"desktop tools" -msgstr "" -"Графическая среда с удобным для пользователя набором приложений и утилит " -"рабочего стола" +#, c-format +msgid "A lighter graphical environment with user-friendly set of applications and desktop tools" +msgstr "Более лёгкая графическая среда с удобным набором приложений и инструментов" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Рабочая станция Gnome" +msgstr "Рабочая станция MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Рабочая станция" +msgstr "Рабочая станция Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Графическое окружение" +msgstr "Графическое окружение на основе GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -793,34 +758,28 @@ msgstr "Рабочий стол LXDE" #: share/meta-task/compssUsers.pl:179 #, c-format -msgid "" -"A lightweight & fast graphical environment with user-friendly set of " -"applications and desktop tools" -msgstr "" -"Простая и быстрая графическая среда с удобным для пользователя набором " -"приложений и настольными программами" +msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools" +msgstr "Простая и быстрая графическая среда с удобным для пользователя набором приложений и настольными программами" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Другой рабочий стол" +msgstr "Рабочий стол RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Менее развитая, лёгкая, быстрая графическая среда" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Рабочий стол Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Простая и быстрая графическая среда с удобным для пользователя набором " -"приложений и настольными программами" +msgstr "Легкая и быстрая графическая среда" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -828,16 +787,17 @@ msgid "Other Graphical Desktops" msgstr "Другие графические рабочие столы" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm и т.п." +msgstr "Window Maker, Fvwm и т.п." #: share/meta-task/compssUsers.pl:217 #, c-format msgid "Utilities" msgstr "Утилиты" -#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220 +#: share/meta-task/compssUsers.pl:219 +#: share/meta-task/compssUsers.pl:220 #, c-format msgid "SSH Server" msgstr "Сервер SSH" @@ -886,15 +846,14 @@ msgstr "" msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" -"\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n" msgstr "" "Некоторые важные пакеты установились некорректно.\n" "Повреждён привод CDROM или компакт-диск.\n" -"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/" -"main/*.rpm\"\n" +"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/main/*.rpm\"\n" -#: steps_auto_install.pm:71 steps_stdio.pm:27 +#: steps_auto_install.pm:71 +#: steps_stdio.pm:27 #, c-format msgid "Entering step `%s'\n" msgstr "Выполняется переход на этап `%s'\n" @@ -926,7 +885,8 @@ msgstr "" "текстовом режиме. Для этого после загрузки с диска нажмите `F1',\n" "а затем наберите 'text'." -#: steps_gtk.pm:240 steps_gtk.pm:757 +#: steps_gtk.pm:240 +#: steps_gtk.pm:757 #, c-format msgid "Media Selection" msgstr "Выбор источника" @@ -971,12 +931,15 @@ msgstr "Это предварительный вид рабочего стола msgid "Click on images in order to see a bigger preview" msgstr "Щёлкните картинку, чтобы увеличить её" -#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30 +#: steps_gtk.pm:325 +#: steps_interactive.pm:633 +#: steps_list.pm:30 #, c-format msgid "Package Group Selection" msgstr "Выбор групп пакетов" -#: steps_gtk.pm:350 steps_interactive.pm:650 +#: steps_gtk.pm:350 +#: steps_interactive.pm:650 #, c-format msgid "Individual package selection" msgstr "Выбор отдельных пакетов" @@ -986,7 +949,8 @@ msgstr "Выбор отдельных пакетов" msgid "Unselect All" msgstr "Снять выделение со всех" -#: steps_gtk.pm:376 steps_interactive.pm:562 +#: steps_gtk.pm:376 +#: steps_interactive.pm:562 #, c-format msgid "Total size: %d / %d MB" msgstr "Общий объём: %d / %d МБ" @@ -1038,9 +1002,7 @@ msgstr "чтобы сохранить %s" #: steps_gtk.pm:470 #, c-format -msgid "" -"You cannot select this package as there is not enough space left to install " -"it" +msgid "You cannot select this package as there is not enough space left to install it" msgstr "Этот пакет нельзя выбрать, т.к. для его установки не хватает места" #: steps_gtk.pm:473 @@ -1098,12 +1060,15 @@ msgstr "Минимальная установка" msgid "Software Management" msgstr "Управление ПО" -#: steps_gtk.pm:534 steps_interactive.pm:443 +#: steps_gtk.pm:534 +#: steps_interactive.pm:443 #, c-format msgid "Choose the packages you want to install" msgstr "Выберите пакеты, которые нужно установить" -#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32 +#: steps_gtk.pm:551 +#: steps_interactive.pm:670 +#: steps_list.pm:32 #, c-format msgid "Installing" msgstr "Установка" @@ -1130,7 +1095,9 @@ msgid_plural "%d packages" msgstr[0] "%d пакет" msgstr[1] "%d пакетов" -#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 +#: steps_gtk.pm:687 +#: steps_interactive.pm:837 +#: steps_list.pm:43 #, c-format msgid "Summary" msgstr "Сводка" @@ -1140,12 +1107,15 @@ msgstr "Сводка" msgid "Configure" msgstr "Настройка" -#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986 +#: steps_gtk.pm:723 +#: steps_interactive.pm:833 +#: steps_interactive.pm:986 #, c-format msgid "not configured" msgstr "не настроен" -#: steps_gtk.pm:766 steps_interactive.pm:343 +#: steps_gtk.pm:766 +#: steps_interactive.pm:343 #, c-format msgid "" "The following installation media have been found.\n" @@ -1154,20 +1124,18 @@ msgstr "" "Найдены следующие источники для установки.\n" "Если нужно пропустить некоторые из них, сейчас с них можно снять флажки." -#: steps_gtk.pm:782 steps_interactive.pm:349 +#: steps_gtk.pm:782 +#: steps_interactive.pm:349 #, c-format msgid "" -"You have the option to copy the contents of the CDs onto the hard disk drive " -"before installation.\n" -"It will then continue from the hard disk drive and the packages will remain " -"available once the system is fully installed." +"You have the option to copy the contents of the CDs onto the hard disk drive before installation.\n" +"It will then continue from the hard disk drive and the packages will remain available once the system is fully installed." msgstr "" -"Содержимое компакт-диска перед установкой можно скопировать на жёсткий " -"диск.\n" -"После этого установка продолжится с жёсткого диска, и пакеты будут доступны " -"после полной установки системы." +"Содержимое компакт-диска перед установкой можно скопировать на жёсткий диск.\n" +"После этого установка продолжится с жёсткого диска, и пакеты будут доступны после полной установки системы." -#: steps_gtk.pm:784 steps_interactive.pm:351 +#: steps_gtk.pm:784 +#: steps_interactive.pm:351 #, c-format msgid "Copy whole CDs" msgstr "Целиком скопировать компакт-диски" @@ -1245,8 +1213,7 @@ msgstr "" "\n" "Рекомедуется заново установить систему, заменив существующую.\n" "\n" -"Внимание: вы должны сделать копию всех ваших персональных данных, перед " -"выбором \"Новая\n" +"Внимание: вы должны сделать копию всех ваших персональных данных, перед выбором \"Новая\n" "Установка\"." #: steps_interactive.pm:264 @@ -1261,38 +1228,25 @@ msgstr "Настраивается IDE" #: steps_interactive.pm:301 #, c-format -msgid "" -"No free space for 1MB bootstrap! Install will continue, but to boot your " -"system, you'll need to create the bootstrap partition in DiskDrake" -msgstr "" -"Недостаточно свободного места для программы самозагрузки! Установка " -"продолжится, но для загрузки системы будет необходимо создать раздел " -"начальной загрузки в DiskDrake" +msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" +msgstr "Недостаточно свободного места для программы самозагрузки! Установка продолжится, но для загрузки системы будет необходимо создать раздел начальной загрузки в DiskDrake" #: steps_interactive.pm:306 #, c-format -msgid "" -"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but " -"to boot your system, you'll need to create the bootstrap partition in " -"DiskDrake" -msgstr "" -"Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но " -"для загрузки системы нужно будет создать раздел начальной загрузки в " -"DiskDrake" +msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake" +msgstr "Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но для загрузки системы нужно будет создать раздел начальной загрузки в DiskDrake" #: steps_interactive.pm:382 #, c-format msgid "" "Change your Cd-Rom!\n" -"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when " -"done.\n" +"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n" "If you do not have it, press Cancel to avoid installation from this Cd-Rom." msgstr "" "Смените компакт-диск!\n" "\n" "Вставьте в привод компакт-диск под названием \"%s\", а затем нажмите 'ОК'.\n" -"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого " -"диска." +"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого диска." #: steps_interactive.pm:400 #, c-format @@ -1301,12 +1255,8 @@ msgstr "Поиск доступных пакетов..." #: steps_interactive.pm:408 #, c-format -msgid "" -"Your system does not have enough space left for installation or upgrade " -"(%dMB > %dMB)" -msgstr "" -"В вашей системе недостаточно свободного дискового пространства для установки " -"или обновления (%d МБ > %d МБ)" +msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)" +msgstr "В вашей системе недостаточно свободного дискового пространства для установки или обновления (%d МБ > %d МБ)" #: steps_interactive.pm:456 #, c-format @@ -1451,7 +1401,8 @@ msgstr "Настройка после установки" msgid "Please ensure the Update Modules media is in drive %s" msgstr "Проверьте наличие носителя 'Update Modules' в устройстве %s" -#: steps_interactive.pm:767 steps_list.pm:47 +#: steps_interactive.pm:767 +#: steps_list.pm:47 #, c-format msgid "Updates" msgstr "Обновления" @@ -1483,13 +1434,17 @@ msgstr "" msgid "%s on %s" msgstr "%s на %s" -#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933 -#: steps_interactive.pm:950 steps_interactive.pm:965 +#: steps_interactive.pm:913 +#: steps_interactive.pm:920 +#: steps_interactive.pm:933 +#: steps_interactive.pm:950 +#: steps_interactive.pm:965 #, c-format msgid "Hardware" msgstr "Оборудование" -#: steps_interactive.pm:934 steps_interactive.pm:951 +#: steps_interactive.pm:934 +#: steps_interactive.pm:951 #, c-format msgid "Sound card" msgstr "Звуковая карта" @@ -1501,26 +1456,21 @@ msgstr "Есть ли у вас звуковая карта ISA?" #: steps_interactive.pm:956 #, c-format -msgid "" -"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " -"card" -msgstr "" -"Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" " -"или \"sndconfig\"." +msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card" +msgstr "Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" или \"sndconfig\"." #: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" -msgstr "" -"Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту " -"\"harddrake\" " +msgstr "Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту \"harddrake\" " #: steps_interactive.pm:966 #, c-format msgid "Graphical interface" msgstr "Графический интерфейс" -#: steps_interactive.pm:972 steps_interactive.pm:984 +#: steps_interactive.pm:972 +#: steps_interactive.pm:984 #, c-format msgid "Network & Internet" msgstr "Сеть и Интернет" @@ -1578,25 +1528,13 @@ msgstr "Подождите, это может занять некоторое в #: steps_interactive.pm:1077 #, c-format -msgid "" -"You appear to have an OldWorld or Unknown machine, the yaboot bootloader " -"will not work for you. The install will continue, but you'll need to use " -"BootX or some other means to boot your machine. The kernel argument for the " -"root fs is: root=%s" -msgstr "" -"Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на " -"которой начальный загрузчик 'yaboot' не будет работать. Установка " -"продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или " -"какой-то другой. Параметр ядра для корневой файловой системы: root=%s" +msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s" +msgstr "Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на которой начальный загрузчик 'yaboot' не будет работать. Установка продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или какой-то другой. Параметр ядра для корневой файловой системы: root=%s" #: steps_interactive.pm:1090 #, c-format -msgid "" -"In this security level, access to the files in the Windows partition is " -"restricted to the administrator." -msgstr "" -"На данном уровне безопасности доступ к файлам на разделе Windows разрешён " -"только администратору. " +msgid "In this security level, access to the files in the Windows partition is restricted to the administrator." +msgstr "На данном уровне безопасности доступ к файлам на разделе Windows разрешён только администратору. " #: steps_interactive.pm:1122 #, c-format @@ -1637,7 +1575,8 @@ msgid "" "Language" msgstr "Выбор языка" -#: steps_list.pm:16 steps_list.pm:23 +#: steps_list.pm:16 +#: steps_list.pm:23 #, c-format msgid "Localization" msgstr "Локализация" @@ -1656,14 +1595,16 @@ msgid "" "Mouse" msgstr "Мышь" -#: steps_list.pm:19 steps_list.pm:20 +#: steps_list.pm:19 +#: steps_list.pm:20 #, c-format msgid "" "_: Keep these entry short\n" "Hard drive detection" msgstr "Поиск жёсткого диска" -#: steps_list.pm:21 steps_list.pm:22 +#: steps_list.pm:21 +#: steps_list.pm:22 #, c-format msgid "" "_: Keep these entry short\n" @@ -1691,7 +1632,8 @@ msgid "" "Partitioning" msgstr "Разметка диска" -#: steps_list.pm:27 steps_list.pm:28 +#: steps_list.pm:27 +#: steps_list.pm:28 #, c-format msgid "" "_: Keep these entry short\n" @@ -1719,14 +1661,16 @@ msgid "" "Users" msgstr "Пользователи" -#: steps_list.pm:38 steps_list.pm:39 +#: steps_list.pm:38 +#: steps_list.pm:39 #, c-format msgid "" "_: Keep these entry short\n" "Bootloader" msgstr "Загрузчик" -#: steps_list.pm:40 steps_list.pm:41 +#: steps_list.pm:40 +#: steps_list.pm:41 #, c-format msgid "" "_: Keep these entry short\n" @@ -1740,7 +1684,8 @@ msgid "" "Summary" msgstr "Сводка" -#: steps_list.pm:44 steps_list.pm:45 +#: steps_list.pm:44 +#: steps_list.pm:45 #, c-format msgid "" "_: Keep these entry short\n" -- cgit v1.2.1 From fb0e725b23878e5c4b7dccd5b679831f78ad536d Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 3 Nov 2013 16:12:51 +0000 Subject: rescue: 1.46 --- rescue/Makefile | 2 +- rescue/NEWS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rescue/Makefile b/rescue/Makefile index 9e6b80637..064670531 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.45.1 +VERSION=1.46 PRODUCT=drakx-installer-rescue RESCUE = rescue.sqfs diff --git a/rescue/NEWS b/rescue/NEWS index cf1c694d2..bb85b4dbd 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,4 @@ +Version 1.46 - 20 October 2013 by Colin Guthrie - adapt to a dracut based stage1 Version 1.45.1 - 14 October 2013 by Colin Guthrie -- cgit v1.2.1 From 66b836a78461613399cca62b4ef87e8b86e8aca1 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Sun, 3 Nov 2013 16:18:00 +0000 Subject: install: Update beta1 left background --- perl-install/install/NEWS | 2 ++ perl-install/install/pixmaps/left-background.png | Bin 220817 -> 220862 bytes 2 files changed, 2 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 0633ad6c6..7ac776d1f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- Mageia 4 beta 1 left background + Version 15.69 - 29 October 2013 - adapt to a dracut based stage1 diff --git a/perl-install/install/pixmaps/left-background.png b/perl-install/install/pixmaps/left-background.png index 9bc0dbaf2..c301c2b26 100644 Binary files a/perl-install/install/pixmaps/left-background.png and b/perl-install/install/pixmaps/left-background.png differ -- cgit v1.2.1 From 5f88dc22a2b9d279ab3fe908e40f4c3cb86fd832 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Sun, 3 Nov 2013 16:18:52 +0000 Subject: 15.70 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index cb08a62d1..7b04bfdf3 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.69 +VERSION:=15.70 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7ac776d1f..03ab65043 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 15.70 - 3 November 2013 + - Mageia 4 beta 1 left background Version 15.69 - 29 October 2013 -- cgit v1.2.1 From f024f6ede059ff4b9cfe03076b1339b203132ba1 Mon Sep 17 00:00:00 2001 From: filip Date: Sun, 3 Nov 2013 18:56:47 +0100 Subject: Slovenian translation updated --- perl-install/install/share/po/sl.po | 41 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/perl-install/install/share/po/sl.po b/perl-install/install/share/po/sl.po index 65a0eabfe..510927295 100644 --- a/perl-install/install/share/po/sl.po +++ b/perl-install/install/share/po/sl.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-04 12:10+0100\n" +"PO-Revision-Date: 2013-11-03 18:50+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" @@ -749,32 +749,33 @@ msgstr "" "Grafično okolje z naborom uporabniku prijaznih programov in namiznimi orodji" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Delovna postaja KDE" +msgstr "Delovna postaja XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Grafično okolje z naborom uporabniku prijaznih programov in namiznimi orodji" +"Majhno grafično okolje z naborom uporabniku prijaznih programov in namiznimi " +"orodji" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Delovna postaja GNOME" +msgstr "Delovna postaja MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Delovna postaja" +msgstr "Delovna postaja Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Grafično okolje" +msgstr "Grafično okolje osnovano na GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -791,26 +792,24 @@ msgstr "" "namiznimi orodji" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Namizje po meri" +msgstr "Namizje RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Majhno in hitro, a manj razvito grafično okolje" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Namizje Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Majhno in hitro grafično okolje z naborom uporabniku prijaznih programov in " -"namiznimi orodji" +msgstr "Majhno in hitro grafično okolje s predanimi privrženci" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -818,9 +817,9 @@ msgid "Other Graphical Desktops" msgstr "Druga grafična namizja" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, FVWM ..." +msgstr "Window Maker, FVWM ..." #: share/meta-task/compssUsers.pl:217 #, c-format -- cgit v1.2.1 From 9b27817656c02746ae230508631ebfb4334f6f57 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 4 Nov 2013 14:05:57 +0000 Subject: Revert "images: Fix 32-bit isolinux wrapper (s/i586/i386)" This reverts commit addfd6769673ba661498183a220769144f758f5a. Conflicts: images/NEWS --- images/NEWS | 2 ++ images/isolinux.cfg | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images/NEWS b/images/NEWS index 43c9ef30c..6ee96e164 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- revert back to static per-arch isolinux.cfg files + Version 2.00 - 2 November 2013 by Thomas Backlund - ensure initrd is created with 644 perms (normally 600 for security reasons) diff --git a/images/isolinux.cfg b/images/isolinux.cfg index 70fa19d0a..1facfc8a3 100644 --- a/images/isolinux.cfg +++ b/images/isolinux.cfg @@ -1,8 +1,8 @@ default detect label detect com32 ifcpu.c32 - append 64 -- x86_64 -- i386 + append 64 -- x86_64 -- i586 label x86_64 config x86_64.cfg -label i386 - config i386.cfg +label i586 + config i586.cfg -- cgit v1.2.1 From c386a93997aa2f3e233a273f8c7157e2ab26d217 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 4 Nov 2013 14:06:00 +0000 Subject: Revert "images: Use a generic, shared isolinux.cfg file." This reverts commit 74cc75140329a03e5ed6f952932f8ea937216209. --- images/isolinux.cfg | 8 -------- images/make_boot_img | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 images/isolinux.cfg diff --git a/images/isolinux.cfg b/images/isolinux.cfg deleted file mode 100644 index 1facfc8a3..000000000 --- a/images/isolinux.cfg +++ /dev/null @@ -1,8 +0,0 @@ -default detect -label detect - com32 ifcpu.c32 - append 64 -- x86_64 -- i586 -label x86_64 - config x86_64.cfg -label i586 - config i586.cfg diff --git a/images/make_boot_img b/images/make_boot_img index ed4c5baec..b07776b27 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -682,8 +682,7 @@ sub isolinux { _ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32"; _ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32"; _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32"; - output("isolinux/$arch.cfg", syslinux_cfg_all('cdrom', 1)); - _ "cp isolinux.cfg isolinux/"; + output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); xbox_stage1() if arch() =~ /i.86/; } @@ -728,8 +727,7 @@ sub boot_iso { #_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot; _ "cp /usr/lib/syslinux/gfxboot.c32 .boot_iso/isolinux/gfxboot.c32" if $with_gfxboot; - output(".boot_iso/isolinux/$arch.cfg", syslinux_cfg_all('', $with_gfxboot)); - _ "cp isolinux.cfg .boot_iso/isolinux/"; + output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; _ "isohybrid -o 1 $iso"; -- cgit v1.2.1 From 68a6562894f4d85e94721cc51264c80670c65615 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 5 Nov 2013 12:33:10 +0000 Subject: images: 2.1 --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 3d54152f8..386792f2a 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.00 +VERSION=2.1 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 6ee96e164..fbb047944 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 2.1 - 5 November 2013 by Colin Guthrie + - revert back to static per-arch isolinux.cfg files Version 2.00 - 2 November 2013 by Thomas Backlund -- cgit v1.2.1 From af2da841dbb78c275a4ee32c5f1653f7c6b13677 Mon Sep 17 00:00:00 2001 From: tarakbumba Date: Tue, 5 Nov 2013 21:41:48 +0200 Subject: Updated turkish translation --- perl-install/install/share/po/tr.po | 41 +++++++++++---------- perl-install/standalone/po/tr.po | 71 +++++++++++++++++++++---------------- 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/perl-install/install/share/po/tr.po b/perl-install/install/share/po/tr.po index 6eba712f0..345f7a74f 100644 --- a/perl-install/install/share/po/tr.po +++ b/perl-install/install/share/po/tr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-09 01:31+0300\n" +"PO-Revision-Date: 2013-11-05 21:31+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Mageia Turkish Translation Team \n" "Language: tr\n" @@ -743,32 +743,33 @@ msgstr "" "Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam " #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "KDE İş istasyonu" +msgstr "XFCE İş istasyonu" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, 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 görsel bir ortam " +"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel " +"bir ortam " #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "GNOME İş istasyonu" +msgstr "MATE İş istasyonu" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "İş istasyonu" +msgstr "Cinnamon İş istasyonu" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Grafik Ortamı" +msgstr "GNOME temelli bir grafik ortamı" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -785,26 +786,24 @@ msgstr "" "ortam" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Kişisel Masaüstü" +msgstr "RazorQT Masaüstü" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Daha az gelişmiş, hafif ve hızlı grafiksel bir ortam" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Enlightenment e17 Masaüstü" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel " -"ortam" +msgstr "Bunlara özgülenmiş hızlı ve hafif bir görsel ortam" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -812,9 +811,9 @@ msgid "Other Graphical Desktops" msgstr "Diğer Görsel Masaüstleri" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, etc" +msgstr "Window Maker, Fvwm, v.b." #: share/meta-task/compssUsers.pl:217 #, c-format diff --git a/perl-install/standalone/po/tr.po b/perl-install/standalone/po/tr.po index 3503c70ef..4523a1dc9 100644 --- a/perl-install/standalone/po/tr.po +++ b/perl-install/standalone/po/tr.po @@ -11,18 +11,20 @@ # Erçin EKER , 2003. # Atilla ÖNTAŞ , 2008-2013. # Numan Demirdöğen , 2013. +# Atilla ÖNTAŞ , 2013. msgid "" msgstr "" "Project-Id-Version: drakx_standalone\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-16 02:21+0200\n" -"Last-Translator: Numan Demirdöğen \n" -"Language-Team: Mageia Turkish Translation Team \n" +"PO-Revision-Date: 2013-11-05 21:39+0300\n" +"Last-Translator: Atilla ÖNTAŞ \n" +"Language-Team: Mageia Turkish Translation Team \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" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Virtaal 0.7.1\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -691,7 +693,8 @@ msgstr "Yazı tipi kurucusu." #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") #: drakfont:533 harddrake2:242 #, c-format -msgid "_: Translator(s) name(s) & email(s)\n" +msgid "" +"_: Translator(s) name(s) & email(s)\n" msgstr "" "Ömer Fadıl USTA , 1999-2003.\n" "Tuncay YENİAY , 2002.\n" @@ -3392,118 +3395,126 @@ msgid "Language & country configuration" msgstr "Dil ve Ülke yapılandırması" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Posta uyarı yapılandırması" +msgstr "Mageia Kimlik Doğrulama Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"Mageia Kimlik Doğrulama Yapılandırması çalıştırmak için kimlik doğrulama " +"gerekli" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Önyükleme Yapılandırması" +msgstr "Mageia Önyükleme Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" msgstr "" +"Mageia Önyükleme Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Posta uyarı yapılandırması" +msgstr "Mageia Tarih ve Saat Yapılandırma Çalıştır" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" +"Mageia Tarih ve Saat Yapılandırması çalıştırmak için kimlik doğrulama " +"gerekli" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Mageia Disk Yerleşimi Düzenleyici Çalıştır" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" msgstr "" +"Mageia Disk Yerleşimi Düzenleyici' yi çalıştırmak için kimlik doğrulama " +"gerekli" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Dil ve Ülke yapılandırması" +msgstr "Mageia Giriş Yöneticisi Yapılandırma Çalıştır" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" msgstr "" +"Mageia Giriş Yöneticisi Yapılandırması çalıştırmak için kimlik doğrulaması " +"gerekli" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Dil ve Ülke yapılandırması" +msgstr "Mageia Yazıtipi Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" msgstr "" +"Mageia Yazıtipi Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Grafiksel Sunucu Yapılandırması" +msgstr "Mageia Donanım Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" msgstr "" +"Mageia Donanım Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Mageia Günlük Kaydı Görüntüleyici Çalıştır" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" msgstr "" +"Mageia Günlük Kaydı Görüntüleyici' yi çalıştırmak için kimlik doğrulama " +"gerekli" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Grafiksel Sunucu Yapılandırması" +msgstr "Mageia Güvenlik İzinleri Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" +"Mageia Güvenlik İzinleri Yapılandırması çalıştırmak için kimlik doğrulama " +"gerekli" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Grafiksel Sunucu Yapılandırması" +msgstr "Mageia Tarayıcı Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" msgstr "" +"Mageia Tarayıcı Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Posta uyarı yapılandırması" +msgstr "Mageia Uygulama Güvenliği Yapılandırması Çalıştır" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" +"Mageia Uygulama Güvenliği Yapılandırması çalıştırmak için kimlik doğrulaması " +"gerekli" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "UPS Yapılandırması" +msgstr "Mageia UPS Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Mageia UPS Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Grafiksel Sunucu Yapılandırması" +msgstr "Mageia Hizmet Yapılandırması Çalıştır" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" msgstr "" +"Mageia Hizmet Yapılandırması çalıştırmak için kimlik doğrulaması gerekli" -- cgit v1.2.1 From c981ca81e90d734c8ed412c90e53aecda07a12f1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 6 Nov 2013 12:54:36 +0000 Subject: stage1: Ensure kernel modules and firmware can be loaded in stage2 mga#11600 mga#11601 --- mdk-stage1/NEWS | 4 ++++ mdk-stage1/init.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 498850515..96aff7b04 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,7 @@ +- kernel modules and firmware is needed during stage2, so move and symlink + (symlinks are only for if you umount state2 /usr and want a still working initrd) + mga#11600 mga#11601 + 1.83 - do initrd symlinking in 'init' rather than 'stage1' (stage1 is now run earlier) - build init and stage1 as a shared library (due to bugs in directory handling diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index b5fb6115b..7cec1076b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -517,6 +517,20 @@ int main(int argc, char **argv) if (create_initial_fs_symlinks(STAGE2_LOCATION "/usr/share/symlinks") != 0) fatal_error("Fatal error finishing initialization (could not create symlinks)."); + /* kernel modules and firmware is needed by stage2, so move them to the root */ + if (rename("/usr/lib/modules", "/modules")) + fatal_error("Cannot rename modules folder"); + + if (rename("/usr/lib/firmware", "/firmware")) + fatal_error("Cannot rename firmware folder"); + + /* Add some symlinks so stage1 is still valid on it's own - not strictly needed */ + if (symlink("/modules", "/usr/lib/modules")) + fatal_error("Cannot symlink modules folder"); + + if (symlink("/firmware", "/usr/lib/firmware")) + fatal_error("Cannot symlink firmware folder"); + if (mount(STAGE2_LOCATION "/usr", "/usr", "none", MS_BIND|MS_RDONLY, NULL)) fatal_error("Unable to bind mount /usr filesystem from rescue or installer stage2"); -- cgit v1.2.1 From 8a6400bbfea81118a90def75fd3f7c41a0ac1d04 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 6 Nov 2013 12:56:33 +0000 Subject: stage1: 2.0 Version bumped to represent the major change from previously (as was done for stage2) --- mdk-stage1/Makefile | 2 +- mdk-stage1/NEWS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index b320a04c8..591100525 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -VERSION=1.83 +VERSION=2.0 PRODUCT=drakx-installer-binaries # diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 96aff7b04..f5406b6d9 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +2.0 - kernel modules and firmware is needed during stage2, so move and symlink (symlinks are only for if you umount state2 /usr and want a still working initrd) mga#11600 mga#11601 -- cgit v1.2.1 From 20e8b9849a0a80c01f17fe8b59747d805bb75fc9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 10:21:05 +0100 Subject: drop packdrake (uneeded) it's uneeded since we switch to urpmi last usage was drop in commit 61e15785 on Nov 16 2012 --- perl-install/install/NEWS | 2 ++ perl-install/install/share/list.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 03ab65043..1d9324f30 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- do not include anymore packdrake module + Version 15.70 - 3 November 2013 - Mageia 4 beta 1 left background diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index af18e5962..0a286a909 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -464,7 +464,6 @@ - packdrake.pm Config/IniFiles.pm MDV/Distribconf.pm MDV/Packdrakeng.pm -- cgit v1.2.1 From ce0490fc814b209dff1fef98aaa90a974d0b6f42 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Fri, 8 Nov 2013 10:19:59 +0100 Subject: do not use gdm automatically for XFCE (too heavy) --- perl-install/any.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 27bae9ac1..26ffacf4f 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -663,7 +663,6 @@ sub get_autologin() { my %desktop_to_dm = ( GNOME => 'gdm', KDE4 => 'kdm', - xfce4 => 'gdm', LXDE => 'lxdm', ); my %dm_canonical = ( -- cgit v1.2.1 From 7921b47111412d20a2af795684be49cf032307f0 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Fri, 8 Nov 2013 10:32:03 +0100 Subject: 15.71 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 7b04bfdf3..f783799d3 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.70 +VERSION:=15.71 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1d9324f30..2910f4baf 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +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 -- cgit v1.2.1 From 76b172ebe3c1d692183b2ca89a43bc265ee2af48 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 11:27:45 +0100 Subject: fix building debug image with latest gdb --- perl-install/install/NEWS | 3 +++ perl-install/install/share/list.xml | 17 +++-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 2910f4baf..8321c2bfb 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- debug image: + o fix building with latest gdb + Version 15.71 - 8 November 2013 - do not use automatically gdm for xfce diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 0a286a909..9a4a92f9c 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -252,20 +252,9 @@ /usr/LIB/python2.7/warnings.py /usr/LIB/python2.7/weakref.py /usr/LIB/python2.7/_weakrefset.py - /usr/share/gdb/python/gdb/backtrace.py - /usr/share/gdb/python/gdb/command/backtrace.py - /usr/share/gdb/python/gdb/command/ignore_errors.py - /usr/share/gdb/python/gdb/command/__init__.py - /usr/share/gdb/python/gdb/command/pahole.py - /usr/share/gdb/python/gdb/command/pretty_printers.py - /usr/share/gdb/python/gdb/command/require.py - /usr/share/gdb/python/gdb/command/upto.py - /usr/share/gdb/python/gdb/FrameIterator.py - /usr/share/gdb/python/gdb/FrameWrapper.py - /usr/share/gdb/python/gdb/function/caller_is.py - /usr/share/gdb/python/gdb/function/__init__.py - /usr/share/gdb/python/gdb/function/in_scope.py - /usr/share/gdb/python/gdb/__init__.py + + /usr/share/gdb/python/gdb/* + -- cgit v1.2.1 From b9a02896df3a48aebccfe23cc144d02637100400 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 11:53:31 +0100 Subject: add missing python modules for gdb --- perl-install/install/NEWS | 1 + perl-install/install/share/list.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8321c2bfb..8c06591e9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - debug image: + o add missing python modules for latest gdb o fix building with latest gdb Version 15.71 - 8 November 2013 diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 9a4a92f9c..f029c0b61 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -227,6 +227,7 @@ /usr/LIB/python2.7/_abcoll.py /usr/LIB/python2.7/abc.py /usr/LIB/python2.7/codecs.py + /usr/LIB/python2.7/collections.py /usr/LIB/python2.7/config/Makefile /usr/LIB/python2.7/copy.py /usr/LIB/python2.7/copy_reg.py @@ -246,6 +247,7 @@ /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 -- cgit v1.2.1 From 26b5fcd0b10715f1d0d085a1f9db5907a10185f2 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 16:39:01 +0159 Subject: - dont remove radeon-firmware or any network related firmwares as we dont know when some hw gets plugged that needs it --- perl-install/NEWS | 3 +++ perl-install/pkgs.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index f733849a8..78753b6b1 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- dont remove radeon-firmware or any network related firmwares as we dont + know when some hw gets plugged that needs it + Version 15.68 - 14 October 2013 - fix path to urpmi.update (so it works without mgaonline installed mga#11125) diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 34a72bcf4..f2bea7cc8 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -259,7 +259,7 @@ sub remove_unused_packages { undef $wait; # Packages to not remove even if they seem unused - my @wanted_hardware_packages = qw(gnome-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant); + my @wanted_hardware_packages = qw(gnome-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode); @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages); @unused_hardware_packages || @unselected_locales or return; -- cgit v1.2.1 From 116c83ad9eba3d54e2fd0657f9b9768bda4afbe4 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 16:46:50 +0159 Subject: 15.72 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index f783799d3..4f5b5ae58 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.71 +VERSION:=15.72 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 78753b6b1..b120881ff 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 15.72 - 9 November 2013 + - dont remove radeon-firmware or any network related firmwares as we dont know when some hw gets plugged that needs it -- cgit v1.2.1 From c95ef2daa33f39c7e8f1d4eb86595f6c4daccb95 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 20:34:23 +0159 Subject: use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319) --- perl-install/install/NEWS | 1 + perl-install/standalone/polkit/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8c06591e9..8052ab908 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- 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 diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index a8b5a51da..b70cc96c4 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@ + @echo -e '#!/bin/sh\nif [[ "$(id -u)" != "0" ]] ; then" >\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache -- cgit v1.2.1 From 432fd0e73660d9d2be0063f1d0e9e0c1e6c8bc37 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 20:36:33 +0159 Subject: 15.72 --- perl-install/install/NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8052ab908..4cceb9482 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +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 -- cgit v1.2.1 From d785037f4af85bae350353e84e58165319def060 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 22:37:51 +0159 Subject: fix typo in last Makefile change --- perl-install/install/NEWS | 2 ++ perl-install/standalone/polkit/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 4cceb9482..ddd17fe7a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix typo in last Makefile change + Version 15.72 - 9 November 2013 - use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319) diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index b70cc96c4..c39f4ae71 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e '#!/bin/sh\nif [[ "$(id -u)" != "0" ]] ; then" >\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ + @echo -e '#!/bin/sh\nif [[ "$(id -u)" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache -- cgit v1.2.1 From 04857d3dc1375cc560292d30ab8db994dc143470 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sat, 9 Nov 2013 22:39:14 +0159 Subject: 15.72.1 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 4f5b5ae58..5f416193a 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.72 +VERSION:=15.72.1 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ddd17fe7a..8270b27db 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 15.72.1 - 9 November 2013 + - fix typo in last Makefile change Version 15.72 - 9 November 2013 -- cgit v1.2.1 From d7d5ba42ce1e234de688ae6648145e71f821c92e Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Sun, 10 Nov 2013 19:00:57 +0159 Subject: use 500 instead of 500 --- perl-install/install/NEWS | 2 ++ perl-install/standalone/polkit/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8270b27db..f6b795f46 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- use $UID instead of $(id -u) + Version 15.72.1 - 9 November 2013 - fix typo in last Makefile change diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index c39f4ae71..cadd056aa 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e '#!/bin/sh\nif [[ "$(id -u)" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ + @echo -e '#!/bin/sh\nif [[ "$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache -- cgit v1.2.1 From 830590691f7272ab8c1f0db29887c2bd8fc93874 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Mon, 11 Nov 2013 01:24:33 +0159 Subject: properly escape 5096UID --- perl-install/install/NEWS | 3 ++- perl-install/standalone/polkit/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f6b795f46..9c9f00705 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ -- use $UID instead of $(id -u) +- properly escape $$UID +- use $$UID instead of $$(id -u) Version 15.72.1 - 9 November 2013 diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index cadd056aa..3a1736983 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e '#!/bin/sh\nif [[ "$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ + @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache -- cgit v1.2.1 From 3ed597224e6730fe2e37f5afdbff0343e56028de Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Mon, 11 Nov 2013 01:25:54 +0159 Subject: 15.72.2 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 5f416193a..dce2c83ad 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.72.1 +VERSION:=15.72.2 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9c9f00705..f8679286c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 15.72.2 - 11 November 2013 + - properly escape $$UID - use $$UID instead of $$(id -u) -- cgit v1.2.1 From ab56a8451d6255b5892c2c7717c946b80e984f30 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 11 Nov 2013 20:54:36 +0200 Subject: Fix Tamil PO-file --- perl-install/standalone/po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/standalone/po/ta.po b/perl-install/standalone/po/ta.po index d75a6cd59..a58f3f7dc 100644 --- a/perl-install/standalone/po/ta.po +++ b/perl-install/standalone/po/ta.po @@ -180,7 +180,7 @@ msgstr "மான்ட்ரிவ லினக்ஸ்" #: drakbug:67 #, c-format msgid "%s Control Center" -msgstr "மாண்ட்ரிவ கட்டுப்பாடு மையம்" +msgstr "%s கட்டுப்பாடு மையம்" #: drakbug:68 #, c-format -- cgit v1.2.1 From 18526c95f0933172f4ab9623f8464d956b4668b8 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 12 Nov 2013 09:31:32 +0100 Subject: polkit: fix wrappers to properly escape arguments when calling the binary --- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ perl-install/standalone/polkit/Makefile | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index b120881ff..aa6ce087d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- polkit: fix wrappers to properly escape arguments when calling the binary + Version 15.72 - 9 November 2013 - dont remove radeon-firmware or any network related firmwares as we dont diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f8679286c..1cab1b451 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- polkit: fix wrappers to properly escape arguments when calling the binary + Version 15.72.2 - 11 November 2013 - properly escape $$UID diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index 3a1736983..070f4211e 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -13,7 +13,7 @@ clean: rm -f $(WRAPPERS) $(POLICY) %: org.mageia.%.policy.in - @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@ + @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@ %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache -- cgit v1.2.1 From dd28f6573bad3a9a4a4b86a22be7cbdca1bf99b8 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 12 Nov 2013 09:32:38 +0100 Subject: perl-install: 15.73 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index dce2c83ad..2736887a7 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.72.2 +VERSION:=15.73 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index aa6ce087d..4736ff288 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 15.73 - 12 November 2013 + - polkit: fix wrappers to properly escape arguments when calling the binary Version 15.72 - 9 November 2013 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1cab1b451..d024cda19 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 15.73 - 12 November 2013 + - polkit: fix wrappers to properly escape arguments when calling the binary Version 15.72.2 - 11 November 2013 -- cgit v1.2.1 From 2b80ee5e648b7b1001119c74c9b416dea217f9e1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 10:59:00 +0100 Subject: explain how to get a stack trace --- perl-install/install/share/gdb-inst | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/perl-install/install/share/gdb-inst b/perl-install/install/share/gdb-inst index 84c2db9bf..d5ab6c6ca 100644 --- a/perl-install/install/share/gdb-inst +++ b/perl-install/install/share/gdb-inst @@ -1,2 +1,22 @@ #!/bin/sh -exec gdb -q --args perl /usr/bin/install2 \ No newline at end of file +cat < Date: Tue, 12 Nov 2013 21:23:39 +0100 Subject: support dynamic linking only --- mdk-stage1/Makefile | 18 ------------------ mdk-stage1/Makefile.common | 16 ---------------- mdk-stage1/NEWS | 2 ++ 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 591100525..75e321400 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -59,9 +59,7 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS) INIT_DEFS = INITSRC = init.c -ifneq (DIETLIBC, $(L)) INIT_DEFS += $(GLIBC_INCLUDES) -endif STAGE1_DEFS=-DDISABLE_KA @@ -70,35 +68,19 @@ INITOBJS = $(subst .c,.o,$(INITSRC)) #- frontends NEWT_FRONTEND_SRC = newt-frontend.c -ifeq (DIETLIBC, $(L)) -NEWT_FRONTEND_LIBS = libnewt.a libslang.a -else NEWT_FRONTEND_LIBS = -lnewt -lslang -endif STDIO_FRONTEND_SRC = stdio-frontend.c STDIO_FRONTEND_LIBS = FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC)) -ifeq (DIETLIBC, $(L)) -FRONTEND_LINK = $(FRONTEND_OBJS) $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$($(F)_FRONTEND_LIBS)) -else FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) -endif -ifeq (DIETLIBC, $(L)) -STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a) -else STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs -endif -ifeq (DIETLIBC, $(L)) -STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a -else STAGE1_NETWORK_LIBS = -lresolv -endif #- stage1 itself STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.c diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index d225da69e..1f3442730 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -27,21 +27,7 @@ else F = NEWT endif -# diet libc syscalls are broken on mips -#ifneq (mips, $(ARCH)) -## diet libc eabi support is mostly broken -#ifneq (arm, $(ARCH)) -#DIET = $(shell test -x /usr/bin/diet && echo diet) -#endif -#endif - - -ifeq ($(DIET), diet) - #- default lib is dietlibc (honoured by main Makefile whenever possible) -L = DIETLIBC -else L = GLIBC -endif ifdef DEBUG OPTFLAGS = -g -DDEBUG @@ -58,8 +44,6 @@ CFLAGS += -Werror endif endif -DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I. -DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a GLIBC_INCLUDES = -I. INCLUDES = $($(L)_INCLUDES) diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index f5406b6d9..fcb911d77 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- support dynamic linking only + 2.0 - kernel modules and firmware is needed during stage2, so move and symlink (symlinks are only for if you umount state2 /usr and want a still working initrd) -- cgit v1.2.1 From b79bb8a976c8990cc7b6f3b3f3ea219442429f28 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 21:24:47 +0100 Subject: simplify after previous commit: drop $DIET --- mdk-stage1/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 75e321400..f1a563575 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -141,15 +141,15 @@ dirs: done init: $(INITOBJS) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ @@ -157,16 +157,16 @@ $(INITOBJS): %.o: %.c $(COMPILE) $(INIT_DEFS) -c $< $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@ + $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@ $(STAGE1OBJS-NETWORK-STANDALONE): %-NETWORK-STANDALONE.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@ + $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-FULL): %-FULL.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@ + $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@ .c.o: - $(DIET) $(COMPILE) $(INCLUDES) -c $< + $(COMPILE) $(INCLUDES) -c $< clean: localclean @@ -179,11 +179,11 @@ localclean: rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ dist: tar -- cgit v1.2.1 From 7e4ea2526a7512601c16d468a78f7945059121ed Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 21:27:56 +0100 Subject: simplify, we only have one libc --- mdk-stage1/Makefile.common | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 1f3442730..188482ae9 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -44,10 +44,9 @@ CFLAGS += -Werror endif endif -GLIBC_INCLUDES = -I. -INCLUDES = $($(L)_INCLUDES) +INCLUDES = -I. -LDFLAGS = $($(L)_LDFLAGS) +LDFLAGS = STAGE1_LIBC = $($(L)_LIBC) -- cgit v1.2.1 From 6d081422730ada70af4d24c8c84f19c63ee3bd73 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 21:28:37 +0100 Subject: simplify: drop $STAGE1_LIBC --- mdk-stage1/Makefile | 10 +++++----- mdk-stage1/Makefile.common | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index f1a563575..1f47002f4 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -140,15 +140,15 @@ dirs: [ "$$n" = "." ] || make -C $$n || exit 1 ;\ done -init: $(INITOBJS) $(STAGE1_LIBC) +init: $(INITOBJS) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) +stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC) +dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ @@ -178,11 +178,11 @@ localclean: rm -f *.o .depend *.rdz *.img $(BINS) -rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(STAGE1_LIBC) +rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(STAGE1_LIBC) +probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index 188482ae9..629d27619 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -48,8 +48,6 @@ INCLUDES = -I. LDFLAGS = -STAGE1_LIBC = $($(L)_LIBC) - ifdef DEBUG STRIPCMD = echo not stripping else -- cgit v1.2.1 From 5ad105eaea1d6be9170593af2e4af8c7debee481 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 11:01:12 +0100 Subject: include enough python in order to generate a stack trace from within stage2 --- perl-install/install/NEWS | 3 +++ perl-install/install/share/list.xml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d024cda19..e20cf3bf9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- debug image: + o include enough python in order to generate a stack trace from within stage2 + Version 15.73 - 12 November 2013 - polkit: fix wrappers to properly escape arguments when calling the binary diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index f029c0b61..5a4c4a0bf 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -235,7 +235,11 @@ /usr/LIB/python2.7/encodings/__init__.py /usr/LIB/python2.7/encodings/utf_8.py /usr/LIB/python2.7/genericpath.py + /usr/LIB/python2.7/heapq.py + /usr/LIB/python2.7/keyword.py + /usr/LIB/python2.7/lib-dynload/_collections.so /usr/LIB/python2.7/lib-dynload/itertools.so + /usr/LIB/python2.7/lib-dynload/operator.so /usr/LIB/python2.7/linecache.py /usr/LIB/python2.7/os.py /usr/LIB/python2.7/posixpath.py -- cgit v1.2.1 From 9c8e358edad9ec6b7b0569113f5448b0f3a19faa Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 13 Nov 2013 11:39:34 +0100 Subject: images: Add a way to put an automatic method on boot.iso syslinux for testing --- images/NEWS | 2 ++ images/make_boot_img | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/images/NEWS b/images/NEWS index fbb047944..eab97dad3 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- add BOOT_AUTOMATIC_METHOD to inject command line params into boot.iso syslinux + Version 2.1 - 5 November 2013 by Colin Guthrie - revert back to static per-arch isolinux.cfg files diff --git a/images/make_boot_img b/images/make_boot_img index b07776b27..457572ca0 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -729,6 +729,10 @@ sub boot_iso { output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); + if ($ENV{BOOT_AUTOMATIC_METHOD}) { + _ "sed -i 's|splash quiet\$|splash quiet automatic=$ENV{BOOT_AUTOMATIC_METHOD}|' .boot_iso/isolinux/isolinux.cfg" + } + _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; _ "isohybrid -o 1 $iso"; rm_rf('.boot_iso'); -- cgit v1.2.1 From 79b08a48f3cff888454ebc4a71db4a3e92d992fd Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 13 Nov 2013 11:43:50 +0100 Subject: images/kernel: Pass the modules we need to be in modules.alias through to dracut. The installer needs to have the modules.alias information for more kernel modules than are actually included. In order to do this we need to use and environment variable as there is no sensible way to do this via dracut command line arguments. The mgainstaller dracut module will need updating accordingly. This should solve the problem where Sound Cards are shown as 'not configured' at the end of the install. --- images/NEWS | 2 ++ images/make_boot_img | 3 ++- kernel/modules.pl | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/images/NEWS b/images/NEWS index eab97dad3..0a91e7a9b 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- pass the modules we want in modules.alias, but not in the initrd through to + dracut via an environment variable - add BOOT_AUTOMATIC_METHOD to inject command line params into boot.iso syslinux Version 2.1 - 5 November 2013 by Colin Guthrie diff --git a/images/make_boot_img b/images/make_boot_img index 457572ca0..2ac8eb189 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -154,6 +154,7 @@ sub initrd { my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; my $modules = " mgainstaller "; my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`; + my $fakedrivers = `perl ../kernel/modules.pl list_fake_modules $kernel | xargs`; if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { $modules="$modules busybox "; @@ -162,7 +163,7 @@ sub initrd { mkdir_p("build/dracut.conf.d"); # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream - __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'"; + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary DRAKX_FAKE_MODULES='$fakedrivers' dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'"; chmod(0644, $img); } diff --git a/kernel/modules.pl b/kernel/modules.pl index 3b68b4039..70d6ed0bd 100644 --- a/kernel/modules.pl +++ b/kernel/modules.pl @@ -56,6 +56,20 @@ sub list_needed_modules { } } +sub list_fake_modules { + my ($kern_ver) = @_; + + load_dependencies("/lib/modules/$kern_ver/modules.dep"); + + my @all = map { category2modules($_) } split(' ', 'multimedia/*'); + my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all; + foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) { + my $modfile = basename($_); + $modfile =~ s/\.ko\.xz//; + $wanted_modules{$modfile} and print "$modfile\n"; + } +} + sub get_main_modules() { my $base = dirname($0); my $main = chomp_(cat_("$base/RPMS/.main")); -- cgit v1.2.1 From 5e2cb78633952183bf805f1c2223475305d8db6b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 13 Nov 2013 13:01:23 +0100 Subject: log why updates were not applied log a nice message (urpmi not found or no network) instead of a silent missing feature --- perl-install/any.pm | 11 +++++++++-- perl-install/install/NEWS | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 26ffacf4f..52dc46bb2 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -946,11 +946,18 @@ sub sessions_with_order() { sub urpmi_add_all_media { my ($in, $o_previous_release) = @_; - my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia' or return; + my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia'; + if (!$binary) { + log::l("urpmi.addmedia not found!"); + return; + } #- configure urpmi media if network is up require network::tools; - return if !network::tools::has_network_connection(); + if (!network::tools::has_network_connection()) { + log::l("no network connexion!"); + return; + } my $wait; my @options = ('--distrib', '--mirrorlist', '$MIRRORLIST'); if ($binary eq 'urpmi.addmedia') { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e20cf3bf9..d137a7c75 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - debug image: o include enough python in order to generate a stack trace from within stage2 +- log why updates were not applied Version 15.73 - 12 November 2013 -- cgit v1.2.1 From 6298fe9b2ec4be3c8845a0ab39c90ad76ea7a49e Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Wed, 13 Nov 2013 14:45:44 +0100 Subject: 2.2 --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 386792f2a..1cd48e38e 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.1 +VERSION=2.2 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 0a91e7a9b..76f27e00d 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 2.2 - 13 November 2013 by Colin Guthrie + - pass the modules we want in modules.alias, but not in the initrd through to dracut via an environment variable - add BOOT_AUTOMATIC_METHOD to inject command line params into boot.iso syslinux -- cgit v1.2.1 From d54857e5704e52bc93d810250732affc82e1d65f Mon Sep 17 00:00:00 2001 From: David Walser Date: Sun, 17 Nov 2013 19:00:07 +0000 Subject: Add chrony support to drakclock mga#11092 v2 (by Colin Guthrie) * Fix external variable reference (my -> our + $ when using it) * Drop systemd cgroup filesystem check as the path has changed now (prefer "systemctl is-active foo.service" instead) * Add iburst to chrony config server definitions (triggers sync at startup) * Don't use ntpdate with chrony - rather chronyc waitsync * Don't bother checking for ntp in finish-install - just use chrony --- perl-install/NEWS | 2 ++ perl-install/install/steps.pm | 9 ++++++- perl-install/services.pm | 1 + perl-install/standalone/drakclock | 43 +++++++++++++++++++--------------- perl-install/standalone/finish-install | 2 +- perl-install/timezone.pm | 19 ++++++++++----- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 4736ff288..85f894eac 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- add chrony support to drakclock mga#11092 + Version 15.73 - 12 November 2013 - polkit: fix wrappers to properly escape arguments when calling the binary diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 58236da2e..f51d50729 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -689,7 +689,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}); diff --git a/perl-install/services.pm b/perl-install/services.pm index c7260d549..09f31ba20 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -23,6 +23,7 @@ It can also be used for shutting down the machine when the battery is low."), atd => N_("Runs commands scheduled by the at command at the time specified when at was run, and runs batch commands when the load average is low enough."), 'avahi-deamon' => N_("Avahi is a ZeroConf daemon which implements an mDNS stack"), +chronyd => N_("An NTP client/server"), cpufreq => N_("Set CPU frequency settings"), crond => N_("cron is a standard UNIX program that runs user-specified programs at periodic scheduled times. vixie cron adds a number of features to the basic diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 0ca3c5b51..de60872f6 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -23,9 +23,8 @@ my $its_reset = 0; $ugtk2::wm_icon = "/usr/share/mcc/themes/default/time-mdk.png"; -my $ntpfile = '/etc/ntp.conf'; -my $ntpdlock = '/var/lock/subsys/ntpd'; -my $ntpdsystemdlock = '/sys/fs/cgroup/systemd/system/ntpd.service'; +my $ntpd = $timezone::ntp . 'd'; +my $ntpfile = '/etc/' . $timezone::ntp . '.conf'; my $my_win = ugtk2->new(N("Date, Clock & Time Zone Settings")); @@ -77,7 +76,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi 0, gtksignal_connect(gtkset_active($check_ntp = gtknew('CheckButton', text => N("Enable Network Time Protocol")), $mode), clicked => sub { $mode = !$mode; $hb_ntp->set_sensitive($mode); - if ($mode == 1 && !$in->do_pkgs->is_installed('ntp')) { + if ($mode == 1 && !$in->do_pkgs->is_installed('ntp') && !$in->do_pkgs->is_installed('chrony')) { install_ntp(); } }), @@ -116,15 +115,22 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi return; } timezone::set_ntp_server($choosed_serv); - system(qw(/sbin/chkconfig --level 35 ntpd on)); - # FIXME: Change to use systemctl when will not support old iniscript anymore - system(qw(service ntpd stop)); + system('systemctl', 'enable', "$ntpd.service"); + system('systemctl', 'stop', "$ntpd.service"); #verify that we have a valid hostname (thx sam) $choosed_serv =~ s/[^-a-zA-Z0-9.]//g; - if (!system("/usr/sbin/ntpdate", $choosed_serv)) { + my $sync_ok; + if ($ntpd == "chronyd") { + system('systemctl', 'start', "$ntpd.service"); + # Wait up to 30s for sync + $sync_ok = !system('chronyc', 'waitsync', '30', '0.1'); + system('systemctl', 'stop', "$ntpd.service") if (!$sync_ok); + } else { + $sync_ok = !system('/usr/sbin/ntpdate', $choosed_serv); + system('systemctl', 'start', "$ntpd.service") if ($sync_ok); + } + if ($sync_ok) { update_time(); #- get the new time before updating the hwclock - # FIXME: Change to use systemctl when will not support old iniscript anymore - system(qw(service ntpd start)); $need_date = 0; } else { $in->ask_from_no_check({ @@ -135,13 +141,9 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi }, []) or return; } } else { - if (-e $ntpdlock) { - system(qw(service ntpd stop)); - system(qw(/sbin/chkconfig --level 35 ntpd off)); - } - elsif (-e $ntpdsystemdlock) { - system(qw(systemctl stop ntpd.service)); - system(qw(systemctl disable ntpd.service)); + if (is_ntp_daemon_running()) { + system('systemctl', 'stop', "$ntpd.service"); + system('systemctl', 'disable', "$ntpd.service"); } } if ($need_date) { @@ -174,7 +176,7 @@ $time_box->set_direction('ltr'); my $servers = get_server(); $combo_ntpserver->set_popdown_strings(@$servers); -if (-e $ntpfile && (-e $ntpdsystemdlock || -e $ntpdlock)) { +if (-e $ntpfile && is_ntp_daemon_running()) { $ntp = timezone::ntp_server(); $ntp and ntp_widget_state(1); my $fullntp = $ntp; @@ -238,9 +240,12 @@ sub ntp_widget_state { } sub install_ntp() { $my_win->{window}->set_sensitive(0); - $in->do_pkgs->ensure_is_installed('ntp') or ntp_widget_state(0); + $in->do_pkgs->ensure_is_installed('chrony') or ntp_widget_state(0); $my_win->{window}->set_sensitive(1); } +sub is_ntp_daemon_running() { + !system("systemctl is-active $ntpd.service >/dev/null"); +} sub get_server() { my $servs = timezone::ntp_servers(); [ map { "$servs->{$_}: $_" } sort { $servs->{$a} cmp $servs->{$b} || $a cmp $b } keys %$servs ]; diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 20b0a179f..16de321ea 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -75,7 +75,7 @@ sub ask_timezone() { $timezone->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country}; any::configure_timezone($in, $timezone, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified'); - $in->do_pkgs->ensure_is_installed('ntp') if $timezone->{ntp}; + $in->do_pkgs->ensure_is_installed('chrony') if $timezone->{ntp}; timezone::write($timezone); #- reload sys clock from hc once we know the real timezone diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index d9a5dc246..b4b4cfe89 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -24,15 +24,20 @@ sub read() { { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) }; } -my $ntp_conf_file = "/etc/ntp.conf"; +our $ntp = "chrony"; +my $servername_config_suffix = " iburst"; +unless (-f $::prefix . "/etc/" . $ntp . ".conf") { + $ntp = "ntp"; + $servername_config_suffix = ""; +} sub ntp_server() { - find { $_ ne '127.127.1.0' } map { if_(/^\s*server\s+(\S*)/, $1) } cat_($::prefix . $ntp_conf_file); + find { $_ ne '127.127.1.0' } map { if_(/^\s*server\s+(\S*)/, $1) } cat_($::prefix . "/etc/" . $ntp . ".conf"); } sub set_ntp_server { my ($server) = @_; - my $f = $::prefix . $ntp_conf_file; + my $f = $::prefix . "/etc/" . $ntp . ".conf"; -f $f or return; my $pool_match = qr/\.pool\.ntp\.org$/; @@ -41,14 +46,16 @@ sub set_ntp_server { my $added = 0; substInFile { if (/^#?\s*server\s+(\S*)/ && $1 ne '127.127.1.0') { - $_ = $added ? $_ =~ $pool_match ? undef : "#server $1\n" : join('', map { "server $_\n" } @servers); + $_ = $added ? $_ =~ $pool_match ? undef : "#server $1\n" : join('', map { "server $_$servername_config_suffix\n" } @servers); $added = 1; } } $f; - output_p("$::prefix/etc/ntp/step-tickers", join('', map { "$_\n" } @servers)); + if ($ntp eq "ntp") { + output_p("$::prefix/etc/ntp/step-tickers", join('', map { "$_\n" } @servers)); + } require services; - services::set_status('ntpd', to_bool($server), $::isInstall); + services::set_status($ntp . 'd', to_bool($server), $::isInstall); } sub write { -- cgit v1.2.1 From 0cb23c91706f6e33ac66e5a80c1c5cb5046c1ca1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 17 Nov 2013 20:57:03 +0000 Subject: Fix string comparison in chrony support My bad, not David's --- perl-install/standalone/drakclock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index de60872f6..fdda6e96d 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -120,7 +120,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi #verify that we have a valid hostname (thx sam) $choosed_serv =~ s/[^-a-zA-Z0-9.]//g; my $sync_ok; - if ($ntpd == "chronyd") { + if ($ntpd eq "chronyd") { system('systemctl', 'start', "$ntpd.service"); # Wait up to 30s for sync $sync_ok = !system('chronyc', 'waitsync', '30', '0.1'); -- cgit v1.2.1 From bb071915b305f09bb50f4a4d5dc16cb5f3bdd649 Mon Sep 17 00:00:00 2001 From: tarakbumba Date: Mon, 18 Nov 2013 00:33:47 +0200 Subject: Updated Turkish translation --- perl-install/share/po/tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po index 9a402120f..380c27276 100644 --- a/perl-install/share/po/tr.po +++ b/perl-install/share/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-09-30 21:17+0200\n" -"PO-Revision-Date: 2013-04-08 08:21+0300\n" +"PO-Revision-Date: 2013-11-18 00:32+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Mageia Turkish Translation Team \n" "Language: tr\n" @@ -521,7 +521,7 @@ msgstr "Kapat" #: any.pm:1094 #, c-format msgid "License agreement" -msgstr "Lisans anlaşması" +msgstr "Lisans sözleşmesi" #: any.pm:1096 diskdrake/dav.pm:26 mygtk2.pm:1229 #, c-format @@ -4900,7 +4900,8 @@ msgstr "" #. -PO: Only write something if needed: #: messages.pm:11 #, c-format -msgid "_: You can warn about unofficial translation here" +msgid "" +"_: You can warn about unofficial translation here" msgstr "" "UYARI: Bu lisans belgesinin çevirisi gayriresmi nitelikte olup hukuki bir " "belge olarak kullanılamaz." @@ -5027,8 +5028,7 @@ msgstr "" "Yazılım Ürünleri ve yanlarında gelen belgeler \"oldukları gibi\", ve " "kanunların izin verdiği\n" "ölçüde garanti dışıdırlar.\n" -"Ne Mageia ne de lisans sağlayıcıları veya destekleyicileri hiçbir koşulda " -"ve\n" +"Ne Mageia ne de lisans sağlayıcıları veya destekleyicileri hiçbir koşulda ve\n" "yasaların izin verdiği oranda, kullanıcının\n" "Yazılım Ürünlerini kullanmak konusunda\n" "yetkin olmaması nedeniyle oluşan (iş kaybı, işin aksaması,\n" -- cgit v1.2.1 From 647e9adea013a9138638c908cad00456b470e8bc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 15:09:52 +0100 Subject: do not compile/include xhost+ anymore (unused for years) --- perl-install/Makefile.config | 2 +- perl-install/install/share/list.xml | 1 - tools/Makefile | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 2736887a7..7f354a27e 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -14,7 +14,7 @@ STANDALONEPMS_ = adduserdrake bootloader-config display_help display_installer_h STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%) ALLPMS = $(PMS) $(STANDALONEPMS) PERL = perl -LOCALFILES = $(patsubst %, ../tools/%,serial_probe/serial_probe xhost+) +LOCALFILES = $(patsubst %, ../tools/%,serial_probe/serial_probe) DIRS = c resize_fat #po CFLAGS = -Wall override CFLAGS += -pipe diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 5a4c4a0bf..360f95a6c 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -543,7 +543,6 @@ serial_probe/serial_probe - xhost+ diff --git a/tools/Makefile b/tools/Makefile index 669b6f987..1d9d5d736 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,7 +10,7 @@ endif .PHONY: clean install $(DIRS) -all: $(DIRS) xhost+ rpcinfo-flushed +all: $(DIRS) rpcinfo-flushed $(DIRS): make -C $@ -- cgit v1.2.1 From 5c7f440d6ba6016ebe497d7f88d88aafab47a47d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 23:28:26 +0100 Subject: fix passing arguments from drakx-in-chroot in debug mode --- perl-install/install/NEWS | 2 ++ perl-install/install/share/runinstall2.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d137a7c75..7779bdb59 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,7 @@ - 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 diff --git a/perl-install/install/share/runinstall2.sh b/perl-install/install/share/runinstall2.sh index bcf0f25d1..014f5fd5d 100644 --- a/perl-install/install/share/runinstall2.sh +++ b/perl-install/install/share/runinstall2.sh @@ -5,4 +5,4 @@ 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 +exec install2 $@ -- cgit v1.2.1 From 7828203e308e62a47eac337a193d0fa1680b97d9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 19 Nov 2013 00:29:53 +0100 Subject: 15.73.1 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 7f354a27e..a20dae1de 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.73 +VERSION:=15.73.1 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 85f894eac..7a2a447c8 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 15.73.1 - 19 November 2013 + - add chrony support to drakclock mga#11092 Version 15.73 - 12 November 2013 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7779bdb59..62443f6c8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +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 -- cgit v1.2.1 From 3b641cb27c28bdf42865ee15f7ccd2b6c9e9d3d1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 21 Nov 2013 21:12:37 +0000 Subject: polkit: Add support to draksec for writing polkit policy override rules. This allows draksec to override things properly under polkit. --- perl-install/NEWS | 3 +- perl-install/standalone/draksec | 52 +++++++++++++++------- perl-install/standalone/polkit/Makefile | 5 ++- .../standalone/polkit/org.mageia.draksec.rules | 11 +++++ 4 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 perl-install/standalone/polkit/org.mageia.draksec.rules diff --git a/perl-install/NEWS b/perl-install/NEWS index 7a2a447c8..40de8d645 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ -Version 15.73.1 - 19 November 2013 +- draksec: support polkit rules editing for permissions overrides. +Version 15.73.1 - 19 November 2013 - add chrony support to drakclock mga#11092 Version 15.73 - 12 November 2013 diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index b5fd5d5ca..a4716da9b 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -110,33 +110,54 @@ my %progs; my $auth_string = N("Configure authentication required to access %s tools", N("Mageia")); my %auth = ( + default => N("Default"), no_passwd => N("No password"), root_passwd => N("Root password"), user_passwd => N("User password"), ); +my $polkit_rules_file = "/etc/polkit-1/rules.d/51-draksec.rules"; +my %overrides = map { if ( /case '([^']+)': return polkit\.Result\.(YES|AUTH_ADMIN_KEEP|AUTH_SELF_KEEP)/ ) { ($1, $2) } } cat_($polkit_rules_file); + + sub default_auth_value { my ($prog) = @_; - my $link = readlink("/etc/pam.d/$prog"); - if ($link =~ /mageia-console-auth/) { - return $auth{no_passwd}; - } elsif ($link =~ /mageia-simple-auth/) { - my ($user) = cat_("/etc/security/console.apps/$prog") =~ /USER=(.*)/; - return $auth{root_passwd} if $user eq 'root'; - return $auth{user_passwd} if $user eq ''; - } + + return $auth{no_passwd} if $overrides{$prog} eq 'YES'; + return $auth{root_passwd} if $overrides{$prog} eq 'AUTH_ADMIN_KEEP'; + return $auth{user_passwd} if $overrides{$prog} eq 'AUTH_SELF_KEEP'; + return $auth{default}; } sub set_auth_value { my ($prog, $auth) = @_; if ($auth eq 'no_passwd') { - symlinkf('../../etc/pam.d/mageia-console-auth', "/etc/pam.d/$prog"); + $overrides{$prog} = 'YES'; + } elsif ($auth eq 'root_passwd') { + $overrides{$prog} = 'AUTH_ADMIN_KEEP'; + } elsif ($auth eq 'user_passwd') { + $overrides{$prog} = 'AUTH_SELF_KEEP'; + } else { + delete $overrides{$prog}; + } +} + +sub write_rules() { + my $contents = ''; + keys %overrides; + while(my($k, $v) = each %overrides) { + $contents .= "case '$k': return polkit.Result.$v;\n" if ($k && $v); + } + + if ($contents) { + output($polkit_rules_file, <' : 'root'; - substInFile { - s/^USER=.*/USER=$value/; - } "/etc/security/console.apps/$prog"; + rm_rf($polkit_rules_file); } } @@ -188,7 +209,7 @@ gtkpack_($vbox, [ gtkshow(gtknew('Label_Left', line_wrap => 1, text => $descr{$_} || $_)), $progs{$_} = new_nonedit_combo([ - @auth{qw(user_passwd root_passwd no_passwd)} + @auth{qw(default user_passwd root_passwd no_passwd)} ], default_auth_value($_) #$msec->get_check_value($opt) @@ -217,6 +238,7 @@ gtkpack_($vbox, set_auth_value($key, $rev_auth{$value}); } + write_rules(); remove_wait_msg($w); ugtk2->exit(0); } diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile index 070f4211e..6cd42c013 100644 --- a/perl-install/standalone/polkit/Makefile +++ b/perl-install/standalone/polkit/Makefile @@ -1,8 +1,10 @@ BINDIR = /usr/bin LIBEXECDIR = /usr/libexec BINDEST = $(PREFIX)$(BINDIR) +POLKITRULESDEST = $(PREFIX)/usr/share/polkit-1/rules.d POLKITPOLICYDEST = $(PREFIX)/usr/share/polkit-1/actions +RULES := $(wildcard *.rules) POLICY_IN := $(wildcard *.policy.in) POLICY = $(POLICY_IN:.policy.in=.policy) WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY)) @@ -19,6 +21,7 @@ clean: intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache install: all - install -d $(BINDEST) $(POLKITPOLICYDEST) + install -d $(BINDEST) $(POLKITRULESDEST) $(POLKITPOLICYDEST) install -m755 $(WRAPPERS) $(BINDEST) install -m644 $(POLICY) $(POLKITPOLICYDEST) + install -m644 $(RULES) $(POLKITRULESDEST) diff --git a/perl-install/standalone/polkit/org.mageia.draksec.rules b/perl-install/standalone/polkit/org.mageia.draksec.rules new file mode 100644 index 000000000..45a7f0efe --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.draksec.rules @@ -0,0 +1,11 @@ +polkit.addRule(function(action, subject) { + if (typeof drakToolAuth != "function" || action.id.indexOf("org.mageia.") != 0) + return polkit.Result.NOT_HANDLED; + + var tool = action.id.split(".")[2]; + var rv = drakToolAuth(tool); + if (rv != polkit.Result.NOT_HANDLED) + polkit.log("draksec security policy for '" + tool + "' is overriden to '" + rv + "'"); + return rv; +}); + -- cgit v1.2.1 From ebcfeec4ffb44186ad43662cbe2d7fbf49ca2e6d Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 21 Nov 2013 21:15:46 +0000 Subject: draksec: Use 'Administrator password' rather than 'Root password'. This is more accurate as you can override polkit configuration such that any user in the wheel group will acceptable rather than the 'root' user specifically. Keep existing translations however to avoid unnecessary churn. --- perl-install/standalone/draksec | 2 +- perl-install/standalone/po/af.po | 2 +- perl-install/standalone/po/am.po | 2 +- perl-install/standalone/po/ar.po | 2 +- perl-install/standalone/po/az.po | 2 +- perl-install/standalone/po/be.po | 2 +- perl-install/standalone/po/bg.po | 2 +- perl-install/standalone/po/bn.po | 2 +- perl-install/standalone/po/br.po | 2 +- perl-install/standalone/po/bs.po | 2 +- perl-install/standalone/po/ca.po | 2 +- perl-install/standalone/po/cs.po | 2 +- perl-install/standalone/po/cy.po | 2 +- perl-install/standalone/po/da.po | 2 +- perl-install/standalone/po/de.po | 2 +- perl-install/standalone/po/el.po | 2 +- perl-install/standalone/po/eo.po | 2 +- perl-install/standalone/po/es.po | 2 +- perl-install/standalone/po/et.po | 2 +- perl-install/standalone/po/eu.po | 2 +- perl-install/standalone/po/fa.po | 2 +- perl-install/standalone/po/fi.po | 2 +- perl-install/standalone/po/fr.po | 2 +- perl-install/standalone/po/fur.po | 2 +- perl-install/standalone/po/ga.po | 2 +- perl-install/standalone/po/gl.po | 2 +- perl-install/standalone/po/he.po | 2 +- perl-install/standalone/po/hi.po | 2 +- perl-install/standalone/po/hr.po | 2 +- perl-install/standalone/po/hu.po | 2 +- perl-install/standalone/po/id.po | 2 +- perl-install/standalone/po/is.po | 2 +- perl-install/standalone/po/it.po | 2 +- perl-install/standalone/po/ja.po | 2 +- perl-install/standalone/po/ko.po | 2 +- perl-install/standalone/po/ky.po | 2 +- perl-install/standalone/po/libDrakX-standalone.pot | 2 +- perl-install/standalone/po/lt.po | 2 +- perl-install/standalone/po/ltg.po | 2 +- perl-install/standalone/po/lv.po | 2 +- perl-install/standalone/po/mk.po | 2 +- perl-install/standalone/po/mn.po | 2 +- perl-install/standalone/po/ms.po | 2 +- perl-install/standalone/po/mt.po | 2 +- perl-install/standalone/po/nb.po | 2 +- perl-install/standalone/po/nl.po | 2 +- perl-install/standalone/po/nn.po | 2 +- perl-install/standalone/po/pa_IN.po | 2 +- perl-install/standalone/po/pl.po | 2 +- perl-install/standalone/po/pt.po | 2 +- perl-install/standalone/po/pt_BR.po | 2 +- perl-install/standalone/po/ro.po | 2 +- perl-install/standalone/po/ru.po | 2 +- perl-install/standalone/po/sc.po | 2 +- perl-install/standalone/po/sk.po | 2 +- perl-install/standalone/po/sl.po | 2 +- perl-install/standalone/po/sq.po | 2 +- perl-install/standalone/po/sr.po | 2 +- perl-install/standalone/po/sr@Latn.po | 2 +- perl-install/standalone/po/sv.po | 2 +- perl-install/standalone/po/ta.po | 2 +- perl-install/standalone/po/tg.po | 2 +- perl-install/standalone/po/th.po | 2 +- perl-install/standalone/po/tl.po | 2 +- perl-install/standalone/po/tr.po | 2 +- perl-install/standalone/po/uk.po | 2 +- perl-install/standalone/po/uz.po | 2 +- perl-install/standalone/po/uz@cyrillic.po | 2 +- perl-install/standalone/po/vi.po | 2 +- perl-install/standalone/po/wa.po | 2 +- perl-install/standalone/po/zh_CN.po | 2 +- perl-install/standalone/po/zh_TW.po | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index a4716da9b..879b56e15 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -112,7 +112,7 @@ my $auth_string = N("Configure authentication required to access %s tools", N("M my %auth = ( default => N("Default"), no_passwd => N("No password"), - root_passwd => N("Root password"), + root_passwd => N("Administrator password"), user_passwd => N("User password"), ); diff --git a/perl-install/standalone/po/af.po b/perl-install/standalone/po/af.po index 645db5e13..736f99437 100644 --- a/perl-install/standalone/po/af.po +++ b/perl-install/standalone/po/af.po @@ -1168,7 +1168,7 @@ msgstr "Geen wagwoord" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/am.po b/perl-install/standalone/po/am.po index c381f4a04..9dec5aa59 100644 --- a/perl-install/standalone/po/am.po +++ b/perl-install/standalone/po/am.po @@ -1128,7 +1128,7 @@ msgstr "ሚስጢራዊ ቃል የለም" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ar.po b/perl-install/standalone/po/ar.po index 4b6a6f396..b401cb49e 100644 --- a/perl-install/standalone/po/ar.po +++ b/perl-install/standalone/po/ar.po @@ -1172,7 +1172,7 @@ msgstr "بدون كلمة مرور" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "كلمة مرور الجذر" #: draksec:115 diff --git a/perl-install/standalone/po/az.po b/perl-install/standalone/po/az.po index d0d4380a5..df94f7dbf 100644 --- a/perl-install/standalone/po/az.po +++ b/perl-install/standalone/po/az.po @@ -1164,7 +1164,7 @@ msgstr "Şifrə olmasın" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/be.po b/perl-install/standalone/po/be.po index bd4fac70c..5703aff8a 100644 --- a/perl-install/standalone/po/be.po +++ b/perl-install/standalone/po/be.po @@ -1132,7 +1132,7 @@ msgstr "Няма паролю" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/bg.po b/perl-install/standalone/po/bg.po index 8c977f579..daaf0f69a 100644 --- a/perl-install/standalone/po/bg.po +++ b/perl-install/standalone/po/bg.po @@ -1158,7 +1158,7 @@ msgstr "Без парола" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/bn.po b/perl-install/standalone/po/bn.po index ddebe5724..c4c5afdad 100644 --- a/perl-install/standalone/po/bn.po +++ b/perl-install/standalone/po/bn.po @@ -1173,7 +1173,7 @@ msgstr "পাসওয়ার্ড ছাড়া" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/br.po b/perl-install/standalone/po/br.po index ae4b17a23..4e3cf3bce 100644 --- a/perl-install/standalone/po/br.po +++ b/perl-install/standalone/po/br.po @@ -1145,7 +1145,7 @@ msgstr "Tremenger ebet" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Tremenger root" #: draksec:115 diff --git a/perl-install/standalone/po/bs.po b/perl-install/standalone/po/bs.po index 67c40fe57..7b60a894b 100644 --- a/perl-install/standalone/po/bs.po +++ b/perl-install/standalone/po/bs.po @@ -1179,7 +1179,7 @@ msgstr "Bez šifre" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ca.po b/perl-install/standalone/po/ca.po index 664e37e2b..cfa2d884a 100644 --- a/perl-install/standalone/po/ca.po +++ b/perl-install/standalone/po/ca.po @@ -1174,7 +1174,7 @@ msgstr "Sense contrasenya" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Contrasenya de l'usuari primari" #: draksec:115 diff --git a/perl-install/standalone/po/cs.po b/perl-install/standalone/po/cs.po index ff479c62c..f5d8c6b56 100644 --- a/perl-install/standalone/po/cs.po +++ b/perl-install/standalone/po/cs.po @@ -1179,7 +1179,7 @@ msgstr "Bez hesla" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Heslo správce systému" #: draksec:115 diff --git a/perl-install/standalone/po/cy.po b/perl-install/standalone/po/cy.po index 017f89889..9c5a9459e 100644 --- a/perl-install/standalone/po/cy.po +++ b/perl-install/standalone/po/cy.po @@ -1178,7 +1178,7 @@ msgstr "Dim cyfrinair" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Cyfrinair root" #: draksec:115 diff --git a/perl-install/standalone/po/da.po b/perl-install/standalone/po/da.po index 9f9c6a58e..138c4d5c7 100644 --- a/perl-install/standalone/po/da.po +++ b/perl-install/standalone/po/da.po @@ -1183,7 +1183,7 @@ msgstr "Ingen adgangskode" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Adgangskode for root" #: draksec:115 diff --git a/perl-install/standalone/po/de.po b/perl-install/standalone/po/de.po index 04d194884..e199e2c17 100644 --- a/perl-install/standalone/po/de.po +++ b/perl-install/standalone/po/de.po @@ -1191,7 +1191,7 @@ msgstr "Kein Passwort" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root Passwort" #: draksec:115 diff --git a/perl-install/standalone/po/el.po b/perl-install/standalone/po/el.po index 69d046615..49f4053d7 100644 --- a/perl-install/standalone/po/el.po +++ b/perl-install/standalone/po/el.po @@ -1197,7 +1197,7 @@ msgstr "Χωρίς κωδικό πρόσβασης" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Κωδικός πρόσβασης root" #: draksec:115 diff --git a/perl-install/standalone/po/eo.po b/perl-install/standalone/po/eo.po index 9777d112d..d058d7c35 100644 --- a/perl-install/standalone/po/eo.po +++ b/perl-install/standalone/po/eo.po @@ -1131,7 +1131,7 @@ msgstr "Neniu pasvorto" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/es.po b/perl-install/standalone/po/es.po index bc669264a..d3d1d39e4 100644 --- a/perl-install/standalone/po/es.po +++ b/perl-install/standalone/po/es.po @@ -1186,7 +1186,7 @@ msgstr "Sin contraseña" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Contraseña del administrador" #: draksec:115 diff --git a/perl-install/standalone/po/et.po b/perl-install/standalone/po/et.po index 3258e2e4a..70cac4b7b 100644 --- a/perl-install/standalone/po/et.po +++ b/perl-install/standalone/po/et.po @@ -1175,7 +1175,7 @@ msgstr "Parool puudub" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Administraatori parool" #: draksec:115 diff --git a/perl-install/standalone/po/eu.po b/perl-install/standalone/po/eu.po index d5ae09b0e..e0ea4fb2a 100644 --- a/perl-install/standalone/po/eu.po +++ b/perl-install/standalone/po/eu.po @@ -1181,7 +1181,7 @@ msgstr "Pasahitzik ez" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root pasahitza" #: draksec:115 diff --git a/perl-install/standalone/po/fa.po b/perl-install/standalone/po/fa.po index b382f5c69..493ce9f4d 100644 --- a/perl-install/standalone/po/fa.po +++ b/perl-install/standalone/po/fa.po @@ -1171,7 +1171,7 @@ msgstr "بدون گذرواژه" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/fi.po b/perl-install/standalone/po/fi.po index b4a7c5e5d..ed39c10a7 100644 --- a/perl-install/standalone/po/fi.po +++ b/perl-install/standalone/po/fi.po @@ -1187,7 +1187,7 @@ msgstr "Ei salasanaa" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Pääkäyttäjän salasana" #: draksec:115 diff --git a/perl-install/standalone/po/fr.po b/perl-install/standalone/po/fr.po index 2dafcfc9d..72aaea113 100644 --- a/perl-install/standalone/po/fr.po +++ b/perl-install/standalone/po/fr.po @@ -1200,7 +1200,7 @@ msgstr "Aucun mot de passe" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Mot de passe root" #: draksec:115 diff --git a/perl-install/standalone/po/fur.po b/perl-install/standalone/po/fur.po index a222300c5..5258e86e8 100644 --- a/perl-install/standalone/po/fur.po +++ b/perl-install/standalone/po/fur.po @@ -1129,7 +1129,7 @@ msgstr "" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ga.po b/perl-install/standalone/po/ga.po index edbc9905d..21719e279 100644 --- a/perl-install/standalone/po/ga.po +++ b/perl-install/standalone/po/ga.po @@ -1127,7 +1127,7 @@ msgstr "Gan pasfhocal" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/gl.po b/perl-install/standalone/po/gl.po index 6c884d67b..9ee08ab47 100644 --- a/perl-install/standalone/po/gl.po +++ b/perl-install/standalone/po/gl.po @@ -1186,7 +1186,7 @@ msgstr "Sen contrasinal" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Contrasinal de root" #: draksec:115 diff --git a/perl-install/standalone/po/he.po b/perl-install/standalone/po/he.po index bd143b820..e1e69ad35 100644 --- a/perl-install/standalone/po/he.po +++ b/perl-install/standalone/po/he.po @@ -1178,7 +1178,7 @@ msgstr "בלי סיסמה" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "סיסמת מנהל המערכת" #: draksec:115 diff --git a/perl-install/standalone/po/hi.po b/perl-install/standalone/po/hi.po index c4e4bcb6b..7ec008462 100644 --- a/perl-install/standalone/po/hi.po +++ b/perl-install/standalone/po/hi.po @@ -1153,7 +1153,7 @@ msgstr "कोई कूट-शब्द नहीं" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/hr.po b/perl-install/standalone/po/hr.po index 56e7ae3db..f9708ba73 100644 --- a/perl-install/standalone/po/hr.po +++ b/perl-install/standalone/po/hr.po @@ -1138,7 +1138,7 @@ msgstr "Bez lozinke" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/hu.po b/perl-install/standalone/po/hu.po index e7df1f3d1..9abe95932 100644 --- a/perl-install/standalone/po/hu.po +++ b/perl-install/standalone/po/hu.po @@ -1187,7 +1187,7 @@ msgstr "Nincs jelszó" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Rendszergazdai jelszó" #: draksec:115 diff --git a/perl-install/standalone/po/id.po b/perl-install/standalone/po/id.po index 8fe95a371..ef2eed180 100644 --- a/perl-install/standalone/po/id.po +++ b/perl-install/standalone/po/id.po @@ -1200,7 +1200,7 @@ msgstr "Tanpa sandi" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Sandi root" #: draksec:115 diff --git a/perl-install/standalone/po/is.po b/perl-install/standalone/po/is.po index cff0f4ff4..3bbd99f0e 100644 --- a/perl-install/standalone/po/is.po +++ b/perl-install/standalone/po/is.po @@ -1180,7 +1180,7 @@ msgstr "Ekkert lykilorð" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Lykilorð kerfisstjóra" #: draksec:115 diff --git a/perl-install/standalone/po/it.po b/perl-install/standalone/po/it.po index 69ce8a26b..2af297460 100644 --- a/perl-install/standalone/po/it.po +++ b/perl-install/standalone/po/it.po @@ -1180,7 +1180,7 @@ msgstr "No password" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Password di root" #: draksec:115 diff --git a/perl-install/standalone/po/ja.po b/perl-install/standalone/po/ja.po index 82a18ad98..2dab222a4 100644 --- a/perl-install/standalone/po/ja.po +++ b/perl-install/standalone/po/ja.po @@ -1179,7 +1179,7 @@ msgstr "パスワードなし" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "root のパスワード" #: draksec:115 diff --git a/perl-install/standalone/po/ko.po b/perl-install/standalone/po/ko.po index 4a20be7ab..4adb4cc7a 100644 --- a/perl-install/standalone/po/ko.po +++ b/perl-install/standalone/po/ko.po @@ -1130,7 +1130,7 @@ msgstr "암호 없음" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ky.po b/perl-install/standalone/po/ky.po index 3eb017144..d8b16fc84 100644 --- a/perl-install/standalone/po/ky.po +++ b/perl-install/standalone/po/ky.po @@ -1130,7 +1130,7 @@ msgstr "Паролсуз" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/libDrakX-standalone.pot b/perl-install/standalone/po/libDrakX-standalone.pot index a646fd3dd..0155b10c9 100644 --- a/perl-install/standalone/po/libDrakX-standalone.pot +++ b/perl-install/standalone/po/libDrakX-standalone.pot @@ -1128,7 +1128,7 @@ msgstr "" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/lt.po b/perl-install/standalone/po/lt.po index f45c20e39..e719cff70 100644 --- a/perl-install/standalone/po/lt.po +++ b/perl-install/standalone/po/lt.po @@ -1127,7 +1127,7 @@ msgstr "Jokio slaptažodžio" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ltg.po b/perl-install/standalone/po/ltg.po index 2fb5c37ec..490e77d2a 100644 --- a/perl-install/standalone/po/ltg.po +++ b/perl-install/standalone/po/ltg.po @@ -1137,7 +1137,7 @@ msgstr "Bez parolis" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/lv.po b/perl-install/standalone/po/lv.po index 1ba571316..6c8823ad8 100644 --- a/perl-install/standalone/po/lv.po +++ b/perl-install/standalone/po/lv.po @@ -1137,7 +1137,7 @@ msgstr "Bez paroles" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/mk.po b/perl-install/standalone/po/mk.po index 12b626f26..9c248f478 100644 --- a/perl-install/standalone/po/mk.po +++ b/perl-install/standalone/po/mk.po @@ -1154,7 +1154,7 @@ msgstr "Без лозинка" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/mn.po b/perl-install/standalone/po/mn.po index 5f58b43ed..c68e0ff9d 100644 --- a/perl-install/standalone/po/mn.po +++ b/perl-install/standalone/po/mn.po @@ -1136,7 +1136,7 @@ msgstr "Нууц үг байхгүй" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/ms.po b/perl-install/standalone/po/ms.po index f99f03a0f..bb2aff20d 100644 --- a/perl-install/standalone/po/ms.po +++ b/perl-install/standalone/po/ms.po @@ -1137,7 +1137,7 @@ msgstr "Tiada katalaluan" #: draksec:114 #, fuzzy, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Katalaluan Tidak Betul" #: draksec:115 diff --git a/perl-install/standalone/po/mt.po b/perl-install/standalone/po/mt.po index 1df229640..b98c6e6ed 100644 --- a/perl-install/standalone/po/mt.po +++ b/perl-install/standalone/po/mt.po @@ -1169,7 +1169,7 @@ msgstr "Ebda password" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/nb.po b/perl-install/standalone/po/nb.po index e6f28fa5a..afaf125f5 100644 --- a/perl-install/standalone/po/nb.po +++ b/perl-install/standalone/po/nb.po @@ -1178,7 +1178,7 @@ msgstr "Ingen passord" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root-passord" #: draksec:115 diff --git a/perl-install/standalone/po/nl.po b/perl-install/standalone/po/nl.po index af3dc08d1..b0aacbb0f 100644 --- a/perl-install/standalone/po/nl.po +++ b/perl-install/standalone/po/nl.po @@ -1194,7 +1194,7 @@ msgstr "Geen wachtwoord" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root-wachtwoord" #: draksec:115 diff --git a/perl-install/standalone/po/nn.po b/perl-install/standalone/po/nn.po index 545955b00..fe96a9a0d 100644 --- a/perl-install/standalone/po/nn.po +++ b/perl-install/standalone/po/nn.po @@ -1174,7 +1174,7 @@ msgstr "Ingen passord" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root-passord" #: draksec:115 diff --git a/perl-install/standalone/po/pa_IN.po b/perl-install/standalone/po/pa_IN.po index 9a2ed0758..fb755d2e3 100644 --- a/perl-install/standalone/po/pa_IN.po +++ b/perl-install/standalone/po/pa_IN.po @@ -1161,7 +1161,7 @@ msgstr "ਕੋਈ ਗੁਪਤ-ਕੋਡ ਨਹੀਂ" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/pl.po b/perl-install/standalone/po/pl.po index ba289c9eb..34fee4d75 100644 --- a/perl-install/standalone/po/pl.po +++ b/perl-install/standalone/po/pl.po @@ -1192,7 +1192,7 @@ msgstr "Bez hasła" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Hasło root'a" #: draksec:115 diff --git a/perl-install/standalone/po/pt.po b/perl-install/standalone/po/pt.po index 083f9a0ac..25f4a3f9d 100644 --- a/perl-install/standalone/po/pt.po +++ b/perl-install/standalone/po/pt.po @@ -1182,7 +1182,7 @@ msgstr "Sem senha" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Senha de administrador" #: draksec:115 diff --git a/perl-install/standalone/po/pt_BR.po b/perl-install/standalone/po/pt_BR.po index c021d4cab..e7b4673da 100644 --- a/perl-install/standalone/po/pt_BR.po +++ b/perl-install/standalone/po/pt_BR.po @@ -1195,7 +1195,7 @@ msgstr "Nenhuma senha" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Senha do root" #: draksec:115 diff --git a/perl-install/standalone/po/ro.po b/perl-install/standalone/po/ro.po index 93ee5de95..a304a7296 100644 --- a/perl-install/standalone/po/ro.po +++ b/perl-install/standalone/po/ro.po @@ -1216,7 +1216,7 @@ msgstr "Fără parolă" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Parolă root" #: draksec:115 diff --git a/perl-install/standalone/po/ru.po b/perl-install/standalone/po/ru.po index 942556390..bb0a54eb7 100644 --- a/perl-install/standalone/po/ru.po +++ b/perl-install/standalone/po/ru.po @@ -1263,7 +1263,7 @@ msgstr "Без пароля" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Пароль пользователя root" #: draksec:115 diff --git a/perl-install/standalone/po/sc.po b/perl-install/standalone/po/sc.po index e579caa05..041676860 100644 --- a/perl-install/standalone/po/sc.po +++ b/perl-install/standalone/po/sc.po @@ -1129,7 +1129,7 @@ msgstr "Nisçuna password" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/sk.po b/perl-install/standalone/po/sk.po index 61caa1611..83d498390 100644 --- a/perl-install/standalone/po/sk.po +++ b/perl-install/standalone/po/sk.po @@ -1173,7 +1173,7 @@ msgstr "Bez hesla" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/sl.po b/perl-install/standalone/po/sl.po index 40ce76f39..c1e0b06ed 100644 --- a/perl-install/standalone/po/sl.po +++ b/perl-install/standalone/po/sl.po @@ -1197,7 +1197,7 @@ msgstr "Brez gesla" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Geslo skrbnika (root)" #: draksec:115 diff --git a/perl-install/standalone/po/sq.po b/perl-install/standalone/po/sq.po index c8df2748c..a57af63bc 100644 --- a/perl-install/standalone/po/sq.po +++ b/perl-install/standalone/po/sq.po @@ -1167,7 +1167,7 @@ msgstr "Asnjë parullë" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/sr.po b/perl-install/standalone/po/sr.po index 351206491..377090049 100644 --- a/perl-install/standalone/po/sr.po +++ b/perl-install/standalone/po/sr.po @@ -1149,7 +1149,7 @@ msgstr "Без лозинке" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/sr@Latn.po b/perl-install/standalone/po/sr@Latn.po index e34a5a0d5..3eeab4576 100644 --- a/perl-install/standalone/po/sr@Latn.po +++ b/perl-install/standalone/po/sr@Latn.po @@ -1150,7 +1150,7 @@ msgstr "Bez lozinke" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/sv.po b/perl-install/standalone/po/sv.po index 2a5c958b1..07dc4ff55 100644 --- a/perl-install/standalone/po/sv.po +++ b/perl-install/standalone/po/sv.po @@ -1197,7 +1197,7 @@ msgstr "Inget lösenord" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root lösenord" #: draksec:115 diff --git a/perl-install/standalone/po/ta.po b/perl-install/standalone/po/ta.po index a58f3f7dc..e7fbbfc29 100644 --- a/perl-install/standalone/po/ta.po +++ b/perl-install/standalone/po/ta.po @@ -1132,7 +1132,7 @@ msgstr "கடவுச்ெசால் ஏதுமில்ைல" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/tg.po b/perl-install/standalone/po/tg.po index 6c061c2db..c2c3cbbba 100644 --- a/perl-install/standalone/po/tg.po +++ b/perl-install/standalone/po/tg.po @@ -1187,7 +1187,7 @@ msgstr "Гузарвожа нест" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/th.po b/perl-install/standalone/po/th.po index 4ceaba3c0..57b1670f4 100644 --- a/perl-install/standalone/po/th.po +++ b/perl-install/standalone/po/th.po @@ -1131,7 +1131,7 @@ msgstr "ไม่มีรหัสผ่าน" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/tl.po b/perl-install/standalone/po/tl.po index 10b0ec637..a9ecc4a2c 100644 --- a/perl-install/standalone/po/tl.po +++ b/perl-install/standalone/po/tl.po @@ -1168,7 +1168,7 @@ msgstr "Walang password" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/tr.po b/perl-install/standalone/po/tr.po index 4523a1dc9..e7ec0698c 100644 --- a/perl-install/standalone/po/tr.po +++ b/perl-install/standalone/po/tr.po @@ -1193,7 +1193,7 @@ msgstr "Parola yok" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Kök parolası" #: draksec:115 diff --git a/perl-install/standalone/po/uk.po b/perl-install/standalone/po/uk.po index da3c2b7a6..04802ca17 100644 --- a/perl-install/standalone/po/uk.po +++ b/perl-install/standalone/po/uk.po @@ -1182,7 +1182,7 @@ msgstr "Без пароля" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Пароль адміністратора" #: draksec:115 diff --git a/perl-install/standalone/po/uz.po b/perl-install/standalone/po/uz.po index dfe307c14..ff690dc09 100644 --- a/perl-install/standalone/po/uz.po +++ b/perl-install/standalone/po/uz.po @@ -1143,7 +1143,7 @@ msgstr "Maxfiy soʻzsiz" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Administratorning maxfiy soʻzi" #: draksec:115 diff --git a/perl-install/standalone/po/uz@cyrillic.po b/perl-install/standalone/po/uz@cyrillic.po index 0e92616c4..a7b0c88a4 100644 --- a/perl-install/standalone/po/uz@cyrillic.po +++ b/perl-install/standalone/po/uz@cyrillic.po @@ -1140,7 +1140,7 @@ msgstr "Махфий сўзсиз" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Администраторнинг махфий сўзи" #: draksec:115 diff --git a/perl-install/standalone/po/vi.po b/perl-install/standalone/po/vi.po index 7373eda18..f5282b519 100644 --- a/perl-install/standalone/po/vi.po +++ b/perl-install/standalone/po/vi.po @@ -1172,7 +1172,7 @@ msgstr "Không có mật khẩu" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/wa.po b/perl-install/standalone/po/wa.po index 6e6ecb76c..7b59e7c03 100644 --- a/perl-install/standalone/po/wa.po +++ b/perl-install/standalone/po/wa.po @@ -1185,7 +1185,7 @@ msgstr "Nou scret" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "" #: draksec:115 diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po index 9642daf26..353bc0753 100644 --- a/perl-install/standalone/po/zh_CN.po +++ b/perl-install/standalone/po/zh_CN.po @@ -1163,7 +1163,7 @@ msgstr "无密码" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root 密码" #: draksec:115 diff --git a/perl-install/standalone/po/zh_TW.po b/perl-install/standalone/po/zh_TW.po index 6e1c5caaa..c1c29bb1c 100644 --- a/perl-install/standalone/po/zh_TW.po +++ b/perl-install/standalone/po/zh_TW.po @@ -1165,7 +1165,7 @@ msgstr "沒有密碼" #: draksec:114 #, c-format -msgid "Root password" +msgid "Administrator password" msgstr "Root 密碼" #: draksec:115 -- cgit v1.2.1 From cbbfbd64207194dccf5efc6f58af03b7e24f67f9 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 21 Nov 2013 21:20:13 +0000 Subject: draksec: Rename binaries for new policy file name --- perl-install/standalone/draksec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 879b56e15..e98845e27 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -64,7 +64,7 @@ sub to_i18n { map { $translations{$_} || $_ } @_ } sub from_i18n { $inv_translations{$_[0]} || $_[0] } sub resize { gtkset($_[0], width => 50) } -# factorize this with rpmdrake and harddrake2 +# factorize this with drakrpm and harddrake2 sub wait_msg { my $mainw = ugtk2->new(N("Please wait"), (modal => 1, transient => $w->{real_window})); $mainw->{window}->add(gtknew('WrappedLabel', text => $_[0])); @@ -163,11 +163,11 @@ EOF my %descr = ( - rpmdrake => N("Software Management"), - mageiaupdate => N("%s Update", N("Mageia")), - 'drakrpm-edit-media' => N("Software Media Manager"), + drakrpm => N("Software Management"), + 'drakrpm-update' => N("%s Update", N("Mageia")), + 'drakrpm-editmedia' => N("Software Media Manager"), drak3d => N("Configure 3D Desktop effects"), - xfdrake => N("Graphical Server Configuration"), + drakx11 => N("Graphical Server Configuration"), drakmouse => N("Mouse Configuration"), drakkeyboard => N("Keyboard Configuration"), drakups => N("UPS Configuration"), @@ -183,7 +183,7 @@ my %descr = ( drakfont => N("Import fonts"), draklog => N("Logs"), drakxservices => N("Services"), - userdrake => N("Users"), + drakuser => N("Users"), drakclock => N("Date, Clock & Time Zone Settings"), drakboot => N("Boot Configuration"), ); @@ -218,10 +218,10 @@ gtkpack_($vbox, } split(' ', $progs) ); } ( - [ N("Software Management"), 'rpmdrake mageiaupdate drakrpm-edit-media' ], - [ N("Hardware"), 'drak3d xfdrake drakmouse drakkeyboard drakups' ], + [ N("Software Management"), 'drakrpm drakrpm-update drakrpm-editmedia' ], + [ N("Hardware"), 'drak3d drakx11 drakmouse drakkeyboard drakups' ], [ N("Network"), 'drakconnect drakhosts draknetcenter drakroam drakvpn drakproxy drakgw' ], - [ N("System"), 'drakauth drakbackup drakfont draklog drakxservices userdrake drakclock' ], + [ N("System"), 'drakauth drakbackup drakfont draklog drakxservices drakuser drakclock' ], [ N("Boot"), 'drakboot' ], ) ) -- cgit v1.2.1 From a70773cb277033a412fc9d71ff53383b29cbb84a Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 21 Nov 2013 21:24:08 +0000 Subject: draksec: drakbackup seems dead. Remove it from the list, but keep the i18n bits just in case it returns. --- perl-install/standalone/draksec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index e98845e27..f70bcd423 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -221,7 +221,7 @@ gtkpack_($vbox, [ N("Software Management"), 'drakrpm drakrpm-update drakrpm-editmedia' ], [ N("Hardware"), 'drak3d drakx11 drakmouse drakkeyboard drakups' ], [ N("Network"), 'drakconnect drakhosts draknetcenter drakroam drakvpn drakproxy drakgw' ], - [ N("System"), 'drakauth drakbackup drakfont draklog drakxservices drakuser drakclock' ], + [ N("System"), 'drakauth drakfont draklog drakxservices drakuser drakclock' ], [ N("Boot"), 'drakboot' ], ) ) -- cgit v1.2.1 From a69511015762808bba2d17cfc64485eb7fd5e420 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 23 Nov 2013 11:08:35 +0000 Subject: timezone: As we will install chrony, assume that when nothing is installed. --- perl-install/NEWS | 1 + perl-install/timezone.pm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 40de8d645..d8193d3a6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- timezone: Assume chrony rather than ntp when neither is installed - draksec: support polkit rules editing for permissions overrides. Version 15.73.1 - 19 November 2013 diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index b4b4cfe89..eeb1ed30d 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -24,11 +24,11 @@ sub read() { { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) }; } -our $ntp = "chrony"; -my $servername_config_suffix = " iburst"; +our $ntp = "ntp"; +my $servername_config_suffix = ""; unless (-f $::prefix . "/etc/" . $ntp . ".conf") { - $ntp = "ntp"; - $servername_config_suffix = ""; + $ntp = "chrony"; + $servername_config_suffix = " iburst"; } sub ntp_server() { -- cgit v1.2.1 From f5e4720412c0b04dee16a2562c580b6e5b4d9879 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sat, 23 Nov 2013 16:47:04 +0200 Subject: Update French translation by Dune --- perl-install/install/share/po/fr.po | 88 +++++++++++-------------------------- 1 file changed, 26 insertions(+), 62 deletions(-) diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po index 7bb7cd67a..1c7895ebb 100644 --- a/perl-install/install/share/po/fr.po +++ b/perl-install/install/share/po/fr.po @@ -1,21 +1,23 @@ # 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 , YEAR. # +# Translators: +# Dune , 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_install\n" +"Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-17 05:24+0200\n" -"Last-Translator: Rémi Verschelde \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2013-11-21 23:46+0000\n" +"Last-Translator: Dune \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" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../../advertising/01_IM_mageia.pl:1 #, c-format @@ -752,33 +754,33 @@ msgstr "" "intuitifs" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Station de travail KDE" +msgstr "L'environnement de bureau XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Un environnement de bureau avec un ensemble de programmes et d'outils " -"intuitifs" +"Un environnement de bureau plus léger avec un ensemble de programmes et " +"d'outils intuitifs" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Station de travail GNOME" +msgstr "L'environnement de bureau MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Station de travail" +msgstr "L'environnement de bureau Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Environnement graphique" +msgstr "Un environnement de bureau basé sur GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -795,26 +797,24 @@ msgstr "" "d'outils intuitifs" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Bureau personnalisé" +msgstr "L'environnement de bureau RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Un environnement de bureau rapide et léger avec peu d'outils" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Environnement de bureau Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" -"Un environnement graphique léger et rapide avec un ensemble de programmes et " -"d'outils intuitifs" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -822,9 +822,9 @@ msgid "Other Graphical Desktops" msgstr "Autres environnements de bureau" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, etc." +msgstr "Window Maker, Fvwm, etc." #: share/meta-task/compssUsers.pl:217 #, c-format @@ -1763,39 +1763,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Quitter" - -#~ msgid "Welcome" -#~ msgstr "Bienvenue" - -#~ msgid "People!" -#~ msgstr "Pour tous !" - -#~ msgid "For people" -#~ msgstr "Pour les gens" - -#~ msgid "For contributors" -#~ msgstr "Pour les contributeurs" - -#~ msgid "For you" -#~ msgstr "Pour vous" - -#~ msgid "Welcome!" -#~ msgstr "Bienvenue !" - -#~ msgid "Select All" -#~ msgstr "Sélectionner tout" - -#~ msgid "Bad package" -#~ msgstr "Mauvais paquetage" - -#, fuzzy -#~ msgid "Preparing boot images..." -#~ msgstr "Préparation du chargeur d'amorçage…" - -#~ msgid "Mageia, the new Linux distribution" -#~ msgstr "Mageia, la nouvelle distribution Linux" - -#~ msgid "" -#~ "_: Keep these entry short\n" -#~ "Networking" -#~ msgstr "Réseau" -- cgit v1.2.1 From 85b1b15f743ae641eddfdbe3188fa8571215e98d Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sat, 23 Nov 2013 19:49:51 +0200 Subject: Update French translation by Dune --- perl-install/standalone/po/fr.po | 81 +++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/perl-install/standalone/po/fr.po b/perl-install/standalone/po/fr.po index 72aaea113..9c853d393 100644 --- a/perl-install/standalone/po/fr.po +++ b/perl-install/standalone/po/fr.po @@ -1,19 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. # +# Translators: +# Dune , 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_standalone\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-13 16:58+0100\n" -"Last-Translator: Rémi Verschelde \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2013-11-23 15:50+0000\n" +"Last-Translator: Dune \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: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -3432,124 +3434,127 @@ msgid "Language & country configuration" msgstr "Configuration de la langue et du pays" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Configuration des alertes par courriel" +msgstr "Configurer l'authentification pour les outils Mageia" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"Une authentification est nécessaire pour configurer l'authentification des " +"outils Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Configuration du démarrage" +msgstr "Configurer le démarrage du système Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" msgstr "" +"Une authentification est nécessaire pour configurer le démarrage du système " +"Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Configuration des alertes par courriel" +msgstr "Configurer la date et l'heure de Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" +"Une authentification est nécessaire pour configurer la date et l'heure de " +"Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Configurer les partitions des disques durs" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" msgstr "" +"Une authentification est nécessaire pour configurer les partitions des " +"disques durs" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Configuration de la langue et du pays" +msgstr "Configurer le gestionnaire de connexion Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" msgstr "" +"Une authentification est nécessaire pour configurer le gestionnaire de " +"connexion Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Configuration de la langue et du pays" +msgstr "Configurer les polices de Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" msgstr "" +"Une authentification est nécessaire pour configurer les polices de Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Configuration du serveur graphique" +msgstr "Lancer l'outil de configuration du matériel" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" msgstr "" +"Une authentification est nécessaire pour lancer l'outil de configuration du " +"matériel" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Visionner les journaux de Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" msgstr "" +"Une authentification est nécessaire pour visionner les journaux de Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Configuration du serveur graphique" +msgstr "Configurer les autorisations de sécurité de Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" +"Une authentification est nécessaire pour configurer les autorisations de " +"sécurité de Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Configuration du serveur graphique" +msgstr "Configurer le scanneur" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Une authentification est nécessaire pour configurer le scanneur" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Configuration des alertes par courriel" +msgstr "Configurer la sécurité des logiciels dans Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" +"Une authentification est nécessaire pour configurer la sécurité des " +"logiciels dans Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Configuration de l'onduleur (UPS)" +msgstr "Configurer un onduleur" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Une authentification est nécessaire pour configurer un onduleur" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Configuration du serveur graphique" +msgstr "Configurer les services du système Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" msgstr "" - -#~ msgid "Verbose" -#~ msgstr "Verbeux" - -#~ msgid "/Autodetect _printers" -#~ msgstr "/Auto-détecter les _imprimantes" +"Une authentification est nécessaire pour configurer les services du système " +"Mageia" -- cgit v1.2.1 From 743d0f83ba6c25f111069284e06a5e81052285c4 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 24 Nov 2013 11:42:25 +0000 Subject: draksec: Make sure to restart polkitd after writing new rules Also do not try to rm the file if it does not exist (it seems to complain and then exit if you try to do it on a non-existant file - which means the function is not named nicely as -f to rm should make it ignore this) --- perl-install/NEWS | 5 +++-- perl-install/standalone/draksec | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index d8193d3a6..ff281df0a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ -- timezone: Assume chrony rather than ntp when neither is installed -- draksec: support polkit rules editing for permissions overrides. +- draksec: make sure to restart polkitd after writing rules +- timezone: assume chrony rather than ntp when neither is installed +- draksec: support polkit rules editing for permissions overrides Version 15.73.1 - 19 November 2013 - add chrony support to drakclock mga#11092 diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index f70bcd423..f78b5f63a 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -157,8 +157,10 @@ $contents }return polkit.Result.NOT_HANDLED;}; EOF } else { - rm_rf($polkit_rules_file); + rm_rf($polkit_rules_file) if -f $polkit_rules_file; } + + system('systemctl', 'try-restart', 'polkit.service'); } my %descr = ( -- cgit v1.2.1 From ad8f0041871eebcb6d51884009405939709a4763 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 17:02:52 +0100 Subject: beautify --- perl-install/NEWS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index ff281df0a..07306b038 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ -- draksec: make sure to restart polkitd after writing rules -- timezone: assume chrony rather than ntp when neither is installed -- draksec: support polkit rules editing for permissions overrides +- drakclock: + o assume chrony rather than ntp when neither is installed +- draksec: + o make sure to restart polkitd after writing rules + o support polkit rules editing for permissions overrides Version 15.73.1 - 19 November 2013 - add chrony support to drakclock mga#11092 -- cgit v1.2.1 From 3b11a70048e6d0a245deafcdfea78407a55a3d14 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 19:40:56 +0100 Subject: make translations homogeneous (& smaller...) --- perl-install/install/share/po/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po index 1c7895ebb..094e9cfed 100644 --- a/perl-install/install/share/po/fr.po +++ b/perl-install/install/share/po/fr.po @@ -756,7 +756,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:162 #, c-format msgid "XFCE Workstation" -msgstr "L'environnement de bureau XFCE" +msgstr "Station de travail XFCE" #: share/meta-task/compssUsers.pl:163 #, c-format @@ -770,12 +770,12 @@ msgstr "" #: share/meta-task/compssUsers.pl:167 #, c-format msgid "MATE Workstation" -msgstr "L'environnement de bureau MATE" +msgstr "Station de travail MATE" #: share/meta-task/compssUsers.pl:172 #, c-format msgid "Cinnamon Workstation" -msgstr "L'environnement de bureau Cinnamon" +msgstr "Station de travail Cinnamon" #: share/meta-task/compssUsers.pl:173 #, c-format @@ -799,7 +799,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:183 #, c-format msgid "RazorQT Desktop" -msgstr "L'environnement de bureau RazorQT" +msgstr "Station de travail RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format -- cgit v1.2.1 From 26dab7f85e8a93da2f534c5c175c1ad66195c089 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 24 Nov 2013 19:45:55 +0200 Subject: Update Spanish translation --- perl-install/install/share/po/es.po | 89 +++++++++++-------------------------- 1 file changed, 25 insertions(+), 64 deletions(-) diff --git a/perl-install/install/share/po/es.po b/perl-install/install/share/po/es.po index 2e8759847..dafe5e2e4 100644 --- a/perl-install/install/share/po/es.po +++ b/perl-install/install/share/po/es.po @@ -1,22 +1,23 @@ # 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 , YEAR. # +# Translators: +# Miguel Ortega, 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_install\n" +"Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-04 23:27-0500\n" -"Last-Translator: Diego Bello \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2013-11-17 08:04+0000\n" +"Last-Translator: Miguel Ortega\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" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" #: ../../advertising/01_IM_mageia.pl:1 #, c-format @@ -751,33 +752,33 @@ msgstr "" "escritorio amigables con el usuario" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Estación de trabajo KDE" +msgstr "Estación de trabajo XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Un entorno gráfico con un conjunto de aplicaciones y herramientas de " +"Un entorno gráfico ligero con un conjunto de aplicaciones y herramientas de " "escritorio amigables con el usuario" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Estación de trabajo GNOME" +msgstr "Estación de trabajo MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Estación de trabajo" +msgstr "Estación de trabajo Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Entorno gráfico" +msgstr "Un entorno gráfico basado en GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -794,26 +795,24 @@ msgstr "" "amigables y herramientas de escritorio" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Escritorio personalizado" +msgstr "Escritorio RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Un entorno gráfico rápico, de poco peso y poco desarrollado" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Escritorio Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Un ambiente gráfico liviano y rápido, con un conjunto de aplicaciones " -"amigables y herramientas de escritorio" +msgstr "Un entorno gráfico rápido y liviando con un seguimiento dedicado" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -821,9 +820,9 @@ msgid "Other Graphical Desktops" msgstr "Otros escritorios gráficos" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, FVWM, etc." +msgstr "Window Maker, Fvwm, etc" #: share/meta-task/compssUsers.pl:217 #, c-format @@ -1795,41 +1794,3 @@ msgid "" msgstr "" "_: Keep these entry short\n" "Salida" - -#~ msgid "Welcome" -#~ msgstr "Bienvenido(a)" - -#~ msgid "People!" -#~ msgstr "¡Gente!" - -#~ msgid "For people" -#~ msgstr "Para la gente" - -#~ msgid "For contributors" -#~ msgstr "Para colaboradores" - -#~ msgid "For you" -#~ msgstr "Para tí" - -#~ msgid "Welcome!" -#~ msgstr "¡Bienvenido!" - -#~ msgid "Select All" -#~ msgstr "Seleccionar todas." - -#~ msgid "Bad package" -#~ msgstr "Paquete erróneo" - -#, fuzzy -#~ msgid "Preparing boot images..." -#~ msgstr "Preparando el cargador de arranque..." - -#~ msgid "Mageia, the new Linux distribution" -#~ msgstr "Mageia, la nueva distribución de Linux" - -#~ msgid "" -#~ "_: Keep these entry short\n" -#~ "Networking" -#~ msgstr "" -#~ "_: Keep these entry short\n" -#~ "Red" -- cgit v1.2.1 From 29f5caf3938d736f5cefa614b156f0e975082ad2 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 24 Nov 2013 19:51:38 +0200 Subject: Update Spanish translation --- perl-install/standalone/po/es.po | 84 ++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/perl-install/standalone/po/es.po b/perl-install/standalone/po/es.po index d3d1d39e4..9c3fbf2e1 100644 --- a/perl-install/standalone/po/es.po +++ b/perl-install/standalone/po/es.po @@ -1,19 +1,22 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. # +# Translators: +# Miguel Ortega, 2013 +# rocholc , 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_standalone\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-28 21:46-0500\n" -"Last-Translator: Diego Bello \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2013-11-22 13:30+0000\n" +"Last-Translator: Yuri Chornoivan \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" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -3414,124 +3417,111 @@ msgid "Language & country configuration" msgstr "Configuración del idioma y país" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Configuración de alerta por correo" +msgstr "Ejecutar la configuración de autenticación de Mageia" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"Se necesita autenticación para ejecutar la Configuración de Autenticación de " +"Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" msgstr "Configuración de arranque" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "Se necesita autenticación para configurar el arranque" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Configuración de alerta por correo" +msgstr "Configurar fecha y hora" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" -msgstr "" +msgstr "Se requiere autenticación para configurar la fecha y la hora" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Ejecutar editor de disposición de discos Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" msgstr "" +"La autenticación es necesaria para ejecutar el editor de disposición de " +"discos Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Configuración del idioma y país" +msgstr "Configurar al administrador de acceso" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "Se requiere autenticación para configurar al administrador de acceso" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Configuración del idioma y país" +msgstr "Configurar los tipos de letra" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "Se requiere autenticación para configurar los tipos de letra" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Configuración del servidor gráfico" +msgstr "Configurar el hardware" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Se requiere autenticación para configurar el hardware" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Ejecutar el visor de registros" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Se necesita autenticación para ejecutar el visor de registros" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Configuración del servidor gráfico" +msgstr "Configurar los permisos de seguridad" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" -msgstr "" +msgstr "Se requiere autenticación para configurar los permisos de seguridad" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Configuración del servidor gráfico" +msgstr "Configurar un scanner" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Se necesita autenticación para configurar un scanner" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Configuración de alerta por correo" +msgstr "Configuración de seguridad" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" -msgstr "" +msgstr "Se necesita autenticación para configurar la seguridad" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Configuración de UPS" +msgstr "Configurar un UPS" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Se necesita autenticación para configurar un UPS" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Configuración del servidor gráfico" +msgstr "Configuración de servicios" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" - -#~ msgid "Verbose" -#~ msgstr "Con mensajes" - -#~ msgid "/Autodetect _printers" -#~ msgstr "/Autodetectar im_presoras" +msgstr "Se requiere autenticación para configurar los servicios" -- cgit v1.2.1 From 5ecf727d6aad275ed4ee04d0a0a763c9137f92d6 Mon Sep 17 00:00:00 2001 From: filip Date: Sun, 24 Nov 2013 20:37:08 +0100 Subject: Slovenian translation updated --- perl-install/install/share/po/sl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/install/share/po/sl.po b/perl-install/install/share/po/sl.po index 510927295..b973d3b64 100644 --- a/perl-install/install/share/po/sl.po +++ b/perl-install/install/share/po/sl.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-11-03 18:50+0100\n" +"PO-Revision-Date: 2013-11-24 19:34+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" @@ -187,17 +187,17 @@ msgstr "" #: any.pm:319 #, c-format msgid "Core Release" -msgstr "Glavni - izdajni" +msgstr "Glavni (core) - izdajni" #: any.pm:321 #, c-format msgid "Tainted Release" -msgstr "Patentno zaščiteni - izdajni" +msgstr "Patentno zaščiteni (tainted) - izdajni" #: any.pm:323 #, c-format msgid "Nonfree Release" -msgstr "Lastniški - izdajni" +msgstr "Lastniški (nonfree) - izdajni" #: any.pm:351 #, c-format -- cgit v1.2.1 From 560f03ba7a642654d75055bfb0b9062d4c481f66 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 18 Jan 2013 19:00:47 +0100 Subject: convert from mygtk2 to ugtk2 (needed for next commits) --- perl-install/install/steps_gtk.pm | 12 ++++++------ perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakdvb | 2 +- perl-install/standalone/drakups | 2 +- perl-install/unused/migrate-ugtk2-to-mygtk2.pl | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 1e715d0a8..04db5ffd1 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -278,17 +278,17 @@ sub reallyChooseDesktop { my $wp = ugtk2->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(), ), 1, gtknew('Image', file => "desktop-$val->[0]-big"), - 0, Gtk2::HSeparator->new, - 0, gtkpack(create_hbox('end'), + 0, gtknew('HSeparator'), + 0, gtknew('HButtonBox', layout => 'end', children_loose => [ gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) - ), - ), + ]), + ]), ); $wp->{real_window}->set_size_request(-1, -1); $wp->{real_window}->grab_focus; @@ -350,7 +350,7 @@ sub reallyChooseGroups { 0, gtknew('CheckButton', text => N("Individual package selection"), active_ref => $individual), ), 0, $w_size, - 0, Gtk2::HSeparator->new, + 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' }) }), diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 47e4de3aa..fec394ce3 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -78,7 +78,7 @@ sub run_boot_window { my $w = ugtk2->new($title); my $window = $w->{window}; - mygtk2::register_main_window($w->{real_window}); + mygtk3::register_main_window($w->{real_window}); $window->signal_connect(delete_event => sub { ugtk2->exit(0) }); unless ($::isEmbedded) { diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb index 2c5f3484a..ce735cafa 100755 --- a/perl-install/standalone/drakdvb +++ b/perl-install/standalone/drakdvb @@ -31,7 +31,7 @@ my $title = N("DVB"); $ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; my $w = ugtk2->new($title); $w->{window}->signal_connect('destroy' => \&exitapp); -mygtk2::register_main_window($w->{real_window}); +mygtk3::register_main_window($w->{real_window}); my $in = 'interactive'->vnew; my $config_file = "$ENV{HOME}/.mplayer/channels.conf"; diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index b5baee934..8524daf2a 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -328,7 +328,7 @@ if (member('--wizard', @ARGV)) { $w = ugtk2->new(N("UPS Management")); if (!$::isEmbedded) { - mygtk2::register_main_window($w->{real_window}); + mygtk3::register_main_window($w->{real_window}); $w->{window}->set_size_request(500, 550); $w->{rwindow}->set_title(N("DrakUPS")); } diff --git a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl index ccd0faaee..620ff4578 100755 --- a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl +++ b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl @@ -200,8 +200,8 @@ sub dorepl_new { } sub dorepl { - s/gtkdestroy\(/mygtk2::may_destroy(/ || - s/gtkset_background\(/mygtk2::set_root_window_background(/ || + s/gtkdestroy\(/mygtk3::may_destroy(/ || + s/gtkset_background\(/mygtk3::set_root_window_background(/ || s/gtkset_tip\($re,\s*($re),\s*($re)\)/gtkset($1, tip => $2)/ || s/gtkset_size_request\(($re),\s*($re), ($re)\)/"gtkset($1" . ($2 && $2 ne '-1' ? ", width => $2" : '') . ($3 && $3 ne '-1' ? ", height => $3" : '') . ')'/e || s/gtkset_(modal)\(($re),\s*($re)\)/gtkset($2, $1 => $3)/ || -- cgit v1.2.1 From e077d9de9c53e01dab6243941fc2ece05998f6ad Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:12:50 +0200 Subject: rename for gtk+3 --- perl-install/mygtk2.pm | 1598 ---------------------------------------------- perl-install/mygtk3.pm | 1598 ++++++++++++++++++++++++++++++++++++++++++++++ perl-install/ugtk2.pm | 1652 ------------------------------------------------ perl-install/ugtk3.pm | 1652 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 3250 insertions(+), 3250 deletions(-) delete mode 100644 perl-install/mygtk2.pm create mode 100644 perl-install/mygtk3.pm delete mode 100644 perl-install/ugtk2.pm create mode 100644 perl-install/ugtk3.pm diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm deleted file mode 100644 index 779e77e8f..000000000 --- a/perl-install/mygtk2.pm +++ /dev/null @@ -1,1598 +0,0 @@ -package mygtk2; - -use diagnostics; -use strict; -use feature 'state'; - -our @ISA = qw(Exporter); -our @EXPORT = qw(gtknew gtkset gtkadd gtkval_register gtkval_modify); - -use c; -use log; -use common; - -use Gtk2; - -sub init() { - !check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0); - $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); - - Gtk2->init; - Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), - if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), - 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation - @::textdomains; - Glib->enable_exceptions2; -} -init() unless $::no_ugtk_init; -Glib->enable_exceptions2 if $::isInstall; - - - -sub gtknew { - my $class = shift; - if (@_ % 2 != 0) { - internal_error("gtknew $class: bad options @_"); - } - if (my $r = find { ref $_->[0] } group_by2(@_)) { - internal_error("gtknew $class: $r should be a string in @_"); - } - my %opts = @_; - _gtk(undef, $class, 'gtknew', \%opts); -} - -sub gtkset { - my $w = shift; - my $class = ref($w); - if (@_ % 2 != 0) { - internal_error("gtkset $class: bad options @_"); - } - if (my $r = find { ref $_->[0] } group_by2(@_)) { - internal_error("gtkset $class: $r should be a string in @_"); - } - my %opts = @_; - - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkset unknown class $class"); - - _gtk($w, $class, 'gtkset', \%opts); -} - -sub gtkadd { - my $w = shift; - my $class = ref($w); - if (@_ % 2 != 0) { - internal_error("gtkadd $class: bad options @_"); - } - if (my $r = find { ref $_->[0] } group_by2(@_)) { - internal_error("gtkadd $class: $r should be a string in @_"); - } - my %opts = @_; - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkadd unknown class $class"); - - _gtk($w, $class, 'gtkadd', \%opts); -} - - -my %refs; - -sub gtkval_register { - my ($w, $ref, $sub) = @_; - push @{$w->{_ref}}, $ref; - $w->signal_connect(destroy => sub { - @{$refs{$ref}} = grep { $_->[1] != $w } @{$refs{$ref}}; - delete $refs{$ref} if !@{$refs{$ref}}; - }); - push @{$refs{$ref}}, [ $sub, $w ]; -} -sub gtkval_modify { - my ($ref, $val, @to_skip) = @_; - my $prev = '' . $ref; - $$ref = $val; - if ($prev ne '' . $ref) { - internal_error(); - } - foreach (@{$refs{$ref} || []}) { - my ($f, @para) = @$_; - $f->(@para) if !member($f, @to_skip); - } -} - -my $global_tooltips; - -sub _gtk { - my ($w, $class, $action, $opts) = @_; - - if (my $f = $mygtk2::{"_gtk__$class"}) { - $w = $f->($w, $opts, $class, $action); - } else { - internal_error("$action $class: unknown class"); - } - - $w->set_size_request(delete $opts->{width} || -1, delete $opts->{height} || -1) if exists $opts->{width} || exists $opts->{height}; - if (my $position = delete $opts->{position}) { - $w->move($position->[0], $position->[1]); - } - $w->set_name(delete $opts->{widget_name}) if exists $opts->{widget_name}; - $w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; - $w->can_default(delete $opts->{can_default}) if exists $opts->{can_default}; - $w->grab_focus if delete $opts->{grab_focus}; - $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; - $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; - $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event}; - $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; - (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; - if (my $tip = delete $opts->{tip}) { - $global_tooltips ||= Gtk2::Tooltips->new; - $global_tooltips->set_tip($w, $tip); - } - - #- WARNING: hide_ref and show_ref are not effective until you gtkval_modify the ref - if (my $hide_ref = delete $opts->{hide_ref}) { - gtkval_register($w, $hide_ref, sub { $$hide_ref ? $w->hide : $w->show }); - } elsif (my $show_ref = delete $opts->{show_ref}) { - gtkval_register($w, $show_ref, sub { $$show_ref ? $w->show : $w->hide }); - } - - if (my $sensitive_ref = delete $opts->{sensitive_ref}) { - my $set = sub { $w->set_sensitive($$sensitive_ref) }; - gtkval_register($w, $sensitive_ref, $set); - $set->(); - } - - if (%$opts && !$opts->{allow_unknown_options}) { - internal_error("$action $class: unknown option(s) " . join(', ', keys %$opts)); - } - $w; -} - -sub _gtk__Install_Button { - my ($w, $opts, $_class) = @_; - $opts->{child} = gtknew('HBox', spacing => 5, - children_tight => [ - # FIXME: not RTL compliant (lang::text_direction_rtl() ? ...) - gtknew('Image', file => 'advanced_expander'), - gtknew('Label', text => delete $opts->{text}), - ], - ); - $opts->{relief} = 'none'; - _gtk__Button($w, $opts, 'Button'); -} - -sub _gtk__Button { &_gtk_any_Button } -sub _gtk__ToggleButton { &_gtk_any_Button } -sub _gtk__CheckButton { &_gtk_any_Button } -sub _gtk__RadioButton { &_gtk_any_Button } -sub _gtk_any_Button { - my ($w, $opts, $class) = @_; - - if (!$w) { - my @radio_options; - if ($class eq 'RadioButton') { - @radio_options = delete $opts->{group}; - } - $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) : - delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : - $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : - "Gtk2::$class"->new(@radio_options); - - $w->{format} = delete $opts->{format} if exists $opts->{format}; - } - - if (my $widget = delete $opts->{child}) { - $w->add($widget); - $widget->show; - } - $w->set_image(delete $opts->{image}) if exists $opts->{image}; - $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; - - if (my $text_ref = delete $opts->{text_ref}) { - my $set = sub { - eval { $w->set_label(may_apply($w->{format}, $$text_ref)) }; - }; - gtkval_register($w, $text_ref, $set); - $set->(); - } elsif (exists $opts->{text}) { - $w->set_label(delete $opts->{text}); - } elsif (exists $opts->{stock}) { - $w->set_label(delete $opts->{stock}); - $w->set_use_stock(1); - } - - if ($class eq 'Button') { - $w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked}; - } else { - if (my $active_ref = delete $opts->{active_ref}) { - my $set = sub { $w->set_active($$active_ref) }; - $w->signal_connect(toggled => sub { - gtkval_modify($active_ref, $w->get_active, $set); - }); - gtkval_register($w, $active_ref, $set); - gtkval_register($w, $active_ref, delete $opts->{toggled}) if exists $opts->{toggled}; - $set->(); - } else { - $w->set_active(delete $opts->{active}) if exists $opts->{active}; - $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; - } - } - $w; -} - -sub _gtk__CheckMenuItem { - my ($w, $opts, $class) = @_; - - if (!$w) { - add2hash_($opts, { mnemonic => 1 }); - - $w = $opts->{image} || !exists $opts->{text} ? "Gtk2::$class"->new : - delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_label(delete $opts->{text}) : - "Gtk2::$class"->new_with_mnemonic(delete $opts->{text}); - } - - $w->set_active(delete $opts->{active}) if exists $opts->{active}; - $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; - $w; -} - -sub _gtk__SpinButton { - my ($w, $opts) = @_; - - if (!$w) { - $opts->{adjustment} ||= do { - add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} }); - Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); - }; - $w = Gtk2::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); - } - - $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; - $w; -} - -sub _gtk__HScale { - my ($w, $opts) = @_; - - if (!$w) { - $opts->{adjustment} ||= do { - add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 }); - add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value}; - Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); - }; - $w = Gtk2::HScale->new(delete $opts->{adjustment}); - } - - $w->set_digits(delete $opts->{digits}) if exists $opts->{digits}; - if (my $value_ref = delete $opts->{value_ref}) { - my $set = sub { $w->set_value($$value_ref) }; - gtkval_register($w, $value_ref, $set); - $set->(); - $w->signal_connect(value_changed => sub { - gtkval_modify($value_ref, $w->get_value, $set); - }); - } - $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; - $w; -} - -sub _gtk__ProgressBar { - my ($w, $opts) = @_; - - if (!$w) { - $w = Gtk2::ProgressBar->new; - } - - if (my $fraction_ref = delete $opts->{fraction_ref}) { - my $set = sub { $w->set_fraction($$fraction_ref) }; - gtkval_register($w, $fraction_ref, $set); - $set->(); - } elsif (exists $opts->{fraction}) { - $w->set_fraction(delete $opts->{fraction}); - } - - $w; -} - -sub _gtk__VSeparator { &_gtk_any_simple } -sub _gtk__HSeparator { &_gtk_any_simple } -sub _gtk__Calendar { &_gtk_any_simple } - -sub _gtk__DrawingArea { - my ($w, $_opts) = @_; - - if (!$w) { - $w = Gtk2::DrawingArea->new; - } - $w; -} - -sub _gtk__Pixbuf { - my ($w, $opts) = @_; - - if (!$w) { - my $name = delete $opts->{file} or internal_error("missing file"); - my $file = _find_imgfile($name) or internal_error("cannot find image $name"); - if (my $size = delete $opts->{size}) { - $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1); - } else { - $w = Gtk2::Gdk::Pixbuf->new_from_file($file); - } - $w = $w->flip(1) if delete $opts->{flip}; - } - $w; -} - -# Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays -sub _gtk__Image_using_pixmap { &_gtk__Image } -# Image_using_pixbuf is rendered using DITHER_MAX & transparency which is much better on 16bpp displays -sub _gtk__Image_using_pixbuf { &_gtk__Image } -sub _gtk__Image { - my ($w, $opts, $class) = @_; - - if (!$w) { - $w = Gtk2::Image->new; - $w->{format} = delete $opts->{format} if exists $opts->{format}; - - $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock}; - - $w->{options} = { flip => delete $opts->{flip} }; - - $w->{set_from_file} = $class =~ /using_pixmap/ ? sub { - my ($w, $file) = @_; - my $pixmap = mygtk2::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); - $w->set_from_pixmap($pixmap, undef); - } : $class =~ /using_pixbuf/ ? sub { - my ($w, $file) = @_; - my $pixbuf = _pixbuf_render_alpha(gtknew('Pixbuf', file => $file, %{$w->{options}}), 255); - my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - $w->set_size_request($width, $height); - $w->{pixbuf} = $pixbuf; - $w->signal_connect(expose_event => sub { - my (undef, $event) = @_; - if (!$w->{x}) { - my $alloc = $w->allocation; - $w->{x} = $alloc->x; - $w->{y} = $alloc->y; - } - # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: - if ($::isInstall) { - $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), - 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); - return; - } - foreach my $rect ($event->region->get_rectangles) { - my @values = $rect->values; - $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), - @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); - } - }); - } : sub { - my ($w, $file, $o_size) = @_; - my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}}); - $w->set_from_pixbuf($pixbuf); - }; - } - - if (my $name = delete $opts->{file}) { - my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("cannot find image $name"); - $w->{set_from_file}->($w, $file, delete $opts->{size}); - } elsif (my $file_ref = delete $opts->{file_ref}) { - my $set = sub { - my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("cannot find image $$file_ref"); - $w->{set_from_file}->($w, $file, delete $opts->{size}); - }; - gtkval_register($w, $file_ref, $set); - $set->() if $$file_ref; - } - $w; -} - -sub _gtk__WrappedLabel { - my ($w, $opts) = @_; - - $opts->{line_wrap} = 1 if !defined $opts->{line_wrap}; - _gtk__Label($w, $opts); -} - -our $left_padding = 20; - -sub _gtk__Label_Left { - my ($w, $opts) = @_; - $opts->{alignment} ||= [ 0, 0 ]; - $opts->{padding} ||= [ $left_padding, 0 ]; - _gtk__WrappedLabel($w, $opts); -} - -sub _gtk__Label_Right { - my ($w, $opts) = @_; - $opts->{alignment} ||= [ 1, 0.5 ]; - _gtk__Label($w, $opts); -} - - -sub _gtk__Label { - my ($w, $opts) = @_; - - if ($w) { - $w->set_text(delete $opts->{text}) if exists $opts->{text}; - } else { - $w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new; - $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable}; - $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize}; - $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; - $w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap}; - $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; - $w->modify_font(Gtk2::Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; - } - - if (my $text_ref = delete $opts->{text_ref}) { - my $set = sub { $w->set_text($$text_ref) }; - gtkval_register($w, $text_ref, $set); - $set->(); - } - - if (my $t = delete $opts->{text_markup}) { - $w->set_markup($t); - if ($w->get_text eq '') { - log::l("invalid markup in $t. not using the markup"); - $w->set_text($t); - } - } - $w; -} - - -sub _gtk__Alignment { - my ($w, $_opts) = @_; - - if (!$w) { - $w = Gtk2::Alignment->new(0, 0, 0, 0); - } - $w; -} - - -sub title1_to_markup { - my ($label) = @_; - if ($::isInstall) { - my $font = lang::l2pango_font($::o->{locale}{lang}); - if (my ($font_size) = $font =~ /(\d+)/) { - $font_size++; - $font =~ s/\d+/$font_size/; - } - qq($label); - } else { - qq($label); - } -} - -sub _gtk__Install_Title { - my ($w, $opts) = @_; - local $opts->{widget_name} = 'Banner'; - $opts->{text} = uc($opts->{text}) if $::isInstall; - gtknew('HBox', widget_name => 'Banner', children => [ - 0, gtknew('Label', padding => [ 6, 0 ]), - 1, gtknew('VBox', widget_name => 'Banner', children_tight => [ - _gtk__Title2($w, $opts), - if_($::isInstall, Gtk2::HSeparator->new), - ]), - 0, gtknew('Label', padding => [ 6, 0 ]), - ]); -} - -sub _gtk__Title1 { - my ($w, $opts) = @_; - $opts ||= {}; - $opts->{text_markup} = title1_to_markup(delete($opts->{label})) if $opts->{label}; - _gtk__WrappedLabel($w, $opts); -} - -sub _gtk__Title2 { - my ($w, $opts) = @_; - $opts ||= {}; - $opts->{alignment} = [ 0, 0 ]; - _gtk__Title1($w, $opts); -} - -sub _gtk__Sexy_IconEntry { - my ($w, $opts) = @_; - - require Gtk2::Sexy; - if (!$w) { - $w = Gtk2::Sexy::IconEntry->new; - $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; - } - - $w->add_clear_button if delete $opts->{clear_button}; - if (my $icon = delete $opts->{primary_icon}) { - $w->set_icon('primary', $icon); - $w->set_icon_highlight('primary', $icon); - } - if (my $icon = delete $opts->{secondary_icon}) { - $w->set_icon('secondary', $icon); - $w->set_icon_highlight('secondary', $icon); - } - - $w->signal_connect('icon-released' => delete $opts->{'icon-released'}) if exists $opts->{'icon-released'}; - $w->signal_connect('icon-pressed' => delete $opts->{'icon-pressed'}) if exists $opts->{'icon-pressed'}; - - _gtk__Entry($w, $opts); -} - -sub _gtk__Entry { - my ($w, $opts) = @_; - - if (!$w) { - $w = Gtk2::Entry->new; - $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; - } - - if (my $icon = delete $opts->{primary_icon}) { - $w->set_icon_from_stock('primary', $icon); - #$w->set_icon_highlight('primary', $icon); - } - if (my $icon = delete $opts->{secondary_icon}) { - $w->set_icon_from_stock('secondary', $icon); - #$w->set_icon_highlight('secondary', $icon); - } - - $w->signal_connect('icon-release' => delete $opts->{'icon-release'}) if exists $opts->{'icon-release'}; - $w->signal_connect('icon-press' => delete $opts->{'icon-press'}) if exists $opts->{'icon-press'}; - - $w->set_text(delete $opts->{text}) if exists $opts->{text}; - $w->signal_connect(key_press_event => delete $opts->{key_press_event}) if exists $opts->{key_press_event}; - - if (my $text_ref = delete $opts->{text_ref}) { - my $set = sub { $w->set_text($$text_ref) }; - gtkval_register($w, $text_ref, $set); - $set->(); - $w->signal_connect(changed => sub { - gtkval_modify($text_ref, $w->get_text, $set); - }); - } - - $w; -} - -sub _gtk__WeaknessCheckEntry { - my ($w, $opts) = @_; - - if (!$w) { - $w = _gtk__Entry($w, $opts); - } - - $w->signal_connect('changed' => sub { - require authentication; - my $password_weakness = authentication::compute_password_weakness($w->get_text); - $w->set_icon_from_pixbuf('GTK_ENTRY_ICON_SECONDARY', _get_weakness_icon($password_weakness)); - $w->set_icon_tooltip_text('GTK_ENTRY_ICON_SECONDARY', _get_weakness_tooltip($password_weakness)); - }); - - $w; -} - -sub _gtk__TextView { - my ($w, $opts, $_class, $action) = @_; - - if (!$w) { - $w = Gtk2::TextView->new; - $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; - $w->set_wrap_mode(delete $opts->{wrap_mode}) if exists $opts->{wrap_mode}; - $w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible}; - } - - _text_insert($w, delete $opts->{text}, append => $action eq 'gtkadd') if exists $opts->{text}; - $w; -} - -sub _gtk__WebKit_View { - my ($w, $opts, $_class, $_action) = @_; - if (!$w) { - $w = Gtk2::WebKit::WebView->new; - } - - # disable contextual menu: - if (delete $opts->{no_popup_menu}) { - $w->signal_connect('populate-popup' => sub { - my (undef, $menu) = @_; - $menu->destroy if $menu; - 1; - }); - } - - $w; -} - -sub _gtk__ComboBox { - my ($w, $opts, $_class, $action) = @_; - - if (!$w) { - $w = Gtk2::ComboBox->new_text; - $w->{format} = delete $opts->{format} if exists $opts->{format}; - - } - my $set_list = sub { - $w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list}; - $w->get_model->clear; - $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk2 - $w->append_text($_) foreach @{$w->{formatted_list}}; - }; - if (my $list_ref = delete $opts->{list_ref}) { - !$opts->{list} or internal_error("both list and list_ref"); - my $set = sub { - $w->{list} = $$list_ref; - $set_list->(); - }; - gtkval_register($w, $list_ref, $set); - $set->(); - } elsif (exists $opts->{list}) { - $w->{list} = delete $opts->{list}; - $set_list->(); - } - - if ($action eq 'gtknew') { - if (my $text_ref = delete $opts->{text_ref}) { - my $set = sub { - my $val = may_apply($w->{format}, $$text_ref); - eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) }; - }; - $w->signal_connect(changed => sub { - gtkval_modify($text_ref, $w->{list}[$w->get_active], $set); - }); - gtkval_register($w, $text_ref, $set); - gtkval_register($w, $text_ref, delete $opts->{changed}) if exists $opts->{changed}; - $set->(); - } else { - my $val = delete $opts->{text}; - eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) } if defined $val; - $w->signal_connect(changed => delete $opts->{changed}) if exists $opts->{changed}; - } - } - $w; -} - -sub _gtk__ScrolledWindow { - my ($w, $opts, $_class, $action) = @_; - - if (!$w) { - $w = Gtk2::ScrolledWindow->new(undef, undef); - $w->set_policy(delete $opts->{h_policy} || 'automatic', delete $opts->{v_policy} || 'automatic'); - } - - my $faked_w = $w; - - if (my $child = delete $opts->{child}) { - if (member(ref($child), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::SimpleList Gtk2::SourceView::View Gtk2::Text Gtk2::TextView Gtk2::TreeView Gtk2::WebKit::WebView))) { - $w->add($child); - } else { - $w->add_with_viewport($child); - } - $child->set_focus_vadjustment($w->get_vadjustment) if $child->can('set_focus_vadjustment'); - $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/ && $child->get_left_margin <= 6; - $child->show; - - $w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; - - if (ref($child) eq 'Gtk2::TextView' && delete $opts->{to_bottom}) { - $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child); - } - - if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk2::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) { - $faked_w = gtknew('Frame', shadow_type => 'in', child => $w); - } - } - $faked_w; -} - -sub _gtk__Frame { - my ($w, $opts) = @_; - - if ($w) { - $w->set_label(delete $opts->{text}) if exists $opts->{text}; - } else { - $w = Gtk2::Frame->new(delete $opts->{text}); - $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; - $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; - } - - if (my $child = delete $opts->{child}) { - $w->add($child); - $child->show; - } - $w; -} - -sub _gtk__Expander { - my ($w, $opts) = @_; - - if ($w) { - $w->set_label(delete $opts->{text}) if exists $opts->{text}; - } else { - $w = Gtk2::Expander->new(delete $opts->{text}); - } - - $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; - - if (my $child = delete $opts->{child}) { - $w->add($child); - $child->show; - } - $w; -} - - - -sub _gtk__MDV_Notebook { - my ($w, $opts, $_class, $_action) = @_; - if (!$w) { - import_style_ressources(); - - my ($layout, $selection_arrow, $selection_bar); - my $parent_window = delete $opts->{parent_window} || root_window(); - my $root_height = first($parent_window->get_size); - my $suffix = $root_height == 800 && !$::isStandalone ? '_600' : '_768'; - # the white square is a little bit above the actual left sidepanel: - my $offset = 20; - my $is_flip_needed = text_direction_rtl(); - my $filler = gtknew('Image', file => 'left-background-filler.png'); - my $filler_height = $filler->get_pixbuf->get_height; - my $left_background = gtknew('Image_using_pixbuf', file => 'left-background.png'); - my $lf_height = $left_background->{pixbuf}->get_height; - my @right_background = $::isInstall ? - gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) - : map { - gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); - } 1, 2, 2, 3; - my $width1 = $left_background->{pixbuf}->get_width; - my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width; - my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; - $w = gtknew('HBox', spacing => 0, children => [ - 0, $layout = gtknew('Layout', width => $total_width - $offset, children => [ #Layout Fixed - # stacking order is important for "Z-buffer": - [ $left_background, 0, 0 ], - if_($suffix ne '_600', - [ $filler, 0, $lf_height ], - [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height ], - [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height*2 ], - ), - [ $selection_bar = gtknew('Image', file => 'rollover.png'), 0, 0 ], # arbitrary vertical position - ($opts->{children} ? @{ delete $opts->{children} } : ()), - [ my $box = gtknew('VBox', spacing => 0, height => -1, children => [ - 0, $right_background[0], - if_(!$::isInstall, - 1, $right_background[1], - 1, $right_background[2], # enought up to to XYZx1280 resolution - 0, $right_background[3], - ), - ]), (text_direction_rtl() ? 0 : $width1 - $offset), 0 ], - # stack on top (vertical position is arbitrary): - [ $selection_arrow = gtknew('Image', file => 'steps_on', flip => $is_flip_needed), $arrow_x, 0, ], - ]), - 1, delete $opts->{right_child} || - gtknew('Image_using_pixbuf', file => "right-white-background_right_part$suffix", flip => $is_flip_needed), - ]); - - $w->signal_connect('size-allocate' => sub { - my (undef, $requisition) = @_; - state $width ||= $right_background[0]->get_pixbuf->get_width; - $box->set_size_request($width, $requisition->height); - }); - $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; - bless($w, 'Gtk2::MDV_Notebook'); - add2hash($w, { - arrow_x => $arrow_x, - layout => $layout, - selection_arrow => $selection_arrow, - selection_bar =>$selection_bar, - }); - } - $w; -} - - -sub _gtk__Fixed { - my ($w, $opts, $_class, $_action) = @_; - - if (!$w) { - $w = Gtk2::Fixed->new; - $w->set_has_window(delete $opts->{has_window}) if exists $opts->{has_window}; - _gtknew_handle_layout_children($w, $opts); - } - $w; -} - -sub _gtk__Layout { - my ($w, $opts, $_class, $_action) = @_; - - if (!$w) { - $w = Gtk2::Layout->new; - _gtknew_handle_layout_children($w, $opts); - } - $w; -} - -sub _gtknew_handle_layout_children { - my ($w, $opts) = @_; - $opts->{children} ||= []; - push @{$opts->{children}}, [ delete $opts->{child}, delete $opts->{x}, delete $opts->{y} ] if exists $opts->{child}; - foreach (@{$opts->{children}}) { - $w->put(@$_); - } - delete $opts->{children}; - - if ($opts->{pixbuf_file}) { - my $pixbuf = if_($opts->{pixbuf_file}, gtknew('Pixbuf', file => delete $opts->{pixbuf_file})); - $w->signal_connect( - realize => sub { - ugtk2::set_back_pixbuf($w, $pixbuf); - }); - } -} - - -sub _gtk__Window { &_gtk_any_Window } -sub _gtk__Dialog { &_gtk_any_Window } -sub _gtk__Plug { &_gtk_any_Window } -sub _gtk_any_Window { - my ($w, $opts, $class) = @_; - - if (!$w) { - if ($class eq 'Window') { - $w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel'); - } elsif ($class eq 'Plug') { - $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id"); - $w = "Gtk2::$class"->new(delete $opts->{socket_id}); - } elsif ($class eq 'FileChooserDialog') { - my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); - $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window, - $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok', - ); - } else { - $w = "Gtk2::$class"->new; - } - - if ($::isInstall || $::set_dialog_hint) { - $w->set_type_hint('dialog'); # for matchbox window manager - } - - $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; - $opts->{transient_for} ||= $::main_window if $::main_window; - $w->set_modal(1) if exists $opts->{transient_for}; - $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; - $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; - $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; - $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; - $w->set_default_size(delete $opts->{default_width} || -1, delete $opts->{default_height} || -1) if exists $opts->{default_width} || exists $opts->{default_height}; - my $icon_no_error = $opts->{icon_no_error}; - if (my $name = delete $opts->{icon} || delete $opts->{icon_no_error}) { - if (my $f = _find_imgfile($name)) { - $w->set_icon(gtknew('Pixbuf', file => $f)); - } elsif (!$icon_no_error) { - internal_error("cannot find $name"); - } - } - } - $w->set_title(delete $opts->{title}) if exists $opts->{title}; - - if (my $child = delete $opts->{child}) { - $w->add($child); - $child->show; - } - $w; -} - -my $previous_popped_and_reuse_window; - -sub destroy_previous_popped_and_reuse_window() { - $previous_popped_and_reuse_window or return; - - $previous_popped_and_reuse_window->destroy; - $previous_popped_and_reuse_window = undef; -} - -sub _gtk__MagicWindow { - my ($w, $opts) = @_; - - my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { - #- do not take into account the wizard banner - # FIXME!!! - any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children; - }; - - my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; - my $sub_child = delete $opts->{child}; - my $provided_banner = delete $opts->{banner}; - - if ($pop_it && $provided_banner) { - $sub_child = gtknew('VBox', children => [ 0, $provided_banner, if_($sub_child, 1, $sub_child) ]); - } else { - $sub_child ||= gtknew('VBox'); - } - if (!$pop_and_reuse) { - destroy_previous_popped_and_reuse_window(); - } - - if ($previous_popped_and_reuse_window && $pop_and_reuse) { - $w = $previous_popped_and_reuse_window; - $w->remove($w->child); - - gtkadd($w, child => $sub_child); - %$opts = (); - } elsif ($pop_it) { - $opts->{child} = $sub_child; - - $w = _create_Window($opts, ''); - $previous_popped_and_reuse_window = $w if $pop_and_reuse; - } else { - if (!$::WizardWindow) { - - my $banner; - if (!$::isEmbedded && !$::isInstall && $::Wizard_title) { - if (_find_imgfile($opts->{icon_no_error})) { - $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title); - } else { - log::l("ERROR: missing wizard banner $opts->{icon_no_error}"); - } - } - $::WizardTable = gtknew('VBox', if_($banner, children_tight => [ $banner ])); - - if ($::isEmbedded) { - add2hash($opts, { - socket_id => $::XID, - child => $::WizardTable, - }); - delete $opts->{no_Window_Manager}; - $::Plug = $::WizardWindow = _gtk(undef, 'Plug', 'gtknew', $opts); - sync($::WizardWindow); - } else { - add2hash($opts, { - child => $::WizardTable, - }); - $::WizardWindow = _create_Window($opts, 'special_center'); - } - } else { - %$opts = (); - } - - set_main_window_size($::WizardWindow); - - $w = $::WizardWindow; - - gtkadd($::WizardTable, children_tight => [ $provided_banner ]) if $provided_banner; - gtkadd($::WizardTable, children_loose => [ $sub_child ]); - } - bless { - real_window => $w, - child => $sub_child, pop_it => $pop_it, pop_and_reuse => $pop_and_reuse, - if_($provided_banner, banner => $provided_banner), - }, 'mygtk2::MagicWindow'; -} - -# A standard About dialog. Used with: -# my $w = gtknew('AboutDialog', ...); -# $w->show_all; -# $w->run; -sub _gtk__AboutDialog { - my ($w, $opts) = @_; - - if (!$w) { - $w = Gtk2::AboutDialog->new; - $w->signal_connect(response => sub { $_[0]->destroy }); - $w->set_program_name(delete $opts->{name}) if exists $opts->{name}; - $w->set_version(delete $opts->{version}) if exists $opts->{version}; - $w->set_icon(gtknew('Pixbuf', file => delete $opts->{icon})) if exists $opts->{icon}; - $w->set_logo(gtknew('Pixbuf', file => delete $opts->{logo})) if exists $opts->{logo}; - $w->set_copyright(delete $opts->{copyright}) if exists $opts->{copyright}; - $w->set_url_hook(sub { - my (undef, $url) = @_; - run_program::raw({ detach => 1 }, 'www-browser', $url); - }); - $w->set_email_hook(sub { - my (undef, $url) = @_; - run_program::raw({ detach => 1 }, 'www-browser', $url); - }); - - if (my $url = delete $opts->{website}) { - $url =~ s/^https:/http:/; # Gtk2::About doesn't like "https://..." like URLs - $w->set_website($url); - } - $w->set_license(delete $opts->{license}) if exists $opts->{license}; - $w->set_wrap_license(delete $opts->{wrap_license}) if exists $opts->{wrap_license}; - $w->set_comments(delete $opts->{comments}) if exists $opts->{comments}; - $w->set_website_label(delete $opts->{website_label}) if exists $opts->{website_label}; - $w->set_authors(delete $opts->{authors}) if exists $opts->{authors}; - $w->set_documenters(delete $opts->{documenters}) if exists $opts->{documenters}; - $w->set_translator_credits(delete $opts->{translator_credits}) if exists $opts->{translator_credits}; - $w->set_artists(delete $opts->{artists}) if exists $opts->{artists}; - $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; - $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; - $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; - } - $w; -} - -sub _gtk__FileSelection { - my ($w, $opts) = @_; - - if (!$w) { - $w = Gtk2::FileSelection->new(delete $opts->{title} || ''); - gtkset($w->ok_button, %{delete $opts->{ok_button}}) if exists $opts->{ok_button}; - gtkset($w->cancel_button, %{delete $opts->{cancel_button}}) if exists $opts->{cancel_button}; - } - $w; -} - -sub _gtk__FileChooserDialog { &_gtk_any_Window } - -sub _gtk__FileChooser { - my ($w, $opts) = @_; - - #- no nice way to have a {file_ref} on a FileChooser since selection_changed only works for browsing, not file/folder creation - - if (!$w) { - my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); - $w = Gtk2::FileChooserWidget->new($action); - - my $file = $opts->{file} && delete $opts->{file}; - - if (my $dir = delete $opts->{directory} || $file && dirname($file)) { - $w->set_current_folder($dir); - } - if ($file) { - if ($action =~ /save|create/) { - $w->set_current_name(basename($file)); - } else { - $w->set_filename($file); - } - } - } - $w; -} - -sub _gtk__VPaned { &_gtk_any_Paned } -sub _gtk__HPaned { &_gtk_any_Paned } -sub _gtk_any_Paned { - my ($w, $opts, $class, $action) = @_; - - if (!$w) { - $w = "Gtk2::$class"->new; - $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; - $w->set_position(delete $opts->{position}) if exists $opts->{position}; - } elsif ($action eq 'gtkset') { - $_->destroy foreach $w->get_children; - } - - foreach my $opt (qw(resize1 shrink1 resize2 shrink2)) { - $opts->{$opt} = 1 if !defined $opts->{$opt}; - } - $w->pack1(delete $opts->{child1}, delete $opts->{resize1}, delete $opts->{shrink1}); - $w->pack2(delete $opts->{child2}, delete $opts->{resize2}, delete $opts->{shrink2}); - $w; -} - -sub _gtk__VBox { &_gtk_any_Box } -sub _gtk__HBox { &_gtk_any_Box } -sub _gtk_any_Box { - my ($w, $opts, $class, $action) = @_; - - if (!$w) { - $w = "Gtk2::$class"->new; - $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; - $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; - $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; - } elsif ($action eq 'gtkset') { - $_->destroy foreach $w->get_children; - } - - _gtknew_handle_children($w, $opts); - $w; -} - -sub _gtk__VButtonBox { &_gtk_any_ButtonBox } -sub _gtk__HButtonBox { &_gtk_any_ButtonBox } -sub _gtk_any_ButtonBox { - my ($w, $opts, $class, $action) = @_; - - if (!$w) { - $w = "Gtk2::$class"->new; - $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; - $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; - $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; - $w->set_layout(delete $opts->{layout} || 'spread'); - } elsif ($action eq 'gtkset') { - $_->destroy foreach $w->get_children; - } - - _gtknew_handle_children($w, $opts); - $w; -} - -sub _gtk__Notebook { - my ($w, $opts) = @_; - - if (!$w) { - $w = Gtk2::Notebook->new; - $w->set_property('show-tabs', delete $opts->{show_tabs}) if exists $opts->{show_tabs}; - $w->set_property('show-border', delete $opts->{show_border}) if exists $opts->{show_border}; - } - - if (exists $opts->{children}) { - foreach (group_by2(@{delete $opts->{children}})) { - my ($title, $page) = @$_; - $w->append_page($page, $title); - $page->show; - $title->show; - } - } - $w; -} - -sub _gtk__Table { - my ($w, $opts) = @_; - - if (!$w) { - add2hash_($opts, { xpadding => 5, ypadding => 0, border_width => $::isInstall ? 3 : 10 }); - - $w = Gtk2::Table->new(0, 0, delete $opts->{homogeneous} || 0); - $w->set_col_spacings(delete $opts->{col_spacings} || 0); - $w->set_row_spacings(delete $opts->{row_spacings} || 0); - $w->set_border_width(delete $opts->{border_width}); - $w->{$_} = delete $opts->{$_} foreach 'xpadding', 'ypadding', 'mcc'; - } - - each_index { - my ($i, $l) = ($::i, $_); - each_index { - my $j = $::i; - if ($_) { - ref $_ or $_ = Gtk2::WrappedLabel->new($_); - $w->attach($_, $j, $j + 1, $i, $i + 1, - $j != $#$l && !$w->{mcc} ? - ('fill', 'fill', $w->{xpadding}, $w->{ypadding}) : - (['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? - ['expand', 'fill'] : [], 0, 0)); - $_->show; - } - } @$l; - } @{delete $opts->{children} || []}; - - $w; -} - -sub _gtk_any_simple { - my ($w, $_opts, $class) = @_; - - $w ||= "Gtk2::$class"->new; -} - -sub _gtknew_handle_children { - my ($w, $opts) = @_; - - my @child = exists $opts->{children_tight} ? map { [ 0, $_ ] } @{delete $opts->{children_tight}} : - exists $opts->{children_loose} ? map { [ 1, $_ ] } @{delete $opts->{children_loose}} : - exists $opts->{children} ? group_by2(@{delete $opts->{children}}) : - exists $opts->{children_centered} ? - ([ 1, gtknew('VBox') ], (map { [ 0, $_ ] } @{delete $opts->{children_centered}}), [ 1, gtknew('VBox') ]) : - (); - - my $padding = delete $opts->{padding}; - - foreach (@child) { - my ($fill, $child) = @$_; - $fill eq '0' || $fill eq '1' || $fill eq 'fill' || $fill eq 'expand' or internal_error("odd {children} parameter must be 0 or 1 (got $fill)"); - ref $child or $child = Gtk2::WrappedLabel->new($child); - my $expand = $fill && $fill ne 'fill' ? 1 : 0; - $w->pack_start($child, $expand, $fill, $padding || 0); - $child->show; - } -} - -#- this magic function redirects method calls: -#- * default is to redirect them to the {child} -#- * if the {child} doesn't handle the method, we try with the {real_window} -#- (eg : add_accel_group set_position set_default_size -#- * a few methods are handled specially -my %for_real_window = map { $_ => 1 } qw(show_all size_request); -sub mygtk2::MagicWindow::AUTOLOAD { - my ($w, @args) = @_; - - my ($meth) = $mygtk2::MagicWindow::AUTOLOAD =~ /mygtk2::MagicWindow::(.*)/; - - my ($s1, @s2) = $meth eq 'show' - ? ('real_window', 'banner', 'child') : - $meth eq 'destroy' || $meth eq 'hide' ? - ($w->{pop_it} ? 'real_window' : ('child', 'banner')) : - $meth eq 'get' && $args[0] eq 'window-position' || - $for_real_window{$meth} || - !$w->{child}->can($meth) - ? 'real_window' - : 'child'; - -#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n"; - - $w->{$_} && $w->{$_}->$meth(@args) foreach @s2; - $w->{$s1}->$meth(@args); -} - -my $enable_quit_popup; -sub enable_quit_popup { - my ($bool) = @_; - $enable_quit_popup = $bool; -} - -state $in_callback; -sub quit_popup() { - return if !$enable_quit_popup; - if (!$in_callback) { - $in_callback = 1; - my $_guard = before_leaving { undef $in_callback }; - require ugtk2; - my $w = ugtk2->new(N("Confirmation"), grab => 1); - ugtk2::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel")); - my $ret = ugtk2::main($w); - return 1 if !$ret; - } -} - -sub quit_callback { - my ($w) = @_; - - return 1 if quit_popup(); - if ($::isWizard) { - $w->destroy; - die 'wizcancel'; - } else { - if (Gtk2->main_level) { - Gtk2->main_quit; - } else { - # block window deletion if not in main loop (eg: while starting the GUI) - return 1; - } - } -} - -sub _create_Window { - my ($opts, $special_center) = @_; - - my $no_Window_Manager = exists $opts->{no_Window_Manager} ? delete $opts->{no_Window_Manager} : !$::isStandalone; - - add2hash($opts, { - if_(!$::isInstall && !$::isWizard, border_width => 5), - - #- policy: during install, we need a special code to handle the weird centering, see below - position_policy => $special_center ? 'none' : - $no_Window_Manager ? 'center-always' : 'center-on-parent', - - if_($::isInstall, position => [ - $::stepswidth + ($::o->{windowwidth} - $::real_windowwidth) / 2, - ($::o->{windowheight} - $::real_windowheight) / 2, - ]), - }); - my $w = _gtk(undef, 'Window', 'gtknew', $opts); - - #- when the window is closed using the window manager "X" button (or alt-f4) - $w->signal_connect(delete_event => \&quit_callback); - - if ($::isInstall && !$::isStandalone) { - require install::gtk; #- for perl_checker - install::gtk::handle_unsafe_mouse($::o, $w); - $w->signal_connect(key_press_event => \&install::gtk::special_shortcuts); - - #- force center at a weird position, this can't be handled by position_policy - #- because center-* really are window manager hints for centering, whereas we want - #- to center the main window in the right part of the screen - my ($wi, $he); - $w->signal_connect(size_allocate => sub { - my (undef, $event) = @_; - my @w_size = $event->values; - - # ignore bogus sizing events: - return if $w_size[2] < 5; - return if $w_size[2] == $wi && $w_size[3] == $he; #BUG - (undef, undef, $wi, $he) = @w_size; - - $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), - max(0, ($::o->{windowheight} - $he) / 2)); - }) if $special_center; - } - - $w->present if $no_Window_Manager; - - $w; -} - -sub _find_imgfile { - my ($name) = @_; - - if ($name =~ m|/| && -f $name) { - $name; - } else { - foreach my $path (_icon_paths()) { - foreach ('', '.png', '.xpm', '.jpg') { - my $file = "$path/$name$_"; - -f $file and return $file; - } - } - } -} - -# _text_insert() can be used with any of choose one of theses styles: -# - no tags: -# _text_insert($textview, "My text.."); -# - anonymous tags: -# _text_insert($textview, [ [ 'first text', { 'foreground' => 'blue', 'background' => 'green', ... } ], -# [ 'second text' ], -# [ 'third', { 'font' => 'Serif 15', ... } ], -# ... ]); -# - named tags: -# $textview->{tags} = { -# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, -# 'big_font' => { 'font' => 'Serif 35', ... }, -# } -# _text_insert($textview, [ [ 'first text', 'blue_green' ], -# [ 'second', 'big_font' ], -# ... ]); -# - mixed anonymous and named tags: -# $textview->{tags} = { -# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, -# 'big_font' => { 'font' => 'Serif 35', ... }, -# } -# _text_insert($textview, [ [ 'first text', 'blue_green' ], -# [ 'second text' ], -# [ 'third', 'big_font' ], -# [ 'fourth', { 'font' => 'Serif 15', ... } ], -# ... ]); -sub _text_insert { - my ($textview, $t, %opts) = @_; - my $buffer = $textview->get_buffer; - $buffer->{tags} ||= {}; - $buffer->{gtk_tags} ||= {}; - my $gtk_tags = $buffer->{gtk_tags}; - my $tags = $buffer->{tags}; - if (ref($t) eq 'ARRAY') { - if (!$opts{append}) { - $buffer->set_text(''); - $textview->{anchors} = []; - } - foreach my $token (@$t) { - my ($item, $tag) = @$token; - my $iter1 = $buffer->get_end_iter; - if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) { - $buffer->insert_pixbuf($iter1, $item); - next; - } - if (ref($item) =~ /^Gtk2::/) { - my $anchor = $buffer->create_child_anchor($iter1); - $textview->add_child_at_anchor($item, $anchor); - $textview->{anchors} ||= []; - push @{$textview->{anchors}}, $anchor; - next; - } - if ($tag) { - if (ref($tag)) { - # use anonymous tags - $buffer->insert_with_tags($iter1, $item, $buffer->create_tag(undef, %$tag)); - } else { - # fast text insertion: - # since in some contexts (eg: localedrake, rpmdrake), we use quite a lot of identical tags, - # it's much more efficient and less memory pressure to use named tags - $gtk_tags->{$tag} ||= $buffer->create_tag($tag, %{$tags->{$token->[1]}}); - $buffer->insert_with_tags($iter1, $item, $gtk_tags->{$tag}); - } - } else { - $buffer->insert($iter1, $item); - } - } - } else { - if ($opts{append}) { - $buffer->insert($buffer->get_end_iter, $t); - } else { - $textview->{anchors} = []; - $buffer->set_text($t); - } - } - $textview->{to_bottom}->() if $textview->{to_bottom}; - - #- the following line is needed to move the cursor to the beginning, so that if the - #- textview has a scrollbar, it will not scroll to the bottom when focusing (#3633) - $buffer->place_cursor($buffer->get_start_iter); - $textview->set_wrap_mode($opts{wrap_mode} || 'word'); - $textview->set_editable($opts{editable} || 0); - $textview->set_cursor_visible($opts{visible} || 0); - $textview; -} - -sub _allow_scroll_TextView_to_bottom { - my ($scrolledWindow, $textView) = @_; - - $textView->get_buffer->create_mark('end', $textView->get_buffer->get_end_iter, 0); - sub { - my ($o_force) = @_; - my $adjustment = $scrolledWindow->get_vadjustment; - if ($o_force || $adjustment->page_size + $adjustment->value == $adjustment->upper) { - flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end - $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); - } - }; -} - -sub asteriskize { - my ($label) = @_; - "\x{2022} " . $label; -} - -sub get_main_window_size() { - $::real_windowwidth ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400); -} - -# in order to workaround infamous 6 years old gnome bug #101968: -sub get_label_width() { - first(mygtk2::get_main_window_size()) - 55 - $left_padding; -} - -sub set_main_window_size { - my ($window) = @_; - my ($width, $height) = get_main_window_size(); - $window->set_size_request($width, $height); -} - -my @icon_paths; -sub add_icon_path { push @icon_paths, @_ } -sub _icon_paths() { - (@icon_paths, (exists $ENV{SHARE_PATH} ? ($ENV{SHARE_PATH}, "$ENV{SHARE_PATH}/icons", "$ENV{SHARE_PATH}/libDrakX/pixmaps") : ()), - "/usr/lib/libDrakX/icons", "pixmaps", 'data/icons', 'data/pixmaps', 'standalone/icons', '/usr/share/rpmdrake/icons'); -} - -sub main { - my ($window, $o_verif) = @_; - my $destroyed; - $window->signal_connect(destroy => sub { $destroyed = 1 }); - $window->show; - do { Gtk2->main } while (!$destroyed && $o_verif && !$o_verif->()); - may_destroy($window); - flush(); -} - -sub sync { - my ($window) = @_; - $window->show; - flush(); -} - -sub flush() { - Gtk2->main_iteration while Gtk2->events_pending; -} - -sub enable_sync_flush { - my ($w) = @_; - $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); -} - -sub sync_flush { - my ($w) = @_; - # hackish :-( - mygtk2::sync($w) while !$w->{displayed}; -} - - -sub register_main_window { - my ($w) = @_; - push @::main_windows, $::main_window = $w; -} - -sub may_destroy { - my ($w) = @_; - return if !$w; - @::main_windows = difference2(\@::main_windows, [ $w->{real_window} ]); - if ($::main_window eq $w->{real_window}) { - undef $::main_window; - $::main_window = $::main_windows[-1]; - } - $w->destroy; -} - -sub root_window() { - state $root; - $root ||= Gtk2::Gdk->get_default_root_window; -} - -sub rgb2color { - my ($r, $g, $b) = @_; - my $color = Gtk2::Gdk::Color->new($r, $g, $b); - root_window()->get_colormap->rgb_find_color($color); - $color; -} - -sub set_root_window_background { - my ($r, $g, $b) = @_; - my $root = root_window(); - my $gc = Gtk2::Gdk::GC->new($root); - my $color = rgb2color($r, $g, $b); - $gc->set_rgb_fg_color($color); - set_root_window_background_with_gc($gc); -} - -sub set_root_window_background_with_gc { - my ($gc) = @_; - my $root = root_window(); - my ($w, $h) = $root->get_size; - $root->set_background($gc->get_values->{foreground}); - $root->draw_rectangle($gc, 1, 0, 0, $w, $h); -} - -sub _new_alpha_pixbuf { - my ($pixbuf) = @_; - my ($height, $width) = ($pixbuf->get_height, $pixbuf->get_width); - my $new_pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height); - $new_pixbuf->fill(0x00000000); # transparent white - $width, $height, $new_pixbuf; -} - -sub _pixbuf_render_alpha { - my ($pixbuf, $alpha_threshold) = @_; - my ($width, $height, $new_pixbuf) = _new_alpha_pixbuf($pixbuf); - $pixbuf->composite($new_pixbuf, 0, 0, $width, $height, 0, 0, 1, 1, 'bilinear', $alpha_threshold); - $new_pixbuf; -} - -sub pixmap_from_pixbuf { - my ($widget, $pixbuf) = @_; - my $window = $widget->window or internal_error("you can't use this function if the widget is not realised"); - my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); - $pixmap; -} - -sub import_style_ressources() { - if (!$::isInstall) { - Gtk2::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG - } -} - -sub text_direction_rtl() { - Gtk2::Widget->get_default_direction eq 'rtl'; -} - -sub _get_weakness_icon { - my ($password_weakness) = @_; - my %weakness_icon = ( - 1 => gtknew('Pixbuf', file => 'security-low'), - 2 => gtknew('Pixbuf', file => 'security-low'), - 3 => gtknew('Pixbuf', file => 'security-medium'), - 4 => gtknew('Pixbuf', file => 'security-strong'), - 5 => gtknew('Pixbuf', file => 'security-strong')); - my $weakness_icon = $weakness_icon{$password_weakness} || return undef; - $weakness_icon; -} - -sub _get_weakness_tooltip { - my ($password_weakness) = @_; - my %weakness_tooltip = ( - 1 => N("Password is trivial to guess"), - 2 => N("Password is trivial to guess"), - 3 => N("Password should be resistant to basic attacks"), - 4 => N("Password seems secure"), - 5 => N("Password seems secure")); - my $weakness_tooltip = $weakness_tooltip{$password_weakness} || return undef; - return $weakness_tooltip; -} - -package Gtk2::MDV_Notebook; # helper functions for installer & mcc -our @ISA = qw(Gtk2::Widget); - -sub hide_selection { - my ($w) = @_; - $_->hide foreach $w->{selection_bar}, $w->{selection_arrow}; -} - -sub move_selection { - my ($w, $label) = @_; - my $layout = $w->{layout}; - $layout->{arrow_ydiff} ||= - ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; - my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; - $layout->move($w->{selection_bar}, 0, $bar_y); - $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer - $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; -} - -1; diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm new file mode 100644 index 000000000..779e77e8f --- /dev/null +++ b/perl-install/mygtk3.pm @@ -0,0 +1,1598 @@ +package mygtk2; + +use diagnostics; +use strict; +use feature 'state'; + +our @ISA = qw(Exporter); +our @EXPORT = qw(gtknew gtkset gtkadd gtkval_register gtkval_modify); + +use c; +use log; +use common; + +use Gtk2; + +sub init() { + !check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0); + $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); + + Gtk2->init; + Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), + if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), + 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation + @::textdomains; + Glib->enable_exceptions2; +} +init() unless $::no_ugtk_init; +Glib->enable_exceptions2 if $::isInstall; + + + +sub gtknew { + my $class = shift; + if (@_ % 2 != 0) { + internal_error("gtknew $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtknew $class: $r should be a string in @_"); + } + my %opts = @_; + _gtk(undef, $class, 'gtknew', \%opts); +} + +sub gtkset { + my $w = shift; + my $class = ref($w); + if (@_ % 2 != 0) { + internal_error("gtkset $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtkset $class: $r should be a string in @_"); + } + my %opts = @_; + + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkset unknown class $class"); + + _gtk($w, $class, 'gtkset', \%opts); +} + +sub gtkadd { + my $w = shift; + my $class = ref($w); + if (@_ % 2 != 0) { + internal_error("gtkadd $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtkadd $class: $r should be a string in @_"); + } + my %opts = @_; + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkadd unknown class $class"); + + _gtk($w, $class, 'gtkadd', \%opts); +} + + +my %refs; + +sub gtkval_register { + my ($w, $ref, $sub) = @_; + push @{$w->{_ref}}, $ref; + $w->signal_connect(destroy => sub { + @{$refs{$ref}} = grep { $_->[1] != $w } @{$refs{$ref}}; + delete $refs{$ref} if !@{$refs{$ref}}; + }); + push @{$refs{$ref}}, [ $sub, $w ]; +} +sub gtkval_modify { + my ($ref, $val, @to_skip) = @_; + my $prev = '' . $ref; + $$ref = $val; + if ($prev ne '' . $ref) { + internal_error(); + } + foreach (@{$refs{$ref} || []}) { + my ($f, @para) = @$_; + $f->(@para) if !member($f, @to_skip); + } +} + +my $global_tooltips; + +sub _gtk { + my ($w, $class, $action, $opts) = @_; + + if (my $f = $mygtk2::{"_gtk__$class"}) { + $w = $f->($w, $opts, $class, $action); + } else { + internal_error("$action $class: unknown class"); + } + + $w->set_size_request(delete $opts->{width} || -1, delete $opts->{height} || -1) if exists $opts->{width} || exists $opts->{height}; + if (my $position = delete $opts->{position}) { + $w->move($position->[0], $position->[1]); + } + $w->set_name(delete $opts->{widget_name}) if exists $opts->{widget_name}; + $w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; + $w->can_default(delete $opts->{can_default}) if exists $opts->{can_default}; + $w->grab_focus if delete $opts->{grab_focus}; + $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; + $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; + $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event}; + $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; + (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; + if (my $tip = delete $opts->{tip}) { + $global_tooltips ||= Gtk2::Tooltips->new; + $global_tooltips->set_tip($w, $tip); + } + + #- WARNING: hide_ref and show_ref are not effective until you gtkval_modify the ref + if (my $hide_ref = delete $opts->{hide_ref}) { + gtkval_register($w, $hide_ref, sub { $$hide_ref ? $w->hide : $w->show }); + } elsif (my $show_ref = delete $opts->{show_ref}) { + gtkval_register($w, $show_ref, sub { $$show_ref ? $w->show : $w->hide }); + } + + if (my $sensitive_ref = delete $opts->{sensitive_ref}) { + my $set = sub { $w->set_sensitive($$sensitive_ref) }; + gtkval_register($w, $sensitive_ref, $set); + $set->(); + } + + if (%$opts && !$opts->{allow_unknown_options}) { + internal_error("$action $class: unknown option(s) " . join(', ', keys %$opts)); + } + $w; +} + +sub _gtk__Install_Button { + my ($w, $opts, $_class) = @_; + $opts->{child} = gtknew('HBox', spacing => 5, + children_tight => [ + # FIXME: not RTL compliant (lang::text_direction_rtl() ? ...) + gtknew('Image', file => 'advanced_expander'), + gtknew('Label', text => delete $opts->{text}), + ], + ); + $opts->{relief} = 'none'; + _gtk__Button($w, $opts, 'Button'); +} + +sub _gtk__Button { &_gtk_any_Button } +sub _gtk__ToggleButton { &_gtk_any_Button } +sub _gtk__CheckButton { &_gtk_any_Button } +sub _gtk__RadioButton { &_gtk_any_Button } +sub _gtk_any_Button { + my ($w, $opts, $class) = @_; + + if (!$w) { + my @radio_options; + if ($class eq 'RadioButton') { + @radio_options = delete $opts->{group}; + } + $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) : + delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : + $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : + "Gtk2::$class"->new(@radio_options); + + $w->{format} = delete $opts->{format} if exists $opts->{format}; + } + + if (my $widget = delete $opts->{child}) { + $w->add($widget); + $widget->show; + } + $w->set_image(delete $opts->{image}) if exists $opts->{image}; + $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { + eval { $w->set_label(may_apply($w->{format}, $$text_ref)) }; + }; + gtkval_register($w, $text_ref, $set); + $set->(); + } elsif (exists $opts->{text}) { + $w->set_label(delete $opts->{text}); + } elsif (exists $opts->{stock}) { + $w->set_label(delete $opts->{stock}); + $w->set_use_stock(1); + } + + if ($class eq 'Button') { + $w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked}; + } else { + if (my $active_ref = delete $opts->{active_ref}) { + my $set = sub { $w->set_active($$active_ref) }; + $w->signal_connect(toggled => sub { + gtkval_modify($active_ref, $w->get_active, $set); + }); + gtkval_register($w, $active_ref, $set); + gtkval_register($w, $active_ref, delete $opts->{toggled}) if exists $opts->{toggled}; + $set->(); + } else { + $w->set_active(delete $opts->{active}) if exists $opts->{active}; + $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; + } + } + $w; +} + +sub _gtk__CheckMenuItem { + my ($w, $opts, $class) = @_; + + if (!$w) { + add2hash_($opts, { mnemonic => 1 }); + + $w = $opts->{image} || !exists $opts->{text} ? "Gtk2::$class"->new : + delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_label(delete $opts->{text}) : + "Gtk2::$class"->new_with_mnemonic(delete $opts->{text}); + } + + $w->set_active(delete $opts->{active}) if exists $opts->{active}; + $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; + $w; +} + +sub _gtk__SpinButton { + my ($w, $opts) = @_; + + if (!$w) { + $opts->{adjustment} ||= do { + add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} }); + Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + }; + $w = Gtk2::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); + } + + $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; + $w; +} + +sub _gtk__HScale { + my ($w, $opts) = @_; + + if (!$w) { + $opts->{adjustment} ||= do { + add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 }); + add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value}; + Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + }; + $w = Gtk2::HScale->new(delete $opts->{adjustment}); + } + + $w->set_digits(delete $opts->{digits}) if exists $opts->{digits}; + if (my $value_ref = delete $opts->{value_ref}) { + my $set = sub { $w->set_value($$value_ref) }; + gtkval_register($w, $value_ref, $set); + $set->(); + $w->signal_connect(value_changed => sub { + gtkval_modify($value_ref, $w->get_value, $set); + }); + } + $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; + $w; +} + +sub _gtk__ProgressBar { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::ProgressBar->new; + } + + if (my $fraction_ref = delete $opts->{fraction_ref}) { + my $set = sub { $w->set_fraction($$fraction_ref) }; + gtkval_register($w, $fraction_ref, $set); + $set->(); + } elsif (exists $opts->{fraction}) { + $w->set_fraction(delete $opts->{fraction}); + } + + $w; +} + +sub _gtk__VSeparator { &_gtk_any_simple } +sub _gtk__HSeparator { &_gtk_any_simple } +sub _gtk__Calendar { &_gtk_any_simple } + +sub _gtk__DrawingArea { + my ($w, $_opts) = @_; + + if (!$w) { + $w = Gtk2::DrawingArea->new; + } + $w; +} + +sub _gtk__Pixbuf { + my ($w, $opts) = @_; + + if (!$w) { + my $name = delete $opts->{file} or internal_error("missing file"); + my $file = _find_imgfile($name) or internal_error("cannot find image $name"); + if (my $size = delete $opts->{size}) { + $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1); + } else { + $w = Gtk2::Gdk::Pixbuf->new_from_file($file); + } + $w = $w->flip(1) if delete $opts->{flip}; + } + $w; +} + +# Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays +sub _gtk__Image_using_pixmap { &_gtk__Image } +# Image_using_pixbuf is rendered using DITHER_MAX & transparency which is much better on 16bpp displays +sub _gtk__Image_using_pixbuf { &_gtk__Image } +sub _gtk__Image { + my ($w, $opts, $class) = @_; + + if (!$w) { + $w = Gtk2::Image->new; + $w->{format} = delete $opts->{format} if exists $opts->{format}; + + $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock}; + + $w->{options} = { flip => delete $opts->{flip} }; + + $w->{set_from_file} = $class =~ /using_pixmap/ ? sub { + my ($w, $file) = @_; + my $pixmap = mygtk2::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); + $w->set_from_pixmap($pixmap, undef); + } : $class =~ /using_pixbuf/ ? sub { + my ($w, $file) = @_; + my $pixbuf = _pixbuf_render_alpha(gtknew('Pixbuf', file => $file, %{$w->{options}}), 255); + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + $w->set_size_request($width, $height); + $w->{pixbuf} = $pixbuf; + $w->signal_connect(expose_event => sub { + my (undef, $event) = @_; + if (!$w->{x}) { + my $alloc = $w->allocation; + $w->{x} = $alloc->x; + $w->{y} = $alloc->y; + } + # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: + if ($::isInstall) { + $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); + return; + } + foreach my $rect ($event->region->get_rectangles) { + my @values = $rect->values; + $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); + } + }); + } : sub { + my ($w, $file, $o_size) = @_; + my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}}); + $w->set_from_pixbuf($pixbuf); + }; + } + + if (my $name = delete $opts->{file}) { + my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("cannot find image $name"); + $w->{set_from_file}->($w, $file, delete $opts->{size}); + } elsif (my $file_ref = delete $opts->{file_ref}) { + my $set = sub { + my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("cannot find image $$file_ref"); + $w->{set_from_file}->($w, $file, delete $opts->{size}); + }; + gtkval_register($w, $file_ref, $set); + $set->() if $$file_ref; + } + $w; +} + +sub _gtk__WrappedLabel { + my ($w, $opts) = @_; + + $opts->{line_wrap} = 1 if !defined $opts->{line_wrap}; + _gtk__Label($w, $opts); +} + +our $left_padding = 20; + +sub _gtk__Label_Left { + my ($w, $opts) = @_; + $opts->{alignment} ||= [ 0, 0 ]; + $opts->{padding} ||= [ $left_padding, 0 ]; + _gtk__WrappedLabel($w, $opts); +} + +sub _gtk__Label_Right { + my ($w, $opts) = @_; + $opts->{alignment} ||= [ 1, 0.5 ]; + _gtk__Label($w, $opts); +} + + +sub _gtk__Label { + my ($w, $opts) = @_; + + if ($w) { + $w->set_text(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new; + $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable}; + $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize}; + $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; + $w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap}; + $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; + $w->modify_font(Gtk2::Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; + } + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { $w->set_text($$text_ref) }; + gtkval_register($w, $text_ref, $set); + $set->(); + } + + if (my $t = delete $opts->{text_markup}) { + $w->set_markup($t); + if ($w->get_text eq '') { + log::l("invalid markup in $t. not using the markup"); + $w->set_text($t); + } + } + $w; +} + + +sub _gtk__Alignment { + my ($w, $_opts) = @_; + + if (!$w) { + $w = Gtk2::Alignment->new(0, 0, 0, 0); + } + $w; +} + + +sub title1_to_markup { + my ($label) = @_; + if ($::isInstall) { + my $font = lang::l2pango_font($::o->{locale}{lang}); + if (my ($font_size) = $font =~ /(\d+)/) { + $font_size++; + $font =~ s/\d+/$font_size/; + } + qq($label); + } else { + qq($label); + } +} + +sub _gtk__Install_Title { + my ($w, $opts) = @_; + local $opts->{widget_name} = 'Banner'; + $opts->{text} = uc($opts->{text}) if $::isInstall; + gtknew('HBox', widget_name => 'Banner', children => [ + 0, gtknew('Label', padding => [ 6, 0 ]), + 1, gtknew('VBox', widget_name => 'Banner', children_tight => [ + _gtk__Title2($w, $opts), + if_($::isInstall, Gtk2::HSeparator->new), + ]), + 0, gtknew('Label', padding => [ 6, 0 ]), + ]); +} + +sub _gtk__Title1 { + my ($w, $opts) = @_; + $opts ||= {}; + $opts->{text_markup} = title1_to_markup(delete($opts->{label})) if $opts->{label}; + _gtk__WrappedLabel($w, $opts); +} + +sub _gtk__Title2 { + my ($w, $opts) = @_; + $opts ||= {}; + $opts->{alignment} = [ 0, 0 ]; + _gtk__Title1($w, $opts); +} + +sub _gtk__Sexy_IconEntry { + my ($w, $opts) = @_; + + require Gtk2::Sexy; + if (!$w) { + $w = Gtk2::Sexy::IconEntry->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + } + + $w->add_clear_button if delete $opts->{clear_button}; + if (my $icon = delete $opts->{primary_icon}) { + $w->set_icon('primary', $icon); + $w->set_icon_highlight('primary', $icon); + } + if (my $icon = delete $opts->{secondary_icon}) { + $w->set_icon('secondary', $icon); + $w->set_icon_highlight('secondary', $icon); + } + + $w->signal_connect('icon-released' => delete $opts->{'icon-released'}) if exists $opts->{'icon-released'}; + $w->signal_connect('icon-pressed' => delete $opts->{'icon-pressed'}) if exists $opts->{'icon-pressed'}; + + _gtk__Entry($w, $opts); +} + +sub _gtk__Entry { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::Entry->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + } + + if (my $icon = delete $opts->{primary_icon}) { + $w->set_icon_from_stock('primary', $icon); + #$w->set_icon_highlight('primary', $icon); + } + if (my $icon = delete $opts->{secondary_icon}) { + $w->set_icon_from_stock('secondary', $icon); + #$w->set_icon_highlight('secondary', $icon); + } + + $w->signal_connect('icon-release' => delete $opts->{'icon-release'}) if exists $opts->{'icon-release'}; + $w->signal_connect('icon-press' => delete $opts->{'icon-press'}) if exists $opts->{'icon-press'}; + + $w->set_text(delete $opts->{text}) if exists $opts->{text}; + $w->signal_connect(key_press_event => delete $opts->{key_press_event}) if exists $opts->{key_press_event}; + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { $w->set_text($$text_ref) }; + gtkval_register($w, $text_ref, $set); + $set->(); + $w->signal_connect(changed => sub { + gtkval_modify($text_ref, $w->get_text, $set); + }); + } + + $w; +} + +sub _gtk__WeaknessCheckEntry { + my ($w, $opts) = @_; + + if (!$w) { + $w = _gtk__Entry($w, $opts); + } + + $w->signal_connect('changed' => sub { + require authentication; + my $password_weakness = authentication::compute_password_weakness($w->get_text); + $w->set_icon_from_pixbuf('GTK_ENTRY_ICON_SECONDARY', _get_weakness_icon($password_weakness)); + $w->set_icon_tooltip_text('GTK_ENTRY_ICON_SECONDARY', _get_weakness_tooltip($password_weakness)); + }); + + $w; +} + +sub _gtk__TextView { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::TextView->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + $w->set_wrap_mode(delete $opts->{wrap_mode}) if exists $opts->{wrap_mode}; + $w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible}; + } + + _text_insert($w, delete $opts->{text}, append => $action eq 'gtkadd') if exists $opts->{text}; + $w; +} + +sub _gtk__WebKit_View { + my ($w, $opts, $_class, $_action) = @_; + if (!$w) { + $w = Gtk2::WebKit::WebView->new; + } + + # disable contextual menu: + if (delete $opts->{no_popup_menu}) { + $w->signal_connect('populate-popup' => sub { + my (undef, $menu) = @_; + $menu->destroy if $menu; + 1; + }); + } + + $w; +} + +sub _gtk__ComboBox { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::ComboBox->new_text; + $w->{format} = delete $opts->{format} if exists $opts->{format}; + + } + my $set_list = sub { + $w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list}; + $w->get_model->clear; + $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk2 + $w->append_text($_) foreach @{$w->{formatted_list}}; + }; + if (my $list_ref = delete $opts->{list_ref}) { + !$opts->{list} or internal_error("both list and list_ref"); + my $set = sub { + $w->{list} = $$list_ref; + $set_list->(); + }; + gtkval_register($w, $list_ref, $set); + $set->(); + } elsif (exists $opts->{list}) { + $w->{list} = delete $opts->{list}; + $set_list->(); + } + + if ($action eq 'gtknew') { + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { + my $val = may_apply($w->{format}, $$text_ref); + eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) }; + }; + $w->signal_connect(changed => sub { + gtkval_modify($text_ref, $w->{list}[$w->get_active], $set); + }); + gtkval_register($w, $text_ref, $set); + gtkval_register($w, $text_ref, delete $opts->{changed}) if exists $opts->{changed}; + $set->(); + } else { + my $val = delete $opts->{text}; + eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) } if defined $val; + $w->signal_connect(changed => delete $opts->{changed}) if exists $opts->{changed}; + } + } + $w; +} + +sub _gtk__ScrolledWindow { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::ScrolledWindow->new(undef, undef); + $w->set_policy(delete $opts->{h_policy} || 'automatic', delete $opts->{v_policy} || 'automatic'); + } + + my $faked_w = $w; + + if (my $child = delete $opts->{child}) { + if (member(ref($child), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::SimpleList Gtk2::SourceView::View Gtk2::Text Gtk2::TextView Gtk2::TreeView Gtk2::WebKit::WebView))) { + $w->add($child); + } else { + $w->add_with_viewport($child); + } + $child->set_focus_vadjustment($w->get_vadjustment) if $child->can('set_focus_vadjustment'); + $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/ && $child->get_left_margin <= 6; + $child->show; + + $w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + + if (ref($child) eq 'Gtk2::TextView' && delete $opts->{to_bottom}) { + $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child); + } + + if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk2::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) { + $faked_w = gtknew('Frame', shadow_type => 'in', child => $w); + } + } + $faked_w; +} + +sub _gtk__Frame { + my ($w, $opts) = @_; + + if ($w) { + $w->set_label(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = Gtk2::Frame->new(delete $opts->{text}); + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + } + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + +sub _gtk__Expander { + my ($w, $opts) = @_; + + if ($w) { + $w->set_label(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = Gtk2::Expander->new(delete $opts->{text}); + } + + $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + + + +sub _gtk__MDV_Notebook { + my ($w, $opts, $_class, $_action) = @_; + if (!$w) { + import_style_ressources(); + + my ($layout, $selection_arrow, $selection_bar); + my $parent_window = delete $opts->{parent_window} || root_window(); + my $root_height = first($parent_window->get_size); + my $suffix = $root_height == 800 && !$::isStandalone ? '_600' : '_768'; + # the white square is a little bit above the actual left sidepanel: + my $offset = 20; + my $is_flip_needed = text_direction_rtl(); + my $filler = gtknew('Image', file => 'left-background-filler.png'); + my $filler_height = $filler->get_pixbuf->get_height; + my $left_background = gtknew('Image_using_pixbuf', file => 'left-background.png'); + my $lf_height = $left_background->{pixbuf}->get_height; + my @right_background = $::isInstall ? + gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) + : map { + gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); + } 1, 2, 2, 3; + my $width1 = $left_background->{pixbuf}->get_width; + my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width; + my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; + $w = gtknew('HBox', spacing => 0, children => [ + 0, $layout = gtknew('Layout', width => $total_width - $offset, children => [ #Layout Fixed + # stacking order is important for "Z-buffer": + [ $left_background, 0, 0 ], + if_($suffix ne '_600', + [ $filler, 0, $lf_height ], + [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height ], + [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height*2 ], + ), + [ $selection_bar = gtknew('Image', file => 'rollover.png'), 0, 0 ], # arbitrary vertical position + ($opts->{children} ? @{ delete $opts->{children} } : ()), + [ my $box = gtknew('VBox', spacing => 0, height => -1, children => [ + 0, $right_background[0], + if_(!$::isInstall, + 1, $right_background[1], + 1, $right_background[2], # enought up to to XYZx1280 resolution + 0, $right_background[3], + ), + ]), (text_direction_rtl() ? 0 : $width1 - $offset), 0 ], + # stack on top (vertical position is arbitrary): + [ $selection_arrow = gtknew('Image', file => 'steps_on', flip => $is_flip_needed), $arrow_x, 0, ], + ]), + 1, delete $opts->{right_child} || + gtknew('Image_using_pixbuf', file => "right-white-background_right_part$suffix", flip => $is_flip_needed), + ]); + + $w->signal_connect('size-allocate' => sub { + my (undef, $requisition) = @_; + state $width ||= $right_background[0]->get_pixbuf->get_width; + $box->set_size_request($width, $requisition->height); + }); + $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; + bless($w, 'Gtk2::MDV_Notebook'); + add2hash($w, { + arrow_x => $arrow_x, + layout => $layout, + selection_arrow => $selection_arrow, + selection_bar =>$selection_bar, + }); + } + $w; +} + + +sub _gtk__Fixed { + my ($w, $opts, $_class, $_action) = @_; + + if (!$w) { + $w = Gtk2::Fixed->new; + $w->set_has_window(delete $opts->{has_window}) if exists $opts->{has_window}; + _gtknew_handle_layout_children($w, $opts); + } + $w; +} + +sub _gtk__Layout { + my ($w, $opts, $_class, $_action) = @_; + + if (!$w) { + $w = Gtk2::Layout->new; + _gtknew_handle_layout_children($w, $opts); + } + $w; +} + +sub _gtknew_handle_layout_children { + my ($w, $opts) = @_; + $opts->{children} ||= []; + push @{$opts->{children}}, [ delete $opts->{child}, delete $opts->{x}, delete $opts->{y} ] if exists $opts->{child}; + foreach (@{$opts->{children}}) { + $w->put(@$_); + } + delete $opts->{children}; + + if ($opts->{pixbuf_file}) { + my $pixbuf = if_($opts->{pixbuf_file}, gtknew('Pixbuf', file => delete $opts->{pixbuf_file})); + $w->signal_connect( + realize => sub { + ugtk2::set_back_pixbuf($w, $pixbuf); + }); + } +} + + +sub _gtk__Window { &_gtk_any_Window } +sub _gtk__Dialog { &_gtk_any_Window } +sub _gtk__Plug { &_gtk_any_Window } +sub _gtk_any_Window { + my ($w, $opts, $class) = @_; + + if (!$w) { + if ($class eq 'Window') { + $w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel'); + } elsif ($class eq 'Plug') { + $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id"); + $w = "Gtk2::$class"->new(delete $opts->{socket_id}); + } elsif ($class eq 'FileChooserDialog') { + my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); + $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window, + $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok', + ); + } else { + $w = "Gtk2::$class"->new; + } + + if ($::isInstall || $::set_dialog_hint) { + $w->set_type_hint('dialog'); # for matchbox window manager + } + + $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $opts->{transient_for} ||= $::main_window if $::main_window; + $w->set_modal(1) if exists $opts->{transient_for}; + $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; + $w->set_default_size(delete $opts->{default_width} || -1, delete $opts->{default_height} || -1) if exists $opts->{default_width} || exists $opts->{default_height}; + my $icon_no_error = $opts->{icon_no_error}; + if (my $name = delete $opts->{icon} || delete $opts->{icon_no_error}) { + if (my $f = _find_imgfile($name)) { + $w->set_icon(gtknew('Pixbuf', file => $f)); + } elsif (!$icon_no_error) { + internal_error("cannot find $name"); + } + } + } + $w->set_title(delete $opts->{title}) if exists $opts->{title}; + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + +my $previous_popped_and_reuse_window; + +sub destroy_previous_popped_and_reuse_window() { + $previous_popped_and_reuse_window or return; + + $previous_popped_and_reuse_window->destroy; + $previous_popped_and_reuse_window = undef; +} + +sub _gtk__MagicWindow { + my ($w, $opts) = @_; + + my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { + #- do not take into account the wizard banner + # FIXME!!! + any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children; + }; + + my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; + my $sub_child = delete $opts->{child}; + my $provided_banner = delete $opts->{banner}; + + if ($pop_it && $provided_banner) { + $sub_child = gtknew('VBox', children => [ 0, $provided_banner, if_($sub_child, 1, $sub_child) ]); + } else { + $sub_child ||= gtknew('VBox'); + } + if (!$pop_and_reuse) { + destroy_previous_popped_and_reuse_window(); + } + + if ($previous_popped_and_reuse_window && $pop_and_reuse) { + $w = $previous_popped_and_reuse_window; + $w->remove($w->child); + + gtkadd($w, child => $sub_child); + %$opts = (); + } elsif ($pop_it) { + $opts->{child} = $sub_child; + + $w = _create_Window($opts, ''); + $previous_popped_and_reuse_window = $w if $pop_and_reuse; + } else { + if (!$::WizardWindow) { + + my $banner; + if (!$::isEmbedded && !$::isInstall && $::Wizard_title) { + if (_find_imgfile($opts->{icon_no_error})) { + $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title); + } else { + log::l("ERROR: missing wizard banner $opts->{icon_no_error}"); + } + } + $::WizardTable = gtknew('VBox', if_($banner, children_tight => [ $banner ])); + + if ($::isEmbedded) { + add2hash($opts, { + socket_id => $::XID, + child => $::WizardTable, + }); + delete $opts->{no_Window_Manager}; + $::Plug = $::WizardWindow = _gtk(undef, 'Plug', 'gtknew', $opts); + sync($::WizardWindow); + } else { + add2hash($opts, { + child => $::WizardTable, + }); + $::WizardWindow = _create_Window($opts, 'special_center'); + } + } else { + %$opts = (); + } + + set_main_window_size($::WizardWindow); + + $w = $::WizardWindow; + + gtkadd($::WizardTable, children_tight => [ $provided_banner ]) if $provided_banner; + gtkadd($::WizardTable, children_loose => [ $sub_child ]); + } + bless { + real_window => $w, + child => $sub_child, pop_it => $pop_it, pop_and_reuse => $pop_and_reuse, + if_($provided_banner, banner => $provided_banner), + }, 'mygtk2::MagicWindow'; +} + +# A standard About dialog. Used with: +# my $w = gtknew('AboutDialog', ...); +# $w->show_all; +# $w->run; +sub _gtk__AboutDialog { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::AboutDialog->new; + $w->signal_connect(response => sub { $_[0]->destroy }); + $w->set_program_name(delete $opts->{name}) if exists $opts->{name}; + $w->set_version(delete $opts->{version}) if exists $opts->{version}; + $w->set_icon(gtknew('Pixbuf', file => delete $opts->{icon})) if exists $opts->{icon}; + $w->set_logo(gtknew('Pixbuf', file => delete $opts->{logo})) if exists $opts->{logo}; + $w->set_copyright(delete $opts->{copyright}) if exists $opts->{copyright}; + $w->set_url_hook(sub { + my (undef, $url) = @_; + run_program::raw({ detach => 1 }, 'www-browser', $url); + }); + $w->set_email_hook(sub { + my (undef, $url) = @_; + run_program::raw({ detach => 1 }, 'www-browser', $url); + }); + + if (my $url = delete $opts->{website}) { + $url =~ s/^https:/http:/; # Gtk2::About doesn't like "https://..." like URLs + $w->set_website($url); + } + $w->set_license(delete $opts->{license}) if exists $opts->{license}; + $w->set_wrap_license(delete $opts->{wrap_license}) if exists $opts->{wrap_license}; + $w->set_comments(delete $opts->{comments}) if exists $opts->{comments}; + $w->set_website_label(delete $opts->{website_label}) if exists $opts->{website_label}; + $w->set_authors(delete $opts->{authors}) if exists $opts->{authors}; + $w->set_documenters(delete $opts->{documenters}) if exists $opts->{documenters}; + $w->set_translator_credits(delete $opts->{translator_credits}) if exists $opts->{translator_credits}; + $w->set_artists(delete $opts->{artists}) if exists $opts->{artists}; + $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; + $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; + } + $w; +} + +sub _gtk__FileSelection { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::FileSelection->new(delete $opts->{title} || ''); + gtkset($w->ok_button, %{delete $opts->{ok_button}}) if exists $opts->{ok_button}; + gtkset($w->cancel_button, %{delete $opts->{cancel_button}}) if exists $opts->{cancel_button}; + } + $w; +} + +sub _gtk__FileChooserDialog { &_gtk_any_Window } + +sub _gtk__FileChooser { + my ($w, $opts) = @_; + + #- no nice way to have a {file_ref} on a FileChooser since selection_changed only works for browsing, not file/folder creation + + if (!$w) { + my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); + $w = Gtk2::FileChooserWidget->new($action); + + my $file = $opts->{file} && delete $opts->{file}; + + if (my $dir = delete $opts->{directory} || $file && dirname($file)) { + $w->set_current_folder($dir); + } + if ($file) { + if ($action =~ /save|create/) { + $w->set_current_name(basename($file)); + } else { + $w->set_filename($file); + } + } + } + $w; +} + +sub _gtk__VPaned { &_gtk_any_Paned } +sub _gtk__HPaned { &_gtk_any_Paned } +sub _gtk_any_Paned { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_position(delete $opts->{position}) if exists $opts->{position}; + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + foreach my $opt (qw(resize1 shrink1 resize2 shrink2)) { + $opts->{$opt} = 1 if !defined $opts->{$opt}; + } + $w->pack1(delete $opts->{child1}, delete $opts->{resize1}, delete $opts->{shrink1}); + $w->pack2(delete $opts->{child2}, delete $opts->{resize2}, delete $opts->{shrink2}); + $w; +} + +sub _gtk__VBox { &_gtk_any_Box } +sub _gtk__HBox { &_gtk_any_Box } +sub _gtk_any_Box { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; + $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + _gtknew_handle_children($w, $opts); + $w; +} + +sub _gtk__VButtonBox { &_gtk_any_ButtonBox } +sub _gtk__HButtonBox { &_gtk_any_ButtonBox } +sub _gtk_any_ButtonBox { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; + $w->set_layout(delete $opts->{layout} || 'spread'); + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + _gtknew_handle_children($w, $opts); + $w; +} + +sub _gtk__Notebook { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::Notebook->new; + $w->set_property('show-tabs', delete $opts->{show_tabs}) if exists $opts->{show_tabs}; + $w->set_property('show-border', delete $opts->{show_border}) if exists $opts->{show_border}; + } + + if (exists $opts->{children}) { + foreach (group_by2(@{delete $opts->{children}})) { + my ($title, $page) = @$_; + $w->append_page($page, $title); + $page->show; + $title->show; + } + } + $w; +} + +sub _gtk__Table { + my ($w, $opts) = @_; + + if (!$w) { + add2hash_($opts, { xpadding => 5, ypadding => 0, border_width => $::isInstall ? 3 : 10 }); + + $w = Gtk2::Table->new(0, 0, delete $opts->{homogeneous} || 0); + $w->set_col_spacings(delete $opts->{col_spacings} || 0); + $w->set_row_spacings(delete $opts->{row_spacings} || 0); + $w->set_border_width(delete $opts->{border_width}); + $w->{$_} = delete $opts->{$_} foreach 'xpadding', 'ypadding', 'mcc'; + } + + each_index { + my ($i, $l) = ($::i, $_); + each_index { + my $j = $::i; + if ($_) { + ref $_ or $_ = Gtk2::WrappedLabel->new($_); + $w->attach($_, $j, $j + 1, $i, $i + 1, + $j != $#$l && !$w->{mcc} ? + ('fill', 'fill', $w->{xpadding}, $w->{ypadding}) : + (['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? + ['expand', 'fill'] : [], 0, 0)); + $_->show; + } + } @$l; + } @{delete $opts->{children} || []}; + + $w; +} + +sub _gtk_any_simple { + my ($w, $_opts, $class) = @_; + + $w ||= "Gtk2::$class"->new; +} + +sub _gtknew_handle_children { + my ($w, $opts) = @_; + + my @child = exists $opts->{children_tight} ? map { [ 0, $_ ] } @{delete $opts->{children_tight}} : + exists $opts->{children_loose} ? map { [ 1, $_ ] } @{delete $opts->{children_loose}} : + exists $opts->{children} ? group_by2(@{delete $opts->{children}}) : + exists $opts->{children_centered} ? + ([ 1, gtknew('VBox') ], (map { [ 0, $_ ] } @{delete $opts->{children_centered}}), [ 1, gtknew('VBox') ]) : + (); + + my $padding = delete $opts->{padding}; + + foreach (@child) { + my ($fill, $child) = @$_; + $fill eq '0' || $fill eq '1' || $fill eq 'fill' || $fill eq 'expand' or internal_error("odd {children} parameter must be 0 or 1 (got $fill)"); + ref $child or $child = Gtk2::WrappedLabel->new($child); + my $expand = $fill && $fill ne 'fill' ? 1 : 0; + $w->pack_start($child, $expand, $fill, $padding || 0); + $child->show; + } +} + +#- this magic function redirects method calls: +#- * default is to redirect them to the {child} +#- * if the {child} doesn't handle the method, we try with the {real_window} +#- (eg : add_accel_group set_position set_default_size +#- * a few methods are handled specially +my %for_real_window = map { $_ => 1 } qw(show_all size_request); +sub mygtk2::MagicWindow::AUTOLOAD { + my ($w, @args) = @_; + + my ($meth) = $mygtk2::MagicWindow::AUTOLOAD =~ /mygtk2::MagicWindow::(.*)/; + + my ($s1, @s2) = $meth eq 'show' + ? ('real_window', 'banner', 'child') : + $meth eq 'destroy' || $meth eq 'hide' ? + ($w->{pop_it} ? 'real_window' : ('child', 'banner')) : + $meth eq 'get' && $args[0] eq 'window-position' || + $for_real_window{$meth} || + !$w->{child}->can($meth) + ? 'real_window' + : 'child'; + +#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n"; + + $w->{$_} && $w->{$_}->$meth(@args) foreach @s2; + $w->{$s1}->$meth(@args); +} + +my $enable_quit_popup; +sub enable_quit_popup { + my ($bool) = @_; + $enable_quit_popup = $bool; +} + +state $in_callback; +sub quit_popup() { + return if !$enable_quit_popup; + if (!$in_callback) { + $in_callback = 1; + my $_guard = before_leaving { undef $in_callback }; + require ugtk2; + my $w = ugtk2->new(N("Confirmation"), grab => 1); + ugtk2::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel")); + my $ret = ugtk2::main($w); + return 1 if !$ret; + } +} + +sub quit_callback { + my ($w) = @_; + + return 1 if quit_popup(); + if ($::isWizard) { + $w->destroy; + die 'wizcancel'; + } else { + if (Gtk2->main_level) { + Gtk2->main_quit; + } else { + # block window deletion if not in main loop (eg: while starting the GUI) + return 1; + } + } +} + +sub _create_Window { + my ($opts, $special_center) = @_; + + my $no_Window_Manager = exists $opts->{no_Window_Manager} ? delete $opts->{no_Window_Manager} : !$::isStandalone; + + add2hash($opts, { + if_(!$::isInstall && !$::isWizard, border_width => 5), + + #- policy: during install, we need a special code to handle the weird centering, see below + position_policy => $special_center ? 'none' : + $no_Window_Manager ? 'center-always' : 'center-on-parent', + + if_($::isInstall, position => [ + $::stepswidth + ($::o->{windowwidth} - $::real_windowwidth) / 2, + ($::o->{windowheight} - $::real_windowheight) / 2, + ]), + }); + my $w = _gtk(undef, 'Window', 'gtknew', $opts); + + #- when the window is closed using the window manager "X" button (or alt-f4) + $w->signal_connect(delete_event => \&quit_callback); + + if ($::isInstall && !$::isStandalone) { + require install::gtk; #- for perl_checker + install::gtk::handle_unsafe_mouse($::o, $w); + $w->signal_connect(key_press_event => \&install::gtk::special_shortcuts); + + #- force center at a weird position, this can't be handled by position_policy + #- because center-* really are window manager hints for centering, whereas we want + #- to center the main window in the right part of the screen + my ($wi, $he); + $w->signal_connect(size_allocate => sub { + my (undef, $event) = @_; + my @w_size = $event->values; + + # ignore bogus sizing events: + return if $w_size[2] < 5; + return if $w_size[2] == $wi && $w_size[3] == $he; #BUG + (undef, undef, $wi, $he) = @w_size; + + $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), + max(0, ($::o->{windowheight} - $he) / 2)); + }) if $special_center; + } + + $w->present if $no_Window_Manager; + + $w; +} + +sub _find_imgfile { + my ($name) = @_; + + if ($name =~ m|/| && -f $name) { + $name; + } else { + foreach my $path (_icon_paths()) { + foreach ('', '.png', '.xpm', '.jpg') { + my $file = "$path/$name$_"; + -f $file and return $file; + } + } + } +} + +# _text_insert() can be used with any of choose one of theses styles: +# - no tags: +# _text_insert($textview, "My text.."); +# - anonymous tags: +# _text_insert($textview, [ [ 'first text', { 'foreground' => 'blue', 'background' => 'green', ... } ], +# [ 'second text' ], +# [ 'third', { 'font' => 'Serif 15', ... } ], +# ... ]); +# - named tags: +# $textview->{tags} = { +# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, +# 'big_font' => { 'font' => 'Serif 35', ... }, +# } +# _text_insert($textview, [ [ 'first text', 'blue_green' ], +# [ 'second', 'big_font' ], +# ... ]); +# - mixed anonymous and named tags: +# $textview->{tags} = { +# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, +# 'big_font' => { 'font' => 'Serif 35', ... }, +# } +# _text_insert($textview, [ [ 'first text', 'blue_green' ], +# [ 'second text' ], +# [ 'third', 'big_font' ], +# [ 'fourth', { 'font' => 'Serif 15', ... } ], +# ... ]); +sub _text_insert { + my ($textview, $t, %opts) = @_; + my $buffer = $textview->get_buffer; + $buffer->{tags} ||= {}; + $buffer->{gtk_tags} ||= {}; + my $gtk_tags = $buffer->{gtk_tags}; + my $tags = $buffer->{tags}; + if (ref($t) eq 'ARRAY') { + if (!$opts{append}) { + $buffer->set_text(''); + $textview->{anchors} = []; + } + foreach my $token (@$t) { + my ($item, $tag) = @$token; + my $iter1 = $buffer->get_end_iter; + if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) { + $buffer->insert_pixbuf($iter1, $item); + next; + } + if (ref($item) =~ /^Gtk2::/) { + my $anchor = $buffer->create_child_anchor($iter1); + $textview->add_child_at_anchor($item, $anchor); + $textview->{anchors} ||= []; + push @{$textview->{anchors}}, $anchor; + next; + } + if ($tag) { + if (ref($tag)) { + # use anonymous tags + $buffer->insert_with_tags($iter1, $item, $buffer->create_tag(undef, %$tag)); + } else { + # fast text insertion: + # since in some contexts (eg: localedrake, rpmdrake), we use quite a lot of identical tags, + # it's much more efficient and less memory pressure to use named tags + $gtk_tags->{$tag} ||= $buffer->create_tag($tag, %{$tags->{$token->[1]}}); + $buffer->insert_with_tags($iter1, $item, $gtk_tags->{$tag}); + } + } else { + $buffer->insert($iter1, $item); + } + } + } else { + if ($opts{append}) { + $buffer->insert($buffer->get_end_iter, $t); + } else { + $textview->{anchors} = []; + $buffer->set_text($t); + } + } + $textview->{to_bottom}->() if $textview->{to_bottom}; + + #- the following line is needed to move the cursor to the beginning, so that if the + #- textview has a scrollbar, it will not scroll to the bottom when focusing (#3633) + $buffer->place_cursor($buffer->get_start_iter); + $textview->set_wrap_mode($opts{wrap_mode} || 'word'); + $textview->set_editable($opts{editable} || 0); + $textview->set_cursor_visible($opts{visible} || 0); + $textview; +} + +sub _allow_scroll_TextView_to_bottom { + my ($scrolledWindow, $textView) = @_; + + $textView->get_buffer->create_mark('end', $textView->get_buffer->get_end_iter, 0); + sub { + my ($o_force) = @_; + my $adjustment = $scrolledWindow->get_vadjustment; + if ($o_force || $adjustment->page_size + $adjustment->value == $adjustment->upper) { + flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end + $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); + } + }; +} + +sub asteriskize { + my ($label) = @_; + "\x{2022} " . $label; +} + +sub get_main_window_size() { + $::real_windowwidth ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400); +} + +# in order to workaround infamous 6 years old gnome bug #101968: +sub get_label_width() { + first(mygtk2::get_main_window_size()) - 55 - $left_padding; +} + +sub set_main_window_size { + my ($window) = @_; + my ($width, $height) = get_main_window_size(); + $window->set_size_request($width, $height); +} + +my @icon_paths; +sub add_icon_path { push @icon_paths, @_ } +sub _icon_paths() { + (@icon_paths, (exists $ENV{SHARE_PATH} ? ($ENV{SHARE_PATH}, "$ENV{SHARE_PATH}/icons", "$ENV{SHARE_PATH}/libDrakX/pixmaps") : ()), + "/usr/lib/libDrakX/icons", "pixmaps", 'data/icons', 'data/pixmaps', 'standalone/icons', '/usr/share/rpmdrake/icons'); +} + +sub main { + my ($window, $o_verif) = @_; + my $destroyed; + $window->signal_connect(destroy => sub { $destroyed = 1 }); + $window->show; + do { Gtk2->main } while (!$destroyed && $o_verif && !$o_verif->()); + may_destroy($window); + flush(); +} + +sub sync { + my ($window) = @_; + $window->show; + flush(); +} + +sub flush() { + Gtk2->main_iteration while Gtk2->events_pending; +} + +sub enable_sync_flush { + my ($w) = @_; + $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); +} + +sub sync_flush { + my ($w) = @_; + # hackish :-( + mygtk2::sync($w) while !$w->{displayed}; +} + + +sub register_main_window { + my ($w) = @_; + push @::main_windows, $::main_window = $w; +} + +sub may_destroy { + my ($w) = @_; + return if !$w; + @::main_windows = difference2(\@::main_windows, [ $w->{real_window} ]); + if ($::main_window eq $w->{real_window}) { + undef $::main_window; + $::main_window = $::main_windows[-1]; + } + $w->destroy; +} + +sub root_window() { + state $root; + $root ||= Gtk2::Gdk->get_default_root_window; +} + +sub rgb2color { + my ($r, $g, $b) = @_; + my $color = Gtk2::Gdk::Color->new($r, $g, $b); + root_window()->get_colormap->rgb_find_color($color); + $color; +} + +sub set_root_window_background { + my ($r, $g, $b) = @_; + my $root = root_window(); + my $gc = Gtk2::Gdk::GC->new($root); + my $color = rgb2color($r, $g, $b); + $gc->set_rgb_fg_color($color); + set_root_window_background_with_gc($gc); +} + +sub set_root_window_background_with_gc { + my ($gc) = @_; + my $root = root_window(); + my ($w, $h) = $root->get_size; + $root->set_background($gc->get_values->{foreground}); + $root->draw_rectangle($gc, 1, 0, 0, $w, $h); +} + +sub _new_alpha_pixbuf { + my ($pixbuf) = @_; + my ($height, $width) = ($pixbuf->get_height, $pixbuf->get_width); + my $new_pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height); + $new_pixbuf->fill(0x00000000); # transparent white + $width, $height, $new_pixbuf; +} + +sub _pixbuf_render_alpha { + my ($pixbuf, $alpha_threshold) = @_; + my ($width, $height, $new_pixbuf) = _new_alpha_pixbuf($pixbuf); + $pixbuf->composite($new_pixbuf, 0, 0, $width, $height, 0, 0, 1, 1, 'bilinear', $alpha_threshold); + $new_pixbuf; +} + +sub pixmap_from_pixbuf { + my ($widget, $pixbuf) = @_; + my $window = $widget->window or internal_error("you can't use this function if the widget is not realised"); + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $pixmap; +} + +sub import_style_ressources() { + if (!$::isInstall) { + Gtk2::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG + } +} + +sub text_direction_rtl() { + Gtk2::Widget->get_default_direction eq 'rtl'; +} + +sub _get_weakness_icon { + my ($password_weakness) = @_; + my %weakness_icon = ( + 1 => gtknew('Pixbuf', file => 'security-low'), + 2 => gtknew('Pixbuf', file => 'security-low'), + 3 => gtknew('Pixbuf', file => 'security-medium'), + 4 => gtknew('Pixbuf', file => 'security-strong'), + 5 => gtknew('Pixbuf', file => 'security-strong')); + my $weakness_icon = $weakness_icon{$password_weakness} || return undef; + $weakness_icon; +} + +sub _get_weakness_tooltip { + my ($password_weakness) = @_; + my %weakness_tooltip = ( + 1 => N("Password is trivial to guess"), + 2 => N("Password is trivial to guess"), + 3 => N("Password should be resistant to basic attacks"), + 4 => N("Password seems secure"), + 5 => N("Password seems secure")); + my $weakness_tooltip = $weakness_tooltip{$password_weakness} || return undef; + return $weakness_tooltip; +} + +package Gtk2::MDV_Notebook; # helper functions for installer & mcc +our @ISA = qw(Gtk2::Widget); + +sub hide_selection { + my ($w) = @_; + $_->hide foreach $w->{selection_bar}, $w->{selection_arrow}; +} + +sub move_selection { + my ($w, $label) = @_; + my $layout = $w->{layout}; + $layout->{arrow_ydiff} ||= + ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; + my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; + $layout->move($w->{selection_bar}, 0, $bar_y); + $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer + $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; +} + +1; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm deleted file mode 100644 index 3db9ff814..000000000 --- a/perl-install/ugtk2.pm +++ /dev/null @@ -1,1652 +0,0 @@ -package ugtk2; - -use diagnostics; -use strict; -use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- leave it on one line, for automatic removal of the line at package creation -use locale; - -@ISA = qw(Exporter); -%EXPORT_TAGS = ( - wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy - gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ - gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot - gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap - gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name - gtkset_property gtkset_relief gtkset_selectable gtkset_sensitive gtkset_shadow_type gtkset_size_request - gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append - gtktext_insert ) ], - - helpers => [ qw(add2notebook add_icon_path escape_text_for_TextView_markup_format gtkcolor gtkcreate_img - gtkcreate_pixbuf gtkfontinfo gtkset_background gtktreeview_children set_back_pixmap - get_default_step_items set_default_step_items - string_size string_width) ], - - create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu - create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable - create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ], - - ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn - ask_yesorno) ], - dialogs => [ qw(err_dialog info_dialog warn_dialog) ], - -); -$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; -@EXPORT_OK = map { @$_ } values %EXPORT_TAGS; - -use c; -use log; -use common; -use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version - -use Gtk2; - - -$border = 5; - -sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } - -# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- -# wrappers -# -# Functional-style wrappers to existing Gtk functions; allows to program in -# a more functional way, and especially, first, to avoid using temp -# variables, and second, to "see" directly in the code the user interface -# you're building. - -sub gtkdestroy { mygtk2::may_destroy($_[0]) } -sub gtkflush() { mygtk2::flush() } -sub gtkhide { $_[0]->hide; $_[0] } -sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } -sub gtkpack { gtkpowerpack(1, 1, @_) } -sub gtkpack_ { gtkpowerpack('arg', 1, @_) } -sub gtkpack__ { gtkpowerpack(0, 1, @_) } -sub gtkpack2 { gtkpowerpack(1, 0, @_) } -sub gtkpack2_ { gtkpowerpack('arg', 0, @_) } -sub gtkpack2__ { gtkpowerpack(0, 0, @_) } -sub gtkput { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] } -sub gtkresize { $_[0]->window->resize($_[1], $_[2]); $_[0] } -sub gtkset_active { $_[0]->set_active($_[1]); $_[0] } -sub gtkset_border_width { $_[0]->set_border_width($_[1]); $_[0] } -sub gtkset_editable { $_[0]->set_editable($_[1]); $_[0] } -sub gtkset_selectable { $_[0]->set_selectable($_[1]); $_[0] } -sub gtkset_justify { $_[0]->set_justify($_[1]); $_[0] } -sub gtkset_alignment { $_[0]->set_alignment($_[1], $_[2]); $_[0] } -sub gtkset_layout { $_[0]->set_layout($_[1]); $_[0] } -sub gtkset_modal { $_[0]->set_modal($_[1]); $_[0] } -sub gtkset_mousecursor_normal { gtkset_mousecursor('left-ptr', @_) } -sub gtkset_mousecursor_wait { gtkset_mousecursor('watch', @_) } -sub gtkset_relief { $_[0]->set_relief($_[1]); $_[0] } -sub gtkset_sensitive { $_[0]->set_sensitive($_[1]); $_[0] } -sub gtkset_visibility { $_[0]->set_visibility($_[1]); $_[0] } -sub gtkset_tip { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] } -sub gtkset_shadow_type { $_[0]->set_shadow_type($_[1]); $_[0] } -sub gtkset_style { $_[0]->set_style($_[1]); $_[0] } -sub gtkset_size_request { $_[0]->set_size_request($_[1], $_[2]); $_[0] } -sub gtkshow { $_[0]->show; $_[0] } -sub gtksize { $_[0]->size($_[1], $_[2]); $_[0] } -sub gtkset_markup { $_[0]->set_markup($_[1]); $_[0] } -sub gtkset_line_wrap { $_[0]->set_line_wrap($_[1]); $_[0] } - -sub gtkadd { - my $w = shift; - foreach my $l (@_) { - ref $l or $l = gtknew('WrappedLabel', text => $l); - $w->add(gtkshow($l)); - } - $w; -} - -sub gtkadd_widget { - my $sg = shift; - map { - my $l = $_; - ref $l or $l = gtknew('WrappedLabel', text => $l); - $sg->add_widget($l); - $l; - } @_; -} - -sub gtkappend { - my $w = shift; - foreach my $l (@_) { - ref $l or $l = gtknew('WrappedLabel', text => $l); - $w->append(gtkshow($l)); - } - $w; -} - -sub gtkappenditems { - my $w = shift; - $_->show foreach @_; - $w->append_items(@_); - $w; -} - -# append page to a notebook -sub gtkappend_page { - my ($notebook, $page, $o_title) = @_; - $notebook->append_page($page, $o_title); - $notebook; -} - -sub gtkentry { - my ($o_text) = @_; - my $e = gtknew('Entry'); - $o_text and $e->set_text($o_text); - $e; -} - -sub gtksetstyle { - my ($w, $s) = @_; - $w->set_style($s); - $w; -} - -sub gtkradio { - my $def = shift; - my $radio; - map { - my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); - $w->get_child->set_line_wrap(1); - $w; - } @_; -} - -sub gtkroot() { mygtk2::root_window() } -sub gtkcolor { &mygtk2::rgb2color } -sub gtkset_background { &mygtk2::set_root_window_background } - -sub gtkset_text { - my ($w, $s) = @_; - $w->set_text($s); - $w; -} - -sub gtkcombo_setpopdown_strings { - my $w = shift; - $w->set_popdown_strings(@_); - $w; -} - -sub gtkset_mousecursor { - my ($type, $w) = @_; - ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type)); - $w; -} - -sub gtksignal_connect { - my $w = shift; - $w->signal_connect(@_); - $w; -} - -sub gtkset_name { - my ($widget, $name) = @_; - $widget->set_name($name); - $widget; -} - - -sub gtkpowerpack { - #- Get Default Attributes (if any). 2 syntaxes allowed : - #- gtkpowerpack( {expand => 1, fill => 0}, $box...) : the attributes are picked from a specified hash ref - #- gtkpowerpack(1, 0, 1, $box, ...) : the attributes are picked from the non-ref list, in the order (expand, fill, padding, pack_end). - my @attributes_list = qw(expand fill padding pack_end); - my $default_attrs = {}; - if (ref($_[0]) eq 'HASH') { - $default_attrs = shift; - } elsif (!ref($_[0])) { - foreach (@attributes_list) { - ref($_[0]) and last; - $default_attrs->{$_} = shift; - } - } - my $box = shift; - - while (@_) { - #- Get attributes (if specified). 4 syntaxes allowed (default values are undef ie. false...) : - #- gtkpowerpack({defaultattrs}, $box, $widget1, $widget2, ...) : the attrs are picked from the default ones (if they exist) - #- gtkpowerpack($box, {fill=>1, expand=>0, ...}, $widget1, ...) : the attributes are picked from a specified hash ref - #- gtkpowerpack($box, [1,0,1], $widget1, ...) : the attributes are picked from the array ref : (expand, fill, padding, pack_end). - #- gtkpowerpack({attr=>'arg'}, $box, 1, $widget1, 0, $widget2, etc...) : the 'arg' value will tell gtkpowerpack to always read the - #- attr value directly in the arg list (avoiding confusion between value 0 and Gtk::Label("0"). That can simplify some writings but - #- this arg(s) MUST then be present... - my (%attr, $attrs); - ref($_[0]) eq 'HASH' || ref($_[0]) eq 'ARRAY' and $attrs = shift; - foreach (@attributes_list) { - if (($default_attrs->{$_} || '') eq 'arg') { - ref($_[0]) and internal_error "error in packing definition\n"; - $attr{$_} = shift; - ref($attrs) eq 'ARRAY' and shift @$attrs; - } elsif (ref($attrs) eq 'HASH' && defined($attrs->{$_})) { - $attr{$_} = $attrs->{$_}; - } elsif (ref($attrs) eq 'ARRAY') { - $attr{$_} = shift @$attrs; - } elsif (defined($default_attrs->{$_})) { - $attr{$_} = int $default_attrs->{$_}; - } else { - $attr{$_} = 0; - } - } - #- Get and pack the widget (create it if necessary to a label...) - my $widget = ref($_[0]) ? shift : gtknew('WrappedLabel', text => shift); - my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start'); - $box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding}); - $widget->show; - } - return $box; -} - -sub gtktreeview_children { - my ($model, $iter) = @_; - my @l; - $model or return; - for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { - push @l, $p; - } - @l; -} - - - -# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- -# create -# -# Helpers that allow omitting common operations on common widgets -# (e.g. create widgets with good default properties) - -sub create_pixbutton { - my ($label, $pix, $reverse_order) = @_; - my @label_and_pix = (0, $label, if_($pix, 0, $pix)); - gtkadd(gtknew('Button'), - gtknew('HBox', spacing => 3, children => [ - 1, "", - $reverse_order ? reverse(@label_and_pix) : @label_and_pix, - 1, "", - ])); -} - -sub create_adjustment { - my ($val, $min, $max) = @_; - Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1); -} - -sub create_scrolled_window { - my ($W, $o_policy, $o_viewport_shadow) = @_; - gtknew('ScrolledWindow', ($o_policy ? (h_policy => $o_policy->[0], v_policy => $o_policy->[1]) : ()), - child => $W, if_($o_viewport_shadow, shadow_type => $o_viewport_shadow)); -} - -sub n_line_size { - my ($nbline, $type, $widget) = @_; - my $spacing = ${{ text => 3, various => 17 }}{$type}; - my %fontinfo = gtkfontinfo($widget); - round($nbline * ($fontinfo{ascent} + $fontinfo{descent} + $spacing) + 8); -} - -# Glib::Markup::escape_text() if no use for us because it'll do extra -# s/X/&foobar;/ (such as s/'/'/) that are suitable for -# Gtk2::Labels but are not for Gtk2::TextViews, resulting in -# displaying the raw enriched text instead... -# -sub escape_text_for_TextView_markup_format { - my ($str) = @_; - my %rules = ('&' => '&', - '<' => '<', - '>' => '>', - ); - eval { $str =~ s!([&<>])!$rules{$1}!g }; #^(&(amp|lt|gt);)!!) { - if (my $err = $@) { - internal_error("$err\n$str"); - } - $str; -} - -sub markup_to_TextView_format { - my ($s, $o_default_attrs) = @_; - require interactive; - my $l = interactive::markup_parse($s) or return $s; - - foreach (@$l) { - my ($_txt, $attrs) = @$_; - if ($attrs) { - $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; - $attrs->{size} eq 'larger' and do { - $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' - delete $attrs->{size}; - }; - } - #- nb: $attrs may be empty, need special handling if $o_default_attrs is used - add2hash_($_->[1] ||= {}, $o_default_attrs) if $o_default_attrs; - } - $l; -} - -sub create_box_with_title { - my ($o, @l) = @_; - - my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @l); - my $box = gtknew('VBox'); - if ($nbline == 0) { - $o->{box_size} = 0; - return $box; - } - $o->{box_size} = n_line_size($nbline, 'text', $box); - if (@l <= 2 && $nbline > 4) { - $o->{icon} && !$::isWizard and - eval { gtkpack__($box, gtknew('HBox', border_width => 5, children_loose => [ gtkcreate_img($o->{icon}) ])) }; - my $wanted = $o->{box_size}; - $o->{box_size} = min(200, $o->{box_size}); - my $has_scroll = $o->{box_size} < $wanted; - - chomp(my $text = join("\n", @l)); - my $wtext = gtknew('TextView', text => markup_to_TextView_format($text)); - $wtext->set_justification('fill'); - $wtext->set_left_margin(12); - $wtext->set_right_margin(12); - $wtext->can_focus($has_scroll); - my $width = 400; - my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); - $scroll->signal_connect(realize => sub { - my $layout = $wtext->create_pango_layout($text); - $layout->set_width(($width - 10) * Gtk2::Pango->scale); - $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); - $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); - $o->{rwindow}->queue_resize; - }); - gtkpack_($box, $o->{box_allow_grow} || 0, $scroll); - } else { - my $new_label = sub { - my ($txt) = @_; - ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, - # workaround infamous 6 years old gnome bug #101968: - width => mygtk2::get_label_width()); - }; - gtkpack__($box, - if_($::isWizard, gtknew('Label', height => 10)), - (map { - my $w = $new_label->($_); - $::isWizard ? gtknew('HBox', children_tight => [ gtknew('Label', width => 20), $w ]) - : $w; - } @l), - if_($::isWizard, gtknew('Label', height => 15)), - ); - } -} - -sub _create_dialog { - my ($title, $o_options) = @_; - my $options = $o_options || {}; - - #- keep compatibility with "transient" now called "transient_for" - $options->{transient_for} = delete $options->{transient} if $options->{transient}; - - gtknew('Dialog', title => $title, - position_policy => 'center-on-parent', # center-on-parent does not work - modal => 1, - if_(!$::isInstall, icon_no_error => wm_icon()), - %$options, allow_unknown_options => 1, - ); -} - - -# drakfloppy / drakfont / harddrake2 / mcc -sub create_dialog { - my ($title, $label, $o_options) = @_; - my $ret = 0; - $o_options ||= {}; - $o_options->{transient_for} = $::main_window if !$o_options->{transient_for} && $::main_window; - - my $dialog = gtkset_border_width(_create_dialog($title, $o_options), 10); - $dialog->set_border_width(10); - my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label); - gtkpack($dialog->vbox, - gtknew('HBox', children => [ - if_($o_options->{stock}, - 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'), - 0, gtknew('Label', text => " "), - ), - 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, - ]), - ); - - if ($o_options->{cancel}) { - $dialog->action_area->pack_start( - gtknew('Button', text => N("Cancel"), - clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }, - can_default => 1), - 1, 1, 0); - } - - my $button = gtknew('Button', text => N("Ok"), can_default => 1, - clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); - $dialog->action_area->pack_start($button, 1, 1, 0); - $button->grab_default; - - $dialog->set_has_separator(0); - $dialog->show_all; - Gtk2->main; - $ret; -} - -sub info_dialog { - my ($title, $label, $o_options) = @_; - $o_options ||= { }; - add2hash_($o_options, { stock => 'gtk-dialog-info' }); - create_dialog($title, $label, $o_options); -} - -sub warn_dialog { - my ($title, $label, $o_options) = @_; - $o_options ||= { }; - add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 }); - create_dialog($title, $label, $o_options); -} - -sub err_dialog { - my ($title, $label, $o_options) = @_; - $o_options ||= { }; - add2hash_($o_options, { stock => 'gtk-dialog-error' }); - create_dialog($title, $label, $o_options); -} - -sub create_hbox { gtknew('HButtonBox', layout => $_[0]) } -sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } - -sub create_factory_menu_ { - my ($type, $name, $window, @menu_items) = @_; - my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new); - $widget->create_items($window, @menu_items); - $window->add_accel_group($accel_group); - ($widget->get_widget($name), $widget); -} - -sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '
', @_) } -sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '
', @_) } - -sub create_menu { - my $title = shift; - my $w = Gtk2::MenuItem->new($title); - $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_))); - $w; -} - -sub create_notebook { - my $book = gtknew('Notebook'); - while (@_) { - my ($page, $title) = splice(@_, 0, 2); - gtkappend_page($book, $page, $title); - } - $book; -} - -sub create_packtable { - my ($options, @l) = @_; - my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0); - add2hash_($options, { xpadding => 5, ypadding => 0 }); - each_index { - my ($i, $l) = ($::i, $_); - each_index { - my $j = $::i; - if ($_) { - ref $_ or $_ = gtknew('WrappedLabel', text => $_); - $j != $#$l && !$options->{mcc} ? - $w->attach($_, $j, $j + 1, $i, $i + 1, - 'fill', 'fill', $options->{xpadding}, $options->{ypadding}) : - $w->attach($_, $j, $j + 1, $i, $i + 1, - ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); - $_->show; - } - } @$l; - } @l; - $w->set_col_spacings($options->{col_spacings} || 0); - $w->set_row_spacings($options->{row_spacings} || 0); - gtkset_border_width($w, $::isInstall ? 3 : 10); -} - -my $wm_is_kde; -sub create_okcancel { - my ($w, $o_ok, $o_cancel, $_o_spread, @other) = @_; - # @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button) - # extra buttons have the following structure [ label, handler, is_first, pack_right ] - local $::isWizard = $::isWizard && !$w->{pop_it}; - my $cancel; - if (defined $o_cancel || defined $o_ok) { - $cancel = $o_cancel; - } elsif (!$::Wizard_no_previous) { - $cancel = $::isWizard ? N("Previous") : N("Cancel"); - } - my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); - my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit })); - my $bprev; - if ($cancel) { - $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || - sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); - } - $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel; - if (!defined $wm_is_kde) { - require any; - my $wm = any::running_window_manager(); - $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0; - } - my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ? - $_[0][0] : - gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; - my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other), - map { $f->($_) } grep { !$_->[2] && !$_->[3] } @other); - my @right = ((map { $f->($_) } grep { $_->[2] && $_->[3] } @other), - map { $f->($_) } grep { !$_->[2] && $_->[3] } @other); - # we put space to group buttons in two packs (but if there's only one when not in wizard mode) - # but in the installer where all windows run in wizard mode because of design even when not in a wizard step - $bprev = gtknew('Label') if !$cancel && $::Wizard_no_previous && !@left && !@right; - if ($::isWizard || $w->{pop_it}) { - # wizard mode: order is cancel/left_extras/white/right_extras/prev/next - unshift @left, $w->{wizcancel} if $w->{wizcancel}; - push @right, $bprev, $bok; - } else { - # normal mode: cancel/ok button follow GNOME's HIG - unshift @left, ($wm_is_kde ? $bok : $bprev); - push @left, gtknew('Label') if $ok && $cancel; # space buttons but if there's only one button - push @right, ($wm_is_kde ? $bprev : $bok); - } - - gtknew('VBox', spacing => 5, children_loose => [ - gtknew('HBox', height => 5), - gtknew('HSeparator'), - gtknew('HBox', children_loose => [ - map { - gtknew('HButtonBox', spacing => 5, layout => $_->[1], - children_loose => [ - map { - $_->can_default($::isWizard); - $_; - } grep { $_ } @{$_->[0]} - ]); - } ([ \@left, 'start' ], - [ \@right, 'end' ], - ) - ]), - ]); -} - -sub _setup_paned { - my ($paned, $child1, $child2, %options) = @_; - foreach ([ 'resize1', 0 ], [ 'shrink1', 1 ], [ 'resize2', 1 ], [ 'shrink2', 1 ]) { - $options{$_->[0]} = $_->[1] unless defined($options{$_->[0]}); - } - $paned->pack1(gtkshow($child1), $options{resize1}, $options{shrink1}); - $paned->pack2(gtkshow($child2), $options{resize2}, $options{shrink2}); - gtkshow($paned); -} - -sub create_vpaned { - _setup_paned(Gtk2::VPaned->new, @_); -} - -sub create_hpaned { - _setup_paned(Gtk2::HPaned->new, @_); -} - -sub gtkcreate_frame { - my ($label) = @_; - gtknew('Frame', text => $label, border_width => 5); -} - - -# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- -# helpers -# -# Functions that do typical operations on widgets, that you may need in -# several places of your programs. - -sub _find_imgfile { - my ($name) = @_; - - if ($name =~ m|/| && -f $name) { - $name; - } else { - foreach my $path (icon_paths()) { - foreach ('', '.png', '.xpm') { - my $file = "$path/$name$_"; - -f $file and return $file; - } - } - } -} - -# use it if you want to display an icon/image in your app -sub gtkcreate_img { - my ($file, $o_size) = @_; - gtknew('Image', file => $file, if_($o_size, size => $o_size)); -} - -# use it if you want to draw an image onto a drawingarea -sub gtkcreate_pixbuf { - my ($file, $o_size) = @_; - gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); -} - -sub gtktext_append { gtktext_insert(@_, append => 1) } - -sub may_set_icon { - my ($w, $name) = @_; - if (my $f = $name && _find_imgfile($name)) { - $w->set_icon(gtkcreate_pixbuf($f)); - } -} - -sub gtktext_insert { &mygtk2::_text_insert } -sub icon_paths { &mygtk2::_icon_paths } -sub add_icon_path { &mygtk2::add_icon_path } - -sub set_main_window_size { - my ($o) = @_; - mygtk2::set_main_window_size($o->{rwindow}); -} - -# extracts interesting font metrics for a given widget -sub gtkfontinfo { - my ($widget) = @_; - my $context = $widget->get_pango_context; - my $metrics = $context->get_metrics($context->get_font_description, $context->get_language); - my %fontinfo; - foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { - no strict; - my $func = "get_$_"; - $fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func); - } - %fontinfo; -} - -sub gtkmodify_font { - my ($w, $arg) = @_; - $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg)); - $w; -} - -sub gtkset_property { - my ($w, $property, $value) = @_; - $w->set_property($property, $value); - $w; -} - -sub set_back_pixbuf { - my ($widget, $pixbuf) = @_; - my $window = $widget->window; - my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); - $window->set_back_pixmap($pixmap, 0); -} - -sub set_back_pixmap { - my ($w) = @_; - return if !$w->realized; - my $window = $w->window; - my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); - - my $style = $w->get_style; - $pixmap->draw_points($style->bg_gc('normal'), 0, 0); - $pixmap->draw_points($style->base_gc('normal'), 0, 1); - $window->set_back_pixmap($pixmap); -} - -sub add2notebook { - my ($n, $title, $book) = @_; - $n->append_page($book, gtkshow(gtknew('Label', text => $title))); - $book->show; -} - -sub string_size { - my ($widget, $text) = @_; - my $layout = $widget->create_pango_layout($text); - my @size = $layout->get_pixel_size; - @size; -} - -sub string_width { - my ($widget, $text) = @_; - my ($width, undef) = string_size($widget, $text); - $width; -} - - -my ($def_step_title); -sub set_default_step_items { - $def_step_title = translate($_[0]); -} - -sub get_default_step_items { ($def_step_title) } - -# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- -# toplevel window creation helper -# -# Use the 'new' function as a method constructor and then 'main' on it to -# launch the main loop. Use $o->{retval} to indicate that the window needs -# to terminate. -# Set $::isWizard to have a wizard appearance. -# Set $::isEmbedded and $::XID so that the window will plug. - -sub new { - my ($type, $title, %opts) = @_; - - my $o = bless { %opts }, $type; - while (my $e = shift @tempory::objects) { $e->destroy } - - my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon}; - my $banner_title = $opts{banner_title}; - $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window}; - my $window = gtknew( - 'MagicWindow', - title => $title || '', - pop_it => $o->{pop_it}, - $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), - $::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (), - width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, - modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal}, - no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone, - if_(!$::isInstall, icon_no_error => wm_icon()), - if_($o->{transient}, transient_for => $o->{transient}), - ); - mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; - $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded; - - $o->{rwindow} = $o->{window} = $window; - $o->{real_window} = $window->{real_window}; - $o->{pop_it} = $window->{pop_it}; - - $o; -} - -sub main { - my ($o, $o_completed, $o_canceled) = @_; - gtkset_mousecursor_normal(); - - $o->show; - mygtk2::main($o->{rwindow}, - sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() }); - $o->{retval}; -} -sub show($) { - my ($o) = @_; - $o->{rwindow}->show; -} -sub destroy($) { - my ($o) = @_; - $o->{rwindow}->destroy; - flush(); -} -sub DESTROY { goto &destroy } -sub sync { - my ($o) = @_; - show($o); - flush(); -} -sub flush() { gtkflush() } -sub shrink_topwindow { - my ($o) = @_; - $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1)); -} -sub exit { - gtkset_mousecursor_normal(); #- for restoring a normal in any case - flush(); - if ($::isStandalone) { - require standalone; - standalone::__exit($_[1]); #- workaround - } else { - c::_exit($_[1]); #- workaround - } -} - -#- in case "exit" above was not called by the program -END { &exit() } - -# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- -# ask -# -# Full UI managed functions that will return to you the value that the -# user chose. - -sub ask_warn { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) } -sub ask_yesorno { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } -sub ask_okcancel { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } -sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) } -sub ask_dir { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) } - -sub _ask_from_entry($$@) { - my ($o, @msgs) = @_; - my $entry = gtknew('Entry'); - my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit }; - $o->{ok_clicked} = $f; - $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit }; - - gtkadd($o->{window}, - gtkpack($o->create_box_with_title(@msgs), - gtksignal_connect($entry, 'activate' => $f), - ($o->{hide_buttons} ? () : create_okcancel($o))), - ); - $entry->grab_focus; -} - -sub _ask_warn($@) { - my ($o, @msgs) = @_; - gtkadd($o->{window}, - gtkpack($o->create_box_with_title(@msgs), - my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }), - ), - ); - $w->grab_focus; -} - -sub _ask_okcancel($@) { - my ($o, @msgs) = @_; - my ($ok, $cancel) = splice @msgs, -2; - - gtkadd($o->{window}, - gtkpack(create_box_with_title($o, @msgs), - create_okcancel($o, $ok, $cancel), - ) - ); - $o->{ok}->grab_focus; -} - -sub create_file_selector { - my (%opts) = @_; - my $w = ugtk2->new(delete $opts{title}, modal => 1); - my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir}); - my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open'); - add2hash(\%opts, { width => 480, height => 250 }); - gtkadd($w->{window}, - gtkpack_(create_box_with_title($w, $message), - 1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts), - 0, create_okcancel($w), - )); - $w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked }); - $w; -} - -sub file_selected_check { - my ($save, $want_a_dir, $file) = @_; - - if (!$file) { - N("No file chosen"); - } elsif (-f $file && $want_a_dir) { - N("You have chosen a file, not a directory"); - } elsif (-d $file && !$want_a_dir) { - N("You have chosen a directory, not a file"); - } elsif (!-e $file && !$save) { - $want_a_dir ? N("No such directory") : N("No such file"); - } else { - ''; - } -} - -sub _ask_file { - my ($o, $title, $path) = @_; - - my $w = create_file_selector(title => $title, want_a_dir => 0, directory => $path); - put_in_hash($o, $w); - - $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); -} -sub _ask_dir { - my ($o, $title, $path) = @_; - - my $w = create_file_selector(title => $title, want_a_dir => 1, directory => $path); - put_in_hash($o, $w); - - $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); -} - -sub ask_browse_tree_info { - my ($common) = @_; - - my $w = ugtk2->new($common->{title}); - - my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); - my $tree = Gtk2::TreeView->new_with_model($tree_model); - $tree->get_selection->set_mode('browse'); - $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); - $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1)); - $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2)); - $tree->set_headers_visible(0); - $tree->set_rules_hint(1); - $textcolumn->set_min_width(200); - $textcolumn->set_max_width(200); - - gtkadd($w->{window}, - gtknew('VBox', spacing => 5, children => [ - 0, gtknew('Title2', label => $common->{message}, - # workaround infamous 6 years old gnome bug #101968: - width => mygtk2::get_label_width()), - 1, gtknew('VBox', children => [ - 1, gtknew('ScrolledWindow', child => $tree), - 0, gtknew('Frame', text => N("Info"), child => - gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)), - ) ]), - 0, Gtk2::HSeparator->new, - 0, my $status = gtknew('Label'), - if_($common->{auto_deps}, - 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) - ), - 0, Gtk2::HSeparator->new, - 0, my $box2 = gtknew('HBox', spacing => 10), - ])); - - gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"), - clicked => $common->{interactive_help})) if $common->{interactive_help}; - - #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); - gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new); - - my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ])); - @l = reverse @l if !$::isInstall; - my @buttons = map { - my ($t, $val) = @$_; - $box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub { - $w->{retval} = $val; - Gtk2->main_quit; - }), 0, 1, 20); - $w->show; - $w; - } @l; - @buttons = reverse @buttons if !$::isInstall; - - $status->show; - - $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall; - $buttons[0]->grab_focus; - $w->{rwindow}->show; - - my @toolbar; - foreach my $ic (@{$common->{icons} || []}) { - push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { - if ($ic->{code}) { - my $_w = $ic->{wait_message} && $common->{wait_message}->('', $ic->{wait_message}); - $ic->{code}(); - $common->{rebuild_tree}->(); - } - } ]); - } - my %toolbar = @toolbar; - foreach (grep_index { $::i % 2 == 0 } @toolbar) { - $toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]); - } - - $pixcolumn->{is_pix} = 1; - $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, - info => $info, status => $status }; - ask_browse_tree_info_given_widgets($common); -} - -sub ask_browse_tree_info_given_widgets { - my ($common) = @_; - my $w = $common->{widgets}; - - my ($curr, $prev_label, $idle, $mouse_toggle_pending); - my (%wtree, %ptree, %pix, %node_state, %state_stats); - my $update_size = sub { - if ($w->{status}) { - my $new_label = $common->{get_status}(); - $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label); - } - }; - - my $set_node_state_flat = sub { - my ($iter, $state) = @_; - $state eq 'XXX' and return; - $pix{$state} ||= gtkcreate_pixbuf($state); - $w->{tree_model}->set($iter, 1 => $pix{$state}); - }; - my $set_node_state_tree; $set_node_state_tree = sub { - my ($iter, $state) = @_; - my $iter_str = $w->{tree_model}->get_path_str($iter); - $state eq 'XXX' and return; - $pix{$state} ||= gtkcreate_pixbuf($state); - if ($node_state{$iter_str} ne $state) { - my $parent; - if (!$w->{tree_model}->iter_has_child($iter) && ($parent = $w->{tree_model}->iter_parent($iter))) { - my $parent_str = $w->{tree_model}->get_path_str($parent); - my $stats = $state_stats{$parent_str} ||= {}; $stats->{$node_state{$iter_str}}--; $stats->{$state}++; - my @list = grep { $stats->{$_} > 0 } keys %$stats; - my $new_state = @list == 1 ? $list[0] : 'semiselected'; - $node_state{$parent_str} ne $new_state and $set_node_state_tree->($parent, $new_state); - } - $w->{tree_model}->set($iter, 1 => $pix{$state}); - $node_state{$iter_str} = $state; #- cache for efficiency - } - }; - my $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; - - my $set_leaf_state = sub { - my ($leaf, $state) = @_; - $set_node_state->($_, $state) foreach @{$ptree{$leaf}}; - }; - my $add_parent; $add_parent = sub { - my ($root, $state) = @_; - $root or return undef; - if (my $w = $wtree{$root}) { return $w } - my $s; foreach (split '\|', $root) { - my $s2 = $s ? "$s|$_" : $_; - $wtree{$s2} ||= do { - my $iter = $w->{tree_model}->append_set($s ? $add_parent->($s, $state) : undef, [ 0 => $_ ]); - $iter; - }; - $s = $s2; - } - $set_node_state->($wtree{$s}, $state); #- use this state by default as tree is building. - $wtree{$s}; - }; - my $add_node = sub { - my ($leaf, $root, $options) = @_; - my $state = $common->{node_state}($leaf) or return; - if ($leaf) { - my $iter = $w->{tree_model}->append_set($add_parent->($root, $state), [ 0 => $leaf ]); - $set_node_state->($iter, $state); - push @{$ptree{$leaf}}, $iter; - } else { - my $parent = $add_parent->($root, $state); - #- hackery for partial displaying of trees, used in rpmdrake: - #- if leaf is void, we may create the parent and one child (to have the [+] in front of the parent in the ctree) - #- though we use '' as the label of the child; then rpmdrake will connect on tree_expand, and whenever - #- the first child has '' as the label, it will remove the child and add all the "right" children - $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ]); - } - }; - my $clear_all_caches = sub { - foreach (values %ptree) { - foreach my $n (@$_) { - delete $node_state{$w->{tree_model}->get_path_str($n)}; - } - } - foreach (values %wtree) { - my $iter_str = $w->{tree_model}->get_path_str($_); - delete $node_state{$iter_str}; - delete $state_stats{$iter_str}; - } - %ptree = %wtree = (); - }; - $common->{delete_all} = sub { - $clear_all_caches->(); - $w->{tree_model}->clear; - }; - $common->{rebuild_tree} = sub { - $common->{delete_all}->(); - $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; - $common->{build_tree}($add_node, $common->{state}{flat}, $common->{tree_mode}); - &$update_size; - }; - $common->{delete_category} = sub { - my ($cat) = @_; - exists $wtree{$cat} or return; - foreach (keys %ptree) { - my @to_remove; - foreach my $node (@{$ptree{$_}}) { - my $category; - my $parent = $node; - my @parents; - while ($parent = $w->{tree_model}->iter_parent($parent)) { #- LEAKS - my $parent_name = $w->{tree_model}->get($parent, 0); - $category = $category ? "$parent_name|$category" : $parent_name; - $_->[1] = "$parent_name|$_->[1]" foreach @parents; - push @parents, [ $parent, $category ]; - } - if ($category =~ /^\Q$cat/) { - push @to_remove, $node; - foreach (@parents) { - next if $_->[1] eq $cat || !exists $wtree{$_->[1]}; - delete $wtree{$_->[1]}; - delete $node_state{$w->{tree_model}->get_path_str($_->[0])}; - delete $state_stats{$w->{tree_model}->get_path_str($_->[0])}; - } - } - } - foreach (@to_remove) { - delete $node_state{$w->{tree_model}->get_path_str($_)}; - } - @{$ptree{$_}} = difference2($ptree{$_}, \@to_remove); - } - if (exists $wtree{$cat}) { - my $iter_str = $w->{tree_model}->get_path_str($wtree{$cat}); - delete $node_state{$iter_str}; - delete $state_stats{$iter_str}; - $w->{tree_model}->remove($wtree{$cat}); - delete $wtree{$cat}; - } - &$update_size; - }; - $common->{add_nodes} = sub { - my (@nodes) = @_; - $add_node->($_->[0], $_->[1], $_->[2]) foreach @nodes; - &$update_size; - }; - - $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 }; - my $children = sub { map { $w->{tree_model}->get($_, 0) } gtktreeview_children($w->{tree_model}, $_[0]) }; - my $toggle = sub { - if (ref($curr) && !$_[0]) { - $w->{tree}->toggle_expansion($w->{tree_model}->get_path($curr)); - } else { - if (ref $curr) { - my @l = $common->{grep_allowed_to_toggle}($children->($curr)) or return; - my @unsel = $common->{grep_unselected}(@l); - my @p = @unsel ? - #- not all is selected, select all if no option to potentially override - (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) - : @l; - $common->{toggle_nodes}($set_leaf_state, @p); - &$update_size; - } else { - $common->{check_interactive_to_toggle}($curr) and $common->{toggle_nodes}($set_leaf_state, $curr); - &$update_size; - } - } - }; - - $w->{tree}->signal_connect(key_press_event => sub { - my $c = chr($_[1]->keyval & 0xff); - if ($_[1]->keyval >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') { - $toggle->(0); - } - 0; - }); - - $w->{tree}->get_selection->signal_connect(changed => sub { - my ($model, $iter) = $_[0]->get_selected; - $model && $iter or return; - Glib::Source->remove($idle) if $idle; - - if (!$model->iter_has_child($iter)) { - $curr = $model->get($iter, 0); - $idle = Glib::Timeout->add(100, $common->{display_info}); - } else { - $curr = $iter; - } - #- the following test for equality is because we can have a button_press_event first, then - #- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that - #- happens in rpmdrake when doing a "search" and directly trying to select a found package - if ($mouse_toggle_pending eq $model->get($iter, 0)) { - $toggle->(1); - $mouse_toggle_pending = 0; - } - 0; - }); - $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( - my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); - if ($path && $column) { - $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); - } - 0; - }); - $common->{rebuild_tree}->(); - &$update_size; - $common->{initial_selection} and $common->{toggle_nodes}($set_leaf_state, @{$common->{initial_selection}}); - my $_b = before_leaving { $clear_all_caches->() }; - $common->{init_callback}->() if $common->{init_callback}; - $w->{w}->main; -} - -sub gtk_set_treelist { - my ($treelist, $l) = @_; - - my $list = $treelist->get_model; - $list->clear; - $list->append_set([ 0 => $_ ]) foreach @$l; -} - - -sub gtk_TextView_get_log { - my ($log_w, $command, $filter_output, $when_command_is_over) = @_; - - my $pid = open(my $F, "$command |") or return; - common::nonblock($F); - - my $gtk_buffer = $log_w->get_buffer; - $log_w->signal_connect(destroy => sub { - kill 9, $pid if $pid; #- we do not continue in background - $pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null - }); - - Glib::Timeout->add(100, sub { - if ($gtk_buffer) { - my $end = $gtk_buffer->get_end_iter; - while (defined (my $s = <$F>)) { - $gtk_buffer->insert($end, $filter_output->($s)); - } - $log_w->{to_bottom}->(); - } - if (waitpid($pid, c::WNOHANG()) > 0) { - #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore - #- since it is not a normal case - $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer; - $pid = ''; - 0; - } else { - to_bool($gtk_buffer); - } - }); - $pid; #- $pid becomes invalid after $when_command_is_over is called -} - -sub gtk_new_TextView_get_log { - my ($command, $filter_output, $when_command_is_over) = @_; - - my $log_w = gtknew('TextView', editable => 0); - my $log_scroll = gtknew('ScrolledWindow', child => $log_w, to_bottom => 1); - my $pid = gtk_TextView_get_log($log_w, $command, $filter_output, $when_command_is_over) or return; - $log_scroll, $pid; -} - -# misc helpers: - -package Gtk2::TreeStore; -sub append_set { - my ($model, $parent, @values) = @_; - # compatibility: - @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; - my $iter = $model->append($parent); - $model->set($iter, @values); - return $iter; -} - - -package Gtk2::ListStore; -# Append a new row, set the values, return the TreeIter -sub append_set { - my ($model, @values) = @_; - # compatibility: - @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; - my $iter = $model->append; - $model->set($iter, @values); - return $iter; -} - - -package Gtk2::TreeModel; -# gets the string representation of a TreeIter -sub get_path_str { - my ($self, $iter) = @_; - my $path = $self->get_path($iter); - $path or return; - $path->to_string; -} - -sub iter_each_children { - my ($model, $iter, $f) = @_; - for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) { - $f->($child); - } -} - -package Gtk2::TreeView; -# likewise gtk-1.2 function -sub toggle_expansion { - my ($self, $path, $b_open_all) = @_; - if ($self->row_expanded($path)) { - $self->collapse_row($path); - } else { - $self->expand_row($path, $b_open_all || 0); - } -} - - -# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a -# combo if the user is selecting from a fixed set of options. -# -# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much -# easier to use than GtkCombo as well. Use GtkCombo only when you need the -# editable text entry. -# -# GtkOptionMenu is a much better-implemented widget and also the right UI for -# noneditable sets of choices.) -# -# GtkCombo is deprecated in 2.4.x because it still uses deprecated -# GtkList. GtkOption menu is deprecated in order to have an unified widget. -# -# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo. -# -# -# This layer try to make OptionMenu and ComboBox look being api -# compatible with Combo since its API is quite nice. - -package Gtk2::OptionMenu; -use MDK::Common; - -# try to get combox <==> option menu mapping -sub set_popdown_strings { - my ($w, @strs) = @_; - my $menu = Gtk2::Menu->new; - # keep string list around for ->set_text compatibilty helper - $w->{strings} = \@strs; - #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); - $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; - $w->set_menu($menu); - $w; -} - -sub new_with_strings { - my ($class, $strs, $o_val) = @_; - my $w = $class->new; - $w->set_popdown_strings(@$strs); - $w->set_text($o_val) if $o_val; - $w; -} - -sub entry { - my ($w) = @_; - return $w; -} - -sub get_text { - my ($w) = @_; - $w->get_history == -1 ? '' : $w->{strings}[$w->get_history]; -} - -sub set_text { - my ($w, $val) = @_; - each_index { - if ($_ eq $val) { - $w->set_history($::i); - return; - } - } @{$w->{strings}}; -} - - - - -package Gtk2::ComboBox; -use MDK::Common; - -# try to get combox <==> option menu mapping -sub set_popdown_strings { - my ($w, @strs) = @_; - $w->get_model->clear; - # keep string list around for ->set_text compatibilty helper - $w->{strings} = \@strs; - $w->append_text($_) foreach @strs; - $w; -} - -sub new_with_strings { - my ($class, $strs, $o_val) = @_; - my $w = $class->new_text; - $w->set_popdown_strings(@$strs); - $w->set_text($o_val) if $o_val; - $w; -} - -sub entry { - my ($w) = @_; - return $w; -} - -sub get_text { - my ($w) = @_; - $w->get_active == -1 ? '' : $w->{strings}[$w->get_active]; -} - -sub set_text { - my ($w, $val) = @_; - eval { - my $val_index = find_index { $_ eq $val } @{$w->{strings}}; - $w->set_active($val_index); - }; - # internal_error(qq(impossible to lookup "$val":\n\t) . chomp_($@)) if $@; -} - - -package Gtk2::Label; -sub set { - my ($label, $text) = @_; - mygtk2::gtkset($label, text => $text); -} - - -package Gtk2::WrappedLabel; -sub new { - my ($_type, $o_text, $o_align) = @_; - mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); -} - - -package Gtk2::Entry; -sub new_with_text { - my ($_class, $o_text) = @_; - mygtk2::gtknew('Entry', text => $o_text); -} - - -package Gtk2::Banner; - -use MDK::Common; -use mygtk2 qw(gtknew); -use ugtk2 qw(:helpers :wrappers); - -sub set_pixmap { - my ($darea) = @_; - return if !$darea->realized; - ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf}); - update_text($darea); -} - -sub update_text { - my ($darea) = @_; - $darea->{layout} = $darea->create_pango_layout($darea->{text}); - $darea->{txt_width} = first($darea->{layout}->get_pixel_size); - $darea->queue_draw; -} - - -sub new { - my ($_class, $icon, $text, $o_options) = @_; - - mygtk2::import_style_ressources(); - my $darea = gtknew('DrawingArea', widget_name => 'Banner'); - $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); - my $d_height = $darea->{back_pixbuf}->get_height; - $darea->set_size_request(-1, $d_height); - $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); - eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) }; - $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon()); - my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) }; - my $blue_width = $blue_part->get_width; - $darea->{text} = $text; - require lang; - my $is_rtl = lang::text_direction_rtl(); - - $darea->signal_connect(realize => \&set_pixmap); - $darea->signal_connect("style-set" => \&set_pixmap); - $darea->signal_connect(expose_event => sub { - my $style = $darea->get_style; - my $height = $darea->{icon}->get_height; - my $width = $darea->{icon}->get_width; - # fix icon position when not using the default height: - (undef, undef, undef, $d_height) = $darea->window->get_geometry; - my $padding = int(($d_height - $height)/2); - my $d_width = $darea->allocation->width; - my $x_blue = $is_rtl ? $d_width - $blue_width : 0; - my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; - # here: 48 is the amount of white background in the blue background we wish to ignore: - my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; - $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); - $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), - 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); - $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'), - 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); - $darea->window->draw_layout($style->fg_gc('normal'), $x_text, - $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, - $darea->{layout}); - 1; - }); - - return $darea; -} - - -package Gtk2::MDV::CellRendererPixWithLabel; - -use MDK::Common; -use Glib::Object::Subclass "Gtk2::CellRenderer", - properties => [ - Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), - Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]), - ]; - -my $x_padding = 2; -my $y_padding = 2; - -sub INIT_INSTANCE {} - -sub pixbuf_size { - my ($cell) = @_; - my $pixbuf = $cell->get('pixbuf'); - $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0); -} - -sub calc_size { - my ($cell, $layout) = @_; - my ($width, $height) = $layout->get_pixel_size; - my ($pwidth, $pheight) = pixbuf_size($cell); - - return 0, 0, - $width + $x_padding * 3 + $pwidth, - max($pheight, $height + $y_padding * 2); -} - -sub GET_SIZE { - my ($cell, $widget, $_cell_area) = @_; - - my $layout = get_layout($cell, $widget); - $layout->set_text($cell->get('label')); - - return calc_size($cell, $layout); -} - -sub get_layout { - my ($_cell, $widget) = @_; - return $widget->create_pango_layout(""); -} - -sub RENDER { # not that efficient... - my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_; - my $state; - if ($flags & 'selected') { - $state = $widget->has_focus - ? 'selected' - : 'active'; - } else { - $state = $widget->state eq 'insensitive' - ? 'insensitive' - : 'normal'; - } - - my $layout = get_layout($cell, $widget); - $layout->set_text($cell->get('label')); - - my $is_rtl = lang::text_direction_rtl(); - my $txt_width = first($layout->get_pixel_size); - - my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); - my $pixbuf = $cell->get('pixbuf'); - my ($pwidth, $pheight) = pixbuf_size($cell); - my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth; - - if ($pixbuf) { - $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), - 0, 0, - $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding, - $cell_area->y, #+ $y_padding, - $pwidth, $pheight, 'none', 0, 0); - } - $widget->get_style->paint_layout($window, - $state, - 1, - $cell_area, - $widget, - "cellrenderertext", - $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset, - $cell_area->y + $y_offset + $y_padding, - $layout); - -} - -1; - - -package Gtk2::Notify::Queue; - -sub new { - my ($class, $statusicon) = @_; - - require Gtk2::Notify; - - my $self = bless { - queue => [], - statusicon => $statusicon, - display => 5000, - delay => 500, - }, $class; - $self; -} - -sub process_next { - my ($self) = @_; - shift @{$self->{queue}}; - #- wait for some time so that the new notification is noticeable - @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 }); -} - -sub add { - my ($self, $info) = @_; - push @{$self->{queue}}, $info; - @{$self->{queue}} == 1 and $self->show; -} - -sub show { - my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new - my $info = $self->{queue}[0]; - my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); - $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; - $notification->set_urgency($info->{urgency}) if $info->{urgency}; - foreach my $a (@{$info->{actions} || []}) { - $notification->add_action( - $a->{action}, $a->{label}, - sub { - $info->{processed} = 1; - #- $a->{callback} has to call $selft->process_next when done - $a->{callback}->(); - }); - } - $notification->signal_connect(closed => sub { - $info->{processed} and return; - $info->{timeout}->() if $info->{timeout}; - $self->process_next; - }); - # this makes net_applet to segfault (mga#9102): - #eval { $notification->show }; -} - -1; - - -package Gtk2::GUI_Update_Guard; - -use MDK::Common::Func qw(before_leaving); -use ugtk2; - -sub new { - my ($_class) = @_; # prevent a perl_checker warning in callers - my $old_signal = $SIG{ALRM}; - $SIG{ALRM} = sub { - ugtk2::gtkflush(); - alarm(1); - }; - alarm(1); - return before_leaving { - alarm(0); - $SIG{ALRM} = $old_signal || 'DEFAULT'; # restore default action - }; -} - -1; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm new file mode 100644 index 000000000..3db9ff814 --- /dev/null +++ b/perl-install/ugtk3.pm @@ -0,0 +1,1652 @@ +package ugtk2; + +use diagnostics; +use strict; +use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- leave it on one line, for automatic removal of the line at package creation +use locale; + +@ISA = qw(Exporter); +%EXPORT_TAGS = ( + wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy + gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ + gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot + gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap + gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name + gtkset_property gtkset_relief gtkset_selectable gtkset_sensitive gtkset_shadow_type gtkset_size_request + gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append + gtktext_insert ) ], + + helpers => [ qw(add2notebook add_icon_path escape_text_for_TextView_markup_format gtkcolor gtkcreate_img + gtkcreate_pixbuf gtkfontinfo gtkset_background gtktreeview_children set_back_pixmap + get_default_step_items set_default_step_items + string_size string_width) ], + + create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu + create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable + create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ], + + ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn + ask_yesorno) ], + dialogs => [ qw(err_dialog info_dialog warn_dialog) ], + +); +$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; +@EXPORT_OK = map { @$_ } values %EXPORT_TAGS; + +use c; +use log; +use common; +use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version + +use Gtk2; + + +$border = 5; + +sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# wrappers +# +# Functional-style wrappers to existing Gtk functions; allows to program in +# a more functional way, and especially, first, to avoid using temp +# variables, and second, to "see" directly in the code the user interface +# you're building. + +sub gtkdestroy { mygtk2::may_destroy($_[0]) } +sub gtkflush() { mygtk2::flush() } +sub gtkhide { $_[0]->hide; $_[0] } +sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } +sub gtkpack { gtkpowerpack(1, 1, @_) } +sub gtkpack_ { gtkpowerpack('arg', 1, @_) } +sub gtkpack__ { gtkpowerpack(0, 1, @_) } +sub gtkpack2 { gtkpowerpack(1, 0, @_) } +sub gtkpack2_ { gtkpowerpack('arg', 0, @_) } +sub gtkpack2__ { gtkpowerpack(0, 0, @_) } +sub gtkput { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] } +sub gtkresize { $_[0]->window->resize($_[1], $_[2]); $_[0] } +sub gtkset_active { $_[0]->set_active($_[1]); $_[0] } +sub gtkset_border_width { $_[0]->set_border_width($_[1]); $_[0] } +sub gtkset_editable { $_[0]->set_editable($_[1]); $_[0] } +sub gtkset_selectable { $_[0]->set_selectable($_[1]); $_[0] } +sub gtkset_justify { $_[0]->set_justify($_[1]); $_[0] } +sub gtkset_alignment { $_[0]->set_alignment($_[1], $_[2]); $_[0] } +sub gtkset_layout { $_[0]->set_layout($_[1]); $_[0] } +sub gtkset_modal { $_[0]->set_modal($_[1]); $_[0] } +sub gtkset_mousecursor_normal { gtkset_mousecursor('left-ptr', @_) } +sub gtkset_mousecursor_wait { gtkset_mousecursor('watch', @_) } +sub gtkset_relief { $_[0]->set_relief($_[1]); $_[0] } +sub gtkset_sensitive { $_[0]->set_sensitive($_[1]); $_[0] } +sub gtkset_visibility { $_[0]->set_visibility($_[1]); $_[0] } +sub gtkset_tip { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] } +sub gtkset_shadow_type { $_[0]->set_shadow_type($_[1]); $_[0] } +sub gtkset_style { $_[0]->set_style($_[1]); $_[0] } +sub gtkset_size_request { $_[0]->set_size_request($_[1], $_[2]); $_[0] } +sub gtkshow { $_[0]->show; $_[0] } +sub gtksize { $_[0]->size($_[1], $_[2]); $_[0] } +sub gtkset_markup { $_[0]->set_markup($_[1]); $_[0] } +sub gtkset_line_wrap { $_[0]->set_line_wrap($_[1]); $_[0] } + +sub gtkadd { + my $w = shift; + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); + $w->add(gtkshow($l)); + } + $w; +} + +sub gtkadd_widget { + my $sg = shift; + map { + my $l = $_; + ref $l or $l = gtknew('WrappedLabel', text => $l); + $sg->add_widget($l); + $l; + } @_; +} + +sub gtkappend { + my $w = shift; + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); + $w->append(gtkshow($l)); + } + $w; +} + +sub gtkappenditems { + my $w = shift; + $_->show foreach @_; + $w->append_items(@_); + $w; +} + +# append page to a notebook +sub gtkappend_page { + my ($notebook, $page, $o_title) = @_; + $notebook->append_page($page, $o_title); + $notebook; +} + +sub gtkentry { + my ($o_text) = @_; + my $e = gtknew('Entry'); + $o_text and $e->set_text($o_text); + $e; +} + +sub gtksetstyle { + my ($w, $s) = @_; + $w->set_style($s); + $w; +} + +sub gtkradio { + my $def = shift; + my $radio; + map { + my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); + $w->get_child->set_line_wrap(1); + $w; + } @_; +} + +sub gtkroot() { mygtk2::root_window() } +sub gtkcolor { &mygtk2::rgb2color } +sub gtkset_background { &mygtk2::set_root_window_background } + +sub gtkset_text { + my ($w, $s) = @_; + $w->set_text($s); + $w; +} + +sub gtkcombo_setpopdown_strings { + my $w = shift; + $w->set_popdown_strings(@_); + $w; +} + +sub gtkset_mousecursor { + my ($type, $w) = @_; + ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type)); + $w; +} + +sub gtksignal_connect { + my $w = shift; + $w->signal_connect(@_); + $w; +} + +sub gtkset_name { + my ($widget, $name) = @_; + $widget->set_name($name); + $widget; +} + + +sub gtkpowerpack { + #- Get Default Attributes (if any). 2 syntaxes allowed : + #- gtkpowerpack( {expand => 1, fill => 0}, $box...) : the attributes are picked from a specified hash ref + #- gtkpowerpack(1, 0, 1, $box, ...) : the attributes are picked from the non-ref list, in the order (expand, fill, padding, pack_end). + my @attributes_list = qw(expand fill padding pack_end); + my $default_attrs = {}; + if (ref($_[0]) eq 'HASH') { + $default_attrs = shift; + } elsif (!ref($_[0])) { + foreach (@attributes_list) { + ref($_[0]) and last; + $default_attrs->{$_} = shift; + } + } + my $box = shift; + + while (@_) { + #- Get attributes (if specified). 4 syntaxes allowed (default values are undef ie. false...) : + #- gtkpowerpack({defaultattrs}, $box, $widget1, $widget2, ...) : the attrs are picked from the default ones (if they exist) + #- gtkpowerpack($box, {fill=>1, expand=>0, ...}, $widget1, ...) : the attributes are picked from a specified hash ref + #- gtkpowerpack($box, [1,0,1], $widget1, ...) : the attributes are picked from the array ref : (expand, fill, padding, pack_end). + #- gtkpowerpack({attr=>'arg'}, $box, 1, $widget1, 0, $widget2, etc...) : the 'arg' value will tell gtkpowerpack to always read the + #- attr value directly in the arg list (avoiding confusion between value 0 and Gtk::Label("0"). That can simplify some writings but + #- this arg(s) MUST then be present... + my (%attr, $attrs); + ref($_[0]) eq 'HASH' || ref($_[0]) eq 'ARRAY' and $attrs = shift; + foreach (@attributes_list) { + if (($default_attrs->{$_} || '') eq 'arg') { + ref($_[0]) and internal_error "error in packing definition\n"; + $attr{$_} = shift; + ref($attrs) eq 'ARRAY' and shift @$attrs; + } elsif (ref($attrs) eq 'HASH' && defined($attrs->{$_})) { + $attr{$_} = $attrs->{$_}; + } elsif (ref($attrs) eq 'ARRAY') { + $attr{$_} = shift @$attrs; + } elsif (defined($default_attrs->{$_})) { + $attr{$_} = int $default_attrs->{$_}; + } else { + $attr{$_} = 0; + } + } + #- Get and pack the widget (create it if necessary to a label...) + my $widget = ref($_[0]) ? shift : gtknew('WrappedLabel', text => shift); + my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start'); + $box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding}); + $widget->show; + } + return $box; +} + +sub gtktreeview_children { + my ($model, $iter) = @_; + my @l; + $model or return; + for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { + push @l, $p; + } + @l; +} + + + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# create +# +# Helpers that allow omitting common operations on common widgets +# (e.g. create widgets with good default properties) + +sub create_pixbutton { + my ($label, $pix, $reverse_order) = @_; + my @label_and_pix = (0, $label, if_($pix, 0, $pix)); + gtkadd(gtknew('Button'), + gtknew('HBox', spacing => 3, children => [ + 1, "", + $reverse_order ? reverse(@label_and_pix) : @label_and_pix, + 1, "", + ])); +} + +sub create_adjustment { + my ($val, $min, $max) = @_; + Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1); +} + +sub create_scrolled_window { + my ($W, $o_policy, $o_viewport_shadow) = @_; + gtknew('ScrolledWindow', ($o_policy ? (h_policy => $o_policy->[0], v_policy => $o_policy->[1]) : ()), + child => $W, if_($o_viewport_shadow, shadow_type => $o_viewport_shadow)); +} + +sub n_line_size { + my ($nbline, $type, $widget) = @_; + my $spacing = ${{ text => 3, various => 17 }}{$type}; + my %fontinfo = gtkfontinfo($widget); + round($nbline * ($fontinfo{ascent} + $fontinfo{descent} + $spacing) + 8); +} + +# Glib::Markup::escape_text() if no use for us because it'll do extra +# s/X/&foobar;/ (such as s/'/'/) that are suitable for +# Gtk2::Labels but are not for Gtk2::TextViews, resulting in +# displaying the raw enriched text instead... +# +sub escape_text_for_TextView_markup_format { + my ($str) = @_; + my %rules = ('&' => '&', + '<' => '<', + '>' => '>', + ); + eval { $str =~ s!([&<>])!$rules{$1}!g }; #^(&(amp|lt|gt);)!!) { + if (my $err = $@) { + internal_error("$err\n$str"); + } + $str; +} + +sub markup_to_TextView_format { + my ($s, $o_default_attrs) = @_; + require interactive; + my $l = interactive::markup_parse($s) or return $s; + + foreach (@$l) { + my ($_txt, $attrs) = @$_; + if ($attrs) { + $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; + $attrs->{size} eq 'larger' and do { + $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' + delete $attrs->{size}; + }; + } + #- nb: $attrs may be empty, need special handling if $o_default_attrs is used + add2hash_($_->[1] ||= {}, $o_default_attrs) if $o_default_attrs; + } + $l; +} + +sub create_box_with_title { + my ($o, @l) = @_; + + my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @l); + my $box = gtknew('VBox'); + if ($nbline == 0) { + $o->{box_size} = 0; + return $box; + } + $o->{box_size} = n_line_size($nbline, 'text', $box); + if (@l <= 2 && $nbline > 4) { + $o->{icon} && !$::isWizard and + eval { gtkpack__($box, gtknew('HBox', border_width => 5, children_loose => [ gtkcreate_img($o->{icon}) ])) }; + my $wanted = $o->{box_size}; + $o->{box_size} = min(200, $o->{box_size}); + my $has_scroll = $o->{box_size} < $wanted; + + chomp(my $text = join("\n", @l)); + my $wtext = gtknew('TextView', text => markup_to_TextView_format($text)); + $wtext->set_justification('fill'); + $wtext->set_left_margin(12); + $wtext->set_right_margin(12); + $wtext->can_focus($has_scroll); + my $width = 400; + my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); + $scroll->signal_connect(realize => sub { + my $layout = $wtext->create_pango_layout($text); + $layout->set_width(($width - 10) * Gtk2::Pango->scale); + $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $o->{rwindow}->queue_resize; + }); + gtkpack_($box, $o->{box_allow_grow} || 0, $scroll); + } else { + my $new_label = sub { + my ($txt) = @_; + ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()); + }; + gtkpack__($box, + if_($::isWizard, gtknew('Label', height => 10)), + (map { + my $w = $new_label->($_); + $::isWizard ? gtknew('HBox', children_tight => [ gtknew('Label', width => 20), $w ]) + : $w; + } @l), + if_($::isWizard, gtknew('Label', height => 15)), + ); + } +} + +sub _create_dialog { + my ($title, $o_options) = @_; + my $options = $o_options || {}; + + #- keep compatibility with "transient" now called "transient_for" + $options->{transient_for} = delete $options->{transient} if $options->{transient}; + + gtknew('Dialog', title => $title, + position_policy => 'center-on-parent', # center-on-parent does not work + modal => 1, + if_(!$::isInstall, icon_no_error => wm_icon()), + %$options, allow_unknown_options => 1, + ); +} + + +# drakfloppy / drakfont / harddrake2 / mcc +sub create_dialog { + my ($title, $label, $o_options) = @_; + my $ret = 0; + $o_options ||= {}; + $o_options->{transient_for} = $::main_window if !$o_options->{transient_for} && $::main_window; + + my $dialog = gtkset_border_width(_create_dialog($title, $o_options), 10); + $dialog->set_border_width(10); + my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label); + gtkpack($dialog->vbox, + gtknew('HBox', children => [ + if_($o_options->{stock}, + 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'), + 0, gtknew('Label', text => " "), + ), + 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, + ]), + ); + + if ($o_options->{cancel}) { + $dialog->action_area->pack_start( + gtknew('Button', text => N("Cancel"), + clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }, + can_default => 1), + 1, 1, 0); + } + + my $button = gtknew('Button', text => N("Ok"), can_default => 1, + clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); + $dialog->action_area->pack_start($button, 1, 1, 0); + $button->grab_default; + + $dialog->set_has_separator(0); + $dialog->show_all; + Gtk2->main; + $ret; +} + +sub info_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-info' }); + create_dialog($title, $label, $o_options); +} + +sub warn_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 }); + create_dialog($title, $label, $o_options); +} + +sub err_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-error' }); + create_dialog($title, $label, $o_options); +} + +sub create_hbox { gtknew('HButtonBox', layout => $_[0]) } +sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } + +sub create_factory_menu_ { + my ($type, $name, $window, @menu_items) = @_; + my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new); + $widget->create_items($window, @menu_items); + $window->add_accel_group($accel_group); + ($widget->get_widget($name), $widget); +} + +sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '
', @_) } +sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '
', @_) } + +sub create_menu { + my $title = shift; + my $w = Gtk2::MenuItem->new($title); + $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_))); + $w; +} + +sub create_notebook { + my $book = gtknew('Notebook'); + while (@_) { + my ($page, $title) = splice(@_, 0, 2); + gtkappend_page($book, $page, $title); + } + $book; +} + +sub create_packtable { + my ($options, @l) = @_; + my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0); + add2hash_($options, { xpadding => 5, ypadding => 0 }); + each_index { + my ($i, $l) = ($::i, $_); + each_index { + my $j = $::i; + if ($_) { + ref $_ or $_ = gtknew('WrappedLabel', text => $_); + $j != $#$l && !$options->{mcc} ? + $w->attach($_, $j, $j + 1, $i, $i + 1, + 'fill', 'fill', $options->{xpadding}, $options->{ypadding}) : + $w->attach($_, $j, $j + 1, $i, $i + 1, + ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); + $_->show; + } + } @$l; + } @l; + $w->set_col_spacings($options->{col_spacings} || 0); + $w->set_row_spacings($options->{row_spacings} || 0); + gtkset_border_width($w, $::isInstall ? 3 : 10); +} + +my $wm_is_kde; +sub create_okcancel { + my ($w, $o_ok, $o_cancel, $_o_spread, @other) = @_; + # @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button) + # extra buttons have the following structure [ label, handler, is_first, pack_right ] + local $::isWizard = $::isWizard && !$w->{pop_it}; + my $cancel; + if (defined $o_cancel || defined $o_ok) { + $cancel = $o_cancel; + } elsif (!$::Wizard_no_previous) { + $cancel = $::isWizard ? N("Previous") : N("Cancel"); + } + my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); + my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit })); + my $bprev; + if ($cancel) { + $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || + sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); + } + $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel; + if (!defined $wm_is_kde) { + require any; + my $wm = any::running_window_manager(); + $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0; + } + my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ? + $_[0][0] : + gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; + my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && !$_->[3] } @other); + my @right = ((map { $f->($_) } grep { $_->[2] && $_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && $_->[3] } @other); + # we put space to group buttons in two packs (but if there's only one when not in wizard mode) + # but in the installer where all windows run in wizard mode because of design even when not in a wizard step + $bprev = gtknew('Label') if !$cancel && $::Wizard_no_previous && !@left && !@right; + if ($::isWizard || $w->{pop_it}) { + # wizard mode: order is cancel/left_extras/white/right_extras/prev/next + unshift @left, $w->{wizcancel} if $w->{wizcancel}; + push @right, $bprev, $bok; + } else { + # normal mode: cancel/ok button follow GNOME's HIG + unshift @left, ($wm_is_kde ? $bok : $bprev); + push @left, gtknew('Label') if $ok && $cancel; # space buttons but if there's only one button + push @right, ($wm_is_kde ? $bprev : $bok); + } + + gtknew('VBox', spacing => 5, children_loose => [ + gtknew('HBox', height => 5), + gtknew('HSeparator'), + gtknew('HBox', children_loose => [ + map { + gtknew('HButtonBox', spacing => 5, layout => $_->[1], + children_loose => [ + map { + $_->can_default($::isWizard); + $_; + } grep { $_ } @{$_->[0]} + ]); + } ([ \@left, 'start' ], + [ \@right, 'end' ], + ) + ]), + ]); +} + +sub _setup_paned { + my ($paned, $child1, $child2, %options) = @_; + foreach ([ 'resize1', 0 ], [ 'shrink1', 1 ], [ 'resize2', 1 ], [ 'shrink2', 1 ]) { + $options{$_->[0]} = $_->[1] unless defined($options{$_->[0]}); + } + $paned->pack1(gtkshow($child1), $options{resize1}, $options{shrink1}); + $paned->pack2(gtkshow($child2), $options{resize2}, $options{shrink2}); + gtkshow($paned); +} + +sub create_vpaned { + _setup_paned(Gtk2::VPaned->new, @_); +} + +sub create_hpaned { + _setup_paned(Gtk2::HPaned->new, @_); +} + +sub gtkcreate_frame { + my ($label) = @_; + gtknew('Frame', text => $label, border_width => 5); +} + + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# helpers +# +# Functions that do typical operations on widgets, that you may need in +# several places of your programs. + +sub _find_imgfile { + my ($name) = @_; + + if ($name =~ m|/| && -f $name) { + $name; + } else { + foreach my $path (icon_paths()) { + foreach ('', '.png', '.xpm') { + my $file = "$path/$name$_"; + -f $file and return $file; + } + } + } +} + +# use it if you want to display an icon/image in your app +sub gtkcreate_img { + my ($file, $o_size) = @_; + gtknew('Image', file => $file, if_($o_size, size => $o_size)); +} + +# use it if you want to draw an image onto a drawingarea +sub gtkcreate_pixbuf { + my ($file, $o_size) = @_; + gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); +} + +sub gtktext_append { gtktext_insert(@_, append => 1) } + +sub may_set_icon { + my ($w, $name) = @_; + if (my $f = $name && _find_imgfile($name)) { + $w->set_icon(gtkcreate_pixbuf($f)); + } +} + +sub gtktext_insert { &mygtk2::_text_insert } +sub icon_paths { &mygtk2::_icon_paths } +sub add_icon_path { &mygtk2::add_icon_path } + +sub set_main_window_size { + my ($o) = @_; + mygtk2::set_main_window_size($o->{rwindow}); +} + +# extracts interesting font metrics for a given widget +sub gtkfontinfo { + my ($widget) = @_; + my $context = $widget->get_pango_context; + my $metrics = $context->get_metrics($context->get_font_description, $context->get_language); + my %fontinfo; + foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { + no strict; + my $func = "get_$_"; + $fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func); + } + %fontinfo; +} + +sub gtkmodify_font { + my ($w, $arg) = @_; + $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg)); + $w; +} + +sub gtkset_property { + my ($w, $property, $value) = @_; + $w->set_property($property, $value); + $w; +} + +sub set_back_pixbuf { + my ($widget, $pixbuf) = @_; + my $window = $widget->window; + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $window->set_back_pixmap($pixmap, 0); +} + +sub set_back_pixmap { + my ($w) = @_; + return if !$w->realized; + my $window = $w->window; + my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); + + my $style = $w->get_style; + $pixmap->draw_points($style->bg_gc('normal'), 0, 0); + $pixmap->draw_points($style->base_gc('normal'), 0, 1); + $window->set_back_pixmap($pixmap); +} + +sub add2notebook { + my ($n, $title, $book) = @_; + $n->append_page($book, gtkshow(gtknew('Label', text => $title))); + $book->show; +} + +sub string_size { + my ($widget, $text) = @_; + my $layout = $widget->create_pango_layout($text); + my @size = $layout->get_pixel_size; + @size; +} + +sub string_width { + my ($widget, $text) = @_; + my ($width, undef) = string_size($widget, $text); + $width; +} + + +my ($def_step_title); +sub set_default_step_items { + $def_step_title = translate($_[0]); +} + +sub get_default_step_items { ($def_step_title) } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# toplevel window creation helper +# +# Use the 'new' function as a method constructor and then 'main' on it to +# launch the main loop. Use $o->{retval} to indicate that the window needs +# to terminate. +# Set $::isWizard to have a wizard appearance. +# Set $::isEmbedded and $::XID so that the window will plug. + +sub new { + my ($type, $title, %opts) = @_; + + my $o = bless { %opts }, $type; + while (my $e = shift @tempory::objects) { $e->destroy } + + my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon}; + my $banner_title = $opts{banner_title}; + $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window}; + my $window = gtknew( + 'MagicWindow', + title => $title || '', + pop_it => $o->{pop_it}, + $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), + $::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (), + width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, + modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal}, + no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone, + if_(!$::isInstall, icon_no_error => wm_icon()), + if_($o->{transient}, transient_for => $o->{transient}), + ); + mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; + $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded; + + $o->{rwindow} = $o->{window} = $window; + $o->{real_window} = $window->{real_window}; + $o->{pop_it} = $window->{pop_it}; + + $o; +} + +sub main { + my ($o, $o_completed, $o_canceled) = @_; + gtkset_mousecursor_normal(); + + $o->show; + mygtk2::main($o->{rwindow}, + sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() }); + $o->{retval}; +} +sub show($) { + my ($o) = @_; + $o->{rwindow}->show; +} +sub destroy($) { + my ($o) = @_; + $o->{rwindow}->destroy; + flush(); +} +sub DESTROY { goto &destroy } +sub sync { + my ($o) = @_; + show($o); + flush(); +} +sub flush() { gtkflush() } +sub shrink_topwindow { + my ($o) = @_; + $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1)); +} +sub exit { + gtkset_mousecursor_normal(); #- for restoring a normal in any case + flush(); + if ($::isStandalone) { + require standalone; + standalone::__exit($_[1]); #- workaround + } else { + c::_exit($_[1]); #- workaround + } +} + +#- in case "exit" above was not called by the program +END { &exit() } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# ask +# +# Full UI managed functions that will return to you the value that the +# user chose. + +sub ask_warn { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) } +sub ask_yesorno { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } +sub ask_okcancel { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } +sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) } +sub ask_dir { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) } + +sub _ask_from_entry($$@) { + my ($o, @msgs) = @_; + my $entry = gtknew('Entry'); + my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit }; + $o->{ok_clicked} = $f; + $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit }; + + gtkadd($o->{window}, + gtkpack($o->create_box_with_title(@msgs), + gtksignal_connect($entry, 'activate' => $f), + ($o->{hide_buttons} ? () : create_okcancel($o))), + ); + $entry->grab_focus; +} + +sub _ask_warn($@) { + my ($o, @msgs) = @_; + gtkadd($o->{window}, + gtkpack($o->create_box_with_title(@msgs), + my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }), + ), + ); + $w->grab_focus; +} + +sub _ask_okcancel($@) { + my ($o, @msgs) = @_; + my ($ok, $cancel) = splice @msgs, -2; + + gtkadd($o->{window}, + gtkpack(create_box_with_title($o, @msgs), + create_okcancel($o, $ok, $cancel), + ) + ); + $o->{ok}->grab_focus; +} + +sub create_file_selector { + my (%opts) = @_; + my $w = ugtk2->new(delete $opts{title}, modal => 1); + my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir}); + my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open'); + add2hash(\%opts, { width => 480, height => 250 }); + gtkadd($w->{window}, + gtkpack_(create_box_with_title($w, $message), + 1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts), + 0, create_okcancel($w), + )); + $w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked }); + $w; +} + +sub file_selected_check { + my ($save, $want_a_dir, $file) = @_; + + if (!$file) { + N("No file chosen"); + } elsif (-f $file && $want_a_dir) { + N("You have chosen a file, not a directory"); + } elsif (-d $file && !$want_a_dir) { + N("You have chosen a directory, not a file"); + } elsif (!-e $file && !$save) { + $want_a_dir ? N("No such directory") : N("No such file"); + } else { + ''; + } +} + +sub _ask_file { + my ($o, $title, $path) = @_; + + my $w = create_file_selector(title => $title, want_a_dir => 0, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); +} +sub _ask_dir { + my ($o, $title, $path) = @_; + + my $w = create_file_selector(title => $title, want_a_dir => 1, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); +} + +sub ask_browse_tree_info { + my ($common) = @_; + + my $w = ugtk2->new($common->{title}); + + my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); + my $tree = Gtk2::TreeView->new_with_model($tree_model); + $tree->get_selection->set_mode('browse'); + $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1)); + $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2)); + $tree->set_headers_visible(0); + $tree->set_rules_hint(1); + $textcolumn->set_min_width(200); + $textcolumn->set_max_width(200); + + gtkadd($w->{window}, + gtknew('VBox', spacing => 5, children => [ + 0, gtknew('Title2', label => $common->{message}, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()), + 1, gtknew('VBox', children => [ + 1, gtknew('ScrolledWindow', child => $tree), + 0, gtknew('Frame', text => N("Info"), child => + gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)), + ) ]), + 0, Gtk2::HSeparator->new, + 0, my $status = gtknew('Label'), + if_($common->{auto_deps}, + 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) + ), + 0, Gtk2::HSeparator->new, + 0, my $box2 = gtknew('HBox', spacing => 10), + ])); + + gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"), + clicked => $common->{interactive_help})) if $common->{interactive_help}; + + #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); + gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new); + + my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ])); + @l = reverse @l if !$::isInstall; + my @buttons = map { + my ($t, $val) = @$_; + $box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub { + $w->{retval} = $val; + Gtk2->main_quit; + }), 0, 1, 20); + $w->show; + $w; + } @l; + @buttons = reverse @buttons if !$::isInstall; + + $status->show; + + $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall; + $buttons[0]->grab_focus; + $w->{rwindow}->show; + + my @toolbar; + foreach my $ic (@{$common->{icons} || []}) { + push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { + if ($ic->{code}) { + my $_w = $ic->{wait_message} && $common->{wait_message}->('', $ic->{wait_message}); + $ic->{code}(); + $common->{rebuild_tree}->(); + } + } ]); + } + my %toolbar = @toolbar; + foreach (grep_index { $::i % 2 == 0 } @toolbar) { + $toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]); + } + + $pixcolumn->{is_pix} = 1; + $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, + info => $info, status => $status }; + ask_browse_tree_info_given_widgets($common); +} + +sub ask_browse_tree_info_given_widgets { + my ($common) = @_; + my $w = $common->{widgets}; + + my ($curr, $prev_label, $idle, $mouse_toggle_pending); + my (%wtree, %ptree, %pix, %node_state, %state_stats); + my $update_size = sub { + if ($w->{status}) { + my $new_label = $common->{get_status}(); + $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label); + } + }; + + my $set_node_state_flat = sub { + my ($iter, $state) = @_; + $state eq 'XXX' and return; + $pix{$state} ||= gtkcreate_pixbuf($state); + $w->{tree_model}->set($iter, 1 => $pix{$state}); + }; + my $set_node_state_tree; $set_node_state_tree = sub { + my ($iter, $state) = @_; + my $iter_str = $w->{tree_model}->get_path_str($iter); + $state eq 'XXX' and return; + $pix{$state} ||= gtkcreate_pixbuf($state); + if ($node_state{$iter_str} ne $state) { + my $parent; + if (!$w->{tree_model}->iter_has_child($iter) && ($parent = $w->{tree_model}->iter_parent($iter))) { + my $parent_str = $w->{tree_model}->get_path_str($parent); + my $stats = $state_stats{$parent_str} ||= {}; $stats->{$node_state{$iter_str}}--; $stats->{$state}++; + my @list = grep { $stats->{$_} > 0 } keys %$stats; + my $new_state = @list == 1 ? $list[0] : 'semiselected'; + $node_state{$parent_str} ne $new_state and $set_node_state_tree->($parent, $new_state); + } + $w->{tree_model}->set($iter, 1 => $pix{$state}); + $node_state{$iter_str} = $state; #- cache for efficiency + } + }; + my $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; + + my $set_leaf_state = sub { + my ($leaf, $state) = @_; + $set_node_state->($_, $state) foreach @{$ptree{$leaf}}; + }; + my $add_parent; $add_parent = sub { + my ($root, $state) = @_; + $root or return undef; + if (my $w = $wtree{$root}) { return $w } + my $s; foreach (split '\|', $root) { + my $s2 = $s ? "$s|$_" : $_; + $wtree{$s2} ||= do { + my $iter = $w->{tree_model}->append_set($s ? $add_parent->($s, $state) : undef, [ 0 => $_ ]); + $iter; + }; + $s = $s2; + } + $set_node_state->($wtree{$s}, $state); #- use this state by default as tree is building. + $wtree{$s}; + }; + my $add_node = sub { + my ($leaf, $root, $options) = @_; + my $state = $common->{node_state}($leaf) or return; + if ($leaf) { + my $iter = $w->{tree_model}->append_set($add_parent->($root, $state), [ 0 => $leaf ]); + $set_node_state->($iter, $state); + push @{$ptree{$leaf}}, $iter; + } else { + my $parent = $add_parent->($root, $state); + #- hackery for partial displaying of trees, used in rpmdrake: + #- if leaf is void, we may create the parent and one child (to have the [+] in front of the parent in the ctree) + #- though we use '' as the label of the child; then rpmdrake will connect on tree_expand, and whenever + #- the first child has '' as the label, it will remove the child and add all the "right" children + $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ]); + } + }; + my $clear_all_caches = sub { + foreach (values %ptree) { + foreach my $n (@$_) { + delete $node_state{$w->{tree_model}->get_path_str($n)}; + } + } + foreach (values %wtree) { + my $iter_str = $w->{tree_model}->get_path_str($_); + delete $node_state{$iter_str}; + delete $state_stats{$iter_str}; + } + %ptree = %wtree = (); + }; + $common->{delete_all} = sub { + $clear_all_caches->(); + $w->{tree_model}->clear; + }; + $common->{rebuild_tree} = sub { + $common->{delete_all}->(); + $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; + $common->{build_tree}($add_node, $common->{state}{flat}, $common->{tree_mode}); + &$update_size; + }; + $common->{delete_category} = sub { + my ($cat) = @_; + exists $wtree{$cat} or return; + foreach (keys %ptree) { + my @to_remove; + foreach my $node (@{$ptree{$_}}) { + my $category; + my $parent = $node; + my @parents; + while ($parent = $w->{tree_model}->iter_parent($parent)) { #- LEAKS + my $parent_name = $w->{tree_model}->get($parent, 0); + $category = $category ? "$parent_name|$category" : $parent_name; + $_->[1] = "$parent_name|$_->[1]" foreach @parents; + push @parents, [ $parent, $category ]; + } + if ($category =~ /^\Q$cat/) { + push @to_remove, $node; + foreach (@parents) { + next if $_->[1] eq $cat || !exists $wtree{$_->[1]}; + delete $wtree{$_->[1]}; + delete $node_state{$w->{tree_model}->get_path_str($_->[0])}; + delete $state_stats{$w->{tree_model}->get_path_str($_->[0])}; + } + } + } + foreach (@to_remove) { + delete $node_state{$w->{tree_model}->get_path_str($_)}; + } + @{$ptree{$_}} = difference2($ptree{$_}, \@to_remove); + } + if (exists $wtree{$cat}) { + my $iter_str = $w->{tree_model}->get_path_str($wtree{$cat}); + delete $node_state{$iter_str}; + delete $state_stats{$iter_str}; + $w->{tree_model}->remove($wtree{$cat}); + delete $wtree{$cat}; + } + &$update_size; + }; + $common->{add_nodes} = sub { + my (@nodes) = @_; + $add_node->($_->[0], $_->[1], $_->[2]) foreach @nodes; + &$update_size; + }; + + $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 }; + my $children = sub { map { $w->{tree_model}->get($_, 0) } gtktreeview_children($w->{tree_model}, $_[0]) }; + my $toggle = sub { + if (ref($curr) && !$_[0]) { + $w->{tree}->toggle_expansion($w->{tree_model}->get_path($curr)); + } else { + if (ref $curr) { + my @l = $common->{grep_allowed_to_toggle}($children->($curr)) or return; + my @unsel = $common->{grep_unselected}(@l); + my @p = @unsel ? + #- not all is selected, select all if no option to potentially override + (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) + : @l; + $common->{toggle_nodes}($set_leaf_state, @p); + &$update_size; + } else { + $common->{check_interactive_to_toggle}($curr) and $common->{toggle_nodes}($set_leaf_state, $curr); + &$update_size; + } + } + }; + + $w->{tree}->signal_connect(key_press_event => sub { + my $c = chr($_[1]->keyval & 0xff); + if ($_[1]->keyval >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') { + $toggle->(0); + } + 0; + }); + + $w->{tree}->get_selection->signal_connect(changed => sub { + my ($model, $iter) = $_[0]->get_selected; + $model && $iter or return; + Glib::Source->remove($idle) if $idle; + + if (!$model->iter_has_child($iter)) { + $curr = $model->get($iter, 0); + $idle = Glib::Timeout->add(100, $common->{display_info}); + } else { + $curr = $iter; + } + #- the following test for equality is because we can have a button_press_event first, then + #- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that + #- happens in rpmdrake when doing a "search" and directly trying to select a found package + if ($mouse_toggle_pending eq $model->get($iter, 0)) { + $toggle->(1); + $mouse_toggle_pending = 0; + } + 0; + }); + $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( + my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); + if ($path && $column) { + $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); + } + 0; + }); + $common->{rebuild_tree}->(); + &$update_size; + $common->{initial_selection} and $common->{toggle_nodes}($set_leaf_state, @{$common->{initial_selection}}); + my $_b = before_leaving { $clear_all_caches->() }; + $common->{init_callback}->() if $common->{init_callback}; + $w->{w}->main; +} + +sub gtk_set_treelist { + my ($treelist, $l) = @_; + + my $list = $treelist->get_model; + $list->clear; + $list->append_set([ 0 => $_ ]) foreach @$l; +} + + +sub gtk_TextView_get_log { + my ($log_w, $command, $filter_output, $when_command_is_over) = @_; + + my $pid = open(my $F, "$command |") or return; + common::nonblock($F); + + my $gtk_buffer = $log_w->get_buffer; + $log_w->signal_connect(destroy => sub { + kill 9, $pid if $pid; #- we do not continue in background + $pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null + }); + + Glib::Timeout->add(100, sub { + if ($gtk_buffer) { + my $end = $gtk_buffer->get_end_iter; + while (defined (my $s = <$F>)) { + $gtk_buffer->insert($end, $filter_output->($s)); + } + $log_w->{to_bottom}->(); + } + if (waitpid($pid, c::WNOHANG()) > 0) { + #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore + #- since it is not a normal case + $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer; + $pid = ''; + 0; + } else { + to_bool($gtk_buffer); + } + }); + $pid; #- $pid becomes invalid after $when_command_is_over is called +} + +sub gtk_new_TextView_get_log { + my ($command, $filter_output, $when_command_is_over) = @_; + + my $log_w = gtknew('TextView', editable => 0); + my $log_scroll = gtknew('ScrolledWindow', child => $log_w, to_bottom => 1); + my $pid = gtk_TextView_get_log($log_w, $command, $filter_output, $when_command_is_over) or return; + $log_scroll, $pid; +} + +# misc helpers: + +package Gtk2::TreeStore; +sub append_set { + my ($model, $parent, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append($parent); + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::ListStore; +# Append a new row, set the values, return the TreeIter +sub append_set { + my ($model, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append; + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::TreeModel; +# gets the string representation of a TreeIter +sub get_path_str { + my ($self, $iter) = @_; + my $path = $self->get_path($iter); + $path or return; + $path->to_string; +} + +sub iter_each_children { + my ($model, $iter, $f) = @_; + for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) { + $f->($child); + } +} + +package Gtk2::TreeView; +# likewise gtk-1.2 function +sub toggle_expansion { + my ($self, $path, $b_open_all) = @_; + if ($self->row_expanded($path)) { + $self->collapse_row($path); + } else { + $self->expand_row($path, $b_open_all || 0); + } +} + + +# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a +# combo if the user is selecting from a fixed set of options. +# +# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much +# easier to use than GtkCombo as well. Use GtkCombo only when you need the +# editable text entry. +# +# GtkOptionMenu is a much better-implemented widget and also the right UI for +# noneditable sets of choices.) +# +# GtkCombo is deprecated in 2.4.x because it still uses deprecated +# GtkList. GtkOption menu is deprecated in order to have an unified widget. +# +# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo. +# +# +# This layer try to make OptionMenu and ComboBox look being api +# compatible with Combo since its API is quite nice. + +package Gtk2::OptionMenu; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + my $menu = Gtk2::Menu->new; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); + $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; + $w->set_menu($menu); + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_history == -1 ? '' : $w->{strings}[$w->get_history]; +} + +sub set_text { + my ($w, $val) = @_; + each_index { + if ($_ eq $val) { + $w->set_history($::i); + return; + } + } @{$w->{strings}}; +} + + + + +package Gtk2::ComboBox; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + $w->get_model->clear; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + $w->append_text($_) foreach @strs; + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new_text; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_active == -1 ? '' : $w->{strings}[$w->get_active]; +} + +sub set_text { + my ($w, $val) = @_; + eval { + my $val_index = find_index { $_ eq $val } @{$w->{strings}}; + $w->set_active($val_index); + }; + # internal_error(qq(impossible to lookup "$val":\n\t) . chomp_($@)) if $@; +} + + +package Gtk2::Label; +sub set { + my ($label, $text) = @_; + mygtk2::gtkset($label, text => $text); +} + + +package Gtk2::WrappedLabel; +sub new { + my ($_type, $o_text, $o_align) = @_; + mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); +} + + +package Gtk2::Entry; +sub new_with_text { + my ($_class, $o_text) = @_; + mygtk2::gtknew('Entry', text => $o_text); +} + + +package Gtk2::Banner; + +use MDK::Common; +use mygtk2 qw(gtknew); +use ugtk2 qw(:helpers :wrappers); + +sub set_pixmap { + my ($darea) = @_; + return if !$darea->realized; + ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf}); + update_text($darea); +} + +sub update_text { + my ($darea) = @_; + $darea->{layout} = $darea->create_pango_layout($darea->{text}); + $darea->{txt_width} = first($darea->{layout}->get_pixel_size); + $darea->queue_draw; +} + + +sub new { + my ($_class, $icon, $text, $o_options) = @_; + + mygtk2::import_style_ressources(); + my $darea = gtknew('DrawingArea', widget_name => 'Banner'); + $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); + my $d_height = $darea->{back_pixbuf}->get_height; + $darea->set_size_request(-1, $d_height); + $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); + eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) }; + $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon()); + my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) }; + my $blue_width = $blue_part->get_width; + $darea->{text} = $text; + require lang; + my $is_rtl = lang::text_direction_rtl(); + + $darea->signal_connect(realize => \&set_pixmap); + $darea->signal_connect("style-set" => \&set_pixmap); + $darea->signal_connect(expose_event => sub { + my $style = $darea->get_style; + my $height = $darea->{icon}->get_height; + my $width = $darea->{icon}->get_width; + # fix icon position when not using the default height: + (undef, undef, undef, $d_height) = $darea->window->get_geometry; + my $padding = int(($d_height - $height)/2); + my $d_width = $darea->allocation->width; + my $x_blue = $is_rtl ? $d_width - $blue_width : 0; + my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; + # here: 48 is the amount of white background in the blue background we wish to ignore: + my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; + $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); + $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); + $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); + $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, + $darea->{layout}); + 1; + }); + + return $darea; +} + + +package Gtk2::MDV::CellRendererPixWithLabel; + +use MDK::Common; +use Glib::Object::Subclass "Gtk2::CellRenderer", + properties => [ + Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), + Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]), + ]; + +my $x_padding = 2; +my $y_padding = 2; + +sub INIT_INSTANCE {} + +sub pixbuf_size { + my ($cell) = @_; + my $pixbuf = $cell->get('pixbuf'); + $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0); +} + +sub calc_size { + my ($cell, $layout) = @_; + my ($width, $height) = $layout->get_pixel_size; + my ($pwidth, $pheight) = pixbuf_size($cell); + + return 0, 0, + $width + $x_padding * 3 + $pwidth, + max($pheight, $height + $y_padding * 2); +} + +sub GET_SIZE { + my ($cell, $widget, $_cell_area) = @_; + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + return calc_size($cell, $layout); +} + +sub get_layout { + my ($_cell, $widget) = @_; + return $widget->create_pango_layout(""); +} + +sub RENDER { # not that efficient... + my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_; + my $state; + if ($flags & 'selected') { + $state = $widget->has_focus + ? 'selected' + : 'active'; + } else { + $state = $widget->state eq 'insensitive' + ? 'insensitive' + : 'normal'; + } + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + my $is_rtl = lang::text_direction_rtl(); + my $txt_width = first($layout->get_pixel_size); + + my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); + my $pixbuf = $cell->get('pixbuf'); + my ($pwidth, $pheight) = pixbuf_size($cell); + my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth; + + if ($pixbuf) { + $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), + 0, 0, + $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding, + $cell_area->y, #+ $y_padding, + $pwidth, $pheight, 'none', 0, 0); + } + $widget->get_style->paint_layout($window, + $state, + 1, + $cell_area, + $widget, + "cellrenderertext", + $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset, + $cell_area->y + $y_offset + $y_padding, + $layout); + +} + +1; + + +package Gtk2::Notify::Queue; + +sub new { + my ($class, $statusicon) = @_; + + require Gtk2::Notify; + + my $self = bless { + queue => [], + statusicon => $statusicon, + display => 5000, + delay => 500, + }, $class; + $self; +} + +sub process_next { + my ($self) = @_; + shift @{$self->{queue}}; + #- wait for some time so that the new notification is noticeable + @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 }); +} + +sub add { + my ($self, $info) = @_; + push @{$self->{queue}}, $info; + @{$self->{queue}} == 1 and $self->show; +} + +sub show { + my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new + my $info = $self->{queue}[0]; + my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); + $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; + $notification->set_urgency($info->{urgency}) if $info->{urgency}; + foreach my $a (@{$info->{actions} || []}) { + $notification->add_action( + $a->{action}, $a->{label}, + sub { + $info->{processed} = 1; + #- $a->{callback} has to call $selft->process_next when done + $a->{callback}->(); + }); + } + $notification->signal_connect(closed => sub { + $info->{processed} and return; + $info->{timeout}->() if $info->{timeout}; + $self->process_next; + }); + # this makes net_applet to segfault (mga#9102): + #eval { $notification->show }; +} + +1; + + +package Gtk2::GUI_Update_Guard; + +use MDK::Common::Func qw(before_leaving); +use ugtk2; + +sub new { + my ($_class) = @_; # prevent a perl_checker warning in callers + my $old_signal = $SIG{ALRM}; + $SIG{ALRM} = sub { + ugtk2::gtkflush(); + alarm(1); + }; + alarm(1); + return before_leaving { + alarm(0); + $SIG{ALRM} = $old_signal || 'DEFAULT'; # restore default action + }; +} + +1; -- cgit v1.2.1 From 3252bfe856428c0a38ba7edb0f0ad6245537df6e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 15:18:47 +0200 Subject: forked --- perl-install/mygtk2.pm | 1598 ++++++++++++++++++++++++++++++++++++++++++++++ perl-install/ugtk2.pm | 1652 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3250 insertions(+) create mode 100644 perl-install/mygtk2.pm create mode 100644 perl-install/ugtk2.pm diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm new file mode 100644 index 000000000..779e77e8f --- /dev/null +++ b/perl-install/mygtk2.pm @@ -0,0 +1,1598 @@ +package mygtk2; + +use diagnostics; +use strict; +use feature 'state'; + +our @ISA = qw(Exporter); +our @EXPORT = qw(gtknew gtkset gtkadd gtkval_register gtkval_modify); + +use c; +use log; +use common; + +use Gtk2; + +sub init() { + !check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0); + $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); + + Gtk2->init; + Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), + if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), + 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation + @::textdomains; + Glib->enable_exceptions2; +} +init() unless $::no_ugtk_init; +Glib->enable_exceptions2 if $::isInstall; + + + +sub gtknew { + my $class = shift; + if (@_ % 2 != 0) { + internal_error("gtknew $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtknew $class: $r should be a string in @_"); + } + my %opts = @_; + _gtk(undef, $class, 'gtknew', \%opts); +} + +sub gtkset { + my $w = shift; + my $class = ref($w); + if (@_ % 2 != 0) { + internal_error("gtkset $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtkset $class: $r should be a string in @_"); + } + my %opts = @_; + + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkset unknown class $class"); + + _gtk($w, $class, 'gtkset', \%opts); +} + +sub gtkadd { + my $w = shift; + my $class = ref($w); + if (@_ % 2 != 0) { + internal_error("gtkadd $class: bad options @_"); + } + if (my $r = find { ref $_->[0] } group_by2(@_)) { + internal_error("gtkadd $class: $r should be a string in @_"); + } + my %opts = @_; + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkadd unknown class $class"); + + _gtk($w, $class, 'gtkadd', \%opts); +} + + +my %refs; + +sub gtkval_register { + my ($w, $ref, $sub) = @_; + push @{$w->{_ref}}, $ref; + $w->signal_connect(destroy => sub { + @{$refs{$ref}} = grep { $_->[1] != $w } @{$refs{$ref}}; + delete $refs{$ref} if !@{$refs{$ref}}; + }); + push @{$refs{$ref}}, [ $sub, $w ]; +} +sub gtkval_modify { + my ($ref, $val, @to_skip) = @_; + my $prev = '' . $ref; + $$ref = $val; + if ($prev ne '' . $ref) { + internal_error(); + } + foreach (@{$refs{$ref} || []}) { + my ($f, @para) = @$_; + $f->(@para) if !member($f, @to_skip); + } +} + +my $global_tooltips; + +sub _gtk { + my ($w, $class, $action, $opts) = @_; + + if (my $f = $mygtk2::{"_gtk__$class"}) { + $w = $f->($w, $opts, $class, $action); + } else { + internal_error("$action $class: unknown class"); + } + + $w->set_size_request(delete $opts->{width} || -1, delete $opts->{height} || -1) if exists $opts->{width} || exists $opts->{height}; + if (my $position = delete $opts->{position}) { + $w->move($position->[0], $position->[1]); + } + $w->set_name(delete $opts->{widget_name}) if exists $opts->{widget_name}; + $w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; + $w->can_default(delete $opts->{can_default}) if exists $opts->{can_default}; + $w->grab_focus if delete $opts->{grab_focus}; + $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; + $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; + $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event}; + $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; + (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; + if (my $tip = delete $opts->{tip}) { + $global_tooltips ||= Gtk2::Tooltips->new; + $global_tooltips->set_tip($w, $tip); + } + + #- WARNING: hide_ref and show_ref are not effective until you gtkval_modify the ref + if (my $hide_ref = delete $opts->{hide_ref}) { + gtkval_register($w, $hide_ref, sub { $$hide_ref ? $w->hide : $w->show }); + } elsif (my $show_ref = delete $opts->{show_ref}) { + gtkval_register($w, $show_ref, sub { $$show_ref ? $w->show : $w->hide }); + } + + if (my $sensitive_ref = delete $opts->{sensitive_ref}) { + my $set = sub { $w->set_sensitive($$sensitive_ref) }; + gtkval_register($w, $sensitive_ref, $set); + $set->(); + } + + if (%$opts && !$opts->{allow_unknown_options}) { + internal_error("$action $class: unknown option(s) " . join(', ', keys %$opts)); + } + $w; +} + +sub _gtk__Install_Button { + my ($w, $opts, $_class) = @_; + $opts->{child} = gtknew('HBox', spacing => 5, + children_tight => [ + # FIXME: not RTL compliant (lang::text_direction_rtl() ? ...) + gtknew('Image', file => 'advanced_expander'), + gtknew('Label', text => delete $opts->{text}), + ], + ); + $opts->{relief} = 'none'; + _gtk__Button($w, $opts, 'Button'); +} + +sub _gtk__Button { &_gtk_any_Button } +sub _gtk__ToggleButton { &_gtk_any_Button } +sub _gtk__CheckButton { &_gtk_any_Button } +sub _gtk__RadioButton { &_gtk_any_Button } +sub _gtk_any_Button { + my ($w, $opts, $class) = @_; + + if (!$w) { + my @radio_options; + if ($class eq 'RadioButton') { + @radio_options = delete $opts->{group}; + } + $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) : + delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : + $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : + "Gtk2::$class"->new(@radio_options); + + $w->{format} = delete $opts->{format} if exists $opts->{format}; + } + + if (my $widget = delete $opts->{child}) { + $w->add($widget); + $widget->show; + } + $w->set_image(delete $opts->{image}) if exists $opts->{image}; + $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { + eval { $w->set_label(may_apply($w->{format}, $$text_ref)) }; + }; + gtkval_register($w, $text_ref, $set); + $set->(); + } elsif (exists $opts->{text}) { + $w->set_label(delete $opts->{text}); + } elsif (exists $opts->{stock}) { + $w->set_label(delete $opts->{stock}); + $w->set_use_stock(1); + } + + if ($class eq 'Button') { + $w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked}; + } else { + if (my $active_ref = delete $opts->{active_ref}) { + my $set = sub { $w->set_active($$active_ref) }; + $w->signal_connect(toggled => sub { + gtkval_modify($active_ref, $w->get_active, $set); + }); + gtkval_register($w, $active_ref, $set); + gtkval_register($w, $active_ref, delete $opts->{toggled}) if exists $opts->{toggled}; + $set->(); + } else { + $w->set_active(delete $opts->{active}) if exists $opts->{active}; + $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; + } + } + $w; +} + +sub _gtk__CheckMenuItem { + my ($w, $opts, $class) = @_; + + if (!$w) { + add2hash_($opts, { mnemonic => 1 }); + + $w = $opts->{image} || !exists $opts->{text} ? "Gtk2::$class"->new : + delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_label(delete $opts->{text}) : + "Gtk2::$class"->new_with_mnemonic(delete $opts->{text}); + } + + $w->set_active(delete $opts->{active}) if exists $opts->{active}; + $w->signal_connect(toggled => delete $opts->{toggled}) if exists $opts->{toggled}; + $w; +} + +sub _gtk__SpinButton { + my ($w, $opts) = @_; + + if (!$w) { + $opts->{adjustment} ||= do { + add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} }); + Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + }; + $w = Gtk2::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); + } + + $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; + $w; +} + +sub _gtk__HScale { + my ($w, $opts) = @_; + + if (!$w) { + $opts->{adjustment} ||= do { + add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 }); + add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value}; + Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + }; + $w = Gtk2::HScale->new(delete $opts->{adjustment}); + } + + $w->set_digits(delete $opts->{digits}) if exists $opts->{digits}; + if (my $value_ref = delete $opts->{value_ref}) { + my $set = sub { $w->set_value($$value_ref) }; + gtkval_register($w, $value_ref, $set); + $set->(); + $w->signal_connect(value_changed => sub { + gtkval_modify($value_ref, $w->get_value, $set); + }); + } + $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; + $w; +} + +sub _gtk__ProgressBar { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::ProgressBar->new; + } + + if (my $fraction_ref = delete $opts->{fraction_ref}) { + my $set = sub { $w->set_fraction($$fraction_ref) }; + gtkval_register($w, $fraction_ref, $set); + $set->(); + } elsif (exists $opts->{fraction}) { + $w->set_fraction(delete $opts->{fraction}); + } + + $w; +} + +sub _gtk__VSeparator { &_gtk_any_simple } +sub _gtk__HSeparator { &_gtk_any_simple } +sub _gtk__Calendar { &_gtk_any_simple } + +sub _gtk__DrawingArea { + my ($w, $_opts) = @_; + + if (!$w) { + $w = Gtk2::DrawingArea->new; + } + $w; +} + +sub _gtk__Pixbuf { + my ($w, $opts) = @_; + + if (!$w) { + my $name = delete $opts->{file} or internal_error("missing file"); + my $file = _find_imgfile($name) or internal_error("cannot find image $name"); + if (my $size = delete $opts->{size}) { + $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1); + } else { + $w = Gtk2::Gdk::Pixbuf->new_from_file($file); + } + $w = $w->flip(1) if delete $opts->{flip}; + } + $w; +} + +# Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays +sub _gtk__Image_using_pixmap { &_gtk__Image } +# Image_using_pixbuf is rendered using DITHER_MAX & transparency which is much better on 16bpp displays +sub _gtk__Image_using_pixbuf { &_gtk__Image } +sub _gtk__Image { + my ($w, $opts, $class) = @_; + + if (!$w) { + $w = Gtk2::Image->new; + $w->{format} = delete $opts->{format} if exists $opts->{format}; + + $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock}; + + $w->{options} = { flip => delete $opts->{flip} }; + + $w->{set_from_file} = $class =~ /using_pixmap/ ? sub { + my ($w, $file) = @_; + my $pixmap = mygtk2::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); + $w->set_from_pixmap($pixmap, undef); + } : $class =~ /using_pixbuf/ ? sub { + my ($w, $file) = @_; + my $pixbuf = _pixbuf_render_alpha(gtknew('Pixbuf', file => $file, %{$w->{options}}), 255); + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + $w->set_size_request($width, $height); + $w->{pixbuf} = $pixbuf; + $w->signal_connect(expose_event => sub { + my (undef, $event) = @_; + if (!$w->{x}) { + my $alloc = $w->allocation; + $w->{x} = $alloc->x; + $w->{y} = $alloc->y; + } + # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: + if ($::isInstall) { + $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); + return; + } + foreach my $rect ($event->region->get_rectangles) { + my @values = $rect->values; + $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); + } + }); + } : sub { + my ($w, $file, $o_size) = @_; + my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}}); + $w->set_from_pixbuf($pixbuf); + }; + } + + if (my $name = delete $opts->{file}) { + my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("cannot find image $name"); + $w->{set_from_file}->($w, $file, delete $opts->{size}); + } elsif (my $file_ref = delete $opts->{file_ref}) { + my $set = sub { + my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("cannot find image $$file_ref"); + $w->{set_from_file}->($w, $file, delete $opts->{size}); + }; + gtkval_register($w, $file_ref, $set); + $set->() if $$file_ref; + } + $w; +} + +sub _gtk__WrappedLabel { + my ($w, $opts) = @_; + + $opts->{line_wrap} = 1 if !defined $opts->{line_wrap}; + _gtk__Label($w, $opts); +} + +our $left_padding = 20; + +sub _gtk__Label_Left { + my ($w, $opts) = @_; + $opts->{alignment} ||= [ 0, 0 ]; + $opts->{padding} ||= [ $left_padding, 0 ]; + _gtk__WrappedLabel($w, $opts); +} + +sub _gtk__Label_Right { + my ($w, $opts) = @_; + $opts->{alignment} ||= [ 1, 0.5 ]; + _gtk__Label($w, $opts); +} + + +sub _gtk__Label { + my ($w, $opts) = @_; + + if ($w) { + $w->set_text(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new; + $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable}; + $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize}; + $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; + $w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap}; + $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; + $w->modify_font(Gtk2::Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; + } + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { $w->set_text($$text_ref) }; + gtkval_register($w, $text_ref, $set); + $set->(); + } + + if (my $t = delete $opts->{text_markup}) { + $w->set_markup($t); + if ($w->get_text eq '') { + log::l("invalid markup in $t. not using the markup"); + $w->set_text($t); + } + } + $w; +} + + +sub _gtk__Alignment { + my ($w, $_opts) = @_; + + if (!$w) { + $w = Gtk2::Alignment->new(0, 0, 0, 0); + } + $w; +} + + +sub title1_to_markup { + my ($label) = @_; + if ($::isInstall) { + my $font = lang::l2pango_font($::o->{locale}{lang}); + if (my ($font_size) = $font =~ /(\d+)/) { + $font_size++; + $font =~ s/\d+/$font_size/; + } + qq($label); + } else { + qq($label); + } +} + +sub _gtk__Install_Title { + my ($w, $opts) = @_; + local $opts->{widget_name} = 'Banner'; + $opts->{text} = uc($opts->{text}) if $::isInstall; + gtknew('HBox', widget_name => 'Banner', children => [ + 0, gtknew('Label', padding => [ 6, 0 ]), + 1, gtknew('VBox', widget_name => 'Banner', children_tight => [ + _gtk__Title2($w, $opts), + if_($::isInstall, Gtk2::HSeparator->new), + ]), + 0, gtknew('Label', padding => [ 6, 0 ]), + ]); +} + +sub _gtk__Title1 { + my ($w, $opts) = @_; + $opts ||= {}; + $opts->{text_markup} = title1_to_markup(delete($opts->{label})) if $opts->{label}; + _gtk__WrappedLabel($w, $opts); +} + +sub _gtk__Title2 { + my ($w, $opts) = @_; + $opts ||= {}; + $opts->{alignment} = [ 0, 0 ]; + _gtk__Title1($w, $opts); +} + +sub _gtk__Sexy_IconEntry { + my ($w, $opts) = @_; + + require Gtk2::Sexy; + if (!$w) { + $w = Gtk2::Sexy::IconEntry->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + } + + $w->add_clear_button if delete $opts->{clear_button}; + if (my $icon = delete $opts->{primary_icon}) { + $w->set_icon('primary', $icon); + $w->set_icon_highlight('primary', $icon); + } + if (my $icon = delete $opts->{secondary_icon}) { + $w->set_icon('secondary', $icon); + $w->set_icon_highlight('secondary', $icon); + } + + $w->signal_connect('icon-released' => delete $opts->{'icon-released'}) if exists $opts->{'icon-released'}; + $w->signal_connect('icon-pressed' => delete $opts->{'icon-pressed'}) if exists $opts->{'icon-pressed'}; + + _gtk__Entry($w, $opts); +} + +sub _gtk__Entry { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::Entry->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + } + + if (my $icon = delete $opts->{primary_icon}) { + $w->set_icon_from_stock('primary', $icon); + #$w->set_icon_highlight('primary', $icon); + } + if (my $icon = delete $opts->{secondary_icon}) { + $w->set_icon_from_stock('secondary', $icon); + #$w->set_icon_highlight('secondary', $icon); + } + + $w->signal_connect('icon-release' => delete $opts->{'icon-release'}) if exists $opts->{'icon-release'}; + $w->signal_connect('icon-press' => delete $opts->{'icon-press'}) if exists $opts->{'icon-press'}; + + $w->set_text(delete $opts->{text}) if exists $opts->{text}; + $w->signal_connect(key_press_event => delete $opts->{key_press_event}) if exists $opts->{key_press_event}; + + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { $w->set_text($$text_ref) }; + gtkval_register($w, $text_ref, $set); + $set->(); + $w->signal_connect(changed => sub { + gtkval_modify($text_ref, $w->get_text, $set); + }); + } + + $w; +} + +sub _gtk__WeaknessCheckEntry { + my ($w, $opts) = @_; + + if (!$w) { + $w = _gtk__Entry($w, $opts); + } + + $w->signal_connect('changed' => sub { + require authentication; + my $password_weakness = authentication::compute_password_weakness($w->get_text); + $w->set_icon_from_pixbuf('GTK_ENTRY_ICON_SECONDARY', _get_weakness_icon($password_weakness)); + $w->set_icon_tooltip_text('GTK_ENTRY_ICON_SECONDARY', _get_weakness_tooltip($password_weakness)); + }); + + $w; +} + +sub _gtk__TextView { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::TextView->new; + $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; + $w->set_wrap_mode(delete $opts->{wrap_mode}) if exists $opts->{wrap_mode}; + $w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible}; + } + + _text_insert($w, delete $opts->{text}, append => $action eq 'gtkadd') if exists $opts->{text}; + $w; +} + +sub _gtk__WebKit_View { + my ($w, $opts, $_class, $_action) = @_; + if (!$w) { + $w = Gtk2::WebKit::WebView->new; + } + + # disable contextual menu: + if (delete $opts->{no_popup_menu}) { + $w->signal_connect('populate-popup' => sub { + my (undef, $menu) = @_; + $menu->destroy if $menu; + 1; + }); + } + + $w; +} + +sub _gtk__ComboBox { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::ComboBox->new_text; + $w->{format} = delete $opts->{format} if exists $opts->{format}; + + } + my $set_list = sub { + $w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list}; + $w->get_model->clear; + $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk2 + $w->append_text($_) foreach @{$w->{formatted_list}}; + }; + if (my $list_ref = delete $opts->{list_ref}) { + !$opts->{list} or internal_error("both list and list_ref"); + my $set = sub { + $w->{list} = $$list_ref; + $set_list->(); + }; + gtkval_register($w, $list_ref, $set); + $set->(); + } elsif (exists $opts->{list}) { + $w->{list} = delete $opts->{list}; + $set_list->(); + } + + if ($action eq 'gtknew') { + if (my $text_ref = delete $opts->{text_ref}) { + my $set = sub { + my $val = may_apply($w->{format}, $$text_ref); + eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) }; + }; + $w->signal_connect(changed => sub { + gtkval_modify($text_ref, $w->{list}[$w->get_active], $set); + }); + gtkval_register($w, $text_ref, $set); + gtkval_register($w, $text_ref, delete $opts->{changed}) if exists $opts->{changed}; + $set->(); + } else { + my $val = delete $opts->{text}; + eval { $w->set_active(find_index { $_ eq $val } @{$w->{formatted_list}}) } if defined $val; + $w->signal_connect(changed => delete $opts->{changed}) if exists $opts->{changed}; + } + } + $w; +} + +sub _gtk__ScrolledWindow { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk2::ScrolledWindow->new(undef, undef); + $w->set_policy(delete $opts->{h_policy} || 'automatic', delete $opts->{v_policy} || 'automatic'); + } + + my $faked_w = $w; + + if (my $child = delete $opts->{child}) { + if (member(ref($child), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::SimpleList Gtk2::SourceView::View Gtk2::Text Gtk2::TextView Gtk2::TreeView Gtk2::WebKit::WebView))) { + $w->add($child); + } else { + $w->add_with_viewport($child); + } + $child->set_focus_vadjustment($w->get_vadjustment) if $child->can('set_focus_vadjustment'); + $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/ && $child->get_left_margin <= 6; + $child->show; + + $w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + + if (ref($child) eq 'Gtk2::TextView' && delete $opts->{to_bottom}) { + $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child); + } + + if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk2::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) { + $faked_w = gtknew('Frame', shadow_type => 'in', child => $w); + } + } + $faked_w; +} + +sub _gtk__Frame { + my ($w, $opts) = @_; + + if ($w) { + $w->set_label(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = Gtk2::Frame->new(delete $opts->{text}); + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + } + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + +sub _gtk__Expander { + my ($w, $opts) = @_; + + if ($w) { + $w->set_label(delete $opts->{text}) if exists $opts->{text}; + } else { + $w = Gtk2::Expander->new(delete $opts->{text}); + } + + $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + + + +sub _gtk__MDV_Notebook { + my ($w, $opts, $_class, $_action) = @_; + if (!$w) { + import_style_ressources(); + + my ($layout, $selection_arrow, $selection_bar); + my $parent_window = delete $opts->{parent_window} || root_window(); + my $root_height = first($parent_window->get_size); + my $suffix = $root_height == 800 && !$::isStandalone ? '_600' : '_768'; + # the white square is a little bit above the actual left sidepanel: + my $offset = 20; + my $is_flip_needed = text_direction_rtl(); + my $filler = gtknew('Image', file => 'left-background-filler.png'); + my $filler_height = $filler->get_pixbuf->get_height; + my $left_background = gtknew('Image_using_pixbuf', file => 'left-background.png'); + my $lf_height = $left_background->{pixbuf}->get_height; + my @right_background = $::isInstall ? + gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) + : map { + gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); + } 1, 2, 2, 3; + my $width1 = $left_background->{pixbuf}->get_width; + my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width; + my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; + $w = gtknew('HBox', spacing => 0, children => [ + 0, $layout = gtknew('Layout', width => $total_width - $offset, children => [ #Layout Fixed + # stacking order is important for "Z-buffer": + [ $left_background, 0, 0 ], + if_($suffix ne '_600', + [ $filler, 0, $lf_height ], + [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height ], + [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height*2 ], + ), + [ $selection_bar = gtknew('Image', file => 'rollover.png'), 0, 0 ], # arbitrary vertical position + ($opts->{children} ? @{ delete $opts->{children} } : ()), + [ my $box = gtknew('VBox', spacing => 0, height => -1, children => [ + 0, $right_background[0], + if_(!$::isInstall, + 1, $right_background[1], + 1, $right_background[2], # enought up to to XYZx1280 resolution + 0, $right_background[3], + ), + ]), (text_direction_rtl() ? 0 : $width1 - $offset), 0 ], + # stack on top (vertical position is arbitrary): + [ $selection_arrow = gtknew('Image', file => 'steps_on', flip => $is_flip_needed), $arrow_x, 0, ], + ]), + 1, delete $opts->{right_child} || + gtknew('Image_using_pixbuf', file => "right-white-background_right_part$suffix", flip => $is_flip_needed), + ]); + + $w->signal_connect('size-allocate' => sub { + my (undef, $requisition) = @_; + state $width ||= $right_background[0]->get_pixbuf->get_width; + $box->set_size_request($width, $requisition->height); + }); + $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; + bless($w, 'Gtk2::MDV_Notebook'); + add2hash($w, { + arrow_x => $arrow_x, + layout => $layout, + selection_arrow => $selection_arrow, + selection_bar =>$selection_bar, + }); + } + $w; +} + + +sub _gtk__Fixed { + my ($w, $opts, $_class, $_action) = @_; + + if (!$w) { + $w = Gtk2::Fixed->new; + $w->set_has_window(delete $opts->{has_window}) if exists $opts->{has_window}; + _gtknew_handle_layout_children($w, $opts); + } + $w; +} + +sub _gtk__Layout { + my ($w, $opts, $_class, $_action) = @_; + + if (!$w) { + $w = Gtk2::Layout->new; + _gtknew_handle_layout_children($w, $opts); + } + $w; +} + +sub _gtknew_handle_layout_children { + my ($w, $opts) = @_; + $opts->{children} ||= []; + push @{$opts->{children}}, [ delete $opts->{child}, delete $opts->{x}, delete $opts->{y} ] if exists $opts->{child}; + foreach (@{$opts->{children}}) { + $w->put(@$_); + } + delete $opts->{children}; + + if ($opts->{pixbuf_file}) { + my $pixbuf = if_($opts->{pixbuf_file}, gtknew('Pixbuf', file => delete $opts->{pixbuf_file})); + $w->signal_connect( + realize => sub { + ugtk2::set_back_pixbuf($w, $pixbuf); + }); + } +} + + +sub _gtk__Window { &_gtk_any_Window } +sub _gtk__Dialog { &_gtk_any_Window } +sub _gtk__Plug { &_gtk_any_Window } +sub _gtk_any_Window { + my ($w, $opts, $class) = @_; + + if (!$w) { + if ($class eq 'Window') { + $w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel'); + } elsif ($class eq 'Plug') { + $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id"); + $w = "Gtk2::$class"->new(delete $opts->{socket_id}); + } elsif ($class eq 'FileChooserDialog') { + my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); + $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window, + $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok', + ); + } else { + $w = "Gtk2::$class"->new; + } + + if ($::isInstall || $::set_dialog_hint) { + $w->set_type_hint('dialog'); # for matchbox window manager + } + + $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $opts->{transient_for} ||= $::main_window if $::main_window; + $w->set_modal(1) if exists $opts->{transient_for}; + $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; + $w->set_default_size(delete $opts->{default_width} || -1, delete $opts->{default_height} || -1) if exists $opts->{default_width} || exists $opts->{default_height}; + my $icon_no_error = $opts->{icon_no_error}; + if (my $name = delete $opts->{icon} || delete $opts->{icon_no_error}) { + if (my $f = _find_imgfile($name)) { + $w->set_icon(gtknew('Pixbuf', file => $f)); + } elsif (!$icon_no_error) { + internal_error("cannot find $name"); + } + } + } + $w->set_title(delete $opts->{title}) if exists $opts->{title}; + + if (my $child = delete $opts->{child}) { + $w->add($child); + $child->show; + } + $w; +} + +my $previous_popped_and_reuse_window; + +sub destroy_previous_popped_and_reuse_window() { + $previous_popped_and_reuse_window or return; + + $previous_popped_and_reuse_window->destroy; + $previous_popped_and_reuse_window = undef; +} + +sub _gtk__MagicWindow { + my ($w, $opts) = @_; + + my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { + #- do not take into account the wizard banner + # FIXME!!! + any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children; + }; + + my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; + my $sub_child = delete $opts->{child}; + my $provided_banner = delete $opts->{banner}; + + if ($pop_it && $provided_banner) { + $sub_child = gtknew('VBox', children => [ 0, $provided_banner, if_($sub_child, 1, $sub_child) ]); + } else { + $sub_child ||= gtknew('VBox'); + } + if (!$pop_and_reuse) { + destroy_previous_popped_and_reuse_window(); + } + + if ($previous_popped_and_reuse_window && $pop_and_reuse) { + $w = $previous_popped_and_reuse_window; + $w->remove($w->child); + + gtkadd($w, child => $sub_child); + %$opts = (); + } elsif ($pop_it) { + $opts->{child} = $sub_child; + + $w = _create_Window($opts, ''); + $previous_popped_and_reuse_window = $w if $pop_and_reuse; + } else { + if (!$::WizardWindow) { + + my $banner; + if (!$::isEmbedded && !$::isInstall && $::Wizard_title) { + if (_find_imgfile($opts->{icon_no_error})) { + $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title); + } else { + log::l("ERROR: missing wizard banner $opts->{icon_no_error}"); + } + } + $::WizardTable = gtknew('VBox', if_($banner, children_tight => [ $banner ])); + + if ($::isEmbedded) { + add2hash($opts, { + socket_id => $::XID, + child => $::WizardTable, + }); + delete $opts->{no_Window_Manager}; + $::Plug = $::WizardWindow = _gtk(undef, 'Plug', 'gtknew', $opts); + sync($::WizardWindow); + } else { + add2hash($opts, { + child => $::WizardTable, + }); + $::WizardWindow = _create_Window($opts, 'special_center'); + } + } else { + %$opts = (); + } + + set_main_window_size($::WizardWindow); + + $w = $::WizardWindow; + + gtkadd($::WizardTable, children_tight => [ $provided_banner ]) if $provided_banner; + gtkadd($::WizardTable, children_loose => [ $sub_child ]); + } + bless { + real_window => $w, + child => $sub_child, pop_it => $pop_it, pop_and_reuse => $pop_and_reuse, + if_($provided_banner, banner => $provided_banner), + }, 'mygtk2::MagicWindow'; +} + +# A standard About dialog. Used with: +# my $w = gtknew('AboutDialog', ...); +# $w->show_all; +# $w->run; +sub _gtk__AboutDialog { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::AboutDialog->new; + $w->signal_connect(response => sub { $_[0]->destroy }); + $w->set_program_name(delete $opts->{name}) if exists $opts->{name}; + $w->set_version(delete $opts->{version}) if exists $opts->{version}; + $w->set_icon(gtknew('Pixbuf', file => delete $opts->{icon})) if exists $opts->{icon}; + $w->set_logo(gtknew('Pixbuf', file => delete $opts->{logo})) if exists $opts->{logo}; + $w->set_copyright(delete $opts->{copyright}) if exists $opts->{copyright}; + $w->set_url_hook(sub { + my (undef, $url) = @_; + run_program::raw({ detach => 1 }, 'www-browser', $url); + }); + $w->set_email_hook(sub { + my (undef, $url) = @_; + run_program::raw({ detach => 1 }, 'www-browser', $url); + }); + + if (my $url = delete $opts->{website}) { + $url =~ s/^https:/http:/; # Gtk2::About doesn't like "https://..." like URLs + $w->set_website($url); + } + $w->set_license(delete $opts->{license}) if exists $opts->{license}; + $w->set_wrap_license(delete $opts->{wrap_license}) if exists $opts->{wrap_license}; + $w->set_comments(delete $opts->{comments}) if exists $opts->{comments}; + $w->set_website_label(delete $opts->{website_label}) if exists $opts->{website_label}; + $w->set_authors(delete $opts->{authors}) if exists $opts->{authors}; + $w->set_documenters(delete $opts->{documenters}) if exists $opts->{documenters}; + $w->set_translator_credits(delete $opts->{translator_credits}) if exists $opts->{translator_credits}; + $w->set_artists(delete $opts->{artists}) if exists $opts->{artists}; + $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; + $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; + } + $w; +} + +sub _gtk__FileSelection { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::FileSelection->new(delete $opts->{title} || ''); + gtkset($w->ok_button, %{delete $opts->{ok_button}}) if exists $opts->{ok_button}; + gtkset($w->cancel_button, %{delete $opts->{cancel_button}}) if exists $opts->{cancel_button}; + } + $w; +} + +sub _gtk__FileChooserDialog { &_gtk_any_Window } + +sub _gtk__FileChooser { + my ($w, $opts) = @_; + + #- no nice way to have a {file_ref} on a FileChooser since selection_changed only works for browsing, not file/folder creation + + if (!$w) { + my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); + $w = Gtk2::FileChooserWidget->new($action); + + my $file = $opts->{file} && delete $opts->{file}; + + if (my $dir = delete $opts->{directory} || $file && dirname($file)) { + $w->set_current_folder($dir); + } + if ($file) { + if ($action =~ /save|create/) { + $w->set_current_name(basename($file)); + } else { + $w->set_filename($file); + } + } + } + $w; +} + +sub _gtk__VPaned { &_gtk_any_Paned } +sub _gtk__HPaned { &_gtk_any_Paned } +sub _gtk_any_Paned { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_position(delete $opts->{position}) if exists $opts->{position}; + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + foreach my $opt (qw(resize1 shrink1 resize2 shrink2)) { + $opts->{$opt} = 1 if !defined $opts->{$opt}; + } + $w->pack1(delete $opts->{child1}, delete $opts->{resize1}, delete $opts->{shrink1}); + $w->pack2(delete $opts->{child2}, delete $opts->{resize2}, delete $opts->{shrink2}); + $w; +} + +sub _gtk__VBox { &_gtk_any_Box } +sub _gtk__HBox { &_gtk_any_Box } +sub _gtk_any_Box { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; + $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + _gtknew_handle_children($w, $opts); + $w; +} + +sub _gtk__VButtonBox { &_gtk_any_ButtonBox } +sub _gtk__HButtonBox { &_gtk_any_ButtonBox } +sub _gtk_any_ButtonBox { + my ($w, $opts, $class, $action) = @_; + + if (!$w) { + $w = "Gtk2::$class"->new; + $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; + $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; + $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; + $w->set_layout(delete $opts->{layout} || 'spread'); + } elsif ($action eq 'gtkset') { + $_->destroy foreach $w->get_children; + } + + _gtknew_handle_children($w, $opts); + $w; +} + +sub _gtk__Notebook { + my ($w, $opts) = @_; + + if (!$w) { + $w = Gtk2::Notebook->new; + $w->set_property('show-tabs', delete $opts->{show_tabs}) if exists $opts->{show_tabs}; + $w->set_property('show-border', delete $opts->{show_border}) if exists $opts->{show_border}; + } + + if (exists $opts->{children}) { + foreach (group_by2(@{delete $opts->{children}})) { + my ($title, $page) = @$_; + $w->append_page($page, $title); + $page->show; + $title->show; + } + } + $w; +} + +sub _gtk__Table { + my ($w, $opts) = @_; + + if (!$w) { + add2hash_($opts, { xpadding => 5, ypadding => 0, border_width => $::isInstall ? 3 : 10 }); + + $w = Gtk2::Table->new(0, 0, delete $opts->{homogeneous} || 0); + $w->set_col_spacings(delete $opts->{col_spacings} || 0); + $w->set_row_spacings(delete $opts->{row_spacings} || 0); + $w->set_border_width(delete $opts->{border_width}); + $w->{$_} = delete $opts->{$_} foreach 'xpadding', 'ypadding', 'mcc'; + } + + each_index { + my ($i, $l) = ($::i, $_); + each_index { + my $j = $::i; + if ($_) { + ref $_ or $_ = Gtk2::WrappedLabel->new($_); + $w->attach($_, $j, $j + 1, $i, $i + 1, + $j != $#$l && !$w->{mcc} ? + ('fill', 'fill', $w->{xpadding}, $w->{ypadding}) : + (['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? + ['expand', 'fill'] : [], 0, 0)); + $_->show; + } + } @$l; + } @{delete $opts->{children} || []}; + + $w; +} + +sub _gtk_any_simple { + my ($w, $_opts, $class) = @_; + + $w ||= "Gtk2::$class"->new; +} + +sub _gtknew_handle_children { + my ($w, $opts) = @_; + + my @child = exists $opts->{children_tight} ? map { [ 0, $_ ] } @{delete $opts->{children_tight}} : + exists $opts->{children_loose} ? map { [ 1, $_ ] } @{delete $opts->{children_loose}} : + exists $opts->{children} ? group_by2(@{delete $opts->{children}}) : + exists $opts->{children_centered} ? + ([ 1, gtknew('VBox') ], (map { [ 0, $_ ] } @{delete $opts->{children_centered}}), [ 1, gtknew('VBox') ]) : + (); + + my $padding = delete $opts->{padding}; + + foreach (@child) { + my ($fill, $child) = @$_; + $fill eq '0' || $fill eq '1' || $fill eq 'fill' || $fill eq 'expand' or internal_error("odd {children} parameter must be 0 or 1 (got $fill)"); + ref $child or $child = Gtk2::WrappedLabel->new($child); + my $expand = $fill && $fill ne 'fill' ? 1 : 0; + $w->pack_start($child, $expand, $fill, $padding || 0); + $child->show; + } +} + +#- this magic function redirects method calls: +#- * default is to redirect them to the {child} +#- * if the {child} doesn't handle the method, we try with the {real_window} +#- (eg : add_accel_group set_position set_default_size +#- * a few methods are handled specially +my %for_real_window = map { $_ => 1 } qw(show_all size_request); +sub mygtk2::MagicWindow::AUTOLOAD { + my ($w, @args) = @_; + + my ($meth) = $mygtk2::MagicWindow::AUTOLOAD =~ /mygtk2::MagicWindow::(.*)/; + + my ($s1, @s2) = $meth eq 'show' + ? ('real_window', 'banner', 'child') : + $meth eq 'destroy' || $meth eq 'hide' ? + ($w->{pop_it} ? 'real_window' : ('child', 'banner')) : + $meth eq 'get' && $args[0] eq 'window-position' || + $for_real_window{$meth} || + !$w->{child}->can($meth) + ? 'real_window' + : 'child'; + +#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n"; + + $w->{$_} && $w->{$_}->$meth(@args) foreach @s2; + $w->{$s1}->$meth(@args); +} + +my $enable_quit_popup; +sub enable_quit_popup { + my ($bool) = @_; + $enable_quit_popup = $bool; +} + +state $in_callback; +sub quit_popup() { + return if !$enable_quit_popup; + if (!$in_callback) { + $in_callback = 1; + my $_guard = before_leaving { undef $in_callback }; + require ugtk2; + my $w = ugtk2->new(N("Confirmation"), grab => 1); + ugtk2::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel")); + my $ret = ugtk2::main($w); + return 1 if !$ret; + } +} + +sub quit_callback { + my ($w) = @_; + + return 1 if quit_popup(); + if ($::isWizard) { + $w->destroy; + die 'wizcancel'; + } else { + if (Gtk2->main_level) { + Gtk2->main_quit; + } else { + # block window deletion if not in main loop (eg: while starting the GUI) + return 1; + } + } +} + +sub _create_Window { + my ($opts, $special_center) = @_; + + my $no_Window_Manager = exists $opts->{no_Window_Manager} ? delete $opts->{no_Window_Manager} : !$::isStandalone; + + add2hash($opts, { + if_(!$::isInstall && !$::isWizard, border_width => 5), + + #- policy: during install, we need a special code to handle the weird centering, see below + position_policy => $special_center ? 'none' : + $no_Window_Manager ? 'center-always' : 'center-on-parent', + + if_($::isInstall, position => [ + $::stepswidth + ($::o->{windowwidth} - $::real_windowwidth) / 2, + ($::o->{windowheight} - $::real_windowheight) / 2, + ]), + }); + my $w = _gtk(undef, 'Window', 'gtknew', $opts); + + #- when the window is closed using the window manager "X" button (or alt-f4) + $w->signal_connect(delete_event => \&quit_callback); + + if ($::isInstall && !$::isStandalone) { + require install::gtk; #- for perl_checker + install::gtk::handle_unsafe_mouse($::o, $w); + $w->signal_connect(key_press_event => \&install::gtk::special_shortcuts); + + #- force center at a weird position, this can't be handled by position_policy + #- because center-* really are window manager hints for centering, whereas we want + #- to center the main window in the right part of the screen + my ($wi, $he); + $w->signal_connect(size_allocate => sub { + my (undef, $event) = @_; + my @w_size = $event->values; + + # ignore bogus sizing events: + return if $w_size[2] < 5; + return if $w_size[2] == $wi && $w_size[3] == $he; #BUG + (undef, undef, $wi, $he) = @w_size; + + $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), + max(0, ($::o->{windowheight} - $he) / 2)); + }) if $special_center; + } + + $w->present if $no_Window_Manager; + + $w; +} + +sub _find_imgfile { + my ($name) = @_; + + if ($name =~ m|/| && -f $name) { + $name; + } else { + foreach my $path (_icon_paths()) { + foreach ('', '.png', '.xpm', '.jpg') { + my $file = "$path/$name$_"; + -f $file and return $file; + } + } + } +} + +# _text_insert() can be used with any of choose one of theses styles: +# - no tags: +# _text_insert($textview, "My text.."); +# - anonymous tags: +# _text_insert($textview, [ [ 'first text', { 'foreground' => 'blue', 'background' => 'green', ... } ], +# [ 'second text' ], +# [ 'third', { 'font' => 'Serif 15', ... } ], +# ... ]); +# - named tags: +# $textview->{tags} = { +# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, +# 'big_font' => { 'font' => 'Serif 35', ... }, +# } +# _text_insert($textview, [ [ 'first text', 'blue_green' ], +# [ 'second', 'big_font' ], +# ... ]); +# - mixed anonymous and named tags: +# $textview->{tags} = { +# 'blue_green' => { 'foreground' => 'blue', 'background' => 'green', ... }, +# 'big_font' => { 'font' => 'Serif 35', ... }, +# } +# _text_insert($textview, [ [ 'first text', 'blue_green' ], +# [ 'second text' ], +# [ 'third', 'big_font' ], +# [ 'fourth', { 'font' => 'Serif 15', ... } ], +# ... ]); +sub _text_insert { + my ($textview, $t, %opts) = @_; + my $buffer = $textview->get_buffer; + $buffer->{tags} ||= {}; + $buffer->{gtk_tags} ||= {}; + my $gtk_tags = $buffer->{gtk_tags}; + my $tags = $buffer->{tags}; + if (ref($t) eq 'ARRAY') { + if (!$opts{append}) { + $buffer->set_text(''); + $textview->{anchors} = []; + } + foreach my $token (@$t) { + my ($item, $tag) = @$token; + my $iter1 = $buffer->get_end_iter; + if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) { + $buffer->insert_pixbuf($iter1, $item); + next; + } + if (ref($item) =~ /^Gtk2::/) { + my $anchor = $buffer->create_child_anchor($iter1); + $textview->add_child_at_anchor($item, $anchor); + $textview->{anchors} ||= []; + push @{$textview->{anchors}}, $anchor; + next; + } + if ($tag) { + if (ref($tag)) { + # use anonymous tags + $buffer->insert_with_tags($iter1, $item, $buffer->create_tag(undef, %$tag)); + } else { + # fast text insertion: + # since in some contexts (eg: localedrake, rpmdrake), we use quite a lot of identical tags, + # it's much more efficient and less memory pressure to use named tags + $gtk_tags->{$tag} ||= $buffer->create_tag($tag, %{$tags->{$token->[1]}}); + $buffer->insert_with_tags($iter1, $item, $gtk_tags->{$tag}); + } + } else { + $buffer->insert($iter1, $item); + } + } + } else { + if ($opts{append}) { + $buffer->insert($buffer->get_end_iter, $t); + } else { + $textview->{anchors} = []; + $buffer->set_text($t); + } + } + $textview->{to_bottom}->() if $textview->{to_bottom}; + + #- the following line is needed to move the cursor to the beginning, so that if the + #- textview has a scrollbar, it will not scroll to the bottom when focusing (#3633) + $buffer->place_cursor($buffer->get_start_iter); + $textview->set_wrap_mode($opts{wrap_mode} || 'word'); + $textview->set_editable($opts{editable} || 0); + $textview->set_cursor_visible($opts{visible} || 0); + $textview; +} + +sub _allow_scroll_TextView_to_bottom { + my ($scrolledWindow, $textView) = @_; + + $textView->get_buffer->create_mark('end', $textView->get_buffer->get_end_iter, 0); + sub { + my ($o_force) = @_; + my $adjustment = $scrolledWindow->get_vadjustment; + if ($o_force || $adjustment->page_size + $adjustment->value == $adjustment->upper) { + flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end + $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); + } + }; +} + +sub asteriskize { + my ($label) = @_; + "\x{2022} " . $label; +} + +sub get_main_window_size() { + $::real_windowwidth ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400); +} + +# in order to workaround infamous 6 years old gnome bug #101968: +sub get_label_width() { + first(mygtk2::get_main_window_size()) - 55 - $left_padding; +} + +sub set_main_window_size { + my ($window) = @_; + my ($width, $height) = get_main_window_size(); + $window->set_size_request($width, $height); +} + +my @icon_paths; +sub add_icon_path { push @icon_paths, @_ } +sub _icon_paths() { + (@icon_paths, (exists $ENV{SHARE_PATH} ? ($ENV{SHARE_PATH}, "$ENV{SHARE_PATH}/icons", "$ENV{SHARE_PATH}/libDrakX/pixmaps") : ()), + "/usr/lib/libDrakX/icons", "pixmaps", 'data/icons', 'data/pixmaps', 'standalone/icons', '/usr/share/rpmdrake/icons'); +} + +sub main { + my ($window, $o_verif) = @_; + my $destroyed; + $window->signal_connect(destroy => sub { $destroyed = 1 }); + $window->show; + do { Gtk2->main } while (!$destroyed && $o_verif && !$o_verif->()); + may_destroy($window); + flush(); +} + +sub sync { + my ($window) = @_; + $window->show; + flush(); +} + +sub flush() { + Gtk2->main_iteration while Gtk2->events_pending; +} + +sub enable_sync_flush { + my ($w) = @_; + $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); +} + +sub sync_flush { + my ($w) = @_; + # hackish :-( + mygtk2::sync($w) while !$w->{displayed}; +} + + +sub register_main_window { + my ($w) = @_; + push @::main_windows, $::main_window = $w; +} + +sub may_destroy { + my ($w) = @_; + return if !$w; + @::main_windows = difference2(\@::main_windows, [ $w->{real_window} ]); + if ($::main_window eq $w->{real_window}) { + undef $::main_window; + $::main_window = $::main_windows[-1]; + } + $w->destroy; +} + +sub root_window() { + state $root; + $root ||= Gtk2::Gdk->get_default_root_window; +} + +sub rgb2color { + my ($r, $g, $b) = @_; + my $color = Gtk2::Gdk::Color->new($r, $g, $b); + root_window()->get_colormap->rgb_find_color($color); + $color; +} + +sub set_root_window_background { + my ($r, $g, $b) = @_; + my $root = root_window(); + my $gc = Gtk2::Gdk::GC->new($root); + my $color = rgb2color($r, $g, $b); + $gc->set_rgb_fg_color($color); + set_root_window_background_with_gc($gc); +} + +sub set_root_window_background_with_gc { + my ($gc) = @_; + my $root = root_window(); + my ($w, $h) = $root->get_size; + $root->set_background($gc->get_values->{foreground}); + $root->draw_rectangle($gc, 1, 0, 0, $w, $h); +} + +sub _new_alpha_pixbuf { + my ($pixbuf) = @_; + my ($height, $width) = ($pixbuf->get_height, $pixbuf->get_width); + my $new_pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height); + $new_pixbuf->fill(0x00000000); # transparent white + $width, $height, $new_pixbuf; +} + +sub _pixbuf_render_alpha { + my ($pixbuf, $alpha_threshold) = @_; + my ($width, $height, $new_pixbuf) = _new_alpha_pixbuf($pixbuf); + $pixbuf->composite($new_pixbuf, 0, 0, $width, $height, 0, 0, 1, 1, 'bilinear', $alpha_threshold); + $new_pixbuf; +} + +sub pixmap_from_pixbuf { + my ($widget, $pixbuf) = @_; + my $window = $widget->window or internal_error("you can't use this function if the widget is not realised"); + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $pixmap; +} + +sub import_style_ressources() { + if (!$::isInstall) { + Gtk2::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG + } +} + +sub text_direction_rtl() { + Gtk2::Widget->get_default_direction eq 'rtl'; +} + +sub _get_weakness_icon { + my ($password_weakness) = @_; + my %weakness_icon = ( + 1 => gtknew('Pixbuf', file => 'security-low'), + 2 => gtknew('Pixbuf', file => 'security-low'), + 3 => gtknew('Pixbuf', file => 'security-medium'), + 4 => gtknew('Pixbuf', file => 'security-strong'), + 5 => gtknew('Pixbuf', file => 'security-strong')); + my $weakness_icon = $weakness_icon{$password_weakness} || return undef; + $weakness_icon; +} + +sub _get_weakness_tooltip { + my ($password_weakness) = @_; + my %weakness_tooltip = ( + 1 => N("Password is trivial to guess"), + 2 => N("Password is trivial to guess"), + 3 => N("Password should be resistant to basic attacks"), + 4 => N("Password seems secure"), + 5 => N("Password seems secure")); + my $weakness_tooltip = $weakness_tooltip{$password_weakness} || return undef; + return $weakness_tooltip; +} + +package Gtk2::MDV_Notebook; # helper functions for installer & mcc +our @ISA = qw(Gtk2::Widget); + +sub hide_selection { + my ($w) = @_; + $_->hide foreach $w->{selection_bar}, $w->{selection_arrow}; +} + +sub move_selection { + my ($w, $label) = @_; + my $layout = $w->{layout}; + $layout->{arrow_ydiff} ||= + ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; + my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; + $layout->move($w->{selection_bar}, 0, $bar_y); + $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer + $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; +} + +1; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm new file mode 100644 index 000000000..3db9ff814 --- /dev/null +++ b/perl-install/ugtk2.pm @@ -0,0 +1,1652 @@ +package ugtk2; + +use diagnostics; +use strict; +use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- leave it on one line, for automatic removal of the line at package creation +use locale; + +@ISA = qw(Exporter); +%EXPORT_TAGS = ( + wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy + gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ + gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot + gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap + gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name + gtkset_property gtkset_relief gtkset_selectable gtkset_sensitive gtkset_shadow_type gtkset_size_request + gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append + gtktext_insert ) ], + + helpers => [ qw(add2notebook add_icon_path escape_text_for_TextView_markup_format gtkcolor gtkcreate_img + gtkcreate_pixbuf gtkfontinfo gtkset_background gtktreeview_children set_back_pixmap + get_default_step_items set_default_step_items + string_size string_width) ], + + create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu + create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable + create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ], + + ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn + ask_yesorno) ], + dialogs => [ qw(err_dialog info_dialog warn_dialog) ], + +); +$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; +@EXPORT_OK = map { @$_ } values %EXPORT_TAGS; + +use c; +use log; +use common; +use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version + +use Gtk2; + + +$border = 5; + +sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# wrappers +# +# Functional-style wrappers to existing Gtk functions; allows to program in +# a more functional way, and especially, first, to avoid using temp +# variables, and second, to "see" directly in the code the user interface +# you're building. + +sub gtkdestroy { mygtk2::may_destroy($_[0]) } +sub gtkflush() { mygtk2::flush() } +sub gtkhide { $_[0]->hide; $_[0] } +sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } +sub gtkpack { gtkpowerpack(1, 1, @_) } +sub gtkpack_ { gtkpowerpack('arg', 1, @_) } +sub gtkpack__ { gtkpowerpack(0, 1, @_) } +sub gtkpack2 { gtkpowerpack(1, 0, @_) } +sub gtkpack2_ { gtkpowerpack('arg', 0, @_) } +sub gtkpack2__ { gtkpowerpack(0, 0, @_) } +sub gtkput { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] } +sub gtkresize { $_[0]->window->resize($_[1], $_[2]); $_[0] } +sub gtkset_active { $_[0]->set_active($_[1]); $_[0] } +sub gtkset_border_width { $_[0]->set_border_width($_[1]); $_[0] } +sub gtkset_editable { $_[0]->set_editable($_[1]); $_[0] } +sub gtkset_selectable { $_[0]->set_selectable($_[1]); $_[0] } +sub gtkset_justify { $_[0]->set_justify($_[1]); $_[0] } +sub gtkset_alignment { $_[0]->set_alignment($_[1], $_[2]); $_[0] } +sub gtkset_layout { $_[0]->set_layout($_[1]); $_[0] } +sub gtkset_modal { $_[0]->set_modal($_[1]); $_[0] } +sub gtkset_mousecursor_normal { gtkset_mousecursor('left-ptr', @_) } +sub gtkset_mousecursor_wait { gtkset_mousecursor('watch', @_) } +sub gtkset_relief { $_[0]->set_relief($_[1]); $_[0] } +sub gtkset_sensitive { $_[0]->set_sensitive($_[1]); $_[0] } +sub gtkset_visibility { $_[0]->set_visibility($_[1]); $_[0] } +sub gtkset_tip { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] } +sub gtkset_shadow_type { $_[0]->set_shadow_type($_[1]); $_[0] } +sub gtkset_style { $_[0]->set_style($_[1]); $_[0] } +sub gtkset_size_request { $_[0]->set_size_request($_[1], $_[2]); $_[0] } +sub gtkshow { $_[0]->show; $_[0] } +sub gtksize { $_[0]->size($_[1], $_[2]); $_[0] } +sub gtkset_markup { $_[0]->set_markup($_[1]); $_[0] } +sub gtkset_line_wrap { $_[0]->set_line_wrap($_[1]); $_[0] } + +sub gtkadd { + my $w = shift; + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); + $w->add(gtkshow($l)); + } + $w; +} + +sub gtkadd_widget { + my $sg = shift; + map { + my $l = $_; + ref $l or $l = gtknew('WrappedLabel', text => $l); + $sg->add_widget($l); + $l; + } @_; +} + +sub gtkappend { + my $w = shift; + foreach my $l (@_) { + ref $l or $l = gtknew('WrappedLabel', text => $l); + $w->append(gtkshow($l)); + } + $w; +} + +sub gtkappenditems { + my $w = shift; + $_->show foreach @_; + $w->append_items(@_); + $w; +} + +# append page to a notebook +sub gtkappend_page { + my ($notebook, $page, $o_title) = @_; + $notebook->append_page($page, $o_title); + $notebook; +} + +sub gtkentry { + my ($o_text) = @_; + my $e = gtknew('Entry'); + $o_text and $e->set_text($o_text); + $e; +} + +sub gtksetstyle { + my ($w, $s) = @_; + $w->set_style($s); + $w; +} + +sub gtkradio { + my $def = shift; + my $radio; + map { + my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); + $w->get_child->set_line_wrap(1); + $w; + } @_; +} + +sub gtkroot() { mygtk2::root_window() } +sub gtkcolor { &mygtk2::rgb2color } +sub gtkset_background { &mygtk2::set_root_window_background } + +sub gtkset_text { + my ($w, $s) = @_; + $w->set_text($s); + $w; +} + +sub gtkcombo_setpopdown_strings { + my $w = shift; + $w->set_popdown_strings(@_); + $w; +} + +sub gtkset_mousecursor { + my ($type, $w) = @_; + ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type)); + $w; +} + +sub gtksignal_connect { + my $w = shift; + $w->signal_connect(@_); + $w; +} + +sub gtkset_name { + my ($widget, $name) = @_; + $widget->set_name($name); + $widget; +} + + +sub gtkpowerpack { + #- Get Default Attributes (if any). 2 syntaxes allowed : + #- gtkpowerpack( {expand => 1, fill => 0}, $box...) : the attributes are picked from a specified hash ref + #- gtkpowerpack(1, 0, 1, $box, ...) : the attributes are picked from the non-ref list, in the order (expand, fill, padding, pack_end). + my @attributes_list = qw(expand fill padding pack_end); + my $default_attrs = {}; + if (ref($_[0]) eq 'HASH') { + $default_attrs = shift; + } elsif (!ref($_[0])) { + foreach (@attributes_list) { + ref($_[0]) and last; + $default_attrs->{$_} = shift; + } + } + my $box = shift; + + while (@_) { + #- Get attributes (if specified). 4 syntaxes allowed (default values are undef ie. false...) : + #- gtkpowerpack({defaultattrs}, $box, $widget1, $widget2, ...) : the attrs are picked from the default ones (if they exist) + #- gtkpowerpack($box, {fill=>1, expand=>0, ...}, $widget1, ...) : the attributes are picked from a specified hash ref + #- gtkpowerpack($box, [1,0,1], $widget1, ...) : the attributes are picked from the array ref : (expand, fill, padding, pack_end). + #- gtkpowerpack({attr=>'arg'}, $box, 1, $widget1, 0, $widget2, etc...) : the 'arg' value will tell gtkpowerpack to always read the + #- attr value directly in the arg list (avoiding confusion between value 0 and Gtk::Label("0"). That can simplify some writings but + #- this arg(s) MUST then be present... + my (%attr, $attrs); + ref($_[0]) eq 'HASH' || ref($_[0]) eq 'ARRAY' and $attrs = shift; + foreach (@attributes_list) { + if (($default_attrs->{$_} || '') eq 'arg') { + ref($_[0]) and internal_error "error in packing definition\n"; + $attr{$_} = shift; + ref($attrs) eq 'ARRAY' and shift @$attrs; + } elsif (ref($attrs) eq 'HASH' && defined($attrs->{$_})) { + $attr{$_} = $attrs->{$_}; + } elsif (ref($attrs) eq 'ARRAY') { + $attr{$_} = shift @$attrs; + } elsif (defined($default_attrs->{$_})) { + $attr{$_} = int $default_attrs->{$_}; + } else { + $attr{$_} = 0; + } + } + #- Get and pack the widget (create it if necessary to a label...) + my $widget = ref($_[0]) ? shift : gtknew('WrappedLabel', text => shift); + my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start'); + $box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding}); + $widget->show; + } + return $box; +} + +sub gtktreeview_children { + my ($model, $iter) = @_; + my @l; + $model or return; + for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { + push @l, $p; + } + @l; +} + + + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# create +# +# Helpers that allow omitting common operations on common widgets +# (e.g. create widgets with good default properties) + +sub create_pixbutton { + my ($label, $pix, $reverse_order) = @_; + my @label_and_pix = (0, $label, if_($pix, 0, $pix)); + gtkadd(gtknew('Button'), + gtknew('HBox', spacing => 3, children => [ + 1, "", + $reverse_order ? reverse(@label_and_pix) : @label_and_pix, + 1, "", + ])); +} + +sub create_adjustment { + my ($val, $min, $max) = @_; + Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1); +} + +sub create_scrolled_window { + my ($W, $o_policy, $o_viewport_shadow) = @_; + gtknew('ScrolledWindow', ($o_policy ? (h_policy => $o_policy->[0], v_policy => $o_policy->[1]) : ()), + child => $W, if_($o_viewport_shadow, shadow_type => $o_viewport_shadow)); +} + +sub n_line_size { + my ($nbline, $type, $widget) = @_; + my $spacing = ${{ text => 3, various => 17 }}{$type}; + my %fontinfo = gtkfontinfo($widget); + round($nbline * ($fontinfo{ascent} + $fontinfo{descent} + $spacing) + 8); +} + +# Glib::Markup::escape_text() if no use for us because it'll do extra +# s/X/&foobar;/ (such as s/'/'/) that are suitable for +# Gtk2::Labels but are not for Gtk2::TextViews, resulting in +# displaying the raw enriched text instead... +# +sub escape_text_for_TextView_markup_format { + my ($str) = @_; + my %rules = ('&' => '&', + '<' => '<', + '>' => '>', + ); + eval { $str =~ s!([&<>])!$rules{$1}!g }; #^(&(amp|lt|gt);)!!) { + if (my $err = $@) { + internal_error("$err\n$str"); + } + $str; +} + +sub markup_to_TextView_format { + my ($s, $o_default_attrs) = @_; + require interactive; + my $l = interactive::markup_parse($s) or return $s; + + foreach (@$l) { + my ($_txt, $attrs) = @$_; + if ($attrs) { + $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; + $attrs->{size} eq 'larger' and do { + $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' + delete $attrs->{size}; + }; + } + #- nb: $attrs may be empty, need special handling if $o_default_attrs is used + add2hash_($_->[1] ||= {}, $o_default_attrs) if $o_default_attrs; + } + $l; +} + +sub create_box_with_title { + my ($o, @l) = @_; + + my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @l); + my $box = gtknew('VBox'); + if ($nbline == 0) { + $o->{box_size} = 0; + return $box; + } + $o->{box_size} = n_line_size($nbline, 'text', $box); + if (@l <= 2 && $nbline > 4) { + $o->{icon} && !$::isWizard and + eval { gtkpack__($box, gtknew('HBox', border_width => 5, children_loose => [ gtkcreate_img($o->{icon}) ])) }; + my $wanted = $o->{box_size}; + $o->{box_size} = min(200, $o->{box_size}); + my $has_scroll = $o->{box_size} < $wanted; + + chomp(my $text = join("\n", @l)); + my $wtext = gtknew('TextView', text => markup_to_TextView_format($text)); + $wtext->set_justification('fill'); + $wtext->set_left_margin(12); + $wtext->set_right_margin(12); + $wtext->can_focus($has_scroll); + my $width = 400; + my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); + $scroll->signal_connect(realize => sub { + my $layout = $wtext->create_pango_layout($text); + $layout->set_width(($width - 10) * Gtk2::Pango->scale); + $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); + $o->{rwindow}->queue_resize; + }); + gtkpack_($box, $o->{box_allow_grow} || 0, $scroll); + } else { + my $new_label = sub { + my ($txt) = @_; + ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()); + }; + gtkpack__($box, + if_($::isWizard, gtknew('Label', height => 10)), + (map { + my $w = $new_label->($_); + $::isWizard ? gtknew('HBox', children_tight => [ gtknew('Label', width => 20), $w ]) + : $w; + } @l), + if_($::isWizard, gtknew('Label', height => 15)), + ); + } +} + +sub _create_dialog { + my ($title, $o_options) = @_; + my $options = $o_options || {}; + + #- keep compatibility with "transient" now called "transient_for" + $options->{transient_for} = delete $options->{transient} if $options->{transient}; + + gtknew('Dialog', title => $title, + position_policy => 'center-on-parent', # center-on-parent does not work + modal => 1, + if_(!$::isInstall, icon_no_error => wm_icon()), + %$options, allow_unknown_options => 1, + ); +} + + +# drakfloppy / drakfont / harddrake2 / mcc +sub create_dialog { + my ($title, $label, $o_options) = @_; + my $ret = 0; + $o_options ||= {}; + $o_options->{transient_for} = $::main_window if !$o_options->{transient_for} && $::main_window; + + my $dialog = gtkset_border_width(_create_dialog($title, $o_options), 10); + $dialog->set_border_width(10); + my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label); + gtkpack($dialog->vbox, + gtknew('HBox', children => [ + if_($o_options->{stock}, + 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'), + 0, gtknew('Label', text => " "), + ), + 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, + ]), + ); + + if ($o_options->{cancel}) { + $dialog->action_area->pack_start( + gtknew('Button', text => N("Cancel"), + clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }, + can_default => 1), + 1, 1, 0); + } + + my $button = gtknew('Button', text => N("Ok"), can_default => 1, + clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); + $dialog->action_area->pack_start($button, 1, 1, 0); + $button->grab_default; + + $dialog->set_has_separator(0); + $dialog->show_all; + Gtk2->main; + $ret; +} + +sub info_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-info' }); + create_dialog($title, $label, $o_options); +} + +sub warn_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 }); + create_dialog($title, $label, $o_options); +} + +sub err_dialog { + my ($title, $label, $o_options) = @_; + $o_options ||= { }; + add2hash_($o_options, { stock => 'gtk-dialog-error' }); + create_dialog($title, $label, $o_options); +} + +sub create_hbox { gtknew('HButtonBox', layout => $_[0]) } +sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } + +sub create_factory_menu_ { + my ($type, $name, $window, @menu_items) = @_; + my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new); + $widget->create_items($window, @menu_items); + $window->add_accel_group($accel_group); + ($widget->get_widget($name), $widget); +} + +sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '
', @_) } +sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '
', @_) } + +sub create_menu { + my $title = shift; + my $w = Gtk2::MenuItem->new($title); + $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_))); + $w; +} + +sub create_notebook { + my $book = gtknew('Notebook'); + while (@_) { + my ($page, $title) = splice(@_, 0, 2); + gtkappend_page($book, $page, $title); + } + $book; +} + +sub create_packtable { + my ($options, @l) = @_; + my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0); + add2hash_($options, { xpadding => 5, ypadding => 0 }); + each_index { + my ($i, $l) = ($::i, $_); + each_index { + my $j = $::i; + if ($_) { + ref $_ or $_ = gtknew('WrappedLabel', text => $_); + $j != $#$l && !$options->{mcc} ? + $w->attach($_, $j, $j + 1, $i, $i + 1, + 'fill', 'fill', $options->{xpadding}, $options->{ypadding}) : + $w->attach($_, $j, $j + 1, $i, $i + 1, + ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); + $_->show; + } + } @$l; + } @l; + $w->set_col_spacings($options->{col_spacings} || 0); + $w->set_row_spacings($options->{row_spacings} || 0); + gtkset_border_width($w, $::isInstall ? 3 : 10); +} + +my $wm_is_kde; +sub create_okcancel { + my ($w, $o_ok, $o_cancel, $_o_spread, @other) = @_; + # @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button) + # extra buttons have the following structure [ label, handler, is_first, pack_right ] + local $::isWizard = $::isWizard && !$w->{pop_it}; + my $cancel; + if (defined $o_cancel || defined $o_ok) { + $cancel = $o_cancel; + } elsif (!$::Wizard_no_previous) { + $cancel = $::isWizard ? N("Previous") : N("Cancel"); + } + my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); + my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit })); + my $bprev; + if ($cancel) { + $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || + sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); + } + $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel; + if (!defined $wm_is_kde) { + require any; + my $wm = any::running_window_manager(); + $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0; + } + my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ? + $_[0][0] : + gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; + my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && !$_->[3] } @other); + my @right = ((map { $f->($_) } grep { $_->[2] && $_->[3] } @other), + map { $f->($_) } grep { !$_->[2] && $_->[3] } @other); + # we put space to group buttons in two packs (but if there's only one when not in wizard mode) + # but in the installer where all windows run in wizard mode because of design even when not in a wizard step + $bprev = gtknew('Label') if !$cancel && $::Wizard_no_previous && !@left && !@right; + if ($::isWizard || $w->{pop_it}) { + # wizard mode: order is cancel/left_extras/white/right_extras/prev/next + unshift @left, $w->{wizcancel} if $w->{wizcancel}; + push @right, $bprev, $bok; + } else { + # normal mode: cancel/ok button follow GNOME's HIG + unshift @left, ($wm_is_kde ? $bok : $bprev); + push @left, gtknew('Label') if $ok && $cancel; # space buttons but if there's only one button + push @right, ($wm_is_kde ? $bprev : $bok); + } + + gtknew('VBox', spacing => 5, children_loose => [ + gtknew('HBox', height => 5), + gtknew('HSeparator'), + gtknew('HBox', children_loose => [ + map { + gtknew('HButtonBox', spacing => 5, layout => $_->[1], + children_loose => [ + map { + $_->can_default($::isWizard); + $_; + } grep { $_ } @{$_->[0]} + ]); + } ([ \@left, 'start' ], + [ \@right, 'end' ], + ) + ]), + ]); +} + +sub _setup_paned { + my ($paned, $child1, $child2, %options) = @_; + foreach ([ 'resize1', 0 ], [ 'shrink1', 1 ], [ 'resize2', 1 ], [ 'shrink2', 1 ]) { + $options{$_->[0]} = $_->[1] unless defined($options{$_->[0]}); + } + $paned->pack1(gtkshow($child1), $options{resize1}, $options{shrink1}); + $paned->pack2(gtkshow($child2), $options{resize2}, $options{shrink2}); + gtkshow($paned); +} + +sub create_vpaned { + _setup_paned(Gtk2::VPaned->new, @_); +} + +sub create_hpaned { + _setup_paned(Gtk2::HPaned->new, @_); +} + +sub gtkcreate_frame { + my ($label) = @_; + gtknew('Frame', text => $label, border_width => 5); +} + + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# helpers +# +# Functions that do typical operations on widgets, that you may need in +# several places of your programs. + +sub _find_imgfile { + my ($name) = @_; + + if ($name =~ m|/| && -f $name) { + $name; + } else { + foreach my $path (icon_paths()) { + foreach ('', '.png', '.xpm') { + my $file = "$path/$name$_"; + -f $file and return $file; + } + } + } +} + +# use it if you want to display an icon/image in your app +sub gtkcreate_img { + my ($file, $o_size) = @_; + gtknew('Image', file => $file, if_($o_size, size => $o_size)); +} + +# use it if you want to draw an image onto a drawingarea +sub gtkcreate_pixbuf { + my ($file, $o_size) = @_; + gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); +} + +sub gtktext_append { gtktext_insert(@_, append => 1) } + +sub may_set_icon { + my ($w, $name) = @_; + if (my $f = $name && _find_imgfile($name)) { + $w->set_icon(gtkcreate_pixbuf($f)); + } +} + +sub gtktext_insert { &mygtk2::_text_insert } +sub icon_paths { &mygtk2::_icon_paths } +sub add_icon_path { &mygtk2::add_icon_path } + +sub set_main_window_size { + my ($o) = @_; + mygtk2::set_main_window_size($o->{rwindow}); +} + +# extracts interesting font metrics for a given widget +sub gtkfontinfo { + my ($widget) = @_; + my $context = $widget->get_pango_context; + my $metrics = $context->get_metrics($context->get_font_description, $context->get_language); + my %fontinfo; + foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { + no strict; + my $func = "get_$_"; + $fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func); + } + %fontinfo; +} + +sub gtkmodify_font { + my ($w, $arg) = @_; + $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg)); + $w; +} + +sub gtkset_property { + my ($w, $property, $value) = @_; + $w->set_property($property, $value); + $w; +} + +sub set_back_pixbuf { + my ($widget, $pixbuf) = @_; + my $window = $widget->window; + my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); + my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $window->set_back_pixmap($pixmap, 0); +} + +sub set_back_pixmap { + my ($w) = @_; + return if !$w->realized; + my $window = $w->window; + my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); + + my $style = $w->get_style; + $pixmap->draw_points($style->bg_gc('normal'), 0, 0); + $pixmap->draw_points($style->base_gc('normal'), 0, 1); + $window->set_back_pixmap($pixmap); +} + +sub add2notebook { + my ($n, $title, $book) = @_; + $n->append_page($book, gtkshow(gtknew('Label', text => $title))); + $book->show; +} + +sub string_size { + my ($widget, $text) = @_; + my $layout = $widget->create_pango_layout($text); + my @size = $layout->get_pixel_size; + @size; +} + +sub string_width { + my ($widget, $text) = @_; + my ($width, undef) = string_size($widget, $text); + $width; +} + + +my ($def_step_title); +sub set_default_step_items { + $def_step_title = translate($_[0]); +} + +sub get_default_step_items { ($def_step_title) } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# toplevel window creation helper +# +# Use the 'new' function as a method constructor and then 'main' on it to +# launch the main loop. Use $o->{retval} to indicate that the window needs +# to terminate. +# Set $::isWizard to have a wizard appearance. +# Set $::isEmbedded and $::XID so that the window will plug. + +sub new { + my ($type, $title, %opts) = @_; + + my $o = bless { %opts }, $type; + while (my $e = shift @tempory::objects) { $e->destroy } + + my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon}; + my $banner_title = $opts{banner_title}; + $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window}; + my $window = gtknew( + 'MagicWindow', + title => $title || '', + pop_it => $o->{pop_it}, + $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), + $::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (), + width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, + modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal}, + no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone, + if_(!$::isInstall, icon_no_error => wm_icon()), + if_($o->{transient}, transient_for => $o->{transient}), + ); + mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; + $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded; + + $o->{rwindow} = $o->{window} = $window; + $o->{real_window} = $window->{real_window}; + $o->{pop_it} = $window->{pop_it}; + + $o; +} + +sub main { + my ($o, $o_completed, $o_canceled) = @_; + gtkset_mousecursor_normal(); + + $o->show; + mygtk2::main($o->{rwindow}, + sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() }); + $o->{retval}; +} +sub show($) { + my ($o) = @_; + $o->{rwindow}->show; +} +sub destroy($) { + my ($o) = @_; + $o->{rwindow}->destroy; + flush(); +} +sub DESTROY { goto &destroy } +sub sync { + my ($o) = @_; + show($o); + flush(); +} +sub flush() { gtkflush() } +sub shrink_topwindow { + my ($o) = @_; + $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1)); +} +sub exit { + gtkset_mousecursor_normal(); #- for restoring a normal in any case + flush(); + if ($::isStandalone) { + require standalone; + standalone::__exit($_[1]); #- workaround + } else { + c::_exit($_[1]); #- workaround + } +} + +#- in case "exit" above was not called by the program +END { &exit() } + +# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- +# ask +# +# Full UI managed functions that will return to you the value that the +# user chose. + +sub ask_warn { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) } +sub ask_yesorno { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } +sub ask_okcancel { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } +sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) } +sub ask_dir { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) } + +sub _ask_from_entry($$@) { + my ($o, @msgs) = @_; + my $entry = gtknew('Entry'); + my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit }; + $o->{ok_clicked} = $f; + $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit }; + + gtkadd($o->{window}, + gtkpack($o->create_box_with_title(@msgs), + gtksignal_connect($entry, 'activate' => $f), + ($o->{hide_buttons} ? () : create_okcancel($o))), + ); + $entry->grab_focus; +} + +sub _ask_warn($@) { + my ($o, @msgs) = @_; + gtkadd($o->{window}, + gtkpack($o->create_box_with_title(@msgs), + my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }), + ), + ); + $w->grab_focus; +} + +sub _ask_okcancel($@) { + my ($o, @msgs) = @_; + my ($ok, $cancel) = splice @msgs, -2; + + gtkadd($o->{window}, + gtkpack(create_box_with_title($o, @msgs), + create_okcancel($o, $ok, $cancel), + ) + ); + $o->{ok}->grab_focus; +} + +sub create_file_selector { + my (%opts) = @_; + my $w = ugtk2->new(delete $opts{title}, modal => 1); + my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir}); + my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open'); + add2hash(\%opts, { width => 480, height => 250 }); + gtkadd($w->{window}, + gtkpack_(create_box_with_title($w, $message), + 1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts), + 0, create_okcancel($w), + )); + $w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked }); + $w; +} + +sub file_selected_check { + my ($save, $want_a_dir, $file) = @_; + + if (!$file) { + N("No file chosen"); + } elsif (-f $file && $want_a_dir) { + N("You have chosen a file, not a directory"); + } elsif (-d $file && !$want_a_dir) { + N("You have chosen a directory, not a file"); + } elsif (!-e $file && !$save) { + $want_a_dir ? N("No such directory") : N("No such file"); + } else { + ''; + } +} + +sub _ask_file { + my ($o, $title, $path) = @_; + + my $w = create_file_selector(title => $title, want_a_dir => 0, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); +} +sub _ask_dir { + my ($o, $title, $path) = @_; + + my $w = create_file_selector(title => $title, want_a_dir => 1, directory => $path); + put_in_hash($o, $w); + + $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename }); +} + +sub ask_browse_tree_info { + my ($common) = @_; + + my $w = ugtk2->new($common->{title}); + + my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); + my $tree = Gtk2::TreeView->new_with_model($tree_model); + $tree->get_selection->set_mode('browse'); + $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1)); + $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2)); + $tree->set_headers_visible(0); + $tree->set_rules_hint(1); + $textcolumn->set_min_width(200); + $textcolumn->set_max_width(200); + + gtkadd($w->{window}, + gtknew('VBox', spacing => 5, children => [ + 0, gtknew('Title2', label => $common->{message}, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()), + 1, gtknew('VBox', children => [ + 1, gtknew('ScrolledWindow', child => $tree), + 0, gtknew('Frame', text => N("Info"), child => + gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)), + ) ]), + 0, Gtk2::HSeparator->new, + 0, my $status = gtknew('Label'), + if_($common->{auto_deps}, + 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) + ), + 0, Gtk2::HSeparator->new, + 0, my $box2 = gtknew('HBox', spacing => 10), + ])); + + gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"), + clicked => $common->{interactive_help})) if $common->{interactive_help}; + + #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); + gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new); + + my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ])); + @l = reverse @l if !$::isInstall; + my @buttons = map { + my ($t, $val) = @$_; + $box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub { + $w->{retval} = $val; + Gtk2->main_quit; + }), 0, 1, 20); + $w->show; + $w; + } @l; + @buttons = reverse @buttons if !$::isInstall; + + $status->show; + + $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall; + $buttons[0]->grab_focus; + $w->{rwindow}->show; + + my @toolbar; + foreach my $ic (@{$common->{icons} || []}) { + push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { + if ($ic->{code}) { + my $_w = $ic->{wait_message} && $common->{wait_message}->('', $ic->{wait_message}); + $ic->{code}(); + $common->{rebuild_tree}->(); + } + } ]); + } + my %toolbar = @toolbar; + foreach (grep_index { $::i % 2 == 0 } @toolbar) { + $toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]); + } + + $pixcolumn->{is_pix} = 1; + $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, + info => $info, status => $status }; + ask_browse_tree_info_given_widgets($common); +} + +sub ask_browse_tree_info_given_widgets { + my ($common) = @_; + my $w = $common->{widgets}; + + my ($curr, $prev_label, $idle, $mouse_toggle_pending); + my (%wtree, %ptree, %pix, %node_state, %state_stats); + my $update_size = sub { + if ($w->{status}) { + my $new_label = $common->{get_status}(); + $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label); + } + }; + + my $set_node_state_flat = sub { + my ($iter, $state) = @_; + $state eq 'XXX' and return; + $pix{$state} ||= gtkcreate_pixbuf($state); + $w->{tree_model}->set($iter, 1 => $pix{$state}); + }; + my $set_node_state_tree; $set_node_state_tree = sub { + my ($iter, $state) = @_; + my $iter_str = $w->{tree_model}->get_path_str($iter); + $state eq 'XXX' and return; + $pix{$state} ||= gtkcreate_pixbuf($state); + if ($node_state{$iter_str} ne $state) { + my $parent; + if (!$w->{tree_model}->iter_has_child($iter) && ($parent = $w->{tree_model}->iter_parent($iter))) { + my $parent_str = $w->{tree_model}->get_path_str($parent); + my $stats = $state_stats{$parent_str} ||= {}; $stats->{$node_state{$iter_str}}--; $stats->{$state}++; + my @list = grep { $stats->{$_} > 0 } keys %$stats; + my $new_state = @list == 1 ? $list[0] : 'semiselected'; + $node_state{$parent_str} ne $new_state and $set_node_state_tree->($parent, $new_state); + } + $w->{tree_model}->set($iter, 1 => $pix{$state}); + $node_state{$iter_str} = $state; #- cache for efficiency + } + }; + my $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; + + my $set_leaf_state = sub { + my ($leaf, $state) = @_; + $set_node_state->($_, $state) foreach @{$ptree{$leaf}}; + }; + my $add_parent; $add_parent = sub { + my ($root, $state) = @_; + $root or return undef; + if (my $w = $wtree{$root}) { return $w } + my $s; foreach (split '\|', $root) { + my $s2 = $s ? "$s|$_" : $_; + $wtree{$s2} ||= do { + my $iter = $w->{tree_model}->append_set($s ? $add_parent->($s, $state) : undef, [ 0 => $_ ]); + $iter; + }; + $s = $s2; + } + $set_node_state->($wtree{$s}, $state); #- use this state by default as tree is building. + $wtree{$s}; + }; + my $add_node = sub { + my ($leaf, $root, $options) = @_; + my $state = $common->{node_state}($leaf) or return; + if ($leaf) { + my $iter = $w->{tree_model}->append_set($add_parent->($root, $state), [ 0 => $leaf ]); + $set_node_state->($iter, $state); + push @{$ptree{$leaf}}, $iter; + } else { + my $parent = $add_parent->($root, $state); + #- hackery for partial displaying of trees, used in rpmdrake: + #- if leaf is void, we may create the parent and one child (to have the [+] in front of the parent in the ctree) + #- though we use '' as the label of the child; then rpmdrake will connect on tree_expand, and whenever + #- the first child has '' as the label, it will remove the child and add all the "right" children + $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ]); + } + }; + my $clear_all_caches = sub { + foreach (values %ptree) { + foreach my $n (@$_) { + delete $node_state{$w->{tree_model}->get_path_str($n)}; + } + } + foreach (values %wtree) { + my $iter_str = $w->{tree_model}->get_path_str($_); + delete $node_state{$iter_str}; + delete $state_stats{$iter_str}; + } + %ptree = %wtree = (); + }; + $common->{delete_all} = sub { + $clear_all_caches->(); + $w->{tree_model}->clear; + }; + $common->{rebuild_tree} = sub { + $common->{delete_all}->(); + $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree; + $common->{build_tree}($add_node, $common->{state}{flat}, $common->{tree_mode}); + &$update_size; + }; + $common->{delete_category} = sub { + my ($cat) = @_; + exists $wtree{$cat} or return; + foreach (keys %ptree) { + my @to_remove; + foreach my $node (@{$ptree{$_}}) { + my $category; + my $parent = $node; + my @parents; + while ($parent = $w->{tree_model}->iter_parent($parent)) { #- LEAKS + my $parent_name = $w->{tree_model}->get($parent, 0); + $category = $category ? "$parent_name|$category" : $parent_name; + $_->[1] = "$parent_name|$_->[1]" foreach @parents; + push @parents, [ $parent, $category ]; + } + if ($category =~ /^\Q$cat/) { + push @to_remove, $node; + foreach (@parents) { + next if $_->[1] eq $cat || !exists $wtree{$_->[1]}; + delete $wtree{$_->[1]}; + delete $node_state{$w->{tree_model}->get_path_str($_->[0])}; + delete $state_stats{$w->{tree_model}->get_path_str($_->[0])}; + } + } + } + foreach (@to_remove) { + delete $node_state{$w->{tree_model}->get_path_str($_)}; + } + @{$ptree{$_}} = difference2($ptree{$_}, \@to_remove); + } + if (exists $wtree{$cat}) { + my $iter_str = $w->{tree_model}->get_path_str($wtree{$cat}); + delete $node_state{$iter_str}; + delete $state_stats{$iter_str}; + $w->{tree_model}->remove($wtree{$cat}); + delete $wtree{$cat}; + } + &$update_size; + }; + $common->{add_nodes} = sub { + my (@nodes) = @_; + $add_node->($_->[0], $_->[1], $_->[2]) foreach @nodes; + &$update_size; + }; + + $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 }; + my $children = sub { map { $w->{tree_model}->get($_, 0) } gtktreeview_children($w->{tree_model}, $_[0]) }; + my $toggle = sub { + if (ref($curr) && !$_[0]) { + $w->{tree}->toggle_expansion($w->{tree_model}->get_path($curr)); + } else { + if (ref $curr) { + my @l = $common->{grep_allowed_to_toggle}($children->($curr)) or return; + my @unsel = $common->{grep_unselected}(@l); + my @p = @unsel ? + #- not all is selected, select all if no option to potentially override + (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) + : @l; + $common->{toggle_nodes}($set_leaf_state, @p); + &$update_size; + } else { + $common->{check_interactive_to_toggle}($curr) and $common->{toggle_nodes}($set_leaf_state, $curr); + &$update_size; + } + } + }; + + $w->{tree}->signal_connect(key_press_event => sub { + my $c = chr($_[1]->keyval & 0xff); + if ($_[1]->keyval >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') { + $toggle->(0); + } + 0; + }); + + $w->{tree}->get_selection->signal_connect(changed => sub { + my ($model, $iter) = $_[0]->get_selected; + $model && $iter or return; + Glib::Source->remove($idle) if $idle; + + if (!$model->iter_has_child($iter)) { + $curr = $model->get($iter, 0); + $idle = Glib::Timeout->add(100, $common->{display_info}); + } else { + $curr = $iter; + } + #- the following test for equality is because we can have a button_press_event first, then + #- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that + #- happens in rpmdrake when doing a "search" and directly trying to select a found package + if ($mouse_toggle_pending eq $model->get($iter, 0)) { + $toggle->(1); + $mouse_toggle_pending = 0; + } + 0; + }); + $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( + my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); + if ($path && $column) { + $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); + } + 0; + }); + $common->{rebuild_tree}->(); + &$update_size; + $common->{initial_selection} and $common->{toggle_nodes}($set_leaf_state, @{$common->{initial_selection}}); + my $_b = before_leaving { $clear_all_caches->() }; + $common->{init_callback}->() if $common->{init_callback}; + $w->{w}->main; +} + +sub gtk_set_treelist { + my ($treelist, $l) = @_; + + my $list = $treelist->get_model; + $list->clear; + $list->append_set([ 0 => $_ ]) foreach @$l; +} + + +sub gtk_TextView_get_log { + my ($log_w, $command, $filter_output, $when_command_is_over) = @_; + + my $pid = open(my $F, "$command |") or return; + common::nonblock($F); + + my $gtk_buffer = $log_w->get_buffer; + $log_w->signal_connect(destroy => sub { + kill 9, $pid if $pid; #- we do not continue in background + $pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null + }); + + Glib::Timeout->add(100, sub { + if ($gtk_buffer) { + my $end = $gtk_buffer->get_end_iter; + while (defined (my $s = <$F>)) { + $gtk_buffer->insert($end, $filter_output->($s)); + } + $log_w->{to_bottom}->(); + } + if (waitpid($pid, c::WNOHANG()) > 0) { + #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore + #- since it is not a normal case + $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer; + $pid = ''; + 0; + } else { + to_bool($gtk_buffer); + } + }); + $pid; #- $pid becomes invalid after $when_command_is_over is called +} + +sub gtk_new_TextView_get_log { + my ($command, $filter_output, $when_command_is_over) = @_; + + my $log_w = gtknew('TextView', editable => 0); + my $log_scroll = gtknew('ScrolledWindow', child => $log_w, to_bottom => 1); + my $pid = gtk_TextView_get_log($log_w, $command, $filter_output, $when_command_is_over) or return; + $log_scroll, $pid; +} + +# misc helpers: + +package Gtk2::TreeStore; +sub append_set { + my ($model, $parent, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append($parent); + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::ListStore; +# Append a new row, set the values, return the TreeIter +sub append_set { + my ($model, @values) = @_; + # compatibility: + @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY'; + my $iter = $model->append; + $model->set($iter, @values); + return $iter; +} + + +package Gtk2::TreeModel; +# gets the string representation of a TreeIter +sub get_path_str { + my ($self, $iter) = @_; + my $path = $self->get_path($iter); + $path or return; + $path->to_string; +} + +sub iter_each_children { + my ($model, $iter, $f) = @_; + for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) { + $f->($child); + } +} + +package Gtk2::TreeView; +# likewise gtk-1.2 function +sub toggle_expansion { + my ($self, $path, $b_open_all) = @_; + if ($self->row_expanded($path)) { + $self->collapse_row($path); + } else { + $self->expand_row($path, $b_open_all || 0); + } +} + + +# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a +# combo if the user is selecting from a fixed set of options. +# +# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much +# easier to use than GtkCombo as well. Use GtkCombo only when you need the +# editable text entry. +# +# GtkOptionMenu is a much better-implemented widget and also the right UI for +# noneditable sets of choices.) +# +# GtkCombo is deprecated in 2.4.x because it still uses deprecated +# GtkList. GtkOption menu is deprecated in order to have an unified widget. +# +# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo. +# +# +# This layer try to make OptionMenu and ComboBox look being api +# compatible with Combo since its API is quite nice. + +package Gtk2::OptionMenu; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + my $menu = Gtk2::Menu->new; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); + $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; + $w->set_menu($menu); + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_history == -1 ? '' : $w->{strings}[$w->get_history]; +} + +sub set_text { + my ($w, $val) = @_; + each_index { + if ($_ eq $val) { + $w->set_history($::i); + return; + } + } @{$w->{strings}}; +} + + + + +package Gtk2::ComboBox; +use MDK::Common; + +# try to get combox <==> option menu mapping +sub set_popdown_strings { + my ($w, @strs) = @_; + $w->get_model->clear; + # keep string list around for ->set_text compatibilty helper + $w->{strings} = \@strs; + $w->append_text($_) foreach @strs; + $w; +} + +sub new_with_strings { + my ($class, $strs, $o_val) = @_; + my $w = $class->new_text; + $w->set_popdown_strings(@$strs); + $w->set_text($o_val) if $o_val; + $w; +} + +sub entry { + my ($w) = @_; + return $w; +} + +sub get_text { + my ($w) = @_; + $w->get_active == -1 ? '' : $w->{strings}[$w->get_active]; +} + +sub set_text { + my ($w, $val) = @_; + eval { + my $val_index = find_index { $_ eq $val } @{$w->{strings}}; + $w->set_active($val_index); + }; + # internal_error(qq(impossible to lookup "$val":\n\t) . chomp_($@)) if $@; +} + + +package Gtk2::Label; +sub set { + my ($label, $text) = @_; + mygtk2::gtkset($label, text => $text); +} + + +package Gtk2::WrappedLabel; +sub new { + my ($_type, $o_text, $o_align) = @_; + mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); +} + + +package Gtk2::Entry; +sub new_with_text { + my ($_class, $o_text) = @_; + mygtk2::gtknew('Entry', text => $o_text); +} + + +package Gtk2::Banner; + +use MDK::Common; +use mygtk2 qw(gtknew); +use ugtk2 qw(:helpers :wrappers); + +sub set_pixmap { + my ($darea) = @_; + return if !$darea->realized; + ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf}); + update_text($darea); +} + +sub update_text { + my ($darea) = @_; + $darea->{layout} = $darea->create_pango_layout($darea->{text}); + $darea->{txt_width} = first($darea->{layout}->get_pixel_size); + $darea->queue_draw; +} + + +sub new { + my ($_class, $icon, $text, $o_options) = @_; + + mygtk2::import_style_ressources(); + my $darea = gtknew('DrawingArea', widget_name => 'Banner'); + $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); + my $d_height = $darea->{back_pixbuf}->get_height; + $darea->set_size_request(-1, $d_height); + $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); + eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) }; + $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon()); + my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) }; + my $blue_width = $blue_part->get_width; + $darea->{text} = $text; + require lang; + my $is_rtl = lang::text_direction_rtl(); + + $darea->signal_connect(realize => \&set_pixmap); + $darea->signal_connect("style-set" => \&set_pixmap); + $darea->signal_connect(expose_event => sub { + my $style = $darea->get_style; + my $height = $darea->{icon}->get_height; + my $width = $darea->{icon}->get_width; + # fix icon position when not using the default height: + (undef, undef, undef, $d_height) = $darea->window->get_geometry; + my $padding = int(($d_height - $height)/2); + my $d_width = $darea->allocation->width; + my $x_blue = $is_rtl ? $d_width - $blue_width : 0; + my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; + # here: 48 is the amount of white background in the blue background we wish to ignore: + my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; + $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); + $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); + $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'), + 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); + $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, + $darea->{layout}); + 1; + }); + + return $darea; +} + + +package Gtk2::MDV::CellRendererPixWithLabel; + +use MDK::Common; +use Glib::Object::Subclass "Gtk2::CellRenderer", + properties => [ + Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), + Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]), + ]; + +my $x_padding = 2; +my $y_padding = 2; + +sub INIT_INSTANCE {} + +sub pixbuf_size { + my ($cell) = @_; + my $pixbuf = $cell->get('pixbuf'); + $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0); +} + +sub calc_size { + my ($cell, $layout) = @_; + my ($width, $height) = $layout->get_pixel_size; + my ($pwidth, $pheight) = pixbuf_size($cell); + + return 0, 0, + $width + $x_padding * 3 + $pwidth, + max($pheight, $height + $y_padding * 2); +} + +sub GET_SIZE { + my ($cell, $widget, $_cell_area) = @_; + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + return calc_size($cell, $layout); +} + +sub get_layout { + my ($_cell, $widget) = @_; + return $widget->create_pango_layout(""); +} + +sub RENDER { # not that efficient... + my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_; + my $state; + if ($flags & 'selected') { + $state = $widget->has_focus + ? 'selected' + : 'active'; + } else { + $state = $widget->state eq 'insensitive' + ? 'insensitive' + : 'normal'; + } + + my $layout = get_layout($cell, $widget); + $layout->set_text($cell->get('label')); + + my $is_rtl = lang::text_direction_rtl(); + my $txt_width = first($layout->get_pixel_size); + + my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); + my $pixbuf = $cell->get('pixbuf'); + my ($pwidth, $pheight) = pixbuf_size($cell); + my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth; + + if ($pixbuf) { + $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), + 0, 0, + $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding, + $cell_area->y, #+ $y_padding, + $pwidth, $pheight, 'none', 0, 0); + } + $widget->get_style->paint_layout($window, + $state, + 1, + $cell_area, + $widget, + "cellrenderertext", + $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset, + $cell_area->y + $y_offset + $y_padding, + $layout); + +} + +1; + + +package Gtk2::Notify::Queue; + +sub new { + my ($class, $statusicon) = @_; + + require Gtk2::Notify; + + my $self = bless { + queue => [], + statusicon => $statusicon, + display => 5000, + delay => 500, + }, $class; + $self; +} + +sub process_next { + my ($self) = @_; + shift @{$self->{queue}}; + #- wait for some time so that the new notification is noticeable + @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 }); +} + +sub add { + my ($self, $info) = @_; + push @{$self->{queue}}, $info; + @{$self->{queue}} == 1 and $self->show; +} + +sub show { + my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new + my $info = $self->{queue}[0]; + my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); + $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; + $notification->set_urgency($info->{urgency}) if $info->{urgency}; + foreach my $a (@{$info->{actions} || []}) { + $notification->add_action( + $a->{action}, $a->{label}, + sub { + $info->{processed} = 1; + #- $a->{callback} has to call $selft->process_next when done + $a->{callback}->(); + }); + } + $notification->signal_connect(closed => sub { + $info->{processed} and return; + $info->{timeout}->() if $info->{timeout}; + $self->process_next; + }); + # this makes net_applet to segfault (mga#9102): + #eval { $notification->show }; +} + +1; + + +package Gtk2::GUI_Update_Guard; + +use MDK::Common::Func qw(before_leaving); +use ugtk2; + +sub new { + my ($_class) = @_; # prevent a perl_checker warning in callers + my $old_signal = $SIG{ALRM}; + $SIG{ALRM} = sub { + ugtk2::gtkflush(); + alarm(1); + }; + alarm(1); + return before_leaving { + alarm(0); + $SIG{ALRM} = $old_signal || 'DEFAULT'; # restore default action + }; +} + +1; -- cgit v1.2.1 From 504f6c89db28716c7038153fb7838565b4ba0583 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:16:09 +0200 Subject: use (my|u)gtk3 instead of *tk2 --- perl-install/any.pm | 16 +++---- perl-install/common.pm | 2 +- perl-install/dbus_object.pm | 6 +-- perl-install/diskdrake/hd_gtk.pm | 12 ++--- perl-install/diskdrake/smbnfs_gtk.pm | 8 ++-- perl-install/fs/partitioning_wizard.pm | 48 ++++++++++---------- perl-install/install/gtk.pm | 12 ++--- perl-install/install/steps_gtk.pm | 42 +++++++++--------- perl-install/install/steps_interactive.pm | 2 +- perl-install/interactive/gtk.pm | 54 +++++++++++----------- perl-install/mygtk3.pm | 36 +++++++-------- perl-install/services.pm | 8 ++-- perl-install/share/po/translation_size.pl | 2 +- perl-install/standalone/diskdrake | 2 +- perl-install/standalone/display_help | 10 ++--- perl-install/standalone/drakautoinst | 6 +-- perl-install/standalone/drakboot | 18 ++++---- perl-install/standalone/drakbug | 16 +++---- perl-install/standalone/drakclock | 18 ++++---- perl-install/standalone/drakdvb | 12 ++--- perl-install/standalone/drakedm | 2 +- perl-install/standalone/drakfloppy | 18 ++++---- perl-install/standalone/drakfont | 14 +++--- perl-install/standalone/drakhelp | 2 +- perl-install/standalone/drakperm | 16 +++---- perl-install/standalone/draksec | 18 ++++---- perl-install/standalone/draksound | 2 +- perl-install/standalone/drakups | 6 +-- perl-install/standalone/drakxservices | 2 +- perl-install/standalone/drakxtv | 2 +- perl-install/standalone/harddrake2 | 12 ++--- perl-install/standalone/localedrake | 2 +- perl-install/standalone/logdrake | 14 +++--- perl-install/standalone/scannerdrake | 2 +- perl-install/ugtk3.pm | 74 +++++++++++++++---------------- 35 files changed, 258 insertions(+), 258 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 52dc46bb2..a04c47f5e 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -964,7 +964,7 @@ sub urpmi_add_all_media { $wait = $in->wait_message(N("Please wait"), N("Please wait, adding media...")); } elsif ($in->isa('interactive::gtk')) { push @options, '--silent-success'; - mygtk2::flush(); + mygtk3::flush(); } my $reason = join(',', $o_previous_release ? @@ -1028,17 +1028,17 @@ sub display_release_notes { } require Gtk2::WebKit; - require ugtk2; - ugtk2->import(':all'); - require mygtk2; - mygtk2->import('gtknew'); + require ugtk3; + ugtk3->import(':all'); + require mygtk3; + mygtk3->import('gtknew'); my $view = gtknew('WebKit_View', no_popup_menu => 1); $view->load_html_string($release_notes, '/'); - my $w = ugtk2->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1); + my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1); gtkadd($w->{rwindow}, gtkpack_(Gtk2::VBox->new, - 1, create_scrolled_window(ugtk2::gtkset_border_width($view, 5), + 1, create_scrolled_window(ugtk3::gtkset_border_width($view, 5), [ 'never', 'automatic' ], ), 0, gtkpack(create_hbox('end'), @@ -1047,7 +1047,7 @@ sub display_release_notes { ), ), ); - mygtk2::set_main_window_size($w->{rwindow}); + mygtk3::set_main_window_size($w->{rwindow}); $w->{real_window}->grab_focus; $w->{real_window}->show_all; $w->main; diff --git a/perl-install/common.pm b/perl-install/common.pm index adee703b0..9d5763202 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -69,7 +69,7 @@ sub remove_translate_context { sub translate { my $s = translate_real(@_); - $::one_message_has_been_translated ||= join(':', (caller(1))[1,2]); #- see mygtk2.pm + $::one_message_has_been_translated ||= join(':', (caller(1))[1,2]); #- see mygtk3.pm remove_translate_context($s); } diff --git a/perl-install/dbus_object.pm b/perl-install/dbus_object.pm index dc9df0d54..a1038fc40 100644 --- a/perl-install/dbus_object.pm +++ b/perl-install/dbus_object.pm @@ -44,12 +44,12 @@ sub safe_call_method { @ret; } -sub set_gtk2_watch { +sub set_gtk3_watch { my ($o) = @_; - set_gtk2_watch_helper($o->{bus}); + set_gtk3_watch_helper($o->{bus}); } -sub set_gtk2_watch_helper { +sub set_gtk3_watch_helper { my ($bus) = @_; $bus->{connection}->set_watch_callbacks(sub { my ($con, $watch) = @_; diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 89d46dbfd..f552fb1af 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -4,8 +4,8 @@ use diagnostics; use strict; use common; -use mygtk2 qw(gtknew); -use ugtk2 qw(:helpers :wrappers :create); +use mygtk3 qw(gtknew); +use ugtk3 qw(:helpers :wrappers :create); use partition_table; use fs::type; use detect_devices; @@ -58,8 +58,8 @@ sub main { local $in->{grab} = 1; - $w = ugtk2->new(N("Partitioning")); - mygtk2::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall; + $w = ugtk3->new(N("Partitioning")); + mygtk3::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall; load_theme(); @@ -72,7 +72,7 @@ sub main { 0, gtknew(($::isInstall ? ('Title1', 'label') : ('Label_Left', 'text')) => N("Click on a partition, choose a filesystem type then choose an action"), # workaround infamous 6 years old gnome bug #101968: - width => mygtk2::get_label_width() + width => mygtk3::get_label_width() ), 1, (my $notebook_widget = Gtk2::Notebook->new), 0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')), @@ -176,7 +176,7 @@ sub add_kind2notebook { 1, $box, 0, $kind->{action_box}, ]); - ugtk2::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box}); + ugtk3::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box}); push @notebook, $kind; $kind; } diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index 28fc9f2ea..e29101b44 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -9,8 +9,8 @@ use common; use interactive; use fs::remote::smb; use fs::remote::nfs; -use mygtk2 qw(gtknew gtkset); -use ugtk2 qw(:helpers :wrappers :create); +use mygtk3 qw(gtknew gtkset); +use ugtk3 qw(:helpers :wrappers :create); my ($all_hds, $in, $tree_model, $current_entry, $current_leaf, %icons); @@ -19,7 +19,7 @@ sub main { my ($kind) = $type eq 'smb' ? smb2kind() : nfs2kind(); $kind->check($in) or return; - my $w = ugtk2->new(N("Partitioning")); + my $w = ugtk3->new(N("Partitioning")); add_smbnfs($w->{window}, $kind); $w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size'); @@ -227,7 +227,7 @@ sub import_tree { } else { if (!$tree_model->iter_has_child($curr)) { gtkset_mousecursor_wait($tree->window); - ugtk2::flush(); + ugtk3::flush(); $add_exports->($curr); gtkset_mousecursor_normal($tree->window); } diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 750e02816..935ecb5bc 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -13,8 +13,8 @@ use partition_table; use partition_table::raw; use partition_table::dos; use POSIX qw(ceil); -use mygtk2; -use ugtk2 qw(:wrappers); +use mygtk3; +use ugtk3 qw(:wrappers); #- unit of $mb is mega bytes, min and max are in sectors, this #- function is used to convert back to sectors count the size of @@ -300,7 +300,7 @@ sub create_display_box { my $width = 540; my $minwidth = 40; - my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26); + my $display_box = ugtk3::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26); my $sep_count = @parts - 1; #- ratio used to compute initial partition pixel width (each partition should be > min_width) @@ -339,12 +339,12 @@ sub create_display_box { $hpane->add2($mdv_widget); $hpane->child2_shrink(0); $hpane->set_position(ceil($ratio * $entry->{req_size})); - ugtk2::gtkset_size_request($hpane, $entry->{width}, 0); - ugtk2::gtkpack__($display_box, $hpane); + ugtk3::gtkset_size_request($hpane, $entry->{width}, 0); + ugtk3::gtkpack__($display_box, $hpane); my $add_part_size_info = sub { my ($name, $label) = @_; - ugtk2::gtkpack__($desc, + ugtk3::gtkpack__($desc, gtkadd(gtkset_name(Gtk2::EventBox->new, $name), Gtk2::Label->new(" " x 4)), gtkset_size_request(gtkset_alignment($label, 0, 0.5), @@ -396,7 +396,7 @@ sub create_display_box { 'other')); } $part_widget->set_size_request($entry->{width}, 0); - ugtk2::gtkpack($display_box, $part_widget); + ugtk3::gtkpack($display_box, $part_widget); } $part_widget->add($part_info); @@ -409,7 +409,7 @@ sub create_display_box { my @types = (N_("Ext2/3/4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"), N_("Other"), N_("Empty")); my %name2fs_type = ('Ext2/3/4' => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); - $desc = ugtk2::gtkpack(Gtk2::HBox->new, + $desc = ugtk3::gtkpack(Gtk2::HBox->new, map { my $t = $name2fs_type{$_}; my $ev = Gtk2::EventBox->new; @@ -443,8 +443,8 @@ sub display_choices { $contentbox->foreach(sub { $contentbox->remove($_[0]) }); $mainw->{kind}{display_box} ||= create_display_box($mainw->{kind}); - ugtk2::gtkpack2__($contentbox, $mainw->{kind}{display_box}); - ugtk2::gtkpack__($contentbox, gtknew('Label', + ugtk3::gtkpack2__($contentbox, $mainw->{kind}{display_box}); + ugtk3::gtkpack__($contentbox, gtknew('Label', text => N("The DrakX Partitioning wizard found the following solutions:"), alignment => [0, 0])); @@ -471,20 +471,20 @@ sub display_choices { log::l($s); next; } - ugtk2::gtkpack($vbox, + ugtk3::gtkpack($vbox, gtknew('Label', text => $solutions{$s}[1], alignment => [0, 0])); - ugtk2::gtkpack($vbox, $item) if defined($item); + ugtk3::gtkpack($vbox, $item) if defined($item); $button->set_group($oldbutton->get_group) if $oldbutton; $oldbutton = $button; $button->signal_connect('toggled', sub { $mainw->{sol} = $solutions{$s} if $_[0]->get_active }); - ugtk2::gtkpack2__($choicesbox, $button); + ugtk3::gtkpack2__($choicesbox, $button); $sep = gtknew('HSeparator'); - ugtk2::gtkpack2__($choicesbox, $sep); + ugtk3::gtkpack2__($choicesbox, $sep); } $choicesbox->remove($sep); - ugtk2::gtkadd($contentbox, $choicesbox); + ugtk3::gtkadd($contentbox, $choicesbox); $mainw->{sol} = $solutions{@solutions[0]}; } @@ -494,15 +494,15 @@ sub main { my $sol; if ($o->isa('interactive::gtk')) { - require mygtk2; - mygtk2->import(qw(gtknew)); - require ugtk2; - ugtk2->import(qw(:wrappers)); + require mygtk3; + mygtk3->import(qw(gtknew)); + require ugtk3; + ugtk3->import(qw(:wrappers)); - my $mainw = ugtk2->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window)); + my $mainw = ugtk3->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window)); $mainw->{box_allow_grow} = 1; - mygtk2::set_main_window_size($mainw->{rwindow}); + mygtk3::set_main_window_size($mainw->{rwindow}); require diskdrake::hd_gtk; diskdrake::hd_gtk::load_theme(); @@ -526,10 +526,10 @@ sub main { } $combobox->set_active(0); - ugtk2::gtkpack2__($hdchoice, $hdchoicelabel); + ugtk3::gtkpack2__($hdchoice, $hdchoicelabel); $hdchoice->add($combobox); - ugtk2::gtkpack2__($mainbox, $hdchoice); + ugtk3::gtkpack2__($mainbox, $hdchoice); my $contentbox = Gtk2::VBox->new(0, 12); @@ -564,7 +564,7 @@ sub main { ); my $buttons_pack = $mainw->create_okcancel(N("Next"), undef, '', @more_buttons); $mainbox->pack_end($buttons_pack, 0, 0, 0); - ugtk2::gtkadd($mainw->{window}, $mainbox); + ugtk3::gtkadd($mainw->{window}, $mainbox); $mainw->{window}->show_all; $mainw->main; diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 675b33475..ac5c49ba4 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -3,8 +3,8 @@ package install::gtk; # $Id: gtk.pm 269881 2010-06-04 14:48:46Z cfergeau $ use diagnostics; use strict; -use ugtk2; -use mygtk2; +use ugtk3; +use mygtk3; use common; use lang; use devices; @@ -98,7 +98,7 @@ sub install_theme { 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')); + mygtk3::set_root_window_background_with_gc($win->style->bg_gc('normal')); $root_window = $win; } @@ -169,7 +169,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 Gtk2 main loop $o->{steps_widget}->move_selection($steps{steps}{$_}{text}); if ($last_step) { @@ -179,7 +179,7 @@ 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 Gtk2 main loop } #------------------------------------------------------------------------------ @@ -233,7 +233,7 @@ sub special_shortcuts { install::any::take_screenshot($::o); } elsif ($d eq 'restart' && member('control-mask', @{$event->state}) && member('mod1-mask', @{$event->state})) { log::l("restarting install"); - ugtk2->exit(0x35); + ugtk3->exit(0x35); } 0; } diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 04db5ffd1..d88fa2106 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -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; @@ -53,7 +53,7 @@ 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; @@ -245,7 +245,7 @@ sub setPackages { 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", N("Mageia")), @@ -276,12 +276,12 @@ 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}, 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, gtknew('HSeparator'), @@ -301,11 +301,11 @@ 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, '', @@ -322,7 +322,7 @@ 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; @@ -341,7 +341,7 @@ sub reallyChooseGroups { }; #- 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}, + ugtk3::gtkadd($w->{window}, gtknew('ScrolledWindow', child => gtknew('VBox', children => [ 1, $o->{gtk_display_compssUsers}->($entry), @@ -548,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; @@ -588,7 +588,7 @@ sub installPackages { 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 => [ + ugtk3::gtkadd($w->{window}, my $box = gtknew('VBox', children_tight => [ gtknew('Image_using_pixmap', file_ref => \$advertising_image, show_ref => \$show_advertising), ])); @@ -628,7 +628,7 @@ 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') { $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20; @@ -642,7 +642,7 @@ sub installPackages { } elsif ($type eq 'inst' && $subtype eq 'start') { 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))); + mygtk3::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary))); $current_total_size += $last_size; $last_size = $p->size; @@ -684,7 +684,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); @@ -698,7 +698,7 @@ 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 ]); @@ -730,7 +730,7 @@ sub summary_prompt { 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', @@ -754,15 +754,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 => [ @@ -778,7 +778,7 @@ 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(), + 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), diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index ee5eda054..83929dd83 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -36,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) ]); } diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 7e177b420..61c886da2 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -8,8 +8,8 @@ use vars qw(@ISA); use interactive; use common; -use mygtk2; -use ugtk2 qw(:helpers :wrappers :create); +use mygtk3; +use ugtk3 qw(:helpers :wrappers :create); use Gtk2::Gdk::Keysyms; my $forgetTime = 1000; #- in milli-seconds @@ -22,21 +22,21 @@ sub new { sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) } sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) } sub adapt_markup { - #- nothing needed, the default markup is gtk2's + #- nothing needed, the default markup is gtk3's my ($_o, $s) = @_; return $s; } -sub exit { ugtk2::exit(@_) } +sub exit { ugtk3::exit(@_) } sub ask_fileW { my ($in, $common) = @_; - my $w = ugtk2::create_file_selector(%$common); + my $w = ugtk3::create_file_selector(%$common); my $file; $w->main(sub { $file = $w->{chooser}->get_filename; - my $err = ugtk2::file_selected_check($common->{save}, $common->{want_a_dir}, $file); + my $err = ugtk3::file_selected_check($common->{save}, $common->{want_a_dir}, $file); $err and $in->ask_warn('', $err); !$err; }) && $file; @@ -51,7 +51,7 @@ sub create_boxradio { mapn { my ($txt, $w) = @_; # workaround infamous 6 years old gnome bug #101968: - $w->child->set_size_request(mygtk2::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label}; + $w->child->set_size_request(mygtk3::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label}; $w->signal_connect(button_press_event => $double_click) if $double_click; $w->signal_connect(key_press_event => $e->{may_go_to_next}); @@ -223,7 +223,7 @@ sub create_treeview_tree { my $path = Gtk2::TreePath->new_from_string($path_str); $tree->expand_to_path($path); $tree->set_cursor($path, undef, 0); - gtkflush(); #- workaround gtk2 bug not honouring centering on the given row if node was closed + gtkflush(); #- workaround gtk3 bug not honouring centering on the given row if node was closed $tree->scroll_to_cell($path, undef, 1, 0.5, 0); }; @@ -348,7 +348,7 @@ sub add_modify_remove_action { } elsif ($button->{kind} eq 'remove') { ${$e->{val}} = $e->{list}[0]; } - ugtk2::gtk_set_treelist($treelist, [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]); + ugtk3::gtk_set_treelist($treelist, [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]); add_modify_remove_sensitive($buttons, $e); 1; @@ -357,7 +357,7 @@ sub add_modify_remove_action { sub add_padding { my ($w) = @_; gtknew('HBox', children => [ - 0, gtknew('Alignment', width => $mygtk2::left_padding), + 0, gtknew('Alignment', width => $mygtk3::left_padding), 1, $w ]); } @@ -392,7 +392,7 @@ sub create_widget { } } elsif ($e->{type} eq 'bool') { if ($e->{image}) { - $w = ugtk2::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image}))); + $w = ugtk3::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image}))); } else { #- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text}; $w = Gtk2::CheckButton->new_with_label($e->{text}); @@ -403,7 +403,7 @@ sub create_widget { } elsif ($e->{type} eq 'only_label') { my @common = ( # workaround infamous 6 years old gnome bug #101968: - if_($e->{alignment} ne 'right', width => mygtk2::get_label_width()) + if_($e->{alignment} ne 'right', width => mygtk3::get_label_width()) ); $w = $e->{title} ? gtknew('Title2', label => escape_text_for_TextView_markup_format(${$e->{val}}), @common) : @@ -746,7 +746,7 @@ sub create_widgets { # add asterisks before titles when there're more than one: my @all_titles = all_title_entries($l); if (2 <= @all_titles) { - ${$_->{val}} = mygtk2::asteriskize(${$_->{val}}) foreach @all_titles; + ${$_->{val}} = mygtk3::asteriskize(${$_->{val}}) foreach @all_titles; } my $box = create_widgets_block($o, $common, $l, $update, \$ignore); @@ -810,7 +810,7 @@ sub display_help_window { load_from_uri($view, $file); - my $w = ugtk2->new(N("Help"), modal => 1); + my $w = ugtk3->new(N("Help"), modal => 1); gtkadd($w->{rwindow}, gtkpack_(Gtk2::VBox->new, 1, create_scrolled_window(gtkset_border_width($view, 5), @@ -822,7 +822,7 @@ sub display_help_window { ), ), ); - mygtk2::set_main_window_size($w->{rwindow}); + mygtk3::set_main_window_size($w->{rwindow}); $w->{real_window}->grab_focus; $w->{real_window}->show_all; $w->main; @@ -847,7 +847,7 @@ sub ask_fromW { filter_widgets($l); - my $mainw = ugtk2->new($common->{title}, %$o, if__($::main_window, transient => $::main_window), + my $mainw = ugtk3->new($common->{title}, %$o, if__($::main_window, transient => $::main_window), if_($common->{icon}, icon => $common->{icon}), banner_title => $common->{banner_title}, ); @@ -855,7 +855,7 @@ sub ask_fromW { $mainw->{box_allow_grow} = 1; my $pack = create_box_with_title($mainw, @{$common->{messages}}); - mygtk2::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && !$common->{auto_window_size} && (@$l || $mainw->{box_size} == 200); + mygtk3::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && !$common->{auto_window_size} && (@$l || $mainw->{box_size} == 200); my @more_buttons = ( if_($common->{interactive_help} || $common->{interactive_help_id}, @@ -870,7 +870,7 @@ sub ask_fromW { if ($buttons_pack) { $pack->pack_end(gtkshow($buttons_pack), 0, 0, 0); } - ugtk2::gtkadd($mainw->{window}, $pack); + ugtk3::gtkadd($mainw->{window}, $pack); $set_all->(); my $entry_to_focus = find { $_->{focus} && $_->{focus}() } @$l; @@ -899,7 +899,7 @@ sub ask_fromW { sub ask_browse_tree_info_refW { my ($o, $common) = @_; add2hash($common, { wait_message => sub { $o->wait_message(@_) } }); - ugtk2::ask_browse_tree_info($common); + ugtk3::ask_browse_tree_info($common); } @@ -935,9 +935,9 @@ sub wait_messageW { if_(ref($message_modifiable), 0, $message_modifiable), ]), ); - mygtk2::enable_sync_flush($Window); + mygtk3::enable_sync_flush($Window); $Window->{wait_messageW} = $to_modify; - mygtk2::sync_flush($Window); + mygtk3::sync_flush($Window); $Window; } sub wait_message_nextW { @@ -945,17 +945,17 @@ sub wait_message_nextW { return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no expose_event :( $Window->{displayed} = 0; $Window->{wait_messageW}->set($message); - mygtk2::sync($Window) while !$Window->{displayed}; + mygtk3::sync($Window) while !$Window->{displayed}; } sub wait_message_endW { my ($_o, $Window) = @_; if ($Window->{pop_and_reuse}) { $reuse_timeout = Glib::Timeout->add(100, sub { - mygtk2::destroy_previous_popped_and_reuse_window(); + mygtk3::destroy_previous_popped_and_reuse_window(); }); } else { - mygtk2::may_destroy($Window); - mygtk2::flush(); + mygtk3::may_destroy($Window); + mygtk3::flush(); } } @@ -979,11 +979,11 @@ sub wait_message_with_progress_bar { $progress->set_fraction($fraction); $progress->show; $displayed = 0; - mygtk2::flush() while !$displayed; + mygtk3::flush() while !$displayed; } } else { $progress->hide; - mygtk2::flush(); + mygtk3::flush(); } }; } diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 779e77e8f..9c6fccce4 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1,4 +1,4 @@ -package mygtk2; +package mygtk3; use diagnostics; use strict; @@ -15,7 +15,7 @@ use Gtk2; sub init() { !check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0); - $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); + $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk3 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); Gtk2->init; Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), @@ -52,7 +52,7 @@ sub gtkset { } my %opts = @_; - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkset unknown class $class"); + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkset unknown class $class"); _gtk($w, $class, 'gtkset', \%opts); } @@ -67,7 +67,7 @@ sub gtkadd { internal_error("gtkadd $class: $r should be a string in @_"); } my %opts = @_; - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk2)::// or internal_error("gtkadd unknown class $class"); + $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkadd unknown class $class"); _gtk($w, $class, 'gtkadd', \%opts); } @@ -102,7 +102,7 @@ my $global_tooltips; sub _gtk { my ($w, $class, $action, $opts) = @_; - if (my $f = $mygtk2::{"_gtk__$class"}) { + if (my $f = $mygtk3::{"_gtk__$class"}) { $w = $f->($w, $opts, $class, $action); } else { internal_error("$action $class: unknown class"); @@ -337,7 +337,7 @@ sub _gtk__Image { $w->{set_from_file} = $class =~ /using_pixmap/ ? sub { my ($w, $file) = @_; - my $pixmap = mygtk2::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); + my $pixmap = mygtk3::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); $w->set_from_pixmap($pixmap, undef); } : $class =~ /using_pixbuf/ ? sub { my ($w, $file) = @_; @@ -612,7 +612,7 @@ sub _gtk__ComboBox { my $set_list = sub { $w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list}; $w->get_model->clear; - $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk2 + $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk3 $w->append_text($_) foreach @{$w->{formatted_list}}; }; if (my $list_ref = delete $opts->{list_ref}) { @@ -822,7 +822,7 @@ sub _gtknew_handle_layout_children { my $pixbuf = if_($opts->{pixbuf_file}, gtknew('Pixbuf', file => delete $opts->{pixbuf_file})); $w->signal_connect( realize => sub { - ugtk2::set_back_pixbuf($w, $pixbuf); + ugtk3::set_back_pixbuf($w, $pixbuf); }); } } @@ -963,7 +963,7 @@ sub _gtk__MagicWindow { real_window => $w, child => $sub_child, pop_it => $pop_it, pop_and_reuse => $pop_and_reuse, if_($provided_banner, banner => $provided_banner), - }, 'mygtk2::MagicWindow'; + }, 'mygtk3::MagicWindow'; } # A standard About dialog. Used with: @@ -1191,10 +1191,10 @@ sub _gtknew_handle_children { #- (eg : add_accel_group set_position set_default_size #- * a few methods are handled specially my %for_real_window = map { $_ => 1 } qw(show_all size_request); -sub mygtk2::MagicWindow::AUTOLOAD { +sub mygtk3::MagicWindow::AUTOLOAD { my ($w, @args) = @_; - my ($meth) = $mygtk2::MagicWindow::AUTOLOAD =~ /mygtk2::MagicWindow::(.*)/; + my ($meth) = $mygtk3::MagicWindow::AUTOLOAD =~ /mygtk3::MagicWindow::(.*)/; my ($s1, @s2) = $meth eq 'show' ? ('real_window', 'banner', 'child') : @@ -1206,7 +1206,7 @@ sub mygtk2::MagicWindow::AUTOLOAD { ? 'real_window' : 'child'; -#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n"; +#- warn "mygtk3::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n"; $w->{$_} && $w->{$_}->$meth(@args) foreach @s2; $w->{$s1}->$meth(@args); @@ -1224,10 +1224,10 @@ sub quit_popup() { if (!$in_callback) { $in_callback = 1; my $_guard = before_leaving { undef $in_callback }; - require ugtk2; - my $w = ugtk2->new(N("Confirmation"), grab => 1); - ugtk2::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel")); - my $ret = ugtk2::main($w); + require ugtk3; + my $w = ugtk3->new(N("Confirmation"), grab => 1); + ugtk3::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel")); + my $ret = ugtk3::main($w); return 1 if !$ret; } } @@ -1425,7 +1425,7 @@ sub get_main_window_size() { # in order to workaround infamous 6 years old gnome bug #101968: sub get_label_width() { - first(mygtk2::get_main_window_size()) - 55 - $left_padding; + first(mygtk3::get_main_window_size()) - 55 - $left_padding; } sub set_main_window_size { @@ -1469,7 +1469,7 @@ sub enable_sync_flush { sub sync_flush { my ($w) = @_; # hackish :-( - mygtk2::sync($w) while !$w->{displayed}; + mygtk3::sync($w) while !$w->{displayed}; } diff --git a/perl-install/services.pm b/perl-install/services.pm index 09f31ba20..1c3200c99 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -220,10 +220,10 @@ sub ask_standalone_gtk { my ($l, $on_services) = services(); my @xinetd_services = map { $_->[0] } xinetd_services(); - require ugtk2; - ugtk2->import(qw(:wrappers :create)); + require ugtk3; + ugtk3->import(qw(:wrappers :create)); - my $W = ugtk2->new(N("Services")); + my $W = ugtk3->new(N("Services")); my ($x, $y, $w_popup); my $nopop = sub { $w_popup and $w_popup->destroy; undef $w_popup }; my $display = sub { @@ -244,7 +244,7 @@ sub ask_standalone_gtk { my $b = Gtk2::EventBox->new; $b->set_events('pointer_motion_mask'); gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title, - 0, mygtk2::gtknew('Title1', label => N("Services and daemons")), + 0, mygtk3::gtknew('Title1', label => N("Services and daemons")), 1, gtkset_size_request(create_scrolled_window(create_packtable({ col_spacings => 10, row_spacings => 3 }, map { my $service = $_; diff --git a/perl-install/share/po/translation_size.pl b/perl-install/share/po/translation_size.pl index ff491d08e..178baaefd 100755 --- a/perl-install/share/po/translation_size.pl +++ b/perl-install/share/po/translation_size.pl @@ -20,7 +20,7 @@ use lib qw(../..); use common; -use ugtk2; +use ugtk3; use install_gtk; !@ARGV and die "Usage: LANGUAGE=lang_to_test $0 string_to_translate\n(for example: LANGUAGE=ja $0 Advanced)\n"; diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index e3b304c4a..7e5645509 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -34,7 +34,7 @@ use fs; use log; use c; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png"; my %options; my @l = @ARGV; diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help index 3894d04e3..bc219eb8a 100755 --- a/perl-install/standalone/display_help +++ b/perl-install/standalone/display_help @@ -22,8 +22,8 @@ use lib qw(/usr/lib/libDrakX); use common; use any; -use mygtk2 qw(gtknew); -use ugtk2 qw(:wrappers :create); +use mygtk3 qw(gtknew); +use ugtk3 qw(:wrappers :create); use Gtk2::WebKit; my $view = gtknew('WebKit_View', no_popup_menu => 1); @@ -31,11 +31,11 @@ my $view = gtknew('WebKit_View', no_popup_menu => 1); my $websettings = $view->get_settings; $websettings->set_property('allow-scripts-to-close-windows', 1); $view->set_settings($websettings); -$view->signal_connect('close-web-view', sub { ugtk2::exit(0) }); +$view->signal_connect('close-web-view', sub { ugtk3::exit(0) }); $view->open($ARGV[0]); -# FIXME: merge this with mcc code into new mygtk2::set_standalone_main_window_size()? +# FIXME: merge this with mcc code into new mygtk3::set_standalone_main_window_size()? my ($rootwin_width, $rootwin_height) = gtkroot()->get_size; my ($default_width, $default_height); my $wm = any::running_window_manager(); @@ -51,7 +51,7 @@ if (!$is_firstime) { } # TODO: got XID from mcc/... ? (transient & modal hints?) -my $w = ugtk2->new(N("Help"), width => $default_width, height => $default_height); +my $w = ugtk3->new(N("Help"), width => $default_width, height => $default_height); gtkadd($w->{rwindow}, gtkpack_(Gtk2::VBox->new, diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index e1d27a72a..63b8c4974 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -104,8 +104,8 @@ my $o_old = $o; # BUG (maybe install's $::o ?) my %struct_gui; if (!$::isEmbedded && $in->isa('interactive::gtk')) { - require ugtk2; - ugtk2->import(qw(:helpers :wrappers :create)); + require ugtk3; + ugtk3->import(qw(:helpers :wrappers :create)); my %tree; $struct_gui{$_} = 'General' foreach qw(lang isUpgrade autoExitInstall timezone default_packages); @@ -138,7 +138,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { exists $struct_gui{$_} and push @{$tree{$struct_gui{$_}}}, [ $_ , $pixmap{$_}, h2widget($o->{$_}, "\$o->\{$_}") ] foreach keys %$o; - my $W = ugtk2->new('$o edition'); + my $W = ugtk3->new('$o edition'); my @box_to_hide; my $nb_pages=0; my $notebook = Gtk2::Notebook->new; diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index fec394ce3..dc2b2267b 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -66,27 +66,27 @@ if ($is_bootloader_mode) { $in->exit(0); } -require ugtk2; -ugtk2->import(qw(:helpers :wrappers :create)); -require mygtk2; -mygtk2->import(qw(gtknew)); +require ugtk3; +ugtk3->import(qw(:helpers :wrappers :create)); +require mygtk3; +mygtk3->import(qw(gtknew)); autologin_choice(); sub run_boot_window { my ($title, $pack_list, $apply_sub) = @_; - my $w = ugtk2->new($title); + my $w = ugtk3->new($title); my $window = $w->{window}; mygtk3::register_main_window($w->{real_window}); - $window->signal_connect(delete_event => sub { ugtk2->exit(0) }); + $window->signal_connect(delete_event => sub { ugtk3->exit(0) }); unless ($::isEmbedded) { $window->set_border_width(2); ### menus definition # the menus are not shown but they provides shiny shortcut like C-q my @menu_items = ([ N("/_File"), undef, undef, undef, '' ], - [ N("/File/_Quit"), N("Q"), sub { ugtk2->exit(0) }, undef, '' ], + [ N("/File/_Quit"), N("Q"), sub { ugtk3->exit(0) }, undef, '' ], ); create_factory_menu($w->{rwindow}, @menu_items); ######### menus end @@ -94,10 +94,10 @@ sub run_boot_window { gtkadd($window, gtknew('VBox', children => [ @$pack_list, 0, create_okcancel({ - cancel_clicked => sub { ugtk2->exit(0) }, + cancel_clicked => sub { ugtk3->exit(0) }, ok_clicked => sub { $apply_sub->(); - ugtk2->exit(0); + ugtk3->exit(0); } }) ])); $window->show_all; diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index d483605b3..a960a248d 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -26,8 +26,8 @@ use standalone; use MDK::Common; use common; BEGIN { $::no_ugtk_init = 1 } -use mygtk2 qw(gtknew); -use ugtk2 qw(:all); +use mygtk3 qw(gtknew); +use ugtk3 qw(:all); use Config; use URI::Escape; use run_program; @@ -56,12 +56,12 @@ if (!check_for_xserver()) { c::_exit(0); } -mygtk2::init(); +mygtk3::init(); -$ugtk2::wm_icon = 'drakbug-16'; -my $window = ugtk2->new(N("%s Bug Report Tool", N("Mageia")), center => 1); +$ugtk3::wm_icon = 'drakbug-16'; +my $window = ugtk3->new(N("%s Bug Report Tool", N("Mageia")), center => 1); $window->{rwindow}->set_border_width(5); -$window->{window}->signal_connect("delete_event", sub { ugtk2->exit(0) }); +$window->{window}->signal_connect("delete_event", sub { ugtk3->exit(0) }); my $mdk_app = { N("%s Control Center", N("Mageia")) => 'drakconf', @@ -175,7 +175,7 @@ gtkadd($window->{window}, }), gtkpack(create_hbox('end'), gtksignal_connect(Gtk2::Button->new(N("Report")), clicked => \&report_bug_to_bugzilla), - gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk2->exit(0) }), + gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk3->exit(0) }), )))); if (defined $prog) { @@ -197,7 +197,7 @@ $button_browse->signal_connect('file-set', sub { $com_app->set_text($button_brow $window->{window}->show_all; $window->main; -ugtk2->exit(0); +ugtk3->exit(0); sub update_app { my ($text) = @_; diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index fdda6e96d..71653b7b1 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -6,8 +6,8 @@ use POSIX; use common; # i18n : IMPORTANT to get correct namespace (drakconf instead of libDrakX) BEGIN { unshift @::textdomains, 'drakconf' } -use mygtk2 qw(gtknew); -use ugtk2 qw(:all); +use mygtk3 qw(gtknew); +use ugtk3 qw(:all); use interactive; use standalone; use timezone; @@ -21,14 +21,14 @@ my $timer; my $first = 1; my $its_reset = 0; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/time-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/time-mdk.png"; my $ntpd = $timezone::ntp . 'd'; my $ntpfile = '/etc/' . $timezone::ntp . '.conf'; -my $my_win = ugtk2->new(N("Date, Clock & Time Zone Settings")); +my $my_win = ugtk3->new(N("Date, Clock & Time Zone Settings")); -$my_win->{window}->signal_connect(delete_event => sub { ugtk2->exit(0) }); +$my_win->{window}->signal_connect(delete_event => sub { ugtk3->exit(0) }); my $calendar = gtknew('Calendar'); $calendar->signal_connect($_ => \&cal_changed) foreach 'month-changed', 'day-selected', 'day-selected-double-click', 'prev-month', 'next-month', 'prev-year', 'next-year'; @@ -103,7 +103,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi ]), 0, create_okcancel(my $w = { - cancel_clicked => sub { ugtk2->exit(0) }, + cancel_clicked => sub { ugtk3->exit(0) }, ok_clicked => sub { my $need_date = 1; any::disable_x_screensaver(); @@ -156,7 +156,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi -e '/sbin/hwclock' and system('/sbin/hwclock', '--systohc'); any::enable_x_screensaver(); system(qw(dcop kicker Panel restart)) if $ENV{DESKTOP} eq 'kde'; - ugtk2->exit(0); + ugtk3->exit(0); }, }, undef, undef, '', @@ -230,7 +230,7 @@ $drawing_area->show; $my_win->{window}->show_all; my ($midx, $midy) = ($drawing_area->allocation->width/2, $drawing_area->allocation->height/2); $my_win->main; -ugtk2->exit(0); +ugtk3->exit(0); sub ntp_widget_state { my ($state) = @_; @@ -345,7 +345,7 @@ sub Repaint { my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; my $dRadians_sec_real = $dRadians_sec; my $gc = $drawing_area->style->white_gc; - # fix race on ugtk2->exit that causes a crash (#33894) + # fix race on ugtk3->exit that causes a crash (#33894) return 0 if !$gc; $pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, $width, $height); my ($midx, $midy) = ($width / 2, $height / 2); diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb index ce735cafa..9ed351b71 100755 --- a/perl-install/standalone/drakdvb +++ b/perl-install/standalone/drakdvb @@ -22,14 +22,14 @@ use lib qw(/usr/lib/libDrakX); use MDK::Common; use common; use standalone; -use mygtk2; +use mygtk3; use interactive; -use ugtk2 qw(:create :helpers :wrappers); +use ugtk3 qw(:create :helpers :wrappers); use Gtk2::SimpleList; my $title = N("DVB"); -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; -my $w = ugtk2->new($title); +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; +my $w = ugtk3->new($title); $w->{window}->signal_connect('destroy' => \&exitapp); mygtk3::register_main_window($w->{real_window}); my $in = 'interactive'->vnew; @@ -77,7 +77,7 @@ sub detect_channels() { $buttons{detect}->set_sensitive(1); $channel_list->set_sensitive(1); }; - $wait = ugtk2->new(N("Please wait"), grab => 1); + $wait = ugtk3->new(N("Please wait"), grab => 1); $wait->{window}->signal_connect('destroy' => \&exitapp); if ($pid = fork()) { gtkadd($wait->{window}, @@ -142,7 +142,7 @@ sub launch_tv() { gtkadd($w->{window}, gtknew('VBox', spacing => 5, children => [ - $::isEmbedded ? () : (0, Gtk2::Banner->new($ugtk2::wm_icon, $title)), + $::isEmbedded ? () : (0, Gtk2::Banner->new($ugtk3::wm_icon, $title)), 1, gtknew('ScrolledWindow', width => 300, height => 400, child => $channel_list), 0, gtknew('HButtonBox', layout => 'end', children_loose => [ $buttons{detect} = gtknew('Button', text => N("Detect Channels"), clicked => \&detect_channels), diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 77a9180cc..687846932 100755 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -26,7 +26,7 @@ use interactive; use services; use run_program; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png"; my $in = 'interactive'->vnew('su'); diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index c7a21b1ed..11597c6aa 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -29,23 +29,23 @@ use lib qw(/usr/lib/libDrakX); use standalone; #- warning, standalone must be loaded very first, for 'explanations' use common; -use mygtk2 qw(gtknew); -use ugtk2 qw(:create :dialogs :helpers :wrappers); +use mygtk3 qw(gtknew); +use ugtk3 qw(:create :dialogs :helpers :wrappers); use detect_devices; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakfloppy-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakfloppy-mdk.png"; require_root_capability(); -my $window = ugtk2->new(N("Boot Floppy")); +my $window = ugtk3->new(N("Boot Floppy")); unless ($::isEmbedded) { - $window->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) }); + $window->{rwindow}->signal_connect(delete_event => sub { ugtk3->exit(0) }); $window->{rwindow}->set_border_width(5); ### menus definition # the menus are not shown but they provides shiny shortcut like C-q create_factory_menu($window->{rwindow}, ( { path => N("/_File"), item_type => '' }, - { path => N("/File/_Quit"), accelerator => N("Q"), callback => sub { ugtk2->exit(0) } }, + { path => N("/File/_Quit"), accelerator => N("Q"), callback => sub { ugtk3->exit(0) } }, ) ); } @@ -96,7 +96,7 @@ $window->{window}->add( ), 1, gtknew('VBox'), 0, create_okcancel({ - cancel_clicked => sub { ugtk2->exit(0) }, + cancel_clicked => sub { ugtk3->exit(0) }, ok_clicked => \&build_it, }, undef, undef, '', @@ -108,7 +108,7 @@ $window->{window}->add( $window->{rwindow}->show_all; $window->main; -ugtk2->exit(0); +ugtk3->exit(0); my $remove_but; @@ -301,7 +301,7 @@ sub build_it() { my $log = join('', <$STATUS>); if (close $STATUS) { info_dialog(N("Floppy creation completed"), N("The creation of the boot floppy has been successfully completed \n")); - ugtk2->exit; + ugtk3->exit; } else { err_dialog(N("Error"), #-PO: Do not alter the and tags diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index c4657ffc1..4599d76f7 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -87,14 +87,14 @@ use lib qw(/usr/lib/libDrakX); use standalone; #- warning, standalone must be loaded very first, for 'explanations' -use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version -use ugtk2 qw(:create :dialogs :helpers :wrappers); +use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version +use ugtk3 qw(:create :dialogs :helpers :wrappers); use common; use run_program; require_root_capability(); -$ugtk2::wm_icon = "drakfont"; +$ugtk3::wm_icon = "drakfont"; # global variables needed by each functions my $xlsfonts = 0; @@ -476,9 +476,9 @@ sub backend_mod() { sub interactive_mode() { $interactive = 1; - $window1 = ugtk2->new(N("Font Installation")); - mygtk2::register_main_window($window1->{real_window}); - $window1->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) }); + $window1 = ugtk3->new(N("Font Installation")); + mygtk3::register_main_window($window1->{real_window}); + $window1->{rwindow}->signal_connect(delete_event => sub { ugtk3->exit(0) }); $window1->{rwindow}->set_position('center') if !$::isEmbedded; my $button = {}; @@ -510,7 +510,7 @@ sub interactive_mode() { $window1->{rwindow}->show_all; $window1->{rwindow}->realize; $window1->main; - ugtk2->exit(0); + ugtk3->exit(0); } $list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend_mod() : interactive_mode(); diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 8a8048c81..cc7aa434c 100755 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -48,7 +48,7 @@ if (-f $instpath) { local $ENV{HOME} = '/root' if !$<; run_program::raw({ detach => 1 }, 'display_help', "file://$ancpath"); } else { - $ugtk2::wm_icon = "help"; + $ugtk3::wm_icon = "help"; my $in = interactive->vnew; $in->ask_warn(N("%s Help Center", N("Mageia")), N("No Help entry for %s\n", $idlabel)); } diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 1ad449519..c7fae3143 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -7,10 +7,10 @@ use standalone; use MDK::Common; use common; -use mygtk2 qw(gtknew gtkset); -use ugtk2 qw(:create :dialogs :helpers :wrappers); +use mygtk3 qw(gtknew gtkset); +use ugtk3 qw(:create :dialogs :helpers :wrappers); -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png"; require_root_capability(); #- vars declaration @@ -30,10 +30,10 @@ my ($editable, $modified) = (0, 0); my @rules; #- Widget declaration -my $w = ugtk2->new(N("Security Permissions")); +my $w = ugtk3->new(N("Security Permissions")); $w->{rwindow}->set_size_request(620, 400) unless $::isEmbedded; my $W = $w->{window}; -$W->signal_connect(delete_event => sub { ugtk2->exit }); +$W->signal_connect(delete_event => sub { ugtk3->exit }); my $model = Gtk2::ListStore->new("Gtk2::Gdk::Pixbuf", ("Glib::String") x 5); my $permList = Gtk2::TreeView->new_with_model($model); @@ -129,7 +129,7 @@ Select permissions to see/edit", $level), alignment => [ 0, 0 ]), 0, gtknew('VBox'), ]), 0, create_okcancel({ - cancel_clicked => sub { ugtk2->exit }, + cancel_clicked => sub { ugtk3->exit }, ok_clicked => \&save_perm, }, undef, undef, '', @@ -160,7 +160,7 @@ $permList->get_selection->signal_connect('changed' => sub { }); $w->main; -ugtk2->exit; +ugtk3->exit; sub hide_up_button_iffirst_item { @@ -211,7 +211,7 @@ sub save_perm() { close $F; } $modified = 0; - ugtk2->exit; + ugtk3->exit; } sub load_perms() { diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index f78b5f63a..b4d99469f 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -26,8 +26,8 @@ use common; use standalone; use vars qw($MODE %options); use interactive; -use mygtk2 qw(gtknew gtkset); -use ugtk2 qw(:helpers :wrappers :ask :create); +use mygtk3 qw(gtknew gtkset); +use ugtk3 qw(:helpers :wrappers :ask :create); use run_program; use security::level; use security::msec; @@ -43,7 +43,7 @@ use security::l10n; my $_in = 'interactive'->vnew('su'); # enforce being root -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/draksec-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/draksec-mdk.png"; my ($w); ############################ I18N ################################### @@ -66,7 +66,7 @@ sub resize { gtkset($_[0], width => 50) } # factorize this with drakrpm and harddrake2 sub wait_msg { - my $mainw = ugtk2->new(N("Please wait"), (modal => 1, transient => $w->{real_window})); + my $mainw = ugtk3->new(N("Please wait"), (modal => 1, transient => $w->{real_window})); $mainw->{window}->add(gtknew('WrappedLabel', text => $_[0])); $mainw->{rwindow}->show_all; gtkset_mousecursor_wait($mainw->{rwindow}->window); @@ -84,7 +84,7 @@ sub new_nonedit_combo { } #my $msec = security::msec->new; -$w = ugtk2->new(N("Security Level and Checks")); +$w = ugtk3->new(N("Security Level and Checks")); my $window = $w->{window}; @@ -98,7 +98,7 @@ unless ($::isEmbedded) { # Connect the signals $window->signal_connect('delete_event', sub { $window->destroy }); -$window->signal_connect('destroy', sub { ugtk2->exit }); +$window->signal_connect('destroy', sub { ugtk3->exit }); $window->add(my $vbox = gtkshow(gtknew('VBox'))); @@ -231,7 +231,7 @@ gtkpack_($vbox, 0, create_okcancel(my $oc = { - cancel_clicked => sub { ugtk2->exit(0) }, + cancel_clicked => sub { ugtk3->exit(0) }, ok_clicked => sub { log::explanations("Setting up right delegation"); my %rev_auth = reverse %auth; @@ -242,7 +242,7 @@ gtkpack_($vbox, write_rules(); remove_wait_msg($w); - ugtk2->exit(0); + ugtk3->exit(0); } }, undef, undef, '' @@ -253,4 +253,4 @@ $oc->{cancel}->can_default(1); $oc->{cancel}->grab_default; $w->main; -ugtk2->exit(0); +ugtk3->exit(0); diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index 6a8e899ea..a51dffbca 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -29,7 +29,7 @@ use detect_devices; my $in = 'interactive'->vnew('su'); -$ugtk2::wm_icon = 'draksound-16'; +$ugtk3::wm_icon = 'draksound-16'; my $modules_conf = modules::any_conf->read; if (my @devices = detect_devices::probe_category('multimedia/sound')) { diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index 8524daf2a..266c6fd1b 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -6,7 +6,7 @@ use standalone; use common; use mouse; use detect_devices; -use ugtk2 qw(:create :dialogs :helpers :wrappers); +use ugtk3 qw(:create :dialogs :helpers :wrappers); use interactive; use Libconf qw(:functions); use Libconf::Glueconf::NUT::Ups_conf; @@ -313,7 +313,7 @@ my @pages = ( #$in = 'interactive'->vnew('su'); # require_root_capability(); $in = 'interactive'->vnew; -$ugtk2::wm_icon = "drakups"; +$ugtk3::wm_icon = "drakups"; if (!$::testing) { $in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') or $in->exit(1); @@ -326,7 +326,7 @@ if (member('--wizard', @ARGV)) { $in->exit($@ ? 1 : 0); } -$w = ugtk2->new(N("UPS Management")); +$w = ugtk3->new(N("UPS Management")); if (!$::isEmbedded) { mygtk3::register_main_window($w->{real_window}); $w->{window}->set_size_request(500, 550); diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices index 91317d1f4..5d814354e 100755 --- a/perl-install/standalone/drakxservices +++ b/perl-install/standalone/drakxservices @@ -10,7 +10,7 @@ use interactive; use services; use log; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/service-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/service-mdk.png"; my $in = 'interactive'->vnew('su'); begin: my $l = services::ask($in); diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 9b56007e2..e8cf7d9be 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -29,7 +29,7 @@ use detect_devices; use lang; use log; -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; my $in = 'interactive'->vnew; diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 588ac6841..bd1bcd9d0 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -12,11 +12,11 @@ use common; # i18n: IMPORTANT: to get correct namespace (drakconf instead of only libDrakX) BEGIN { unshift @::textdomains, 'drakconf' } -use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version -use ugtk2 qw(:create :helpers :wrappers); +use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version +use ugtk3 qw(:create :helpers :wrappers); use interactive; use modules::parameters; -use harddrake::data; #- needs to stay after use-ugtk2 as long as this module defines globals containing some N() +use harddrake::data; #- needs to stay after use-ugtk3 as long as this module defines globals containing some N() use fsedit; use pkgs; use POSIX qw(:sys_wait_h); @@ -188,8 +188,8 @@ my %menu_options = ( 'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ], ); -$ugtk2::wm_icon = "harddrake"; -$w = ugtk2->new(N("Hardware Configuration")); +$ugtk3::wm_icon = "harddrake"; +$w = ugtk3->new(N("Hardware Configuration")); # fake diagnostics pragma: local $::main_window = $w->{real_window}; @@ -548,7 +548,7 @@ $w->main; sub quit_global() { kill(15, $pid) if $pid; setVarsInSh($conffile, \%options) if !$::testing; - ugtk2->exit(0); + ugtk3->exit(0); } sub show_hide { diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index cb2b81da6..231c528ea 100755 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -34,7 +34,7 @@ if (defined $klang) { my $locale = lang::read($>); my $in = 'interactive'->vnew; -$ugtk2::wm_icon = "localedrake"; +$ugtk3::wm_icon = "localedrake"; $::Wizard_title = N("LocaleDrake"); any::selectLanguage_and_more_standalone($in, $locale); diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index d5f391b05..2c420affd 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -28,10 +28,10 @@ use c; use common; use interactive; use do_pkgs; -use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version -use ugtk2 qw(:create :dialogs :helpers :wrappers); +use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version +use ugtk3 qw(:create :dialogs :helpers :wrappers); -$ugtk2::wm_icon = "/usr/share/mcc/themes/default/logdrake-mdk.png"; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/logdrake-mdk.png"; my $in = 'interactive'->vnew('su'); my ($isExplain, $Explain, $isFile, $File, $isWord, $Word); @@ -50,9 +50,9 @@ my $isTail = $isFile; $| = 1 if $isTail; my $h = chomp_(`hostname -s`); -$ugtk2::wm_icon = "logdrake"; +$ugtk3::wm_icon = "logdrake"; my $explain_title = N("%s Tools Logs", N("Mageia")); -my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logs")); +my $my_win = ugtk3->new($isExplain ? $explain_title : N("Logs")); unless ($::isEmbedded) { $my_win->{window}->set_border_width(5); @@ -186,7 +186,7 @@ $my_win->{window}->show_all; search() if $isFile; $my_win->main; -sub quit() { ugtk2->exit(0) } +sub quit() { ugtk3->exit(0) } #------------------------------------------------------------- # search functions @@ -364,7 +364,7 @@ sub log_output { } sub insert_text_n_scroll() { - ugtk2::gtktext_insert($log_text, \@logs, append => 1); + ugtk3::gtktext_insert($log_text, \@logs, append => 1); $log_text->scroll_to_iter($log_buf->get_end_iter, 0, 1, 0.5, 0.5); undef @logs; } diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index 112953b27..f36cf4967 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -39,7 +39,7 @@ foreach (@ARGV) { /^--dynamic=(.*)$/ and do { dynamic(); exit() }; } -$ugtk2::wm_icon = "scannerdrake"; +$ugtk3::wm_icon = "scannerdrake"; my $in = 'interactive'->vnew('su'); if (!files_exist(qw(/usr/bin/scanimage /etc/sane.d/dll.conf)) || diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 3db9ff814..d1db5ed79 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1,4 +1,4 @@ -package ugtk2; +package ugtk3; use diagnostics; use strict; @@ -36,7 +36,7 @@ $EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ]; use c; use log; use common; -use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version +use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version use Gtk2; @@ -53,8 +53,8 @@ sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } # variables, and second, to "see" directly in the code the user interface # you're building. -sub gtkdestroy { mygtk2::may_destroy($_[0]) } -sub gtkflush() { mygtk2::flush() } +sub gtkdestroy { mygtk3::may_destroy($_[0]) } +sub gtkflush() { mygtk3::flush() } sub gtkhide { $_[0]->hide; $_[0] } sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } sub gtkpack { gtkpowerpack(1, 1, @_) } @@ -152,9 +152,9 @@ sub gtkradio { } @_; } -sub gtkroot() { mygtk2::root_window() } -sub gtkcolor { &mygtk2::rgb2color } -sub gtkset_background { &mygtk2::set_root_window_background } +sub gtkroot() { mygtk3::root_window() } +sub gtkcolor { &mygtk3::rgb2color } +sub gtkset_background { &mygtk3::set_root_window_background } sub gtkset_text { my ($w, $s) = @_; @@ -360,7 +360,7 @@ sub create_box_with_title { my ($txt) = @_; ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, # workaround infamous 6 years old gnome bug #101968: - width => mygtk2::get_label_width()); + width => mygtk3::get_label_width()); }; gtkpack__($box, if_($::isWizard, gtknew('Label', height => 10)), @@ -635,13 +635,13 @@ sub may_set_icon { } } -sub gtktext_insert { &mygtk2::_text_insert } -sub icon_paths { &mygtk2::_icon_paths } -sub add_icon_path { &mygtk2::add_icon_path } +sub gtktext_insert { &mygtk3::_text_insert } +sub icon_paths { &mygtk3::_icon_paths } +sub add_icon_path { &mygtk3::add_icon_path } sub set_main_window_size { my ($o) = @_; - mygtk2::set_main_window_size($o->{rwindow}); + mygtk3::set_main_window_size($o->{rwindow}); } # extracts interesting font metrics for a given widget @@ -748,7 +748,7 @@ sub new { if_(!$::isInstall, icon_no_error => wm_icon()), if_($o->{transient}, transient_for => $o->{transient}), ); - mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; + mygtk3::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window}; $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded; $o->{rwindow} = $o->{window} = $window; @@ -763,7 +763,7 @@ sub main { gtkset_mousecursor_normal(); $o->show; - mygtk2::main($o->{rwindow}, + mygtk3::main($o->{rwindow}, sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() }); $o->{retval}; } @@ -807,11 +807,11 @@ END { &exit() } # Full UI managed functions that will return to you the value that the # user chose. -sub ask_warn { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) } -sub ask_yesorno { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } -sub ask_okcancel { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } -sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) } -sub ask_dir { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) } +sub ask_warn { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) } +sub ask_yesorno { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } +sub ask_okcancel { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } +sub ask_from_entry { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) } +sub ask_dir { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) } sub _ask_from_entry($$@) { my ($o, @msgs) = @_; @@ -852,7 +852,7 @@ sub _ask_okcancel($@) { sub create_file_selector { my (%opts) = @_; - my $w = ugtk2->new(delete $opts{title}, modal => 1); + my $w = ugtk3->new(delete $opts{title}, modal => 1); my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir}); my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open'); add2hash(\%opts, { width => 480, height => 250 }); @@ -901,7 +901,7 @@ sub _ask_dir { sub ask_browse_tree_info { my ($common) = @_; - my $w = ugtk2->new($common->{title}); + my $w = ugtk3->new($common->{title}); my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); my $tree = Gtk2::TreeView->new_with_model($tree_model); @@ -918,7 +918,7 @@ sub ask_browse_tree_info { gtknew('VBox', spacing => 5, children => [ 0, gtknew('Title2', label => $common->{message}, # workaround infamous 6 years old gnome bug #101968: - width => mygtk2::get_label_width()), + width => mygtk3::get_label_width()), 1, gtknew('VBox', children => [ 1, gtknew('ScrolledWindow', child => $tree), 0, gtknew('Frame', text => N("Info"), child => @@ -1163,7 +1163,7 @@ sub ask_browse_tree_info_given_widgets { $curr = $iter; } #- the following test for equality is because we can have a button_press_event first, then - #- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that + #- two changed events, the first being on a different row :/ (is it a bug in gtk3?) - that #- happens in rpmdrake when doing a "search" and directly trying to select a found package if ($mouse_toggle_pending eq $model->get($iter, 0)) { $toggle->(1); @@ -1318,8 +1318,8 @@ sub set_popdown_strings { my $menu = Gtk2::Menu->new; # keep string list around for ->set_text compatibilty helper $w->{strings} = \@strs; - #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); - $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; + #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); + $menu->append(ugtk3::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; $w->set_menu($menu); $w; } @@ -1399,34 +1399,34 @@ sub set_text { package Gtk2::Label; sub set { my ($label, $text) = @_; - mygtk2::gtkset($label, text => $text); + mygtk3::gtkset($label, text => $text); } package Gtk2::WrappedLabel; sub new { my ($_type, $o_text, $o_align) = @_; - mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); + mygtk3::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); } package Gtk2::Entry; sub new_with_text { my ($_class, $o_text) = @_; - mygtk2::gtknew('Entry', text => $o_text); + mygtk3::gtknew('Entry', text => $o_text); } package Gtk2::Banner; use MDK::Common; -use mygtk2 qw(gtknew); -use ugtk2 qw(:helpers :wrappers); +use mygtk3 qw(gtknew); +use ugtk3 qw(:helpers :wrappers); sub set_pixmap { my ($darea) = @_; return if !$darea->realized; - ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf}); + ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf}); update_text($darea); } @@ -1441,15 +1441,15 @@ sub update_text { sub new { my ($_class, $icon, $text, $o_options) = @_; - mygtk2::import_style_ressources(); + mygtk3::import_style_ressources(); my $darea = gtknew('DrawingArea', widget_name => 'Banner'); $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); my $d_height = $darea->{back_pixbuf}->get_height; $darea->set_size_request(-1, $d_height); $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); - eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) }; - $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon()); - my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) }; + eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; + $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); + my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) }; my $blue_width = $blue_part->get_width; $darea->{text} = $text; require lang; @@ -1633,13 +1633,13 @@ sub show { package Gtk2::GUI_Update_Guard; use MDK::Common::Func qw(before_leaving); -use ugtk2; +use ugtk3; sub new { my ($_class) = @_; # prevent a perl_checker warning in callers my $old_signal = $SIG{ALRM}; $SIG{ALRM} = sub { - ugtk2::gtkflush(); + ugtk3::gtkflush(); alarm(1); }; alarm(1); -- cgit v1.2.1 From 602108d3f37701dcecdeb9697c05c3b9d76eb67a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:26:31 +0200 Subject: Gtk2::Pango -> Pango --- perl-install/mygtk3.pm | 2 +- perl-install/standalone/harddrake2 | 6 +++--- perl-install/ugtk3.pm | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 9c6fccce4..0c4798e4c 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -420,7 +420,7 @@ sub _gtk__Label { $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; $w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap}; $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; - $w->modify_font(Gtk2::Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; + $w->modify_font(Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; } if (my $text_ref = delete $opts->{text_ref}) { diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index bd1bcd9d0..4a605c480 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -309,7 +309,7 @@ $tree->get_selection->signal_connect('changed' => sub { ($current_device, $current_class) = @{$data[$idx]}; if ($idx ne -1) { - use Gtk2::Pango; + use Pango; my %device_fields = map { # The U+200E character is to force LTR display, as what what follows the colon is always in LTR (device names, paths, etc), # this ensures proper displaying of names like /dev/fd0 (otherwise it gets 'dev/fd0/'). @@ -317,7 +317,7 @@ $tree->get_selection->signal_connect('changed' => sub { my $field = lookup_field($_); if_($_ && $field->[0], $_ => [ - [ $field->[0] . ": \x{200e}", { 'foreground' => 'royalblue3', 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD } ], + [ $field->[0] . ": \x{200e}", { 'foreground' => 'royalblue3', 'weight' => Pango->PANGO_WEIGHT_BOLD } ], [ ($current_device->{$_} =~ /^(unknown)/ ? N("unknown") : $current_device->{$_} =~ /^(Unknown)/ ? N("Unknown") : $current_device->{$_} eq 'yes' ? N("Yes") : @@ -569,7 +569,7 @@ sub lookup_field { sub titleFormat { my ($title) = @_; - [ $title . "\n", { 'weight' => Gtk2::Pango->PANGO_WEIGHT_BOLD, scale => Gtk2::Pango->PANGO_SCALE_LARGE } ]; + [ $title . "\n", { 'weight' => Pango->PANGO_WEIGHT_BOLD, scale => Pango->PANGO_SCALE_LARGE } ]; } sub force_rename_field { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index d1db5ed79..9ad1cc2cb 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -310,9 +310,9 @@ sub markup_to_TextView_format { foreach (@$l) { my ($_txt, $attrs) = @$_; if ($attrs) { - $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; + $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Pango; Pango->PANGO_WEIGHT_BOLD }; $attrs->{size} eq 'larger' and do { - $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' + $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger' delete $attrs->{size}; }; } @@ -349,7 +349,7 @@ sub create_box_with_title { my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); $scroll->signal_connect(realize => sub { my $layout = $wtext->create_pango_layout($text); - $layout->set_width(($width - 10) * Gtk2::Pango->scale); + $layout->set_width(($width - 10) * Pango->scale); $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $o->{rwindow}->queue_resize; @@ -653,14 +653,14 @@ sub gtkfontinfo { foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { no strict; my $func = "get_$_"; - $fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func); + $fontinfo{$_} = Pango->pixels($metrics->$func); } %fontinfo; } sub gtkmodify_font { my ($w, $arg) = @_; - $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg)); + $w->modify_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg)); $w; } @@ -1446,7 +1446,7 @@ sub new { $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); my $d_height = $darea->{back_pixbuf}->get_height; $darea->set_size_request(-1, $d_height); - $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13")); + $darea->modify_font(Pango::FontDescription->from_string("13")); eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) }; -- cgit v1.2.1 From 2cfaaed875e7caeae898acf23630558077bb668a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:30:42 +0200 Subject: "Gtk2::Gdk::Keysyms{XYZ}" => "Gtk3::Gdk::KEY_XYZ" --- perl-install/install/gtk.pm | 2 +- perl-install/interactive/gtk.pm | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index ac5c49ba4..a1fa46ebf 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -228,7 +228,7 @@ 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})) { diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 61c886da2..d3b36abc3 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -10,7 +10,6 @@ use interactive; use common; use mygtk3; use ugtk3 qw(:helpers :wrappers :create); -use Gtk2::Gdk::Keysyms; my $forgetTime = 1000; #- in milli-seconds @@ -104,8 +103,8 @@ sub create_treeview_list { Glib::Source->remove($timeout) if $timeout; $timeout = ''; if ($event->keyval >= 0x100) { - $e->{may_go_to_next}(), return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter})); - $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R})); + $e->{may_go_to_next}(), return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter)); + $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R)); } else { if (member('control-mask', @{$event->state})) { $c eq 's' or return 1; @@ -268,8 +267,8 @@ sub create_treeview_tree { Glib::Source->remove($timeout) if $timeout; $timeout = ''; if ($event->keyval >= 0x100) { - &$toggle and return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter})); - $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R})); + &$toggle and return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter)); + $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R)); } else { my $next; if (member('control-mask', @{$event->state})) { -- cgit v1.2.1 From b9e700aea8f8dfae031d9ff923f00393b052fd3d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:16:30 +0200 Subject: use Gtk3 namespace instead of Gtk2 --- perl-install/any.pm | 8 +- perl-install/common.pm | 2 +- perl-install/dbus_object.pm | 4 +- perl-install/diskdrake/hd_gtk.pm | 34 +++--- perl-install/diskdrake/smbnfs_gtk.pm | 12 +- perl-install/fs/partitioning_wizard.pm | 48 ++++---- perl-install/install/gtk.pm | 16 +-- perl-install/install/steps_gtk.pm | 14 +-- perl-install/interactive/gtk.pm | 94 ++++++++-------- perl-install/mygtk3.pm | 150 ++++++++++++------------- perl-install/services.pm | 26 ++--- perl-install/share/po/translation_size.pl | 12 +- perl-install/standalone/display_help | 10 +- perl-install/standalone/drakautoinst | 58 +++++----- perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakbug | 24 ++-- perl-install/standalone/drakclock | 18 +-- perl-install/standalone/drakdvb | 8 +- perl-install/standalone/drakfloppy | 14 +-- perl-install/standalone/drakfont | 92 +++++++-------- perl-install/standalone/drakperm | 12 +- perl-install/standalone/draksec | 8 +- perl-install/standalone/drakups | 28 ++--- perl-install/standalone/harddrake2 | 26 ++--- perl-install/standalone/logdrake | 48 ++++---- perl-install/ugtk3.pm | 116 +++++++++---------- perl-install/unused/migrate-ugtk2-to-mygtk2.pl | 2 +- 27 files changed, 443 insertions(+), 443 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index a04c47f5e..a19b1c057 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1027,7 +1027,7 @@ sub display_release_notes { return; } - require Gtk2::WebKit; + require Gtk3::WebKit; require ugtk3; ugtk3->import(':all'); require mygtk3; @@ -1037,13 +1037,13 @@ sub display_release_notes { my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1); gtkadd($w->{rwindow}, - gtkpack_(Gtk2::VBox->new, + gtkpack_(Gtk3::VBox->new, 1, create_scrolled_window(ugtk3::gtkset_border_width($view, 5), [ 'never', 'automatic' ], ), 0, gtkpack(create_hbox('end'), gtknew('Button', text => N("Close"), - clicked => sub { Gtk2->main_quit }) + clicked => sub { Gtk3->main_quit }) ), ), ); @@ -1201,7 +1201,7 @@ sub selectLanguage_standalone { ]); $locale->{utf8} = !$non_utf8; lang::set($locale); - Gtk2->set_locale if $in->isa('interactive::gtk'); + Gtk3->set_locale if $in->isa('interactive::gtk'); lang::lang_changed($locale) if $old_lang ne $locale->{lang}; } diff --git a/perl-install/common.pm b/perl-install/common.pm index 9d5763202..f0dcacff3 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -84,7 +84,7 @@ sub to_utf8 { $str; } -#- This is needed because text printed by Gtk2 will always be encoded +#- This is needed because text printed by Gtk3 will always be encoded #- in UTF-8; #- we first check if LC_ALL is defined, because if it is, changing #- only LC_COLLATE will have no effect. diff --git a/perl-install/dbus_object.pm b/perl-install/dbus_object.pm index a1038fc40..5c59de7e0 100644 --- a/perl-install/dbus_object.pm +++ b/perl-install/dbus_object.pm @@ -55,9 +55,9 @@ sub set_gtk3_watch_helper { my ($con, $watch) = @_; my $flags = $watch->get_flags; require Net::DBus::Binding::Watch; - require Gtk2::Helper; + require Gtk3::Helper; if ($flags & &Net::DBus::Binding::Watch::READABLE) { - Gtk2::Helper->add_watch($watch->get_fileno, 'in', sub { + Gtk3::Helper->add_watch($watch->get_fileno, 'in', sub { $watch->handle(&Net::DBus::Binding::Watch::READABLE); $con->dispatch; 1; diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index f552fb1af..5d3a5af4e 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -48,7 +48,7 @@ sub load_theme() { my $rc = "/usr/share/libDrakX/diskdrake.rc"; -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc"; -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc"; - Gtk2::Rc->parse($rc); + Gtk3::Rc->parse($rc); } sub main { @@ -68,16 +68,16 @@ sub main { # updateLoopback(); gtkadd($w->{window}, - gtkpack_(Gtk2::VBox->new(0,7), + gtkpack_(Gtk3::VBox->new(0,7), 0, gtknew(($::isInstall ? ('Title1', 'label') : ('Label_Left', 'text')) => N("Click on a partition, choose a filesystem type then choose an action"), # workaround infamous 6 years old gnome bug #101968: width => mygtk3::get_label_width() ), - 1, (my $notebook_widget = Gtk2::Notebook->new), + 1, (my $notebook_widget = Gtk3::Notebook->new), 0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')), 0, (my $per_kind_action_box2 = gtknew('HButtonBox', layout => 'end')), - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, 0, (my $general_action_box = gtknew('HBox', spacing => 5)), ), ); @@ -150,7 +150,7 @@ sub try_ { } $update_all->($refresh); - Gtk2->main_quit if $v && member($name, 'Done'); + Gtk3->main_quit if $v && member($name, 'Done'); } sub get_action_box_size() { @@ -164,11 +164,11 @@ sub add_kind2notebook { my ($notebook_widget, $kind) = @_; die if $kind->{main_box}; - $kind->{display_box} = gtkset_size_request(Gtk2::HBox->new(0,0), $width, $height); - $kind->{action_box} = gtkset_size_request(Gtk2::VBox->new, get_action_box_size()); - $kind->{info_box} = Gtk2::VBox->new(0,0); + $kind->{display_box} = gtkset_size_request(Gtk3::HBox->new(0,0), $width, $height); + $kind->{action_box} = gtkset_size_request(Gtk3::VBox->new, get_action_box_size()); + $kind->{info_box} = Gtk3::VBox->new(0,0); my $box = - gtkpack_(Gtk2::VBox->new(0,7), + gtkpack_(Gtk3::VBox->new(0,7), 0, $kind->{display_box}, 0, filesystems_button_box(), 1, $kind->{info_box}); @@ -203,7 +203,7 @@ sub general_action_box { N_("Done")); my $box_end = gtknew('HButtonBox', layout => 'end', spacing => 5); foreach my $s (@actions) { - my $button = Gtk2::Button->new(translate($s)); + my $button = Gtk3::Button->new(translate($s)); $done_button = $button if $s eq 'Done'; gtkadd($box_end, gtksignal_connect($button, clicked => sub { try($s) })); } @@ -217,12 +217,12 @@ sub per_kind_action_box { foreach my $s (diskdrake::interactive::hd_possible_actions_base($in)) { gtkadd($box, - gtksignal_connect(Gtk2::Button->new(translate($s)), + gtksignal_connect(Gtk3::Button->new(translate($s)), clicked => sub { try($s, kind2hd($kind)) })); } foreach my $s (diskdrake::interactive::hd_possible_actions_extra($in)) { gtkadd($box2, - gtksignal_connect(Gtk2::Button->new(translate($s)), + gtksignal_connect(Gtk3::Button->new(translate($s)), clicked => sub { try($s, kind2hd($kind)) })); } } @@ -233,18 +233,18 @@ sub per_entry_action_box { if ($entry) { my @buttons = map { my $s = $_; - my $w = Gtk2::Button->new(translate($s)); + my $w = Gtk3::Button->new(translate($s)); $w->signal_connect(clicked => sub { try($s, kind2hd($kind), $entry) }); $w; } diskdrake::interactive::part_possible_actions($in, kind2hd($kind), $entry, $all_hds); - gtkadd($box, create_scrolled_window(gtkpack__(Gtk2::VBox->new, @buttons), undef, 'none')) if @buttons; + gtkadd($box, create_scrolled_window(gtkpack__(Gtk3::VBox->new, @buttons), undef, 'none')) if @buttons; } else { my $txt = !$::isStandalone && fsedit::is_one_big_fat_or_NT($all_hds->{hds}) ? N("You have one big Microsoft Windows partition. I suggest you first resize that partition (click on it, then click on \"Resize\")") : N("Please click on a partition"); - gtkpack($box, gtktext_insert(Gtk2::TextView->new, $txt)); + gtkpack($box, gtktext_insert(Gtk3::TextView->new, $txt)); } } @@ -338,7 +338,7 @@ sub create_buttons4partitions { } my $info = $entry->{mntpoint} || $entry->{device_LABEL}; $info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info; - my $w = Gtk2::ToggleButton->new_with_label($info) or internal_error('new_with_label'); + my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label'); $w->signal_connect(clicked => sub { $current_button != $w or return; current_entry_changed($kind, $entry); @@ -406,7 +406,7 @@ sub filesystems_button_box() { N_("Other"), N_("Empty")); my %name2fs_type = (Ext3 => 'ext3', Ext4 => 'ext4', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); - gtkpack(Gtk2::HBox->new, + gtkpack(Gtk3::HBox->new, map { my $t = $name2fs_type{$_}; my $w = gtknew('Button', text => translate($_), widget_name => 'PART_' . ($t || 'empty'), diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index e29101b44..ff50e0a18 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -42,7 +42,7 @@ sub try_ { $in->ask_warn(N("Error"), formatError($err)); } update($kind); - Gtk2->main_quit if member($name, 'Cancel', 'Done'); + Gtk3->main_quit if member($name, 'Cancel', 'Done'); } sub raw_hd_options { @@ -127,14 +127,14 @@ sub import_tree { my ($kind, $info_box) = @_; my (%servers_displayed, %wservers, %wexports); - $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String"); - my $tree = Gtk2::TreeView->new_with_model($tree_model); + $tree_model = Gtk3::TreeStore->new("Gtk3::Gdk::Pixbuf", "Glib::String"); + my $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->get_selection->set_mode('browse'); - my $col = Gtk2::TreeViewColumn->new; - $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0); + my $col = Gtk3::TreeViewColumn->new; + $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0); $col->add_attribute($pixrender, 'pixbuf', 0); - $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 1); + $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 1); $col->add_attribute($texrender, 'text', 1); $tree->append_column($col); diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 935ecb5bc..86b06f72e 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -300,14 +300,14 @@ sub create_display_box { my $width = 540; my $minwidth = 40; - my $display_box = ugtk3::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26); + my $display_box = ugtk3::gtkset_size_request(Gtk3::HBox->new(0,0), -1, 26); my $sep_count = @parts - 1; #- ratio used to compute initial partition pixel width (each partition should be > min_width) #- though, the pixel/sectors ratio cannot be the same for all the partitions my $initial_ratio = $totalsectors ? ($width - @parts * $minwidth - $sep_count) / $totalsectors : 1; - my $vbox = Gtk2::VBox->new; + my $vbox = Gtk3::VBox->new; my $part_sep; my $desc; @@ -315,9 +315,9 @@ sub create_display_box { my $last = $resize && $resize->[-1]; foreach my $entry (@parts) { - my $part_info = Gtk2::Label->new($entry->{device_LABEL}); + my $part_info = Gtk3::Label->new($entry->{device_LABEL}); my @colorized_fs_types = qw(ext2 ext3 ext4 xfs swap vfat ntfs ntfs-3g); - my $part_widget = Gtk2::EventBox->new; + my $part_widget = Gtk3::EventBox->new; $entry->{width} = int($entry->{size} * $initial_ratio) + $minwidth; if ($last && $last->{device} eq $entry->{device}) { #- entry is the last resizable partition @@ -329,11 +329,11 @@ sub create_display_box { $part_widget->set_name("PART_vfat"); $part_info->set_size_request(ceil($ratio * $entry->{min_win}), 0); - my $mdv_widget = gtkadd(gtkset_name(Gtk2::EventBox->new, "PART_new"), + my $mdv_widget = gtkadd(gtkset_name(Gtk3::EventBox->new, "PART_new"), gtkset_size_request(gtknew("Image", file => "small-logo"), $ratio * MB(600), 0)); - my $hpane = Gtk2::HPaned->new; + my $hpane = Gtk3::HPaned->new; $hpane->add1($part_widget); $hpane->child1_shrink(0); $hpane->add2($mdv_widget); @@ -345,17 +345,17 @@ sub create_display_box { my $add_part_size_info = sub { my ($name, $label) = @_; ugtk3::gtkpack__($desc, - gtkadd(gtkset_name(Gtk2::EventBox->new, $name), - Gtk2::Label->new(" " x 4)), + gtkadd(gtkset_name(Gtk3::EventBox->new, $name), + Gtk3::Label->new(" " x 4)), gtkset_size_request(gtkset_alignment($label, 0, 0.5), 150, 20)); }; - $desc = Gtk2::HBox->new(0,0); + $desc = Gtk3::HBox->new(0,0); - my $win_size_label = Gtk2::Label->new; + my $win_size_label = Gtk3::Label->new; $add_part_size_info->("PART_vfat", $win_size_label); - my $mdv_size_label = Gtk2::Label->new; + my $mdv_size_label = Gtk3::Label->new; $add_part_size_info->("PART_new", $mdv_size_label); my $update_size_labels = sub { @@ -400,8 +400,8 @@ sub create_display_box { } $part_widget->add($part_info); - $part_sep = gtkadd(Gtk2::EventBox->new, - gtkset_size_request(Gtk2::Label->new("."), 1, 0)); + $part_sep = gtkadd(Gtk3::EventBox->new, + gtkset_size_request(Gtk3::Label->new("."), 1, 0)); gtkpack__($display_box, $part_sep); } $display_box->remove($part_sep) if $part_sep; @@ -409,11 +409,11 @@ sub create_display_box { my @types = (N_("Ext2/3/4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"), N_("Other"), N_("Empty")); my %name2fs_type = ('Ext2/3/4' => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs'); - $desc = ugtk3::gtkpack(Gtk2::HBox->new, + $desc = ugtk3::gtkpack(Gtk3::HBox->new, map { my $t = $name2fs_type{$_}; - my $ev = Gtk2::EventBox->new; - my $w = Gtk2::Label->new(translate($_)); + my $ev = Gtk3::EventBox->new; + my $w = Gtk3::Label->new(translate($_)); $ev->add($w); $ev->set_name('PART_' . ($t || 'empty')); $ev; @@ -461,7 +461,7 @@ sub display_choices { $item = create_display_box($mainw->{kind}, $solutions{$s}[3], undef, $button); } elsif ($s eq 'existing_part') { } elsif ($s eq 'wipe_drive') { - $item = Gtk2::EventBox->new; + $item = Gtk3::EventBox->new; my $b2 = gtknew("Image", file => "small-logo"); $item->add($b2); $item->set_size_request(540,26); @@ -507,17 +507,17 @@ sub main { require diskdrake::hd_gtk; diskdrake::hd_gtk::load_theme(); - my $mainbox = Gtk2::VBox->new; + my $mainbox = Gtk3::VBox->new; my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{ $all_hds->{hds} }; push @kinds, diskdrake::hd_gtk::raid2real_kind($_) foreach @{$all_hds->{raids}}; push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}}; - my $hdchoice = Gtk2::HBox->new; + my $hdchoice = Gtk3::HBox->new; - my $hdchoicelabel = Gtk2::Label->new(N("Here is the content of your disk drive ")); + my $hdchoicelabel = Gtk3::Label->new(N("Here is the content of your disk drive ")); - my $combobox = Gtk2::ComboBox->new_text; + my $combobox = Gtk3::ComboBox->new_text; foreach (@kinds) { my $info = $_->{val}{info} || $_->{val}{device}; $info =~ s|^(?:.*/)?(.{24}).*|$1|; @@ -531,11 +531,11 @@ sub main { ugtk3::gtkpack2__($mainbox, $hdchoice); - my $contentbox = Gtk2::VBox->new(0, 12); + my $contentbox = Gtk3::VBox->new(0, 12); - my $scroll = Gtk2::ScrolledWindow->new; + my $scroll = Gtk3::ScrolledWindow->new; $scroll->set_policy('never', 'automatic'), - my $vp = Gtk2::Viewport->new; + my $vp = Gtk3::Viewport->new; $vp->set_shadow_type('none'); $vp->add($contentbox); $scroll->add($vp); diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index a1fa46ebf..dedb66af2 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -59,7 +59,7 @@ sub load_rc { my $f = $name; -r $name or $f = find { -r $_ } map { "$_/themes-$name.rc" } ("share", $ENV{SHARE_PATH}, dirname(__FILE__) . '/..'); if ($f) { - Gtk2::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); + Gtk3::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); } } @@ -68,7 +68,7 @@ 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); @@ -76,7 +76,7 @@ sub load_font { my $font = lang::l2pango_font($o->{locale}{lang}); my $s = qq(gtk-font-name="$font"); - Gtk2::Rc->parse_string($s); + Gtk3::Rc->parse_string($s); mkdir("/root"); output("/root/.gtkrc-2.0", $s); } @@ -169,7 +169,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: - mygtk3::flush(); #- for auto_installs which never go through the Gtk2 main loop + mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop $o->{steps_widget}->move_selection($steps{steps}{$_}{text}); if ($last_step) { @@ -179,7 +179,7 @@ sub update_steps_position { } $last_step = $_; } - mygtk3::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 } #------------------------------------------------------------------------------ @@ -199,14 +199,14 @@ q( $ENV{FONTCONFIG_FILE} = '/tmp/fonts.conf'; } - Gtk2->init; - Gtk2->set_locale; + Gtk3->init; + Gtk3->set_locale; } #------------------------------------------------------------------------------ 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); diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index d88fa2106..f57c9cecc 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -180,7 +180,7 @@ sub leavingStep { sub charsetChanged { my ($o) = @_; - Gtk2->set_locale; + Gtk3->set_locale; install::gtk::load_font($o); install::gtk::create_steps_window($o); } @@ -264,11 +264,11 @@ sub reallyChooseDesktop { $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"), @@ -286,7 +286,7 @@ sub reallyChooseDesktop { 1, gtknew('Image', file => "desktop-$val->[0]-big"), 0, gtknew('HSeparator'), 0, gtknew('HButtonBox', layout => 'end', children_loose => [ - gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) + gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit }) ]), ]), ); @@ -355,7 +355,7 @@ sub reallyChooseGroups { 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 { Gtk2->main_quit }), + gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }), ]), ]), ) @@ -572,7 +572,7 @@ sub installPackages { my $pl = $f; $pl =~ s/\.png$/.pl/; eval(cat_($pl)) if -e $pl; $banner->{text} = $title; - Gtk2::Banner::update_text($banner); + Gtk3::Banner::update_text($banner); } }; @@ -788,7 +788,7 @@ It will then continue from the hard disk drive and the packages will remain avai 0, gtknew('HButtonBox', layout => 'edge', children_tight => [ gtknew('Install_Button', text => N("Help"), clicked => sub { interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) }), - gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }), + gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }), ]), ]), ); diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index d3b36abc3..c1b196f8f 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -44,9 +44,9 @@ sub ask_fileW { sub create_boxradio { my ($e, $onchange_f, $double_click) = @_; - my $boxradio = gtkpack2__(Gtk2::VBox->new, + my $boxradio = gtkpack2__(Gtk3::VBox->new, my @radios = gtkradio('', @{$e->{formatted_list}})); - my $tips = Gtk2::Tooltips->new; + my $tips = Gtk3::Tooltips->new; mapn { my ($txt, $w) = @_; # workaround infamous 6 years old gnome bug #101968: @@ -78,11 +78,11 @@ sub create_treeview_list { my ($e, $onchange_f, $double_click) = @_; my $curr; - my $list = Gtk2::ListStore->new("Glib::String"); - my $list_tv = Gtk2::TreeView->new_with_model($list); + my $list = Gtk3::ListStore->new("Glib::String"); + my $list_tv = Gtk3::TreeView->new_with_model($list); $list_tv->set_headers_visible(0); $list_tv->get_selection->set_mode('browse'); - my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk2::CellRendererText->new, 'text' => 0); + my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk3::CellRendererText->new, 'text' => 0); $list_tv->append_column($textcolumn); $renderer->set_property('ellipsize', 'end'); @@ -124,7 +124,7 @@ sub create_treeview_list { if ($j == @l) { $starting_word = ''; } else { - $select->(Gtk2::TreePath->new_from_string(($j + $curr) % @l)); + $select->(Gtk3::TreePath->new_from_string(($j + $curr) % @l)); } $timeout = Glib::Timeout->add($forgetTime, sub { $timeout = $starting_word = ''; 0 }); @@ -151,7 +151,7 @@ sub create_treeview_list { my $nb = find_index { $_ eq $v } @{$e->{list}}; my ($old_path) = $list_tv->get_cursor; if (!$old_path || $nb != $old_path->to_string) { - $select->(Gtk2::TreePath->new_from_string($nb)); + $select->(Gtk3::TreePath->new_from_string($nb)); } undef $old_path if $old_path; }; @@ -162,7 +162,7 @@ sub __create_tree_model { my ($e) = @_; my $sep = quotemeta $e->{separator}; - my $tree_model = Gtk2::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk2::Gdk::Pixbuf")); + my $tree_model = Gtk3::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk3::Gdk::Pixbuf")); my $build_value = sub { my ($v) = @_; @@ -203,14 +203,14 @@ sub create_treeview_tree { my ($e, $onchange_f, $double_click) = @_; my $tree_model = __create_tree_model($e); - my $tree = Gtk2::TreeView->new_with_model($tree_model); + my $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->get_selection->set_mode('browse'); { - my $col = Gtk2::TreeViewColumn->new; - $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 0); + my $col = Gtk3::TreeViewColumn->new; + $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 0); $col->add_attribute($texrender, text => 0); if ($e->{image2f}) { - $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0); + $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0); $col->add_attribute($pixrender, pixbuf => 1); } $tree->append_column($col); @@ -219,7 +219,7 @@ sub create_treeview_tree { my $select = sub { my ($path_str) = @_; - my $path = Gtk2::TreePath->new_from_string($path_str); + my $path = Gtk3::TreePath->new_from_string($path_str); $tree->expand_to_path($path); $tree->set_cursor($path, undef, 0); gtkflush(); #- workaround gtk3 bug not honouring centering on the given row if node was closed @@ -331,7 +331,7 @@ sub create_treeview_tree { } #- $actions is a ref list of $action -#- $action is a { kind => $kind, action => sub { ... }, button => Gtk2::Button->new(...) } +#- $action is a { kind => $kind, action => sub { ... }, button => Gtk3::Button->new(...) } #- where $kind is one of '', 'modify', 'remove', 'add' sub add_modify_remove_action { my ($button, $buttons, $e, $treelist) = @_; @@ -371,13 +371,13 @@ sub create_widget { my ($w, $real_w, $focus_w, $set); if ($e->{type} eq 'iconlist') { - $w = Gtk2::Button->new; + $w = Gtk3::Button->new; $set = sub { gtkdestroy($e->{icon}); my $f = $e->{icon2f}->($_[0]); $e->{icon} = -e $f ? gtkcreate_img($f) : - Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0])); + Gtk3::WrappedLabel->new(may_apply($e->{format}, $_[0])); $w->add(gtkshow($e->{icon})); }; $w->signal_connect(clicked => sub { @@ -387,14 +387,14 @@ sub create_widget { if ($e->{alignment} eq 'right') { $real_w = gtknew('HButtonBox', layout => 'start', children_tight => [ $w ]); } else { - $real_w = gtkpack_(Gtk2::HBox->new(0,10), 1, Gtk2::HBox->new(0,0), 0, $w, 1, Gtk2::HBox->new(0,0)); + $real_w = gtkpack_(Gtk3::HBox->new(0,10), 1, Gtk3::HBox->new(0,0), 0, $w, 1, Gtk3::HBox->new(0,0)); } } elsif ($e->{type} eq 'bool') { if ($e->{image}) { - $w = ugtk3::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image}))); + $w = ugtk3::gtkadd(Gtk3::CheckButton->new, gtkshow(gtkcreate_img($e->{image}))); } else { #- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text}; - $w = Gtk2::CheckButton->new_with_label($e->{text}); + $w = Gtk3::CheckButton->new_with_label($e->{text}); } $w->signal_connect(clicked => $onchange->(sub { $w->get_active })); $set = sub { $w->set_active($_[0]) }; @@ -419,16 +419,16 @@ sub create_widget { $set = sub { my $w = $w->child; # handle Install_Buttons: - if (ref($w) =~ /Gtk2::HBox/) { - ($w) = find { ref($_) =~ /Gtk2::Label/ } $w->get_children; + if (ref($w) =~ /Gtk3::HBox/) { + ($w) = find { ref($_) =~ /Gtk3::Label/ } $w->get_children; } # guard against 'advanced' widgets that are now in their own dialog # (instead of in another block child of an expander): return if !$w; $w->set_label(may_apply($e->{format}, $_[0])) }; } elsif ($e->{type} eq 'range') { - my $adj = Gtk2::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1); - $w = $e->{SpinButton} ? Gtk2::SpinButton->new($adj, 10, 0) : Gtk2::HScale->new($adj); + my $adj = Gtk3::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1); + $w = $e->{SpinButton} ? Gtk3::SpinButton->new($adj, 10, 0) : Gtk3::HScale->new($adj); $w->set_size_request($e->{SpinButton} ? 100 : 200, -1); $w->set_digits(0); $adj->signal_connect(value_changed => $onchange->(sub { $adj->get_value })); @@ -458,7 +458,7 @@ sub create_widget { push @buttons, map { if_($actions->{$_}, 'gtk-go-' . $_) } qw(Up Down); @buttons = map { my $button = /^gtk-/ ? gtknew('Button', image => gtknew('Image', stock => lc($_))) - : Gtk2::Button->new(translate($_)); + : Gtk3::Button->new(translate($_)); my $kind = $_; $kind =~ s/^gtk-go-//; { kind => lc $kind, action => $actions->{$kind}, button => $button, real_kind => $_ }; @@ -479,9 +479,9 @@ sub create_widget { add_modify_remove_sensitive(\@buttons, $e); my ($images, $real_buttons) = partition { $_->{real_kind} =~ /^gtk-/ } @buttons; - $real_w = gtkpack_(Gtk2::HBox->new(0,0), + $real_w = gtkpack_(Gtk3::HBox->new(0,0), 1, create_scrolled_window($w), - 0, gtkpack__(Gtk2::VBox->new(0,0), + 0, gtkpack__(Gtk3::VBox->new(0,0), (map { $_->{button} } @$real_buttons), if_($images, gtknew('HButtonBox', @@ -518,23 +518,23 @@ sub create_widget { if (!$e->{separator}) { if ($e->{not_edit}) { - $real_w = $w = Gtk2::ComboBox->new_text; + $real_w = $w = Gtk3::ComboBox->new_text; # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time: first($w->child->get_cell_renderers)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width}; } else { - $w = Gtk2::ComboBoxEntry->new_text; + $w = Gtk3::ComboBoxEntry->new_text; ($real_w, $w) = ($w, $w->child); } $real_w->set_popdown_strings(@formatted_list); } else { $model = __create_tree_model($e); - $real_w = $w = Gtk2::ComboBox->new_with_model($model); + $real_w = $w = Gtk3::ComboBox->new_with_model($model); - $w->pack_start(my $texrender = Gtk2::CellRendererText->new, 0); + $w->pack_start(my $texrender = Gtk3::CellRendererText->new, 0); $w->add_attribute($texrender, text => 0); if ($e->{image2f}) { - $w->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0); + $w->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0); $w->add_attribute($pixrender, pixbuf => 1); } } @@ -568,21 +568,21 @@ sub create_widget { $w = gtknew('WeaknessCheckEntry'); } else { - $w = Gtk2::Entry->new; + $w = Gtk3::Entry->new; } $w->signal_connect(changed => $onchange->(sub { $w->get_text })); $w->signal_connect(focus_in_event => sub { $w->select_region(0, -1) }); $w->signal_connect(focus_out_event => sub { $w->select_region(0, 0) }); $set = sub { $w->set_text($_[0]) if $_[0] ne $w->get_text }; if ($e->{type} eq 'file') { - my $button = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-open'), clicked => sub { + my $button = gtksignal_connect(Gtk3::Button->new_from_stock('gtk-open'), clicked => sub { my $file = $o->ask_fileW({ title => $e->{label}, want_a_dir => to_bool($e->{want_a_dir}), }); $set->($file) if $file; }); - $real_w = gtkpack_(Gtk2::HBox->new(0,0), 1, $w, 0, $button); + $real_w = gtkpack_(Gtk3::HBox->new(0,0), 1, $w, 0, $button); } } $w->signal_connect(key_press_event => $e->{may_go_to_next}); @@ -628,9 +628,9 @@ sub all_title_entries { sub create_widgets_block { my ($o, $common, $l, $update, $ignore_ref) = @_; - my $label_sizegrp = Gtk2::SizeGroup->new('horizontal'); - my $right_label_sizegrp = Gtk2::SizeGroup->new('horizontal'); - my $realw_sizegrp = Gtk2::SizeGroup->new('horizontal'); + my $label_sizegrp = Gtk3::SizeGroup->new('horizontal'); + my $right_label_sizegrp = Gtk3::SizeGroup->new('horizontal'); + my $realw_sizegrp = Gtk3::SizeGroup->new('horizontal'); @$l = map_index { if ($::i && ($_->{type} eq 'expander' || $_->{title})) { @@ -667,7 +667,7 @@ sub create_widgets_block { my $eater = if_($e->{alignment} eq 'right' && !$label_w, gtknew('Label')); - $e->{real_w} = gtkpack_(Gtk2::HBox->new, + $e->{real_w} = gtkpack_(Gtk3::HBox->new, if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }), if_($eater, 1, $eater), if_($label_w, $e->{alignment} eq 'right', $label_w), @@ -700,7 +700,7 @@ sub create_widgets { my $ok_clicked = sub { !$mainw->{ok} || $mainw->{ok}->get_property('sensitive') or return; $mainw->{retval} = 1; - Gtk2->main_quit; + Gtk3->main_quit; }; my @all = all_entries($l); @@ -718,7 +718,7 @@ sub create_widgets { $mainw->{rwindow}->hide; if (my $v = $e->{clicked_may_quit}()) { $mainw->{retval} = $v; - Gtk2->main_quit; + Gtk3->main_quit; } $mainw->{rwindow}->show; $update->(); @@ -750,7 +750,7 @@ sub create_widgets { my $box = create_widgets_block($o, $common, $l, $update, \$ignore); - my $tooltips = Gtk2::Tooltips->new; + my $tooltips = Gtk3::Tooltips->new; foreach my $e (@all) { $tooltips->set_tip($e->{w}, $e->{help}) if $e->{help} && !ref($e->{help}); } @@ -804,20 +804,20 @@ sub get_html_file { sub display_help_window { my ($o, $common) = @_; if (my $file = $common->{interactive_help_id}) { - require Gtk2::WebKit; + require Gtk3::WebKit; my $view = gtknew('WebKit_View'); load_from_uri($view, $file); my $w = ugtk3->new(N("Help"), modal => 1); gtkadd($w->{rwindow}, - gtkpack_(Gtk2::VBox->new, + gtkpack_(Gtk3::VBox->new, 1, create_scrolled_window(gtkset_border_width($view, 5), [ 'never', 'automatic' ], ), - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, 0, gtkpack(create_hbox('end'), - gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) + gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit }) ), ), ); @@ -875,7 +875,7 @@ sub ask_fromW { my $entry_to_focus = find { $_->{focus} && $_->{focus}() } @$l; my $widget_to_focus = $entry_to_focus ? $entry_to_focus->{focus_w} : $common->{focus_cancel} ? $mainw->{cancel} : - @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk2::TreeView", "Gtk2::RadioButton")) ? + @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk3::TreeView", "Gtk3::RadioButton")) ? $l->[0]{focus_w} : $mainw->{ok}; $widget_to_focus->grab_focus if $widget_to_focus; @@ -918,7 +918,7 @@ my $reuse_timeout; sub wait_messageW { my ($o, $title, $message, $message_modifiable) = @_; - my $to_modify = Gtk2::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable)); + my $to_modify = Gtk3::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable)); Glib::Source->remove($reuse_timeout) if $reuse_timeout; $reuse_timeout = ''; diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 0c4798e4c..b4e3522f5 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -11,13 +11,13 @@ use c; use log; use common; -use Gtk2; +use Gtk3; sub init() { !check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0); $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk3 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); - Gtk2->init; + Gtk3->init; Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation @@ -52,7 +52,7 @@ sub gtkset { } my %opts = @_; - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkset unknown class $class"); + $class =~ s/^(Gtk3|Gtk3::Gdk|mygtk3)::// or internal_error("gtkset unknown class $class"); _gtk($w, $class, 'gtkset', \%opts); } @@ -67,7 +67,7 @@ sub gtkadd { internal_error("gtkadd $class: $r should be a string in @_"); } my %opts = @_; - $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkadd unknown class $class"); + $class =~ s/^(Gtk3|Gtk3::Gdk|mygtk3)::// or internal_error("gtkadd unknown class $class"); _gtk($w, $class, 'gtkadd', \%opts); } @@ -122,7 +122,7 @@ sub _gtk { $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; if (my $tip = delete $opts->{tip}) { - $global_tooltips ||= Gtk2::Tooltips->new; + $global_tooltips ||= Gtk3::Tooltips->new; $global_tooltips->set_tip($w, $tip); } @@ -170,10 +170,10 @@ sub _gtk_any_Button { if ($class eq 'RadioButton') { @radio_options = delete $opts->{group}; } - $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) : - delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : - $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : - "Gtk2::$class"->new(@radio_options); + $w = $opts->{child} ? "Gtk3::$class"->new(@radio_options) : + delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : + $opts->{text} ? "Gtk3::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : + "Gtk3::$class"->new(@radio_options); $w->{format} = delete $opts->{format} if exists $opts->{format}; } @@ -223,9 +223,9 @@ sub _gtk__CheckMenuItem { if (!$w) { add2hash_($opts, { mnemonic => 1 }); - $w = $opts->{image} || !exists $opts->{text} ? "Gtk2::$class"->new : - delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_label(delete $opts->{text}) : - "Gtk2::$class"->new_with_mnemonic(delete $opts->{text}); + $w = $opts->{image} || !exists $opts->{text} ? "Gtk3::$class"->new : + delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_label(delete $opts->{text}) : + "Gtk3::$class"->new_with_mnemonic(delete $opts->{text}); } $w->set_active(delete $opts->{active}) if exists $opts->{active}; @@ -239,9 +239,9 @@ sub _gtk__SpinButton { if (!$w) { $opts->{adjustment} ||= do { add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} }); - Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + Gtk3::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); }; - $w = Gtk2::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); + $w = Gtk3::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); } $w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed}; @@ -255,9 +255,9 @@ sub _gtk__HScale { $opts->{adjustment} ||= do { add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 }); add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value}; - Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + Gtk3::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); }; - $w = Gtk2::HScale->new(delete $opts->{adjustment}); + $w = Gtk3::HScale->new(delete $opts->{adjustment}); } $w->set_digits(delete $opts->{digits}) if exists $opts->{digits}; @@ -277,7 +277,7 @@ sub _gtk__ProgressBar { my ($w, $opts) = @_; if (!$w) { - $w = Gtk2::ProgressBar->new; + $w = Gtk3::ProgressBar->new; } if (my $fraction_ref = delete $opts->{fraction_ref}) { @@ -299,7 +299,7 @@ sub _gtk__DrawingArea { my ($w, $_opts) = @_; if (!$w) { - $w = Gtk2::DrawingArea->new; + $w = Gtk3::DrawingArea->new; } $w; } @@ -311,9 +311,9 @@ sub _gtk__Pixbuf { my $name = delete $opts->{file} or internal_error("missing file"); my $file = _find_imgfile($name) or internal_error("cannot find image $name"); if (my $size = delete $opts->{size}) { - $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1); + $w = Gtk3::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1); } else { - $w = Gtk2::Gdk::Pixbuf->new_from_file($file); + $w = Gtk3::Gdk::Pixbuf->new_from_file($file); } $w = $w->flip(1) if delete $opts->{flip}; } @@ -328,7 +328,7 @@ sub _gtk__Image { my ($w, $opts, $class) = @_; if (!$w) { - $w = Gtk2::Image->new; + $w = Gtk3::Image->new; $w->{format} = delete $opts->{format} if exists $opts->{format}; $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock}; @@ -414,7 +414,7 @@ sub _gtk__Label { if ($w) { $w->set_text(delete $opts->{text}) if exists $opts->{text}; } else { - $w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new; + $w = exists $opts->{text} ? Gtk3::Label->new(delete $opts->{text}) : Gtk3::Label->new; $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable}; $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize}; $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; @@ -444,7 +444,7 @@ sub _gtk__Alignment { my ($w, $_opts) = @_; if (!$w) { - $w = Gtk2::Alignment->new(0, 0, 0, 0); + $w = Gtk3::Alignment->new(0, 0, 0, 0); } $w; } @@ -472,7 +472,7 @@ sub _gtk__Install_Title { 0, gtknew('Label', padding => [ 6, 0 ]), 1, gtknew('VBox', widget_name => 'Banner', children_tight => [ _gtk__Title2($w, $opts), - if_($::isInstall, Gtk2::HSeparator->new), + if_($::isInstall, Gtk3::HSeparator->new), ]), 0, gtknew('Label', padding => [ 6, 0 ]), ]); @@ -495,9 +495,9 @@ sub _gtk__Title2 { sub _gtk__Sexy_IconEntry { my ($w, $opts) = @_; - require Gtk2::Sexy; + require Gtk3::Sexy; if (!$w) { - $w = Gtk2::Sexy::IconEntry->new; + $w = Gtk3::Sexy::IconEntry->new; $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; } @@ -521,7 +521,7 @@ sub _gtk__Entry { my ($w, $opts) = @_; if (!$w) { - $w = Gtk2::Entry->new; + $w = Gtk3::Entry->new; $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; } @@ -573,7 +573,7 @@ sub _gtk__TextView { my ($w, $opts, $_class, $action) = @_; if (!$w) { - $w = Gtk2::TextView->new; + $w = Gtk3::TextView->new; $w->set_editable(delete $opts->{editable}) if exists $opts->{editable}; $w->set_wrap_mode(delete $opts->{wrap_mode}) if exists $opts->{wrap_mode}; $w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible}; @@ -586,7 +586,7 @@ sub _gtk__TextView { sub _gtk__WebKit_View { my ($w, $opts, $_class, $_action) = @_; if (!$w) { - $w = Gtk2::WebKit::WebView->new; + $w = Gtk3::WebKit::WebView->new; } # disable contextual menu: @@ -605,14 +605,14 @@ sub _gtk__ComboBox { my ($w, $opts, $_class, $action) = @_; if (!$w) { - $w = Gtk2::ComboBox->new_text; + $w = Gtk3::ComboBox->new_text; $w->{format} = delete $opts->{format} if exists $opts->{format}; } my $set_list = sub { $w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list}; $w->get_model->clear; - $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk3 + $w->{strings} = $w->{formatted_list}; # used by Gtk3::ComboBox wrappers such as get_text() in ugtk3 $w->append_text($_) foreach @{$w->{formatted_list}}; }; if (my $list_ref = delete $opts->{list_ref}) { @@ -653,29 +653,29 @@ sub _gtk__ScrolledWindow { my ($w, $opts, $_class, $action) = @_; if (!$w) { - $w = Gtk2::ScrolledWindow->new(undef, undef); + $w = Gtk3::ScrolledWindow->new(undef, undef); $w->set_policy(delete $opts->{h_policy} || 'automatic', delete $opts->{v_policy} || 'automatic'); } my $faked_w = $w; if (my $child = delete $opts->{child}) { - if (member(ref($child), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::SimpleList Gtk2::SourceView::View Gtk2::Text Gtk2::TextView Gtk2::TreeView Gtk2::WebKit::WebView))) { + if (member(ref($child), qw(Gtk3::Layout Gtk3::Html2::View Gtk3::SimpleList Gtk3::SourceView::View Gtk3::Text Gtk3::TextView Gtk3::TreeView Gtk3::WebKit::WebView))) { $w->add($child); } else { $w->add_with_viewport($child); } $child->set_focus_vadjustment($w->get_vadjustment) if $child->can('set_focus_vadjustment'); - $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/ && $child->get_left_margin <= 6; + $child->set_left_margin(6) if ref($child) =~ /Gtk3::TextView/ && $child->get_left_margin <= 6; $child->show; $w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; - if (ref($child) eq 'Gtk2::TextView' && delete $opts->{to_bottom}) { + if (ref($child) eq 'Gtk3::TextView' && delete $opts->{to_bottom}) { $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child); } - if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk2::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) { + if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk3::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) { $faked_w = gtknew('Frame', shadow_type => 'in', child => $w); } } @@ -688,7 +688,7 @@ sub _gtk__Frame { if ($w) { $w->set_label(delete $opts->{text}) if exists $opts->{text}; } else { - $w = Gtk2::Frame->new(delete $opts->{text}); + $w = Gtk3::Frame->new(delete $opts->{text}); $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; $w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; } @@ -706,7 +706,7 @@ sub _gtk__Expander { if ($w) { $w->set_label(delete $opts->{text}) if exists $opts->{text}; } else { - $w = Gtk2::Expander->new(delete $opts->{text}); + $w = Gtk3::Expander->new(delete $opts->{text}); } $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; @@ -776,7 +776,7 @@ sub _gtk__MDV_Notebook { $box->set_size_request($width, $requisition->height); }); $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; - bless($w, 'Gtk2::MDV_Notebook'); + bless($w, 'Gtk3::MDV_Notebook'); add2hash($w, { arrow_x => $arrow_x, layout => $layout, @@ -792,7 +792,7 @@ sub _gtk__Fixed { my ($w, $opts, $_class, $_action) = @_; if (!$w) { - $w = Gtk2::Fixed->new; + $w = Gtk3::Fixed->new; $w->set_has_window(delete $opts->{has_window}) if exists $opts->{has_window}; _gtknew_handle_layout_children($w, $opts); } @@ -803,7 +803,7 @@ sub _gtk__Layout { my ($w, $opts, $_class, $_action) = @_; if (!$w) { - $w = Gtk2::Layout->new; + $w = Gtk3::Layout->new; _gtknew_handle_layout_children($w, $opts); } $w; @@ -836,17 +836,17 @@ sub _gtk_any_Window { if (!$w) { if ($class eq 'Window') { - $w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel'); + $w = "Gtk3::$class"->new(delete $opts->{type} || 'toplevel'); } elsif ($class eq 'Plug') { $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id"); - $w = "Gtk2::$class"->new(delete $opts->{socket_id}); + $w = "Gtk3::$class"->new(delete $opts->{socket_id}); } elsif ($class eq 'FileChooserDialog') { my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); - $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window, + $w = Gtk3::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window, $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok', ); } else { - $w = "Gtk2::$class"->new; + $w = "Gtk3::$class"->new; } if ($::isInstall || $::set_dialog_hint) { @@ -894,7 +894,7 @@ sub _gtk__MagicWindow { my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { #- do not take into account the wizard banner # FIXME!!! - any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children; + any { !$_->isa('Gtk3::DrawingArea') && $_->visible } $::WizardTable->get_children; }; my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; @@ -927,7 +927,7 @@ sub _gtk__MagicWindow { my $banner; if (!$::isEmbedded && !$::isInstall && $::Wizard_title) { if (_find_imgfile($opts->{icon_no_error})) { - $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title); + $banner = Gtk3::Banner->new($opts->{icon_no_error}, $::Wizard_title); } else { log::l("ERROR: missing wizard banner $opts->{icon_no_error}"); } @@ -974,7 +974,7 @@ sub _gtk__AboutDialog { my ($w, $opts) = @_; if (!$w) { - $w = Gtk2::AboutDialog->new; + $w = Gtk3::AboutDialog->new; $w->signal_connect(response => sub { $_[0]->destroy }); $w->set_program_name(delete $opts->{name}) if exists $opts->{name}; $w->set_version(delete $opts->{version}) if exists $opts->{version}; @@ -991,7 +991,7 @@ sub _gtk__AboutDialog { }); if (my $url = delete $opts->{website}) { - $url =~ s/^https:/http:/; # Gtk2::About doesn't like "https://..." like URLs + $url =~ s/^https:/http:/; # Gtk3::About doesn't like "https://..." like URLs $w->set_website($url); } $w->set_license(delete $opts->{license}) if exists $opts->{license}; @@ -1013,7 +1013,7 @@ sub _gtk__FileSelection { my ($w, $opts) = @_; if (!$w) { - $w = Gtk2::FileSelection->new(delete $opts->{title} || ''); + $w = Gtk3::FileSelection->new(delete $opts->{title} || ''); gtkset($w->ok_button, %{delete $opts->{ok_button}}) if exists $opts->{ok_button}; gtkset($w->cancel_button, %{delete $opts->{cancel_button}}) if exists $opts->{cancel_button}; } @@ -1029,7 +1029,7 @@ sub _gtk__FileChooser { if (!$w) { my $action = delete $opts->{action} || internal_error("missing action for FileChooser"); - $w = Gtk2::FileChooserWidget->new($action); + $w = Gtk3::FileChooserWidget->new($action); my $file = $opts->{file} && delete $opts->{file}; @@ -1053,7 +1053,7 @@ sub _gtk_any_Paned { my ($w, $opts, $class, $action) = @_; if (!$w) { - $w = "Gtk2::$class"->new; + $w = "Gtk3::$class"->new; $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; $w->set_position(delete $opts->{position}) if exists $opts->{position}; } elsif ($action eq 'gtkset') { @@ -1074,7 +1074,7 @@ sub _gtk_any_Box { my ($w, $opts, $class, $action) = @_; if (!$w) { - $w = "Gtk2::$class"->new; + $w = "Gtk3::$class"->new; $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; @@ -1092,7 +1092,7 @@ sub _gtk_any_ButtonBox { my ($w, $opts, $class, $action) = @_; if (!$w) { - $w = "Gtk2::$class"->new; + $w = "Gtk3::$class"->new; $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous}; $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width}; $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing}; @@ -1109,7 +1109,7 @@ sub _gtk__Notebook { my ($w, $opts) = @_; if (!$w) { - $w = Gtk2::Notebook->new; + $w = Gtk3::Notebook->new; $w->set_property('show-tabs', delete $opts->{show_tabs}) if exists $opts->{show_tabs}; $w->set_property('show-border', delete $opts->{show_border}) if exists $opts->{show_border}; } @@ -1131,7 +1131,7 @@ sub _gtk__Table { if (!$w) { add2hash_($opts, { xpadding => 5, ypadding => 0, border_width => $::isInstall ? 3 : 10 }); - $w = Gtk2::Table->new(0, 0, delete $opts->{homogeneous} || 0); + $w = Gtk3::Table->new(0, 0, delete $opts->{homogeneous} || 0); $w->set_col_spacings(delete $opts->{col_spacings} || 0); $w->set_row_spacings(delete $opts->{row_spacings} || 0); $w->set_border_width(delete $opts->{border_width}); @@ -1143,11 +1143,11 @@ sub _gtk__Table { each_index { my $j = $::i; if ($_) { - ref $_ or $_ = Gtk2::WrappedLabel->new($_); + ref $_ or $_ = Gtk3::WrappedLabel->new($_); $w->attach($_, $j, $j + 1, $i, $i + 1, $j != $#$l && !$w->{mcc} ? ('fill', 'fill', $w->{xpadding}, $w->{ypadding}) : - (['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? + (['expand', 'fill'], ref($_) eq 'Gtk3::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0)); $_->show; } @@ -1160,7 +1160,7 @@ sub _gtk__Table { sub _gtk_any_simple { my ($w, $_opts, $class) = @_; - $w ||= "Gtk2::$class"->new; + $w ||= "Gtk3::$class"->new; } sub _gtknew_handle_children { @@ -1178,7 +1178,7 @@ sub _gtknew_handle_children { foreach (@child) { my ($fill, $child) = @$_; $fill eq '0' || $fill eq '1' || $fill eq 'fill' || $fill eq 'expand' or internal_error("odd {children} parameter must be 0 or 1 (got $fill)"); - ref $child or $child = Gtk2::WrappedLabel->new($child); + ref $child or $child = Gtk3::WrappedLabel->new($child); my $expand = $fill && $fill ne 'fill' ? 1 : 0; $w->pack_start($child, $expand, $fill, $padding || 0); $child->show; @@ -1240,8 +1240,8 @@ sub quit_callback { $w->destroy; die 'wizcancel'; } else { - if (Gtk2->main_level) { - Gtk2->main_quit; + if (Gtk3->main_level) { + Gtk3->main_quit; } else { # block window deletion if not in main loop (eg: while starting the GUI) return 1; @@ -1355,11 +1355,11 @@ sub _text_insert { foreach my $token (@$t) { my ($item, $tag) = @$token; my $iter1 = $buffer->get_end_iter; - if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) { + if (ref($item) =~ /^Gtk3::Gdk::Pixbuf/) { $buffer->insert_pixbuf($iter1, $item); next; } - if (ref($item) =~ /^Gtk2::/) { + if (ref($item) =~ /^Gtk3::/) { my $anchor = $buffer->create_child_anchor($iter1); $textview->add_child_at_anchor($item, $anchor); $textview->{anchors} ||= []; @@ -1446,7 +1446,7 @@ sub main { my $destroyed; $window->signal_connect(destroy => sub { $destroyed = 1 }); $window->show; - do { Gtk2->main } while (!$destroyed && $o_verif && !$o_verif->()); + do { Gtk3->main } while (!$destroyed && $o_verif && !$o_verif->()); may_destroy($window); flush(); } @@ -1458,7 +1458,7 @@ sub sync { } sub flush() { - Gtk2->main_iteration while Gtk2->events_pending; + Gtk3->main_iteration while Gtk3->events_pending; } sub enable_sync_flush { @@ -1491,12 +1491,12 @@ sub may_destroy { sub root_window() { state $root; - $root ||= Gtk2::Gdk->get_default_root_window; + $root ||= Gtk3::Gdk->get_default_root_window; } sub rgb2color { my ($r, $g, $b) = @_; - my $color = Gtk2::Gdk::Color->new($r, $g, $b); + my $color = Gtk3::Gdk::Color->new($r, $g, $b); root_window()->get_colormap->rgb_find_color($color); $color; } @@ -1504,7 +1504,7 @@ sub rgb2color { sub set_root_window_background { my ($r, $g, $b) = @_; my $root = root_window(); - my $gc = Gtk2::Gdk::GC->new($root); + my $gc = Gtk3::Gdk::GC->new($root); my $color = rgb2color($r, $g, $b); $gc->set_rgb_fg_color($color); set_root_window_background_with_gc($gc); @@ -1521,7 +1521,7 @@ sub set_root_window_background_with_gc { sub _new_alpha_pixbuf { my ($pixbuf) = @_; my ($height, $width) = ($pixbuf->get_height, $pixbuf->get_width); - my $new_pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height); + my $new_pixbuf = Gtk3::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height); $new_pixbuf->fill(0x00000000); # transparent white $width, $height, $new_pixbuf; } @@ -1537,19 +1537,19 @@ sub pixmap_from_pixbuf { my ($widget, $pixbuf) = @_; my $window = $widget->window or internal_error("you can't use this function if the widget is not realised"); my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); $pixmap; } sub import_style_ressources() { if (!$::isInstall) { - Gtk2::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG + Gtk3::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG } } sub text_direction_rtl() { - Gtk2::Widget->get_default_direction eq 'rtl'; + Gtk3::Widget->get_default_direction eq 'rtl'; } sub _get_weakness_icon { @@ -1576,8 +1576,8 @@ sub _get_weakness_tooltip { return $weakness_tooltip; } -package Gtk2::MDV_Notebook; # helper functions for installer & mcc -our @ISA = qw(Gtk2::Widget); +package Gtk3::MDV_Notebook; # helper functions for installer & mcc +our @ISA = qw(Gtk3::Widget); sub hide_selection { my ($w) = @_; diff --git a/perl-install/services.pm b/perl-install/services.pm index 1c3200c99..54dd5efec 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -229,10 +229,10 @@ sub ask_standalone_gtk { my $display = sub { my ($text) = @_; $nopop->(); - gtkshow(gtkadd($w_popup = Gtk2::Window->new('popup'), - gtksignal_connect(gtkadd(Gtk2::EventBox->new, - gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'etched_out'), - gtkset_justify(Gtk2::Label->new($text), 'left'))), + gtkshow(gtkadd($w_popup = Gtk3::Window->new('popup'), + gtksignal_connect(gtkadd(Gtk3::EventBox->new, + gtkadd(gtkset_shadow_type(Gtk3::Frame->new, 'etched_out'), + gtkset_justify(Gtk3::Label->new($text), 'left'))), button_press_event => sub { $nopop->() } )))->move($x, $y) if $text; }; @@ -241,7 +241,7 @@ sub ask_standalone_gtk { my $started = is_service_running($service); $label->set_label($started ? N("running") : N("stopped")); }; - my $b = Gtk2::EventBox->new; + my $b = Gtk3::EventBox->new; $b->set_events('pointer_motion_mask'); gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title, 0, mygtk3::gtknew('Title1', label => N("Services and daemons")), @@ -251,14 +251,14 @@ sub ask_standalone_gtk { my $is_xinetd_service = member($service, @xinetd_services); my $infos = warp_text(description($_), 40); $infos ||= N("No additional information\nabout this service, sorry."); - my $label = gtkset_justify(Gtk2::Label->new, 'left'); + my $label = gtkset_justify(Gtk3::Label->new, 'left'); $update_service->($service, $label) if !$is_xinetd_service; - [ gtkpack__(Gtk2::HBox->new(0,0), $_), - gtkpack__(Gtk2::HBox->new(0,0), $label), - gtkpack__(Gtk2::HBox->new(0,0), gtksignal_connect(Gtk2::Button->new(N("Info")), clicked => sub { $display->($infos) })), + [ gtkpack__(Gtk3::HBox->new(0,0), $_), + gtkpack__(Gtk3::HBox->new(0,0), $label), + gtkpack__(Gtk3::HBox->new(0,0), gtksignal_connect(Gtk3::Button->new(N("Info")), clicked => sub { $display->($infos) })), - gtkpack__(Gtk2::HBox->new(0,0), gtkset_active(gtksignal_connect( - Gtk2::CheckButton->new($is_xinetd_service ? N("Start when requested") : N("On boot")), + gtkpack__(Gtk3::HBox->new(0,0), gtkset_active(gtksignal_connect( + Gtk3::CheckButton->new($is_xinetd_service ? N("Start when requested") : N("On boot")), clicked => sub { if ($_[0]->get_active) { push @$on_services, $service if !member($service, @$on_services); } else { @@ -266,7 +266,7 @@ sub ask_standalone_gtk { } }), member($service, @$on_services))), map { my $a = $_; - gtkpack__(Gtk2::HBox->new(0,0), gtksignal_connect(Gtk2::Button->new(translate($a)), + gtkpack__(Gtk3::HBox->new(0,0), gtksignal_connect(Gtk3::Button->new(translate($a)), clicked => sub { my $action = $a eq "Start" ? 'restart' : 'stop'; log::explanations(qq(GP_LANG="UTF-8" service $service $action)); @@ -280,7 +280,7 @@ sub ask_standalone_gtk { ]; } @$l), [ $::isEmbedded ? 'automatic' : 'never', 'automatic' ]), -1, $::isEmbedded ? -1 : 400), - 0, gtkpack(gtkset_border_width(Gtk2::HBox->new(0,0),5), $W->create_okcancel) + 0, gtkpack(gtkset_border_width(Gtk3::HBox->new(0,0),5), $W->create_okcancel) )) ); $b->signal_connect(motion_notify_event => sub { my ($w, $e) = @_; diff --git a/perl-install/share/po/translation_size.pl b/perl-install/share/po/translation_size.pl index 178baaefd..adc0f968b 100755 --- a/perl-install/share/po/translation_size.pl +++ b/perl-install/share/po/translation_size.pl @@ -26,20 +26,20 @@ use install_gtk; !@ARGV and die "Usage: LANGUAGE=lang_to_test $0 string_to_translate\n(for example: LANGUAGE=ja $0 Advanced)\n"; install_gtk::load_font({ locale => { lang => 'en_US' } }); -$l1 = Gtk2::Label->new($ARGV[0]); -my $v = Gtk2::VBox->new(1, 0); +$l1 = Gtk3::Label->new($ARGV[0]); +my $v = Gtk3::VBox->new(1, 0); $v->pack_start($l1, 0, 0, 0); -my $window = Gtk2::Window->new('toplevel'); +my $window = Gtk3::Window->new('toplevel'); $window->set_size_request(200, 50); $window->set_position('center'); -$window->signal_connect(key_press_event => sub { Gtk2->main_quit }); +$window->signal_connect(key_press_event => sub { Gtk3->main_quit }); $window->add($v); $window->show_all; install_gtk::load_font({ locale => { lang => $ENV{LANGUAGE} } }); -$l2 = Gtk2::Label->new(translate($ARGV[0])); +$l2 = Gtk3::Label->new(translate($ARGV[0])); $v->pack_start($l2, 0, 0, 0); $window->show_all; -Gtk2->main; +Gtk3->main; diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help index bc219eb8a..bd857d092 100755 --- a/perl-install/standalone/display_help +++ b/perl-install/standalone/display_help @@ -24,7 +24,7 @@ use common; use any; use mygtk3 qw(gtknew); use ugtk3 qw(:wrappers :create); -use Gtk2::WebKit; +use Gtk3::WebKit; my $view = gtknew('WebKit_View', no_popup_menu => 1); @@ -54,17 +54,17 @@ if (!$is_firstime) { my $w = ugtk3->new(N("Help"), width => $default_width, height => $default_height); gtkadd($w->{rwindow}, - gtkpack_(Gtk2::VBox->new, + gtkpack_(Gtk3::VBox->new, if_(!$is_firstime, 0, gtknew('Title2', label => N("Help")), - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, ), 1, create_scrolled_window(gtkset_border_width($view, 5), [ 'never', 'automatic' ]), #1, gtknew('ScrolledWindow', child => $view, border_width => 5, h_policy => 'never'); - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, if_(!$is_firstime, 0, gtkpack(create_hbox('end'), - gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) + gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit }) ), ), ), diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 63b8c4974..2648cf4bd 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -141,34 +141,34 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { my $W = ugtk3->new('$o edition'); my @box_to_hide; my $nb_pages=0; - my $notebook = Gtk2::Notebook->new; + my $notebook = Gtk3::Notebook->new; $notebook->set_show_border(0); $notebook->set_show_tabs(0); - $notebook->append_page(gtkpack_(gtkset_border_width(Gtk2::VBox->new(0,0), 10), - 1, Gtk2::VBox->new(0,0), - 0, gtkpack_(Gtk2::HBox->new(0,0), - 1, Gtk2::VBox->new(0,0), - 0, gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'etched-in'), + $notebook->append_page(gtkpack_(gtkset_border_width(Gtk3::VBox->new(0,0), 10), + 1, Gtk3::VBox->new(0,0), + 0, gtkpack_(Gtk3::HBox->new(0,0), + 1, Gtk3::VBox->new(0,0), + 0, gtkadd(gtkset_shadow_type(Gtk3::Frame->new, 'etched-in'), gtkcreate_img('mdk_logo')), - 1, Gtk2::VBox->new(0,0), + 1, Gtk3::VBox->new(0,0), ), 0, N("\nWelcome.\n\nThe parameters of the auto-install are available in the sections on the left"), - 1, Gtk2::VBox->new(0,0), + 1, Gtk3::VBox->new(0,0), ), undef); $notebook->show_all; $notebook->set_current_page(0); gtkadd($W->{window}, - gtkpack_(Gtk2::VBox->new(0,5), - 1, gtkpack_(Gtk2::HBox->new(0,0), - 0, gtkadd(gtkset_size_request(gtkset_shadow_type(Gtk2::Frame->new, 'in'), 130, 470), - gtkpack_(Gtk2::VBox->new(0,0), + gtkpack_(Gtk3::VBox->new(0,5), + 1, gtkpack_(Gtk3::HBox->new(0,0), + 0, gtkadd(gtkset_size_request(gtkset_shadow_type(Gtk3::Frame->new, 'in'), 130, 470), + gtkpack_(Gtk3::VBox->new(0,0), map { - my $box = Gtk2::VBox->new(0,0); + my $box = Gtk3::VBox->new(0,0); push @box_to_hide, $box; $box->{vis} = 0; my @button_to_hide; - 0, gtksignal_connect(Gtk2::Button->new($_), clicked => sub { + 0, gtksignal_connect(Gtk3::Button->new($_), clicked => sub { if ($box->{vis}) { $box->hide; $box->{vis} = 0; $notebook->set_current_page(0) } else { $_->hide, $_->{vis}=0 foreach @box_to_hide; @@ -177,7 +177,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { } }), 1, gtkpack__($box, map { - my $button = gtkset_relief(Gtk2::ToggleButton->new, 'none'); + my $button = gtkset_relief(Gtk3::ToggleButton->new, 'none'); push @button_to_hide, $button; my $gru = $_->[0]; $notebook->append_page(gtkshow($_->[2]), undef); @@ -190,7 +190,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { my $b; if ($_->[1] ne "") { $b = gtkcreate_img($_->[1]) } else { undef $b } gtksignal_connect(gtkadd($button, - gtkpack__(Gtk2::VBox->new(0,3), + gtkpack__(Gtk3::VBox->new(0,3), $b, translate($gru), ) @@ -208,10 +208,10 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { ), 1, $notebook, ), - 0, Gtk2::HSeparator->new, - 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk2::HButtonBox->new, 'end'), 5), - gtksignal_connect(Gtk2::Button->new(N("Accept")), clicked => sub { Gtk2->main_quit }), - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $o = $o_old; Gtk2->main_quit; quit_global($in, 0) }), + 0, Gtk3::HSeparator->new, + 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk3::HButtonBox->new, 'end'), 5), + gtksignal_connect(Gtk3::Button->new(N("Accept")), clicked => sub { Gtk3->main_quit }), + gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => sub { $o = $o_old; Gtk3->main_quit; quit_global($in, 0) }), ) ) ); @@ -220,7 +220,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { # gtkadd($W->{window}, # gtkpack_($W->create_box_with_title(N("Edit variables")), # 1, my $notebook = create_notebook( map { h2widget($o->{$_}, "\$o->\{$_\}"), $_ } keys %$o ), -# 0, gtkpack(gtkset_border_width(Gtk2::HBox->new(0,0),5), $W->create_okcancel), +# 0, gtkpack(gtkset_border_width(Gtk3::HBox->new(0,0),5), $W->create_okcancel), # ), # ); # $notebook->set_tab_pos('left'); @@ -270,8 +270,8 @@ sub h2widget { my @list_keys = keys(%$k); if (ref($k->{$list_keys[0]}) =~ /HASH/) { $i++; - $w = gtkpack_(Gtk2::VBox->new(0,0), - 1, create_scrolled_window(gtkpack__($vb = Gtk2::VBox->new(0,10), + $w = gtkpack_(Gtk3::VBox->new(0,0), + 1, create_scrolled_window(gtkpack__($vb = Gtk3::VBox->new(0,10), $widget_list[$i] = create_packtable({ col_spacings => 10, row_spacings => 3 }, map { my $e; @@ -302,9 +302,9 @@ sub h2widget { my $vb; my @widget_list; my $i = -1; - $w = gtkpack_(Gtk2::VBox->new(0,0), + $w = gtkpack_(Gtk3::VBox->new(0,0), 1, create_scrolled_window( - gtkpack__($vb = Gtk2::VBox->new(0,5), + gtkpack__($vb = Gtk3::VBox->new(0,5), map { $i++; $widget_list[$i] = h2widget($_, "$label\[$i]") } @$k, ) ), @@ -332,7 +332,7 @@ sub create_entry_element { } elsif (ref $text =~ /ARRAY/) { return [ "$label : ", h2widget($text, $label) ]; } else { - $e = Gtk2::Entry->new; + $e = Gtk3::Entry->new; $e->{value} = $value; my $_tag = Glib::Timeout->add(1000, sub { $e->set_text($text); 0 }); gtksignal_connect($e, changed => sub { @@ -351,15 +351,15 @@ sub control_buttons { ref($ref_local_k) =~ /HASH/ or return(); my %local_k = %$ref_local_k; my ($button_remove); - 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk2::HButtonBox->new, 'spread'), 5), - gtksignal_connect(Gtk2::Button->new(N("Add an item")), clicked => sub { + 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk3::HButtonBox->new, 'spread'), 5), + gtksignal_connect(Gtk3::Button->new(N("Add an item")), clicked => sub { $local_k{$_} = undef foreach keys %local_k; $i++; $local_gui->($vb, \@widget_list, \%local_k, $i) or $i--, return; $i >= 0 and $button_remove->set_sensitive(1); } ), - gtksignal_connect($button_remove = Gtk2::Button->new(N("Remove the last item")), clicked => sub { + gtksignal_connect($button_remove = Gtk3::Button->new(N("Remove the last item")), clicked => sub { $i >= 0 or return; $widget_list[$i]->destroy; $i--; diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index dc2b2267b..e9f6cf348 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -182,7 +182,7 @@ sub autologin_choice() { push @users, $user; } my $user_combo = gtknew('ComboBox', text => $user, list => \@users); - my $desktop_combo = Gtk2::ComboBox->new_with_strings(\@sessions, if_(member($auto_mode->{desktop}, @sessions), $auto_mode->{desktop})); + my $desktop_combo = Gtk3::ComboBox->new_with_strings(\@sessions, if_(member($auto_mode->{desktop}, @sessions), $auto_mode->{desktop})); my $auto_box = gtknew('Table', col_spacings => 5, row_spacings => 5, homogeneous => 1, children => [ [ gtknew('Label_Left', text => N("Default user")), $user_combo ], diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index a960a248d..fe8866df4 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -96,15 +96,15 @@ my $bugzilla_url = 'http://bugs.mageia.org/enter_bug.cgi'; my $wizard_name = "Bugzilla"; $table = create_packtable({ col_spacings => 5, row_spacings => 10 }, - [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk2::ComboBox->new_text, $comb_app->set_wrap_width(3) ], + [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk3::ComboBox->new_text, $comb_app->set_wrap_width(3) ], [ gtknew('Label_Left', text => N("or Application Name\n(or Full Path):")), - gtkpack_(Gtk2::HBox->new(0, 5), - 1, $com_app = gtkset_editable(Gtk2::Entry->new, 1), - 0, $button_pkg = Gtk2::Button->new(N("Find Package")), - 0, $button_browse = Gtk2::FileChooserButton->new(N("Browse"), 'GTK_FILE_CHOOSER_ACTION_OPEN'), + gtkpack_(Gtk3::HBox->new(0, 5), + 1, $com_app = gtkset_editable(Gtk3::Entry->new, 1), + 0, $button_pkg = Gtk3::Button->new(N("Find Package")), + 0, $button_browse = Gtk3::FileChooserButton->new(N("Browse"), 'GTK_FILE_CHOOSER_ACTION_OPEN'), ) ], - [ gtknew('Label_Left', text => N("Package: ")), $package = Gtk2::Entry->new_with_text("...") ], # complain on gtk-perl@ml - [ gtknew('Label_Left', text => N("Kernel:")), gtkset_editable(Gtk2::Entry->new_with_text($kernel_release), 0) ] + [ gtknew('Label_Left', text => N("Package: ")), $package = Gtk3::Entry->new_with_text("...") ], # complain on gtk-perl@ml + [ gtknew('Label_Left', text => N("Kernel:")), gtkset_editable(Gtk3::Entry->new_with_text($kernel_release), 0) ] ); $comb_app->set_popdown_strings("", uniq(sort(@generic_tool), if_($prog, $prog))); $comb_app->set_text(""); @@ -127,7 +127,7 @@ my $parent_uid = get_parent_uid(); my $width = 600; gtkadd($window->{window}, - gtkpack_(Gtk2::VBox->new(0, 5), + gtkpack_(Gtk3::VBox->new(0, 5), 0, gtknew('Title1', label => $mageia_release, width => $width), 1, create_scrolled_window( gtknew('TextView', editable => 0, height => 150, @@ -167,15 +167,15 @@ gtkadd($window->{window}, if_(!$error, 0, gtkadd($table), ), - 0, gtkpack(Gtk2::HSeparator->new), + 0, gtkpack(Gtk3::HSeparator->new), 0, gtkpack(create_hbox('edge'), gtksignal_connect( - Gtk2::Button->new(N("Help")), clicked => sub { + Gtk3::Button->new(N("Help")), clicked => sub { run_program::raw({ detach => 1, setuid => $parent_uid }, 'drakhelp', '--id', 'drakbug'); }), gtkpack(create_hbox('end'), - gtksignal_connect(Gtk2::Button->new(N("Report")), clicked => \&report_bug_to_bugzilla), - gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk3->exit(0) }), + gtksignal_connect(Gtk3::Button->new(N("Report")), clicked => \&report_bug_to_bugzilla), + gtksignal_connect(Gtk3::Button->new(N("Close")), clicked => sub { ugtk3->exit(0) }), )))); if (defined $prog) { diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 71653b7b1..962474341 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -55,9 +55,9 @@ if (!@timezones) { my $drawing_area; -my $adjh = Gtk2::Adjustment->new(0.0, 0.0, 23.0, 1.0, 5.0, 0.0); -my $adjm = Gtk2::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); -my $adjs = Gtk2::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); +my $adjh = Gtk3::Adjustment->new(0.0, 0.0, 23.0, 1.0, 5.0, 0.0); +my $adjm = Gtk3::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); +my $adjs = Gtk3::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); my ($button_reset, $check_ntp, $hb_ntp, $combo_ntpserver, $ntp); my $mode = 0; @@ -82,18 +82,18 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi }), 0, $hb_ntp = gtknew('HBox', border_width => 5, children => [ 0, gtknew('Label', text => N("Server:")), - 1, $combo_ntpserver = Gtk2::Combo->new + 1, $combo_ntpserver = Gtk3::Combo->new ]) ])) ]), 0, gtknew('VBox', children => [ 0, gtknew('HBox', children => [ - 0, $drawing_area = gtkset_size_request(Gtk2::DrawingArea->new, @image_size), + 0, $drawing_area = gtkset_size_request(Gtk3::DrawingArea->new, @image_size), ]), 0, my $time_box = gtknew('HBox', homogenous => 1, children => [ - 0, my $spinner_h = Gtk2::SpinButton->new($adjh, 0, 0), - 0, my $spinner_m = Gtk2::SpinButton->new($adjm, 0, 0), - 0, my $spinner_s = Gtk2::SpinButton->new($adjs, 0, 0), + 0, my $spinner_h = Gtk3::SpinButton->new($adjh, 0, 0), + 0, my $spinner_m = Gtk3::SpinButton->new($adjm, 0, 0), + 0, my $spinner_s = Gtk3::SpinButton->new($adjs, 0, 0), ]), 1, gtknew('Frame', text => N("Timezone"), shadow_type => 'etched_in', child => gtknew('VBox', border_width => 5, children_tight => [ @@ -194,7 +194,7 @@ $drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer $drawing_area->signal_connect(expose_event => \&expose_event); $drawing_area->signal_connect(realize => sub { my $window = $drawing_area->window; - $pixmap = Gtk2::Gdk::Pixmap->new($window, @image_size, $window->get_depth); + $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth); }); $drawing_area->signal_connect(button_press_event => sub { $pressed = 1 }); diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb index 9ed351b71..bcbf4a9c9 100755 --- a/perl-install/standalone/drakdvb +++ b/perl-install/standalone/drakdvb @@ -25,7 +25,7 @@ use standalone; use mygtk3; use interactive; use ugtk3 qw(:create :helpers :wrappers); -use Gtk2::SimpleList; +use Gtk3::SimpleList; my $title = N("DVB"); $ugtk3::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png"; @@ -36,7 +36,7 @@ my $in = 'interactive'->vnew; my $config_file = "$ENV{HOME}/.mplayer/channels.conf"; -my $channel_list = Gtk2::SimpleList->new(N("Channel") => "text", "id" => "hidden"); +my $channel_list = Gtk3::SimpleList->new(N("Channel") => "text", "id" => "hidden"); my %buttons; my $pid; my $wait; @@ -49,7 +49,7 @@ sub get_selected_channel() { sub exitapp() { local $SIG{TERM} = 'IGNORE'; kill TERM => -$$; - Gtk2->main_quit; + Gtk3->main_quit; } sub detect_channels() { @@ -142,7 +142,7 @@ sub launch_tv() { gtkadd($w->{window}, gtknew('VBox', spacing => 5, children => [ - $::isEmbedded ? () : (0, Gtk2::Banner->new($ugtk3::wm_icon, $title)), + $::isEmbedded ? () : (0, Gtk3::Banner->new($ugtk3::wm_icon, $title)), 1, gtknew('ScrolledWindow', width => 300, height => 400, child => $channel_list), 0, gtknew('HButtonBox', layout => 'end', children_loose => [ $buttons{detect} = gtknew('Button', text => N("Detect Channels"), clicked => \&detect_channels), diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 11597c6aa..74a9105ea 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -119,18 +119,18 @@ sub pref_dialog() { # Create root tree: - $tree_model = Gtk2::TreeStore->new(("Glib::String") x 2, "Glib::Int"); - $tree = Gtk2::TreeView->new_with_model($tree_model); + $tree_model = Gtk3::TreeStore->new(("Glib::String") x 2, "Glib::Int"); + $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->set_headers_visible(0); - $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); $tree->signal_connect('row-expanded', \&expand_tree); $tree->get_selection->signal_connect('changed' => \&selected_tree); # Create modules list: - $list_model = Gtk2::ListStore->new(("Glib::String") x 3); # relative path, size, (hidden full path) - $list = Gtk2::TreeView->new_with_model($list_model); + $list_model = Gtk3::ListStore->new(("Glib::String") x 3); # relative path, size, (hidden full path) + $list = Gtk3::TreeView->new_with_model($list_model); each_index { - $list->append_column(my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i)); + $list->append_column(my $col = Gtk3::TreeViewColumn->new_with_attributes($_, Gtk3::CellRendererText->new, 'text' => $::i)); $col->set_sort_column_id($::i); $col->set_min_width((200, 50)[$::i]); } (N("Module name"), N("Size")); @@ -150,7 +150,7 @@ sub pref_dialog() { gtknew('ScrolledWindow', child => $tree), 200, $::isEmbedded ? 0 : 175), gtknew('VBox', children => [ - 1, gtkadd(Gtk2::ScrolledWindow->new, + 1, gtkadd(Gtk3::ScrolledWindow->new, $list ), 0, $remove_but = gtknew('Button', text => N("Remove a module"), diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 4599d76f7..14584c1a4 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -486,15 +486,15 @@ sub interactive_mode() { local $::Wizard_no_previous = 1; gtkadd($window1->{window}, - gtkpack_(Gtk2::VBox->new(0, 2), - if_(!$::isEmbedded, 0, Gtk2::Banner->new("drakfont", N("DrakFont"))), + gtkpack_(Gtk3::VBox->new(0, 2), + if_(!$::isEmbedded, 0, Gtk3::Banner->new("drakfont", N("DrakFont"))), 0, gtknew('Title2', label => N("Font List")), - 1, Gtk2::FontSelection->new, + 1, Gtk3::FontSelection->new, 0, gtkadd(create_hbox(), - gtksignal_connect(Gtk2::Button->new(N("Get Windows Fonts")), clicked => sub { $windows = 1; import_status(); $windows = 0 }), + gtksignal_connect(Gtk3::Button->new(N("Get Windows Fonts")), clicked => sub { $windows = 1; import_status(); $windows = 0 }), ), 0, create_okcancel(my $oc = { - ok_clicked => sub { Gtk2->main_quit }, + ok_clicked => sub { Gtk3->main_quit }, }, undef, undef, '', if_(0, [ N("About"), \&help, 1 ]), @@ -541,14 +541,14 @@ sub appli_choice() { dialog(N("Options"), [ 0, gtknew('Title2', label => N("Choose the applications that will support the fonts:")), - 0, Gtk2::WrappedLabel->new(formatAlaTeX(license_msg())), + 0, Gtk3::WrappedLabel->new(formatAlaTeX(license_msg())), (map { my ($label, $ref) = @$_; - (0, gtkpack_(Gtk2::HBox->new, + (0, gtkpack_(Gtk3::HBox->new, 0, $label, - 1, Gtk2::HBox->new, + 1, Gtk3::HBox->new, # BUG: that code never had supported canceling - 0, gtksignal_connect(gtkset_active(Gtk2::CheckButton->new, $$ref), toggled => sub { $$ref = $$ref ? 0 : 1 }), + 0, gtksignal_connect(gtkset_active(Gtk3::CheckButton->new, $$ref), toggled => sub { $$ref = $$ref ? 0 : 1 }), ), ); } ([ N("Ghostscript"), \$gs ], @@ -559,7 +559,7 @@ sub appli_choice() { ), ], [ - gtksignal_connect(Gtk2::Button->new(N("Ok")), + gtksignal_connect(Gtk3::Button->new(N("Ok")), clicked => \&exitdialog, ), ], @@ -569,10 +569,10 @@ sub appli_choice() { sub font_choice() { my $file_dialog; my $_select_font_msg = N("Select the font file or directory and click on 'Add'"); - $file_dialog = Gtk2::FileChooserDialog->new(N("File Selection"), $::main_window, 'open', N("Cancel") => 'cancel', N("Ok") => 'ok'); # 'select_folder' + $file_dialog = Gtk3::FileChooserDialog->new(N("File Selection"), $::main_window, 'open', N("Cancel") => 'cancel', N("Ok") => 'ok'); # 'select_folder' $file_dialog->set_select_multiple(1); - my $filter = Gtk2::FileFilter->new; + my $filter = Gtk3::FileFilter->new; $filter->set_name(N("Fonts")); $filter->add_pattern("*.$_") foreach @font_extensions, map { uc($_) } @font_extensions; $file_dialog->add_filter($filter); @@ -604,7 +604,7 @@ sub list_remove() { #- TODO : multi-selection $treeStore->remove($iter); } -sub exitdialog() { Gtk2->main_quit } +sub exitdialog() { Gtk3->main_quit } sub dialog { my ($title, $widgets, $buttons, $o_main_loop, $o_options) = @_; @@ -620,7 +620,7 @@ sub dialog { gtkflush(); $o_main_loop->(); } else { - Gtk2->main; + Gtk3->main; } $dialog->destroy if $dialog; undef $dialog; @@ -628,9 +628,9 @@ sub dialog { sub advanced_install() { my $button; - $model = Gtk2::TreeStore->new("Glib::String"); - $list = Gtk2::TreeView->new_with_model($model); - $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $model = Gtk3::TreeStore->new("Glib::String"); + $list = Gtk3::TreeView->new_with_model($model); + $list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); $list->set_headers_visible(0); $list->get_selection->set_mode('browse'); $list->set_rules_hint(1); @@ -643,14 +643,14 @@ sub advanced_install() { 1, gtknew('HBox', children => [ 1, create_scrolled_window($list), 0, gtknew('VBox', children_tight => [ - gtksignal_connect(Gtk2::Button->new(N("Add")), clicked => \&font_choice), - gtksignal_connect(Gtk2::Button->new(N("Remove")), clicked => \&list_remove), + gtksignal_connect(Gtk3::Button->new(N("Add")), clicked => \&font_choice), + gtksignal_connect(Gtk3::Button->new(N("Remove")), clicked => \&list_remove), ]), ]), ], [ - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&exitdialog), - gtksignal_connect($button = gtkset_sensitive(Gtk2::Button->new(N("Install")), 0), + gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => \&exitdialog), + gtksignal_connect($button = gtkset_sensitive(Gtk3::Button->new(N("Install")), 0), clicked => sub { import_status() if @install; }), @@ -670,9 +670,9 @@ sub list_to_remove() { } sub show_list_to_remove() { - my $model = Gtk2::TreeStore->new("Glib::String"); - my $list = Gtk2::TreeView->new_with_model($model); - $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + my $model = Gtk3::TreeStore->new("Glib::String"); + my $list = Gtk3::TreeView->new_with_model($model); + $list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); $list->set_headers_visible(0); $list->get_selection->set_mode('browse'); $list->set_rules_hint(1); @@ -681,13 +681,13 @@ sub show_list_to_remove() { dialog(N("Warning"), [ - 0, Gtk2::Label->new(N("Are you sure you want to uninstall the following fonts?")), - 1, gtkpack_(Gtk2::HBox->new(0, 4), 1, create_scrolled_window($list)), + 0, Gtk3::Label->new(N("Are you sure you want to uninstall the following fonts?")), + 1, gtkpack_(Gtk3::HBox->new(0, 4), 1, create_scrolled_window($list)), ], [ - gtksignal_connect(Gtk2::Button->new(N("Yes")), + gtksignal_connect(Gtk3::Button->new(N("Yes")), clicked => sub { import_status_uninstall(); exitdialog() }), - gtksignal_connect(Gtk2::Button->new(N("No")), + gtksignal_connect(Gtk3::Button->new(N("No")), clicked => \&exitdialog ), ], @@ -701,9 +701,9 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect chk_empty_xfs_path(); #- left part - $left_model = Gtk2::TreeStore->new("Glib::String"); - $left_list = Gtk2::TreeView->new_with_model($left_model); - $left_list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $left_model = Gtk3::TreeStore->new("Glib::String"); + $left_list = Gtk3::TreeView->new_with_model($left_model); + $left_list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); $left_list->set_headers_visible(0); $left_list->set_rules_hint(1); $left_list->get_selection->set_mode('multiple'); @@ -711,29 +711,29 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect $left_model->append_set(undef, [ 0 => $_ ]) foreach sort @installed_fonts_path; #- right part - $right_model = Gtk2::TreeStore->new("Glib::String"); - $right_list = Gtk2::TreeView->new_with_model($right_model); - $right_list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); + $right_model = Gtk3::TreeStore->new("Glib::String"); + $right_list = Gtk3::TreeView->new_with_model($right_model); + $right_list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); $right_list->set_headers_visible(0); $right_list->get_selection->set_mode('multiple'); $right_list->set_rules_hint(1); dialog(N("Uninstall"), [ - 1, gtkpack_(Gtk2::HBox->new(0, 4), + 1, gtkpack_(Gtk3::HBox->new(0, 4), 1, create_scrolled_window($left_list), #1, create_scrolled_window($right_list) ), ], [ - gtksignal_connect(Gtk2::Button->new(N("Unselect All")), + gtksignal_connect(Gtk3::Button->new(N("Unselect All")), clicked => sub { $left_list->get_selection->unselect_all } ), - gtksignal_connect(Gtk2::Button->new(N("Select All")), + gtksignal_connect(Gtk3::Button->new(N("Select All")), clicked => sub { $left_list->get_selection->select_all } ), - gtksignal_connect(Gtk2::Button->new(N("Remove")), clicked => sub { exitdialog(); list_to_remove() }), - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&exitdialog), + gtksignal_connect(Gtk3::Button->new(N("Remove")), clicked => sub { exitdialog(); list_to_remove() }), + gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => \&exitdialog), ], undef, { size => [ -1, 300 ] } @@ -742,10 +742,10 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect } sub import_status() { - $pbar = Gtk2::ProgressBar->new; - $pbar1 = Gtk2::ProgressBar->new; - $pbar2 = Gtk2::ProgressBar->new; - $pbar3 = Gtk2::ProgressBar->new; + $pbar = Gtk3::ProgressBar->new; + $pbar1 = Gtk3::ProgressBar->new; + $pbar2 = Gtk3::ProgressBar->new; + $pbar3 = Gtk3::ProgressBar->new; dialog(N("Importing fonts"), [ 0, create_packtable({ col_spacings => 10, row_spacings => 50 }, @@ -762,9 +762,9 @@ sub import_status() { } sub import_status_uninstall() { - $pbar = Gtk2::ProgressBar->new; - $pbar1 = Gtk2::ProgressBar->new; - $pbar2 = Gtk2::ProgressBar->new; + $pbar = Gtk3::ProgressBar->new; + $pbar1 = Gtk3::ProgressBar->new; + $pbar2 = Gtk3::ProgressBar->new; dialog(N("Removing fonts"), [ 0, create_packtable({ col_spacings => 10, row_spacings => 50 }, diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index c7fae3143..5dd9d9198 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -34,17 +34,17 @@ my $w = ugtk3->new(N("Security Permissions")); $w->{rwindow}->set_size_request(620, 400) unless $::isEmbedded; my $W = $w->{window}; $W->signal_connect(delete_event => sub { ugtk3->exit }); -my $model = Gtk2::ListStore->new("Gtk2::Gdk::Pixbuf", ("Glib::String") x 5); -my $permList = Gtk2::TreeView->new_with_model($model); +my $model = Gtk3::ListStore->new("Gtk3::Gdk::Pixbuf", ("Glib::String") x 5); +my $permList = Gtk3::TreeView->new_with_model($model); my $pixbuf = gtknew('Pixbuf', file => 'non-editable'); my @column_sizes = (150, 100, 100, 15, -1); # TreeView layout is (Editable, Path, User, Group, Permissions, [hidden]index_id) -$permList->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Editable"), Gtk2::CellRendererPixbuf->new, 'pixbuf' => 0)); +$permList->append_column(Gtk3::TreeViewColumn->new_with_attributes(N("Editable"), Gtk3::CellRendererPixbuf->new, 'pixbuf' => 0)); each_index { - my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i + 1); + my $col = Gtk3::TreeViewColumn->new_with_attributes($_, Gtk3::CellRendererText->new, 'text' => $::i + 1); $col->set_min_width($column_sizes[$::i+1]); $permList->append_column($col); } (N("Path"), N("User"), N("Group"), N("Permissions")); @@ -103,10 +103,10 @@ $permList->signal_connect(button_press_event => sub { }); -my $tips = Gtk2::Tooltips->new; +my $tips = Gtk3::Tooltips->new; $W->add(gtknew('VBox', spacing => 5, children => [ - if_(!$::isEmbedded, 0, Gtk2::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), + if_(!$::isEmbedded, 0, Gtk3::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), 0, gtknew('Label_Left', text => N("Here you can see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will overwrite the default rules."), alignment => [ 0.5, 0 ]), 1, gtknew('VBox', border_width => 0, children => [ 0, gtknew('Label_Left', text => N("The current security level is %s. diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index b4d99469f..6a262bc2b 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -71,8 +71,8 @@ sub wait_msg { $mainw->{rwindow}->show_all; gtkset_mousecursor_wait($mainw->{rwindow}->window); # ugly workaround for gtk+ not displaying subdialog contents: - Glib::Timeout->add(300, sub { Gtk2->main_quit; 0 }); - Gtk2->main; + Glib::Timeout->add(300, sub { Gtk3->main_quit; 0 }); + Gtk3->main; $mainw; } @@ -89,7 +89,7 @@ my $window = $w->{window}; ############################ MAIN WINDOW ################################### -# Set different options to Gtk2::Window +# Set different options to Gtk3::Window unless ($::isEmbedded) { $w->{rwindow}->set_position('center'); $w->{rwindow}->set_title("DrakSec"); @@ -197,7 +197,7 @@ my %descr = ( ####################### OK CANCEL BUTTONS ################################## gtkpack_($vbox, 0, gtkshow(gtknew('VBox', spacing => 5, children => [ - if_(!$::isEmbedded, 0, Gtk2::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), + if_(!$::isEmbedded, 0, Gtk3::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), 0, gtknew('Label', text => $auth_string, alignment => [ 0.5, 0 ]) ])), 1, gtkshow(create_scrolled_window( diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index 266c6fd1b..61f0a66a7 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -197,7 +197,7 @@ sub edit_row { my ($model, $o_iter) = @_; # create new item if needed (that is when adding a new one) at end of list my $iter = $o_iter || $model->append; - my $dialog = Gtk2::Dialog->new; + my $dialog = Gtk3::Dialog->new; $dialog->set_transient_for($w->{real_window}); $dialog->set_modal(1); @@ -207,14 +207,14 @@ sub edit_row { ); gtkadd($dialog->action_area, - gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { + gtksignal_connect(Gtk3::Button->new(N("Ok")), clicked => sub { # create new item if needed (that is when adding a new one) at end of list $iter ||= $model->append; # $model->set($iter, 1 => $file->get_text); # FILL ME $dialog->destroy; # $modified++; }), - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $dialog->destroy }), + gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => sub { $dialog->destroy }), ); $dialog->show_all; @@ -338,9 +338,9 @@ if (!$::isEmbedded) { my $_msg = N("Welcome to the UPS configuration tools"); -$w->{window}->add(gtkpack_(Gtk2::VBox->new, - if_(!$::isEmbedded, 0, Gtk2::Banner->new('drakups', N("DrakUPS"))), - 1, my $nb = Gtk2::Notebook->new, +$w->{window}->add(gtkpack_(Gtk3::VBox->new, + if_(!$::isEmbedded, 0, Gtk3::Banner->new('drakups', N("DrakUPS"))), + 1, my $nb = Gtk3::Notebook->new, 0, create_okcancel( { ok_clicked => sub { @@ -358,18 +358,18 @@ $w->{window}->add(gtkpack_(Gtk2::VBox->new, # build the notebook foreach my $i (@pages) { - my $model = $models{$i->{id}} = Gtk2::ListStore->new("Glib::Int", ("Glib::String") x listlength(@{$i->{columns}})); + my $model = $models{$i->{id}} = Gtk3::ListStore->new("Glib::Int", ("Glib::String") x listlength(@{$i->{columns}})); my (%buttons, $list); $indexes{$i->{name}} = 0; my $idx = \$indexes{$i->{name}}; my $getindex = sub { $$idx++ }; - $nb->append_page(gtkpack_(Gtk2::VBox->new, - 1, create_scrolled_window($list = Gtk2::TreeView->new_with_model($model), + $nb->append_page(gtkpack_(Gtk3::VBox->new, + 1, create_scrolled_window($list = Gtk3::TreeView->new_with_model($model), [ 'automatic', 'automatic' ]), - 0, gtkpack(Gtk2::HButtonBox->new, + 0, gtkpack(Gtk3::HButtonBox->new, (map { my ($id, $label, $sub) = @$_; - gtksignal_connect($buttons{$id} = Gtk2::Button->new($label), clicked => sub { + gtksignal_connect($buttons{$id} = Gtk3::Button->new($label), clicked => sub { $sub->($model, $list, $getindex); }); } ([ 'add', N("Add"), $i->{callbacks}{add} || \&add_callback ], @@ -378,15 +378,15 @@ foreach my $i (@pages) { ) ) #(map { - # gtksignal_connect(Gtk2::Button->new($_), clicked => $i->{callbacks}{$_}), + # gtksignal_connect(Gtk3::Button->new($_), clicked => $i->{callbacks}{$_}), #} keys %{$i->{callbacks}}) ), ), - Gtk2::Label->new($i->{name}), + Gtk3::Label->new($i->{name}), ); #$i->{list} = $list; each_index { - $list->append_column(Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i + 1)); + $list->append_column(Gtk3::TreeViewColumn->new_with_attributes($_, Gtk3::CellRendererText->new, 'text' => $::i + 1)); } @{$i->{columns}}; my @u = $i->{load}->(); foreach my $line (@u) { diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 4a605c480..c857dbb03 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -261,23 +261,23 @@ $::noborderWhenEmbedded = 1; my ($menubar, $factory) = create_factory_menu($w->{real_window}, @menu_items); $w->{window}->set_size_request(805, 550) if !$::isEmbedded; -my $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Int"); -$w->{window}->add(gtkpack_(0, Gtk2::VBox->new(0, 0), +my $tree_model = Gtk3::TreeStore->new("Gtk3::Gdk::Pixbuf", "Glib::String", "Glib::Int"); +$w->{window}->add(gtkpack_(0, Gtk3::VBox->new(0, 0), 0, $menubar, - 0, Gtk2::Banner->new("/usr/share/mcc/themes/default/harddrake-mdk.png", translate("Hardware")), - 1, create_hpaned(gtkadd(Gtk2::Frame->new(N("Detected hardware")), - create_scrolled_window(gtkset_size_request(my $tree = Gtk2::TreeView->new_with_model($tree_model), 350, -1), ['automatic', 'automatic'])), - gtkpack_(0, Gtk2::VBox->new(0, 0), - 1, gtkadd(my $frame = Gtk2::Frame->new(N("Information")), - create_scrolled_window(my $text = Gtk2::TextView->new)), - 0, my $module_cfg_button = gtksignal_connect(Gtk2::Button->new(N("Set current driver options")), + 0, Gtk3::Banner->new("/usr/share/mcc/themes/default/harddrake-mdk.png", translate("Hardware")), + 1, create_hpaned(gtkadd(Gtk3::Frame->new(N("Detected hardware")), + create_scrolled_window(gtkset_size_request(my $tree = Gtk3::TreeView->new_with_model($tree_model), 350, -1), ['automatic', 'automatic'])), + gtkpack_(0, Gtk3::VBox->new(0, 0), + 1, gtkadd(my $frame = Gtk3::Frame->new(N("Information")), + create_scrolled_window(my $text = Gtk3::TextView->new)), + 0, my $module_cfg_button = gtksignal_connect(Gtk3::Button->new(N("Set current driver options")), clicked => sub { local $SIG{CHLD} = undef; require modules::interactive; modules::interactive::config_window($in, $current_device); gtkset_mousecursor_normal(); }), - 0, my $config_button = gtksignal_connect(Gtk2::Button->new(N("Run config tool")), + 0, my $config_button = gtksignal_connect(Gtk3::Button->new(N("Run config tool")), # we've a configurator, let's add a button for it and show it clicked => sub { return 1 if defined $pid; @@ -292,7 +292,7 @@ $text->set_wrap_mode('word'); $frame->set_size_request(300, 450) unless $::isEmbedded; # $tree->set_column_auto_resize(0, 1); my (@data, @configurators); -$tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::MDV::CellRendererPixWithLabel->new, 'pixbuf' => 0, label => 1)); +$tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::MDV::CellRendererPixWithLabel->new, 'pixbuf' => 0, label => 1)); $tree->set_headers_visible(0); sub fill_default_text { @@ -373,7 +373,7 @@ $tree->get_selection->signal_connect('changed' => sub { # show the main window earlier (so that sub dialogs can use main # window's icon and so that no Gtk+ critical message got displayed): $w->{rwindow}->show_all; -my $flush_guard = Gtk2::GUI_Update_Guard->new; +my $flush_guard = Gtk3::GUI_Update_Guard->new; $_->hide foreach $module_cfg_button, $config_button; # hide buttons while no device my $wait = $in->wait_message(N("Please wait"), N("Detection in progress")); gtkflush() if !$::isEmbedded; @@ -516,7 +516,7 @@ $textcolumn->set_min_width(350); #$textcolumn->set_minmax_width(400); $textcolumn->set_sizing('GTK_TREE_VIEW_COLUMN_AUTOSIZE');#GROW_ONLY #$tree->columns_autosize(); -$tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk2::TreePath->new_first) }); +$tree->signal_connect(realize => sub { $tree->get_selection->select_path(Gtk3::TreePath->new_first) }); { $SIG{CHLD} = undef; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 2c420affd..f2e9d0120 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -60,12 +60,12 @@ unless ($::isEmbedded) { } $my_win->{window}->signal_connect(delete_event => \&quit); -my $cal = gtkset_sensitive(Gtk2::Calendar->new, 0); +my $cal = gtkset_sensitive(Gtk3::Calendar->new, 0); my $mday = (localtime(time()))[3]; $cal->select_day($mday); my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); my $cal_mode = 0; -my $cal_butt = gtksignal_connect(Gtk2::CheckButton->new(N("Show only for the selected day")), clicked => sub { $cal_mode = !$cal_mode; gtkset_sensitive($cal,$cal_mode) }); +my $cal_butt = gtksignal_connect(Gtk3::CheckButton->new(N("Show only for the selected day")), clicked => sub { $cal_mode = !$cal_mode; gtkset_sensitive($cal,$cal_mode) }); ### menus definition # the menus are not shown @@ -117,9 +117,9 @@ my %files = ( "explanations" => { file => "/var/log/explanations", desc => $explain_title } ); -my $yy = gtkset_sensitive(gtksignal_connect(Gtk2::Button->new(N("search")) , clicked => \&search),0); +my $yy = gtkset_sensitive(gtksignal_connect(Gtk3::Button->new(N("search")) , clicked => \&search),0); -my $log_text = gtktext_insert(Gtk2::TextView->new, [ [ '' ] ]); +my $log_text = gtktext_insert(Gtk3::TextView->new, [ [ '' ] ]); my $log_buf = $log_text->get_buffer; my $refcount_search; @@ -128,19 +128,19 @@ my $refcount_search; my %toggle; gtkadd($my_win->{window}, - gtkpack_(Gtk2::VBox->new(0,0), + gtkpack_(Gtk3::VBox->new(0,0), if_(!$::isEmbedded, 0, gtknew('Title1', label => N("A tool to monitor your logs"))), - if_(!$isFile, 0, gtkpack__(Gtk2::VBox->new(0,2), + if_(!$isFile, 0, gtkpack__(Gtk3::VBox->new(0,2), gtknew('Title2', label => N("Settings")), # N("Show lines"), - gtkpack__(Gtk2::HBox->new(0,0), - " " . N("Matching") . " ", my $e_yes = Gtk2::Entry->new, - " " . N("but not matching") . " ", my $e_no = Gtk2::Entry->new + gtkpack__(Gtk3::HBox->new(0,0), + " " . N("Matching") . " ", my $e_yes = Gtk3::Entry->new, + " " . N("but not matching") . " ", my $e_no = Gtk3::Entry->new ), - gtkpack_(Gtk2::HBox->new(0,0), - 1, gtkadd(gtkset_border_width(Gtk2::Frame->new(N("Choose file")),2), - gtkpack(gtkset_border_width(Gtk2::VBox->new(0,0),0), - map { $toggle{$_} = gtksignal_connect(Gtk2::CheckButton->new($files{$_}{desc}), + gtkpack_(Gtk3::HBox->new(0,0), + 1, gtkadd(gtkset_border_width(Gtk3::Frame->new(N("Choose file")),2), + gtkpack(gtkset_border_width(Gtk3::VBox->new(0,0),0), + map { $toggle{$_} = gtksignal_connect(Gtk3::CheckButton->new($files{$_}{desc}), clicked => sub { $refcount_search++; gtkset_sensitive($yy, $refcount_search); @@ -150,8 +150,8 @@ gtkadd($my_win->{window}, } sort keys %files, ) ), - 0, gtkadd(gtkset_border_width(Gtk2::Frame->new(N("Calendar")),2), - gtkpack__(gtkset_border_width(Gtk2::VBox->new(0,0),5), + 0, gtkadd(gtkset_border_width(Gtk3::Frame->new(N("Calendar")),2), + gtkpack__(gtkset_border_width(Gtk3::VBox->new(0,0),5), $cal_butt, $cal ) ) @@ -162,8 +162,8 @@ gtkadd($my_win->{window}, !$isExplain ? (0, gtknew('Title2', label => N("Content of the file")), 1, create_scrolled_window($log_text) ) : (1, create_scrolled_window($log_text)), - 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk2::HButtonBox->new, 'end'), 5), - if_(!$isFile, gtksignal_connect(Gtk2::Button->new(N("Mail alert")), + 0, gtkadd(gtkset_border_width(gtkset_layout(Gtk3::HButtonBox->new, 'end'), 5), + if_(!$isFile, gtksignal_connect(Gtk3::Button->new(N("Mail alert")), clicked => sub { eval { alert_config() }; my $err = $@; @@ -174,8 +174,8 @@ gtkadd($my_win->{window}, . "\n\n" . $err); } })), - gtksignal_connect(Gtk2::Button->new(N("Save")), clicked => \&save), - gtksignal_connect(Gtk2::Button->new($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) + gtksignal_connect(Gtk3::Button->new(N("Save")), clicked => \&save), + gtksignal_connect(Gtk3::Button->new($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) ) ) ); @@ -220,10 +220,10 @@ sub parse_file { my ($pbar, $win_pb); unless ($::isEmbedded && $isExplain) { local $::main_window = $my_win->{real_window}; - gtkadd($win_pb = gtkset_modal(Gtk2::Window->new('toplevel'), 1), - gtkpack(Gtk2::VBox->new(2,0), - Gtk2::Label->new(" " . N("please wait, parsing file: %s", $descr) . " "), - $pbar = Gtk2::ProgressBar->new + gtkadd($win_pb = gtkset_modal(Gtk3::Window->new('toplevel'), 1), + gtkpack(Gtk3::VBox->new(2,0), + Gtk3::Label->new(" " . N("please wait, parsing file: %s", $descr) . " "), + $pbar = Gtk3::ProgressBar->new ) ); $win_pb->set_transient_for($my_win->{real_window}); @@ -355,7 +355,7 @@ sub logcolorize { } -# log_output (Gtk2::TextView, [ [ ... ] ]) +# log_output (Gtk3::TextView, [ [ ... ] ]) sub log_output { my ($text, $font, $col) = @_; my $tag = join('', $font, $col); diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 9ad1cc2cb..d9c2b783c 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -38,7 +38,7 @@ use log; use common; use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version -use Gtk2; +use Gtk3; $border = 5; @@ -146,7 +146,7 @@ sub gtkradio { my $def = shift; my $radio; map { - my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); + my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); $w->get_child->set_line_wrap(1); $w; } @_; @@ -170,7 +170,7 @@ sub gtkcombo_setpopdown_strings { sub gtkset_mousecursor { my ($type, $w) = @_; - ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type)); + ($w || gtkroot())->set_cursor(Gtk3::Gdk::Cursor->new($type)); $w; } @@ -268,7 +268,7 @@ sub create_pixbutton { sub create_adjustment { my ($val, $min, $max) = @_; - Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1); + Gtk3::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1); } sub create_scrolled_window { @@ -286,7 +286,7 @@ sub n_line_size { # Glib::Markup::escape_text() if no use for us because it'll do extra # s/X/&foobar;/ (such as s/'/'/) that are suitable for -# Gtk2::Labels but are not for Gtk2::TextViews, resulting in +# Gtk3::Labels but are not for Gtk3::TextViews, resulting in # displaying the raw enriched text instead... # sub escape_text_for_TextView_markup_format { @@ -403,7 +403,7 @@ sub create_dialog { gtkpack($dialog->vbox, gtknew('HBox', children => [ if_($o_options->{stock}, - 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'), + 0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'), 0, gtknew('Label', text => " "), ), 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, @@ -413,19 +413,19 @@ sub create_dialog { if ($o_options->{cancel}) { $dialog->action_area->pack_start( gtknew('Button', text => N("Cancel"), - clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit }, + clicked => sub { $ret = 0; $dialog->destroy; Gtk3->main_quit }, can_default => 1), 1, 1, 0); } my $button = gtknew('Button', text => N("Ok"), can_default => 1, - clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit }); + clicked => sub { $ret = 1; $dialog->destroy; Gtk3->main_quit }); $dialog->action_area->pack_start($button, 1, 1, 0); $button->grab_default; $dialog->set_has_separator(0); $dialog->show_all; - Gtk2->main; + Gtk3->main; $ret; } @@ -455,19 +455,19 @@ sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } sub create_factory_menu_ { my ($type, $name, $window, @menu_items) = @_; - my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new); + my $widget = Gtk3::ItemFactory->new($type, $name, my $accel_group = Gtk3::AccelGroup->new); $widget->create_items($window, @menu_items); $window->add_accel_group($accel_group); ($widget->get_widget($name), $widget); } -sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '
', @_) } -sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '
', @_) } +sub create_factory_popup_menu { create_factory_menu_("Gtk3::Menu", '
', @_) } +sub create_factory_menu { create_factory_menu_("Gtk3::MenuBar", '
', @_) } sub create_menu { my $title = shift; - my $w = Gtk2::MenuItem->new($title); - $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_))); + my $w = Gtk3::MenuItem->new($title); + $w->set_submenu(gtkshow(gtkappend(Gtk3::Menu->new, @_))); $w; } @@ -482,7 +482,7 @@ sub create_notebook { sub create_packtable { my ($options, @l) = @_; - my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0); + my $w = Gtk3::Table->new(0, 0, $options->{homogeneous} || 0); add2hash_($options, { xpadding => 5, ypadding => 0 }); each_index { my ($i, $l) = ($::i, $_); @@ -494,7 +494,7 @@ sub create_packtable { $w->attach($_, $j, $j + 1, $i, $i + 1, 'fill', 'fill', $options->{xpadding}, $options->{ypadding}) : $w->attach($_, $j, $j + 1, $i, $i + 1, - ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); + ['expand', 'fill'], ref($_) eq 'Gtk3::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0); $_->show; } } @$l; @@ -517,11 +517,11 @@ sub create_okcancel { $cancel = $::isWizard ? N("Previous") : N("Cancel"); } my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); - my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit })); + my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk3->main_quit })); my $bprev; if ($cancel) { $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || - sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit }); + sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk3->main_quit }); } $w->{wizcancel} = gtknew('Button', text => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel; if (!defined $wm_is_kde) { @@ -529,7 +529,7 @@ sub create_okcancel { my $wm = any::running_window_manager(); $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0; } - my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ? + my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk3::Button/ ? $_[0][0] : gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other), @@ -580,11 +580,11 @@ sub _setup_paned { } sub create_vpaned { - _setup_paned(Gtk2::VPaned->new, @_); + _setup_paned(Gtk3::VPaned->new, @_); } sub create_hpaned { - _setup_paned(Gtk2::HPaned->new, @_); + _setup_paned(Gtk3::HPaned->new, @_); } sub gtkcreate_frame { @@ -674,7 +674,7 @@ sub set_back_pixbuf { my ($widget, $pixbuf) = @_; my $window = $widget->window; my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); + my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); $window->set_back_pixmap($pixmap, 0); } @@ -683,7 +683,7 @@ sub set_back_pixmap { my ($w) = @_; return if !$w->realized; my $window = $w->window; - my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); + my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); my $style = $w->get_style; $pixmap->draw_points($style->bg_gc('normal'), 0, 0); @@ -741,7 +741,7 @@ sub new { title => $title || '', pop_it => $o->{pop_it}, $::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (), - $::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (), + $::isStandalone && $banner_title && $icon ? (banner => Gtk3::Banner->new($icon, $banner_title)) : (), width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal}, no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone, @@ -785,7 +785,7 @@ sub sync { sub flush() { gtkflush() } sub shrink_topwindow { my ($o) = @_; - $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1)); + $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1)); } sub exit { gtkset_mousecursor_normal(); #- for restoring a normal in any case @@ -816,9 +816,9 @@ sub ask_dir { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_dir(@_); sub _ask_from_entry($$@) { my ($o, @msgs) = @_; my $entry = gtknew('Entry'); - my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit }; + my $f = sub { $o->{retval} = $entry->get_text; Gtk3->main_quit }; $o->{ok_clicked} = $f; - $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit }; + $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk3->main_quit }; gtkadd($o->{window}, gtkpack($o->create_box_with_title(@msgs), @@ -832,7 +832,7 @@ sub _ask_warn($@) { my ($o, @msgs) = @_; gtkadd($o->{window}, gtkpack($o->create_box_with_title(@msgs), - my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }), + my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk3->main_quit }), ), ); $w->grab_focus; @@ -903,12 +903,12 @@ sub ask_browse_tree_info { my $w = ugtk3->new($common->{title}); - my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String"); - my $tree = Gtk2::TreeView->new_with_model($tree_model); + my $tree_model = Gtk3::TreeStore->new("Glib::String", "Gtk3::Gdk::Pixbuf", "Glib::String"); + my $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->get_selection->set_mode('browse'); - $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0)); - $tree->append_column(my $pixcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1)); - $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2)); + $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $tree->append_column(my $pixcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1)); + $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 2)); $tree->set_headers_visible(0); $tree->set_rules_hint(1); $textcolumn->set_min_width(200); @@ -924,20 +924,20 @@ sub ask_browse_tree_info { 0, gtknew('Frame', text => N("Info"), child => gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)), ) ]), - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, 0, my $status = gtknew('Label'), if_($common->{auto_deps}, 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) ), - 0, Gtk2::HSeparator->new, + 0, Gtk3::HSeparator->new, 0, my $box2 = gtknew('HBox', spacing => 10), ])); gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"), clicked => $common->{interactive_help})) if $common->{interactive_help}; - #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons')); - gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new); + #gtkpack__($box2, my $toolbar = Gtk3::Toolbar->new('horizontal', 'icons')); + gtkpack__($box2, my $toolbar = Gtk3::Toolbar->new); my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ])); @l = reverse @l if !$::isInstall; @@ -945,7 +945,7 @@ sub ask_browse_tree_info { my ($t, $val) = @$_; $box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub { $w->{retval} = $val; - Gtk2->main_quit; + Gtk3->main_quit; }), 0, 1, 20); $w->show; $w; @@ -1239,7 +1239,7 @@ sub gtk_new_TextView_get_log { # misc helpers: -package Gtk2::TreeStore; +package Gtk3::TreeStore; sub append_set { my ($model, $parent, @values) = @_; # compatibility: @@ -1250,7 +1250,7 @@ sub append_set { } -package Gtk2::ListStore; +package Gtk3::ListStore; # Append a new row, set the values, return the TreeIter sub append_set { my ($model, @values) = @_; @@ -1262,7 +1262,7 @@ sub append_set { } -package Gtk2::TreeModel; +package Gtk3::TreeModel; # gets the string representation of a TreeIter sub get_path_str { my ($self, $iter) = @_; @@ -1278,7 +1278,7 @@ sub iter_each_children { } } -package Gtk2::TreeView; +package Gtk3::TreeView; # likewise gtk-1.2 function sub toggle_expansion { my ($self, $path, $b_open_all) = @_; @@ -1309,17 +1309,17 @@ sub toggle_expansion { # This layer try to make OptionMenu and ComboBox look being api # compatible with Combo since its API is quite nice. -package Gtk2::OptionMenu; +package Gtk3::OptionMenu; use MDK::Common; # try to get combox <==> option menu mapping sub set_popdown_strings { my ($w, @strs) = @_; - my $menu = Gtk2::Menu->new; + my $menu = Gtk3::Menu->new; # keep string list around for ->set_text compatibilty helper $w->{strings} = \@strs; #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); - $menu->append(ugtk3::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs; + $menu->append(ugtk3::gtkshow(Gtk3::MenuItem->new_with_label($_))) foreach @strs; $w->set_menu($menu); $w; } @@ -1355,7 +1355,7 @@ sub set_text { -package Gtk2::ComboBox; +package Gtk3::ComboBox; use MDK::Common; # try to get combox <==> option menu mapping @@ -1396,28 +1396,28 @@ sub set_text { } -package Gtk2::Label; +package Gtk3::Label; sub set { my ($label, $text) = @_; mygtk3::gtkset($label, text => $text); } -package Gtk2::WrappedLabel; +package Gtk3::WrappedLabel; sub new { my ($_type, $o_text, $o_align) = @_; mygtk3::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]); } -package Gtk2::Entry; +package Gtk3::Entry; sub new_with_text { my ($_class, $o_text) = @_; mygtk3::gtknew('Entry', text => $o_text); } -package Gtk2::Banner; +package Gtk3::Banner; use MDK::Common; use mygtk3 qw(gtknew); @@ -1484,13 +1484,13 @@ sub new { } -package Gtk2::MDV::CellRendererPixWithLabel; +package Gtk3::MDV::CellRendererPixWithLabel; use MDK::Common; -use Glib::Object::Subclass "Gtk2::CellRenderer", +use Glib::Object::Subclass "Gtk3::CellRenderer", properties => [ Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), - Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]), + Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk3::Gdk::Pixbuf', [qw(readable writable)]), ]; my $x_padding = 2; @@ -1574,12 +1574,12 @@ sub RENDER { # not that efficient... 1; -package Gtk2::Notify::Queue; +package Gtk3::Notify::Queue; sub new { my ($class, $statusicon) = @_; - require Gtk2::Notify; + require Gtk3::Notify; my $self = bless { queue => [], @@ -1604,9 +1604,9 @@ sub add { } sub show { - my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new + my ($self) = @_; # perl_checker: $self = Gtk3::Notify->new my $info = $self->{queue}[0]; - my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); + my $notification = Gtk3::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; $notification->set_urgency($info->{urgency}) if $info->{urgency}; foreach my $a (@{$info->{actions} || []}) { @@ -1630,7 +1630,7 @@ sub show { 1; -package Gtk2::GUI_Update_Guard; +package Gtk3::GUI_Update_Guard; use MDK::Common::Func qw(before_leaving); use ugtk3; diff --git a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl index 620ff4578..aabeb8a36 100755 --- a/perl-install/unused/migrate-ugtk2-to-mygtk2.pl +++ b/perl-install/unused/migrate-ugtk2-to-mygtk2.pl @@ -23,7 +23,7 @@ $b = 1; while ($b) { $b = 0; - if (my ($before, $class, undef, $new, $arg, $after, $after2) = /(.*?)Gtk2::(\w+(::\w+)*)->(new\w*)(?:\(($re)\)(.*)|([^(].*))/s) { + if (my ($before, $class, undef, $new, $arg, $after, $after2) = /(.*?)Gtk3::(\w+(::\w+)*)->(new\w*)(?:\(($re)\)(.*)|([^(].*))/s) { $after ||= $after2; my $s; -- cgit v1.2.1 From 79cb62fd07a91454fe57edfba3b00833a8a19bf6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 17:21:59 +0200 Subject: tell Glib to use gtk+-3 in order to handle exceptions in callbacks --- perl-install/mygtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index b4e3522f5..73520316e 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -22,10 +22,10 @@ sub init() { if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation @::textdomains; - Glib->enable_exceptions2; + Glib->enable_exceptions3; } init() unless $::no_ugtk_init; -Glib->enable_exceptions2 if $::isInstall; +Glib->enable_exceptions3 if $::isInstall; -- cgit v1.2.1 From abcb9996d91012d3454736cd6363f5db3e0e82c7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 2 Aug 2012 15:05:30 +0200 Subject: (_gtk__Label) simplify --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 73520316e..e324513b4 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -414,7 +414,7 @@ sub _gtk__Label { if ($w) { $w->set_text(delete $opts->{text}) if exists $opts->{text}; } else { - $w = exists $opts->{text} ? Gtk3::Label->new(delete $opts->{text}) : Gtk3::Label->new; + $w = Gtk3::Label->new(delete $opts->{text}); $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable}; $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize}; $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; -- cgit v1.2.1 From 64b9097f5cdb64ac0018bd4390b6da4b4246cb01 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:26:54 +0200 Subject: perlish can_default() is no more: use set_/get_can_default() instead --- perl-install/mygtk3.pm | 2 +- perl-install/standalone/draksec | 2 +- perl-install/ugtk3.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index e324513b4..59349c41e 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -114,7 +114,7 @@ sub _gtk { } $w->set_name(delete $opts->{widget_name}) if exists $opts->{widget_name}; $w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; - $w->can_default(delete $opts->{can_default}) if exists $opts->{can_default}; + $w->set_can_default(delete $opts->{can_default}) if exists $opts->{can_default}; $w->grab_focus if delete $opts->{grab_focus}; $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 6a262bc2b..c65e69a76 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -249,7 +249,7 @@ gtkpack_($vbox, ), ); -$oc->{cancel}->can_default(1); +$oc->{cancel}->set_can_default(1); $oc->{cancel}->grab_default; $w->main; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index d9c2b783c..a19356490 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -558,7 +558,7 @@ sub create_okcancel { gtknew('HButtonBox', spacing => 5, layout => $_->[1], children_loose => [ map { - $_->can_default($::isWizard); + $_->set_can_default($::isWizard); $_; } grep { $_ } @{$_->[0]} ]); -- cgit v1.2.1 From abf078590ff4692d5ea40f277feac76687c25b04 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:37:02 +0200 Subject: Gtk3::ComboBox->new_text => Gtk3::ComboBoxText->new --- perl-install/fs/partitioning_wizard.pm | 2 +- perl-install/interactive/gtk.pm | 2 +- perl-install/mygtk3.pm | 2 +- perl-install/standalone/drakbug | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 86b06f72e..e5d744e55 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -517,7 +517,7 @@ sub main { my $hdchoicelabel = Gtk3::Label->new(N("Here is the content of your disk drive ")); - my $combobox = Gtk3::ComboBox->new_text; + my $combobox = Gtk3::ComboBoxText->new; foreach (@kinds) { my $info = $_->{val}{info} || $_->{val}{device}; $info =~ s|^(?:.*/)?(.{24}).*|$1|; diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index c1b196f8f..03c0ea2c1 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -518,7 +518,7 @@ sub create_widget { if (!$e->{separator}) { if ($e->{not_edit}) { - $real_w = $w = Gtk3::ComboBox->new_text; + $real_w = $w = Gtk3::ComboBoxText->new; # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time: first($w->child->get_cell_renderers)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width}; diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 59349c41e..455a83de1 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -605,7 +605,7 @@ sub _gtk__ComboBox { my ($w, $opts, $_class, $action) = @_; if (!$w) { - $w = Gtk3::ComboBox->new_text; + $w = Gtk3::ComboBoxText->new; $w->{format} = delete $opts->{format} if exists $opts->{format}; } diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index fe8866df4..965c44196 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -96,7 +96,7 @@ my $bugzilla_url = 'http://bugs.mageia.org/enter_bug.cgi'; my $wizard_name = "Bugzilla"; $table = create_packtable({ col_spacings => 5, row_spacings => 10 }, - [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk3::ComboBox->new_text, $comb_app->set_wrap_width(3) ], + [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk3::ComboBoxText->new, $comb_app->set_wrap_width(3) ], [ gtknew('Label_Left', text => N("or Application Name\n(or Full Path):")), gtkpack_(Gtk3::HBox->new(0, 5), 1, $com_app = gtkset_editable(Gtk3::Entry->new, 1), -- cgit v1.2.1 From 57cc6e6e43ea687e8b9d55346698338d7d9d9dce Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:49:47 +0200 Subject: perlish realized() => get_realized() --- perl-install/ugtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index a19356490..b092b5da3 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -681,7 +681,7 @@ sub set_back_pixbuf { sub set_back_pixmap { my ($w) = @_; - return if !$w->realized; + return if !$w->get_realized; my $window = $w->window; my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); @@ -1425,7 +1425,7 @@ use ugtk3 qw(:helpers :wrappers); sub set_pixmap { my ($darea) = @_; - return if !$darea->realized; + return if !$darea->get_realized; ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf}); update_text($darea); } -- cgit v1.2.1 From e5d2e80a09845619e90d736ac9c0f5fb3665574d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:56:16 +0200 Subject: perlish ->window => ->get_window --- perl-install/diskdrake/hd_gtk.pm | 2 +- perl-install/diskdrake/smbnfs_gtk.pm | 4 ++-- perl-install/install/steps_gtk.pm | 2 +- perl-install/mygtk3.pm | 6 +++--- perl-install/services.pm | 2 +- perl-install/standalone/drakclock | 4 ++-- perl-install/standalone/drakdvb | 4 ++-- perl-install/standalone/draksec | 2 +- perl-install/standalone/logdrake | 8 ++++---- perl-install/ugtk3.pm | 16 ++++++++-------- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 5d3a5af4e..02f7c1251 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -315,7 +315,7 @@ sub create_automatic_notebooks { sub create_buttons4partitions { my ($kind, $totalsectors, @parts) = @_; - $width = first($w->{window}->window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->window; + $width = first($w->{window}->get_window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->get_window; my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; while (1) { diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index ff50e0a18..61bcab168 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -226,10 +226,10 @@ sub import_tree { $current_entry = find_fstab_entry($kind, $wexports{$tree_model->get_path_str($curr)} || die(''), 'add'); } else { if (!$tree_model->iter_has_child($curr)) { - gtkset_mousecursor_wait($tree->window); + gtkset_mousecursor_wait($tree->get_window); ugtk3::flush(); $add_exports->($curr); - gtkset_mousecursor_normal($tree->window); + gtkset_mousecursor_normal($tree->get_window); } $current_entry = undef; } diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index f57c9cecc..928c29336 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -616,7 +616,7 @@ sub installPackages { $details->hide if !@install::any::advertising_images; $w->sync; foreach ($cancel, $details) { - gtkset_mousecursor_normal($_->window); + gtkset_mousecursor_normal($_->get_window); } $advertize->(0); diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 455a83de1..e3cb85268 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -354,13 +354,13 @@ sub _gtk__Image { } # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: if ($::isInstall) { - $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'), 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); return; } foreach my $rect ($event->region->get_rectangles) { my @values = $rect->values; - $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'), @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); } }); @@ -1535,7 +1535,7 @@ sub _pixbuf_render_alpha { sub pixmap_from_pixbuf { my ($widget, $pixbuf) = @_; - my $window = $widget->window or internal_error("you can't use this function if the widget is not realised"); + my $window = $widget->get_window or internal_error("you can't use this function if the widget is not realised"); my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); diff --git a/perl-install/services.pm b/perl-install/services.pm index 54dd5efec..377e87b98 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -284,7 +284,7 @@ sub ask_standalone_gtk { )) ); $b->signal_connect(motion_notify_event => sub { my ($w, $e) = @_; - my ($ox, $oy) = $w->window->get_origin; + my ($ox, $oy) = $w->get_window->get_origin; $x = $e->x+$ox; $y = $e->y+$oy }); $b->signal_connect(button_press_event => sub { $nopop->() }); $::isEmbedded and gtkflush(); diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 962474341..de1b9d0c9 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -193,7 +193,7 @@ my $pressed; $drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); $drawing_area->signal_connect(expose_event => \&expose_event); $drawing_area->signal_connect(realize => sub { - my $window = $drawing_area->window; + my $window = $drawing_area->get_window; $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth); }); @@ -316,7 +316,7 @@ sub determine_radian { sub expose_event { my ($widget, $event) = @_; my ($x, $y, $width, $height) = $event->area->values; - $widget->window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); + $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); 0; } diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb index bcbf4a9c9..2ced12974 100755 --- a/perl-install/standalone/drakdvb +++ b/perl-install/standalone/drakdvb @@ -56,7 +56,7 @@ sub detect_channels() { if (-s $config_file) { $in->ask_okcancel(N("Warning"), N("%s already exists and its contents will be lost", $config_file)) or return; } - gtkset_mousecursor_wait($w->{window}->window); + gtkset_mousecursor_wait($w->{window}->get_window); $channel_list->set_sensitive(0); $_->set_sensitive(0) foreach values %buttons; @@ -73,7 +73,7 @@ sub detect_channels() { } else { $in->ask_warn(N("Error"), N("Could not get the list of available channels")); } - gtkset_mousecursor_normal($w->{window}->window); + gtkset_mousecursor_normal($w->{window}->get_window); $buttons{detect}->set_sensitive(1); $channel_list->set_sensitive(1); }; diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index c65e69a76..cda3a8705 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -69,7 +69,7 @@ sub wait_msg { my $mainw = ugtk3->new(N("Please wait"), (modal => 1, transient => $w->{real_window})); $mainw->{window}->add(gtknew('WrappedLabel', text => $_[0])); $mainw->{rwindow}->show_all; - gtkset_mousecursor_wait($mainw->{rwindow}->window); + gtkset_mousecursor_wait($mainw->{rwindow}->get_window); # ugly workaround for gtk+ not displaying subdialog contents: Glib::Timeout->add(300, sub { Gtk3->main_quit; 0 }); Gtk3->main; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index f2e9d0120..2c98de368 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -192,8 +192,8 @@ sub quit() { ugtk3->exit(0) } # search functions #------------------------------------------------------------- sub search() { - return if !$log_text->window; - $log_text->window->freeze_updates; + return if !$log_text->get_window; + $log_text->get_window->freeze_updates; $log_buf->set_text(''); if ($isFile) { parse_file($File, $File); @@ -202,7 +202,7 @@ sub search() { parse_file($files{$_}{file}, $files{$_}{desc}) if $toggle{$_}->get_active; } } - $log_text->window->thaw_updates; + $log_text->get_window->thaw_updates; $log_text->show; gtkflush(); } @@ -272,7 +272,7 @@ sub parse_file { $i++; if ($pbar && $i % 10) { $pbar->set_fraction($i/$taille); - $win_pb->window->process_updates(1); # no gtkflush() because we do not want to refresh the TextView + $win_pb->get_window->process_updates(1); # no gtkflush() because we do not want to refresh the TextView } logcolorize($_) if $test->($_); diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index b092b5da3..56c954b38 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -56,7 +56,7 @@ sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" } sub gtkdestroy { mygtk3::may_destroy($_[0]) } sub gtkflush() { mygtk3::flush() } sub gtkhide { $_[0]->hide; $_[0] } -sub gtkmove { $_[0]->window->move($_[1], $_[2]); $_[0] } +sub gtkmove { $_[0]->get_window->move($_[1], $_[2]); $_[0] } sub gtkpack { gtkpowerpack(1, 1, @_) } sub gtkpack_ { gtkpowerpack('arg', 1, @_) } sub gtkpack__ { gtkpowerpack(0, 1, @_) } @@ -64,7 +64,7 @@ sub gtkpack2 { gtkpowerpack(1, 0, @_) } sub gtkpack2_ { gtkpowerpack('arg', 0, @_) } sub gtkpack2__ { gtkpowerpack(0, 0, @_) } sub gtkput { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] } -sub gtkresize { $_[0]->window->resize($_[1], $_[2]); $_[0] } +sub gtkresize { $_[0]->get_window->resize($_[1], $_[2]); $_[0] } sub gtkset_active { $_[0]->set_active($_[1]); $_[0] } sub gtkset_border_width { $_[0]->set_border_width($_[1]); $_[0] } sub gtkset_editable { $_[0]->set_editable($_[1]); $_[0] } @@ -672,7 +672,7 @@ sub gtkset_property { sub set_back_pixbuf { my ($widget, $pixbuf) = @_; - my $window = $widget->window; + my $window = $widget->get_window; my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); @@ -682,7 +682,7 @@ sub set_back_pixbuf { sub set_back_pixmap { my ($w) = @_; return if !$w->get_realized; - my $window = $w->window; + my $window = $w->get_window; my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth); my $style = $w->get_style; @@ -1462,7 +1462,7 @@ sub new { my $height = $darea->{icon}->get_height; my $width = $darea->{icon}->get_width; # fix icon position when not using the default height: - (undef, undef, undef, $d_height) = $darea->window->get_geometry; + (undef, undef, undef, $d_height) = $darea->get_window->get_geometry; my $padding = int(($d_height - $height)/2); my $d_width = $darea->allocation->width; my $x_blue = $is_rtl ? $d_width - $blue_width : 0; @@ -1470,11 +1470,11 @@ sub new { # here: 48 is the amount of white background in the blue background we wish to ignore: my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); - $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), + $blue_part->render_to_drawable($darea->get_window, $style->bg_gc('normal'), 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); - $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'), + $darea->{icon}->render_to_drawable($darea->get_window, $style->bg_gc('normal'), 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); - $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $darea->get_window->draw_layout($style->fg_gc('normal'), $x_text, $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, $darea->{layout}); 1; -- cgit v1.2.1 From 7b90281fb2e73c5e70488b35312c2faa51f2d9ce Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:56:42 +0200 Subject: perlish ->allocation => ->get_allocation --- perl-install/mygtk3.pm | 4 ++-- perl-install/standalone/drakclock | 4 ++-- perl-install/ugtk3.pm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index e3cb85268..9f5b68d1a 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -348,7 +348,7 @@ sub _gtk__Image { $w->signal_connect(expose_event => sub { my (undef, $event) = @_; if (!$w->{x}) { - my $alloc = $w->allocation; + my $alloc = $w->get_allocation; $w->{x} = $alloc->x; $w->{y} = $alloc->y; } @@ -1589,7 +1589,7 @@ sub move_selection { my $layout = $w->{layout}; $layout->{arrow_ydiff} ||= ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; - my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; + my $bar_y = $label->get_allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; $layout->move($w->{selection_bar}, 0, $bar_y); $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index de1b9d0c9..9396a0659 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -228,7 +228,7 @@ $timer = Glib::Timeout->add(120, \&update_time); $drawing_area->show; $my_win->{window}->show_all; -my ($midx, $midy) = ($drawing_area->allocation->width/2, $drawing_area->allocation->height/2); +my ($midx, $midy) = ($drawing_area->get_allocation->width/2, $drawing_area->get_allocation->height/2); $my_win->main; ugtk3->exit(0); @@ -340,7 +340,7 @@ sub Repaint { my ($drawing_area, $o_update_time) = @_; my ($sec, $min, $hour) = localtime(time()); time_to_rad($sec, $min, $hour) if $o_update_time; - my ($width, $height) = ($drawing_area->allocation->width, $drawing_area->allocation->height); + my ($width, $height) = ($drawing_area->get_allocation->width, $drawing_area->get_allocation->height); my $dRadians_hour_real = $dRadians_hour + $dRadians_min / 12; my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; my $dRadians_sec_real = $dRadians_sec; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 56c954b38..ac116a761 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1464,7 +1464,7 @@ sub new { # fix icon position when not using the default height: (undef, undef, undef, $d_height) = $darea->get_window->get_geometry; my $padding = int(($d_height - $height)/2); - my $d_width = $darea->allocation->width; + my $d_width = $darea->get_allocation->width; my $x_blue = $is_rtl ? $d_width - $blue_width : 0; my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; # here: 48 is the amount of white background in the blue background we wish to ignore: -- cgit v1.2.1 From 49671c053c9f4f8c9d7bf9f02e60ab7491a2fcc9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 10 Feb 2013 19:45:14 +0000 Subject: s/can_focus()/set_can_focus()/ --- perl-install/diskdrake/hd_gtk.pm | 2 +- perl-install/mygtk3.pm | 2 +- perl-install/ugtk3.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 02f7c1251..ce6c81ffb 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -412,7 +412,7 @@ sub filesystems_button_box() { my $w = gtknew('Button', text => translate($_), widget_name => 'PART_' . ($t || 'empty'), tip => N("Filesystem types:"), clicked => sub { try_('', \&createOrChangeType, $t, current_hd(), current_part()) }); - $w->can_focus(0); + $w->set_can_focus(0); $w; } @types); } diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 9f5b68d1a..173f0519b 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -113,7 +113,7 @@ sub _gtk { $w->move($position->[0], $position->[1]); } $w->set_name(delete $opts->{widget_name}) if exists $opts->{widget_name}; - $w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; + $w->set_can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus}; $w->set_can_default(delete $opts->{can_default}) if exists $opts->{can_default}; $w->grab_focus if delete $opts->{grab_focus}; $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ac116a761..7e356c8e0 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -344,7 +344,7 @@ sub create_box_with_title { $wtext->set_justification('fill'); $wtext->set_left_margin(12); $wtext->set_right_margin(12); - $wtext->can_focus($has_scroll); + $wtext->set_can_focus($has_scroll); my $width = 400; my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); $scroll->signal_connect(realize => sub { -- cgit v1.2.1 From 1b6efe263d08b0d2c7b42be4f7ea80e1eef1ba84 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 10 Dec 2012 03:40:16 +0100 Subject: switch from gtk+-2 to gtk+-3 include introspection stuff --- perl-install/install/gtk.pm | 2 +- perl-install/install/share/list.xml | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index dedb66af2..714a56022 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -186,7 +186,7 @@ sub update_steps_position { 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 diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 360f95a6c..67ab52ca8 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -92,6 +92,20 @@ 95-dm-notify.rules + + Atk-1.0.typelib + cairo-1.0.typelib + Gdk-3.0.typelib + GdkPixbuf-2.0.typelib + Gio-2.0.typelib + GLib-2.0.typelib + GModule-2.0.typelib + GObject-2.0.typelib + Gtk-3.0.typelib + Pango-1.0.typelib + xlib-2.0.typelib + + drivers/fbdev_drv.so drivers/vesa_drv.so @@ -142,7 +156,7 @@ */LC_MESSAGES/draksnapshot.mo */LC_MESSAGES/drakx-net.mo */LC_MESSAGES/drakx-kbd-mouse-x11.mo - */LC_MESSAGES/gtk20.mo + */LC_MESSAGES/gtk30.mo */LC_MESSAGES/urpmi.mo @@ -184,8 +198,8 @@ /etc/pango/ARCH/pango.modules /usr/LIB/libgdk_pixbuf-2.0.so.0 - /usr/LIB/gtk-2.0/*/immodules/im-cedilla.so - /usr/LIB/gtk-2.0/*/engines/liboxygen-gtk.so + /usr/LIB/gtk-3.0/*/immodules/im-cedilla.so + /usr/LIB/gtk-3.0/*/theming-engines/liboxygen-gtk.so /usr/share/mime/mime.cache /usr/lib/libDrakX/keyboard.pm @@ -271,7 +285,6 @@ /usr/share/themes/oxygen-gtk* /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so - /etc/gtk-2.0/gtk.immodules.* /etc/brltty/*.ttb /etc/brltty/*.txt /LIB/brltty/libbrlttyb??.so @@ -521,8 +534,9 @@ perl-Filesys-Df 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 @@ -580,13 +594,10 @@ - - - gtkrc - + + settings.ini - -- cgit v1.2.1 From d0621dba02bf81b930948014d1e47c2b88aa18bc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 16:04:56 +0100 Subject: include WebKit library & typelib for Gtk3::WebKit --- perl-install/install/share/list.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 67ab52ca8..7707f8193 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -102,7 +102,10 @@ GModule-2.0.typelib GObject-2.0.typelib Gtk-3.0.typelib + JavaScriptCore-3.0.typelib Pango-1.0.typelib + Soup-2.4.typelib + WebKit-3.0.typelib xlib-2.0.typelib @@ -184,6 +187,9 @@ libdmraid-events-isw.so + + + libwebkitgtk-3.0.so.0 -- cgit v1.2.1 From 850e49bb865fc2a087164612ed4e7c2e560b6a4b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 16:11:17 +0100 Subject: include Cairo::GObject & Cairo too --- perl-install/install/share/list.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 7707f8193..c7d638f5a 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -486,6 +486,7 @@ Parse/EDID.pm String/ShellQuote.pm XML/SAX/Exception.pm + ARCH-linux-thread-multi/Cairo.pm ARCH-linux-thread-multi/List/MoreUtils.pm ARCH-linux-thread-multi/Term/ReadKey.pm ARCH-linux-thread-multi/XML/LibXML.pm @@ -497,6 +498,7 @@ ARCH-linux-thread-multi/XML/LibXML/Boolean.pm ARCH-linux-thread-multi/XML/LibXML/Literal.pm ARCH-linux-thread-multi/XML/LibXML/Number.pm + ARCH-linux-thread-multi/auto/Cairo/Cairo.so ARCH-linux-thread-multi/auto/Term/ReadKey/ReadKey.so ARCH-linux-thread-multi/auto/XML/LibXML/LibXML.so urpm.pm @@ -538,6 +540,7 @@ perl-File-FnMatch perl-File-Sync perl-Filesys-Df + perl-Cairo-GObject perl-Clone perl-Glib perl-Glib-Object-Introspection -- cgit v1.2.1 From 8927e8c55ea0b659faabff90b0c9a67e3112eb0c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 16:31:32 +0100 Subject: provide /etc/machine-id for dbus else gtk+3 fails to initialize... --- perl-install/install/share/list.xml | 11 +++++++++++ perl-install/install/share/symlinks | 1 + 2 files changed, 12 insertions(+) diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index c7d638f5a..2dd9de1d0 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -201,6 +201,17 @@ /etc/passwd /etc/protocols /etc/rpm/macros.d/20common.macros + + + + + + + dbus-uuidgen > share/machine-id; echo machine-id + + + + /etc/pango/ARCH/pango.modules /usr/LIB/libgdk_pixbuf-2.0.so.0 diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks index eb0de9b47..dad5e65b0 100644 --- a/perl-install/install/share/symlinks +++ b/perl-install/install/share/symlinks @@ -2,6 +2,7 @@ /etc/protocols /etc/services /etc/group +/etc/machine-id /etc/passwd /etc/pki /etc/urpmi -- cgit v1.2.1 From 45b2bb4e1c39962b9234c3b3a45d24767ef350f2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 10 Dec 2012 04:18:23 +0100 Subject: set font for Gtk+-3 system wide we alter /.config instead of /root/.config due to bogus environment --- perl-install/install/gtk.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 714a56022..a60d6d678 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -75,10 +75,12 @@ sub load_font { } my $font = lang::l2pango_font($o->{locale}{lang}); - my $s = qq(gtk-font-name="$font"); + my $s = qq(gtk-font-name = $font); Gtk3::Rc->parse_string($s); - mkdir("/root"); - output("/root/.gtkrc-2.0", $s); + mkdir_p("/.config/gtk-3.0"); + output("/.config/gtk-3.0/settings.ini", qq([Settings] +$s +)); } #------------------------------------------------------------------------------ -- cgit v1.2.1 From 7f3ec46de7c8c8875c56ccc9efbb10281632fc9f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 10 Feb 2013 19:00:44 +0000 Subject: s/Gtk3::Combo/Gtk3::ComboBox/ --- perl-install/standalone/drakclock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 9396a0659..369cdd5d9 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -82,7 +82,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi }), 0, $hb_ntp = gtknew('HBox', border_width => 5, children => [ 0, gtknew('Label', text => N("Server:")), - 1, $combo_ntpserver = Gtk3::Combo->new + 1, $combo_ntpserver = Gtk3::ComboBox->new ]) ])) ]), -- cgit v1.2.1 From a90c75de317ece497ecd0da553c3a0666ae4fd16 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 10 Feb 2013 19:37:06 +0000 Subject: (create_boxradio,create_widgets) adapt to new tooltips API --- perl-install/interactive/gtk.pm | 6 ++---- perl-install/mygtk3.pm | 5 +---- perl-install/standalone/drakperm | 9 +++------ perl-install/ugtk3.pm | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 03c0ea2c1..d7ce8f182 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -46,7 +46,6 @@ sub create_boxradio { my $boxradio = gtkpack2__(Gtk3::VBox->new, my @radios = gtkradio('', @{$e->{formatted_list}})); - my $tips = Gtk3::Tooltips->new; mapn { my ($txt, $w) = @_; # workaround infamous 6 years old gnome bug #101968: @@ -59,7 +58,7 @@ sub create_boxradio { $onchange_f->(sub { $txt }); }); if ($e->{help}) { - gtkset_tip($tips, $w, + $w->set_tooltip_text( ref($e->{help}) eq 'HASH' ? $e->{help}{$txt} : ref($e->{help}) eq 'CODE' ? $e->{help}($txt) : $e->{help}); } @@ -750,9 +749,8 @@ sub create_widgets { my $box = create_widgets_block($o, $common, $l, $update, \$ignore); - my $tooltips = Gtk3::Tooltips->new; foreach my $e (@all) { - $tooltips->set_tip($e->{w}, $e->{help}) if $e->{help} && !ref($e->{help}); + $e->{w}->set_tooltip_text($e->{help}) if $e->{help} && !ref($e->{help}); } $box, $set_all; diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 173f0519b..50b2a491f 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -97,8 +97,6 @@ sub gtkval_modify { } } -my $global_tooltips; - sub _gtk { my ($w, $class, $action, $opts) = @_; @@ -122,8 +120,7 @@ sub _gtk { $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; if (my $tip = delete $opts->{tip}) { - $global_tooltips ||= Gtk3::Tooltips->new; - $global_tooltips->set_tip($w, $tip); + $w->set_tooltip_text($tip); } #- WARNING: hide_ref and show_ref are not effective until you gtkval_modify the ref diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 5dd9d9198..225fe19f1 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -103,8 +103,6 @@ $permList->signal_connect(button_press_event => sub { }); -my $tips = Gtk3::Tooltips->new; - $W->add(gtknew('VBox', spacing => 5, children => [ if_(!$::isEmbedded, 0, Gtk3::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), 0, gtknew('Label_Left', text => N("Here you can see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will overwrite the default rules."), alignment => [ 0.5, 0 ]), @@ -118,7 +116,7 @@ Select permissions to see/edit", $level), alignment => [ 0, 0 ]), 1, gtknew('ScrolledWindow', child => $permList), 0, my $up_down_box = gtknew('HBox', spacing => 5, children_loose => [ @buttons = map { - gtkset_tip($tips, + gtkset_tip( gtknew('Button', text => $_->[0], clicked => $_->[2]), $_->[1]); } ([ N("Up"), N("Move selected rule up one level"), sub { move_callback('up') } ], @@ -292,7 +290,7 @@ sub row_setting_dialog { ] ); - my $usr_check = gtksignal_connect(gtkset_tip($tips, gtknew('CheckButton', text => N("Current user")), + my $usr_check = gtksignal_connect(gtkset_tip(gtknew('CheckButton', text => N("Current user")), N("When checked, owner and group will not be changed")), clicked => sub { $id_box->set_sensitive(!$_[0]->get_active) }); @@ -343,8 +341,7 @@ sub row_setting_dialog { map { my $c = $_; my $active = $perms{$owner}{$c}; - $perms{$owner}{$c} = gtknew('CheckButton'); - $tips->set_tip($perms{$owner}{$c}, + $perms{$owner}{$c} = gtkset_tip(gtknew('CheckButton'), $checks{$c}{tip}{$owner}, ); gtkset_active($perms{$owner}{$c}, $active); diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 7e356c8e0..192d7a6a9 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -78,7 +78,7 @@ sub gtkset_mousecursor_wait { gtkset_mousecursor('watch', @_) } sub gtkset_relief { $_[0]->set_relief($_[1]); $_[0] } sub gtkset_sensitive { $_[0]->set_sensitive($_[1]); $_[0] } sub gtkset_visibility { $_[0]->set_visibility($_[1]); $_[0] } -sub gtkset_tip { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] } +sub gtkset_tip { $_[0]->set_tooltip_text($_[1]) if $_[1]; $_[0] } sub gtkset_shadow_type { $_[0]->set_shadow_type($_[1]); $_[0] } sub gtkset_style { $_[0]->set_style($_[1]); $_[0] } sub gtkset_size_request { $_[0]->set_size_request($_[1], $_[2]); $_[0] } -- cgit v1.2.1 From 99b1943996623b48db883434aaa9f82a6650403a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 12:51:32 +0200 Subject: use Pango as binded by Gtk3 --- perl-install/standalone/harddrake2 | 1 - perl-install/ugtk3.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index c857dbb03..2de7059af 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -309,7 +309,6 @@ $tree->get_selection->signal_connect('changed' => sub { ($current_device, $current_class) = @{$data[$idx]}; if ($idx ne -1) { - use Pango; my %device_fields = map { # The U+200E character is to force LTR display, as what what follows the colon is always in LTR (device names, paths, etc), # this ensures proper displaying of names like /dev/fd0 (otherwise it gets 'dev/fd0/'). diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 192d7a6a9..99c4ce5a8 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -310,7 +310,7 @@ sub markup_to_TextView_format { foreach (@$l) { my ($_txt, $attrs) = @$_; if ($attrs) { - $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Pango; Pango->PANGO_WEIGHT_BOLD }; + $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD; $attrs->{size} eq 'larger' and do { $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger' delete $attrs->{size}; -- cgit v1.2.1 From fb21b10d95958f815a89ca295eb396fc14750a15 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 10 Feb 2013 18:23:30 +0000 Subject: (root_window) "fix" too many parameters *** Gtk3::Gdk::get_default_root_window: passed too many parameters (expected 0, got 1); ignoring excess at /usr/lib/libDrakX/mygtk3.pm line 1487. --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 50b2a491f..148239732 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1488,7 +1488,7 @@ sub may_destroy { sub root_window() { state $root; - $root ||= Gtk3::Gdk->get_default_root_window; + $root ||= Gtk3::Gdk::get_default_root_window(); } sub rgb2color { -- cgit v1.2.1 From fdc85d6816218aeaae57aae2b813fd1deb926411 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 10 Feb 2013 19:41:25 +0000 Subject: (flush) "fix" too many parameters *** Gtk3::events_pending: passed too many parameters (expected 0, got 1); ignoring excess at /usr/lib/libDrakX/mygtk3.pm line 1454. *** Gtk3::main_iteration: passed too many parameters (expected 0, got 1); ignoring excess at /usr/lib/libDrakX/mygtk3.pm line 1454. --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 148239732..a7ab62cc6 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1455,7 +1455,7 @@ sub sync { } sub flush() { - Gtk3->main_iteration while Gtk3->events_pending; + Gtk3::main_iteration() while Gtk3::events_pending(); } sub enable_sync_flush { -- cgit v1.2.1 From 0f6ae2ce39fb0ea34f546c86298ca5ef17035285 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:29:06 +0200 Subject: (text_direction_rtl) fix too many parameter --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index a7ab62cc6..6d75baec7 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1546,7 +1546,7 @@ sub import_style_ressources() { } sub text_direction_rtl() { - Gtk3::Widget->get_default_direction eq 'rtl'; + Gtk3::Widget::get_default_direction eq 'rtl'; } sub _get_weakness_icon { -- cgit v1.2.1 From 2e2521b1a4ba462898bea91fb6dfc5b9f771ce25 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Feb 2013 01:14:27 +0100 Subject: supplement blacklist --- perl-install/.perl_checker | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/.perl_checker b/perl-install/.perl_checker index 2f8eb3a6c..2a0d70d41 100644 --- a/perl-install/.perl_checker +++ b/perl-install/.perl_checker @@ -22,6 +22,7 @@ Gtk2::Gdk::Keysyms Gtk2::Helper Gtk2::Pango Gtk2::SimpleList +Gtk3 I18N::Langinfo IO::Handle IO::Select -- cgit v1.2.1 From 77a60c19faa38a8c837ce7e742d0691bb51aae97 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Feb 2013 18:48:23 +0100 Subject: Gtk3::TreeViewColumn implements the Gtk3::CellLayout interface, which provides the get_cells() method --- perl-install/interactive/gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index d7ce8f182..f5016d2a7 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -519,7 +519,7 @@ sub create_widget { if ($e->{not_edit}) { $real_w = $w = Gtk3::ComboBoxText->new; # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time: - first($w->child->get_cell_renderers)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; + first($w->child->get_cells)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width}; } else { $w = Gtk3::ComboBoxEntry->new_text; -- cgit v1.2.1 From 527a624d8825348bcd9bd2ec0005409a89230315 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 15:48:53 +0200 Subject: fix 'Too late to run INIT' with Gtk3 --- perl-install/interactive.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 34ae7a4de..9d5c6c3f3 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -112,7 +112,10 @@ sub vnew { } require_root_capability() if $su; if (check_for_xserver()) { - eval { require interactive::gtk }; + eval { + use Glib::Object::Introspection; + require interactive::gtk; + }; if (!$@) { my $o = interactive::gtk->new; if ($o_icon && $o_icon ne 'default' && !$::isWizard) { $o->{icon} = $o_icon } else { undef $o->{icon} } -- cgit v1.2.1 From 45338bd2f691b8fc61665daefd2bd30767bf742d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:20:40 +0200 Subject: (root_window_size) introduce it --- perl-install/mygtk3.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 6d75baec7..ccbd23e27 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1491,6 +1491,12 @@ sub root_window() { $root ||= Gtk3::Gdk::get_default_root_window(); } +sub root_window_size() { + state $root; + $root ||= [Gtk3::Gdk::Screen::width, Gtk3::Gdk::Screen::height]; + @$root; +} + sub rgb2color { my ($r, $g, $b) = @_; my $color = Gtk3::Gdk::Color->new($r, $g, $b); -- cgit v1.2.1 From 3af428310c36de7529b6742a305f56b57caa4d70 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:21:47 +0200 Subject: use new mygtk3::root_window_size() --- perl-install/interactive/gtk.pm | 2 +- perl-install/standalone/display_help | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index f5016d2a7..1886cfd45 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -15,7 +15,7 @@ my $forgetTime = 1000; #- in milli-seconds sub new { my $w = &interactive::new; - ($w->{windowwidth}, $w->{windowheight}) = gtkroot()->get_size if !$::isInstall; + ($w->{windowwidth}, $w->{windowheight}) = mygtk3::root_window_size() if !$::isInstall; $w; } sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) } diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help index bd857d092..b977f0532 100755 --- a/perl-install/standalone/display_help +++ b/perl-install/standalone/display_help @@ -36,7 +36,7 @@ $view->signal_connect('close-web-view', sub { ugtk3::exit(0) }); $view->open($ARGV[0]); # FIXME: merge this with mcc code into new mygtk3::set_standalone_main_window_size()? -my ($rootwin_width, $rootwin_height) = gtkroot()->get_size; +my ($rootwin_width, $rootwin_height) = mygtk3::root_window_size(); my ($default_width, $default_height); my $wm = any::running_window_manager(); my $is_firstime = to_bool($wm =~ /drakx-matchbox-window-manager/); -- cgit v1.2.1 From c55ce2a4f9967518bc736102a29afa8181815f6c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:34:06 +0200 Subject: ->child() => ->get_child() --- perl-install/interactive/gtk.pm | 8 ++++---- perl-install/mygtk3.pm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 1886cfd45..ffe3d96e4 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -49,7 +49,7 @@ sub create_boxradio { mapn { my ($txt, $w) = @_; # workaround infamous 6 years old gnome bug #101968: - $w->child->set_size_request(mygtk3::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label}; + $w->get_child->set_size_request(mygtk3::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label}; $w->signal_connect(button_press_event => $double_click) if $double_click; $w->signal_connect(key_press_event => $e->{may_go_to_next}); @@ -416,7 +416,7 @@ sub create_widget { $w = gtknew(($e->{install_button} ? 'Install_Button' : 'Button'), text => '', clicked => $e->{clicked_may_quit_cooked}); $set = sub { - my $w = $w->child; + my $w = $w->get_child; # handle Install_Buttons: if (ref($w) =~ /Gtk3::HBox/) { ($w) = find { ref($_) =~ /Gtk3::Label/ } $w->get_children; @@ -519,11 +519,11 @@ sub create_widget { if ($e->{not_edit}) { $real_w = $w = Gtk3::ComboBoxText->new; # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time: - first($w->child->get_cells)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; + first($w->get_child->get_cells)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width}; } else { $w = Gtk3::ComboBoxEntry->new_text; - ($real_w, $w) = ($w, $w->child); + ($real_w, $w) = ($w, $w->get_child); } $real_w->set_popdown_strings(@formatted_list); } else { diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index ccbd23e27..55bc12884 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -666,7 +666,7 @@ sub _gtk__ScrolledWindow { $child->set_left_margin(6) if ref($child) =~ /Gtk3::TextView/ && $child->get_left_margin <= 6; $child->show; - $w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; + $w->get_child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type}; if (ref($child) eq 'Gtk3::TextView' && delete $opts->{to_bottom}) { $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child); @@ -909,7 +909,7 @@ sub _gtk__MagicWindow { if ($previous_popped_and_reuse_window && $pop_and_reuse) { $w = $previous_popped_and_reuse_window; - $w->remove($w->child); + $w->remove($w->get_child); gtkadd($w, child => $sub_child); %$opts = (); -- cgit v1.2.1 From bfd9b7229992f38240b4bd020cb45bbf5128d396 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:41:54 +0200 Subject: get_height() => get_allocated_height() --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 99c4ce5a8..74fc1f21f 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1444,7 +1444,7 @@ sub new { mygtk3::import_style_ressources(); my $darea = gtknew('DrawingArea', widget_name => 'Banner'); $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); - my $d_height = $darea->{back_pixbuf}->get_height; + my $d_height = $darea->{back_pixbuf}->get_allocated_height; $darea->set_size_request(-1, $d_height); $darea->modify_font(Pango::FontDescription->from_string("13")); eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; -- cgit v1.2.1 From 5f1f2f2560c1c7f6a688eaccc089ca5a43d7f8e2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 16:46:21 +0200 Subject: visible() => get_visible() --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 55bc12884..75a613c16 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -891,7 +891,7 @@ sub _gtk__MagicWindow { my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { #- do not take into account the wizard banner # FIXME!!! - any { !$_->isa('Gtk3::DrawingArea') && $_->visible } $::WizardTable->get_children; + any { !$_->isa('Gtk3::DrawingArea') && $_->get_visible } $::WizardTable->get_children; }; my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; -- cgit v1.2.1 From 8477be7396561256695beb87e4cbd54f1e392bc9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 9 Oct 2013 17:19:21 +0200 Subject: Gtk3::ComboBoxEntry->new_text -> Gtk3::ComboBoxText->new_with_entry --- perl-install/interactive/gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index ffe3d96e4..5a8f00ba7 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -522,7 +522,7 @@ sub create_widget { first($w->get_child->get_cells)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize}; $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width}; } else { - $w = Gtk3::ComboBoxEntry->new_text; + $w = Gtk3::ComboBoxText->new_with_entry; ($real_w, $w) = ($w, $w->get_child); } $real_w->set_popdown_strings(@formatted_list); -- cgit v1.2.1 From 72b8c1126664f9c26c031cafa71ddca4fb112de6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 9 Oct 2013 17:38:01 +0200 Subject: (try_) display error on console --- perl-install/diskdrake/hd_gtk.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index ce6c81ffb..53c3260f3 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -132,6 +132,7 @@ sub try_ { my $dm_active_before = ($current_entry && $current_entry->{dm_active} && $current_entry->{dm_name}); my $v = eval { $f->($in, @args, $all_hds) }; if (my $err = $@) { + warn $err, "\n", backtrace() if $in->isa('interactive::gtk'); $in->ask_warn(N("Error"), formatError($err)); } my $refresh = 0; -- cgit v1.2.1 From 465e8f2473783697a8b0ea890ab4251a36ca6f92 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 30 Aug 2013 17:37:54 +0200 Subject: fix setting locale with Gtk3 --- perl-install/any.pm | 2 +- perl-install/install/gtk.pm | 2 +- perl-install/install/steps_gtk.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index a19b1c057..ea96ed8c6 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1201,7 +1201,7 @@ sub selectLanguage_standalone { ]); $locale->{utf8} = !$non_utf8; lang::set($locale); - Gtk3->set_locale if $in->isa('interactive::gtk'); + c::init_setlocale() if $in->isa('interactive::gtk'); lang::lang_changed($locale) if $old_lang ne $locale->{lang}; } diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index a60d6d678..ee0899b2e 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -202,7 +202,7 @@ q( } Gtk3->init; - Gtk3->set_locale; + c::init_setlocale(); } #------------------------------------------------------------------------------ diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 928c29336..c55324f84 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -180,7 +180,7 @@ sub leavingStep { sub charsetChanged { my ($o) = @_; - Gtk3->set_locale; + c::init_setlocale(); install::gtk::load_font($o); install::gtk::create_steps_window($o); } -- cgit v1.2.1 From db33f2f905bd8778c0a92015dba536854167fff7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 1 Sep 2013 03:37:16 +0200 Subject: do not attempt to install package in testing mode --- perl-install/standalone/logdrake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 2c98de368..94315750a 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -44,7 +44,9 @@ foreach (@ARGV) { /^--alert$/ and do { alert_config(); quit() }; } -do_pkgs_standalone->new($in)->ensure_is_installed("syslog-daemon", "/etc/systemd/system/syslog.service") or exit(0); +if (!$::testing) { + do_pkgs_standalone->new($in)->ensure_is_installed("syslog-daemon", "/etc/systemd/system/syslog.service") or exit(0); +} my $isTail = $isFile; $| = 1 if $isTail; -- cgit v1.2.1 From 452a6077f9356526be17355e008362fbf46309f8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 1 Sep 2013 03:45:11 +0200 Subject: (gtkradio) workaround gtk+ issue else we got: "object 36b6540 is not really a GObject at (...)/Glib/Object/Introspection.pm line 61." See also bgo#679563 --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 74fc1f21f..07c0ee725 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -146,7 +146,7 @@ sub gtkradio { my $def = shift; my $radio; map { - my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def); + my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label_from_widget($radio, $_), $_ eq $def); $w->get_child->set_line_wrap(1); $w; } @_; -- cgit v1.2.1 From 6996f879c683210337d0fbcdc5c0e24ef9ef0055 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 1 Sep 2013 04:04:30 +0200 Subject: (new_with_strings) guard against too early calls by gtk+ --- perl-install/ugtk3.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 07c0ee725..6480330e7 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1361,6 +1361,8 @@ use MDK::Common; # try to get combox <==> option menu mapping sub set_popdown_strings { my ($w, @strs) = @_; + my $model = $w->get_model; + return if !$model; $w->get_model->clear; # keep string list around for ->set_text compatibilty helper $w->{strings} = \@strs; -- cgit v1.2.1 From c6b68a4baeb51c14d5f6825e396b1ede42c941ae Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 13:35:56 +0200 Subject: ->modify_font() => ->override_font() the former is deprecated in gtk+3 --- perl-install/mygtk3.pm | 2 +- perl-install/ugtk3.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 75a613c16..5934f32cf 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -417,7 +417,7 @@ sub _gtk__Label { $w->set_justify(delete $opts->{justify}) if exists $opts->{justify}; $w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap}; $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; - $w->modify_font(Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; + $w->override_font(Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font}; } if (my $text_ref = delete $opts->{text_ref}) { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 6480330e7..1c12c0965 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -8,7 +8,7 @@ use locale; @ISA = qw(Exporter); %EXPORT_TAGS = ( wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy - gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_ + gtkentry gtkflush gtkhide gtkoverride_font gtkmove gtkpack gtkpack2 gtkpack2_ gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name @@ -658,9 +658,9 @@ sub gtkfontinfo { %fontinfo; } -sub gtkmodify_font { +sub gtkoverride_font { my ($w, $arg) = @_; - $w->modify_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg)); + $w->override_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg)); $w; } -- cgit v1.2.1 From 4ac802ad9ae7e24d1e32f1c5b55f5bbb66edbc8c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Sep 2013 12:46:46 +0200 Subject: do not show popup in testing mode --- perl-install/diskdrake/hd_gtk.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 53c3260f3..de8b1d752 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -113,9 +113,11 @@ sub main { $notebook_widget->signal_connect(realize => $update_all); $w->sync; $done_button->grab_focus; - $in->ask_from_list_(N("Read carefully"), N("Please make a backup of your data first"), - [ N_("Exit"), N_("Continue") ], N_("Continue")) eq N_("Continue") or return - if $::isStandalone; + if (!$::testing) { + $in->ask_from_list_(N("Read carefully"), N("Please make a backup of your data first"), + [ N_("Exit"), N_("Continue") ], N_("Continue")) eq N_("Continue") or return + if $::isStandalone; + } undef $initializing; $w->main; -- cgit v1.2.1 From 807df2a2b558461a2890f9bec0050f0bd974c92e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Sep 2013 12:51:09 +0200 Subject: fix computing width without Gdk::Window --- perl-install/diskdrake/hd_gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index de8b1d752..fa52a3e57 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -318,7 +318,7 @@ sub create_automatic_notebooks { sub create_buttons4partitions { my ($kind, $totalsectors, @parts) = @_; - $width = first($w->{window}->get_window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->get_window; + $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 25 if $w->{window}->get_window; my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; while (1) { -- cgit v1.2.1 From 1d4957dddcbf98c3a985186b8b61be2b3f004b3c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 10:40:59 +0200 Subject: switch from old RC to CSS for diskdrake colors were converted with bc: obase=16 *255 --- perl-install/diskdrake/hd_gtk.pm | 10 ++++--- perl-install/share/diskdrake.css | 63 ++++++++++++++++++++++++++++++++++++++ perl-install/share/diskdrake.rc | 65 ---------------------------------------- 3 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 perl-install/share/diskdrake.css delete mode 100644 perl-install/share/diskdrake.rc diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index fa52a3e57..80334ddab 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -45,10 +45,12 @@ notebook current_kind[] =cut sub load_theme() { - my $rc = "/usr/share/libDrakX/diskdrake.rc"; - -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc"; - -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc"; - Gtk3::Rc->parse($rc); + my $css = "/usr/share/libDrakX/diskdrake.css"; + -r $css or $css = dirname(__FILE__) . "/../diskdrake.css"; + -r $css or $css = dirname(__FILE__) . "/../share/diskdrake.css"; + my $pl = Gtk3::CssProvider->new; + $pl->load_from_path($css); + my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); } sub main { diff --git a/perl-install/share/diskdrake.css b/perl-install/share/diskdrake.css new file mode 100644 index 000000000..02e040157 --- /dev/null +++ b/perl-install/share/diskdrake.css @@ -0,0 +1,63 @@ +/* FIXME: to be inherited by all other styles */ +#PART* { + /* FIXME: replace by appropriate font: + fontset = "-*-*-medium-r-normal-*-8-*-*-*-*-*-iso8859-1,*-r-*" + => font: "8" */ + padding: 1; +} + +#PART_ext2, #PART_ext3, #PART_ext4 { + background-color: #ff0000; +} +#PART_ext2:hover:hover, #PART_ext3:hover, #PART_ext4:hover { + background-color: #e60000; +} +#PART_ext2:active:active, #PART_ext3:active, #PART_ext4:active { + background-color: #e60000; +} + +#PART_xfs { + background-color: #ff9900; +} +#PART_xfs:hover { + background-color: #e66600; +} +#PART_xfs:active { + background-color: #e69900; +} + +#PART_swap { + background-color: #66cc00; + color: #000000; +} +#PART_swap:active, #PART_swap:hover { + background-color: #66b700; +} + +#PART_vfat, #PART_ntfs, #PART_ntfs-3g { + background-color: #00b7ff; +} +#PART_vfat:hover, #PART_ntfs:hover, #PART_ntfs-3g:hover { + background-color: #0099e6; +} +#PART_vfat:active, #PART_ntfs:active, #PART_ntfs-3g:active { + background-color: #0099e6; +} + +#PART_empty { + background-color: #ffffff; + color: #000000; +} +#PART_empty:hover, #PART_empty:active { + background-color: #e6e6e6; +} + +#PART_other { + background-color: #929eab; + color: #000000; +} + +#PART_new { + background-color: #1f429c; + color: #ffffff; +} diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc deleted file mode 100644 index c519fecf0..000000000 --- a/perl-install/share/diskdrake.rc +++ /dev/null @@ -1,65 +0,0 @@ -gtk-button-images=1 -style "font" -{ - fontset = "-*-*-medium-r-normal-*-8-*-*-*-*-*-iso8859-1,*-r-*" - xthickness = 1 - ythickness = 1 -} - -style "red" = "font" -{ - bg[NORMAL] = { 1.0, 0, 0 } - bg[ACTIVE] = { 0.9, 0, 0 } - bg[PRELIGHT] = { 0.9, 0, 0 } -} -style "orange" = "font" -{ - bg[NORMAL] = { 1.0, 0.6, 0 } - bg[ACTIVE] = { 0.9, 0.6, 0 } - bg[PRELIGHT] = { 0.9, 0.4, 0 } -} -style "green" = "font" -{ - bg[NORMAL] = { 0.4, 0.8, 0 } - bg[ACTIVE] = { 0.4, 0.7, 0 } - bg[PRELIGHT] = { 0.4, 0.7, 0 } - fg[NORMAL] = { 0, 0, 0 } -} -style "blue" = "font" -{ - bg[NORMAL] = { 0, 0.7, 1.0 } - bg[ACTIVE] = { 0, 0.6, 0.9 } - bg[PRELIGHT] = { 0, 0.6, 0.9 } -} -style "white" = "font" -{ - bg[NORMAL] = { 1.0, 1.0, 1.0 } - bg[ACTIVE] = { 0.9, 0.9, 0.9 } - bg[PRELIGHT] = { 0.9, 0.9, 0.9 } - fg[NORMAL] = { 0, 0, 0 } -} -style "gray" = "font" -{ - bg[NORMAL] = { 0.57, 0.62, 0.67 } - bg[ACTIVE] = { 0.57, 0.62, 0.57 } - bg[PRELIGHT] = { 0.57, 0.62, 0.57 } - fg[NORMAL] = { 0, 0, 0 } -} -style "darkblue" = "font" -{ - bg[NORMAL] = { 0.12, 0.26, 0.61 } - bg[ACTIVE] = { 0.12, 0.26, 0.61 } - bg[PRELIGHT] = { 0.12, 0.26, 0.61 } - fg[NORMAL] = { 1, 1, 1 } -} - -widget "*PART_ext2" style "red" -widget "*PART_ext3" style "red" -widget "*PART_ext4" style "red" -widget "*PART_xfs" style "orange" -widget "*PART_swap" style "green" -widget "*PART_vfat" style "blue" -widget "*PART_ntfs*" style "blue" -widget "*PART_empty" style "white" -widget "*PART_other" style "gray" -widget "*PART_new" style "darkblue" -- cgit v1.2.1 From e1ecdac525d20120a4e67fa6ee5b6d0362922f45 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 11 Sep 2013 09:03:50 +0200 Subject: add support for Gtk3::Overlay --- perl-install/mygtk3.pm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 5934f32cf..ff0516529 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -796,6 +796,27 @@ sub _gtk__Fixed { $w; } +sub _gtk__Overlay { + my ($w, $opts, $_class, $_action) = @_; + + if (!$w) { + $w = Gtk3::Overlay->new; + _gtknew_handle_overlay_children($w, $opts); + } + $w; +} + +sub _gtknew_handle_overlay_children { + my ($w, $opts) = @_; + $w->add(delete $opts->{main_child}) if $opts->{main_child}; + $opts->{children} ||= []; + foreach (@{$opts->{children}}) { + $w->add_overlay($_); + } + delete $opts->{children}; +} + + sub _gtk__Layout { my ($w, $opts, $_class, $_action) = @_; -- cgit v1.2.1 From 7bebddbde7bc6aeef0cbacc46df5bd3a4162160a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Aug 2012 18:46:33 +0200 Subject: (import_style_ressources) convert Galaxy theme to CSS (styling has totally changed in gtk+3) --- perl-install/mygtk3.pm | 4 +++- perl-install/share/themes-galaxy.css | 33 +++++++++++++++++++++++++++++ perl-install/share/themes-galaxy.rc | 40 ------------------------------------ 3 files changed, 36 insertions(+), 41 deletions(-) create mode 100644 perl-install/share/themes-galaxy.css delete mode 100644 perl-install/share/themes-galaxy.rc diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index ff0516529..318555786 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1568,7 +1568,9 @@ sub pixmap_from_pixbuf { sub import_style_ressources() { if (!$::isInstall) { - Gtk3::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG + my $pl = Gtk3::CssProvider->new; + $pl->load_from_path('/usr/share/libDrakX/themes-galaxy.css'); # FIXME DEBUG + my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); } } diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css new file mode 100644 index 000000000..45c22d14a --- /dev/null +++ b/perl-install/share/themes-galaxy.css @@ -0,0 +1,33 @@ +/*gtk-button-images=0*/ + +/* + * bg[state] = color Sets the color used for the background of most widgets. + * fg[state] = color Sets the color used for the foreground of most widgets. + * base[state] = color Sets the color used for the background of widgets displaying editable text. This color is used for the background of, among others, GtkText, GtkEntry, GtkList, and GtkCList. + * text[state] = color Sets the color used for foreground of widgets using base for the background color. + */ + + +#Logo, #Steps { + /* base[NORMAL] = { 0.28, 0.38, 0.66 }; */ + background-color: #548EE6; + + color: #FFFFFF; +} + +#Step-categories { + color: #32A9DD; +} + +#Banner { + color: #5A8AD6; +} + +#background { + background: #FFFFFF; +} + +#Left_background { + background-color: #2859B5; + color: #FFD200; +} diff --git a/perl-install/share/themes-galaxy.rc b/perl-install/share/themes-galaxy.rc deleted file mode 100644 index b0e4f4b5b..000000000 --- a/perl-install/share/themes-galaxy.rc +++ /dev/null @@ -1,40 +0,0 @@ -gtk-button-images=0 - -style "white-on-blue" -{ - base[NORMAL] = { 0.28, 0.38, 0.66 } - bg[NORMAL] = "#548EE6" - - text[NORMAL] = "#FFFFFF" - fg[NORMAL] = "#FFFFFF" -} - -style "step-categories" -{ - fg[NORMAL] = "#32A9DD" -} -style "banner" -{ - fg[NORMAL] = "#5A8AD6" - fg[ACTIVE] = "#5A8AD6" - fg[PRELIGHT] = "#5A8AD6" -} - -style "background" -{ - bg[NORMAL] = "#FFFFFF" -} - -style "Left_background" -{ - bg[NORMAL] = "#2859B5" - base[NORMAL] = "#2859B5" - fg[NORMAL] = "#FFD200" -} - -widget "*Steps*" style "white-on-blue" -widget "*Step-categories*" style "step-categories" -widget "*Left_background*" style "Left_background" -widget "*logo*" style "white-on-blue" -widget "*background*" style "background" -widget "*Banner*" style "banner" -- cgit v1.2.1 From dd189f07e45b5d9a9bfac188a046eb7394db6d84 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 11 Oct 2013 14:36:32 +0200 Subject: copy new CSS files --- perl-install/Makefile.drakxtools | 2 +- perl-install/install/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 54f43e4cb..c0aef55b6 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -55,7 +55,7 @@ install: install -m 644 *.pm $(LIBDEST) for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done install -m 644 pixmaps/*.* $(PIXDIR) - install -m 644 share/*.rc $(DATADIR)/$(NAME) + install -m 644 share/*.css $(DATADIR)/$(NAME) install -d $(PREFIX)/etc/security echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile index fe04d2f57..7f72576ca 100644 --- a/perl-install/install/Makefile +++ b/perl-install/install/Makefile @@ -44,7 +44,7 @@ install_pms: perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(back|begin|head|item)/ .. /^=cut/) || /use (diagnostics|strict|vars|warnings)/' $$i > $(DESTREP4PMS)/$$i; \ done - cp ../share/*.rc share/*.rc $(DESTREP4PMS) + cp ../share/*.css $(DESTREP4PMS) chmod a+x $(DESTREP4PMS)/install/install2 chmod a+x $(DESTREP4PMS)/install/commands -- cgit v1.2.1 From 6864e4fc1bac9084c26ba4d502350c128c10ef6f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 10 Oct 2013 12:46:07 +0200 Subject: (wait_messageW) prevent calling set_title() w/o a title --- perl-install/interactive/gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 5a8f00ba7..b54813bb0 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -921,7 +921,7 @@ sub wait_messageW { Glib::Source->remove($reuse_timeout) if $reuse_timeout; $reuse_timeout = ''; my $Window = gtknew('MagicWindow', - title => $title, + if_($title, title => $title), pop_it => defined $o->{pop_wait_messages} ? $o->{pop_wait_messages} : 1, pop_and_reuse => $::isInstall, modal => 1, -- cgit v1.2.1 From 491a53dfac510cfeac29bdd2cf8743592e465a9b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 10 Oct 2013 12:49:57 +0200 Subject: 'draw' replaces 'expose_event' --- perl-install/interactive/gtk.pm | 4 ++-- perl-install/mygtk3.pm | 6 +++--- perl-install/standalone/drakclock | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index b54813bb0..357843f21 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -939,7 +939,7 @@ sub wait_messageW { } sub wait_message_nextW { my ($_o, $message, $Window) = @_; - return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no expose_event :( + return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no draw :( $Window->{displayed} = 0; $Window->{wait_messageW}->set($message); mygtk3::sync($Window) while !$Window->{displayed}; @@ -962,7 +962,7 @@ sub wait_message_with_progress_bar { my $progress = gtknew('ProgressBar'); my $w = $in->wait_message($o_title, $progress); my $displayed; - $progress->signal_connect(expose_event => sub { $displayed = 1; 0 }); + $progress->signal_connect(draw => sub { $displayed = 1; 0 }); $w, sub { my ($msg, $current, $total) = @_; if ($msg) { diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 318555786..b9a8eaefd 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -116,7 +116,7 @@ sub _gtk { $w->grab_focus if delete $opts->{grab_focus}; $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding}; $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive}; - $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event}; + $w->signal_connect(draw => delete $opts->{draw}) if exists $opts->{draw}; $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize}; (delete $opts->{size_group})->add_widget($w) if $opts->{size_group}; if (my $tip = delete $opts->{tip}) { @@ -342,7 +342,7 @@ sub _gtk__Image { my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); $w->set_size_request($width, $height); $w->{pixbuf} = $pixbuf; - $w->signal_connect(expose_event => sub { + $w->signal_connect(draw => sub { my (undef, $event) = @_; if (!$w->{x}) { my $alloc = $w->get_allocation; @@ -1481,7 +1481,7 @@ sub flush() { sub enable_sync_flush { my ($w) = @_; - $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); + $w->signal_connect(draw => sub { $w->{displayed} = 1; 0 }); } sub sync_flush { diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 369cdd5d9..6965d6b91 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -191,7 +191,7 @@ if (-e $ntpfile && is_ntp_daemon_running()) { my $pressed; $drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); -$drawing_area->signal_connect(expose_event => \&expose_event); +$drawing_area->signal_connect(draw => \&draw); $drawing_area->signal_connect(realize => sub { my $window = $drawing_area->get_window; $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth); @@ -313,7 +313,7 @@ sub determine_radian { $r; } -sub expose_event { +sub draw { my ($widget, $event) = @_; my ($x, $y, $width, $height) = $event->area->values; $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); -- cgit v1.2.1 From a073af0416c371a1060bafc4bb66ab89cedf5c74 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 10 Oct 2013 13:07:14 +0200 Subject: drop "Image_using_pixbuf", Cairo does a better job --- perl-install/mygtk3.pm | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index b9a8eaefd..8b29c1211 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -319,8 +319,6 @@ sub _gtk__Pixbuf { # Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays sub _gtk__Image_using_pixmap { &_gtk__Image } -# Image_using_pixbuf is rendered using DITHER_MAX & transparency which is much better on 16bpp displays -sub _gtk__Image_using_pixbuf { &_gtk__Image } sub _gtk__Image { my ($w, $opts, $class) = @_; @@ -336,31 +334,6 @@ sub _gtk__Image { my ($w, $file) = @_; my $pixmap = mygtk3::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); $w->set_from_pixmap($pixmap, undef); - } : $class =~ /using_pixbuf/ ? sub { - my ($w, $file) = @_; - my $pixbuf = _pixbuf_render_alpha(gtknew('Pixbuf', file => $file, %{$w->{options}}), 255); - my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - $w->set_size_request($width, $height); - $w->{pixbuf} = $pixbuf; - $w->signal_connect(draw => sub { - my (undef, $event) = @_; - if (!$w->{x}) { - my $alloc = $w->get_allocation; - $w->{x} = $alloc->x; - $w->{y} = $alloc->y; - } - # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: - if ($::isInstall) { - $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'), - 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); - return; - } - foreach my $rect ($event->region->get_rectangles) { - my @values = $rect->values; - $pixbuf->render_to_drawable($w->get_window, $w->style->fg_gc('normal'), - @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); - } - }); } : sub { my ($w, $file, $o_size) = @_; my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}}); @@ -731,7 +704,7 @@ sub _gtk__MDV_Notebook { my $is_flip_needed = text_direction_rtl(); my $filler = gtknew('Image', file => 'left-background-filler.png'); my $filler_height = $filler->get_pixbuf->get_height; - my $left_background = gtknew('Image_using_pixbuf', file => 'left-background.png'); + my $left_background = gtknew('Image', file => 'left-background.png'); my $lf_height = $left_background->{pixbuf}->get_height; my @right_background = $::isInstall ? gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) @@ -764,7 +737,7 @@ sub _gtk__MDV_Notebook { [ $selection_arrow = gtknew('Image', file => 'steps_on', flip => $is_flip_needed), $arrow_x, 0, ], ]), 1, delete $opts->{right_child} || - gtknew('Image_using_pixbuf', file => "right-white-background_right_part$suffix", flip => $is_flip_needed), + gtknew('Image', file => "right-white-background_right_part$suffix", flip => $is_flip_needed), ]); $w->signal_connect('size-allocate' => sub { -- cgit v1.2.1 From bc357e50bf8e0a68f2878ef8d5fce82a903d9cd6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 6 Oct 2013 00:12:26 +0200 Subject: better test for the banner widget make this test work whatever is used to implement our banners --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 8b29c1211..e5b2e486b 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -885,7 +885,7 @@ sub _gtk__MagicWindow { my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do { #- do not take into account the wizard banner # FIXME!!! - any { !$_->isa('Gtk3::DrawingArea') && $_->get_visible } $::WizardTable->get_children; + any { $_->get_name ne 'Banner' && $_->get_visible } $::WizardTable->get_children; }; my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it; -- cgit v1.2.1 From 35f9c81c361e8f1856a457d087d26670878c2c6e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 14:26:40 +0100 Subject: adapt to new Pango binding --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 1c12c0965..6b3c6a1e0 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -349,7 +349,7 @@ sub create_box_with_title { my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); $scroll->signal_connect(realize => sub { my $layout = $wtext->create_pango_layout($text); - $layout->set_width(($width - 10) * Pango->scale); + $layout->set_width(($width - 10) * Pango::SCALE); $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $o->{rwindow}->queue_resize; -- cgit v1.2.1 From 04a9d2b3139a6709aee4b9bc2debf047308a408c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 14:26:59 +0100 Subject: we no longuer have access to PANGO_SCALE_* with introspection --- perl-install/standalone/harddrake2 | 2 +- perl-install/ugtk3.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 2de7059af..6bb33dc25 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -568,7 +568,7 @@ sub lookup_field { sub titleFormat { my ($title) = @_; - [ $title . "\n", { 'weight' => Pango->PANGO_WEIGHT_BOLD, scale => Pango->PANGO_SCALE_LARGE } ]; + [ $title . "\n", { 'weight' => Pango->PANGO_WEIGHT_BOLD, scale => 1.4399999999999 } ]; # Pango->PANGO_SCALE_LARGE } sub force_rename_field { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 6b3c6a1e0..4be3b3c15 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -312,7 +312,7 @@ sub markup_to_TextView_format { if ($attrs) { $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD; $attrs->{size} eq 'larger' and do { - $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger' + $attrs->{scale} = 1.4399999999999; # PANGO_SCALE_X_LARGE: equivalent to Label's size => 'larger' delete $attrs->{size}; }; } -- cgit v1.2.1 From 53e3518613d628d347ddd8e0b7fc2094458a9864 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 14:49:42 +0100 Subject: use the proper Pango API instead of using Pango::SCALE directly --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 4be3b3c15..f442445e6 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -349,7 +349,7 @@ sub create_box_with_title { my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200); $scroll->signal_connect(realize => sub { my $layout = $wtext->create_pango_layout($text); - $layout->set_width(($width - 10) * Pango::SCALE); + $layout->set_width(Pango::units_from_double($width - 10)); $wtext->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10)); $o->{rwindow}->queue_resize; -- cgit v1.2.1 From bfeb73548c5dbbc05bc2f0cc0621104921b6b094 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 12:57:13 +0200 Subject: we no longuer have access to PANGO_PIXELS() with introspection => let's use the proper API instead we could alternatively have divide by Pango::SCALE, but this is cleaner --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index f442445e6..9499e8c56 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -653,7 +653,7 @@ sub gtkfontinfo { foreach (qw(ascent descent approximate_char_width approximate_digit_width)) { no strict; my $func = "get_$_"; - $fontinfo{$_} = Pango->pixels($metrics->$func); + $fontinfo{$_} = Pango::units_to_double($metrics->$func); } %fontinfo; } -- cgit v1.2.1 From 7452efe684fbb35d5d3095c9c2b384fbaca9944f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 1 Nov 2013 00:38:01 +0100 Subject: drop Jazz option (dead for years) --- perl-install/standalone/harddrake2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 6bb33dc25..03c86c759 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -184,7 +184,6 @@ my %menus = ( my %menu_options = ( 'MODEMS_DETECTION' => [ $menus{options}, N("/Autodetect _modems") ], - 'JAZZ_DETECTION' => [ $menus{options}, N("/Autodetect _jaz drives") ], 'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ], ); @@ -199,8 +198,6 @@ my @menu_items = [ N("/_File") . N("/_Quit"), N("Q"), \&quit_global, undef, '' ], [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, sub { $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->get_active }, undef, '' ], - [ join('', @{$menu_options{JAZZ_DETECTION}}), undef, - sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '' ], [ join('', @{$menu_options{PARALLEL_ZIP_DETECTION}}), undef, sub { $options{PARALLEL_ZIP_DETECTION} = $check_boxes{PARALLEL_ZIP_DETECTION}->get_active }, undef, '' ], [ $menus{help}, undef, undef, undef, '' ], @@ -387,7 +384,6 @@ foreach my $hw_class (@harddrake::data::tree) { my ($Ident, $title, $icon, $configurator, $detector) = @$hw_class{qw(class string icon configurator detector)}; next if ref($detector) ne "CODE"; #skip class witouth detector next if $Ident =~ /MODEM/ && $::testing; - next if $Ident =~ /JAZZ/ && !$options{JAZZ_DETECTION}; $detect_devices::detect_serial_modem = 0 if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; my @devices = $detector->(\%options); -- cgit v1.2.1 From 928857551788a8c9ea698cb09c3d50010e8a5c02 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 1 Nov 2013 00:47:46 +0100 Subject: split menu closures as real functions (needed for next commit) --- perl-install/standalone/harddrake2 | 95 ++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 03c86c759..ac10bc3a1 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -196,52 +196,18 @@ my @menu_items = ( [ N("/_File"), undef, undef, undef, '' ], [ N("/_File") . N("/_Quit"), N("Q"), \&quit_global, undef, '' ], - [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, - sub { $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->get_active }, undef, '' ], - [ join('', @{$menu_options{PARALLEL_ZIP_DETECTION}}), undef, - sub { $options{PARALLEL_ZIP_DETECTION} = $check_boxes{PARALLEL_ZIP_DETECTION}->get_active }, undef, '' ], + [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, \&handle_modem_option, undef, '' ], + [ join('', @{$menu_options{PARALLEL_ZIP_DETECTION}}), undef, \&handle_zip_option, undef, '' ], [ $menus{help}, undef, undef, undef, '' ], if_(-x "/usr/sbin/drakhelp_inst", - [ $menus{help} . N("/_Help"), undef, sub { run_program::raw({ detach => 1 }, 'drakhelp', '--id', 'harddrake') }, undef, '' ], + [ $menus{help} . N("/_Help"), undef, \&run_help, undef, '' ], ), - [ $menus{help} . N("/_Fields description"), undef, sub { - if ($current_device) { - create_dialog(N("Harddrake help"), - '' . N("Description of the fields:\n\n") . '' - . join("\n\n", map { - my $info = lookup_field($_); - if_($info->[0], formatAlaTeX(qq($info->[0]: $info->[1]))); - } sort keys %$current_device), - { use_markup => 1, transient => $w->{real_window}, height => 400, scroll => 1 }); - - } else { - create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { transient => $w->{real_window} }); - } - }, - undef, '' + [ $menus{help} . N("/_Fields description"), undef, \&fields_help, undef, '' ], if_(!-e "/etc/sysconfig/oem", - [ $menus{help} . N("/_Report Bug"), undef, sub { run_program::raw({ detach => 1 }, 'drakbug', '--report', 'harddrake') }, undef, '' ], + [ $menus{help} . N("/_Report Bug"), undef, \&run_drakbug, undef, '' ], ), - [ $menus{help} . N("/_About..."), undef, sub { - my $license = formatAlaTeX(translate($::license)); - $license =~ s/\n/\n\n/sg; # nicer formatting - my $w = gtknew('AboutDialog', name => N("Harddrake"), - version => mageia_release_info()->{version}, - copyright => N("Copyright (C) %s by %s", '2001-2008', 'Mandriva') . "\n" . N("Copyright (C) %s by %s", '2011', N("Mageia")), - license => $license, wrap_license => 1, - comments => N("This is HardDrake, a %s hardware configuration tool.", $distro_name), - website => 'http://www.mageia.org', - website_label => N("Mageia"), - authors => 'Thierry Vignaud ', - translator_credits => - #-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") - N("_: Translator(s) name(s) & email(s)\n"), - transient_for => $::main_window, modal => 1, position_policy => 'center-on-parent', - ); - $w->show_all; - $w->run; - }, undef, '' + [ $menus{help} . N("/_About..."), undef, \&about, undef, '' ] ); @@ -539,6 +505,39 @@ fill_default_text($text); $w->main; +sub about() { + my $license = formatAlaTeX(translate($::license)); + $license =~ s/\n/\n\n/sg; # nicer formatting + my $w = gtknew('AboutDialog', name => N("Harddrake"), + version => mageia_release_info()->{version}, + copyright => N("Copyright (C) %s by %s", '2001-2008', 'Mandriva') . "\n" . N("Copyright (C) %s by %s", '2011', N("Mageia")), + license => $license, wrap_license => 1, + comments => N("This is HardDrake, a %s hardware configuration tool.", $distro_name), + website => 'http://www.mageia.org', + website_label => N("Mageia"), + authors => 'Thierry Vignaud ', + translator_credits => + #-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") + N("_: Translator(s) name(s) & email(s)\n"), + transient_for => $::main_window, modal => 1, position_policy => 'center-on-parent', + ); + $w->show_all; + $w->run; +} + +sub fields_help() { + if ($current_device) { + create_dialog(N("Harddrake help"), + '' . N("Description of the fields:\n\n") . '' + . join("\n\n", map { + my $info = lookup_field($_); + if_($info->[0], formatAlaTeX(qq($info->[0]: $info->[1]))); + } sort keys %$current_device), + { use_markup => 1, transient => $w->{real_window}, height => 400, scroll => 1 }); + } else { + create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { transient => $w->{real_window} }); + } +} sub quit_global() { kill(15, $pid) if $pid; @@ -546,6 +545,22 @@ sub quit_global() { ugtk3->exit(0); } +sub run_drakbug() { + run_program::raw({ detach => 1 }, 'drakbug', '--report', 'harddrake'); +} + +sub run_help() { + run_program::raw({ detach => 1 }, 'drakhelp', '--id', 'harddrake'); +} + +sub handle_modem_option() { + $options{MODEMS_DETECTION} = $check_boxes{MODEMS_DETECTION}->get_active; +} + +sub handle_zip_option() { + $options{PARALLEL_ZIP_DETECTION} = $check_boxes{PARALLEL_ZIP_DETECTION}->get_active; +} + sub show_hide { my ($bool, $button) = @_; if ($bool) { $button->show } else { $button->hide } -- cgit v1.2.1 From 53dba361fafaae5dbc07c0409cd7160f6f621f01 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 3 Nov 2013 15:03:39 +0100 Subject: add basic support for ActionGroup & UIManager widgets --- perl-install/mygtk3.pm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index e5b2e486b..1e78a7baa 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -539,6 +539,34 @@ sub _gtk__WeaknessCheckEntry { $w; } +sub _gtk__ActionGroup { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk3::ActionGroup->new(delete $opts->{name}); + if ($opts->{actions}) { + $w->add_actions(delete $opts->{actions}, undef); + $w->add_toggle_actions(delete $opts->{toggle_actions}, undef) if $opts->{toggle_actions}; + } + } + $w; +} + +sub _gtk__UIManager { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk3::UIManager->new; + if ($opts->{actions}) { + $w->insert_action_group(gtknew('ActionGroup', name => 'Actions', + map { exists $opts->{$_} ? ($_ => delete $opts->{$_}) : () } qw(actions toggle_actions)), + 0); + } + $w->add_ui_from_string(delete $opts->{string}) if exists $opts->{string}; + } + $w; +} + sub _gtk__TextView { my ($w, $opts, $_class, $action) = @_; -- cgit v1.2.1 From 453c92141b25585059d7d8d7925dbe880ab26c30 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 3 Nov 2013 15:03:46 +0100 Subject: add basic support for Builder widget --- perl-install/mygtk3.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 1e78a7baa..6fcc192de 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -552,6 +552,18 @@ sub _gtk__ActionGroup { $w; } +sub _gtk__Builder { + my ($w, $opts, $_class, $action) = @_; + + if (!$w) { + $w = Gtk3::Builder->new; + $w->add_from_file(delete $opts->{file}) if exists $opts->{file}; + $w->add_from_string(delete $opts->{string}) if exists $opts->{string}; + $w->connect_signals(undef); + } + $w; +} + sub _gtk__UIManager { my ($w, $opts, $_class, $action) = @_; -- cgit v1.2.1 From 71934d61b0508dc9abd16a29f8820d9aa317149d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 16:59:55 +0100 Subject: (init_sizes) fix retrieving screen size with Gtk3 --- perl-install/install/gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index ee0899b2e..ba16a56e1 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -208,7 +208,7 @@ q( #------------------------------------------------------------------------------ sub init_sizes { my ($o) = @_; - ($::rootwidth, $::rootheight) = (Gtk3::Gdk->screen_width, Gtk3::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); -- cgit v1.2.1 From 855389b387cb938db3ac1965027eacef37c36ef5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 17:08:25 +0100 Subject: (load_rc) rename as 'load_css' and load CSS theme file doc option is know to be broken for now --- perl-install/install/gtk.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index ba16a56e1..0e1951b8b 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -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) { - Gtk3::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); + my $pl = Gtk3::CssProvider->new; + $pl->load_from_data($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); + my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); } } @@ -94,7 +97,7 @@ 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'); -- cgit v1.2.1 From d4084cb37b76895097217b506812dc61261b3d92 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 17:15:22 +0100 Subject: add a FIXME note --- perl-install/install/gtk.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 0e1951b8b..943b42bdc 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -80,6 +80,7 @@ sub load_font { my $font = lang::l2pango_font($o->{locale}{lang}); my $s = qq(gtk-font-name = $font); Gtk3::Rc->parse_string($s); + # 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 -- cgit v1.2.1 From 163c56d3ed7ca7eedd58e5da313740e4ae1afd93 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 17:51:29 +0100 Subject: fix setting font with Gtk3 --- perl-install/install/gtk.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index 943b42bdc..d44214913 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -79,7 +79,9 @@ sub load_font { my $font = lang::l2pango_font($o->{locale}{lang}); my $s = qq(gtk-font-name = $font); - Gtk3::Rc->parse_string($s); + my $pl = Gtk3::CssProvider->new; + $pl->load_from_data("GtkWindow { font: $font }"); + my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); # FIXME: this should be done in /mnt too for forked app such as gurpmi{,.addmedia} (mga#67): mkdir_p("/.config/gtk-3.0"); output("/.config/gtk-3.0/settings.ini", qq([Settings] -- cgit v1.2.1 From 5bbec3f3d0ed92818c34af72b3544bcef1be8cff Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:15:22 +0100 Subject: fix computing parent_window/root_window height --- perl-install/mygtk3.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 6fcc192de..ac7c09f78 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -736,8 +736,14 @@ sub _gtk__MDV_Notebook { import_style_ressources(); my ($layout, $selection_arrow, $selection_bar); - my $parent_window = delete $opts->{parent_window} || root_window(); - my $root_height = first($parent_window->get_size); + my @size; + if ($opts->{parent_window}) { + my $pw = delete $opts->{parent_window}; + @size = $pw->get_allocated_width; + } else { + @size = root_window_size(); + } + my $root_height = first(@size); my $suffix = $root_height == 800 && !$::isStandalone ? '_600' : '_768'; # the white square is a little bit above the actual left sidepanel: my $offset = 20; -- cgit v1.2.1 From 475038ae4cc909d7eb3406c45763ebddf532ff12 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:18:33 +0100 Subject: we don't care about setting root window's background color rationale: the MDV_Notebook widget draws on top of it anyway... --- perl-install/install/gtk.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index d44214913..6518d63ba 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -106,7 +106,6 @@ sub install_theme { my $win = gtknew('Window', widget_name => 'background', title => 'root window'); $win->set_type_hint('desktop'); # for matchbox window manager $win->realize; - mygtk3::set_root_window_background_with_gc($win->style->bg_gc('normal')); $root_window = $win; } -- cgit v1.2.1 From de5dbd962cfb43995b9195da72a2f795817d244d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:30:30 +0100 Subject: fix retrieving image size --- perl-install/mygtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index ac7c09f78..d844a0e41 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -751,13 +751,13 @@ sub _gtk__MDV_Notebook { my $filler = gtknew('Image', file => 'left-background-filler.png'); my $filler_height = $filler->get_pixbuf->get_height; my $left_background = gtknew('Image', file => 'left-background.png'); - my $lf_height = $left_background->{pixbuf}->get_height; + my $lf_height = $left_background->get_allocated_height; my @right_background = $::isInstall ? gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) : map { gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); } 1, 2, 2, 3; - my $width1 = $left_background->{pixbuf}->get_width; + my $width1 = $left_background->get_allocated_width; my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width; my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; $w = gtknew('HBox', spacing => 0, children => [ -- cgit v1.2.1 From 6b45a0f7bf02658ffbdc5398225ba86982bed6be Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:31:01 +0100 Subject: factorize a value --- perl-install/mygtk3.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index d844a0e41..c41320b15 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -758,7 +758,8 @@ sub _gtk__MDV_Notebook { gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); } 1, 2, 2, 3; my $width1 = $left_background->get_allocated_width; - my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width; + my $right_bg_width = $right_background[0]->get_pixbuf->get_width; + my $total_width = $width1 + $right_bg_width; my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; $w = gtknew('HBox', spacing => 0, children => [ 0, $layout = gtknew('Layout', width => $total_width - $offset, children => [ #Layout Fixed @@ -788,7 +789,7 @@ sub _gtk__MDV_Notebook { $w->signal_connect('size-allocate' => sub { my (undef, $requisition) = @_; - state $width ||= $right_background[0]->get_pixbuf->get_width; + state $width ||= $right_bg_width; $box->set_size_request($width, $requisition->height); }); $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; -- cgit v1.2.1 From fadc8b97ed98977bf264d87d62c33e779f299716 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:32:25 +0100 Subject: fix retrieving allocated size --- perl-install/mygtk3.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index c41320b15..24cafc46f 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -790,7 +790,7 @@ sub _gtk__MDV_Notebook { $w->signal_connect('size-allocate' => sub { my (undef, $requisition) = @_; state $width ||= $right_bg_width; - $box->set_size_request($width, $requisition->height); + $box->set_size_request($width, $requisition->{height}); }); $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow; bless($w, 'Gtk3::MDV_Notebook'); @@ -1320,7 +1320,7 @@ sub _create_Window { my ($wi, $he); $w->signal_connect(size_allocate => sub { my (undef, $event) = @_; - my @w_size = $event->values; + my @w_size = @$event{qw(height width)}; # ignore bogus sizing events: return if $w_size[2] < 5; @@ -1635,7 +1635,7 @@ sub move_selection { my $layout = $w->{layout}; $layout->{arrow_ydiff} ||= ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; - my $bar_y = $label->get_allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2; + my $bar_y = $label->get_allocation->{y} - ($w->{selection_bar}->get_pixbuf->get_height - $label->get_allocation->{height})/2; $layout->move($w->{selection_bar}, 0, $bar_y); $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; -- cgit v1.2.1 From 30621d2ac12fafb5e07b601a78d5a40e07316c3d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 18:36:47 +0100 Subject: revert commit 9186647e we would load *gtk3 even on text install --- perl-install/fs/partitioning_wizard.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index e5d744e55..780e8b587 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -13,8 +13,6 @@ use partition_table; use partition_table::raw; use partition_table::dos; use POSIX qw(ceil); -use mygtk3; -use ugtk3 qw(:wrappers); #- unit of $mb is mega bytes, min and max are in sectors, this #- function is used to convert back to sectors count the size of -- cgit v1.2.1 From 11cc03b454eef6365daa592b411433866fe2539a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Nov 2013 22:48:02 +0100 Subject: load Gtk3::WebKit when needed, thus fixing help during install also initialize introspection by explicitely importing it --- perl-install/mygtk3.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 24cafc46f..726524032 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -596,6 +596,8 @@ sub _gtk__TextView { sub _gtk__WebKit_View { my ($w, $opts, $_class, $_action) = @_; if (!$w) { + require Gtk3::WebKit; + Gtk3::WebKit->import; # needed for initializing introspection $w = Gtk3::WebKit::WebView->new; } -- cgit v1.2.1 From f9aab3be9183dabaf2f9df91be15ae5406ff74a4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 13 Nov 2013 10:13:58 +0100 Subject: kill this (uneeded) --- perl-install/standalone/display_help_gtk3 | 72 ------------------------------- 1 file changed, 72 deletions(-) delete mode 100755 perl-install/standalone/display_help_gtk3 diff --git a/perl-install/standalone/display_help_gtk3 b/perl-install/standalone/display_help_gtk3 deleted file mode 100755 index cbecfa75e..000000000 --- a/perl-install/standalone/display_help_gtk3 +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/perl - -# Display Help (gtk3 version) -# Funda Wang -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -use lib qw(/usr/lib/libDrakX); -use common; -use any; -use Encode qw/ encode decode /; -use Gtk3 -init; -use Gtk3::WebKit; -my $wm = any::running_window_manager(); -my $is_firstime = to_bool($wm =~ /drakx-matchbox-window-manager/); - -my $view = Gtk3::WebKit::WebView->new(); -$view->load_uri($ARGV[0]); -my $settings = $view->get_settings (); -$settings->set_property('enable-default-context-menu',0); -$view->set_settings ($settings); -$view->signal_connect('close-web-view' => sub { Gtk3->main_quit() }); - -my $scrolls = Gtk3::ScrolledWindow->new(); -$scrolls->add($view); - -my $button = Gtk3::Button->new_from_stock('gtk-close'); -$button->signal_connect(clicked => sub { Gtk3->main_quit() }); - -my $window = Gtk3::Window->new(GTK_WINDOW_TOPLEVEL); -$window->signal_connect(destroy => sub { Gtk3->main_quit() }); -$window->set_title(decode("UTF8", N("Help"))); -$window->set_border_width(5); -if (!$is_firstime) { - $window->set_default_size(840, 600); -} else { - $window->full_screen(); -} - -my $vbox = Gtk3::Box->new(GTK_ORIENTATION_VERTICAL, 3); -$vbox->pack_start(Gtk3::Separator->new(GTK_ORIENTATION_HORIZONTAL), 0, 0, 0); -if (!$is_firstime) { - my $label = Gtk3::Label->new('Help'); - $label->set_markup (''.decode("UTF8", N("Help")).''); - my $hbox1 = Gtk3::Box->new(GTK_ORIENTATION_HORIZONTAL, 1); - $hbox1->pack_start($label, 0, 0, 0); - $vbox->pack_start($hbox1, 0, 0,0); - $vbox->pack_start(Gtk3::Separator->new(GTK_ORIENTATION_HORIZONTAL), 0, 0, 0); -} -$vbox->pack_start($scrolls, TRUE, TURE, 5); -$vbox->pack_start(Gtk3::Separator->new(GTK_ORIENTATION_HORIZONTAL), 0, 0, 0); -if (!$is_firstime) { - my $hbox2 = Gtk3::Box->new(GTK_ORIENTATION_HORIZONTAL, 1); - $hbox2->pack_end($button, 0,0,5); - $vbox->pack_end($hbox2, 0, 0, 0); -} - -$window->add($vbox); -$window->show_all(); -Gtk3->main(); -- cgit v1.2.1 From f1efadafd12954cbc0b46148577690f5c4f93ec8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 14:36:19 +0100 Subject: fix setting exceptions handler for Gtk3 rationale: whereas Glib's gtk_main() was called smoothly by Gtk2's XS, Gtk3 goes through Glib::Object::Introspection->invoke() which goes directly to the typelib... we thus needs to ask Gtk3 to overrides Gtk3->main --- perl-install/mygtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 726524032..6c28c43ed 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -22,10 +22,10 @@ sub init() { if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'), 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation @::textdomains; - Glib->enable_exceptions3; + Gtk3->enable_exceptions; } init() unless $::no_ugtk_init; -Glib->enable_exceptions3 if $::isInstall; +Gtk3->enable_exceptions if $::isInstall; -- cgit v1.2.1 From a692fa79263096cdb2da1cbd7968058742abbc69 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 17:32:41 +0100 Subject: (installPackages) initialize fraction to 0 Gtk3 doesn't accept default value for Gtk2::ProgressBar->set_fraction() --- perl-install/mygtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 6c28c43ed..6e4c880d1 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -278,6 +278,7 @@ sub _gtk__ProgressBar { } if (my $fraction_ref = delete $opts->{fraction_ref}) { + $$fraction_ref ||= 0; my $set = sub { $w->set_fraction($$fraction_ref) }; gtkval_register($w, $fraction_ref, $set); $set->(); -- cgit v1.2.1 From 99edef45e47724a65daafbe0c3b9ad367258f820 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 17:43:25 +0100 Subject: perlish $adjustment->page_size => adjustment->get_property("page_size") --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 6e4c880d1..af2447722 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1448,7 +1448,7 @@ sub _allow_scroll_TextView_to_bottom { sub { my ($o_force) = @_; my $adjustment = $scrolledWindow->get_vadjustment; - if ($o_force || $adjustment->page_size + $adjustment->value == $adjustment->upper) { + if ($o_force || $adjustment->get_property("page_size") + $adjustment->value == $adjustment->upper) { flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); } -- cgit v1.2.1 From f72cb6d8b4ee6aad7af88e5cb8fc14518d034e7a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 17:48:16 +0100 Subject: perlish $adjustment->value => adjustment->get_value --- perl-install/mygtk3.pm | 2 +- perl-install/standalone/drakclock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index af2447722..aa91f5217 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1448,7 +1448,7 @@ sub _allow_scroll_TextView_to_bottom { sub { my ($o_force) = @_; my $adjustment = $scrolledWindow->get_vadjustment; - if ($o_force || $adjustment->get_property("page_size") + $adjustment->value == $adjustment->upper) { + if ($o_force || $adjustment->get_property("page_size") + $adjustment->get_value == $adjustment->upper) { flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); } diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 6965d6b91..5e38ff6e3 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -315,7 +315,7 @@ sub determine_radian { sub draw { my ($widget, $event) = @_; - my ($x, $y, $width, $height) = $event->area->values; + my ($x, $y, $width, $height) = $event->area->get_values; $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); 0; } -- cgit v1.2.1 From 1d49d7856a207155478d268466e167b0e41d1de9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 17:51:55 +0100 Subject: perlish $adjustment->upper => adjustment->get_property("upper") --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index aa91f5217..df7ac63fc 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1448,7 +1448,7 @@ sub _allow_scroll_TextView_to_bottom { sub { my ($o_force) = @_; my $adjustment = $scrolledWindow->get_vadjustment; - if ($o_force || $adjustment->get_property("page_size") + $adjustment->get_value == $adjustment->upper) { + if ($o_force || $adjustment->get_property("page_size") + $adjustment->get_value == $adjustment->get_property("upper")) { flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1); } -- cgit v1.2.1 From 0d20a8090e7a402ae33b08e8a1e62ca176166b03 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 18:16:29 +0100 Subject: stop using Image_using_pixmap cairo as used by gtk+ does a better job those days anyway... --- perl-install/install/steps_gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index c55324f84..f526f0d74 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -589,7 +589,7 @@ sub installPackages { clicked => sub { $show_release_notes = 1 }); ugtk3::gtkadd($w->{window}, my $box = gtknew('VBox', children_tight => [ - gtknew('Image_using_pixmap', file_ref => \$advertising_image, show_ref => \$show_advertising), + gtknew('Image', file_ref => \$advertising_image, show_ref => \$show_advertising), ])); $box->pack_end(gtkshow(gtknew('VBox', border_width => 7, spacing => 3, children_loose => [ -- cgit v1.2.1 From 847c743fa76267f8e58df6882222ea8b2cae9a13 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 18:18:09 +0100 Subject: drop support for Image_using_pixmap cairo as used by gtk+ does a better job those days anyway... --- perl-install/mygtk3.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index df7ac63fc..c5ab05f83 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -318,8 +318,6 @@ sub _gtk__Pixbuf { $w; } -# Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays -sub _gtk__Image_using_pixmap { &_gtk__Image } sub _gtk__Image { my ($w, $opts, $class) = @_; @@ -331,11 +329,7 @@ sub _gtk__Image { $w->{options} = { flip => delete $opts->{flip} }; - $w->{set_from_file} = $class =~ /using_pixmap/ ? sub { - my ($w, $file) = @_; - my $pixmap = mygtk3::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file)); - $w->set_from_pixmap($pixmap, undef); - } : sub { + $w->{set_from_file} = sub { my ($w, $file, $o_size) = @_; my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}}); $w->set_from_pixbuf($pixbuf); -- cgit v1.2.1 From 4604550867df4dd5e2cea4fd5f934a037a6a9e97 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 18:31:30 +0100 Subject: add --depth in order to force 16bit colors mode --- tools/drakx-in-chroot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 852792349..0992b49c2 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -26,6 +26,7 @@ my ($disk_iso_repository, $repository_uri); --resolution=XXXxYYYY (eg: --resolution=1024x768)\n --repository= path of packages repository --text text mode installer + --depth=XX set screen color depth "; (my $repository, my $dir, @ARGV) = @ARGV; @@ -41,6 +42,8 @@ foreach (@ARGV) { $wrapper = "gdb -q --args"; } elsif (/--strace/) { $wrapper = "strace -e file"; + } elsif (/--depth=(.*)/) { + $resolution .= "x$1"; } } my ($repository_without_arch, $repository_arch) = basename($repository) eq arch() ? (dirname($repository), '/' . arch()) : ($repository, ''); -- cgit v1.2.1 From e33461f6d781c07c325db3a6d502f533d84ff095 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 7 Nov 2013 18:43:32 +0100 Subject: fix "undefined value for mandatory argument..." --- perl-install/mygtk3.pm | 1 + perl-install/services.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index c5ab05f83..56ee74117 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -183,6 +183,7 @@ sub _gtk_any_Button { $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; if (my $text_ref = delete $opts->{text_ref}) { + $$text_ref ||= ''; my $set = sub { eval { $w->set_label(may_apply($w->{format}, $$text_ref)) }; }; diff --git a/perl-install/services.pm b/perl-install/services.pm index 377e87b98..be85ab069 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -224,7 +224,7 @@ sub ask_standalone_gtk { ugtk3->import(qw(:wrappers :create)); my $W = ugtk3->new(N("Services")); - my ($x, $y, $w_popup); + my ($x, $y, $w_popup) = (0, 0); my $nopop = sub { $w_popup and $w_popup->destroy; undef $w_popup }; my $display = sub { my ($text) = @_; -- cgit v1.2.1 From a1bbe9f424c406f745173ae6ebfe6f9d03f0093b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 02:22:24 +0100 Subject: fix $model->iter_next($iter) usage with Gtk3 --- perl-install/ugtk3.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 9499e8c56..20e19bac7 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -241,8 +241,9 @@ sub gtktreeview_children { my ($model, $iter) = @_; my @l; $model or return; - for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { - push @l, $p; + my $p = $model->iter_children($iter); + while ($model->iter_next($p)) { + push @l, $p->copy; } @l; } @@ -1273,7 +1274,8 @@ sub get_path_str { sub iter_each_children { my ($model, $iter, $f) = @_; - for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) { + my $child = $model->iter_children($iter); + while ($child = $model->iter_next($child)) { $f->($child); } } -- cgit v1.2.1 From 0f6353aec7c82e1777483ad8c3b5cc903fba151c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 02:24:06 +0100 Subject: use a variable for clarity (needed for next commit) --- perl-install/ugtk3.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 20e19bac7..e9952b79e 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1173,7 +1173,8 @@ sub ask_browse_tree_info_given_widgets { 0; }); $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( - my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y); + my (undef, $event) = @_; + my ($path, $column) = $w->{tree}->get_path_at_pos($event->x, $event->y); if ($path && $column) { $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); } -- cgit v1.2.1 From b9dcdd9e3db2bd26f501f7edfd94a54ec778829d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 02:24:59 +0100 Subject: ignore events who lack ->x & ->y --- perl-install/ugtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index e9952b79e..6f931a801 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1174,6 +1174,7 @@ sub ask_browse_tree_info_given_widgets { }); $w->{tree}->signal_connect(button_press_event => sub { #- not too good, but CellRendererPixbuf does not have the needed signals :( my (undef, $event) = @_; + return if $event =~ /Gtk3::Gdk::Event=/; my ($path, $column) = $w->{tree}->get_path_at_pos($event->x, $event->y); if ($path && $column) { $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0); -- cgit v1.2.1 From a45c4e4ca33cc642f3dfac9d9b6652a0cb40485f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 03:29:08 +0100 Subject: those setters no more accept undef --- perl-install/interactive/gtk.pm | 2 +- perl-install/mygtk3.pm | 4 ++-- perl-install/standalone/drakfloppy | 2 +- perl-install/standalone/drakfont | 8 ++++---- perl-install/standalone/harddrake2 | 2 +- perl-install/ugtk3.pm | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 357843f21..ac5653bd6 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -81,7 +81,7 @@ sub create_treeview_list { my $list_tv = Gtk3::TreeView->new_with_model($list); $list_tv->set_headers_visible(0); $list_tv->get_selection->set_mode('browse'); - my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk3::CellRendererText->new, 'text' => 0); + my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes("", my $renderer = Gtk3::CellRendererText->new, 'text' => 0); $list_tv->append_column($textcolumn); $renderer->set_property('ellipsize', 'end'); diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 56ee74117..084d0cedf 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -889,7 +889,7 @@ sub _gtk_any_Window { $w->set_type_hint('dialog'); # for matchbox window manager } - $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $w->set_modal(to_bool(delete $opts->{modal})) if exists $opts->{modal}; $opts->{transient_for} ||= $::main_window if $::main_window; $w->set_modal(1) if exists $opts->{transient_for}; $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; @@ -1038,7 +1038,7 @@ sub _gtk__AboutDialog { $w->set_documenters(delete $opts->{documenters}) if exists $opts->{documenters}; $w->set_translator_credits(delete $opts->{translator_credits}) if exists $opts->{translator_credits}; $w->set_artists(delete $opts->{artists}) if exists $opts->{artists}; - $w->set_modal(delete $opts->{modal}) if exists $opts->{modal}; + $w->set_modal(to_bool(delete $opts->{modal})) if exists $opts->{modal}; $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for}; $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy}; } diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 74a9105ea..ec0542f14 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -122,7 +122,7 @@ sub pref_dialog() { $tree_model = Gtk3::TreeStore->new(("Glib::String") x 2, "Glib::Int"); $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->set_headers_visible(0); - $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererText->new, 'text' => 0)); $tree->signal_connect('row-expanded', \&expand_tree); $tree->get_selection->signal_connect('changed' => \&selected_tree); diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 14584c1a4..d5d6b3cf8 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -630,7 +630,7 @@ sub advanced_install() { my $button; $model = Gtk3::TreeStore->new("Glib::String"); $list = Gtk3::TreeView->new_with_model($model); - $list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0)); $list->set_headers_visible(0); $list->get_selection->set_mode('browse'); $list->set_rules_hint(1); @@ -672,7 +672,7 @@ sub list_to_remove() { sub show_list_to_remove() { my $model = Gtk3::TreeStore->new("Glib::String"); my $list = Gtk3::TreeView->new_with_model($model); - $list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0)); $list->set_headers_visible(0); $list->get_selection->set_mode('browse'); $list->set_rules_hint(1); @@ -703,7 +703,7 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect #- left part $left_model = Gtk3::TreeStore->new("Glib::String"); $left_list = Gtk3::TreeView->new_with_model($left_model); - $left_list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $left_list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0)); $left_list->set_headers_visible(0); $left_list->set_rules_hint(1); $left_list->get_selection->set_mode('multiple'); @@ -713,7 +713,7 @@ sub uninstall() { #- TODO : add item to right list with gtksignal_connect #- right part $right_model = Gtk3::TreeStore->new("Glib::String"); $right_list = Gtk3::TreeView->new_with_model($right_model); - $right_list->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); + $right_list->append_column(Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::CellRendererText->new, 'text' => 0)); $right_list->set_headers_visible(0); $right_list->get_selection->set_mode('multiple'); $right_list->set_rules_hint(1); diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index ac10bc3a1..feb07929d 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -255,7 +255,7 @@ $text->set_wrap_mode('word'); $frame->set_size_request(300, 450) unless $::isEmbedded; # $tree->set_column_auto_resize(0, 1); my (@data, @configurators); -$tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::MDV::CellRendererPixWithLabel->new, 'pixbuf' => 0, label => 1)); +$tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::MDV::CellRendererPixWithLabel->new, 'pixbuf' => 0, label => 1)); $tree->set_headers_visible(0); sub fill_default_text { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 6f931a801..675c774db 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -559,7 +559,7 @@ sub create_okcancel { gtknew('HButtonBox', spacing => 5, layout => $_->[1], children_loose => [ map { - $_->set_can_default($::isWizard); + $_->set_can_default(to_bool($::isWizard)); $_; } grep { $_ } @{$_->[0]} ]); @@ -907,9 +907,9 @@ sub ask_browse_tree_info { my $tree_model = Gtk3::TreeStore->new("Glib::String", "Gtk3::Gdk::Pixbuf", "Glib::String"); my $tree = Gtk3::TreeView->new_with_model($tree_model); $tree->get_selection->set_mode('browse'); - $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0)); - $tree->append_column(my $pixcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1)); - $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 2)); + $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererText->new, 'text' => 0)); + $tree->append_column(my $pixcolumn = Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1)); + $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererText->new, 'text' => 2)); $tree->set_headers_visible(0); $tree->set_rules_hint(1); $textcolumn->set_min_width(200); -- cgit v1.2.1 From a7f8805575a700e5ca8dfc962e8049eff33b71b4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 03:42:45 +0100 Subject: perlish $dialog->vbox => $dialog->get_child --- perl-install/standalone/drakfloppy | 2 +- perl-install/standalone/drakfont | 2 +- perl-install/standalone/drakperm | 2 +- perl-install/standalone/drakups | 2 +- perl-install/ugtk3.pm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index ec0542f14..7c4bdd94b 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -135,7 +135,7 @@ sub pref_dialog() { $col->set_min_width((200, 50)[$::i]); } (N("Module name"), N("Size")); - gtkpack_($dialog->vbox, + gtkpack_($dialog->get_child, 0, gtknew('Frame', text => N("Mkinitrd optional arguments"), child => gtknew('VBox', spacing => 5, children_tight => [ $buttons{force} = gtknew('CheckButton', text => N("force")), diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index d5d6b3cf8..f52f2a538 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -613,7 +613,7 @@ sub dialog { local $::main_window = $dialog; $dialog->signal_connect(delete_event => \&exitdialog); $dialog->set_size_request(@{$o_options->{size}}) if ref $o_options->{size}; - gtkpack_($dialog->vbox, @$widgets); + gtkpack_($dialog->get_child, @$widgets); gtkpack($dialog->action_area, @$buttons) if $buttons; $dialog->show_all; if ($o_main_loop) { diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 225fe19f1..df3602ed3 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -314,7 +314,7 @@ sub row_setting_dialog { }); my %perms; - gtkpack_($dlg->vbox, + gtkpack_($dlg->get_child, 0, gtknew('Title2', label => N("Path")), 0, gtknew('HBox', border_width => 18, children => [ 1, $file, diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index 61f0a66a7..1825caecd 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -201,7 +201,7 @@ sub edit_row { $dialog->set_transient_for($w->{real_window}); $dialog->set_modal(1); - gtkpack_($dialog->vbox, + gtkpack_($dialog->get_child, #map { #} ); diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 675c774db..14a2ae337 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -401,7 +401,7 @@ sub create_dialog { my $dialog = gtkset_border_width(_create_dialog($title, $o_options), 10); $dialog->set_border_width(10); my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label); - gtkpack($dialog->vbox, + gtkpack($dialog->get_child, gtknew('HBox', children => [ if_($o_options->{stock}, 0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'), -- cgit v1.2.1 From 8726e6dd60ee00abff6cb6a581f749158ca9dc7e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 03:46:25 +0100 Subject: prevent set_active() to be called with undef parameter --- perl-install/interactive/gtk.pm | 1 + perl-install/mygtk3.pm | 1 + perl-install/standalone/drakfont | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index ac5653bd6..b233ac01d 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -396,6 +396,7 @@ sub create_widget { $w = Gtk3::CheckButton->new_with_label($e->{text}); } $w->signal_connect(clicked => $onchange->(sub { $w->get_active })); + ${$e->{val}} ||= 0; $set = sub { $w->set_active($_[0]) }; $real_w = add_padding($w); } elsif ($e->{type} eq 'only_label') { diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 084d0cedf..094ca1a65 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -200,6 +200,7 @@ sub _gtk_any_Button { $w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked}; } else { if (my $active_ref = delete $opts->{active_ref}) { + $$active_ref ||= 0; my $set = sub { $w->set_active($$active_ref) }; $w->signal_connect(toggled => sub { gtkval_modify($active_ref, $w->get_active, $set); diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index f52f2a538..49a871b7c 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -100,9 +100,9 @@ $ugtk3::wm_icon = "drakfont"; my $xlsfonts = 0; my $windows = 0; my $replace; -my $so = -f '/usr/bin/ooffice'; -my $gs = -f '/usr/bin/gs'; -my $abi = -f '/usr/bin/abiword'; +my $so = to_bool(-f '/usr/bin/ooffice'); +my $gs = to_bool(-f '/usr/bin/gs'); +my $abi = to_bool(-f '/usr/bin/abiword'); my $printer = 1; my $mode = -1; my @application; -- cgit v1.2.1 From 395e1a77a683369614b6fa1ab37f9d33a6cc790b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 03:47:53 +0100 Subject: perlish $dialog->action_area => $dialog->get_action_area --- perl-install/standalone/drakfloppy | 2 +- perl-install/standalone/drakfont | 2 +- perl-install/standalone/drakperm | 2 +- perl-install/standalone/drakups | 2 +- perl-install/ugtk3.pm | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 7c4bdd94b..9154d40a3 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -180,7 +180,7 @@ sub pref_dialog() { $remove_but->set_sensitive(scalar @modules); @temp_modules = (); - gtkadd($dialog->action_area, + gtkadd($dialog->get_action_area, create_okcancel({ cancel_clicked => sub { $dialog->destroy }, ok_clicked => sub { diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 49a871b7c..830baf933 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -614,7 +614,7 @@ sub dialog { $dialog->signal_connect(delete_event => \&exitdialog); $dialog->set_size_request(@{$o_options->{size}}) if ref $o_options->{size}; gtkpack_($dialog->get_child, @$widgets); - gtkpack($dialog->action_area, @$buttons) if $buttons; + gtkpack($dialog->get_action_area, @$buttons) if $buttons; $dialog->show_all; if ($o_main_loop) { gtkflush(); diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index df3602ed3..4e61bae1d 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -362,7 +362,7 @@ sub row_setting_dialog { $dlg->set_has_separator(0); - gtkadd($dlg->action_area, + gtkadd($dlg->get_action_area, create_okcancel(my $w = { cancel_clicked => sub { $dlg->destroy }, diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index 1825caecd..427216069 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -206,7 +206,7 @@ sub edit_row { #} ); - gtkadd($dialog->action_area, + gtkadd($dialog->get_action_area, gtksignal_connect(Gtk3::Button->new(N("Ok")), clicked => sub { # create new item if needed (that is when adding a new one) at end of list $iter ||= $model->append; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 14a2ae337..aa5a30042 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -412,7 +412,7 @@ sub create_dialog { ); if ($o_options->{cancel}) { - $dialog->action_area->pack_start( + $dialog->get_action_area->pack_start( gtknew('Button', text => N("Cancel"), clicked => sub { $ret = 0; $dialog->destroy; Gtk3->main_quit }, can_default => 1), @@ -421,7 +421,7 @@ sub create_dialog { my $button = gtknew('Button', text => N("Ok"), can_default => 1, clicked => sub { $ret = 1; $dialog->destroy; Gtk3->main_quit }); - $dialog->action_area->pack_start($button, 1, 1, 0); + $dialog->get_action_area->pack_start($button, 1, 1, 0); $button->grab_default; $dialog->set_has_separator(0); -- cgit v1.2.1 From bb299753dadf4f2aabfb86c993d622bfe8c0d98f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 00:57:50 +0100 Subject: perlish ->state() => ->get_state() --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index aa5a30042..c628b7cb3 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1542,7 +1542,7 @@ sub RENDER { # not that efficient... ? 'selected' : 'active'; } else { - $state = $widget->state eq 'insensitive' + $state = $widget->get_state eq 'insensitive' ? 'insensitive' : 'normal'; } -- cgit v1.2.1 From a04ae61d231c65c5aa5f497d6e625fb8d5490175 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Nov 2013 15:24:13 +0100 Subject: workaround a gtk+3 segfault --- perl-install/fs/partitioning_wizard.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 780e8b587..fdb61cf7c 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -474,7 +474,7 @@ sub display_choices { text => $solutions{$s}[1], alignment => [0, 0])); ugtk3::gtkpack($vbox, $item) if defined($item); - $button->set_group($oldbutton->get_group) if $oldbutton; + $button->join_group($oldbutton) if $oldbutton; $oldbutton = $button; $button->signal_connect('toggled', sub { $mainw->{sol} = $solutions{$s} if $_[0]->get_active }); ugtk3::gtkpack2__($choicesbox, $button); -- cgit v1.2.1 From 223b6253caecac05649558ec31bd5210768c0dbb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 13:02:00 +0100 Subject: workaround the same segfault when picking the desktop alter mygtk3 in order to pass a button to join its group --- perl-install/install/steps_gtk.pm | 2 +- perl-install/mygtk3.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index f526f0d74..7dc844af2 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -260,7 +260,7 @@ sub reallyChooseDesktop { tip => $tips{$val->[0]}, toggled => sub { $choice = $val if $_[0]->get_active }, active => $choice == $val, - $prev ? (group => $prev->get_group) : ()); + $prev ? (join => $prev) : ()); $prev->signal_connect(key_press_event => sub { my (undef, $event) = @_; if (!$event || ($event->keyval & 0x7f) == 0xd) { diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 094ca1a65..ae72041ca 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -171,6 +171,7 @@ sub _gtk_any_Button { delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') : $opts->{text} ? "Gtk3::$class"->new_with_label(@radio_options, delete $opts->{text} || '') : "Gtk3::$class"->new(@radio_options); + $w->join_group(delete $opts->{join}) if $opts->{join}; $w->{format} = delete $opts->{format} if exists $opts->{format}; } -- cgit v1.2.1 From 7ef9fc1db488a53e12980f367eb8666f4e840bfb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 00:46:39 +0100 Subject: workaround a gtk+3 regression (bgo#711873) See https://bugzilla.gnome.org/show_bug.cgi?id=711873 --- perl-install/services.pm | 2 +- perl-install/standalone/drakclock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/services.pm b/perl-install/services.pm index be85ab069..a32e38d7c 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -242,7 +242,7 @@ sub ask_standalone_gtk { $label->set_label($started ? N("running") : N("stopped")); }; my $b = Gtk3::EventBox->new; - $b->set_events('pointer_motion_mask'); + $b->set_events(${ Gtk3::Gdk::EventMask->new("pointer_motion_mask") }); gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title, 0, mygtk3::gtknew('Title1', label => N("Services and daemons")), 1, gtkset_size_request(create_scrolled_window(create_packtable({ col_spacings => 10, row_spacings => 3 }, diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 5e38ff6e3..a61ac98ac 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -190,7 +190,7 @@ if (-e $ntpfile && is_ntp_daemon_running()) { } else { ntp_widget_state(0) } my $pressed; -$drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); +$drawing_area->set_events(${ Gtk3::Gdk::EventMask->new([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]) }); $drawing_area->signal_connect(draw => \&draw); $drawing_area->signal_connect(realize => sub { my $window = $drawing_area->get_window; -- cgit v1.2.1 From 10f8d025bf555201fd3051893c47aa1c0655790c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 01:01:51 +0100 Subject: fix "Can't call method "x" on unblessed reference" --- perl-install/ugtk3.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index c628b7cb3..3cc54b5f7 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1556,13 +1556,13 @@ sub RENDER { # not that efficient... my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); my $pixbuf = $cell->get('pixbuf'); my ($pwidth, $pheight) = pixbuf_size($cell); - my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth; + my $txt_offset = $cell_area->{x} + $x_offset + $x_padding * 2 + $pwidth; if ($pixbuf) { $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), 0, 0, - $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding, - $cell_area->y, #+ $y_padding, + $is_rtl ? $cell_area->{width} - $cell_area->{x} - $pwidth : $cell_area->{x} ,#+ $x_padding, + $cell_area->{y}, #+ $y_padding, $pwidth, $pheight, 'none', 0, 0); } $widget->get_style->paint_layout($window, @@ -1571,8 +1571,8 @@ sub RENDER { # not that efficient... $cell_area, $widget, "cellrenderertext", - $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset, - $cell_area->y + $y_offset + $y_padding, + $is_rtl ? $cell_area->{width} - $txt_width - $txt_offset : $txt_offset, + $cell_area->{y} + $y_offset + $y_padding, $layout); } -- cgit v1.2.1 From 0279ef2e4ce50f3a9ba35b44eb6459503fb4cbd8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 03:14:54 +0100 Subject: no need to implement our own cell renderer --- perl-install/standalone/harddrake2 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index feb07929d..59889dd37 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -255,7 +255,13 @@ $text->set_wrap_mode('word'); $frame->set_size_request(300, 450) unless $::isEmbedded; # $tree->set_column_auto_resize(0, 1); my (@data, @configurators); -$tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes('', Gtk3::MDV::CellRendererPixWithLabel->new, 'pixbuf' => 0, label => 1)); +$tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new); +$textcolumn->pack_start(my $img_renderer = Gtk3::CellRendererPixbuf->new, 0); +$textcolumn->set_attributes($img_renderer, pixbuf => 0); + +$textcolumn->pack_start(my $text_renderer = Gtk3::CellRendererText->new, 1); +$textcolumn->set_attributes($text_renderer, text => 1); + $tree->set_headers_visible(0); sub fill_default_text { -- cgit v1.2.1 From a4e805c7d8de129537fce0f966bc303f58a37ad3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 03:15:40 +0100 Subject: drop our now unused cellrenderer implementation --- perl-install/ugtk3.pm | 90 --------------------------------------------------- 1 file changed, 90 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 3cc54b5f7..725097ba1 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1490,96 +1490,6 @@ sub new { } -package Gtk3::MDV::CellRendererPixWithLabel; - -use MDK::Common; -use Glib::Object::Subclass "Gtk3::CellRenderer", - properties => [ - Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]), - Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk3::Gdk::Pixbuf', [qw(readable writable)]), - ]; - -my $x_padding = 2; -my $y_padding = 2; - -sub INIT_INSTANCE {} - -sub pixbuf_size { - my ($cell) = @_; - my $pixbuf = $cell->get('pixbuf'); - $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0); -} - -sub calc_size { - my ($cell, $layout) = @_; - my ($width, $height) = $layout->get_pixel_size; - my ($pwidth, $pheight) = pixbuf_size($cell); - - return 0, 0, - $width + $x_padding * 3 + $pwidth, - max($pheight, $height + $y_padding * 2); -} - -sub GET_SIZE { - my ($cell, $widget, $_cell_area) = @_; - - my $layout = get_layout($cell, $widget); - $layout->set_text($cell->get('label')); - - return calc_size($cell, $layout); -} - -sub get_layout { - my ($_cell, $widget) = @_; - return $widget->create_pango_layout(""); -} - -sub RENDER { # not that efficient... - my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_; - my $state; - if ($flags & 'selected') { - $state = $widget->has_focus - ? 'selected' - : 'active'; - } else { - $state = $widget->get_state eq 'insensitive' - ? 'insensitive' - : 'normal'; - } - - my $layout = get_layout($cell, $widget); - $layout->set_text($cell->get('label')); - - my $is_rtl = lang::text_direction_rtl(); - my $txt_width = first($layout->get_pixel_size); - - my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); - my $pixbuf = $cell->get('pixbuf'); - my ($pwidth, $pheight) = pixbuf_size($cell); - my $txt_offset = $cell_area->{x} + $x_offset + $x_padding * 2 + $pwidth; - - if ($pixbuf) { - $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), - 0, 0, - $is_rtl ? $cell_area->{width} - $cell_area->{x} - $pwidth : $cell_area->{x} ,#+ $x_padding, - $cell_area->{y}, #+ $y_padding, - $pwidth, $pheight, 'none', 0, 0); - } - $widget->get_style->paint_layout($window, - $state, - 1, - $cell_area, - $widget, - "cellrenderertext", - $is_rtl ? $cell_area->{width} - $txt_width - $txt_offset : $txt_offset, - $cell_area->{y} + $y_offset + $y_padding, - $layout); - -} - -1; - - package Gtk3::Notify::Queue; sub new { -- cgit v1.2.1 From b2cd4d7c3e240b2ef55ed60884cbcc84f22e29dc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 04:00:16 +0100 Subject: simplify: just use tooltips for service descriptions --- perl-install/services.pm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/perl-install/services.pm b/perl-install/services.pm index a32e38d7c..7805f0141 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -224,18 +224,6 @@ sub ask_standalone_gtk { ugtk3->import(qw(:wrappers :create)); my $W = ugtk3->new(N("Services")); - my ($x, $y, $w_popup) = (0, 0); - my $nopop = sub { $w_popup and $w_popup->destroy; undef $w_popup }; - my $display = sub { - my ($text) = @_; - $nopop->(); - gtkshow(gtkadd($w_popup = Gtk3::Window->new('popup'), - gtksignal_connect(gtkadd(Gtk3::EventBox->new, - gtkadd(gtkset_shadow_type(Gtk3::Frame->new, 'etched_out'), - gtkset_justify(Gtk3::Label->new($text), 'left'))), - button_press_event => sub { $nopop->() } - )))->move($x, $y) if $text; - }; my $update_service = sub { my ($service, $label) = @_; my $started = is_service_running($service); @@ -253,9 +241,8 @@ sub ask_standalone_gtk { $infos ||= N("No additional information\nabout this service, sorry."); my $label = gtkset_justify(Gtk3::Label->new, 'left'); $update_service->($service, $label) if !$is_xinetd_service; - [ gtkpack__(Gtk3::HBox->new(0,0), $_), + [ gtkpack__(Gtk3::HBox->new(0,0), gtkset_tip(Gtk3::Label->new($_), $infos)), gtkpack__(Gtk3::HBox->new(0,0), $label), - gtkpack__(Gtk3::HBox->new(0,0), gtksignal_connect(Gtk3::Button->new(N("Info")), clicked => sub { $display->($infos) })), gtkpack__(Gtk3::HBox->new(0,0), gtkset_active(gtksignal_connect( Gtk3::CheckButton->new($is_xinetd_service ? N("Start when requested") : N("On boot")), @@ -274,7 +261,6 @@ sub ask_standalone_gtk { local $_ = `GP_LANG="UTF-8" service $service $action 2>&1`; s/\033\[[^mG]*[mG]//g; c::set_tagged_utf8($_); $update_service->($service, $label); - $display->($_); })) if !$is_xinetd_service; } (N_("Start"), N_("Stop")) ]; @@ -283,10 +269,6 @@ sub ask_standalone_gtk { 0, gtkpack(gtkset_border_width(Gtk3::HBox->new(0,0),5), $W->create_okcancel) )) ); - $b->signal_connect(motion_notify_event => sub { my ($w, $e) = @_; - my ($ox, $oy) = $w->get_window->get_origin; - $x = $e->x+$ox; $y = $e->y+$oy }); - $b->signal_connect(button_press_event => sub { $nopop->() }); $::isEmbedded and gtkflush(); $W->main or return; $on_services; -- cgit v1.2.1 From 4c173e9145aaf731648709b5d46c7d225a7b0d42 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 16:03:46 +0100 Subject: fix missing parameter in drakx-net --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index ae72041ca..ffcea32c7 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -716,7 +716,7 @@ sub _gtk__Expander { if ($w) { $w->set_label(delete $opts->{text}) if exists $opts->{text}; } else { - $w = Gtk3::Expander->new(delete $opts->{text}); + $w = Gtk3::Expander->new(delete $opts->{text} || ''); } $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; -- cgit v1.2.1 From fa5f6f057d6e7960adbac97a824bc94b025ad00f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 16:15:00 +0100 Subject: fix "Can't locate object method "new_text" via package "Gtk3::ComboBox"" --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 725097ba1..630d25807 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1376,7 +1376,7 @@ sub set_popdown_strings { sub new_with_strings { my ($class, $strs, $o_val) = @_; - my $w = $class->new_text; + my $w = $class->new; $w->set_popdown_strings(@$strs); $w->set_text($o_val) if $o_val; $w; -- cgit v1.2.1 From d985ce0894028d2497ab840789877929d92f18a1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 13 Nov 2013 12:39:03 +0100 Subject: prevent calling CheckButton->set_label() on undef value --- perl-install/ugtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 630d25807..ea275e5ce 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -927,8 +927,8 @@ sub ask_browse_tree_info { ) ]), 0, Gtk3::HSeparator->new, 0, my $status = gtknew('Label'), - if_($common->{auto_deps}, - 0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps}) + ($common->{auto_deps} ? + (0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})) : () ), 0, Gtk3::HSeparator->new, 0, my $box2 = gtknew('HBox', spacing => 10), -- cgit v1.2.1 From ef918297c8f6ca912fb61028b59f4a049c08683c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 01:04:08 +0100 Subject: perlish ->style() => ->get_style() --- perl-install/mygtk3.pm | 2 +- perl-install/standalone/drakclock | 10 +++++----- perl-install/ugtk3.pm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index ffcea32c7..c3f48c456 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1582,7 +1582,7 @@ sub pixmap_from_pixbuf { my $window = $widget->get_window or internal_error("you can't use this function if the widget is not realised"); my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $pixbuf->render_to_drawable($pixmap, $widget->get_style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); $pixmap; } diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index a61ac98ac..fe072b073 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -316,7 +316,7 @@ sub determine_radian { sub draw { my ($widget, $event) = @_; my ($x, $y, $width, $height) = $event->area->get_values; - $widget->get_window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); + $widget->get_window->draw_drawable($widget->get_style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); 0; } @@ -344,15 +344,15 @@ sub Repaint { my $dRadians_hour_real = $dRadians_hour + $dRadians_min / 12; my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; my $dRadians_sec_real = $dRadians_sec; - my $gc = $drawing_area->style->white_gc; + my $gc = $drawing_area->get_style->white_gc; # fix race on ugtk3->exit that causes a crash (#33894) return 0 if !$gc; - $pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, $width, $height); + $pixmap->draw_rectangle($drawing_area->get_style->white_gc, 1, 0, 0, $width, $height); my ($midx, $midy) = ($width / 2, $height / 2); $radius = ($midx < $midy ? $midx : $midy) - 10; - my $gray_gc = $drawing_area->style->bg_gc('normal'); - my $black_gc = $drawing_area->style->black_gc; + my $gray_gc = $drawing_area->get_style->bg_gc('normal'); + my $black_gc = $drawing_area->get_style->black_gc; foreach ([ $gray_gc, 5 ], [ $black_gc, 0 ]) { &DrawTickAt($pixmap, $_->[0], $midx, $midy, $_->[1]); &DrawHour($pixmap, $_->[0], $midx, $midy, $dRadians_hour_real, $_->[1]); diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ea275e5ce..47b91b510 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -676,7 +676,7 @@ sub set_back_pixbuf { my $window = $widget->get_window; my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); + $pixbuf->render_to_drawable($pixmap, $widget->get_style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); $window->set_back_pixmap($pixmap, 0); } -- cgit v1.2.1 From 197d74ac91c99274b772342636e6c3bc33cec3e5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 17 Nov 2013 11:29:12 +0100 Subject: handle alignment for Images too (needed for banners) --- perl-install/mygtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index c3f48c456..468d57420 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -326,6 +326,7 @@ sub _gtk__Image { if (!$w) { $w = Gtk3::Image->new; + $w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment}; $w->{format} = delete $opts->{format} if exists $opts->{format}; $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock}; -- cgit v1.2.1 From bd4da8d9900c122bf0c2b372adc78d298066f00d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 17 Nov 2013 12:43:15 +0100 Subject: add support for set an image directly from a pixbuf --- perl-install/mygtk3.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 468d57420..d6cfd9025 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -350,6 +350,8 @@ sub _gtk__Image { }; gtkval_register($w, $file_ref, $set); $set->() if $$file_ref; + } elsif (my $pixbuf = delete $opts->{pixbuf}) { + $w->set_from_pixbuf($pixbuf); } $w; } -- cgit v1.2.1 From c9349d3f46f2f01cd286f6121c749e83192b6817 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 01:17:13 +0100 Subject: lang package is not needed here also compute language direction only once --- perl-install/ugtk3.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 47b91b510..ee2f8fe3a 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1455,11 +1455,10 @@ sub new { $darea->modify_font(Pango::FontDescription->from_string("13")); eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); - my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) }; + my $is_rtl = mygtk3::text_direction_rtl(); + my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) }; my $blue_width = $blue_part->get_width; $darea->{text} = $text; - require lang; - my $is_rtl = lang::text_direction_rtl(); $darea->signal_connect(realize => \&set_pixmap); $darea->signal_connect("style-set" => \&set_pixmap); -- cgit v1.2.1 From 47280b6bce184eef49ad813ad83d29f9d76dc32f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 01:21:53 +0100 Subject: rename a variable (makes next commit more readable) --- perl-install/ugtk3.pm | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ee2f8fe3a..0ce17fced 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1448,44 +1448,44 @@ sub new { my ($_class, $icon, $text, $o_options) = @_; mygtk3::import_style_ressources(); - my $darea = gtknew('DrawingArea', widget_name => 'Banner'); - $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); - my $d_height = $darea->{back_pixbuf}->get_allocated_height; - $darea->set_size_request(-1, $d_height); - $darea->modify_font(Pango::FontDescription->from_string("13")); - eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; - $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); + my $w = gtknew('DrawingArea', widget_name => 'Banner'); + $w->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); + my $d_height = $w->{back_pixbuf}->get_allocated_height; + $w->set_size_request(-1, $d_height); + $w->modify_font(Pango::FontDescription->from_string("13")); + eval { $w->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; + $w->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); my $is_rtl = mygtk3::text_direction_rtl(); my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) }; my $blue_width = $blue_part->get_width; - $darea->{text} = $text; - - $darea->signal_connect(realize => \&set_pixmap); - $darea->signal_connect("style-set" => \&set_pixmap); - $darea->signal_connect(expose_event => sub { - my $style = $darea->get_style; - my $height = $darea->{icon}->get_height; - my $width = $darea->{icon}->get_width; + $w->{text} = $text; + + $w->signal_connect(realize => \&set_pixmap); + $w->signal_connect("style-set" => \&set_pixmap); + $w->signal_connect(expose_event => sub { + my $style = $w->get_style; + my $height = $w->{icon}->get_height; + my $width = $w->{icon}->get_width; # fix icon position when not using the default height: - (undef, undef, undef, $d_height) = $darea->get_window->get_geometry; + (undef, undef, undef, $d_height) = $w->get_window->get_geometry; my $padding = int(($d_height - $height)/2); - my $d_width = $darea->get_allocation->width; + my $d_width = $w->get_allocation->width; my $x_blue = $is_rtl ? $d_width - $blue_width : 0; my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; # here: 48 is the amount of white background in the blue background we wish to ignore: - my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; - $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); - $blue_part->render_to_drawable($darea->get_window, $style->bg_gc('normal'), + my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $w->{txt_width} : $blue_width - 48; + $w->{layout_height} ||= second($w->{layout}->get_pixel_size); + $blue_part->render_to_drawable($w->get_window, $style->bg_gc('normal'), 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); - $darea->{icon}->render_to_drawable($darea->get_window, $style->bg_gc('normal'), + $w->{icon}->render_to_drawable($w->get_window, $style->bg_gc('normal'), 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); - $darea->get_window->draw_layout($style->fg_gc('normal'), $x_text, - $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, - $darea->{layout}); + $w->get_window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $w->{layout_height})/2, + $w->{layout}); 1; }); - return $darea; + return $w; } -- cgit v1.2.1 From f5ed08a589bc9081c68188c464a5a978557d0b2a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 23 May 2013 17:53:00 +0200 Subject: convert Banner widget to Gtk+3 - Parsing of custom resources: RC -> CSS - signal: 'style-set' => 'style-updated' - Drop our custom draw code - widget is much simpler, using Overlays (due to that(?), we must remove -4 from the vertical padding) Also fix "Unit is missing" fatal error with newer gtk+3.10 Most themes work OK but Oxygen-gtk3... --- perl-install/ugtk3.pm | 79 +++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 0ce17fced..fe0b0f89e 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1429,62 +1429,55 @@ use MDK::Common; use mygtk3 qw(gtknew); use ugtk3 qw(:helpers :wrappers); -sub set_pixmap { - my ($darea) = @_; - return if !$darea->get_realized; - ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf}); - update_text($darea); +sub set_style { + my ($w) = @_; + my $pl = Gtk3::CssProvider->new; + $pl->load_from_data("Layout, GtkLabel {font: 15px; background-color: #ffffff }"); + $w->{label}->get_style_context->add_provider($pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); + my $p = Gtk3::CssProvider->new; + $w->get_style_context->add_provider($p, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); } sub update_text { my ($darea) = @_; - $darea->{layout} = $darea->create_pango_layout($darea->{text}); - $darea->{txt_width} = first($darea->{layout}->get_pixel_size); $darea->queue_draw; } - sub new { my ($_class, $icon, $text, $o_options) = @_; mygtk3::import_style_ressources(); - my $w = gtknew('DrawingArea', widget_name => 'Banner'); - $w->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background'); - my $d_height = $w->{back_pixbuf}->get_allocated_height; - $w->set_size_request(-1, $d_height); - $w->modify_font(Pango::FontDescription->from_string("13")); - eval { $w->{icon} = ugtk3::gtkcreate_pixbuf($icon) }; - $w->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); + my $icon = eval { ugtk3::gtkcreate_pixbuf($icon) }; + $icon ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon()); my $is_rtl = mygtk3::text_direction_rtl(); my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) }; - my $blue_width = $blue_part->get_width; - $w->{text} = $text; - - $w->signal_connect(realize => \&set_pixmap); - $w->signal_connect("style-set" => \&set_pixmap); - $w->signal_connect(expose_event => sub { - my $style = $w->get_style; - my $height = $w->{icon}->get_height; - my $width = $w->{icon}->get_width; - # fix icon position when not using the default height: - (undef, undef, undef, $d_height) = $w->get_window->get_geometry; - my $padding = int(($d_height - $height)/2); - my $d_width = $w->get_allocation->width; - my $x_blue = $is_rtl ? $d_width - $blue_width : 0; - my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; - # here: 48 is the amount of white background in the blue background we wish to ignore: - my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $w->{txt_width} : $blue_width - 48; - $w->{layout_height} ||= second($w->{layout}->get_pixel_size); - $blue_part->render_to_drawable($w->get_window, $style->bg_gc('normal'), - 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); - $w->{icon}->render_to_drawable($w->get_window, $style->bg_gc('normal'), - 0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0); - $w->get_window->draw_layout($style->fg_gc('normal'), $x_text, - $o_options->{txt_ypos} || ($d_height - $w->{layout_height})/2, - $w->{layout}); - 1; - }); - + + my $d_height = $blue_part->get_height; + + + my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]); + + my $label = gtknew('Label', text => $text); # for update_text() + my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [ + gtknew('Overlay', main_child => $img, children => [ + my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]), + ]) + ]); + + # fix Icon position: + if ($is_rtl) { + $icon_img->set_margin_right(12); + } else { + $icon_img->set_margin_left(12); + } + $icon_img->set_margin_top(($blue_part->get_height-$icon->get_height)/2-4); + + $w->{label} = $label; + $w->set_size_request(-1, $d_height); + + $w->signal_connect(realize => \&set_style); + $w->signal_connect("style-updated" => \&set_style); + $w->show_all; return $w; } -- cgit v1.2.1 From 678a27d018858a21727a5fe66c904b30dbad0ea3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 17 Nov 2013 12:23:02 +0100 Subject: explain who uses it --- perl-install/ugtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index fe0b0f89e..70718c5d7 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1438,6 +1438,7 @@ sub set_style { $w->get_style_context->add_provider($p, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); } +# used by install::steps_gtk::installPackages() sub update_text { my ($darea) = @_; $darea->queue_draw; -- cgit v1.2.1 From ad02d01dbed0bc2717eb1bf057455e95255d2d32 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 17 Nov 2013 12:28:29 +0100 Subject: rename a variable --- perl-install/ugtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 70718c5d7..24df06e95 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1440,8 +1440,8 @@ sub set_style { # used by install::steps_gtk::installPackages() sub update_text { - my ($darea) = @_; - $darea->queue_draw; + my ($banner) = @_; + $banner->queue_draw; } sub new { -- cgit v1.2.1 From 3cfaca7fb9efac159556e25a53940dcd341b5dad Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 17 Nov 2013 12:30:08 +0100 Subject: update API for installer --- perl-install/install/steps_gtk.pm | 3 +-- perl-install/ugtk3.pm | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 7dc844af2..5ff2a1bf4 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -571,8 +571,7 @@ sub installPackages { my ($title); my $pl = $f; $pl =~ s/\.png$/.pl/; eval(cat_($pl)) if -e $pl; - $banner->{text} = $title; - Gtk3::Banner::update_text($banner); + Gtk3::Banner::update_text($banner, $title); } }; diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 24df06e95..a262d1b6e 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1440,8 +1440,9 @@ sub set_style { # used by install::steps_gtk::installPackages() sub update_text { - my ($banner) = @_; - $banner->queue_draw; + my ($banner, $new_text) = @_; + $banner->{label}->set_text($new_text); + $banner->{label}->queue_draw; } sub new { -- cgit v1.2.1 From ead34f1dd8d6d95d1c60c88ea5c920c06ff3fc8d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 24 Nov 2013 23:50:12 +0100 Subject: disable updating ads titles testing latest commit shows that updating ads titles hasn't actually worked for years... --- perl-install/install/steps_gtk.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 5ff2a1bf4..ff396e123 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -571,7 +571,8 @@ sub installPackages { my ($title); my $pl = $f; $pl =~ s/\.png$/.pl/; eval(cat_($pl)) if -e $pl; - Gtk3::Banner::update_text($banner, $title); + # FIXME: This hasn't actually worked for years: + #Gtk3::Banner::update_text($banner, $title); } }; -- cgit v1.2.1 From aa1b536467c9b11d9dd3ff3a0369ca5097642fec Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 8 Sep 2013 20:55:08 +0200 Subject: shrink banner background image (shrink the white part) --- perl-install/pixmaps/banner-blue-part.png | Bin 325 -> 233 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/perl-install/pixmaps/banner-blue-part.png b/perl-install/pixmaps/banner-blue-part.png index bd0e8d15a..5ed8fa658 100644 Binary files a/perl-install/pixmaps/banner-blue-part.png and b/perl-install/pixmaps/banner-blue-part.png differ -- cgit v1.2.1 From b803e12977379121da8f49f288337ab18a57e1e3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 01:15:01 +0100 Subject: (set_back_pixbuf) drop it (now unused) --- perl-install/ugtk3.pm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index a262d1b6e..2ec521eee 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -671,15 +671,6 @@ sub gtkset_property { $w; } -sub set_back_pixbuf { - my ($widget, $pixbuf) = @_; - my $window = $widget->get_window; - my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); - my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth); - $pixbuf->render_to_drawable($pixmap, $widget->get_style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0); - $window->set_back_pixmap($pixmap, 0); -} - sub set_back_pixmap { my ($w) = @_; return if !$w->get_realized; -- cgit v1.2.1 From 0f769bdd74f0d06553642f36e019748178fcc803 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 02:59:31 +0100 Subject: Dialog->set_has_separator() no more exists in Gtk3 --- perl-install/standalone/drakperm | 2 -- perl-install/ugtk3.pm | 1 - 2 files changed, 3 deletions(-) diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 4e61bae1d..fa69be838 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -360,8 +360,6 @@ sub row_setting_dialog { $perms{gid}->set_active($s_right{write}); $perms{suid}->set_active($s_right{read}); - $dlg->set_has_separator(0); - gtkadd($dlg->get_action_area, create_okcancel(my $w = { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 2ec521eee..67b0b6880 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -424,7 +424,6 @@ sub create_dialog { $dialog->get_action_area->pack_start($button, 1, 1, 0); $button->grab_default; - $dialog->set_has_separator(0); $dialog->show_all; Gtk3->main; $ret; -- cgit v1.2.1 From 0c50056186c5399231fe89f5657180418ccd0844 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 04:07:48 +0100 Subject: fix computing left part width --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index d6cfd9025..921c76b49 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -760,7 +760,7 @@ sub _gtk__MDV_Notebook { : map { gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed); } 1, 2, 2, 3; - my $width1 = $left_background->get_allocated_width; + my $width1 = $left_background->get_pixbuf->get_width; my $right_bg_width = $right_background[0]->get_pixbuf->get_width; my $total_width = $width1 + $right_bg_width; my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3; -- cgit v1.2.1 From 4d476c3dc673142bf7a56eceeb3cbc5500a63846 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 15:50:11 +0100 Subject: fix creating a SpinButton ->{lower} was deleted in the previous line (bug introduced with the first code drop by pixel in commit f6f78109c on Dec 2 2004) --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 921c76b49..aa17b71b0 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -239,7 +239,7 @@ sub _gtk__SpinButton { if (!$w) { $opts->{adjustment} ||= do { add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} }); - Gtk3::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); + Gtk3::Adjustment->new(delete $opts->{value}, 0, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size}); }; $w = Gtk3::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0); } -- cgit v1.2.1 From 2bffccc63a0edc4979c5ed2831e961d93ebaef1a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 15:52:23 +0100 Subject: prevent set_sensitive() to be called with undef parameter (for drakguard) --- perl-install/mygtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index aa17b71b0..4c9383c8e 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -131,6 +131,7 @@ sub _gtk { } if (my $sensitive_ref = delete $opts->{sensitive_ref}) { + $$sensitive_ref ||= 0; my $set = sub { $w->set_sensitive($$sensitive_ref) }; gtkval_register($w, $sensitive_ref, $set); $set->(); -- cgit v1.2.1 From 3cf3179c502b85693b4b9fed28cc6c0695ee98b6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 18 Nov 2013 15:58:01 +0100 Subject: adapt to get_selected_rows() behavior change in Gtk3 --- perl-install/standalone/drakfont | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 830baf933..8675d8890 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -663,7 +663,8 @@ sub advanced_install() { sub list_to_remove() { #my @files_path = grep(!/fonts/, all($current_path)); garbage ? gtkflush(); - my (@tux) = $left_list->get_selection->get_selected_rows; #- get tree & paths + my ($indices) = $selection->get_selected_rows; + my (@tux) = @$indices; #- get tree & paths push @uninstall, map { $left_model->get($left_model->get_iter($_), 0) } @tux; #push @uninstall, $current_path . "/" . $files_path[$_] foreach @number_to_remove; garbage ? show_list_to_remove(); -- cgit v1.2.1 From 40db6098f693ac28e3e5edc87c518f6111f314dd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 19 Nov 2013 01:36:02 +0100 Subject: simplify --- perl-install/mygtk3.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 4c9383c8e..2ada07517 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1639,7 +1639,8 @@ sub move_selection { my $layout = $w->{layout}; $layout->{arrow_ydiff} ||= ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2; - my $bar_y = $label->get_allocation->{y} - ($w->{selection_bar}->get_pixbuf->get_height - $label->get_allocation->{height})/2; + my $alloc = $label->get_allocation; + my $bar_y = $alloc->{y} - ($w->{selection_bar}->get_pixbuf->get_height - $alloc->{height})/2; $layout->move($w->{selection_bar}, 0, $bar_y); $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer $_->show foreach $w->{selection_bar}, $w->{selection_arrow}; -- cgit v1.2.1 From ebe7e2a62dd6c364969049d9e7be9bca90c94f84 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 19 Nov 2013 01:41:20 +0100 Subject: fix putting filler at right place --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 2ada07517..3be95eae0 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -755,7 +755,7 @@ sub _gtk__MDV_Notebook { my $filler = gtknew('Image', file => 'left-background-filler.png'); my $filler_height = $filler->get_pixbuf->get_height; my $left_background = gtknew('Image', file => 'left-background.png'); - my $lf_height = $left_background->get_allocated_height; + my $lf_height = $left_background->get_pixbuf->get_height; my @right_background = $::isInstall ? gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed) : map { -- cgit v1.2.1 From 15768bb58de861fab57e8053d1b810fb50b469ff Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 22 Nov 2013 15:20:44 +0100 Subject: fix calling Gtk3::Image->new_from_stock() --- perl-install/ugtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 67b0b6880..59d8fae49 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -404,7 +404,7 @@ sub create_dialog { gtkpack($dialog->get_child, gtknew('HBox', children => [ if_($o_options->{stock}, - 0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'), + 0, Gtk3::Image->new_from_stock($o_options->{stock} || '', 'dialog'), 0, gtknew('Label', text => " "), ), 1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text, -- cgit v1.2.1 From 52a8335b44d07c564151a9ad24eecedd33883751 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 22 Nov 2013 15:23:16 +0100 Subject: set_url_hook() & set_email_hook() no more exists --- perl-install/mygtk3.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 3be95eae0..16988905a 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -1023,14 +1023,6 @@ sub _gtk__AboutDialog { $w->set_icon(gtknew('Pixbuf', file => delete $opts->{icon})) if exists $opts->{icon}; $w->set_logo(gtknew('Pixbuf', file => delete $opts->{logo})) if exists $opts->{logo}; $w->set_copyright(delete $opts->{copyright}) if exists $opts->{copyright}; - $w->set_url_hook(sub { - my (undef, $url) = @_; - run_program::raw({ detach => 1 }, 'www-browser', $url); - }); - $w->set_email_hook(sub { - my (undef, $url) = @_; - run_program::raw({ detach => 1 }, 'www-browser', $url); - }); if (my $url = delete $opts->{website}) { $url =~ s/^https:/http:/; # Gtk3::About doesn't like "https://..." like URLs -- cgit v1.2.1 From 3e5eec0fb8d4099a5d0f9a4a16c0d26851ce6fd5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 22 Nov 2013 15:31:02 +0100 Subject: set_authors() needs an array ref --- perl-install/standalone/drakfont | 4 +--- perl-install/standalone/harddrake2 | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 8675d8890..c67041263 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -525,9 +525,7 @@ sub help() { comments => N("Font installer."), website => 'http://www.mageia.org', website_label => N("Mageia"), - authors => 'Sébastien Dupont -Damien Chaumette -Thierry Vignaud ', + authors => [ 'Sébastien Dupont', 'Damien Chaumette', 'Thierry Vignaud ' ], translator_credits => #-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") N("_: Translator(s) name(s) & email(s)\n"), diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 59889dd37..824af3aa1 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -521,7 +521,7 @@ sub about() { comments => N("This is HardDrake, a %s hardware configuration tool.", $distro_name), website => 'http://www.mageia.org', website_label => N("Mageia"), - authors => 'Thierry Vignaud ', + authors => [ 'Thierry Vignaud ' ], translator_credits => #-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") N("_: Translator(s) name(s) & email(s)\n"), -- cgit v1.2.1 From 32dfc90e18b52dc5bc3928a46c5e946158d7aee1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 22 Nov 2013 16:24:42 +0100 Subject: Pango->PANGO_WEIGHT_BOLD is not available through introspection --- perl-install/standalone/harddrake2 | 4 ++-- perl-install/ugtk3.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 824af3aa1..3862a0614 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -285,7 +285,7 @@ $tree->get_selection->signal_connect('changed' => sub { my $field = lookup_field($_); if_($_ && $field->[0], $_ => [ - [ $field->[0] . ": \x{200e}", { 'foreground' => 'royalblue3', 'weight' => Pango->PANGO_WEIGHT_BOLD } ], + [ $field->[0] . ": \x{200e}", { 'foreground' => 'royalblue3', 'weight' => 'bold' } ], [ ($current_device->{$_} =~ /^(unknown)/ ? N("unknown") : $current_device->{$_} =~ /^(Unknown)/ ? N("Unknown") : $current_device->{$_} eq 'yes' ? N("Yes") : @@ -585,7 +585,7 @@ sub lookup_field { sub titleFormat { my ($title) = @_; - [ $title . "\n", { 'weight' => Pango->PANGO_WEIGHT_BOLD, scale => 1.4399999999999 } ]; # Pango->PANGO_SCALE_LARGE + [ $title . "\n", { 'weight' => 'bold', scale => 1.4399999999999 } ]; # Pango->PANGO_SCALE_LARGE } sub force_rename_field { diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 59d8fae49..e136d6701 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -311,7 +311,7 @@ sub markup_to_TextView_format { foreach (@$l) { my ($_txt, $attrs) = @$_; if ($attrs) { - $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD; + $attrs->{weight} eq 'bold' and $attrs->{weight} = 'bold'; $attrs->{size} eq 'larger' and do { $attrs->{scale} = 1.4399999999999; # PANGO_SCALE_X_LARGE: equivalent to Label's size => 'larger' delete $attrs->{size}; -- cgit v1.2.1 From ca6a026a23f723a74dab9a7d3afc11c2a43c01f2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 3 Nov 2013 15:04:02 +0100 Subject: convert to UIManager --- perl-install/standalone/drakboot | 18 +++++++--- perl-install/standalone/drakfloppy | 18 +++++++--- perl-install/standalone/harddrake2 | 71 ++++++++++++++++++++++---------------- perl-install/standalone/logdrake | 31 +++++++++-------- 4 files changed, 85 insertions(+), 53 deletions(-) diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index e9f6cf348..375b0b4d1 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -85,10 +85,20 @@ sub run_boot_window { $window->set_border_width(2); ### menus definition # the menus are not shown but they provides shiny shortcut like C-q - my @menu_items = ([ N("/_File"), undef, undef, undef, '' ], - [ N("/File/_Quit"), N("Q"), sub { ugtk3->exit(0) }, undef, '' ], - ); - create_factory_menu($w->{rwindow}, @menu_items); + my $ui = gtknew('UIManager', actions => [ + # [name, stock_id, value, label, accelerator, tooltip, callback] + [ 'FileMenu', undef, N("_File") ], + [ 'Quit', undef, N("_Quit"), N("Q"), undef, sub { ugtk3->exit(0) } ], + ], + string => qq( + + + + + +)); + $w->{rwindow}->add_accel_group($ui->get_accel_group); + ######### menus end } gtkadd($window, gtknew('VBox', children => [ diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 9154d40a3..efb2104df 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -43,11 +43,19 @@ unless ($::isEmbedded) { ### menus definition # the menus are not shown but they provides shiny shortcut like C-q - create_factory_menu($window->{rwindow}, ( - { path => N("/_File"), item_type => '' }, - { path => N("/File/_Quit"), accelerator => N("Q"), callback => sub { ugtk3->exit(0) } }, - ) - ); + my $ui = gtknew('UIManager', actions => [ + # [name, stock_id, value, label, accelerator, tooltip, callback] + [ 'FileMenu', undef, N("_File") ], + [ 'Quit', undef, N("_Quit"), N("Q"), undef, sub { ugtk3->exit(0) } ], + ], + string => qq( + + + + + +)); + $window->{rwindow}->add_accel_group($ui->get_accel_group); } diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 3862a0614..08a81b913 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -175,16 +175,9 @@ my ($current_device, $current_class, $current_configurator); my %sysh = distrib(); my $distro_name = $sysh{system}; -my %menus = ( - 'options' => - #-PO: please keep all "/" characters !!! - N("/_Options"), - 'help' => N("/_Help") - ); - my %menu_options = ( - 'MODEMS_DETECTION' => [ $menus{options}, N("/Autodetect _modems") ], - 'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ], + 'MODEMS_DETECTION' => N("Autodetect _modems"), + 'PARALLEL_ZIP_DETECTION' => N("Autodetect parallel _zip drives"), ); $ugtk3::wm_icon = "harddrake"; @@ -192,24 +185,42 @@ $w = ugtk3->new(N("Hardware Configuration")); # fake diagnostics pragma: local $::main_window = $w->{real_window}; -my @menu_items = - ( - [ N("/_File"), undef, undef, undef, '' ], - [ N("/_File") . N("/_Quit"), N("Q"), \&quit_global, undef, '' ], - [ join('', @{$menu_options{MODEMS_DETECTION}}), undef, \&handle_modem_option, undef, '' ], - [ join('', @{$menu_options{PARALLEL_ZIP_DETECTION}}), undef, \&handle_zip_option, undef, '' ], - [ $menus{help}, undef, undef, undef, '' ], - if_(-x "/usr/sbin/drakhelp_inst", - [ $menus{help} . N("/_Help"), undef, \&run_help, undef, '' ], - ), - [ $menus{help} . N("/_Fields description"), undef, \&fields_help, undef, '' - ], - if_(!-e "/etc/sysconfig/oem", - [ $menus{help} . N("/_Report Bug"), undef, \&run_drakbug, undef, '' ], - ), - [ $menus{help} . N("/_About..."), undef, \&about, undef, '' - ] - ); +my $has_help = -x "/usr/sbin/drakhelp_inst"; +my $ui = gtknew('UIManager', actions => [ + # [name, stock_id, value, label, accelerator, tooltip, callback] + [ 'FileMenu', undef, N("_File") ], + [ 'Quit', undef, N("_Quit"), N("Q"), undef, \&quit_global ], + [ 'OptionsMenu', undef, '_Options' ], + [ 'HelpMenu', undef, '_Help' ], + if_($has_help, [ 'Help', undef, N("_Help"), N("Q"), undef, \&run_help ]), + [ 'Fields description', undef, N("_Fields description"), undef, undef, \&fields_help ], + [ 'Report Bug', undef, N("_Report Bug"), undef, undef, \&run_drakbug ], + [ 'About', undef, N("_About..."), '', undef, \&about ], + ], + toggle_actions => [ + [ 'MODEMS_DETECTION', undef, $menu_options{MODEMS_DETECTION}, undef, undef, \&handle_modem_option ], + [ 'PARALLEL_ZIP_DETECTION', undef, $menu_options{PARALLEL_ZIP_DETECTION}, undef, undef, \&handle_zip_option ], + ], + string => + join("\n", + qq( + + + + + + + + + ), + if_($has_help, ""), + qq( + + + + + +))); $in = 'interactive'->vnew('su'); #require_root_capability(); @@ -221,7 +232,7 @@ add_icon_path('/usr/share/pixmaps/harddrake2/'); $::noborderWhenEmbedded = 1; -my ($menubar, $factory) = create_factory_menu($w->{real_window}, @menu_items); +my $menubar = $ui->get_widget('/MenuBar'); $w->{window}->set_size_request(805, 550) if !$::isEmbedded; my $tree_model = Gtk3::TreeStore->new("Gtk3::Gdk::Pixbuf", "Glib::String", "Glib::Int"); @@ -338,6 +349,7 @@ $tree->get_selection->signal_connect('changed' => sub { $module_cfg_button->hide; }); +$w->{rwindow}->add_accel_group($ui->get_accel_group); # show the main window earlier (so that sub dialogs can use main # window's icon and so that no Gtk+ critical message got displayed): $w->{rwindow}->show_all; @@ -473,9 +485,8 @@ $w->{rwindow}->signal_connect(delete_event => \&quit_global); $w->{rwindow}->set_position('center') unless $::isEmbedded; foreach (keys %menu_options) { - my $title = strip_first_underscore(@{$menu_options{$_}}); $options{$_} = 0 unless defined($options{$_}); # force detection by default - $check_boxes{$_} = $factory->get_widget("
" . $title); + $check_boxes{$_} = $ui->get_widget('/MenuBar/OptionsMenu/' . $_); $check_boxes{$_}->set_active($options{$_}); # restore saved values } diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 94315750a..8ad314f0f 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -72,20 +72,23 @@ my $cal_butt = gtksignal_connect(Gtk3::CheckButton->new(N("Show only for the sel ### menus definition # the menus are not shown # but they provides shiny shortcut like C-q (Broken: FIXME) -my @menu_items = ( - { path => N("/_File"), item_type => '' }, - { path => N("/File/_New"), accelerator => N("N") }, - { path => N("/File/_Open"), accelerator => N("O") }, - { path => N("/File/_Save"), accelerator => N("S"), callback => \&save }, - { path => N("/File/Save _As") }, - { path => N("/File/-"), item_type => '' }, - { path => N("/File/_Quit"), accelerator => N("Q"), callback => \&quit }, - { path => N("/_Options"), item_type => '' }, - { path => N("/Options/Test") }, - { path => N("/_Help"), item_type => '' }, - { path => N("/Help/_About...") } - ); -my $_menubar = $::isEmbedded ? create_factory_menu($my_win->{rwindow}, @menu_items) : undef; +if ($::isEmbedded) { + my $ui = gtknew('UIManager', actions => [ + # [name, stock_id, value, label, accelerator, tooltip, callback] + [ 'FileMenu', undef, N("_File") ], + [ 'Save', undef, N("_Quit"), N("Q"), undef, \&save ], + [ 'Quit', undef, N("_Quit"), N("Q"), undef, \&quit ], + ], + string => qq( + + + + + + +)); + $my_win->{rwindow}->add_accel_group($ui->get_accel_group); +} ######### menus end -- cgit v1.2.1 From 07272233bbe52eaa714d1764d172b5553d7f8a34 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 22 Nov 2013 19:06:38 +0100 Subject: OptionMenu has been deprecated prior to Gtk3 --- perl-install/ugtk3.pm | 66 --------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index e136d6701..ec24d92bc 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1283,72 +1283,6 @@ sub toggle_expansion { } } - -# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a -# combo if the user is selecting from a fixed set of options. -# -# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much -# easier to use than GtkCombo as well. Use GtkCombo only when you need the -# editable text entry. -# -# GtkOptionMenu is a much better-implemented widget and also the right UI for -# noneditable sets of choices.) -# -# GtkCombo is deprecated in 2.4.x because it still uses deprecated -# GtkList. GtkOption menu is deprecated in order to have an unified widget. -# -# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo. -# -# -# This layer try to make OptionMenu and ComboBox look being api -# compatible with Combo since its API is quite nice. - -package Gtk3::OptionMenu; -use MDK::Common; - -# try to get combox <==> option menu mapping -sub set_popdown_strings { - my ($w, @strs) = @_; - my $menu = Gtk3::Menu->new; - # keep string list around for ->set_text compatibilty helper - $w->{strings} = \@strs; - #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '' ], map { [ "File/" . $_, (undef) x 3, '' ] } @strs))[0]); - $menu->append(ugtk3::gtkshow(Gtk3::MenuItem->new_with_label($_))) foreach @strs; - $w->set_menu($menu); - $w; -} - -sub new_with_strings { - my ($class, $strs, $o_val) = @_; - my $w = $class->new; - $w->set_popdown_strings(@$strs); - $w->set_text($o_val) if $o_val; - $w; -} - -sub entry { - my ($w) = @_; - return $w; -} - -sub get_text { - my ($w) = @_; - $w->get_history == -1 ? '' : $w->{strings}[$w->get_history]; -} - -sub set_text { - my ($w, $val) = @_; - each_index { - if ($_ eq $val) { - $w->set_history($::i); - return; - } - } @{$w->{strings}}; -} - - - - package Gtk3::ComboBox; use MDK::Common; -- cgit v1.2.1 From 4c69b2e8d998d594564508ce31d69b720b02ed00 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 01:01:14 +0100 Subject: (shrink_topwindow) temporary disable due to Gtk3 regression --- perl-install/ugtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ec24d92bc..0fab42f84 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -776,6 +776,7 @@ sub sync { sub flush() { gtkflush() } sub shrink_topwindow { my ($o) = @_; + warn "NOT IMPLEMENTED !!!!\n"; return; $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1)); } sub exit { -- cgit v1.2.1 From 78397d458e73613f1440c0aeb0e87e0c5b31ebc9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 01:17:48 +0100 Subject: create_factory_*: drop them rationale: ItemFactory was deprecated prior to Gtk3 and we must migrate to UIManager or Builder anyway... --- perl-install/ugtk3.pm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 0fab42f84..75d6ca5c7 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -21,7 +21,7 @@ use locale; get_default_step_items set_default_step_items string_size string_width) ], - create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu + create => [ qw(create_adjustment create_box_with_title create_dialog create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ], @@ -453,17 +453,6 @@ sub err_dialog { sub create_hbox { gtknew('HButtonBox', layout => $_[0]) } sub create_vbox { gtknew('VButtonBox', layout => $_[0]) } -sub create_factory_menu_ { - my ($type, $name, $window, @menu_items) = @_; - my $widget = Gtk3::ItemFactory->new($type, $name, my $accel_group = Gtk3::AccelGroup->new); - $widget->create_items($window, @menu_items); - $window->add_accel_group($accel_group); - ($widget->get_widget($name), $widget); -} - -sub create_factory_popup_menu { create_factory_menu_("Gtk3::Menu", '
', @_) } -sub create_factory_menu { create_factory_menu_("Gtk3::MenuBar", '
', @_) } - sub create_menu { my $title = shift; my $w = Gtk3::MenuItem->new($title); -- cgit v1.2.1 From 2adc55159b0394bbf55f468e684fc13ebb524ee4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 01:26:06 +0100 Subject: Gtk3::Notify->new => Gtk3::Notify::Notification->new --- perl-install/ugtk3.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 75d6ca5c7..6bf71bd05 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1428,9 +1428,9 @@ sub add { } sub show { - my ($self) = @_; # perl_checker: $self = Gtk3::Notify->new + my ($self) = @_; # perl_checker: $self = Gtk3::Notify::Notification->new my $info = $self->{queue}[0]; - my $notification = Gtk3::Notify->new($info->{title}, $info->{message}, $self->{statusicon}); + my $notification = Gtk3::Notify::Notification->new($info->{title}, $info->{message}, $self->{statusicon}); $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf}; $notification->set_urgency($info->{urgency}) if $info->{urgency}; foreach my $a (@{$info->{actions} || []}) { -- cgit v1.2.1 From bd184e045143f7b8cdfa4fe518478cb4b2543194 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 01:55:02 +0100 Subject: notifications work again --- perl-install/ugtk3.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 6bf71bd05..b6992bdcf 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1447,8 +1447,7 @@ sub show { $info->{timeout}->() if $info->{timeout}; $self->process_next; }); - # this makes net_applet to segfault (mga#9102): - #eval { $notification->show }; + eval { $notification->show }; } 1; -- cgit v1.2.1 From 9cd2aac40e4703fcd7143dfc7af3e97bd47222b9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 02:04:10 +0100 Subject: workaround only first notification being displayed it looks like we only got the 'closed' signal if the user clicks on it (which is a spec violation: http://www.galago-project.org/specs/notification/0.9/x408.html#signal-notification-closed) --- perl-install/ugtk3.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index b6992bdcf..ce2411820 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1424,7 +1424,10 @@ sub process_next { sub add { my ($self, $info) = @_; push @{$self->{queue}}, $info; - @{$self->{queue}} == 1 and $self->show; + # We don't always receive the 'closed' signal (especially when not clicked) + # and in those case we'll never show the next notifications: + #@{$self->{queue}} == 1 and + $self->show; } sub show { -- cgit v1.2.1 From cca23bf47b1c008a4385beefd02410b22c9bae12 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 03:24:07 +0100 Subject: add support for ToolButton --- perl-install/mygtk3.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 16988905a..68ae21467 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -218,6 +218,19 @@ sub _gtk_any_Button { $w; } +sub _gtk__ToolButton { + my ($w, $opts, $class) = @_; + + if (!$w) { + $w = "Gtk3::$class"->new(gtknew('Image', file => delete $opts->{file}), + delete $opts->{label}); + $w->set_tooltip_text(delete $opts->{tooltip}) if $opts->{tooltip}; + $w->signal_connect(clicked => delete $opts->{clicked}) if exists $opts->{clicked}; + } + + $w; +} + sub _gtk__CheckMenuItem { my ($w, $opts, $class) = @_; -- cgit v1.2.1 From 149cccfbd12c2820c55bda4343ff305831a177a6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 04:36:36 +0100 Subject: add set_popdown_strings API to Gtk3::ComboBoxText --- perl-install/ugtk3.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ce2411820..dad860cb8 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1316,6 +1316,15 @@ sub set_text { } +package Gtk3::ComboBoxText; + +# try to get combox <==> option menu mapping +*new_with_strings = *Gtk3::ComboBox::new_with_strings; +*set_popdown_strings = *Gtk3::ComboBox::set_popdown_strings; +*get_text = *Gtk3::ComboBox::get_text; +*set_text = *Gtk3::ComboBox::set_text; + + package Gtk3::Label; sub set { my ($label, $text) = @_; -- cgit v1.2.1 From e5c3a9bda55a6162b9ce1316a8d4370b650d1358 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 12:51:22 +0200 Subject: simplify CSS --- perl-install/share/diskdrake.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/perl-install/share/diskdrake.css b/perl-install/share/diskdrake.css index 02e040157..025a6e1b6 100644 --- a/perl-install/share/diskdrake.css +++ b/perl-install/share/diskdrake.css @@ -4,6 +4,7 @@ fontset = "-*-*-medium-r-normal-*-8-*-*-*-*-*-iso8859-1,*-r-*" => font: "8" */ padding: 1; + color: #000000; } #PART_ext2, #PART_ext3, #PART_ext4 { @@ -28,7 +29,6 @@ #PART_swap { background-color: #66cc00; - color: #000000; } #PART_swap:active, #PART_swap:hover { background-color: #66b700; @@ -46,7 +46,6 @@ #PART_empty { background-color: #ffffff; - color: #000000; } #PART_empty:hover, #PART_empty:active { background-color: #e6e6e6; @@ -54,7 +53,6 @@ #PART_other { background-color: #929eab; - color: #000000; } #PART_new { -- cgit v1.2.1 From dd695f4b6d5b63168ec3dc7c6aad4374897a17c0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 8 Sep 2013 20:49:46 +0200 Subject: fix: Gtk-WARNING **: Theme parsing error: diskdrake.css:19:12: Not using units is deprecated. Assuming 'px'. --- perl-install/share/diskdrake.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/share/diskdrake.css b/perl-install/share/diskdrake.css index 025a6e1b6..3ba4144df 100644 --- a/perl-install/share/diskdrake.css +++ b/perl-install/share/diskdrake.css @@ -3,7 +3,7 @@ /* FIXME: replace by appropriate font: fontset = "-*-*-medium-r-normal-*-8-*-*-*-*-*-iso8859-1,*-r-*" => font: "8" */ - padding: 1; + padding: 1px; color: #000000; } -- cgit v1.2.1 From 861b1b5f1f023e2ed7c264e7d9ad2abf03bb728a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 05:45:08 +0100 Subject: use simpler Gtk3::ComboBoxText --- perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakclock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 375b0b4d1..33b158b0a 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -192,7 +192,7 @@ sub autologin_choice() { push @users, $user; } my $user_combo = gtknew('ComboBox', text => $user, list => \@users); - my $desktop_combo = Gtk3::ComboBox->new_with_strings(\@sessions, if_(member($auto_mode->{desktop}, @sessions), $auto_mode->{desktop})); + my $desktop_combo = Gtk3::ComboBoxText->new_with_strings(\@sessions, if_(member($auto_mode->{desktop}, @sessions), $auto_mode->{desktop})); my $auto_box = gtknew('Table', col_spacings => 5, row_spacings => 5, homogeneous => 1, children => [ [ gtknew('Label_Left', text => N("Default user")), $user_combo ], diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index fe072b073..ec814dcec 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -82,7 +82,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi }), 0, $hb_ntp = gtknew('HBox', border_width => 5, children => [ 0, gtknew('Label', text => N("Server:")), - 1, $combo_ntpserver = Gtk3::ComboBox->new + 1, $combo_ntpserver = Gtk3::ComboBoxText->new ]) ])) ]), -- cgit v1.2.1 From 223478a7f0d2aa3bb475fe6f589ef26667dc3673 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 12:56:29 +0100 Subject: fix doble space --- perl-install/mygtk3.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 68ae21467..6db4651c9 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -687,7 +687,7 @@ sub _gtk__ScrolledWindow { my $faked_w = $w; if (my $child = delete $opts->{child}) { - if (member(ref($child), qw(Gtk3::Layout Gtk3::Html2::View Gtk3::SimpleList Gtk3::SourceView::View Gtk3::Text Gtk3::TextView Gtk3::TreeView Gtk3::WebKit::WebView))) { + if (member(ref($child), qw(Gtk3::Layout Gtk3::Html2::View Gtk3::SimpleList Gtk3::SourceView::View Gtk3::Text Gtk3::TextView Gtk3::TreeView Gtk3::WebKit::WebView))) { $w->add($child); } else { $w->add_with_viewport($child); -- cgit v1.2.1 From 70abfb7f80bf666a15d2469fb74f9a299384cee9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Sep 2013 13:12:16 +0200 Subject: restore app colors on theme switch --- perl-install/diskdrake/hd_gtk.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 80334ddab..4a67ecdbb 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -64,6 +64,7 @@ sub main { mygtk3::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall; load_theme(); + $w->{window}->signal_connect('style-updated' => \&load_theme); # TODO # is_empty_array_ref($all_hds->{raids}) or raid::stopAll; -- cgit v1.2.1 From 67b622f09f4d4da532a0223b43b586cf716d92ec Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 12 Nov 2013 02:04:40 +0100 Subject: fix field types after commit 76082a819319 fix warnings about numeric comparisons with strings --- perl-install/c/stuff.xs.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index de4800529..7ef772975 100755 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -97,14 +97,14 @@ void log_perror(const char *msg) { HV* common_pciusb_hash_init(struct pciusb_entry *e) { HV *rh = (HV *)sv_2mortal((SV *)newHV()); - hv_store(rh, "vendor", 6, newSVnv(e->vendor), 0); - hv_store(rh, "subvendor", 9, newSVnv(e->subvendor), 0); - hv_store(rh, "id", 2, newSVnv(e->device), 0); - hv_store(rh, "subid", 5, newSVnv(e->subdevice), 0); + hv_store(rh, "vendor", 6, newSViv(e->vendor), 0); + hv_store(rh, "subvendor", 9, newSViv(e->subvendor), 0); + hv_store(rh, "id", 2, newSViv(e->device), 0); + hv_store(rh, "subid", 5, newSViv(e->subdevice), 0); hv_store(rh, "driver", 6, newSVpv(e->module ? e->module : "unknown", 0), 0); hv_store(rh, "description", 11, newSVpv(e->text, 0), 0); - hv_store(rh, "pci_bus", 7, newSVnv(e->pci_bus), 0); - hv_store(rh, "pci_device", 10, newSVnv(e->pci_device), 0); + hv_store(rh, "pci_bus", 7, newSViv(e->pci_bus), 0); + hv_store(rh, "pci_device", 10, newSViv(e->pci_device), 0); return rh; } @@ -281,10 +281,10 @@ pci_probe() for (i = 0; i < entries.nb; i++) { struct pciusb_entry *e = &entries.entries[i]; HV * rh = common_pciusb_hash_init(e); - hv_store(rh, "pci_domain", 10, newSVnv(e->pci_domain), 0); - hv_store(rh, "pci_function", 12, newSVnv(e->pci_function), 0); - hv_store(rh, "pci_revision", 12, newSVnv(e->pci_revision), 0); - hv_store(rh, "is_pciexpress", 13, newSVnv(e->is_pciexpress), 0); + hv_store(rh, "pci_domain", 10, newSViv(e->pci_domain), 0); + hv_store(rh, "pci_function", 12, newSViv(e->pci_function), 0); + hv_store(rh, "pci_revision", 12, newSViv(e->pci_revision), 0); + hv_store(rh, "is_pciexpress", 13, newSViv(e->is_pciexpress), 0); hv_store(rh, "nice_media_type", 15, newSVpv(e->class, 0), 0); hv_store(rh, "media_type", 10, newSVpv(pci_class2text(e->class_id), 0), 0); PUSHs(newRV((SV *)rh)); @@ -304,7 +304,7 @@ usb_probe() struct usb_class_text class_text = usb_class2text(e->class_id); snprintf(buf, sizeof(buf), "%s|%s|%s", class_text.usb_class_text, class_text.usb_sub_text, class_text.usb_prot_text); HV * rh = common_pciusb_hash_init(e); - hv_store(rh, "usb_port", 8, newSVnv(e->usb_port), 0); + hv_store(rh, "usb_port", 8, newSViv(e->usb_port), 0); hv_store(rh, "media_type", 10, newSVpv(buf, 0), 0); PUSHs(newRV((SV *)rh)); } -- cgit v1.2.1 From c81fbb5cc02671aa445492c65dad71baa6c58a40 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 16:53:21 +0100 Subject: fix translations after switching to UIManager --- perl-install/standalone/po/af.po | 74 ++++++++++---------- perl-install/standalone/po/am.po | 72 ++++++++++---------- perl-install/standalone/po/ar.po | 76 ++++++++++----------- perl-install/standalone/po/az.po | 76 ++++++++++----------- perl-install/standalone/po/be.po | 70 +++++++++---------- perl-install/standalone/po/bg.po | 74 ++++++++++---------- perl-install/standalone/po/bn.po | 74 ++++++++++---------- perl-install/standalone/po/br.po | 74 ++++++++++---------- perl-install/standalone/po/bs.po | 76 ++++++++++----------- perl-install/standalone/po/ca.po | 76 ++++++++++----------- perl-install/standalone/po/cs.po | 76 ++++++++++----------- perl-install/standalone/po/cy.po | 76 ++++++++++----------- perl-install/standalone/po/da.po | 76 ++++++++++----------- perl-install/standalone/po/de.po | 76 ++++++++++----------- perl-install/standalone/po/el.po | 76 ++++++++++----------- perl-install/standalone/po/eo.po | 66 +++++++++--------- perl-install/standalone/po/es.po | 74 ++++++++++---------- perl-install/standalone/po/et.po | 76 ++++++++++----------- perl-install/standalone/po/eu.po | 76 ++++++++++----------- perl-install/standalone/po/fa.po | 74 ++++++++++---------- perl-install/standalone/po/fi.po | 76 ++++++++++----------- perl-install/standalone/po/fr.po | 72 ++++++++++---------- perl-install/standalone/po/fur.po | 60 ++++++++--------- perl-install/standalone/po/ga.po | 66 +++++++++--------- perl-install/standalone/po/gl.po | 76 ++++++++++----------- perl-install/standalone/po/he.po | 76 ++++++++++----------- perl-install/standalone/po/hi.po | 74 ++++++++++---------- perl-install/standalone/po/hr.po | 66 +++++++++--------- perl-install/standalone/po/hu.po | 76 ++++++++++----------- perl-install/standalone/po/id.po | 72 ++++++++++---------- perl-install/standalone/po/is.po | 76 ++++++++++----------- perl-install/standalone/po/it.po | 76 ++++++++++----------- perl-install/standalone/po/ja.po | 78 +++++++++++----------- perl-install/standalone/po/ko.po | 66 +++++++++--------- perl-install/standalone/po/ky.po | 74 ++++++++++---------- perl-install/standalone/po/libDrakX-standalone.pot | 36 +++++----- perl-install/standalone/po/lt.po | 66 +++++++++--------- perl-install/standalone/po/ltg.po | 74 ++++++++++---------- perl-install/standalone/po/lv.po | 66 +++++++++--------- perl-install/standalone/po/mk.po | 74 ++++++++++---------- perl-install/standalone/po/mn.po | 72 ++++++++++---------- perl-install/standalone/po/ms.po | 66 +++++++++--------- perl-install/standalone/po/mt.po | 74 ++++++++++---------- perl-install/standalone/po/nb.po | 76 ++++++++++----------- perl-install/standalone/po/nl.po | 76 ++++++++++----------- perl-install/standalone/po/nn.po | 76 ++++++++++----------- perl-install/standalone/po/pa_IN.po | 76 ++++++++++----------- perl-install/standalone/po/pl.po | 76 ++++++++++----------- perl-install/standalone/po/pt.po | 76 ++++++++++----------- perl-install/standalone/po/pt_BR.po | 76 ++++++++++----------- perl-install/standalone/po/ro.po | 72 ++++++++++---------- perl-install/standalone/po/ru.po | 76 ++++++++++----------- perl-install/standalone/po/sc.po | 52 +++++++-------- perl-install/standalone/po/sk.po | 76 ++++++++++----------- perl-install/standalone/po/sl.po | 76 ++++++++++----------- perl-install/standalone/po/sq.po | 74 ++++++++++---------- perl-install/standalone/po/sr.po | 74 ++++++++++---------- perl-install/standalone/po/sr@Latn.po | 74 ++++++++++---------- perl-install/standalone/po/sv.po | 76 ++++++++++----------- perl-install/standalone/po/ta.po | 66 +++++++++--------- perl-install/standalone/po/tg.po | 74 ++++++++++---------- perl-install/standalone/po/th.po | 66 +++++++++--------- perl-install/standalone/po/tl.po | 74 ++++++++++---------- perl-install/standalone/po/tr.po | 72 ++++++++++---------- perl-install/standalone/po/uk.po | 76 ++++++++++----------- perl-install/standalone/po/uz.po | 74 ++++++++++---------- perl-install/standalone/po/uz@cyrillic.po | 74 ++++++++++---------- perl-install/standalone/po/vi.po | 76 ++++++++++----------- perl-install/standalone/po/wa.po | 76 ++++++++++----------- perl-install/standalone/po/zh_CN.po | 76 ++++++++++----------- perl-install/standalone/po/zh_TW.po | 76 ++++++++++----------- 71 files changed, 2581 insertions(+), 2581 deletions(-) diff --git a/perl-install/standalone/po/af.po b/perl-install/standalone/po/af.po index 736f99437..2ed229a02 100644 --- a/perl-install/standalone/po/af.po +++ b/perl-install/standalone/po/af.po @@ -52,13 +52,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Lêer" +msgid "_File" +msgstr "_Lêer" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Lêer/_Verlaat" +msgid "File/_Quit" +msgstr "Lêer/_Verlaat" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2223,27 +2223,27 @@ msgstr "Funksies" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opsies" +msgid "_Options" +msgstr "_Opsies" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hulp" +msgid "_Help" +msgstr "_Hulp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Outospeur _modems" +msgid "Autodetect _modems" +msgstr "Outospeur _modems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Outospeur _jaz-aandrywers" +msgid "Autodetect _jaz drives" +msgstr "Outospeur _jaz-aandrywers" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2253,13 +2253,13 @@ msgstr "Netwerkkonfigurasie" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Verlaat" +msgid "_Quit" +msgstr "_Verlaat" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Velde se beskrywing" +msgid "_Fields description" +msgstr "_Velde se beskrywing" #: harddrake2:212 #, c-format @@ -2291,13 +2291,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raporteer 'n Fout" +msgid "_Report Bug" +msgstr "_Raporteer 'n Fout" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Aangaande..." +msgid "_About..." +msgstr "_Aangaande..." #: harddrake2:232 #, fuzzy, c-format @@ -2404,8 +2404,8 @@ msgstr "Vertoon slegs vir gekose dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Lêer/_Nuut" +msgid "File/_New" +msgstr "Lêer/_Nuut" #: logdrake:75 #, c-format @@ -2414,8 +2414,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Lêer/_Oopmaak" +msgid "File/_Open" +msgstr "Lêer/_Oopmaak" #: logdrake:76 #, c-format @@ -2424,8 +2424,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Lêer/_Stoor" +msgid "File/_Save" +msgstr "Lêer/_Stoor" #: logdrake:77 #, c-format @@ -2434,23 +2434,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Lêer/Stoor _as" +msgid "File/Save _As" +msgstr "Lêer/Stoor _as" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Lêer/-" +msgid "File/-" +msgstr "Lêer/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opsies/Toets" +msgid "Options/Test" +msgstr "Opsies/Toets" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hulp/_Aangaande..." +msgid "Help/_About..." +msgstr "Hulp/_Aangaande..." #: logdrake:113 #, c-format @@ -3477,8 +3477,8 @@ msgstr "Konfigurasie van e-pos alarm" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Outospeur _drukkers" +#~ msgid "Autodetect _printers" +#~ msgstr "Outospeur _drukkers" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/am.po b/perl-install/standalone/po/am.po index 9dec5aa59..e73996ad4 100644 --- a/perl-install/standalone/po/am.po +++ b/perl-install/standalone/po/am.po @@ -46,13 +46,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/ፋይል (_F)" +msgid "_File" +msgstr "ፋይል (_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ፋይል (F)/ውጣ (_Q)" +msgid "File/_Quit" +msgstr "ፋይል (F)/ውጣ (_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -191,7 +191,7 @@ msgstr "የመስሪያውን ምልክት" #: drakbug:70 drakbug:206 #, fuzzy, c-format msgid "Standalone Tools" -msgstr "/መሣሪያዎች/Toolbox" +msgstr "መሣሪያዎች/Toolbox" #: drakbug:72 drakbug:73 #, fuzzy, c-format @@ -1966,7 +1966,7 @@ msgstr "" #: harddrake2:101 #, fuzzy, c-format msgid "EIDE/SCSI channel" -msgstr "/ደረጃ/አልፋ/Add Alpha Channel" +msgstr "ደረጃ/አልፋ/Add Alpha Channel" #: harddrake2:102 #, fuzzy, c-format @@ -2141,27 +2141,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/ምርጫዎች (_O)" +msgid "_Options" +msgstr "ምርጫዎች (_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/መረጃ (_H)" +msgid "_Help" +msgstr "መረጃ (_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2171,12 +2171,12 @@ msgstr "የመረብ ምርጫ" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/ውጣ (_Q)" +msgid "_Quit" +msgstr "ውጣ (_Q)" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "መግለጫ የለም" #: harddrake2:212 @@ -2205,13 +2205,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/የሶፍትዌርን ችግር ዘግብ (_R)" +msgid "_Report Bug" +msgstr "የሶፍትዌርን ችግር ዘግብ (_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/ስለ... (_A)" +msgid "_About..." +msgstr "ስለ... (_A)" #: harddrake2:232 #, fuzzy, c-format @@ -2309,7 +2309,7 @@ msgstr "" #: logdrake:54 #, fuzzy, c-format msgid "%s Tools Logs" -msgstr "/መሣሪያዎች/የነበረው ቀለሞች" +msgstr "መሣሪያዎች/የነበረው ቀለሞች" #: logdrake:68 #, c-format @@ -2318,8 +2318,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/ፋይል (F)/አዲስ (_N)" +msgid "File/_New" +msgstr "ፋይል (F)/አዲስ (_N)" #: logdrake:75 #, c-format @@ -2328,8 +2328,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/ፋይል (F)/ክፈት (_O)" +msgid "File/_Open" +msgstr "ፋይል (F)/ክፈት (_O)" #: logdrake:76 #, c-format @@ -2338,8 +2338,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ፋይል (F)/አስቀምጥ (_S)" +msgid "File/_Save" +msgstr "ፋይል (F)/አስቀምጥ (_S)" #: logdrake:77 #, c-format @@ -2348,23 +2348,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ፋይል (F)/በሌላ ስም አስቀምጥ... (_A)" +msgid "File/Save _As" +msgstr "ፋይል (F)/በሌላ ስም አስቀምጥ... (_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ፋይል (F)/-" +msgid "File/-" +msgstr "ፋይል (F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/ምርጫዎች (O)/ፈተና" +msgid "Options/Test" +msgstr "ምርጫዎች (O)/ፈተና" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/መረጃ (H)/ስለ... (_A)" +msgid "Help/_About..." +msgstr "መረጃ (H)/ስለ... (_A)" #: logdrake:113 #, c-format @@ -3349,7 +3349,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "ሁሉም ማተሚያዎች" #, fuzzy diff --git a/perl-install/standalone/po/ar.po b/perl-install/standalone/po/ar.po index b401cb49e..092860746 100644 --- a/perl-install/standalone/po/ar.po +++ b/perl-install/standalone/po/ar.po @@ -47,13 +47,13 @@ msgstr "لم يُعثر على محمِّل اﻹقلاع , إنشاء إعدا #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_ملف" +msgid "_File" +msgstr "_ملف" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ملف/_خروج" +msgid "File/_Quit" +msgstr "ملف/_خروج" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2230,28 +2230,28 @@ msgstr "الميزات" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_خيارات" +msgid "_Options" +msgstr "_خيارات" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_مساعدة" +msgid "_Help" +msgstr "_مساعدة" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/تحقق آلي من أ_جهزة المودم" +msgid "Autodetect _modems" +msgstr "تحقق آلي من أ_جهزة المودم" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/تحقق آلي من _سواقات Jaz" +msgid "Autodetect _jaz drives" +msgstr "تحقق آلي من _سواقات Jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/التمس تلقائي لتعريفات _zip الموازية" +msgid "Autodetect parallel _zip drives" +msgstr "التمس تلقائي لتعريفات _zip الموازية" #: harddrake2:192 #, c-format @@ -2260,13 +2260,13 @@ msgstr "إعداد العتاد" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_خروج" +msgid "_Quit" +msgstr "_خروج" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_وصف الحقول" +msgid "_Fields description" +msgstr "_وصف الحقول" #: harddrake2:212 #, c-format @@ -2298,13 +2298,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_تقرير خطأ" +msgid "_Report Bug" +msgstr "_تقرير خطأ" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_حول..." +msgid "_About..." +msgstr "_حول..." #: harddrake2:232 #, c-format @@ -2411,8 +2411,8 @@ msgstr "عرض سجلات اليوم المختار فقط" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/ملف/_جديد" +msgid "File/_New" +msgstr "ملف/_جديد" #: logdrake:75 #, c-format @@ -2421,8 +2421,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/ملف/_فتح" +msgid "File/_Open" +msgstr "ملف/_فتح" #: logdrake:76 #, c-format @@ -2431,8 +2431,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ملف/_حفظ" +msgid "File/_Save" +msgstr "ملف/_حفظ" #: logdrake:77 #, c-format @@ -2441,23 +2441,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ملف/حفظ _باسم" +msgid "File/Save _As" +msgstr "ملف/حفظ _باسم" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ملف/-" +msgid "File/-" +msgstr "ملف/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/خيارات/اختبار" +msgid "Options/Test" +msgstr "خيارات/اختبار" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/مساعدة/_حول..." +msgid "Help/_About..." +msgstr "مساعدة/_حول..." #: logdrake:113 #, c-format @@ -3485,8 +3485,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "مُطنب" -#~ msgid "/Autodetect _printers" -#~ msgstr "/تحقق آلي من ال_طابعات" +#~ msgid "Autodetect _printers" +#~ msgstr "تحقق آلي من ال_طابعات" #~ msgid "Its GDB trace is:" #~ msgstr "أثر GDB هو :" diff --git a/perl-install/standalone/po/az.po b/perl-install/standalone/po/az.po index df94f7dbf..a7358885d 100644 --- a/perl-install/standalone/po/az.po +++ b/perl-install/standalone/po/az.po @@ -51,13 +51,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fayl" +msgid "_File" +msgstr "_Fayl" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fayl/_Çıx" +msgid "File/_Quit" +msgstr "Fayl/_Çıx" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2212,28 +2212,28 @@ msgstr "Qabiliyyətlər" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Seçimlər" +msgid "_Options" +msgstr "_Seçimlər" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Yardım" +msgid "_Help" +msgstr "_Yardım" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modemləri avtomatik təsbit et" +msgid "Autodetect _modems" +msgstr "_Modemləri avtomatik təsbit et" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_jaz sürücülərini avtomatik təsbit et" +msgid "Autodetect _jaz drives" +msgstr "_jaz sürücülərini avtomatik təsbit et" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/paralel _zip drayverlərini avtomatik aşkar et" +msgid "Autodetect parallel _zip drives" +msgstr "paralel _zip drayverlərini avtomatik aşkar et" #: harddrake2:192 #, fuzzy, c-format @@ -2242,13 +2242,13 @@ msgstr "Şəbəkə Quraşdırılması" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/Çı_x" +msgid "_Quit" +msgstr "Çı_x" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Sahənin izahatı" +msgid "_Fields description" +msgstr "_Sahənin izahatı" #: harddrake2:212 #, c-format @@ -2280,13 +2280,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Xəta Raportu Göndər" +msgid "_Report Bug" +msgstr "_Xəta Raportu Göndər" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Haqqında..." +msgid "_About..." +msgstr "_Haqqında..." #: harddrake2:232 #, fuzzy, c-format @@ -2393,8 +2393,8 @@ msgstr "Yalnız seçili gününkünü göstər" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fayl/_Təze" +msgid "File/_New" +msgstr "Fayl/_Təze" #: logdrake:75 #, c-format @@ -2403,8 +2403,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fayl/_Aç" +msgid "File/_Open" +msgstr "Fayl/_Aç" #: logdrake:76 #, c-format @@ -2413,8 +2413,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fayl/_Qeyd Et" +msgid "File/_Save" +msgstr "Fayl/_Qeyd Et" #: logdrake:77 #, c-format @@ -2423,23 +2423,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fayl/_Fərqli Qeyd Et" +msgid "File/Save _As" +msgstr "Fayl/_Fərqli Qeyd Et" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fayl/-" +msgid "File/-" +msgstr "Fayl/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Seçimlər/Sınaq" +msgid "Options/Test" +msgstr "Seçimlər/Sınaq" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Yardım/_Haqqında..." +msgid "Help/_About..." +msgstr "Yardım/_Haqqında..." #: logdrake:113 #, c-format @@ -3451,8 +3451,8 @@ msgstr "Poçtla xəbər vermə qurğuları" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Ça_pçıları avtomatik təsbit et" +#~ msgid "Autodetect _printers" +#~ msgstr "Ça_pçıları avtomatik təsbit et" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/be.po b/perl-install/standalone/po/be.po index 5703aff8a..3ad9b748c 100644 --- a/perl-install/standalone/po/be.po +++ b/perl-install/standalone/po/be.po @@ -46,13 +46,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Выйсьці" +msgid "File/_Quit" +msgstr "Файл/_Выйсьці" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2145,27 +2145,27 @@ msgstr "Магчымасьці" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Налады" +msgid "_Options" +msgstr "_Налады" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Дапамога" +msgid "_Help" +msgstr "_Дапамога" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2175,12 +2175,12 @@ msgstr "Канфігурацыя сеткі" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Выйсьці" +msgid "_Quit" +msgstr "_Выйсьці" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Апісанне" #: harddrake2:212 @@ -2209,13 +2209,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Паведаміць пра памылку" +msgid "_Report Bug" +msgstr "_Паведаміць пра памылку" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Пра..." +msgid "_About..." +msgstr "_Пра..." #: harddrake2:232 #, fuzzy, c-format @@ -2322,8 +2322,8 @@ msgstr "Ня знойдзена дадзеных для выбранага ву #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Стварыць" +msgid "File/_New" +msgstr "Файл/_Стварыць" #: logdrake:75 #, fuzzy, c-format @@ -2332,8 +2332,8 @@ msgstr "Q" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Адкрыць" +msgid "File/_Open" +msgstr "Файл/_Адкрыць" #: logdrake:76 #, fuzzy, c-format @@ -2342,8 +2342,8 @@ msgstr "Q" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Захаваць" +msgid "File/_Save" +msgstr "Файл/_Захаваць" #: logdrake:77 #, fuzzy, c-format @@ -2352,23 +2352,23 @@ msgstr "Q" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/Захаваць _як" +msgid "File/Save _As" +msgstr "Файл/Захаваць _як" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Налады/Праверыць" +msgid "Options/Test" +msgstr "Налады/Праверыць" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Дапамога/_Пра..." +msgid "Help/_About..." +msgstr "Дапамога/_Пра..." #: logdrake:113 #, c-format @@ -3063,7 +3063,7 @@ msgstr "Рэдагаваць вылучаны радок" #: scannerdrake:671 scannerdrake:821 #, fuzzy, c-format msgid "Remove selected host" -msgstr "/Выдаліць/Выбранае" +msgstr "Выдаліць/Выбранае" #: scannerdrake:680 scannerdrake:830 #, c-format @@ -3353,7 +3353,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Аддалены прынтэр" #, fuzzy @@ -3477,7 +3477,7 @@ msgstr "" #, fuzzy #~ msgid "Remove the last item" -#~ msgstr "/Выдаліць дохлыя файлы" +#~ msgstr "Выдаліць дохлыя файлы" #, fuzzy #~ msgid "Menudrake" diff --git a/perl-install/standalone/po/bg.po b/perl-install/standalone/po/bg.po index daaf0f69a..6ae96a498 100644 --- a/perl-install/standalone/po/bg.po +++ b/perl-install/standalone/po/bg.po @@ -54,13 +54,13 @@ msgstr "Не е открита програма за начално зарежд #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Излиза" +msgid "File/_Quit" +msgstr "Файл/_Излиза" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2177,27 +2177,27 @@ msgstr "Особености" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Опции" +msgid "_Options" +msgstr "_Опции" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Помощ" +msgid "_Help" +msgstr "_Помощ" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Автоматично открива _модеми" +msgid "Autodetect _modems" +msgstr "Автоматично открива _модеми" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Автоматично открива _jaz устройства" +msgid "Autodetect _jaz drives" +msgstr "Автоматично открива _jaz устройства" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2207,13 +2207,13 @@ msgstr "Настройка на мрежата" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Излиза" +msgid "_Quit" +msgstr "_Излиза" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Полета описание" +msgid "_Fields description" +msgstr "_Полета описание" #: harddrake2:212 #, c-format @@ -2243,13 +2243,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Информирай за бъг" +msgid "_Report Bug" +msgstr "_Информирай за бъг" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Относно..." +msgid "_About..." +msgstr "_Относно..." #: harddrake2:232 #, fuzzy, c-format @@ -2356,8 +2356,8 @@ msgstr "Показва само за избраният ден" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Нов" +msgid "File/_New" +msgstr "Файл/_Нов" #: logdrake:75 #, c-format @@ -2366,8 +2366,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Отвори" +msgid "File/_Open" +msgstr "Файл/_Отвори" #: logdrake:76 #, c-format @@ -2376,8 +2376,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Запис" +msgid "File/_Save" +msgstr "Файл/_Запис" #: logdrake:77 #, c-format @@ -2386,23 +2386,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/Запис _като" +msgid "File/Save _As" +msgstr "Файл/Запис _като" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Опции/Тест" +msgid "Options/Test" +msgstr "Опции/Тест" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Помощ/_Относно..." +msgid "Help/_About..." +msgstr "Помощ/_Относно..." #: logdrake:113 #, c-format @@ -3408,8 +3408,8 @@ msgstr "Конфигурация за подредба на поща" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Автоматично открива _принтери" +#~ msgid "Autodetect _printers" +#~ msgstr "Автоматично открива _принтери" #~ msgid "Its GDB trace is:" #~ msgstr "GDB трасиране:" diff --git a/perl-install/standalone/po/bn.po b/perl-install/standalone/po/bn.po index c4c5afdad..8d824e88a 100644 --- a/perl-install/standalone/po/bn.po +++ b/perl-install/standalone/po/bn.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/ফাইল (_ফ)" +msgid "_File" +msgstr "ফাইল (_ফ)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ফাইল/প্রস্থান (_প)" +msgid "File/_Quit" +msgstr "ফাইল/প্রস্থান (_প)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2235,27 +2235,27 @@ msgstr "বৈশিষ্ট্যসমূহ" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/অপশন (_ও)" +msgid "_Options" +msgstr "অপশন (_ও)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/সাহায্য _য" +msgid "_Help" +msgstr "সাহায্য _য" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/স্বয়ংক্রিয় মডেম (_ম)" +msgid "Autodetect _modems" +msgstr "স্বয়ংক্রিয় মডেম (_ম)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/স্বয়ংক্রিয় জায (jaz) ড্রাইভ (_J)" +msgid "Autodetect _jaz drives" +msgstr "স্বয়ংক্রিয় জায (jaz) ড্রাইভ (_J)" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2265,13 +2265,13 @@ msgstr "নেটওয়ার্ক কনফিগারেশন" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/পরিত্যাগ (_প)" +msgid "_Quit" +msgstr "পরিত্যাগ (_প)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/ফিল্ডের বর্ণনা (_ফ)" +msgid "_Fields description" +msgstr "ফিল্ডের বর্ণনা (_ফ)" #: harddrake2:212 #, c-format @@ -2303,13 +2303,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_বাগ রিপোর্ট করো" +msgid "_Report Bug" +msgstr "_বাগ রিপোর্ট করো" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_সম্বন্ধে..." +msgid "_About..." +msgstr "_সম্বন্ধে..." #: harddrake2:232 #, fuzzy, c-format @@ -2417,8 +2417,8 @@ msgstr "শুধুমাত্র নির্বাচিত দিনসম #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/_নতুন" +msgid "File/_New" +msgstr "File/_নতুন" #: logdrake:75 #, c-format @@ -2427,8 +2427,8 @@ msgstr "0x10009a8" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/File/_খোলো" +msgid "File/_Open" +msgstr "File/_খোলো" #: logdrake:76 #, c-format @@ -2437,8 +2437,8 @@ msgstr "0x1000993" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ফাইল/সংরক্ষণ (_স)" +msgid "File/_Save" +msgstr "ফাইল/সংরক্ষণ (_স)" #: logdrake:77 #, c-format @@ -2447,23 +2447,23 @@ msgstr "0x100098f" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ফাইল/সংরক্ষণের রূপ (_র)" +msgid "File/Save _As" +msgstr "ফাইল/সংরক্ষণের রূপ (_র)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ফাইল/-" +msgid "File/-" +msgstr "ফাইল/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/অপশন/বাছাই" +msgid "Options/Test" +msgstr "অপশন/বাছাই" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/সাহায্য/_সম্বন্ধে..." +msgid "Help/_About..." +msgstr "সাহায্য/_সম্বন্ধে..." #: logdrake:113 #, c-format @@ -3499,8 +3499,8 @@ msgstr "মেইলের সংকেত কনফিগারেশন" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/স্বয়ংক্রিয় ছাপাযন্ত্র" +#~ msgid "Autodetect _printers" +#~ msgstr "স্বয়ংক্রিয় ছাপাযন্ত্র" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/br.po b/perl-install/standalone/po/br.po index 4e3cf3bce..72a07d251 100644 --- a/perl-install/standalone/po/br.po +++ b/perl-install/standalone/po/br.po @@ -48,13 +48,13 @@ msgstr "N'eus karger loc'hañ ebet, o krouiñ ur gefluniadur nevez" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Restr" +msgid "_File" +msgstr "_Restr" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Restr/_Kuitaat" +msgid "File/_Quit" +msgstr "Restr/_Kuitaat" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2158,27 +2158,27 @@ msgstr "Arc'hweloù" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Dibarzhoù" +msgid "_Options" +msgstr "_Dibarzhoù" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Skoazell" +msgid "_Help" +msgstr "_Skoazell" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Kavout m_odemioù" +msgid "Autodetect _modems" +msgstr "Kavout m_odemioù" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Kavout an drobarzhelloù _jaz" +msgid "Autodetect _jaz drives" +msgstr "Kavout an drobarzhelloù _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2188,13 +2188,13 @@ msgstr "Kefluniadur ar periantel" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Kuitaat" +msgid "_Quit" +msgstr "_Kuitaat" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Deskrivadur an _tachennoù" +msgid "_Fields description" +msgstr "Deskrivadur an _tachennoù" #: harddrake2:212 #, c-format @@ -2224,13 +2224,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Reiñ da c'houzout ur gudenn" +msgid "_Report Bug" +msgstr "_Reiñ da c'houzout ur gudenn" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_A-brepoz ..." +msgid "_About..." +msgstr "_A-brepoz ..." #: harddrake2:232 #, c-format @@ -2339,8 +2339,8 @@ msgstr "Diskouez hepken an deiz dibabet" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Rest/_Nevez" +msgid "File/_New" +msgstr "Rest/_Nevez" #: logdrake:75 #, c-format @@ -2349,8 +2349,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Restr/_Digoriñ" +msgid "File/_Open" +msgstr "Restr/_Digoriñ" #: logdrake:76 #, c-format @@ -2359,8 +2359,8 @@ msgstr "D" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Restr/_Enrollañ" +msgid "File/_Save" +msgstr "Restr/_Enrollañ" #: logdrake:77 #, c-format @@ -2369,23 +2369,23 @@ msgstr "G" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Restr/_Gwarediñ dindan" +msgid "File/Save _As" +msgstr "Restr/_Gwarediñ dindan" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Restr/-" +msgid "File/-" +msgstr "Restr/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Dibarzhoù/Arnodenn" +msgid "Options/Test" +msgstr "Dibarzhoù/Arnodenn" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Skoazell/_A-brepoz ..." +msgid "Help/_About..." +msgstr "Skoazell/_A-brepoz ..." #: logdrake:113 #, c-format @@ -3374,8 +3374,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Flapañ" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Kavout _moullerezioù" +#~ msgid "Autodetect _printers" +#~ msgstr "Kavout _moullerezioù" #~ msgid "Its GDB trace is:" #~ msgstr "Setu hent GDB anezhañ :" diff --git a/perl-install/standalone/po/bs.po b/perl-install/standalone/po/bs.po index 7b60a894b..d6a02504d 100644 --- a/perl-install/standalone/po/bs.po +++ b/perl-install/standalone/po/bs.po @@ -50,13 +50,13 @@ msgstr "Nije pronađen bootloader, pravim novu konfiguraciju" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Datoteka" +msgid "_File" +msgstr "_Datoteka" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Datoteka/_Izlaz" +msgid "File/_Quit" +msgstr "Datoteka/_Izlaz" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2241,28 +2241,28 @@ msgstr "Osobine" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcije" +msgid "_Options" +msgstr "_Opcije" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pomoć" +msgid "_Help" +msgstr "_Pomoć" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Automatski prepoznaj _modeme" +msgid "Autodetect _modems" +msgstr "Automatski prepoznaj _modeme" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Automatski prepoznaj _jaz uređaje" +msgid "Autodetect _jaz drives" +msgstr "Automatski prepoznaj _jaz uređaje" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Autodetektuj paralelne _ZIP uređaje" +msgid "Autodetect parallel _zip drives" +msgstr "Autodetektuj paralelne _ZIP uređaje" #: harddrake2:192 #, c-format @@ -2271,13 +2271,13 @@ msgstr "Podešavanje hardvera" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Izlaz" +msgid "_Quit" +msgstr "_Izlaz" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Opis polja" +msgid "_Fields description" +msgstr "_Opis polja" #: harddrake2:212 #, c-format @@ -2309,13 +2309,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Prijavi grešku" +msgid "_Report Bug" +msgstr "_Prijavi grešku" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O programu..." +msgid "_About..." +msgstr "_O programu..." #: harddrake2:232 #, c-format @@ -2422,8 +2422,8 @@ msgstr "Prikaži samo za izabrani dan" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Datoteka/_Nova" +msgid "File/_New" +msgstr "Datoteka/_Nova" #: logdrake:75 #, c-format @@ -2432,8 +2432,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Datoteka/_Otvori" +msgid "File/_Open" +msgstr "Datoteka/_Otvori" #: logdrake:76 #, c-format @@ -2442,8 +2442,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Datoteka/_Sačuvaj" +msgid "File/_Save" +msgstr "Datoteka/_Sačuvaj" #: logdrake:77 #, c-format @@ -2452,23 +2452,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Datoteka/Sačuvaj K_ao" +msgid "File/Save _As" +msgstr "Datoteka/Sačuvaj K_ao" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Datoteka/-" +msgid "File/-" +msgstr "Datoteka/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcije/Test" +msgid "Options/Test" +msgstr "Opcije/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoć/_O programu..." +msgid "Help/_About..." +msgstr "Pomoć/_O programu..." #: logdrake:113 #, c-format @@ -3510,8 +3510,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Opširno" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Automatski prepoznaj štam_pače" +#~ msgid "Autodetect _printers" +#~ msgstr "Automatski prepoznaj štam_pače" #~ msgid "OpenOffice.org" #~ msgstr "OpenOffice.org" diff --git a/perl-install/standalone/po/ca.po b/perl-install/standalone/po/ca.po index cfa2d884a..695a9c3c4 100644 --- a/perl-install/standalone/po/ca.po +++ b/perl-install/standalone/po/ca.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fitxer" +msgid "_File" +msgstr "_Fitxer" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fitxer/_Surt" +msgid "File/_Quit" +msgstr "Fitxer/_Surt" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2227,28 +2227,28 @@ msgstr "Característiques" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcions" +msgid "_Options" +msgstr "_Opcions" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ajuda" +msgid "_Help" +msgstr "_Ajuda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Detecta els _mòdems automàticament" +msgid "Autodetect _modems" +msgstr "Detecta els _mòdems automàticament" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Detecta les unitats _jaz automàticament" +msgid "Autodetect _jaz drives" +msgstr "Detecta les unitats _jaz automàticament" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Detecta les unitats _zip paral·lel automàticament" +msgid "Autodetect parallel _zip drives" +msgstr "Detecta les unitats _zip paral·lel automàticament" #: harddrake2:192 #, c-format @@ -2257,13 +2257,13 @@ msgstr "Configuració de maquinari" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Surt" +msgid "_Quit" +msgstr "_Surt" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Descripció de _camps" +msgid "_Fields description" +msgstr "Descripció de _camps" #: harddrake2:212 #, c-format @@ -2295,13 +2295,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Informeu d'un error" +msgid "_Report Bug" +msgstr "_Informeu d'un error" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Quant a..." +msgid "_About..." +msgstr "_Quant a..." #: harddrake2:232 #, c-format @@ -2410,8 +2410,8 @@ msgstr "Mostrar-ho només per al dia seleccionat" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fitxer/_Nou" +msgid "File/_New" +msgstr "Fitxer/_Nou" #: logdrake:75 #, c-format @@ -2420,8 +2420,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fitxer/_Obre" +msgid "File/_Open" +msgstr "Fitxer/_Obre" #: logdrake:76 #, c-format @@ -2430,8 +2430,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fitxer/De_sa" +msgid "File/_Save" +msgstr "Fitxer/De_sa" #: logdrake:77 #, c-format @@ -2440,23 +2440,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fitxer/_Anomena i desa" +msgid "File/Save _As" +msgstr "Fitxer/_Anomena i desa" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fitxer/-" +msgid "File/-" +msgstr "Fitxer/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcions/Prova" +msgid "Options/Test" +msgstr "Opcions/Prova" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ajuda/_Quant a.." +msgid "Help/_About..." +msgstr "Ajuda/_Quant a.." #: logdrake:113 #, c-format @@ -3506,5 +3506,5 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Amb missatges" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Detecta les im_pressores automàticament" +#~ msgid "Autodetect _printers" +#~ msgstr "Detecta les im_pressores automàticament" diff --git a/perl-install/standalone/po/cs.po b/perl-install/standalone/po/cs.po index f5d8c6b56..12da48f47 100644 --- a/perl-install/standalone/po/cs.po +++ b/perl-install/standalone/po/cs.po @@ -46,13 +46,13 @@ msgstr "Nebyl nalezen zavaděč; vytvářím nové nastavení" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Soubor" +msgid "_File" +msgstr "_Soubor" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Soubor/U_končit" +msgid "File/_Quit" +msgstr "Soubor/U_končit" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2230,28 +2230,28 @@ msgstr "Vlastnosti" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Volby" +msgid "_Options" +msgstr "_Volby" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Nápověda" +msgid "_Help" +msgstr "_Nápověda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Automaticky detekovat _modemy" +msgid "Autodetect _modems" +msgstr "Automaticky detekovat _modemy" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Automaticky detekovat jednotky _Jaz" +msgid "Autodetect _jaz drives" +msgstr "Automaticky detekovat jednotky _Jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Automaticky detekovat jednotky _Zip na paralelním portu" +msgid "Autodetect parallel _zip drives" +msgstr "Automaticky detekovat jednotky _Zip na paralelním portu" #: harddrake2:192 #, c-format @@ -2260,13 +2260,13 @@ msgstr "Nastavení hardware" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Konec" +msgid "_Quit" +msgstr "_Konec" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Popis položek" +msgid "_Fields description" +msgstr "_Popis položek" #: harddrake2:212 #, c-format @@ -2298,13 +2298,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/Nah_lásit chybu" +msgid "_Report Bug" +msgstr "Nah_lásit chybu" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O aplikaci..." +msgid "_About..." +msgstr "_O aplikaci..." #: harddrake2:232 #, c-format @@ -2412,8 +2412,8 @@ msgstr "Zobrazit pouze pro vybraný den" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Soubor/_Nový" +msgid "File/_New" +msgstr "Soubor/_Nový" #: logdrake:75 #, c-format @@ -2422,8 +2422,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Soubor/_Otevřít" +msgid "File/_Open" +msgstr "Soubor/_Otevřít" #: logdrake:76 #, c-format @@ -2432,8 +2432,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Soubor/_Uložit" +msgid "File/_Save" +msgstr "Soubor/_Uložit" #: logdrake:77 #, c-format @@ -2442,23 +2442,23 @@ msgstr "U" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Soubor/Uložit _jako" +msgid "File/Save _As" +msgstr "Soubor/Uložit _jako" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Soubor/-" +msgid "File/-" +msgstr "Soubor/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Volby/Test" +msgid "Options/Test" +msgstr "Volby/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Nápověda/_O aplikaci..." +msgid "Help/_About..." +msgstr "Nápověda/_O aplikaci..." #: logdrake:113 #, c-format @@ -3498,5 +3498,5 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Informativní" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Automaticky detekovat _tiskárny" +#~ msgid "Autodetect _printers" +#~ msgstr "Automaticky detekovat _tiskárny" diff --git a/perl-install/standalone/po/cy.po b/perl-install/standalone/po/cy.po index 9c5a9459e..91b75d343 100644 --- a/perl-install/standalone/po/cy.po +++ b/perl-install/standalone/po/cy.po @@ -51,13 +51,13 @@ msgstr "Heb ganfod cychwynnwr, creu ffurfweddiad newydd" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Ffeil" +msgid "_File" +msgstr "_Ffeil" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Ffeil/_Gadael" +msgid "File/_Quit" +msgstr "Ffeil/_Gadael" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2240,28 +2240,28 @@ msgstr "Nodweddion" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Dewisiadau" +msgid "_Options" +msgstr "_Dewisiadau" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Cymorth" +msgid "_Help" +msgstr "_Cymorth" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Awtoganfod_modem" +msgid "Autodetect _modems" +msgstr "Awtoganfod_modem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Awtoganfod_gyrrwr jaz" +msgid "Autodetect _jaz drives" +msgstr "Awtoganfod_gyrrwr jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Awtoganfod gyrrwyr _zip paralel" +msgid "Autodetect parallel _zip drives" +msgstr "Awtoganfod gyrrwyr _zip paralel" #: harddrake2:192 #, c-format @@ -2270,13 +2270,13 @@ msgstr "Ffurfweddu Caedwedd" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Gadael" +msgid "_Quit" +msgstr "_Gadael" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Disgrifiad meysydd" +msgid "_Fields description" +msgstr "_Disgrifiad meysydd" #: harddrake2:212 #, c-format @@ -2308,13 +2308,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Adrodd ar Wallau" +msgid "_Report Bug" +msgstr "_Adrodd ar Wallau" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Ynghylch..." +msgid "_About..." +msgstr "_Ynghylch..." #: harddrake2:232 #, c-format @@ -2421,8 +2421,8 @@ msgstr "Dangos ar y diwrnod penodol yn unig" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Ffeil/_Newydd" +msgid "File/_New" +msgstr "Ffeil/_Newydd" #: logdrake:75 #, c-format @@ -2431,8 +2431,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Ffeil/_Agor" +msgid "File/_Open" +msgstr "Ffeil/_Agor" #: logdrake:76 #, c-format @@ -2441,8 +2441,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Ffeil/_Cadw" +msgid "File/_Save" +msgstr "Ffeil/_Cadw" #: logdrake:77 #, c-format @@ -2451,23 +2451,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Ffeil/Cadw _fel" +msgid "File/Save _As" +msgstr "Ffeil/Cadw _fel" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Ffeil/-" +msgid "File/-" +msgstr "Ffeil/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Dewisiadau/Test" +msgid "Options/Test" +msgstr "Dewisiadau/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Cymorth/_Ynghylch..." +msgid "Help/_About..." +msgstr "Cymorth/_Ynghylch..." #: logdrake:113 #, c-format @@ -3504,8 +3504,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Geiriol" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Awtoganfod_argraffydd" +#~ msgid "Autodetect _printers" +#~ msgstr "Awtoganfod_argraffydd" #~ msgid "Its GDB trace is:" #~ msgstr "Olrheiniad trace yw:" diff --git a/perl-install/standalone/po/da.po b/perl-install/standalone/po/da.po index 138c4d5c7..a85f33c50 100644 --- a/perl-install/standalone/po/da.po +++ b/perl-install/standalone/po/da.po @@ -52,13 +52,13 @@ msgstr "Ingen opstartsindlæser fundet, laver en ny konfiguration" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fil" +msgid "_File" +msgstr "_Fil" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fil/_Afslut" +msgid "File/_Quit" +msgstr "Fil/_Afslut" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2247,28 +2247,28 @@ msgstr "Faciliteter" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Indstillinger" +msgid "_Options" +msgstr "_Indstillinger" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hjælp" +msgid "_Help" +msgstr "_Hjælp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-detektér modemmer" +msgid "Autodetect _modems" +msgstr "Auto-detektér modemmer" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Autodetektér _jaz-drev" +msgid "Autodetect _jaz drives" +msgstr "Autodetektér _jaz-drev" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Automatisk fundne parallelle _zip-drev" +msgid "Autodetect parallel _zip drives" +msgstr "Automatisk fundne parallelle _zip-drev" #: harddrake2:192 #, c-format @@ -2277,13 +2277,13 @@ msgstr "Konfiguration af udstyr" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Afslut" +msgid "_Quit" +msgstr "_Afslut" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Feltbeskrivelse" +msgid "_Fields description" +msgstr "_Feltbeskrivelse" #: harddrake2:212 #, c-format @@ -2315,13 +2315,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Rapportér fejl" +msgid "_Report Bug" +msgstr "_Rapportér fejl" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Om..." +msgid "_About..." +msgstr "_Om..." #: harddrake2:232 #, c-format @@ -2428,8 +2428,8 @@ msgstr "Vis kun for den valgte dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fil/_Ny" +msgid "File/_New" +msgstr "Fil/_Ny" #: logdrake:75 #, c-format @@ -2438,8 +2438,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fil/_Åbn" +msgid "File/_Open" +msgstr "Fil/_Åbn" #: logdrake:76 #, c-format @@ -2448,8 +2448,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fil/_Gem" +msgid "File/_Save" +msgstr "Fil/_Gem" #: logdrake:77 #, c-format @@ -2458,23 +2458,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fil/Gem _som" +msgid "File/Save _As" +msgstr "Fil/Gem _som" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fil/-" +msgid "File/-" +msgstr "Fil/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Indstillinger/Test" +msgid "Options/Test" +msgstr "Indstillinger/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hjælp/_Om..." +msgid "Help/_About..." +msgstr "Hjælp/_Om..." #: logdrake:113 #, c-format @@ -3520,8 +3520,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Snakkesalig" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Auto-detektér printere" +#~ msgid "Autodetect _printers" +#~ msgstr "Auto-detektér printere" #~ msgid "Its GDB trace is:" #~ msgstr "dets GDB spor er:" diff --git a/perl-install/standalone/po/de.po b/perl-install/standalone/po/de.po index e199e2c17..7c382d6d2 100644 --- a/perl-install/standalone/po/de.po +++ b/perl-install/standalone/po/de.po @@ -46,13 +46,13 @@ msgstr "Kein Systemstarter gefunden, eine neue Konfiguration wird erzeugt" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Datei" +msgid "_File" +msgstr "_Datei" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Datei/_Beenden" +msgid "File/_Quit" +msgstr "Datei/_Beenden" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2245,28 +2245,28 @@ msgstr "Funktionen" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Optionen" +msgid "_Options" +msgstr "_Optionen" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hilfe" +msgid "_Help" +msgstr "_Hilfe" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modems automatisch erkennen" +msgid "Autodetect _modems" +msgstr "_Modems automatisch erkennen" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz-Laufwerke automatisch erkennen" +msgid "Autodetect _jaz drives" +msgstr "_Jaz-Laufwerke automatisch erkennen" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Parallele _Zip-Laufwerke automatisch erkennen" +msgid "Autodetect parallel _zip drives" +msgstr "Parallele _Zip-Laufwerke automatisch erkennen" #: harddrake2:192 #, c-format @@ -2275,13 +2275,13 @@ msgstr "Hardware Konfiguration" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Beenden" +msgid "_Quit" +msgstr "_Beenden" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Felderbeschreibung" +msgid "_Fields description" +msgstr "_Felderbeschreibung" #: harddrake2:212 #, c-format @@ -2313,13 +2313,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Fehler melden" +msgid "_Report Bug" +msgstr "_Fehler melden" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Über ..." +msgid "_About..." +msgstr "_Über ..." #: harddrake2:232 #, c-format @@ -2428,8 +2428,8 @@ msgstr "Nur für diesen Tag zeigen" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Datei/_Neu" +msgid "File/_New" +msgstr "Datei/_Neu" #: logdrake:75 #, c-format @@ -2438,8 +2438,8 @@ msgstr "-N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Datei/_Öffnen" +msgid "File/_Open" +msgstr "Datei/_Öffnen" #: logdrake:76 #, c-format @@ -2448,8 +2448,8 @@ msgstr "-O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Datei/_Speichern" +msgid "File/_Save" +msgstr "Datei/_Speichern" #: logdrake:77 #, c-format @@ -2458,23 +2458,23 @@ msgstr "-S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Datei/Speichern _unter" +msgid "File/Save _As" +msgstr "Datei/Speichern _unter" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Datei/-" +msgid "File/-" +msgstr "Datei/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Optionen/Test" +msgid "Options/Test" +msgstr "Optionen/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hilfe/_Über ..." +msgid "Help/_About..." +msgstr "Hilfe/_Über ..." #: logdrake:113 #, c-format @@ -3536,5 +3536,5 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Ausführlich" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Drucker automatisch erkennen" +#~ msgid "Autodetect _printers" +#~ msgstr "_Drucker automatisch erkennen" diff --git a/perl-install/standalone/po/el.po b/perl-install/standalone/po/el.po index 49f4053d7..e9e4837cd 100644 --- a/perl-install/standalone/po/el.po +++ b/perl-install/standalone/po/el.po @@ -51,13 +51,13 @@ msgstr "Δεν βρέθηκε πρόγραμμα εκκίνησης. Δημιο #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Αρχείο" +msgid "_File" +msgstr "_Αρχείο" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Αρχείο/Έ_ξοδος" +msgid "File/_Quit" +msgstr "Αρχείο/Έ_ξοδος" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2255,28 +2255,28 @@ msgstr "Χαρακτηριστικά" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Επιλογές" +msgid "_Options" +msgstr "_Επιλογές" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Βοήθεια" +msgid "_Help" +msgstr "_Βοήθεια" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Αυτόματος εντοπισμός _μόντεμ" +msgid "Autodetect _modems" +msgstr "Αυτόματος εντοπισμός _μόντεμ" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Αυτόματος εντοπισμός _οδηγών jaz" +msgid "Autodetect _jaz drives" +msgstr "Αυτόματος εντοπισμός _οδηγών jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Αυτόματος εντοπισμός παράλληλων οδηγών _zip" +msgid "Autodetect parallel _zip drives" +msgstr "Αυτόματος εντοπισμός παράλληλων οδηγών _zip" #: harddrake2:192 #, c-format @@ -2285,13 +2285,13 @@ msgstr "Ρύθμιση υλικού" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Έξοδος" +msgid "_Quit" +msgstr "_Έξοδος" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Περιγραφή των πεδίων" +msgid "_Fields description" +msgstr "_Περιγραφή των πεδίων" #: harddrake2:212 #, c-format @@ -2323,13 +2323,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Αναφορά σφάλματος" +msgid "_Report Bug" +msgstr "_Αναφορά σφάλματος" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Σχετικά με..." +msgid "_About..." +msgstr "_Σχετικά με..." #: harddrake2:232 #, c-format @@ -2438,8 +2438,8 @@ msgstr "Εμφάνιση μόνο για την επιλεγμένη ημέρα" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Αρχείο/_Νέο" +msgid "File/_New" +msgstr "Αρχείο/_Νέο" #: logdrake:75 #, c-format @@ -2448,8 +2448,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Αρχείο/Ά_νοιγμα" +msgid "File/_Open" +msgstr "Αρχείο/Ά_νοιγμα" #: logdrake:76 #, c-format @@ -2458,8 +2458,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Αρχείο/Απο_θήκευση" +msgid "File/_Save" +msgstr "Αρχείο/Απο_θήκευση" #: logdrake:77 #, c-format @@ -2468,23 +2468,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Αρχείο/Αποθήκευση _Ως" +msgid "File/Save _As" +msgstr "Αρχείο/Αποθήκευση _Ως" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Αρχείο/-" +msgid "File/-" +msgstr "Αρχείο/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Επιλογές/Δοκιμή" +msgid "Options/Test" +msgstr "Επιλογές/Δοκιμή" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Βοήθεια/_Σχετικά με..." +msgid "Help/_About..." +msgstr "Βοήθεια/_Σχετικά με..." #: logdrake:113 #, c-format @@ -3551,8 +3551,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Γραφικό με κείμενο" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Αυτόματος εντοπισμός _εκτυπωτών" +#~ msgid "Autodetect _printers" +#~ msgstr "Αυτόματος εντοπισμός _εκτυπωτών" #~ msgid "Its GDB trace is:" #~ msgstr "Το ίχνος GDB είναι :" diff --git a/perl-install/standalone/po/eo.po b/perl-install/standalone/po/eo.po index d058d7c35..89927684b 100644 --- a/perl-install/standalone/po/eo.po +++ b/perl-install/standalone/po/eo.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Dosiero" +msgid "_File" +msgstr "_Dosiero" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Dosiero/_Foriru" +msgid "File/_Quit" +msgstr "Dosiero/_Foriru" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2144,27 +2144,27 @@ msgstr "Funkcioj" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcioj" +msgid "_Options" +msgstr "_Opcioj" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Helpo" +msgid "_Help" +msgstr "_Helpo" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Malproksima printilo" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Malproksima printilo" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2174,12 +2174,12 @@ msgstr "Reta Konfiguraĵo" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Ĉesu" +msgid "_Quit" +msgstr "_Ĉesu" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Priskribo" #: harddrake2:212 @@ -2208,13 +2208,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raportu Cimo" +msgid "_Report Bug" +msgstr "_Raportu Cimo" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Pri..." +msgid "_About..." +msgstr "_Pri..." #: harddrake2:232 #, fuzzy, c-format @@ -2321,8 +2321,8 @@ msgstr "Montru nur por ĉi tiu tago" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Dosiero/_Nova" +msgid "File/_New" +msgstr "Dosiero/_Nova" #: logdrake:75 #, c-format @@ -2331,8 +2331,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Dosiero/_Malfermu" +msgid "File/_Open" +msgstr "Dosiero/_Malfermu" #: logdrake:76 #, c-format @@ -2341,8 +2341,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Dosiero/_Savu" +msgid "File/_Save" +msgstr "Dosiero/_Savu" #: logdrake:77 #, c-format @@ -2351,23 +2351,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Dosiero/Savu _Kiel" +msgid "File/Save _As" +msgstr "Dosiero/Savu _Kiel" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Dosiero/-" +msgid "File/-" +msgstr "Dosiero/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcioj/Provu" +msgid "Options/Test" +msgstr "Opcioj/Provu" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Helpo/_Pri..." +msgid "Help/_About..." +msgstr "Helpo/_Pri..." #: logdrake:113 #, c-format @@ -3351,7 +3351,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Malproksima printilo" #, fuzzy diff --git a/perl-install/standalone/po/es.po b/perl-install/standalone/po/es.po index 9c3fbf2e1..1d193de00 100644 --- a/perl-install/standalone/po/es.po +++ b/perl-install/standalone/po/es.po @@ -50,13 +50,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/Archivo" +msgid "_File" +msgstr "Archivo" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Archivo/_Salir" +msgid "File/_Quit" +msgstr "Archivo/_Salir" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2250,28 +2250,28 @@ msgstr "Características" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opciones" +msgid "_Options" +msgstr "_Opciones" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/A_yuda" +msgid "_Help" +msgstr "A_yuda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Autodetectar _módems" +msgid "Autodetect _modems" +msgstr "Autodetectar _módems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Autodetectar unidades _jaz" +msgid "Autodetect _jaz drives" +msgstr "Autodetectar unidades _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Autodetectar unidades _zip paralelo" +msgid "Autodetect parallel _zip drives" +msgstr "Autodetectar unidades _zip paralelo" #: harddrake2:192 #, c-format @@ -2280,13 +2280,13 @@ msgstr "Configuración del material" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Salir" +msgid "_Quit" +msgstr "_Salir" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Descripción de los campos" +msgid "_Fields description" +msgstr "_Descripción de los campos" #: harddrake2:212 #, c-format @@ -2318,13 +2318,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Reportar un error" +msgid "_Report Bug" +msgstr "_Reportar un error" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Acerca..." +msgid "_About..." +msgstr "_Acerca..." #: harddrake2:232 #, c-format @@ -2434,8 +2434,8 @@ msgstr "Mostrar sólo para el día seleccionado" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Archivo/_Nuevo" +msgid "File/_New" +msgstr "Archivo/_Nuevo" #: logdrake:75 #, c-format @@ -2444,8 +2444,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Archivo/_Abrir" +msgid "File/_Open" +msgstr "Archivo/_Abrir" #: logdrake:76 #, c-format @@ -2454,8 +2454,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Archivo/_Guardar" +msgid "File/_Save" +msgstr "Archivo/_Guardar" #: logdrake:77 #, c-format @@ -2464,23 +2464,23 @@ msgstr "G" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Archivo/Guardar _Como" +msgid "File/Save _As" +msgstr "Archivo/Guardar _Como" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Archivo/-" +msgid "File/-" +msgstr "Archivo/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opciones/Prueba" +msgid "Options/Test" +msgstr "Opciones/Prueba" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ayuda/_Acerca..." +msgid "Help/_About..." +msgstr "Ayuda/_Acerca..." #: logdrake:113 #, c-format @@ -2989,7 +2989,7 @@ msgstr "Configurando los módulos del kernel..." #: scannerdrake:328 scannerdrake:335 scannerdrake:365 #, c-format msgid "Auto-detect available ports" -msgstr "/Autodetectar puertos disponibles" +msgstr "Autodetectar puertos disponibles" #: scannerdrake:329 scannerdrake:375 #, c-format diff --git a/perl-install/standalone/po/et.po b/perl-install/standalone/po/et.po index 70cac4b7b..22676b79c 100644 --- a/perl-install/standalone/po/et.po +++ b/perl-install/standalone/po/et.po @@ -48,13 +48,13 @@ msgstr "Alglaadurit ei leitud, luuakse uus konfiguratsioon" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fail" +msgid "_File" +msgstr "_Fail" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fail/_Välju" +msgid "File/_Quit" +msgstr "Fail/_Välju" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2220,28 +2220,28 @@ msgstr "Omadused" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Eelistused" +msgid "_Options" +msgstr "_Eelistused" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Abi" +msgid "_Help" +msgstr "_Abi" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modemite automaattuvastus" +msgid "Autodetect _modems" +msgstr "_Modemite automaattuvastus" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_JAZ ketaste automaattuvastus" +msgid "Autodetect _jaz drives" +msgstr "_JAZ ketaste automaattuvastus" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Paralleelpordi _ZIP-ketaste automaattuvastus" +msgid "Autodetect parallel _zip drives" +msgstr "Paralleelpordi _ZIP-ketaste automaattuvastus" #: harddrake2:192 #, c-format @@ -2250,13 +2250,13 @@ msgstr "Riistvara seadistamine" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Välju" +msgid "_Quit" +msgstr "_Välju" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Välja_de kirjeldus" +msgid "_Fields description" +msgstr "Välja_de kirjeldus" #: harddrake2:212 #, c-format @@ -2288,13 +2288,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Veast teatamine" +msgid "_Report Bug" +msgstr "_Veast teatamine" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Misvärk" +msgid "_About..." +msgstr "_Misvärk" #: harddrake2:232 #, c-format @@ -2402,8 +2402,8 @@ msgstr "Ainult valitud päeval näitamine" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fail/_Uus" +msgid "File/_New" +msgstr "Fail/_Uus" #: logdrake:75 #, c-format @@ -2412,8 +2412,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fail/_Ava" +msgid "File/_Open" +msgstr "Fail/_Ava" #: logdrake:76 #, c-format @@ -2422,8 +2422,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fail/_Salvesta" +msgid "File/_Save" +msgstr "Fail/_Salvesta" #: logdrake:77 #, c-format @@ -2432,23 +2432,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fail/Salvesta _kui" +msgid "File/Save _As" +msgstr "Fail/Salvesta _kui" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fail/-" +msgid "File/-" +msgstr "Fail/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Eelistused/Test" +msgid "Options/Test" +msgstr "Eelistused/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Abi/_Misvärk" +msgid "Help/_About..." +msgstr "Abi/_Misvärk" #: logdrake:113 #, c-format @@ -3493,8 +3493,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Jutukas" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Printerite automaattuvastus" +#~ msgid "Autodetect _printers" +#~ msgstr "_Printerite automaattuvastus" #~ msgid "Its GDB trace is:" #~ msgstr "Selle GDB tagasijälitus on järgmine:" diff --git a/perl-install/standalone/po/eu.po b/perl-install/standalone/po/eu.po index e0ea4fb2a..f833b67ca 100644 --- a/perl-install/standalone/po/eu.po +++ b/perl-install/standalone/po/eu.po @@ -51,13 +51,13 @@ msgstr "Ez da abio-zamatzailerik aurkitu, konfigurazio berria sortzen" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fitxategia" +msgid "_File" +msgstr "_Fitxategia" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fitxategia/I_rten" +msgid "File/_Quit" +msgstr "Fitxategia/I_rten" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2243,28 +2243,28 @@ msgstr "Ezaugarriak" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Aukerak" +msgid "_Options" +msgstr "_Aukerak" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Laguntza" +msgid "_Help" +msgstr "_Laguntza" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Autodetektatu _modemak" +msgid "Autodetect _modems" +msgstr "Autodetektatu _modemak" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Autodetektatu _jaz unitateak" +msgid "Autodetect _jaz drives" +msgstr "Autodetektatu _jaz unitateak" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Autodetektatu zip _unitate paraleloak" +msgid "Autodetect parallel _zip drives" +msgstr "Autodetektatu zip _unitate paraleloak" #: harddrake2:192 #, c-format @@ -2273,13 +2273,13 @@ msgstr "Hardware konfiguraketa" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Irten" +msgid "_Quit" +msgstr "_Irten" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Eremuen azalpena" +msgid "_Fields description" +msgstr "_Eremuen azalpena" #: harddrake2:212 #, c-format @@ -2311,13 +2311,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Akatsen berri-ematea" +msgid "_Report Bug" +msgstr "_Akatsen berri-ematea" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Honi buruz..." +msgid "_About..." +msgstr "_Honi buruz..." #: harddrake2:232 #, c-format @@ -2426,8 +2426,8 @@ msgstr "Hautatutako egunerako bakarrik erakutsi" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fitxategia/_Berria" +msgid "File/_New" +msgstr "Fitxategia/_Berria" #: logdrake:75 #, c-format @@ -2436,8 +2436,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fitxategia/_Ireki" +msgid "File/_Open" +msgstr "Fitxategia/_Ireki" #: logdrake:76 #, c-format @@ -2446,8 +2446,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fitxategia/_Gorde" +msgid "File/_Save" +msgstr "Fitxategia/_Gorde" #: logdrake:77 #, c-format @@ -2456,23 +2456,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fitxategia/Gorde _honela" +msgid "File/Save _As" +msgstr "Fitxategia/Gorde _honela" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fitxategia/-" +msgid "File/-" +msgstr "Fitxategia/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Aukerak/Probatu" +msgid "Options/Test" +msgstr "Aukerak/Probatu" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Laguntza/_Honi buruz..." +msgid "Help/_About..." +msgstr "Laguntza/_Honi buruz..." #: logdrake:113 #, c-format @@ -3516,8 +3516,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Berritsua" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Autodetektatu _inprimagailuak" +#~ msgid "Autodetect _printers" +#~ msgstr "Autodetektatu _inprimagailuak" #~ msgid "Its GDB trace is:" #~ msgstr "Bere GDB aztarna:" diff --git a/perl-install/standalone/po/fa.po b/perl-install/standalone/po/fa.po index 493ce9f4d..716c02219 100644 --- a/perl-install/standalone/po/fa.po +++ b/perl-install/standalone/po/fa.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_پرونده" +msgid "_File" +msgstr "_پرونده" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/پرونده/_خروج" +msgid "File/_Quit" +msgstr "پرونده/_خروج" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2230,27 +2230,27 @@ msgstr "قابلیتها" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_گزینه‌ها" +msgid "_Options" +msgstr "_گزینه‌ها" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/ـراهنما" +msgid "_Help" +msgstr "ـراهنما" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/شناسایی‌خودکار _مودم‌ها" +msgid "Autodetect _modems" +msgstr "شناسایی‌خودکار _مودم‌ها" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/شناسایی _خودکار راه‌انداز jaz" +msgid "Autodetect _jaz drives" +msgstr "شناسایی _خودکار راه‌انداز jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2260,13 +2260,13 @@ msgstr "پیکربندی شبکه" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_ترک" +msgid "_Quit" +msgstr "_ترک" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/توضیحات _محوطه‌ها" +msgid "_Fields description" +msgstr "توضیحات _محوطه‌ها" #: harddrake2:212 #, c-format @@ -2298,13 +2298,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_گزارش اشکال" +msgid "_Report Bug" +msgstr "_گزارش اشکال" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_درباره..." +msgid "_About..." +msgstr "_درباره..." #: harddrake2:232 #, fuzzy, c-format @@ -2411,8 +2411,8 @@ msgstr "فقط برای روز انتخاب شده نشان داده شود" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/پرونده/_جدید" +msgid "File/_New" +msgstr "پرونده/_جدید" #: logdrake:75 #, c-format @@ -2421,8 +2421,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/پرونده/_باز کردن" +msgid "File/_Open" +msgstr "پرونده/_باز کردن" #: logdrake:76 #, c-format @@ -2431,8 +2431,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/پرونده/_ذخیره" +msgid "File/_Save" +msgstr "پرونده/_ذخیره" #: logdrake:77 #, c-format @@ -2441,23 +2441,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/پرونده/ذخیره _بنام" +msgid "File/Save _As" +msgstr "پرونده/ذخیره _بنام" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/پرونده/-" +msgid "File/-" +msgstr "پرونده/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/گزینه‌ها/آزمایش" +msgid "Options/Test" +msgstr "گزینه‌ها/آزمایش" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/راهنما/_درباره..." +msgid "Help/_About..." +msgstr "راهنما/_درباره..." #: logdrake:113 #, c-format @@ -3497,8 +3497,8 @@ msgstr "پیکربندی اخطار پست" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/شناسایی‌خودکار _چاپگرها" +#~ msgid "Autodetect _printers" +#~ msgstr "شناسایی‌خودکار _چاپگرها" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/fi.po b/perl-install/standalone/po/fi.po index ed39c10a7..2c66ecb64 100644 --- a/perl-install/standalone/po/fi.po +++ b/perl-install/standalone/po/fi.po @@ -56,13 +56,13 @@ msgstr "Käynnistyslatainta ei löytynyt, luodaan uudet asetukset" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Tiedosto" +msgid "_File" +msgstr "_Tiedosto" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Tiedosto/_Lopeta" +msgid "File/_Quit" +msgstr "Tiedosto/_Lopeta" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2234,28 +2234,28 @@ msgstr "Ominaisuudet" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Asetukset" +msgid "_Options" +msgstr "_Asetukset" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/O_hje" +msgid "_Help" +msgstr "O_hje" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modeemien automaattitunnistus" +msgid "Autodetect _modems" +msgstr "_Modeemien automaattitunnistus" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz-asemien automaattitunnistus" +msgid "Autodetect _jaz drives" +msgstr "_Jaz-asemien automaattitunnistus" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Rinnakkaisporttiin liitettyjen _ZIP-asemien automaattitunnistus" +msgid "Autodetect parallel _zip drives" +msgstr "Rinnakkaisporttiin liitettyjen _ZIP-asemien automaattitunnistus" #: harddrake2:192 #, c-format @@ -2264,13 +2264,13 @@ msgstr "Laitteistoasetukset" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Lopeta" +msgid "_Quit" +msgstr "_Lopeta" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Kenttien kuvaus" +msgid "_Fields description" +msgstr "_Kenttien kuvaus" #: harddrake2:212 #, c-format @@ -2299,13 +2299,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raportoi virheestä" +msgid "_Report Bug" +msgstr "_Raportoi virheestä" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Tietoja..." +msgid "_About..." +msgstr "_Tietoja..." #: harddrake2:232 #, c-format @@ -2413,8 +2413,8 @@ msgstr "Näytä vain valittu päivä" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Tiedosto/_Uusi" +msgid "File/_New" +msgstr "Tiedosto/_Uusi" #: logdrake:75 #, c-format @@ -2423,8 +2423,8 @@ msgstr "U" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Tiedosto/_Avaa" +msgid "File/_Open" +msgstr "Tiedosto/_Avaa" #: logdrake:76 #, c-format @@ -2433,8 +2433,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Tiedosto/_Tallenna" +msgid "File/_Save" +msgstr "Tiedosto/_Tallenna" #: logdrake:77 #, c-format @@ -2443,23 +2443,23 @@ msgstr "T" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Tiedosto/Tallenna _nimellä" +msgid "File/Save _As" +msgstr "Tiedosto/Tallenna _nimellä" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Tiedosto/-" +msgid "File/-" +msgstr "Tiedosto/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Asetukset/Testaa" +msgid "Options/Test" +msgstr "Asetukset/Testaa" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ohje/_Tietoja..." +msgid "Help/_About..." +msgstr "Ohje/_Tietoja..." #: logdrake:113 #, c-format @@ -3507,8 +3507,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Monisanainen" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Tulostimien automaattitunnistus" +#~ msgid "Autodetect _printers" +#~ msgstr "_Tulostimien automaattitunnistus" #~ msgid "Its GDB trace is:" #~ msgstr "Ohjelman GDB-jäljitys:" diff --git a/perl-install/standalone/po/fr.po b/perl-install/standalone/po/fr.po index 9c853d393..0604e0470 100644 --- a/perl-install/standalone/po/fr.po +++ b/perl-install/standalone/po/fr.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fichier" +msgid "_File" +msgstr "_Fichier" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fichier/_Quitter" +msgid "File/_Quit" +msgstr "Fichier/_Quitter" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2258,28 +2258,28 @@ msgstr "Fonctionnalités" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Options" +msgid "_Options" +msgstr "_Options" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Aide" +msgid "_Help" +msgstr "_Aide" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-détecter les _modems" +msgid "Autodetect _modems" +msgstr "Auto-détecter les _modems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Auto-détecter les périphériques _Jaz" +msgid "Autodetect _jaz drives" +msgstr "Auto-détecter les périphériques _Jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Auto-détecter les périphériques parallèles _Zip" +msgid "Autodetect parallel _zip drives" +msgstr "Auto-détecter les périphériques parallèles _Zip" #: harddrake2:192 #, c-format @@ -2288,13 +2288,13 @@ msgstr "Configuration du matériel" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Quitter" +msgid "_Quit" +msgstr "_Quitter" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Description des champs" +msgid "_Fields description" +msgstr "_Description des champs" #: harddrake2:212 #, c-format @@ -2326,13 +2326,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Signaler un bogue" +msgid "_Report Bug" +msgstr "_Signaler un bogue" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_A propos…" +msgid "_About..." +msgstr "_A propos…" #: harddrake2:232 #, c-format @@ -2441,8 +2441,8 @@ msgstr "N'afficher que pour le jour sélectionné" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fichier/_Nouveau" +msgid "File/_New" +msgstr "Fichier/_Nouveau" #: logdrake:75 #, c-format @@ -2451,8 +2451,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fichier/_Ouvrir" +msgid "File/_Open" +msgstr "Fichier/_Ouvrir" #: logdrake:76 #, c-format @@ -2461,8 +2461,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fichier/Enregi_strer" +msgid "File/_Save" +msgstr "Fichier/Enregi_strer" #: logdrake:77 #, c-format @@ -2471,23 +2471,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fichier/_Enregistrer sous" +msgid "File/Save _As" +msgstr "Fichier/_Enregistrer sous" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fichier/-" +msgid "File/-" +msgstr "Fichier/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Options/Test" +msgid "Options/Test" +msgstr "Options/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Aide/_A propos…" +msgid "Help/_About..." +msgstr "Aide/_A propos…" #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/fur.po b/perl-install/standalone/po/fur.po index 5258e86e8..641ff0539 100644 --- a/perl-install/standalone/po/fur.po +++ b/perl-install/standalone/po/fur.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_File" +msgid "_File" +msgstr "_File" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/File/_Jessî" +msgid "File/_Quit" +msgstr "File/_Jessî" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2142,27 +2142,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opzions" +msgid "_Options" +msgstr "_Opzions" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Jutori" +msgid "_Help" +msgstr "_Jutori" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2172,12 +2172,12 @@ msgstr "Configurazion Xorg" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Jessî" +msgid "_Quit" +msgstr "_Jessî" #: harddrake2:210 #, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "" #: harddrake2:212 @@ -2206,13 +2206,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Segnale un Bug" +msgid "_Report Bug" +msgstr "_Segnale un Bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Informazions su..." +msgid "_About..." +msgstr "_Informazions su..." #: harddrake2:232 #, fuzzy, c-format @@ -2319,8 +2319,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/_Gnûf" +msgid "File/_New" +msgstr "File/_Gnûf" #: logdrake:75 #, c-format @@ -2329,7 +2329,7 @@ msgstr "" #: logdrake:76 #, c-format -msgid "/File/_Open" +msgid "File/_Open" msgstr "" #: logdrake:76 @@ -2339,8 +2339,8 @@ msgstr "" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/File/_Salve" +msgid "File/_Save" +msgstr "File/_Salve" #: logdrake:77 #, c-format @@ -2349,23 +2349,23 @@ msgstr "" #: logdrake:78 #, c-format -msgid "/File/Save _As" +msgid "File/Save _As" msgstr "" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/File/-" +msgid "File/-" +msgstr "File/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opzions/Prove" +msgid "Options/Test" +msgstr "Opzions/Prove" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Jutori/_Informazions su..." +msgid "Help/_About..." +msgstr "Jutori/_Informazions su..." #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/ga.po b/perl-install/standalone/po/ga.po index 21719e279..b8dfea789 100644 --- a/perl-install/standalone/po/ga.po +++ b/perl-install/standalone/po/ga.po @@ -45,13 +45,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Comhad" +msgid "_File" +msgstr "_Comhad" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Comhad/_Ealu" +msgid "File/_Quit" +msgstr "Comhad/_Ealu" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2140,27 +2140,27 @@ msgstr "Tréithe" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Roghanna" +msgid "_Options" +msgstr "_Roghanna" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/C_úidiú" +msgid "_Help" +msgstr "C_úidiú" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Scríos Printéir" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Scríos Printéir" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2170,12 +2170,12 @@ msgstr "Cumraíocht Gréasánú" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Ealu" +msgid "_Quit" +msgstr "_Ealu" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Cuntas" #: harddrake2:212 @@ -2204,13 +2204,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Tuairaisc Fabht" +msgid "_Report Bug" +msgstr "_Tuairaisc Fabht" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Faoi..." +msgid "_About..." +msgstr "_Faoi..." #: harddrake2:232 #, fuzzy, c-format @@ -2317,8 +2317,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Comhad/_Nua" +msgid "File/_New" +msgstr "Comhad/_Nua" #: logdrake:75 #, c-format @@ -2327,8 +2327,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Comhad/_Oscail" +msgid "File/_Open" +msgstr "Comhad/_Oscail" #: logdrake:76 #, c-format @@ -2337,8 +2337,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Comhad/_Sábháil" +msgid "File/_Save" +msgstr "Comhad/_Sábháil" #: logdrake:77 #, c-format @@ -2347,23 +2347,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Comhad/Sábháil _Mar" +msgid "File/Save _As" +msgstr "Comhad/Sábháil _Mar" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Comhad/-" +msgid "File/-" +msgstr "Comhad/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Roghnachais/Teastáil" +msgid "Options/Test" +msgstr "Roghnachais/Teastáil" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Cúidiú/_Faoi..." +msgid "Help/_About..." +msgstr "Cúidiú/_Faoi..." #: logdrake:113 #, c-format @@ -3350,7 +3350,7 @@ msgstr "" #~ msgstr "Foclach" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Scríos Printéir" #~ msgid "OpenOffice.org" diff --git a/perl-install/standalone/po/gl.po b/perl-install/standalone/po/gl.po index 9ee08ab47..1876b68d3 100644 --- a/perl-install/standalone/po/gl.po +++ b/perl-install/standalone/po/gl.po @@ -52,13 +52,13 @@ msgstr "Non se atopou o cargador de arrinque, creando unha nova configuración" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Ficheiro" +msgid "_File" +msgstr "_Ficheiro" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Ficheiro/_Saír" +msgid "File/_Quit" +msgstr "Ficheiro/_Saír" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2253,28 +2253,28 @@ msgstr "Funcionalidades" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcións" +msgid "_Options" +msgstr "_Opcións" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/A_xuda" +msgid "_Help" +msgstr "A_xuda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Detectar automáticamente os _módems" +msgid "Autodetect _modems" +msgstr "Detectar automáticamente os _módems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Detectar automáticamente as unidades _jazz" +msgid "Autodetect _jaz drives" +msgstr "Detectar automáticamente as unidades _jazz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Detectar automaticamente as unidades _zip paralelas" +msgid "Autodetect parallel _zip drives" +msgstr "Detectar automaticamente as unidades _zip paralelas" #: harddrake2:192 #, c-format @@ -2283,13 +2283,13 @@ msgstr "Configuración do Hardware" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/S_aír" +msgid "_Quit" +msgstr "S_aír" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Descrición _dos campos" +msgid "_Fields description" +msgstr "Descrición _dos campos" #: harddrake2:212 #, c-format @@ -2321,13 +2321,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Comunicar Erro" +msgid "_Report Bug" +msgstr "_Comunicar Erro" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Acerca de..." +msgid "_About..." +msgstr "_Acerca de..." #: harddrake2:232 #, c-format @@ -2436,8 +2436,8 @@ msgstr "Amosar só do día seleccionado" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Ficheiro/_Novo" +msgid "File/_New" +msgstr "Ficheiro/_Novo" #: logdrake:75 #, c-format @@ -2446,8 +2446,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Ficheiro/_Abrir" +msgid "File/_Open" +msgstr "Ficheiro/_Abrir" #: logdrake:76 #, c-format @@ -2456,8 +2456,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Ficheiro/_Gardar" +msgid "File/_Save" +msgstr "Ficheiro/_Gardar" #: logdrake:77 #, c-format @@ -2466,23 +2466,23 @@ msgstr "G" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Ficheiro/Gardar _Coma" +msgid "File/Save _As" +msgstr "Ficheiro/Gardar _Coma" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Ficheiro/-" +msgid "File/-" +msgstr "Ficheiro/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcións/Proba" +msgid "Options/Test" +msgstr "Opcións/Proba" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Axuda/_Acerca de..." +msgid "Help/_About..." +msgstr "Axuda/_Acerca de..." #: logdrake:113 #, c-format @@ -3526,8 +3526,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Detallado" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Detectar automáticamente as im_presoras" +#~ msgid "Autodetect _printers" +#~ msgstr "Detectar automáticamente as im_presoras" #~ msgid "Its GDB trace is:" #~ msgstr "A traza de GDB é:" diff --git a/perl-install/standalone/po/he.po b/perl-install/standalone/po/he.po index e1e69ad35..11a720c70 100644 --- a/perl-install/standalone/po/he.po +++ b/perl-install/standalone/po/he.po @@ -55,13 +55,13 @@ msgstr "לא נמצא מנהל אתחול, יוצר תצורה חדשה" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_קובץ" +msgid "_File" +msgstr "_קובץ" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/קובץ/_יציאה" +msgid "File/_Quit" +msgstr "קובץ/_יציאה" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2235,28 +2235,28 @@ msgstr "תכונות" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_אפשרויות" +msgid "_Options" +msgstr "_אפשרויות" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_עזרה" +msgid "_Help" +msgstr "_עזרה" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/זיהוי אוטומטי של _מודמים" +msgid "Autodetect _modems" +msgstr "זיהוי אוטומטי של _מודמים" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/זיהוי אוטומטי של כונני _jaz" +msgid "Autodetect _jaz drives" +msgstr "זיהוי אוטומטי של כונני _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/זיהוי אוטומטי של כונני _zip" +msgid "Autodetect parallel _zip drives" +msgstr "זיהוי אוטומטי של כונני _zip" #: harddrake2:192 #, c-format @@ -2265,13 +2265,13 @@ msgstr "הגדרת חומרה" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_יציאה" +msgid "_Quit" +msgstr "_יציאה" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/תיאור _שדות" +msgid "_Fields description" +msgstr "תיאור _שדות" #: harddrake2:212 #, c-format @@ -2303,13 +2303,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_דיווח באג" +msgid "_Report Bug" +msgstr "_דיווח באג" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_אודות..." +msgid "_About..." +msgstr "_אודות..." #: harddrake2:232 #, c-format @@ -2416,8 +2416,8 @@ msgstr "הראה רק את היום הנבחר" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/קובץ/_חדש" +msgid "File/_New" +msgstr "קובץ/_חדש" #: logdrake:75 #, c-format @@ -2426,8 +2426,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/קובץ/_פתיחה" +msgid "File/_Open" +msgstr "קובץ/_פתיחה" #: logdrake:76 #, c-format @@ -2436,8 +2436,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/קובץ/_שמירה" +msgid "File/_Save" +msgstr "קובץ/_שמירה" #: logdrake:77 #, c-format @@ -2446,23 +2446,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/קובץ/שמירה _בשם" +msgid "File/Save _As" +msgstr "קובץ/שמירה _בשם" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/קובץ/-" +msgid "File/-" +msgstr "קובץ/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/אפשרויות/בדיקה" +msgid "Options/Test" +msgstr "אפשרויות/בדיקה" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/עזרה/_אודות..." +msgid "Help/_About..." +msgstr "עזרה/_אודות..." #: logdrake:113 #, c-format @@ -3486,8 +3486,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "מפורט" -#~ msgid "/Autodetect _printers" -#~ msgstr "/זיהוי _מדפסות אוטומטי" +#~ msgid "Autodetect _printers" +#~ msgstr "זיהוי _מדפסות אוטומטי" #~ msgid "Its GDB trace is:" #~ msgstr "פלט ה-GDB שהתקבל הוא:" diff --git a/perl-install/standalone/po/hi.po b/perl-install/standalone/po/hi.po index 7ec008462..a05982b09 100644 --- a/perl-install/standalone/po/hi.po +++ b/perl-install/standalone/po/hi.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/संचिका (_F)" +msgid "_File" +msgstr "संचिका (_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/संचिका (F)/निकास (_Q)" +msgid "File/_Quit" +msgstr "संचिका (F)/निकास (_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2210,27 +2210,27 @@ msgstr "विशेषताएँ" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/विकल्प (_O)" +msgid "_Options" +msgstr "विकल्प (_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/सहायता (_H)" +msgid "_Help" +msgstr "सहायता (_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/स्वतःखोजी मॉडम (_m)" +msgid "Autodetect _modems" +msgstr "स्वतःखोजी मॉडम (_m)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/जैज़ ड्राइवों की स्वतः खोज (_j)" +msgid "Autodetect _jaz drives" +msgstr "जैज़ ड्राइवों की स्वतः खोज (_j)" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2240,13 +2240,13 @@ msgstr "नेटवर्क संरचना" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/निर्गम (_Q)" +msgid "_Quit" +msgstr "निर्गम (_Q)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/प्रविष्टियों का विवरण (_F)" +msgid "_Fields description" +msgstr "प्रविष्टियों का विवरण (_F)" #: harddrake2:212 #, c-format @@ -2278,13 +2278,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/दोष के बारे में बतायें (_R)" +msgid "_Report Bug" +msgstr "दोष के बारे में बतायें (_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/के बारे में (_A)..." +msgid "_About..." +msgstr "के बारे में (_A)..." #: harddrake2:232 #, fuzzy, c-format @@ -2391,8 +2391,8 @@ msgstr "सिर्फ़ चयनित दिवस के लिए ही द #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/संचिका (F)/नवीन (_N)" +msgid "File/_New" +msgstr "संचिका (F)/नवीन (_N)" #: logdrake:75 #, c-format @@ -2401,8 +2401,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/संचिका (F)/खोलें (_O)" +msgid "File/_Open" +msgstr "संचिका (F)/खोलें (_O)" #: logdrake:76 #, c-format @@ -2411,8 +2411,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/संचिका (F)/सुरक्षित (_S)" +msgid "File/_Save" +msgstr "संचिका (F)/सुरक्षित (_S)" #: logdrake:77 #, c-format @@ -2421,23 +2421,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/संचिका (F)/जैसे सुरक्षित करें ( _A)" +msgid "File/Save _As" +msgstr "संचिका (F)/जैसे सुरक्षित करें ( _A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/संचिका (F)/-" +msgid "File/-" +msgstr "संचिका (F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/विकल्प (O)/परीक्षण" +msgid "Options/Test" +msgstr "विकल्प (O)/परीक्षण" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/सहायता (H)/के बारें में (_A)..." +msgid "Help/_About..." +msgstr "सहायता (H)/के बारें में (_A)..." #: logdrake:113 #, c-format @@ -3466,8 +3466,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "बड़बोला" -#~ msgid "/Autodetect _printers" -#~ msgstr "/प्रिंटरों की स्वतः खोज (_p)" +#~ msgid "Autodetect _printers" +#~ msgstr "प्रिंटरों की स्वतः खोज (_p)" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/hr.po b/perl-install/standalone/po/hr.po index f9708ba73..a4b8c4a6d 100644 --- a/perl-install/standalone/po/hr.po +++ b/perl-install/standalone/po/hr.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Datoteka" +msgid "_File" +msgstr "_Datoteka" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Datoteka/_Izlaz" +msgid "File/_Quit" +msgstr "Datoteka/_Izlaz" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2175,27 +2175,27 @@ msgstr "Značajke" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Odrednice" +msgid "_Options" +msgstr "_Odrednice" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pomoć" +msgid "_Help" +msgstr "_Pomoć" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Koristi auto detekciju" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Koristi auto detekciju" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2205,12 +2205,12 @@ msgstr "Mrežne postavke" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Završi" +msgid "_Quit" +msgstr "_Završi" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Opis" #: harddrake2:212 @@ -2239,13 +2239,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Prijavite Grešku" +msgid "_Report Bug" +msgstr "_Prijavite Grešku" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O..." +msgid "_About..." +msgstr "_O..." #: harddrake2:232 #, fuzzy, c-format @@ -2354,8 +2354,8 @@ msgstr "Pokaži samo izabrani dan" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Datoteka/_Nova" +msgid "File/_New" +msgstr "Datoteka/_Nova" #: logdrake:75 #, c-format @@ -2364,8 +2364,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Datoteka/_Otvori" +msgid "File/_Open" +msgstr "Datoteka/_Otvori" #: logdrake:76 #, c-format @@ -2374,8 +2374,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Datoteka/_Spremi" +msgid "File/_Save" +msgstr "Datoteka/_Spremi" #: logdrake:77 #, c-format @@ -2384,23 +2384,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Datoteka/Snimi_kao" +msgid "File/Save _As" +msgstr "Datoteka/Snimi_kao" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Datoteka/-" +msgid "File/-" +msgstr "Datoteka/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcije/Proba" +msgid "Options/Test" +msgstr "Opcije/Proba" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoć/_O..." +msgid "Help/_About..." +msgstr "Pomoć/_O..." #: logdrake:113 #, c-format @@ -3403,7 +3403,7 @@ msgstr "" #~ msgstr "Opširno" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Koristi auto detekciju" #, fuzzy diff --git a/perl-install/standalone/po/hu.po b/perl-install/standalone/po/hu.po index 9abe95932..ee322856b 100644 --- a/perl-install/standalone/po/hu.po +++ b/perl-install/standalone/po/hu.po @@ -54,13 +54,13 @@ msgstr "Rendszerindító nem található; új beállítás készítése" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fájl" +msgid "_File" +msgstr "_Fájl" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fájl/Ki_lépés" +msgid "File/_Quit" +msgstr "Fájl/Ki_lépés" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2249,28 +2249,28 @@ msgstr "Tulajdonságok" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Beállítások" +msgid "_Options" +msgstr "_Beállítások" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Segítség" +msgid "_Help" +msgstr "_Segítség" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modemek automatikus felderítése" +msgid "Autodetect _modems" +msgstr "_Modemek automatikus felderítése" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz meghajtók automatikus felderítése" +msgid "Autodetect _jaz drives" +msgstr "_Jaz meghajtók automatikus felderítése" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/_Párhuzamos Zip meghajtók automatikus felderítése" +msgid "Autodetect parallel _zip drives" +msgstr "_Párhuzamos Zip meghajtók automatikus felderítése" #: harddrake2:192 #, c-format @@ -2279,13 +2279,13 @@ msgstr "Hardverbeállítás" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Kilépés" +msgid "_Quit" +msgstr "_Kilépés" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Mezőleírások" +msgid "_Fields description" +msgstr "_Mezőleírások" #: harddrake2:212 #, c-format @@ -2317,13 +2317,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Hibabejelentés" +msgid "_Report Bug" +msgstr "_Hibabejelentés" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Névjegy..." +msgid "_About..." +msgstr "_Névjegy..." #: harddrake2:232 #, c-format @@ -2432,8 +2432,8 @@ msgstr "Csak a kijelölt napot jelenítse meg" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fájl/Ú_j" +msgid "File/_New" +msgstr "Fájl/Ú_j" #: logdrake:75 #, c-format @@ -2442,8 +2442,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fájl/_Megnyitás" +msgid "File/_Open" +msgstr "Fájl/_Megnyitás" #: logdrake:76 #, c-format @@ -2452,8 +2452,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fájl/M_entés" +msgid "File/_Save" +msgstr "Fájl/M_entés" #: logdrake:77 #, c-format @@ -2462,23 +2462,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fájl/Mentés más_ként" +msgid "File/Save _As" +msgstr "Fájl/Mentés más_ként" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fájl/-" +msgid "File/-" +msgstr "Fájl/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Beállítások/Próba" +msgid "Options/Test" +msgstr "Beállítások/Próba" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Segítség/_Névjegy..." +msgid "Help/_About..." +msgstr "Segítség/_Névjegy..." #: logdrake:113 #, c-format @@ -3517,8 +3517,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Részletes" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Nyomtatók automatikus felderítése" +#~ msgid "Autodetect _printers" +#~ msgstr "_Nyomtatók automatikus felderítése" #~ msgid "Its GDB trace is:" #~ msgstr "A GDB kimenete:" diff --git a/perl-install/standalone/po/id.po b/perl-install/standalone/po/id.po index ef2eed180..69c9b8042 100644 --- a/perl-install/standalone/po/id.po +++ b/perl-install/standalone/po/id.po @@ -58,13 +58,13 @@ msgstr "Tidak ada bootloader yang ditemukan, membuat konfigurasi baru" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_File" +msgid "_File" +msgstr "_File" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/File/_Keluar" +msgid "File/_Quit" +msgstr "File/_Keluar" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2252,28 +2252,28 @@ msgstr "Fitur" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opsi" +msgid "_Options" +msgstr "_Opsi" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/Bantuan" +msgid "_Help" +msgstr "Bantuan" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Pendeteksian otomatis _modem" +msgid "Autodetect _modems" +msgstr "Pendeteksian otomatis _modem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Pendeteksian otomatis driver _jaz" +msgid "Autodetect _jaz drives" +msgstr "Pendeteksian otomatis driver _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Pendeteksian otomatis drive _zip paralel" +msgid "Autodetect parallel _zip drives" +msgstr "Pendeteksian otomatis drive _zip paralel" #: harddrake2:192 #, c-format @@ -2282,13 +2282,13 @@ msgstr "Konfigurasi Hardware" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Keluar" +msgid "_Quit" +msgstr "_Keluar" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Deskripsi kolom" +msgid "_Fields description" +msgstr "Deskripsi kolom" #: harddrake2:212 #, c-format @@ -2320,13 +2320,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/Lapo_rkan Bug" +msgid "_Report Bug" +msgstr "Lapo_rkan Bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/Tent_ang..." +msgid "_About..." +msgstr "Tent_ang..." #: harddrake2:232 #, c-format @@ -2435,8 +2435,8 @@ msgstr "Tampilkan hanya hari terpilih" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/Baru" +msgid "File/_New" +msgstr "File/Baru" #: logdrake:75 #, c-format @@ -2445,8 +2445,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/File/Buka" +msgid "File/_Open" +msgstr "File/Buka" #: logdrake:76 #, c-format @@ -2455,8 +2455,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/File/_Simpan" +msgid "File/_Save" +msgstr "File/_Simpan" #: logdrake:77 #, c-format @@ -2465,23 +2465,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/File/Simpan Seb_agai" +msgid "File/Save _As" +msgstr "File/Simpan Seb_agai" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/File/-" +msgid "File/-" +msgstr "File/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opsi/Tes" +msgid "Options/Test" +msgstr "Opsi/Tes" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Bantuan/Tent_ang..." +msgid "Help/_About..." +msgstr "Bantuan/Tent_ang..." #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/is.po b/perl-install/standalone/po/is.po index 3bbd99f0e..274409585 100644 --- a/perl-install/standalone/po/is.po +++ b/perl-install/standalone/po/is.po @@ -53,13 +53,13 @@ msgstr "Ekkert ræsiforrit fannst, bý til nýja uppsetningu" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Skrá" +msgid "_File" +msgstr "_Skrá" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Skrá/_Hætta" +msgid "File/_Quit" +msgstr "Skrá/_Hætta" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2240,28 +2240,28 @@ msgstr "Eiginleikar" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Valkostir" +msgid "_Options" +msgstr "_Valkostir" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hjálp" +msgid "_Help" +msgstr "_Hjálp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Finna _mótöld sjálfkrafa" +msgid "Autodetect _modems" +msgstr "Finna _mótöld sjálfkrafa" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Finna _jaz drif sjálfkrafa" +msgid "Autodetect _jaz drives" +msgstr "Finna _jaz drif sjálfkrafa" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Finna sjálfkrafa hliðtengd _zip drif" +msgid "Autodetect parallel _zip drives" +msgstr "Finna sjálfkrafa hliðtengd _zip drif" #: harddrake2:192 #, c-format @@ -2270,13 +2270,13 @@ msgstr "Vélbúnaðarstillingar" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Hætta" +msgid "_Quit" +msgstr "_Hætta" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Lýsing svæða" +msgid "_Fields description" +msgstr "_Lýsing svæða" #: harddrake2:212 #, c-format @@ -2308,13 +2308,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Senda villutilkynningu" +msgid "_Report Bug" +msgstr "_Senda villutilkynningu" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Um..." +msgid "_About..." +msgstr "_Um..." #: harddrake2:232 #, c-format @@ -2421,8 +2421,8 @@ msgstr "Sýna aðeins fyrir valinn dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Skrá/_Ný" +msgid "File/_New" +msgstr "Skrá/_Ný" #: logdrake:75 #, c-format @@ -2431,8 +2431,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Skrá/_Opna" +msgid "File/_Open" +msgstr "Skrá/_Opna" #: logdrake:76 #, c-format @@ -2441,8 +2441,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Skrá/_Vista" +msgid "File/_Save" +msgstr "Skrá/_Vista" #: logdrake:77 #, c-format @@ -2451,23 +2451,23 @@ msgstr "V" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Skrá/Vista _sem" +msgid "File/Save _As" +msgstr "Skrá/Vista _sem" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Skrá/-" +msgid "File/-" +msgstr "Skrá/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Valkostir/Prófun" +msgid "Options/Test" +msgstr "Valkostir/Prófun" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hjálp/_Um..." +msgid "Help/_About..." +msgstr "Hjálp/_Um..." #: logdrake:113 #, c-format @@ -3505,8 +3505,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Mælskt" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Finna _prentara sjálfkrafa" +#~ msgid "Autodetect _printers" +#~ msgstr "Finna _prentara sjálfkrafa" #~ msgid "Its GDB trace is:" #~ msgstr "GDB aflúsunar-upplýsingar eru:" diff --git a/perl-install/standalone/po/it.po b/perl-install/standalone/po/it.po index 2af297460..2dc197997 100644 --- a/perl-install/standalone/po/it.po +++ b/perl-install/standalone/po/it.po @@ -46,13 +46,13 @@ msgstr "Bootloader non trovato. Verrà creata una nuova configurazione" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_File" +msgid "_File" +msgstr "_File" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/File/_Esci" +msgid "File/_Quit" +msgstr "File/_Esci" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2237,28 +2237,28 @@ msgstr "Caratteristiche" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opzioni" +msgid "_Options" +msgstr "_Opzioni" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Guida" +msgid "_Help" +msgstr "_Guida" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Rileva automaticamente i _modem" +msgid "Autodetect _modems" +msgstr "Rileva automaticamente i _modem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Rileva automaticamente dispositivi _jaz" +msgid "Autodetect _jaz drives" +msgstr "Rileva automaticamente dispositivi _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Riconoscimento automatico drive _zip su porta parallela" +msgid "Autodetect parallel _zip drives" +msgstr "Riconoscimento automatico drive _zip su porta parallela" #: harddrake2:192 #, c-format @@ -2267,13 +2267,13 @@ msgstr "Configurazione dell'hardware" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Esci" +msgid "_Quit" +msgstr "_Esci" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Descrizione dei campi" +msgid "_Fields description" +msgstr "_Descrizione dei campi" #: harddrake2:212 #, c-format @@ -2305,13 +2305,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Segnala bug" +msgid "_Report Bug" +msgstr "_Segnala bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Informazioni su..." +msgid "_About..." +msgstr "_Informazioni su..." #: harddrake2:232 #, c-format @@ -2420,8 +2420,8 @@ msgstr "Solo per il giorno selezionato" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/_Nuovo" +msgid "File/_New" +msgstr "File/_Nuovo" #: logdrake:75 #, c-format @@ -2430,8 +2430,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/File/_Apri" +msgid "File/_Open" +msgstr "File/_Apri" #: logdrake:76 #, c-format @@ -2440,8 +2440,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/File/_Salva" +msgid "File/_Save" +msgstr "File/_Salva" #: logdrake:77 #, c-format @@ -2450,23 +2450,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/File/Salv_a con nome" +msgid "File/Save _As" +msgstr "File/Salv_a con nome" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/File/-" +msgid "File/-" +msgstr "File/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opzioni/Prova" +msgid "Options/Test" +msgstr "Opzioni/Prova" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Guida/_Informazioni su..." +msgid "Help/_About..." +msgstr "Guida/_Informazioni su..." #: logdrake:113 #, c-format @@ -3519,5 +3519,5 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Prolisso" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Rileva automaticamente le _stampanti" +#~ msgid "Autodetect _printers" +#~ msgstr "Rileva automaticamente le _stampanti" diff --git a/perl-install/standalone/po/ja.po b/perl-install/standalone/po/ja.po index 2dab222a4..c38927708 100644 --- a/perl-install/standalone/po/ja.po +++ b/perl-install/standalone/po/ja.po @@ -51,13 +51,13 @@ msgstr "ブートローダが見つかりません。新しい設定を作成し #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/ファイル(_F)" +msgid "_File" +msgstr "ファイル(_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ファイル(F)/終了(_Q)" +msgid "File/_Quit" +msgstr "ファイル(F)/終了(_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2236,28 +2236,28 @@ msgstr "機能" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/オプション(_O)" +msgid "_Options" +msgstr "オプション(_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/ヘルプ(_H)" +msgid "_Help" +msgstr "ヘルプ(_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/モデムを自動検出(_M)" +msgid "Autodetect _modems" +msgstr "モデムを自動検出(_M)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Jaz ドライブを自動検出(_J)" +msgid "Autodetect _jaz drives" +msgstr "Jaz ドライブを自動検出(_J)" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/パラレル Zip ドライブを自動検出(_Z)" +msgid "Autodetect parallel _zip drives" +msgstr "パラレル Zip ドライブを自動検出(_Z)" #: harddrake2:192 #, c-format @@ -2266,13 +2266,13 @@ msgstr "ハードウェアの設定" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/終了(_Q)" +msgid "_Quit" +msgstr "終了(_Q)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/項目の説明(_F)" +msgid "_Fields description" +msgstr "項目の説明(_F)" #: harddrake2:212 #, c-format @@ -2302,13 +2302,13 @@ msgstr "デバイスを選択すると右のフレームにデバイスの情報 #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/バグを報告(_R)" +msgid "_Report Bug" +msgstr "バグを報告(_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/情報(_A)..." +msgid "_About..." +msgstr "情報(_A)..." #: harddrake2:232 #, c-format @@ -2415,8 +2415,8 @@ msgstr "指定した日の分だけを表示" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/ファイル(F)/新規(_N)" +msgid "File/_New" +msgstr "ファイル(F)/新規(_N)" #: logdrake:75 #, c-format @@ -2425,8 +2425,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/ファイル(F)/開く(_O)" +msgid "File/_Open" +msgstr "ファイル(F)/開く(_O)" #: logdrake:76 #, c-format @@ -2435,8 +2435,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ファイル(F)/保存(_S)" +msgid "File/_Save" +msgstr "ファイル(F)/保存(_S)" #: logdrake:77 #, c-format @@ -2445,23 +2445,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ファイル(F)/名前を付けて保存(_A)" +msgid "File/Save _As" +msgstr "ファイル(F)/名前を付けて保存(_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ファイル(F)/-" +msgid "File/-" +msgstr "ファイル(F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/オプション(O)/テスト" +msgid "Options/Test" +msgstr "オプション(O)/テスト" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/ヘルプ(H)/情報(_A)..." +msgid "Help/_About..." +msgstr "ヘルプ(H)/情報(_A)..." #: logdrake:113 #, c-format @@ -2674,7 +2674,7 @@ msgstr "メールアドレスを入力してください" #: logdrake:441 #, c-format msgid "and enter the name (or the IP) of the SMTP server you wish to use" -msgstr "/使用する SMTP サーバの名前 (または IP) を入力" +msgstr "使用する SMTP サーバの名前 (または IP) を入力" #: logdrake:443 #, fuzzy, c-format @@ -3498,8 +3498,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "詳細モード" -#~ msgid "/Autodetect _printers" -#~ msgstr "/プリンタを自動検出(_P)" +#~ msgid "Autodetect _printers" +#~ msgstr "プリンタを自動検出(_P)" #~ msgid "Its GDB trace is:" #~ msgstr "GDB トレース:" diff --git a/perl-install/standalone/po/ko.po b/perl-install/standalone/po/ko.po index 4adb4cc7a..990bb03cb 100644 --- a/perl-install/standalone/po/ko.po +++ b/perl-install/standalone/po/ko.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/파일(_F)" +msgid "_File" +msgstr "파일(_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/파일(F)/종료(_Q)" +msgid "File/_Quit" +msgstr "파일(F)/종료(_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2146,27 +2146,27 @@ msgstr "기능" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/옵션(_O)" +msgid "_Options" +msgstr "옵션(_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/도움말(_H)" +msgid "_Help" +msgstr "도움말(_H)" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "자동 검색됨" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "자동 검색됨" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2176,12 +2176,12 @@ msgstr "네트웍 환경 설정" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/종료(_Q)" +msgid "_Quit" +msgstr "종료(_Q)" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "설명" #: harddrake2:212 @@ -2210,13 +2210,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/버그 보고(_R)" +msgid "_Report Bug" +msgstr "버그 보고(_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/정보(_A)..." +msgid "_About..." +msgstr "정보(_A)..." #: harddrake2:232 #, fuzzy, c-format @@ -2323,8 +2323,8 @@ msgstr "선택된 날짜에 대해만 보이기" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/파일(F)/새로 만들기(_N)" +msgid "File/_New" +msgstr "파일(F)/새로 만들기(_N)" #: logdrake:75 #, c-format @@ -2333,8 +2333,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/파일(F)/열기(_O)" +msgid "File/_Open" +msgstr "파일(F)/열기(_O)" #: logdrake:76 #, c-format @@ -2343,8 +2343,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/파일(F)/저장(_S)" +msgid "File/_Save" +msgstr "파일(F)/저장(_S)" #: logdrake:77 #, c-format @@ -2353,23 +2353,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/파일(F)/다른 이름으로 저장(_A)" +msgid "File/Save _As" +msgstr "파일(F)/다른 이름으로 저장(_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/파일(F)/-" +msgid "File/-" +msgstr "파일(F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/옵션(O)/테스트" +msgid "Options/Test" +msgstr "옵션(O)/테스트" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/도움말(H)/이 프로그램은(_A)..." +msgid "Help/_About..." +msgstr "도움말(H)/이 프로그램은(_A)..." #: logdrake:113 #, c-format @@ -3356,7 +3356,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "자동 검색됨" #~ msgid "" diff --git a/perl-install/standalone/po/ky.po b/perl-install/standalone/po/ky.po index d8b16fc84..78e70455a 100644 --- a/perl-install/standalone/po/ky.po +++ b/perl-install/standalone/po/ky.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Чыгуу" +msgid "File/_Quit" +msgstr "Файл/_Чыгуу" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2179,27 +2179,27 @@ msgstr "Мүмкүнчүлүктөр" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Опциялар" +msgid "_Options" +msgstr "_Опциялар" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Жардам" +msgid "_Help" +msgstr "_Жардам" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Модемдерди автоаныктоо" +msgid "Autodetect _modems" +msgstr "_Модемдерди автоаныктоо" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_jaz улоолорун автоаныктоо" +msgid "Autodetect _jaz drives" +msgstr "_jaz улоолорун автоаныктоо" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2209,13 +2209,13 @@ msgstr "Өз алдынча конфигурациялоо" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Чыгуу" +msgid "_Quit" +msgstr "_Чыгуу" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Мүнөздөмөлөр саптары" +msgid "_Fields description" +msgstr "_Мүнөздөмөлөр саптары" #: harddrake2:212 #, c-format @@ -2245,13 +2245,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Баг жөнүндө отчет" +msgid "_Report Bug" +msgstr "_Баг жөнүндө отчет" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Программа жөнүндө..." +msgid "_About..." +msgstr "_Программа жөнүндө..." #: harddrake2:232 #, fuzzy, c-format @@ -2360,8 +2360,8 @@ msgstr "Тандалган күн ичиндегини гана көрсөт" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Жаңы" +msgid "File/_New" +msgstr "Файл/_Жаңы" #: logdrake:75 #, c-format @@ -2370,8 +2370,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Ачуу" +msgid "File/_Open" +msgstr "Файл/_Ачуу" #: logdrake:76 #, c-format @@ -2380,8 +2380,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Сактоо" +msgid "File/_Save" +msgstr "Файл/_Сактоо" #: logdrake:77 #, c-format @@ -2390,23 +2390,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/_Деп сактоо" +msgid "File/Save _As" +msgstr "Файл/_Деп сактоо" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Опциялар/Сыноо" +msgid "Options/Test" +msgstr "Опциялар/Сыноо" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Жардам/_Программа жөнүндө..." +msgid "Help/_About..." +msgstr "Жардам/_Программа жөнүндө..." #: logdrake:113 #, c-format @@ -3447,8 +3447,8 @@ msgstr "Кат аркылуу кабарлоону күүлөө" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Принтерлерди автоаныктоо" +#~ msgid "Autodetect _printers" +#~ msgstr "_Принтерлерди автоаныктоо" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/libDrakX-standalone.pot b/perl-install/standalone/po/libDrakX-standalone.pot index 0155b10c9..4d34c5ffc 100644 --- a/perl-install/standalone/po/libDrakX-standalone.pot +++ b/perl-install/standalone/po/libDrakX-standalone.pot @@ -46,12 +46,12 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" +msgid "_File" msgstr "" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" +msgid "File/_Quit" msgstr "" #: drakboot:89 harddrake2:199 logdrake:80 @@ -2141,27 +2141,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" +msgid "_Options" msgstr "" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" +msgid "_Help" msgstr "" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2171,12 +2171,12 @@ msgstr "" #: harddrake2:199 #, c-format -msgid "/_Quit" +msgid "_Quit" msgstr "" #: harddrake2:210 #, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "" #: harddrake2:212 @@ -2205,12 +2205,12 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" +msgid "_Report Bug" msgstr "" #: harddrake2:229 #, c-format -msgid "/_About..." +msgid "_About..." msgstr "" #: harddrake2:232 @@ -2318,7 +2318,7 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" +msgid "File/_New" msgstr "" #: logdrake:75 @@ -2328,7 +2328,7 @@ msgstr "" #: logdrake:76 #, c-format -msgid "/File/_Open" +msgid "File/_Open" msgstr "" #: logdrake:76 @@ -2338,7 +2338,7 @@ msgstr "" #: logdrake:77 #, c-format -msgid "/File/_Save" +msgid "File/_Save" msgstr "" #: logdrake:77 @@ -2348,22 +2348,22 @@ msgstr "" #: logdrake:78 #, c-format -msgid "/File/Save _As" +msgid "File/Save _As" msgstr "" #: logdrake:79 #, c-format -msgid "/File/-" +msgid "File/-" msgstr "" #: logdrake:82 #, c-format -msgid "/Options/Test" +msgid "Options/Test" msgstr "" #: logdrake:84 #, c-format -msgid "/Help/_About..." +msgid "Help/_About..." msgstr "" #: logdrake:113 diff --git a/perl-install/standalone/po/lt.po b/perl-install/standalone/po/lt.po index e719cff70..77d586212 100644 --- a/perl-install/standalone/po/lt.po +++ b/perl-install/standalone/po/lt.po @@ -45,13 +45,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Byla" +msgid "_File" +msgstr "_Byla" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Byla/_Išeiti" +msgid "File/_Quit" +msgstr "Byla/_Išeiti" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2144,27 +2144,27 @@ msgstr "Savybės" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Pasirinktys" +msgid "_Options" +msgstr "_Pasirinktys" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pagalba" +msgid "_Help" +msgstr "_Pagalba" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Naudokite automatinį aptikimą" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Naudokite automatinį aptikimą" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2174,12 +2174,12 @@ msgstr "Tinklo konfigūravimas" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Išeiti" +msgid "_Quit" +msgstr "_Išeiti" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Aprašymas" #: harddrake2:212 @@ -2208,13 +2208,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raportuoti Klaidą" +msgid "_Report Bug" +msgstr "_Raportuoti Klaidą" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Apie..." +msgid "_About..." +msgstr "_Apie..." #: harddrake2:232 #, fuzzy, c-format @@ -2321,8 +2321,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Byla/_Nauja" +msgid "File/_New" +msgstr "Byla/_Nauja" #: logdrake:75 #, c-format @@ -2331,8 +2331,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Byla/Atidaryti" +msgid "File/_Open" +msgstr "Byla/Atidaryti" #: logdrake:76 #, c-format @@ -2341,8 +2341,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Byla/Užrašyti" +msgid "File/_Save" +msgstr "Byla/Užrašyti" #: logdrake:77 #, c-format @@ -2351,23 +2351,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Byla/Užrašyti Kaip" +msgid "File/Save _As" +msgstr "Byla/Užrašyti Kaip" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Byla/-" +msgid "File/-" +msgstr "Byla/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Pasirinkys/Bandymas" +msgid "Options/Test" +msgstr "Pasirinkys/Bandymas" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pagalba/_Apie..." +msgid "Help/_About..." +msgstr "Pagalba/_Apie..." #: logdrake:113 #, c-format @@ -3351,7 +3351,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Naudokite automatinį aptikimą" #, fuzzy diff --git a/perl-install/standalone/po/ltg.po b/perl-install/standalone/po/ltg.po index 490e77d2a..3707da10c 100644 --- a/perl-install/standalone/po/ltg.po +++ b/perl-install/standalone/po/ltg.po @@ -46,13 +46,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fails" +msgid "_File" +msgstr "_Fails" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fails/_Izīt" +msgid "File/_Quit" +msgstr "Fails/_Izīt" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2175,27 +2175,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcejis" +msgid "_Options" +msgstr "_Opcejis" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Paleidzeiba" +msgid "_Help" +msgstr "_Paleidzeiba" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Automatiska _modemu nūteikšona" +msgid "Autodetect _modems" +msgstr "Automatiska _modemu nūteikšona" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Automatiska _jaz īkuortu nūteikšona" +msgid "Autodetect _jaz drives" +msgstr "Automatiska _jaz īkuortu nūteikšona" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2205,13 +2205,13 @@ msgstr "Teikla konfiguraceja" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Izīt" +msgid "_Quit" +msgstr "_Izīt" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Lauki ar aprokstim" +msgid "_Fields description" +msgstr "_Lauki ar aprokstim" #: harddrake2:212 #, c-format @@ -2241,13 +2241,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Ziņuot kliudu" +msgid "_Report Bug" +msgstr "_Ziņuot kliudu" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Par..." +msgid "_About..." +msgstr "_Par..." #: harddrake2:232 #, fuzzy, c-format @@ -2354,8 +2354,8 @@ msgstr "Ruodeit tikai izvālātajai dīnai" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fails/_Jauns" +msgid "File/_New" +msgstr "Fails/_Jauns" #: logdrake:75 #, c-format @@ -2364,8 +2364,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fails/_Atvērt" +msgid "File/_Open" +msgstr "Fails/_Atvērt" #: logdrake:76 #, c-format @@ -2374,8 +2374,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fails/_Saglobuot" +msgid "File/_Save" +msgstr "Fails/_Saglobuot" #: logdrake:77 #, c-format @@ -2384,23 +2384,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fails/Saglobuot _kai" +msgid "File/Save _As" +msgstr "Fails/Saglobuot _kai" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fails/-" +msgid "File/-" +msgstr "Fails/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcejis/Tests" +msgid "Options/Test" +msgstr "Opcejis/Tests" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Paleidzeiba/_Par..." +msgid "Help/_About..." +msgstr "Paleidzeiba/_Par..." #: logdrake:113 #, c-format @@ -3406,8 +3406,8 @@ msgstr "Posta trauksmis konfigureišona" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Automatiska _printeru nūteikšona" +#~ msgid "Autodetect _printers" +#~ msgstr "Automatiska _printeru nūteikšona" #~ msgid "" #~ "Display theme\n" diff --git a/perl-install/standalone/po/lv.po b/perl-install/standalone/po/lv.po index 6c8823ad8..66409466d 100644 --- a/perl-install/standalone/po/lv.po +++ b/perl-install/standalone/po/lv.po @@ -46,13 +46,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fails" +msgid "_File" +msgstr "_Fails" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fails/_Iziet" +msgid "File/_Quit" +msgstr "Fails/_Iziet" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2174,27 +2174,27 @@ msgstr "Īpašības" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcijas" +msgid "_Options" +msgstr "_Opcijas" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Palīdzība" +msgid "_Help" +msgstr "_Palīdzība" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Automātiska noteikšana" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Automātiska noteikšana" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2204,12 +2204,12 @@ msgstr "Tīkla konfigurācija" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Iziet" +msgid "_Quit" +msgstr "_Iziet" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Apraksts" #: harddrake2:212 @@ -2240,13 +2240,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Ziņot kļūdu" +msgid "_Report Bug" +msgstr "_Ziņot kļūdu" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/P_ar..." +msgid "_About..." +msgstr "P_ar..." #: harddrake2:232 #, fuzzy, c-format @@ -2353,8 +2353,8 @@ msgstr "Rādīt tikai izvēlētajai dienai" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fails/_Jauns" +msgid "File/_New" +msgstr "Fails/_Jauns" #: logdrake:75 #, c-format @@ -2363,8 +2363,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fails/_Atvērt" +msgid "File/_Open" +msgstr "Fails/_Atvērt" #: logdrake:76 #, c-format @@ -2373,8 +2373,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fails/_Saglabāt" +msgid "File/_Save" +msgstr "Fails/_Saglabāt" #: logdrake:77 #, c-format @@ -2383,23 +2383,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fails/Saglabāt _kā" +msgid "File/Save _As" +msgstr "Fails/Saglabāt _kā" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fails/-" +msgid "File/-" +msgstr "Fails/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcijas/Tests" +msgid "Options/Test" +msgstr "Opcijas/Tests" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Palīdzība/_Par..." +msgid "Help/_About..." +msgstr "Palīdzība/_Par..." #: logdrake:113 #, c-format @@ -3403,7 +3403,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Automātiska noteikšana" #, fuzzy diff --git a/perl-install/standalone/po/mk.po b/perl-install/standalone/po/mk.po index 9c248f478..707f25c2d 100644 --- a/perl-install/standalone/po/mk.po +++ b/perl-install/standalone/po/mk.po @@ -53,13 +53,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Датотека" +msgid "_File" +msgstr "_Датотека" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Датотека/_Напушти" +msgid "File/_Quit" +msgstr "Датотека/_Напушти" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2206,27 +2206,27 @@ msgstr "Карактеристики" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Опции" +msgid "_Options" +msgstr "_Опции" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Помош" +msgid "_Help" +msgstr "_Помош" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Автодетектирај _модеми" +msgid "Autodetect _modems" +msgstr "Автодетектирај _модеми" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Автодетектирај _jaz уреди" +msgid "Autodetect _jaz drives" +msgstr "Автодетектирај _jaz уреди" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2236,13 +2236,13 @@ msgstr "Конфигурација на мрежа" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Напушти" +msgid "_Quit" +msgstr "_Напушти" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Опис на полињата" +msgid "_Fields description" +msgstr "_Опис на полињата" #: harddrake2:212 #, c-format @@ -2274,13 +2274,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Извести за бубачка" +msgid "_Report Bug" +msgstr "_Извести за бубачка" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_За..." +msgid "_About..." +msgstr "_За..." #: harddrake2:232 #, fuzzy, c-format @@ -2389,8 +2389,8 @@ msgstr "Прикажи само за избраниот ден" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Дадотека/_Нова" +msgid "File/_New" +msgstr "Дадотека/_Нова" #: logdrake:75 #, c-format @@ -2399,8 +2399,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Датотека/_Отвори" +msgid "File/_Open" +msgstr "Датотека/_Отвори" #: logdrake:76 #, c-format @@ -2409,8 +2409,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Датотека/_Зачувај" +msgid "File/_Save" +msgstr "Датотека/_Зачувај" #: logdrake:77 #, c-format @@ -2419,23 +2419,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Датотека/Зачувај_како" +msgid "File/Save _As" +msgstr "Датотека/Зачувај_како" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Датотека/-" +msgid "File/-" +msgstr "Датотека/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Опции/Тест" +msgid "Options/Test" +msgstr "Опции/Тест" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Помош/_За..." +msgid "Help/_About..." +msgstr "Помош/_За..." #: logdrake:113 #, c-format @@ -3450,8 +3450,8 @@ msgstr "Конфигурирање на известување за пошта" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Автодетектирај _притнери" +#~ msgid "Autodetect _printers" +#~ msgstr "Автодетектирај _притнери" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/mn.po b/perl-install/standalone/po/mn.po index c68e0ff9d..a3c4f78e4 100644 --- a/perl-install/standalone/po/mn.po +++ b/perl-install/standalone/po/mn.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Гарах" +msgid "File/_Quit" +msgstr "Файл/_Гарах" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2153,27 +2153,27 @@ msgstr "Тэмдэг" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Сонголтууд" +msgid "_Options" +msgstr "_Сонголтууд" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Тусламж" +msgid "_Help" +msgstr "_Тусламж" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_jaz хөтлөгчүүдийг автоматаар таних" +msgid "Autodetect _jaz drives" +msgstr "_jaz хөтлөгчүүдийг автоматаар таних" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2183,12 +2183,12 @@ msgstr "Сүлжээний тохируулга" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Гарах" +msgid "_Quit" +msgstr "_Гарах" #: harddrake2:210 #, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "" #: harddrake2:212 @@ -2217,13 +2217,13 @@ msgstr "вы вы ямх баруун хүрээ Мэдээлэл" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Гажигийг мэдээлэх" +msgid "_Report Bug" +msgstr "_Гажигийг мэдээлэх" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Т_ухай..." +msgid "_About..." +msgstr "_Т_ухай..." #: harddrake2:232 #, fuzzy, c-format @@ -2330,8 +2330,8 @@ msgstr "Зөвхөн сонгогдсон өдрийн хувьд харуула #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Шинэ" +msgid "File/_New" +msgstr "Файл/_Шинэ" #: logdrake:75 #, c-format @@ -2340,8 +2340,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Нээх" +msgid "File/_Open" +msgstr "Файл/_Нээх" #: logdrake:76 #, c-format @@ -2350,8 +2350,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Хадгалах" +msgid "File/_Save" +msgstr "Файл/_Хадгалах" #: logdrake:77 #, c-format @@ -2360,23 +2360,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/Ингэж хадгал" +msgid "File/Save _As" +msgstr "Файл/Ингэж хадгал" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Сонголтууд/Шалгалт" +msgid "Options/Test" +msgstr "Сонголтууд/Шалгалт" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Тусламж/_Тухай..." +msgid "Help/_About..." +msgstr "Тусламж/_Тухай..." #: logdrake:113 #, c-format @@ -2857,7 +2857,7 @@ msgstr "Модулийг устгах" #: scannerdrake:328 scannerdrake:335 scannerdrake:365 #, fuzzy, c-format msgid "Auto-detect available ports" -msgstr "/Хэвлэгчүүдийг автоматаар таних" +msgstr "Хэвлэгчүүдийг автоматаар таних" #: scannerdrake:329 scannerdrake:375 #, fuzzy, c-format @@ -3367,8 +3367,8 @@ msgstr "Мэйл сонордуулгын тохиргоо" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Хэвлэгчүүдийг автоматаар таних" +#~ msgid "Autodetect _printers" +#~ msgstr "Хэвлэгчүүдийг автоматаар таних" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/ms.po b/perl-install/standalone/po/ms.po index bb2aff20d..558f768bb 100644 --- a/perl-install/standalone/po/ms.po +++ b/perl-install/standalone/po/ms.po @@ -46,13 +46,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fail" +msgid "_File" +msgstr "_Fail" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fail/_Keluar" +msgid "File/_Quit" +msgstr "Fail/_Keluar" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2154,27 +2154,27 @@ msgstr "Sifat" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Pilihan" +msgid "_Options" +msgstr "_Pilihan" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Bantuan" +msgid "_Help" +msgstr "_Bantuan" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "Autokesan ciri-ciri AP MIB?" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "Tiada Pemacu Dijumpai" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2184,12 +2184,12 @@ msgstr "Tetapan KFish" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Keluar" +msgid "_Quit" +msgstr "_Keluar" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "Medan yang Ada " #: harddrake2:212 @@ -2218,13 +2218,13 @@ msgstr "dalam on Maklumat" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Lapor Pepijat" +msgid "_Report Bug" +msgstr "_Lapor Pepijat" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Perihal..." +msgid "_About..." +msgstr "_Perihal..." #: harddrake2:232 #, c-format @@ -2331,8 +2331,8 @@ msgstr "Papar hanya penerangan pada masukan menu" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fail/Ba_ru" +msgid "File/_New" +msgstr "Fail/Ba_ru" #: logdrake:75 #, c-format @@ -2341,8 +2341,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fail/_Buka" +msgid "File/_Open" +msgstr "Fail/_Buka" #: logdrake:76 #, c-format @@ -2351,8 +2351,8 @@ msgstr "Q" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fail/_Simpan" +msgid "File/_Save" +msgstr "Fail/_Simpan" #: logdrake:77 #, c-format @@ -2361,23 +2361,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fail/Simpan Seb_agai..." +msgid "File/Save _As" +msgstr "Fail/Simpan Seb_agai..." #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fail/-" +msgid "File/-" +msgstr "Fail/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/_Pilihan/Uji" +msgid "Options/Test" +msgstr "_Pilihan/Uji" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Bantuan/Perihal..." +msgid "Help/_About..." +msgstr "Bantuan/Perihal..." #: logdrake:113 #, c-format @@ -3364,7 +3364,7 @@ msgstr "" #~ msgstr " -v - mod verbos.\n" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "Kelas Pencetak" #, fuzzy diff --git a/perl-install/standalone/po/mt.po b/perl-install/standalone/po/mt.po index b98c6e6ed..1c83cdedb 100644 --- a/perl-install/standalone/po/mt.po +++ b/perl-install/standalone/po/mt.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fajl" +msgid "_File" +msgstr "_Fajl" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fajl/O_ħroġ" +msgid "File/_Quit" +msgstr "Fajl/O_ħroġ" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2226,27 +2226,27 @@ msgstr "Karatteristiċi" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/Għa_żliet" +msgid "_Options" +msgstr "Għa_żliet" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Għajnuna" +msgid "_Help" +msgstr "_Għajnuna" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Agħraf _modems awtomatikament" +msgid "Autodetect _modems" +msgstr "Agħraf _modems awtomatikament" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Agħraf drajv _jaz awtomatikament" +msgid "Autodetect _jaz drives" +msgstr "Agħraf drajv _jaz awtomatikament" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2256,13 +2256,13 @@ msgstr "Konfigurazzjoni tan-network" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Oħroġ" +msgid "_Quit" +msgstr "_Oħroġ" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Deskrizzjoni _elementi" +msgid "_Fields description" +msgstr "Deskrizzjoni _elementi" #: harddrake2:212 #, c-format @@ -2294,13 +2294,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/I_rrapporta bug" +msgid "_Report Bug" +msgstr "I_rrapporta bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Dwar..." +msgid "_About..." +msgstr "_Dwar..." #: harddrake2:232 #, fuzzy, c-format @@ -2407,8 +2407,8 @@ msgstr "Uri għall-ġurnata magħżula biss" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/_Ġdid" +msgid "File/_New" +msgstr "File/_Ġdid" #: logdrake:75 #, c-format @@ -2417,8 +2417,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/File/_Iftaħ" +msgid "File/_Open" +msgstr "File/_Iftaħ" #: logdrake:76 #, c-format @@ -2427,8 +2427,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/File/I_kteb" +msgid "File/_Save" +msgstr "File/I_kteb" #: logdrake:77 #, c-format @@ -2437,23 +2437,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/File/Ikteb b'isem _ġdid" +msgid "File/Save _As" +msgstr "File/Ikteb b'isem _ġdid" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fajl/-" +msgid "File/-" +msgstr "Fajl/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Għażliet/Test" +msgid "Options/Test" +msgstr "Għażliet/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Għajnuna/_Dwar..." +msgid "Help/_About..." +msgstr "Għajnuna/_Dwar..." #: logdrake:113 #, c-format @@ -3485,8 +3485,8 @@ msgstr "Konfigurazzjoni allerti bl-imejl" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Agħraf _printers awtomatikament" +#~ msgid "Autodetect _printers" +#~ msgstr "Agħraf _printers awtomatikament" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/nb.po b/perl-install/standalone/po/nb.po index afaf125f5..f72d2840e 100644 --- a/perl-install/standalone/po/nb.po +++ b/perl-install/standalone/po/nb.po @@ -51,13 +51,13 @@ msgstr "Fant ingen oppstartslaster, lager nytt oppsett." #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fil" +msgid "_File" +msgstr "_Fil" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fil/_Avslutt" +msgid "File/_Quit" +msgstr "Fil/_Avslutt" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2238,28 +2238,28 @@ msgstr "Funksjoner" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Innstillinger" +msgid "_Options" +msgstr "_Innstillinger" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hjelp" +msgid "_Help" +msgstr "_Hjelp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Finn _modem automatisk" +msgid "Autodetect _modems" +msgstr "Finn _modem automatisk" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Finn _JAZ-stasjoner automatisk" +msgid "Autodetect _jaz drives" +msgstr "Finn _JAZ-stasjoner automatisk" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Finn automatisk _ZIP-stasjoner på parallellporter" +msgid "Autodetect parallel _zip drives" +msgstr "Finn automatisk _ZIP-stasjoner på parallellporter" #: harddrake2:192 #, c-format @@ -2268,13 +2268,13 @@ msgstr "Oppsett av maskinvare" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Avslutt" +msgid "_Quit" +msgstr "_Avslutt" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Feltbeskrivelser" +msgid "_Fields description" +msgstr "_Feltbeskrivelser" #: harddrake2:212 #, c-format @@ -2306,13 +2306,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Meld fra om feil" +msgid "_Report Bug" +msgstr "_Meld fra om feil" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Om …" +msgid "_About..." +msgstr "_Om …" #: harddrake2:232 #, c-format @@ -2419,8 +2419,8 @@ msgstr "Vis bare for valgt dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fil/_Ny" +msgid "File/_New" +msgstr "Fil/_Ny" #: logdrake:75 #, c-format @@ -2429,8 +2429,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fil/_Åpne" +msgid "File/_Open" +msgstr "Fil/_Åpne" #: logdrake:76 #, c-format @@ -2439,8 +2439,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fil/_Lagre" +msgid "File/_Save" +msgstr "Fil/_Lagre" #: logdrake:77 #, c-format @@ -2449,23 +2449,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fil/Lagre _som" +msgid "File/Save _As" +msgstr "Fil/Lagre _som" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fil/–" +msgid "File/-" +msgstr "Fil/–" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Innstillinger/Test" +msgid "Options/Test" +msgstr "Innstillinger/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hjelp/_Om …" +msgid "Help/_About..." +msgstr "Hjelp/_Om …" #: logdrake:113 #, c-format @@ -3498,8 +3498,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Utvidete meldinger" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Finn _skrivere automatisk" +#~ msgid "Autodetect _printers" +#~ msgstr "Finn _skrivere automatisk" #~ msgid "Its GDB trace is:" #~ msgstr "GDB-sporing er:" diff --git a/perl-install/standalone/po/nl.po b/perl-install/standalone/po/nl.po index b0aacbb0f..462f00f06 100644 --- a/perl-install/standalone/po/nl.po +++ b/perl-install/standalone/po/nl.po @@ -55,13 +55,13 @@ msgstr "Geen opstartlader gevonden, nieuwe configuratie aangemaakt" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Bestand" +msgid "_File" +msgstr "_Bestand" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Bestand/_Afsluiten" +msgid "File/_Quit" +msgstr "Bestand/_Afsluiten" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2247,28 +2247,28 @@ msgstr "Mogelijkheden" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opties" +msgid "_Options" +msgstr "_Opties" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hulp" +msgid "_Help" +msgstr "_Hulp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modems automatisch bespeuren" +msgid "Autodetect _modems" +msgstr "_Modems automatisch bespeuren" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz-stations automatisch bespeuren" +msgid "Autodetect _jaz drives" +msgstr "_Jaz-stations automatisch bespeuren" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Parallelle _zip-drives automatisch bespeuren" +msgid "Autodetect parallel _zip drives" +msgstr "Parallelle _zip-drives automatisch bespeuren" #: harddrake2:192 #, c-format @@ -2277,13 +2277,13 @@ msgstr "Apparaatinstellingen" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Afsluiten" +msgid "_Quit" +msgstr "_Afsluiten" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Omschrijving _velden" +msgid "_Fields description" +msgstr "Omschrijving _velden" #: harddrake2:212 #, c-format @@ -2315,13 +2315,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Rapporteer Bug" +msgid "_Report Bug" +msgstr "_Rapporteer Bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Info over..." +msgid "_About..." +msgstr "_Info over..." #: harddrake2:232 #, c-format @@ -2430,8 +2430,8 @@ msgstr "Alleen tonen voor de geselecteerde dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Bestand/_Nieuw" +msgid "File/_New" +msgstr "Bestand/_Nieuw" #: logdrake:75 #, c-format @@ -2440,8 +2440,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Bestand/_Openen" +msgid "File/_Open" +msgstr "Bestand/_Openen" #: logdrake:76 #, c-format @@ -2450,8 +2450,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Bestand/O_pslaan" +msgid "File/_Save" +msgstr "Bestand/O_pslaan" #: logdrake:77 #, c-format @@ -2460,23 +2460,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Bestand/Ops_laan als..." +msgid "File/Save _As" +msgstr "Bestand/Ops_laan als..." #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Bestand/-" +msgid "File/-" +msgstr "Bestand/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opties/Test" +msgid "Options/Test" +msgstr "Opties/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hulp/_Info..." +msgid "Help/_About..." +msgstr "Hulp/_Info..." #: logdrake:113 #, c-format @@ -3542,8 +3542,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Uitgebreid" -#~ msgid "/Autodetect _printers" -#~ msgstr "/_Printers automatisch bespeuren" +#~ msgid "Autodetect _printers" +#~ msgstr "_Printers automatisch bespeuren" #~ msgid "Its GDB trace is:" #~ msgstr "De GDB-herleiding is:" diff --git a/perl-install/standalone/po/nn.po b/perl-install/standalone/po/nn.po index fe96a9a0d..fbc5087a9 100644 --- a/perl-install/standalone/po/nn.po +++ b/perl-install/standalone/po/nn.po @@ -47,13 +47,13 @@ msgstr "Fann ingen oppstartslaster. Lagar nytt oppsett." #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fil" +msgid "_File" +msgstr "_Fil" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fil/_Avslutt" +msgid "File/_Quit" +msgstr "Fil/_Avslutt" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2236,28 +2236,28 @@ msgstr "Funksjonar" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Val" +msgid "_Options" +msgstr "_Val" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hjelp" +msgid "_Help" +msgstr "_Hjelp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Finn automatisk _modem" +msgid "Autodetect _modems" +msgstr "Finn automatisk _modem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Finn automatisk _Jaz-stasjonar" +msgid "Autodetect _jaz drives" +msgstr "Finn automatisk _Jaz-stasjonar" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Finn automatisk _Zip-stasjonar på parallellport" +msgid "Autodetect parallel _zip drives" +msgstr "Finn automatisk _Zip-stasjonar på parallellport" #: harddrake2:192 #, c-format @@ -2266,13 +2266,13 @@ msgstr "Maskinvareoppsett" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Avslutt" +msgid "_Quit" +msgstr "_Avslutt" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Feltskildring" +msgid "_Fields description" +msgstr "_Feltskildring" #: harddrake2:212 #, c-format @@ -2304,13 +2304,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Meld frå om feil" +msgid "_Report Bug" +msgstr "_Meld frå om feil" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Om …" +msgid "_About..." +msgstr "_Om …" #: harddrake2:232 #, c-format @@ -2417,8 +2417,8 @@ msgstr "Vis berre for vald dag" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fil/_Ny" +msgid "File/_New" +msgstr "Fil/_Ny" #: logdrake:75 #, c-format @@ -2427,8 +2427,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fil/_Opna" +msgid "File/_Open" +msgstr "Fil/_Opna" #: logdrake:76 #, c-format @@ -2437,8 +2437,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fil/_Lagra" +msgid "File/_Save" +msgstr "Fil/_Lagra" #: logdrake:77 #, c-format @@ -2447,23 +2447,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fil/Lagra _som" +msgid "File/Save _As" +msgstr "Fil/Lagra _som" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fil/–" +msgid "File/-" +msgstr "Fil/–" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Val/Test" +msgid "Options/Test" +msgstr "Val/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hjelp/_Om …" +msgid "Help/_About..." +msgstr "Hjelp/_Om …" #: logdrake:113 #, c-format @@ -3497,8 +3497,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Utvida meldingar" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Finn automatisk _skrivarar" +#~ msgid "Autodetect _printers" +#~ msgstr "Finn automatisk _skrivarar" #~ msgid "Its GDB trace is:" #~ msgstr "GDB-logger er:" diff --git a/perl-install/standalone/po/pa_IN.po b/perl-install/standalone/po/pa_IN.po index fb755d2e3..9dc976ee9 100644 --- a/perl-install/standalone/po/pa_IN.po +++ b/perl-install/standalone/po/pa_IN.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/ਫਾਇਲ(_F)" +msgid "_File" +msgstr "ਫਾਇਲ(_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ਫਾਇਲ(F)/ਬਾਹਰ(_Q)" +msgid "File/_Quit" +msgstr "ਫਾਇਲ(F)/ਬਾਹਰ(_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -455,7 +455,7 @@ msgstr "" #: drakdvb:85 drakfont:572 drakfont:652 drakfont:736 drakups:217 logdrake:178 #, c-format msgid "Cancel" -msgstr "/ਰੱਦ ਕਰੋ" +msgstr "ਰੱਦ ਕਰੋ" #: drakdvb:148 #, fuzzy, c-format @@ -2215,27 +2215,27 @@ msgstr "ਵਿਸ਼ੇਸਤਾ" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/ਚੋਣ(_O)" +msgid "_Options" +msgstr "ਚੋਣ(_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/ਸਹਾਇਤਾ(_H)" +msgid "_Help" +msgstr "ਸਹਾਇਤਾ(_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/ਸਵੈ-ਖੋਜੇ ਮਾਡਮ(_m)" +msgid "Autodetect _modems" +msgstr "ਸਵੈ-ਖੋਜੇ ਮਾਡਮ(_m)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/ਸਵੈ-ਖੋਜੀਆਂ _jaz ਡਰਾਈਵਾਂ" +msgid "Autodetect _jaz drives" +msgstr "ਸਵੈ-ਖੋਜੀਆਂ _jaz ਡਰਾਈਵਾਂ" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2245,13 +2245,13 @@ msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/ਬਾਹਰ(_Q)" +msgid "_Quit" +msgstr "ਬਾਹਰ(_Q)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/ਖੇਤਰ ਵਰਣਨ(_F)" +msgid "_Fields description" +msgstr "ਖੇਤਰ ਵਰਣਨ(_F)" #: harddrake2:212 #, c-format @@ -2283,13 +2283,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/ਬੱਗ ਰਿਪੋਰਟ(_R)" +msgid "_Report Bug" +msgstr "ਬੱਗ ਰਿਪੋਰਟ(_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/ਬਾਰੇ(_A)..." +msgid "_About..." +msgstr "ਬਾਰੇ(_A)..." #: harddrake2:232 #, fuzzy, c-format @@ -2396,8 +2396,8 @@ msgstr "ਸਿਰਫ ਚੁਣੇ ਦਿਨ ਲਈ ਵਿਖਾਓ" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/ਫਾਇਲ(F)/ਨਵਾਂ(_N)" +msgid "File/_New" +msgstr "ਫਾਇਲ(F)/ਨਵਾਂ(_N)" #: logdrake:75 #, c-format @@ -2406,8 +2406,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/ਫਾਇਲ(F)/ਖੋਲੋ(_O)" +msgid "File/_Open" +msgstr "ਫਾਇਲ(F)/ਖੋਲੋ(_O)" #: logdrake:76 #, c-format @@ -2416,8 +2416,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ਫਾਇਲ(F)/ਸੰਭਾਲੋ(_S)" +msgid "File/_Save" +msgstr "ਫਾਇਲ(F)/ਸੰਭਾਲੋ(_S)" #: logdrake:77 #, c-format @@ -2426,23 +2426,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ਫਾਇਲ(F)/ਇਸ ਤਰਾਂ ਸੰਭਾਲੋ(_A)" +msgid "File/Save _As" +msgstr "ਫਾਇਲ(F)/ਇਸ ਤਰਾਂ ਸੰਭਾਲੋ(_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ਫਾਇਲ(F)/-" +msgid "File/-" +msgstr "ਫਾਇਲ(F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/ਚੋਣ(O)/ਜਾਂਚ" +msgid "Options/Test" +msgstr "ਚੋਣ(O)/ਜਾਂਚ" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/ਸਹਾਇਤਾ(H)/ਇਸ ਬਾਰੇ(_A)..." +msgid "Help/_About..." +msgstr "ਸਹਾਇਤਾ(H)/ਇਸ ਬਾਰੇ(_A)..." #: logdrake:113 #, c-format @@ -3464,8 +3464,8 @@ msgstr "ਪੱਤਰ ਚੇਤਾਵਨੀ ਸੰਰਚਨਾ" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/ਸਵੈ-ਖੋਜੇ ਪ੍ਰਿੰਟਰ(_p)" +#~ msgid "Autodetect _printers" +#~ msgstr "ਸਵੈ-ਖੋਜੇ ਪ੍ਰਿੰਟਰ(_p)" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/pl.po b/perl-install/standalone/po/pl.po index 34fee4d75..16badb292 100644 --- a/perl-install/standalone/po/pl.po +++ b/perl-install/standalone/po/pl.po @@ -59,13 +59,13 @@ msgstr "Nie odnaleziono menedżera ładowania. Trwa tworzenie nowej konfiguracji #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Plik" +msgid "_File" +msgstr "_Plik" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Plik/_Wyjście" +msgid "File/_Quit" +msgstr "Plik/_Wyjście" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2260,28 +2260,28 @@ msgstr "Funkcje" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcje" +msgid "_Options" +msgstr "_Opcje" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/Pomo_c" +msgid "_Help" +msgstr "Pomo_c" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Automatycznie wykryj _modemy" +msgid "Autodetect _modems" +msgstr "Automatycznie wykryj _modemy" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Automatycznie wykryj urządzenia _jaz" +msgid "Autodetect _jaz drives" +msgstr "Automatycznie wykryj urządzenia _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Automatycznie wykryj równoległe napędy _zip" +msgid "Autodetect parallel _zip drives" +msgstr "Automatycznie wykryj równoległe napędy _zip" #: harddrake2:192 #, c-format @@ -2290,13 +2290,13 @@ msgstr "Konfiguracja sprzętu" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Zakończ" +msgid "_Quit" +msgstr "_Zakończ" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Opis pól" +msgid "_Fields description" +msgstr "_Opis pól" #: harddrake2:212 #, c-format @@ -2328,13 +2328,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Zgłoś błąd" +msgid "_Report Bug" +msgstr "_Zgłoś błąd" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/O _programie..." +msgid "_About..." +msgstr "O _programie..." #: harddrake2:232 #, c-format @@ -2443,8 +2443,8 @@ msgstr "Tylko dla wybranego dnia" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Plik/_Nowy" +msgid "File/_New" +msgstr "Plik/_Nowy" #: logdrake:75 #, c-format @@ -2453,8 +2453,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Plik/_Otwórz" +msgid "File/_Open" +msgstr "Plik/_Otwórz" #: logdrake:76 #, c-format @@ -2463,8 +2463,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Plik/Zapi_sz" +msgid "File/_Save" +msgstr "Plik/Zapi_sz" #: logdrake:77 #, c-format @@ -2473,23 +2473,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Plik/Z_apisz jako" +msgid "File/Save _As" +msgstr "Plik/Z_apisz jako" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Plik/-" +msgid "File/-" +msgstr "Plik/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcje/Test" +msgid "Options/Test" +msgstr "Opcje/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoc/O _programie" +msgid "Help/_About..." +msgstr "Pomoc/O _programie" #: logdrake:113 #, c-format @@ -3540,8 +3540,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Tryb opisowy" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Automatycznie wykryj _drukarki" +#~ msgid "Autodetect _printers" +#~ msgstr "Automatycznie wykryj _drukarki" #~ msgid "Its GDB trace is:" #~ msgstr "Ścieżka GDB:" diff --git a/perl-install/standalone/po/pt.po b/perl-install/standalone/po/pt.po index 25f4a3f9d..70cfb52ab 100644 --- a/perl-install/standalone/po/pt.po +++ b/perl-install/standalone/po/pt.po @@ -49,13 +49,13 @@ msgstr "Nenhum carregador de arranque encontrado, a criar nova configuração" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Ficheiro" +msgid "_File" +msgstr "_Ficheiro" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Ficheiro/_Sair" +msgid "File/_Quit" +msgstr "Ficheiro/_Sair" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2237,28 +2237,28 @@ msgstr "Características" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opções" +msgid "_Options" +msgstr "_Opções" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ajuda" +msgid "_Help" +msgstr "_Ajuda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-detectar _modems" +msgid "Autodetect _modems" +msgstr "Auto-detectar _modems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Auto-detectar controladores _jaz" +msgid "Autodetect _jaz drives" +msgstr "Auto-detectar controladores _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Auto-detectar controladores _zip paralelos" +msgid "Autodetect parallel _zip drives" +msgstr "Auto-detectar controladores _zip paralelos" #: harddrake2:192 #, c-format @@ -2267,13 +2267,13 @@ msgstr "Configuração do Material" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Sair" +msgid "_Quit" +msgstr "_Sair" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Descrição dos campos" +msgid "_Fields description" +msgstr "_Descrição dos campos" #: harddrake2:212 #, c-format @@ -2305,13 +2305,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Reportar Erro" +msgid "_Report Bug" +msgstr "_Reportar Erro" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Acerca..." +msgid "_About..." +msgstr "_Acerca..." #: harddrake2:232 #, c-format @@ -2419,8 +2419,8 @@ msgstr "Mostrar apenas para o dia seleccionado" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Ficheiro/_Novo" +msgid "File/_New" +msgstr "Ficheiro/_Novo" #: logdrake:75 #, c-format @@ -2429,8 +2429,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Ficheiro/_Abrir" +msgid "File/_Open" +msgstr "Ficheiro/_Abrir" #: logdrake:76 #, c-format @@ -2439,8 +2439,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Ficheiro/_Gravar" +msgid "File/_Save" +msgstr "Ficheiro/_Gravar" #: logdrake:77 #, c-format @@ -2449,23 +2449,23 @@ msgstr "G" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Ficheiro/Gravar _Como" +msgid "File/Save _As" +msgstr "Ficheiro/Gravar _Como" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Ficheiro/-" +msgid "File/-" +msgstr "Ficheiro/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opções/Teste" +msgid "Options/Test" +msgstr "Opções/Teste" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ajuda/A_cerca..." +msgid "Help/_About..." +msgstr "Ajuda/A_cerca..." #: logdrake:113 #, c-format @@ -3521,8 +3521,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Detalhado" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Auto-detectar _impressoras" +#~ msgid "Autodetect _printers" +#~ msgstr "Auto-detectar _impressoras" #~ msgid "Its GDB trace is:" #~ msgstr "A depuração GDB:" diff --git a/perl-install/standalone/po/pt_BR.po b/perl-install/standalone/po/pt_BR.po index e7b4673da..b55cd5ce4 100644 --- a/perl-install/standalone/po/pt_BR.po +++ b/perl-install/standalone/po/pt_BR.po @@ -61,13 +61,13 @@ msgstr "Bootloader não encontrado, criando uma nova configuração" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Arquivo" +msgid "_File" +msgstr "_Arquivo" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Arquivo/_Sair" +msgid "File/_Quit" +msgstr "Arquivo/_Sair" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2251,28 +2251,28 @@ msgstr "Características" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opções" +msgid "_Options" +msgstr "_Opções" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/Aj_uda" +msgid "_Help" +msgstr "Aj_uda" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Detectar _modems automaticamente" +msgid "Autodetect _modems" +msgstr "Detectar _modems automaticamente" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Detectar drives _jaz automaticamente" +msgid "Autodetect _jaz drives" +msgstr "Detectar drives _jaz automaticamente" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Detectar _zip drives paralelos automaticamente" +msgid "Autodetect parallel _zip drives" +msgstr "Detectar _zip drives paralelos automaticamente" #: harddrake2:192 #, c-format @@ -2281,13 +2281,13 @@ msgstr "Configuração de Hardware" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Sair" +msgid "_Quit" +msgstr "_Sair" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Descrição dos cam_pos" +msgid "_Fields description" +msgstr "Descrição dos cam_pos" #: harddrake2:212 #, c-format @@ -2319,13 +2319,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/En_viar erro" +msgid "_Report Bug" +msgstr "En_viar erro" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Sobre..." +msgid "_About..." +msgstr "_Sobre..." #: harddrake2:232 #, c-format @@ -2434,8 +2434,8 @@ msgstr "Exibir apenas dia selecionado" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Arquivo/_Novo" +msgid "File/_New" +msgstr "Arquivo/_Novo" #: logdrake:75 #, c-format @@ -2444,8 +2444,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Arquivo/_Abrir" +msgid "File/_Open" +msgstr "Arquivo/_Abrir" #: logdrake:76 #, c-format @@ -2454,8 +2454,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Arquivo/_Salvar" +msgid "File/_Save" +msgstr "Arquivo/_Salvar" #: logdrake:77 #, c-format @@ -2464,23 +2464,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Arquivo/Salvar _Como" +msgid "File/Save _As" +msgstr "Arquivo/Salvar _Como" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Arquivo/-" +msgid "File/-" +msgstr "Arquivo/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opções/Testar" +msgid "Options/Test" +msgstr "Opções/Testar" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ajuda/_Sobre..." +msgid "Help/_About..." +msgstr "Ajuda/_Sobre..." #: logdrake:113 #, c-format @@ -3531,8 +3531,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Detalhado" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Detectar _impressoras automaticamente" +#~ msgid "Autodetect _printers" +#~ msgstr "Detectar _impressoras automaticamente" #~ msgid "Its GDB trace is:" #~ msgstr "O rastreamento GDB é:" diff --git a/perl-install/standalone/po/ro.po b/perl-install/standalone/po/ro.po index a304a7296..60e417fea 100644 --- a/perl-install/standalone/po/ro.po +++ b/perl-install/standalone/po/ro.po @@ -82,13 +82,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fișier" +msgid "_File" +msgstr "_Fișier" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fișier/_Terminare" +msgid "File/_Quit" +msgstr "Fișier/_Terminare" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2266,28 +2266,28 @@ msgstr "Caracteristici" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opțiuni" +msgid "_Options" +msgstr "_Opțiuni" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ajutor" +msgid "_Help" +msgstr "_Ajutor" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-detecție _modemuri" +msgid "Autodetect _modems" +msgstr "Auto-detecție _modemuri" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Auto-detecție unități _JAZ" +msgid "Autodetect _jaz drives" +msgstr "Auto-detecție unități _JAZ" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Autodetectare unități _zip pe port paralel" +msgid "Autodetect parallel _zip drives" +msgstr "Autodetectare unități _zip pe port paralel" #: harddrake2:192 #, c-format @@ -2296,13 +2296,13 @@ msgstr "Configurație materială" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Termină" +msgid "_Quit" +msgstr "_Termină" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Descriere cîmpuri" +msgid "_Fields description" +msgstr "_Descriere cîmpuri" #: harddrake2:212 #, c-format @@ -2334,13 +2334,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raportare eroare" +msgid "_Report Bug" +msgstr "_Raportare eroare" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/Despre..." +msgid "_About..." +msgstr "Despre..." #: harddrake2:232 #, c-format @@ -2449,8 +2449,8 @@ msgstr "Arată numai pentru ziua selectată" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fișier/_Nou" +msgid "File/_New" +msgstr "Fișier/_Nou" #: logdrake:75 #, c-format @@ -2459,8 +2459,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fișier/_Deschide" +msgid "File/_Open" +msgstr "Fișier/_Deschide" #: logdrake:76 #, c-format @@ -2469,8 +2469,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fișier/_Salvează" +msgid "File/_Save" +msgstr "Fișier/_Salvează" #: logdrake:77 #, c-format @@ -2479,23 +2479,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fișier/S_alvează ca..." +msgid "File/Save _As" +msgstr "Fișier/S_alvează ca..." #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fișier/-" +msgid "File/-" +msgstr "Fișier/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opțiuni/Testează" +msgid "Options/Test" +msgstr "Opțiuni/Testează" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ajutor/_Despre..." +msgid "Help/_About..." +msgstr "Ajutor/_Despre..." #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/ru.po b/perl-install/standalone/po/ru.po index bb0a54eb7..d71b73e04 100644 --- a/perl-install/standalone/po/ru.po +++ b/perl-install/standalone/po/ru.po @@ -81,14 +81,14 @@ msgstr "Начальный загрузчик не найден, создаёт #: harddrake2:199 #: logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 #: logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Выход" +msgid "File/_Quit" +msgstr "Файл/_Выход" #: drakboot:89 #: harddrake2:199 @@ -2304,30 +2304,30 @@ msgstr "Возможности" #: harddrake2:181 #: logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Параметры" +msgid "_Options" +msgstr "_Параметры" #: harddrake2:182 #: harddrake2:208 #: logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Справка" +msgid "_Help" +msgstr "_Справка" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Автоопределение _модемов" +msgid "Autodetect _modems" +msgstr "Автоопределение _модемов" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Автоопределение приводов _jaz" +msgid "Autodetect _jaz drives" +msgstr "Автоопределение приводов _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Автоопределение параллельных приводов j_az" +msgid "Autodetect parallel _zip drives" +msgstr "Автоопределение параллельных приводов j_az" #: harddrake2:192 #, c-format @@ -2336,13 +2336,13 @@ msgstr "Настройка оборудования" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Выход" +msgid "_Quit" +msgstr "_Выход" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Поля с описанием" +msgid "_Fields description" +msgstr "_Поля с описанием" #: harddrake2:212 #, c-format @@ -2370,13 +2370,13 @@ msgstr "После того, как вы выбрали устройство, в #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/Сообщить об о_шибке" +msgid "_Report Bug" +msgstr "Сообщить об о_шибке" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_О программе..." +msgid "_About..." +msgstr "_О программе..." #: harddrake2:232 #, c-format @@ -2483,8 +2483,8 @@ msgstr "Показывать только за выбранный день" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Новый" +msgid "File/_New" +msgstr "Файл/_Новый" #: logdrake:75 #, c-format @@ -2493,8 +2493,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Открыть" +msgid "File/_Open" +msgstr "Файл/_Открыть" #: logdrake:76 #, c-format @@ -2503,8 +2503,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Сохранить" +msgid "File/_Save" +msgstr "Файл/_Сохранить" #: logdrake:77 #, c-format @@ -2513,23 +2513,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/Сохранить _как" +msgid "File/Save _As" +msgstr "Файл/Сохранить _как" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Параметры/Проверка" +msgid "Options/Test" +msgstr "Параметры/Проверка" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Справка/_О программе..." +msgid "Help/_About..." +msgstr "Справка/_О программе..." #: logdrake:113 #, c-format @@ -3533,8 +3533,8 @@ msgstr "Необходима аутентификация для запуска #~ msgid "Verbose" #~ msgstr "Подробно" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Автоопределение _принтеров" +#~ msgid "Autodetect _printers" +#~ msgstr "Автоопределение _принтеров" #~ msgid "Its GDB trace is:" #~ msgstr "Трассировка GDB:" diff --git a/perl-install/standalone/po/sc.po b/perl-install/standalone/po/sc.po index 041676860..7a6e7c303 100644 --- a/perl-install/standalone/po/sc.po +++ b/perl-install/standalone/po/sc.po @@ -47,12 +47,12 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_File" +msgid "_File" +msgstr "_File" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" +msgid "File/_Quit" msgstr "" #: drakboot:89 harddrake2:199 logdrake:80 @@ -2142,27 +2142,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/Sc_eras" +msgid "_Options" +msgstr "Sc_eras" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/A_judu" +msgid "_Help" +msgstr "A_judu" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2172,12 +2172,12 @@ msgstr "Assètiu arretza" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Bessi" +msgid "_Quit" +msgstr "_Bessi" #: harddrake2:210 #, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "" #: harddrake2:212 @@ -2206,13 +2206,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/A_rrelata Farta" +msgid "_Report Bug" +msgstr "A_rrelata Farta" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/A_pitzus de..." +msgid "_About..." +msgstr "A_pitzus de..." #: harddrake2:232 #, fuzzy, c-format @@ -2319,7 +2319,7 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" +msgid "File/_New" msgstr "" #: logdrake:75 @@ -2329,7 +2329,7 @@ msgstr "" #: logdrake:76 #, c-format -msgid "/File/_Open" +msgid "File/_Open" msgstr "" #: logdrake:76 @@ -2339,7 +2339,7 @@ msgstr "" #: logdrake:77 #, c-format -msgid "/File/_Save" +msgid "File/_Save" msgstr "" #: logdrake:77 @@ -2349,23 +2349,23 @@ msgstr "" #: logdrake:78 #, c-format -msgid "/File/Save _As" +msgid "File/Save _As" msgstr "" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/File/-" +msgid "File/-" +msgstr "File/-" #: logdrake:82 #, c-format -msgid "/Options/Test" +msgid "Options/Test" msgstr "" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ajudu/_Apitzus de..." +msgid "Help/_About..." +msgstr "Ajudu/_Apitzus de..." #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/sk.po b/perl-install/standalone/po/sk.po index 83d498390..97ef35e48 100644 --- a/perl-install/standalone/po/sk.po +++ b/perl-install/standalone/po/sk.po @@ -48,13 +48,13 @@ msgstr "Nebol nájdený žiaden zavádzač, bude vytvorená nová konfigurácia" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Súbory" +msgid "_File" +msgstr "_Súbory" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Súbor/_Koniec" +msgid "File/_Quit" +msgstr "Súbor/_Koniec" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2234,28 +2234,28 @@ msgstr "Vylepšenia" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Nastavenia" +msgid "_Options" +msgstr "_Nastavenia" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pomoc" +msgid "_Help" +msgstr "_Pomoc" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-detekcia _modemov" +msgid "Autodetect _modems" +msgstr "Auto-detekcia _modemov" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Auto-detekcia _jaz mechaník" +msgid "Autodetect _jaz drives" +msgstr "Auto-detekcia _jaz mechaník" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Autodetekcia paralelných _zip mechaník" +msgid "Autodetect parallel _zip drives" +msgstr "Autodetekcia paralelných _zip mechaník" #: harddrake2:192 #, fuzzy, c-format @@ -2264,13 +2264,13 @@ msgstr "Konfigurácia siete" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Koniec" +msgid "_Quit" +msgstr "_Koniec" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Popis položiek" +msgid "_Fields description" +msgstr "_Popis položiek" #: harddrake2:212 #, c-format @@ -2302,13 +2302,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Ohlásiť chybu" +msgid "_Report Bug" +msgstr "_Ohlásiť chybu" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O aplikácii..." +msgid "_About..." +msgstr "_O aplikácii..." #: harddrake2:232 #, fuzzy, c-format @@ -2417,8 +2417,8 @@ msgstr "Ukázať iba pre vybraný deň" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Súbor/_Nový" +msgid "File/_New" +msgstr "Súbor/_Nový" #: logdrake:75 #, c-format @@ -2427,8 +2427,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Súbor/_Otvor" +msgid "File/_Open" +msgstr "Súbor/_Otvor" #: logdrake:76 #, c-format @@ -2437,8 +2437,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Súbor/_Ulož" +msgid "File/_Save" +msgstr "Súbor/_Ulož" #: logdrake:77 #, c-format @@ -2447,23 +2447,23 @@ msgstr "U" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Súbor/Uložiť _ako" +msgid "File/Save _As" +msgstr "Súbor/Uložiť _ako" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Súbor/-" +msgid "File/-" +msgstr "Súbor/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Parametre/Test" +msgid "Options/Test" +msgstr "Parametre/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoc/_O aplikácii..." +msgid "Help/_About..." +msgstr "Pomoc/_O aplikácii..." #: logdrake:113 #, c-format @@ -3516,8 +3516,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Podrobnosti" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Auto-detekcia _tlačiarní" +#~ msgid "Autodetect _printers" +#~ msgstr "Auto-detekcia _tlačiarní" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/sl.po b/perl-install/standalone/po/sl.po index c1e0b06ed..108001ffd 100644 --- a/perl-install/standalone/po/sl.po +++ b/perl-install/standalone/po/sl.po @@ -54,13 +54,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Datoteka" +msgid "_File" +msgstr "_Datoteka" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Datoteka/_Končaj" +msgid "File/_Quit" +msgstr "Datoteka/_Končaj" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2248,28 +2248,28 @@ msgstr "Značilnosti" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Nastavitve" +msgid "_Options" +msgstr "_Nastavitve" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pomoč" +msgid "_Help" +msgstr "_Pomoč" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Samozaznava _modemov" +msgid "Autodetect _modems" +msgstr "Samozaznava _modemov" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Samozaznava pogonov _jaz" +msgid "Autodetect _jaz drives" +msgstr "Samozaznava pogonov _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Samozaznava pogonov _zip (vzporednih)" +msgid "Autodetect parallel _zip drives" +msgstr "Samozaznava pogonov _zip (vzporednih)" #: harddrake2:192 #, c-format @@ -2278,13 +2278,13 @@ msgstr "Nastavitev strojne opreme" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Končaj" +msgid "_Quit" +msgstr "_Končaj" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Opisi _polj" +msgid "_Fields description" +msgstr "Opisi _polj" #: harddrake2:212 #, c-format @@ -2314,13 +2314,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/po_ročaj o napaki" +msgid "_Report Bug" +msgstr "po_ročaj o napaki" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O ..." +msgid "_About..." +msgstr "_O ..." #: harddrake2:232 #, c-format @@ -2429,8 +2429,8 @@ msgstr "Prikaži samo za izbran dan" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Datoteka/_Nova" +msgid "File/_New" +msgstr "Datoteka/_Nova" #: logdrake:75 #, c-format @@ -2439,8 +2439,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Datoteka/_Odpri" +msgid "File/_Open" +msgstr "Datoteka/_Odpri" #: logdrake:76 #, c-format @@ -2449,8 +2449,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Datoteka/_Shrani" +msgid "File/_Save" +msgstr "Datoteka/_Shrani" #: logdrake:77 #, c-format @@ -2459,23 +2459,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Datoteka/Shrani_kot" +msgid "File/Save _As" +msgstr "Datoteka/Shrani_kot" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Datoteka/-" +msgid "File/-" +msgstr "Datoteka/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Možnosti/Test" +msgid "Options/Test" +msgstr "Možnosti/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoč/_O ..." +msgid "Help/_About..." +msgstr "Pomoč/_O ..." #: logdrake:113 #, c-format @@ -3517,5 +3517,5 @@ msgstr "Za zagon nastavitev storitev Mageje je potrebno overjanje" #~ msgid "Verbose" #~ msgstr "Gostobesedno" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Samozaznava _tiskalnikov" +#~ msgid "Autodetect _printers" +#~ msgstr "Samozaznava _tiskalnikov" diff --git a/perl-install/standalone/po/sq.po b/perl-install/standalone/po/sq.po index a57af63bc..a98efed24 100644 --- a/perl-install/standalone/po/sq.po +++ b/perl-install/standalone/po/sq.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Skedare" +msgid "_File" +msgstr "_Skedare" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Skedare/_Braktise" +msgid "File/_Quit" +msgstr "Skedare/_Braktise" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2225,27 +2225,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcionet" +msgid "_Options" +msgstr "_Opcionet" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ndihmë" +msgid "_Help" +msgstr "_Ndihmë" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Auto-zbulues _modemeve" +msgid "Autodetect _modems" +msgstr "Auto-zbulues _modemeve" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Auto-zbulues i pilotve _jaz" +msgid "Autodetect _jaz drives" +msgstr "Auto-zbulues i pilotve _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2255,13 +2255,13 @@ msgstr "Konfigurimi i rrjetit (Network)" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Braktise" +msgid "_Quit" +msgstr "_Braktise" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Zonat përshkuese" +msgid "_Fields description" +msgstr "_Zonat përshkuese" #: harddrake2:212 #, c-format @@ -2293,13 +2293,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Raport Bug(i)" +msgid "_Report Bug" +msgstr "_Raport Bug(i)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Në lidhje me..." +msgid "_About..." +msgstr "_Në lidhje me..." #: harddrake2:232 #, fuzzy, c-format @@ -2408,8 +2408,8 @@ msgstr "Çfaqi vetëm për ditët e zgedhura" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Skedare/_E Re" +msgid "File/_New" +msgstr "Skedare/_E Re" #: logdrake:75 #, c-format @@ -2418,8 +2418,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Skedare/_Hape" +msgid "File/_Open" +msgstr "Skedare/_Hape" #: logdrake:76 #, c-format @@ -2428,8 +2428,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Skedare/_Shpëtoje" +msgid "File/_Save" +msgstr "Skedare/_Shpëtoje" #: logdrake:77 #, c-format @@ -2438,23 +2438,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Skedare/Shpëtoje _Si" +msgid "File/Save _As" +msgstr "Skedare/Shpëtoje _Si" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Skedare/-" +msgid "File/-" +msgstr "Skedare/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcione/Testi" +msgid "Options/Test" +msgstr "Opcione/Testi" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ndihmë/_Në lidhje me..." +msgid "Help/_About..." +msgstr "Ndihmë/_Në lidhje me..." #: logdrake:113 #, c-format @@ -3473,8 +3473,8 @@ msgstr "Konfigurimi i lajmit alarmues" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Auto-zbulues _stampuesve" +#~ msgid "Autodetect _printers" +#~ msgstr "Auto-zbulues _stampuesve" #~ msgid "" #~ "No Sound Card has been detected on your machine. Please verify that a " diff --git a/perl-install/standalone/po/sr.po b/perl-install/standalone/po/sr.po index 377090049..46652e91c 100644 --- a/perl-install/standalone/po/sr.po +++ b/perl-install/standalone/po/sr.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Фајл" +msgid "_File" +msgstr "_Фајл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Фајл/_Крај" +msgid "File/_Quit" +msgstr "Фајл/_Крај" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2196,27 +2196,27 @@ msgstr "Могућности" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Опције" +msgid "_Options" +msgstr "_Опције" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Помоћ" +msgid "_Help" +msgstr "_Помоћ" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Аутодетекција _модема" +msgid "Autodetect _modems" +msgstr "Аутодетекција _модема" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Аутодетекција _jaz уређаја" +msgid "Autodetect _jaz drives" +msgstr "Аутодетекција _jaz уређаја" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2226,13 +2226,13 @@ msgstr "Подешавање мреже" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Крај" +msgid "_Quit" +msgstr "_Крај" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Опис поља" +msgid "_Fields description" +msgstr "_Опис поља" #: harddrake2:212 #, c-format @@ -2264,13 +2264,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Пријавите Баг" +msgid "_Report Bug" +msgstr "_Пријавите Баг" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_О..." +msgid "_About..." +msgstr "_О..." #: harddrake2:232 #, fuzzy, c-format @@ -2377,8 +2377,8 @@ msgstr "Прикажи само за изабрани дан" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Датотека/_Нова" +msgid "File/_New" +msgstr "Датотека/_Нова" #: logdrake:75 #, c-format @@ -2387,8 +2387,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Датотека/_Отвори" +msgid "File/_Open" +msgstr "Датотека/_Отвори" #: logdrake:76 #, c-format @@ -2397,8 +2397,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Датотека/_Сними" +msgid "File/_Save" +msgstr "Датотека/_Сними" #: logdrake:77 #, c-format @@ -2407,23 +2407,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Датотека/Сними _Као" +msgid "File/Save _As" +msgstr "Датотека/Сними _Као" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Фајл/-" +msgid "File/-" +msgstr "Фајл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Опције/Тест" +msgid "Options/Test" +msgstr "Опције/Тест" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Помоћ/_О..." +msgid "Help/_About..." +msgstr "Помоћ/_О..." #: logdrake:113 #, c-format @@ -3439,8 +3439,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Опширно" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Аутодетекција _штампача" +#~ msgid "Autodetect _printers" +#~ msgstr "Аутодетекција _штампача" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/sr@Latn.po b/perl-install/standalone/po/sr@Latn.po index 3eeab4576..926eca901 100644 --- a/perl-install/standalone/po/sr@Latn.po +++ b/perl-install/standalone/po/sr@Latn.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fajl" +msgid "_File" +msgstr "_Fajl" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fajl/_Kraj" +msgid "File/_Quit" +msgstr "Fajl/_Kraj" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2197,27 +2197,27 @@ msgstr "Mogućnosti" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Opcije" +msgid "_Options" +msgstr "_Opcije" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Pomoć" +msgid "_Help" +msgstr "_Pomoć" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Autodetekcija _modema" +msgid "Autodetect _modems" +msgstr "Autodetekcija _modema" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Autodetekcija _jaz uređaja" +msgid "Autodetect _jaz drives" +msgstr "Autodetekcija _jaz uređaja" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2227,13 +2227,13 @@ msgstr "Podešavanje mreže" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Kraj" +msgid "_Quit" +msgstr "_Kraj" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Opis polja" +msgid "_Fields description" +msgstr "_Opis polja" #: harddrake2:212 #, c-format @@ -2265,13 +2265,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Prijavite Bag" +msgid "_Report Bug" +msgstr "_Prijavite Bag" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_O..." +msgid "_About..." +msgstr "_O..." #: harddrake2:232 #, fuzzy, c-format @@ -2378,8 +2378,8 @@ msgstr "Prikaži samo za izabrani dan" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Datoteka/_Nova" +msgid "File/_New" +msgstr "Datoteka/_Nova" #: logdrake:75 #, c-format @@ -2388,8 +2388,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Datoteka/_Otvori" +msgid "File/_Open" +msgstr "Datoteka/_Otvori" #: logdrake:76 #, c-format @@ -2398,8 +2398,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Datoteka/_Snimi" +msgid "File/_Save" +msgstr "Datoteka/_Snimi" #: logdrake:77 #, c-format @@ -2408,23 +2408,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Datoteka/Snimi _Kao" +msgid "File/Save _As" +msgstr "Datoteka/Snimi _Kao" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fajl/-" +msgid "File/-" +msgstr "Fajl/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Opcije/Test" +msgid "Options/Test" +msgstr "Opcije/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Pomoć/_O..." +msgid "Help/_About..." +msgstr "Pomoć/_O..." #: logdrake:113 #, c-format @@ -3437,8 +3437,8 @@ msgstr "KOnfiguracija alarma za Mail" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Autodetekcija _štampača" +#~ msgid "Autodetect _printers" +#~ msgstr "Autodetekcija _štampača" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/sv.po b/perl-install/standalone/po/sv.po index 07dc4ff55..1c70cb813 100644 --- a/perl-install/standalone/po/sv.po +++ b/perl-install/standalone/po/sv.po @@ -57,13 +57,13 @@ msgstr "Ingen starthanterare funnen, skapar en ny konfiguration" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Arkiv" +msgid "_File" +msgstr "_Arkiv" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Arkiv/A_vsluta" +msgid "File/_Quit" +msgstr "Arkiv/A_vsluta" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2250,28 +2250,28 @@ msgstr "Egenskaper" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/A_lternativ" +msgid "_Options" +msgstr "A_lternativ" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Hjälp" +msgid "_Help" +msgstr "_Hjälp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Identifiera modem auto_matiskt" +msgid "Autodetect _modems" +msgstr "Identifiera modem auto_matiskt" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Identifiera _Jaz-enheter automatiskt" +msgid "Autodetect _jaz drives" +msgstr "Identifiera _Jaz-enheter automatiskt" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Detektera parallella zip enheter automatiskt" +msgid "Autodetect parallel _zip drives" +msgstr "Detektera parallella zip enheter automatiskt" #: harddrake2:192 #, c-format @@ -2280,13 +2280,13 @@ msgstr "Hårdvaru Konfiguration" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Avsluta" +msgid "_Quit" +msgstr "_Avsluta" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Fältbeskrivningar" +msgid "_Fields description" +msgstr "_Fältbeskrivningar" #: harddrake2:212 #, c-format @@ -2318,13 +2318,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Rapportera fel" +msgid "_Report Bug" +msgstr "_Rapportera fel" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Om..." +msgid "_About..." +msgstr "_Om..." #: harddrake2:232 #, c-format @@ -2431,8 +2431,8 @@ msgstr "Visa endast för den valda dagen" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Arkiv/_Nytt" +msgid "File/_New" +msgstr "Arkiv/_Nytt" #: logdrake:75 #, c-format @@ -2441,8 +2441,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Arkiv/_Öppna" +msgid "File/_Open" +msgstr "Arkiv/_Öppna" #: logdrake:76 #, c-format @@ -2451,8 +2451,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Arkiv/_Spara" +msgid "File/_Save" +msgstr "Arkiv/_Spara" #: logdrake:77 #, c-format @@ -2461,23 +2461,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Arkiv/Spara so_m" +msgid "File/Save _As" +msgstr "Arkiv/Spara so_m" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Arkiv/-" +msgid "File/-" +msgstr "Arkiv/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Alternativ/Testa" +msgid "Options/Test" +msgstr "Alternativ/Testa" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Hjälp/_Om..." +msgid "Help/_About..." +msgstr "Hjälp/_Om..." #: logdrake:113 #, c-format @@ -3525,8 +3525,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Pratig" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Identifiera skrivare a_utomatiskt" +#~ msgid "Autodetect _printers" +#~ msgstr "Identifiera skrivare a_utomatiskt" #~ msgid "Its GDB trace is:" #~ msgstr "GDB-trace är:" diff --git a/perl-install/standalone/po/ta.po b/perl-install/standalone/po/ta.po index e7fbbfc29..2717e7a86 100644 --- a/perl-install/standalone/po/ta.po +++ b/perl-install/standalone/po/ta.po @@ -50,13 +50,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_கோப்பு" +msgid "_File" +msgstr "_கோப்பு" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/கோப்பு/_வெளிச்ெசல்" +msgid "File/_Quit" +msgstr "கோப்பு/_வெளிச்ெசல்" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2149,27 +2149,27 @@ msgstr "தன்மைகள்" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_விருப்பத்ேதர்வு" +msgid "_Options" +msgstr "_விருப்பத்ேதர்வு" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_உதவி" +msgid "_Help" +msgstr "_உதவி" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "தானியக்கத்தால் கண்டுபிடிக்கப்பட்டது" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "தானியக்கத்தால் கண்டுபிடிக்கப்பட்டது" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2179,12 +2179,12 @@ msgstr "வலையமைப்பாக்க வடிவமைப்பு #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_வெளிச்ெசல்" +msgid "_Quit" +msgstr "_வெளிச்ெசல்" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "குறிப்பு" #: harddrake2:212 @@ -2215,13 +2215,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_பிழைகளை அறிவிக்க" +msgid "_Report Bug" +msgstr "_பிழைகளை அறிவிக்க" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_பற்றி" +msgid "_About..." +msgstr "_பற்றி" #: harddrake2:232 #, fuzzy, c-format @@ -2328,8 +2328,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/கோப்பு/_புதியது" +msgid "File/_New" +msgstr "கோப்பு/_புதியது" #: logdrake:75 #, fuzzy, c-format @@ -2338,8 +2338,8 @@ msgstr "Q" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/கோப்பு/_திற" +msgid "File/_Open" +msgstr "கோப்பு/_திற" #: logdrake:76 #, fuzzy, c-format @@ -2348,8 +2348,8 @@ msgstr "Q" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/கோப்பு/_சேமி" +msgid "File/_Save" +msgstr "கோப்பு/_சேமி" #: logdrake:77 #, fuzzy, c-format @@ -2358,23 +2358,23 @@ msgstr "Q" #: logdrake:78 #, fuzzy, c-format -msgid "/File/Save _As" -msgstr "/கோப்பு/_சேமி" +msgid "File/Save _As" +msgstr "கோப்பு/_சேமி" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/கோப்பு/-" +msgid "File/-" +msgstr "கோப்பு/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/_விருப்பத்ேதர்வு/சோதனை" +msgid "Options/Test" +msgstr "_விருப்பத்ேதர்வு/சோதனை" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/உதவி/_பற்றி..." +msgid "Help/_About..." +msgstr "உதவி/_பற்றி..." #: logdrake:113 #, c-format @@ -3369,7 +3369,7 @@ msgstr "" #~ msgstr "விளக்கமான" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "தானியக்கத்தால் கண்டுபிடிக்கப்பட்டது" #, fuzzy diff --git a/perl-install/standalone/po/tg.po b/perl-install/standalone/po/tg.po index c2c3cbbba..762bee5f2 100644 --- a/perl-install/standalone/po/tg.po +++ b/perl-install/standalone/po/tg.po @@ -57,13 +57,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Баромадан" +msgid "File/_Quit" +msgstr "Файл/_Баромадан" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2252,27 +2252,27 @@ msgstr "Хусусиятҳо" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Хосиятҳо" +msgid "_Options" +msgstr "_Хосиятҳо" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ёрӣ" +msgid "_Help" +msgstr "_Ёрӣ" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Худмуаяйнкунии _модемҳо" +msgid "Autodetect _modems" +msgstr "Худмуаяйнкунии _модемҳо" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Худмуайянкунии гардонандаҳои _jaz" +msgid "Autodetect _jaz drives" +msgstr "Худмуайянкунии гардонандаҳои _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2282,13 +2282,13 @@ msgstr "Танзимдарории Шабака" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Баромадан" +msgid "_Quit" +msgstr "_Баромадан" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Майдонҳо бо тавсифот" +msgid "_Fields description" +msgstr "_Майдонҳо бо тавсифот" #: harddrake2:212 #, c-format @@ -2320,13 +2320,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Ҳисобот оиди хатогӣ" +msgid "_Report Bug" +msgstr "_Ҳисобот оиди хатогӣ" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Оиди..." +msgid "_About..." +msgstr "_Оиди..." #: harddrake2:232 #, fuzzy, c-format @@ -2435,8 +2435,8 @@ msgstr "Танҳо барои рӯзи интихобшуда нишон диҳ #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Нав" +msgid "File/_New" +msgstr "Файл/_Нав" #: logdrake:75 #, c-format @@ -2445,8 +2445,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Кушодан" +msgid "File/_Open" +msgstr "Файл/_Кушодан" #: logdrake:76 #, c-format @@ -2455,8 +2455,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Нигоҳ доштан" +msgid "File/_Save" +msgstr "Файл/_Нигоҳ доштан" #: logdrake:77 #, c-format @@ -2465,23 +2465,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/нигоҳ доред _ҳамчун" +msgid "File/Save _As" +msgstr "Файл/нигоҳ доред _ҳамчун" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Хосиятҳо/Санҷиш" +msgid "Options/Test" +msgstr "Хосиятҳо/Санҷиш" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ёрӣ/_Дар бораи..." +msgid "Help/_About..." +msgstr "Ёрӣ/_Дар бораи..." #: logdrake:113 #, c-format @@ -3527,8 +3527,8 @@ msgstr "Танзимдарории огоҳиномаи пост" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Ба таври автоматӣ муаяйн кардани _чопгарҳоро" +#~ msgid "Autodetect _printers" +#~ msgstr "Ба таври автоматӣ муаяйн кардани _чопгарҳоро" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/th.po b/perl-install/standalone/po/th.po index 57b1670f4..d74c72a1e 100644 --- a/perl-install/standalone/po/th.po +++ b/perl-install/standalone/po/th.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_ไฟล์" +msgid "_File" +msgstr "_ไฟล์" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/ไฟล์/_เลิก" +msgid "File/_Quit" +msgstr "ไฟล์/_เลิก" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2144,27 +2144,27 @@ msgstr "คุณสมบัติ" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_อ็อปชั่น" +msgid "_Options" +msgstr "_อ็อปชั่น" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_ช่วยเหลือ" +msgid "_Help" +msgstr "_ช่วยเหลือ" #: harddrake2:186 #, fuzzy, c-format -msgid "/Autodetect _modems" +msgid "Autodetect _modems" msgstr "ใช้ auto detection" #: harddrake2:187 #, fuzzy, c-format -msgid "/Autodetect _jaz drives" +msgid "Autodetect _jaz drives" msgstr "ใช้ auto detection" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2174,12 +2174,12 @@ msgstr "การคอนฟิกระบบเน็ตเวิร์ก" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_ออก" +msgid "_Quit" +msgstr "_ออก" #: harddrake2:210 #, fuzzy, c-format -msgid "/_Fields description" +msgid "_Fields description" msgstr "รายละเอียด" #: harddrake2:212 @@ -2208,13 +2208,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_แจ้ง Bug" +msgid "_Report Bug" +msgstr "_แจ้ง Bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_เกี่ยวกับ..." +msgid "_About..." +msgstr "_เกี่ยวกับ..." #: harddrake2:232 #, fuzzy, c-format @@ -2321,8 +2321,8 @@ msgstr "" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/ไฟล์/_ใหม่" +msgid "File/_New" +msgstr "ไฟล์/_ใหม่" #: logdrake:75 #, c-format @@ -2331,8 +2331,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/ไฟล์/_เปิด" +msgid "File/_Open" +msgstr "ไฟล์/_เปิด" #: logdrake:76 #, c-format @@ -2341,8 +2341,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/ไฟล์/_บันทึก" +msgid "File/_Save" +msgstr "ไฟล์/_บันทึก" #: logdrake:77 #, c-format @@ -2351,23 +2351,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/ไฟล์/บันทึก_เป็น" +msgid "File/Save _As" +msgstr "ไฟล์/บันทึก_เป็น" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/ไฟล์/-" +msgid "File/-" +msgstr "ไฟล์/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/อ็อปชั่น/ทดลอง" +msgid "Options/Test" +msgstr "อ็อปชั่น/ทดลอง" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/ช่วยเหลือ/_เกี่ยวกับ..." +msgid "Help/_About..." +msgstr "ช่วยเหลือ/_เกี่ยวกับ..." #: logdrake:113 #, c-format @@ -3355,7 +3355,7 @@ msgid "Authentication is required to run Mageia Service Configuration" msgstr "" #, fuzzy -#~ msgid "/Autodetect _printers" +#~ msgid "Autodetect _printers" #~ msgstr "ใช้ auto detection" #, fuzzy diff --git a/perl-install/standalone/po/tl.po b/perl-install/standalone/po/tl.po index a9ecc4a2c..ab8103a05 100644 --- a/perl-install/standalone/po/tl.po +++ b/perl-install/standalone/po/tl.po @@ -48,13 +48,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_File" +msgid "_File" +msgstr "_File" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/File/_Quit" +msgid "File/_Quit" +msgstr "File/_Quit" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2229,27 +2229,27 @@ msgstr "" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/Mga _option" +msgid "_Options" +msgstr "Mga _option" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Tulong" +msgid "_Help" +msgstr "_Tulong" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/I-autodetect mga _modem" +msgid "Autodetect _modems" +msgstr "I-autodetect mga _modem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/I-autodetect mga _jaz drive" +msgid "Autodetect _jaz drives" +msgstr "I-autodetect mga _jaz drive" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2259,13 +2259,13 @@ msgstr "Configuration ng Network" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Quit" +msgid "_Quit" +msgstr "_Quit" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Paglalarawan ng mga _field" +msgid "_Fields description" +msgstr "Paglalarawan ng mga _field" #: harddrake2:212 #, c-format @@ -2297,13 +2297,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Iulat ang Bug" +msgid "_Report Bug" +msgstr "_Iulat ang Bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/Tung_kol sa..." +msgid "_About..." +msgstr "Tung_kol sa..." #: harddrake2:232 #, fuzzy, c-format @@ -2412,8 +2412,8 @@ msgstr "Ipakita lamang para sa napiling araw" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/File/_Bago" +msgid "File/_New" +msgstr "File/_Bago" #: logdrake:75 #, c-format @@ -2422,8 +2422,8 @@ msgstr "B" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/File/B_uksan" +msgid "File/_Open" +msgstr "File/B_uksan" #: logdrake:76 #, c-format @@ -2432,8 +2432,8 @@ msgstr "U" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/File/I-_save" +msgid "File/_Save" +msgstr "File/I-_save" #: logdrake:77 #, c-format @@ -2442,23 +2442,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/File/I-save _Na" +msgid "File/Save _As" +msgstr "File/I-save _Na" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/File/-" +msgid "File/-" +msgstr "File/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Mga Option/Subukan" +msgid "Options/Test" +msgstr "Mga Option/Subukan" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Tulong/Tung_kol sa..." +msgid "Help/_About..." +msgstr "Tulong/Tung_kol sa..." #: logdrake:113 #, c-format @@ -3499,8 +3499,8 @@ msgstr "Mail alert configuration" msgid "Authentication is required to run Mageia Service Configuration" msgstr "" -#~ msgid "/Autodetect _printers" -#~ msgstr "/I-autodetect mga _printer" +#~ msgid "Autodetect _printers" +#~ msgstr "I-autodetect mga _printer" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/tr.po b/perl-install/standalone/po/tr.po index e7ec0698c..9ebb57f98 100644 --- a/perl-install/standalone/po/tr.po +++ b/perl-install/standalone/po/tr.po @@ -57,13 +57,13 @@ msgstr "Önyükleyici bulunamadı. Yeni bir yapılandırma oluşturuluyor." #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Dosya" +msgid "_File" +msgstr "_Dosya" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Dosya/Çı_kış" +msgid "File/_Quit" +msgstr "Dosya/Çı_kış" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2241,28 +2241,28 @@ msgstr "Özellikler" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Seçenekler" +msgid "_Options" +msgstr "_Seçenekler" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Yardım" +msgid "_Help" +msgstr "_Yardım" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modemleri otomatik algıla" +msgid "Autodetect _modems" +msgstr "_Modemleri otomatik algıla" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_jaz sürücülerini otomatik algıla" +msgid "Autodetect _jaz drives" +msgstr "_jaz sürücülerini otomatik algıla" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/paralel _zip sürücüleri otomatik algıla" +msgid "Autodetect parallel _zip drives" +msgstr "paralel _zip sürücüleri otomatik algıla" #: harddrake2:192 #, c-format @@ -2271,13 +2271,13 @@ msgstr "Donanım Yapılandırması" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/_Çık" +msgid "_Quit" +msgstr "_Çık" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Alan açıklamaları" +msgid "_Fields description" +msgstr "_Alan açıklamaları" #: harddrake2:212 #, c-format @@ -2309,13 +2309,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Hata Bildir" +msgid "_Report Bug" +msgstr "_Hata Bildir" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Hakkında..." +msgid "_About..." +msgstr "_Hakkında..." #: harddrake2:232 #, c-format @@ -2422,8 +2422,8 @@ msgstr "Sadece bugünlük olanları göster" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Dosya/_Yeni" +msgid "File/_New" +msgstr "Dosya/_Yeni" #: logdrake:75 #, c-format @@ -2432,8 +2432,8 @@ msgstr "Y" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Dosya/_Aç" +msgid "File/_Open" +msgstr "Dosya/_Aç" #: logdrake:76 #, c-format @@ -2442,8 +2442,8 @@ msgstr "A" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Dosya/_Kaydet" +msgid "File/_Save" +msgstr "Dosya/_Kaydet" #: logdrake:77 #, c-format @@ -2452,23 +2452,23 @@ msgstr "K" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Dosya/_Farklı kaydet" +msgid "File/Save _As" +msgstr "Dosya/_Farklı kaydet" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Dosya/-" +msgid "File/-" +msgstr "Dosya/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Ayarlar/Test" +msgid "Options/Test" +msgstr "Ayarlar/Test" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Yardım/_Hakkında..." +msgid "Help/_About..." +msgstr "Yardım/_Hakkında..." #: logdrake:113 #, c-format diff --git a/perl-install/standalone/po/uk.po b/perl-install/standalone/po/uk.po index 04802ca17..9c4858103 100644 --- a/perl-install/standalone/po/uk.po +++ b/perl-install/standalone/po/uk.po @@ -47,13 +47,13 @@ msgstr "Завантажувач не знайдено, створюються #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/_Вийти" +msgid "File/_Quit" +msgstr "Файл/_Вийти" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2230,28 +2230,28 @@ msgstr "Можливості" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Параметри" +msgid "_Options" +msgstr "_Параметри" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Довідка" +msgid "_Help" +msgstr "_Довідка" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Автовизначення _модемів" +msgid "Autodetect _modems" +msgstr "Автовизначення _модемів" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Автоматично визначати др_айвери jaz" +msgid "Autodetect _jaz drives" +msgstr "Автоматично визначати др_айвери jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Автовизначення паралельних п_риводів zip" +msgid "Autodetect parallel _zip drives" +msgstr "Автовизначення паралельних п_риводів zip" #: harddrake2:192 #, c-format @@ -2260,13 +2260,13 @@ msgstr "Налаштування обладнання" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/Ви_йти" +msgid "_Quit" +msgstr "Ви_йти" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Описи по_лів" +msgid "_Fields description" +msgstr "Описи по_лів" #: harddrake2:212 #, c-format @@ -2298,13 +2298,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_R Повідомити про помилку" +msgid "_Report Bug" +msgstr "_R Повідомити про помилку" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Про програму…" +msgid "_About..." +msgstr "_Про програму…" #: harddrake2:232 #, c-format @@ -2412,8 +2412,8 @@ msgstr "Показувати лише для позначеного дня" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/С_творити" +msgid "File/_New" +msgstr "Файл/С_творити" #: logdrake:75 #, c-format @@ -2422,8 +2422,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Відкрити" +msgid "File/_Open" +msgstr "Файл/_Відкрити" #: logdrake:76 #, c-format @@ -2432,8 +2432,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Зберегти" +msgid "File/_Save" +msgstr "Файл/_Зберегти" #: logdrake:77 #, c-format @@ -2442,23 +2442,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/Зберегти _як…" +msgid "File/Save _As" +msgstr "Файл/Зберегти _як…" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Параметри/Перевірка" +msgid "Options/Test" +msgstr "Параметри/Перевірка" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Довідка/_Про програму…" +msgid "Help/_About..." +msgstr "Довідка/_Про програму…" #: logdrake:113 #, c-format @@ -3521,8 +3521,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Детально" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Користуватися автовизначенням друкарок" +#~ msgid "Autodetect _printers" +#~ msgstr "Користуватися автовизначенням друкарок" #~ msgid "Its GDB trace is:" #~ msgstr "Трасування GDB:" diff --git a/perl-install/standalone/po/uz.po b/perl-install/standalone/po/uz.po index ff690dc09..acb7e2b8d 100644 --- a/perl-install/standalone/po/uz.po +++ b/perl-install/standalone/po/uz.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fayl" +msgid "_File" +msgstr "_Fayl" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fayl/Chi_qish" +msgid "File/_Quit" +msgstr "Fayl/Chi_qish" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2162,27 +2162,27 @@ msgstr "Qulayliklar" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Moslamalar" +msgid "_Options" +msgstr "_Moslamalar" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Yordam" +msgid "_Help" +msgstr "_Yordam" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Modemlarni avto-aniqlash" +msgid "Autodetect _modems" +msgstr "_Modemlarni avto-aniqlash" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz uskunalarini avto-aniqlash" +msgid "Autodetect _jaz drives" +msgstr "_Jaz uskunalarini avto-aniqlash" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2192,13 +2192,13 @@ msgstr "Asbob-uskunalarni moslash" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/Chi_qish" +msgid "_Quit" +msgstr "Chi_qish" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Maydonlar taʼrifi" +msgid "_Fields description" +msgstr "_Maydonlar taʼrifi" #: harddrake2:212 #, c-format @@ -2230,13 +2230,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Xato haqida xabar qilish" +msgid "_Report Bug" +msgstr "_Xato haqida xabar qilish" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Haqida" +msgid "_About..." +msgstr "_Haqida" #: harddrake2:232 #, c-format @@ -2345,8 +2345,8 @@ msgstr "Faqat tanlangan kun uchun koʻrsatish" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fayl/_Yangi" +msgid "File/_New" +msgstr "Fayl/_Yangi" #: logdrake:75 #, c-format @@ -2355,8 +2355,8 @@ msgstr "Cyrillic_EN" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fayl/_Ochish" +msgid "File/_Open" +msgstr "Fayl/_Ochish" #: logdrake:76 #, c-format @@ -2365,8 +2365,8 @@ msgstr "Cyrillic_O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fayl/_Saqlash" +msgid "File/_Save" +msgstr "Fayl/_Saqlash" #: logdrake:77 #, c-format @@ -2375,23 +2375,23 @@ msgstr "Cyrillic_ES" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fayl/...sifatida s_aqlash" +msgid "File/Save _As" +msgstr "Fayl/...sifatida s_aqlash" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fayl/-" +msgid "File/-" +msgstr "Fayl/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Parametrlar/Sinash" +msgid "Options/Test" +msgstr "Parametrlar/Sinash" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Yordam/_Haqida" +msgid "Help/_About..." +msgstr "Yordam/_Haqida" #: logdrake:113 #, c-format @@ -3401,8 +3401,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Batafsil maʼlumot bilan" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Printerlarni _avto-aniqlash" +#~ msgid "Autodetect _printers" +#~ msgstr "Printerlarni _avto-aniqlash" #~ msgid "OpenOffice.org" #~ msgstr "OpenOffice.org" diff --git a/perl-install/standalone/po/uz@cyrillic.po b/perl-install/standalone/po/uz@cyrillic.po index a7b0c88a4..2566f2be1 100644 --- a/perl-install/standalone/po/uz@cyrillic.po +++ b/perl-install/standalone/po/uz@cyrillic.po @@ -49,13 +49,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Файл" +msgid "_File" +msgstr "_Файл" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Файл/Чи_қиш" +msgid "File/_Quit" +msgstr "Файл/Чи_қиш" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2159,27 +2159,27 @@ msgstr "Қулайликлар" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Мосламалар" +msgid "_Options" +msgstr "_Мосламалар" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Ёрдам" +msgid "_Help" +msgstr "_Ёрдам" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/_Модемларни авто-аниқлаш" +msgid "Autodetect _modems" +msgstr "_Модемларни авто-аниқлаш" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/_Jaz ускуналарини авто-аниқлаш" +msgid "Autodetect _jaz drives" +msgstr "_Jaz ускуналарини авто-аниқлаш" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" +msgid "Autodetect parallel _zip drives" msgstr "" #: harddrake2:192 @@ -2189,13 +2189,13 @@ msgstr "Асбоб-ускуналарни мослаш" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/Чи_қиш" +msgid "_Quit" +msgstr "Чи_қиш" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/_Майдонлар таърифи" +msgid "_Fields description" +msgstr "_Майдонлар таърифи" #: harddrake2:212 #, c-format @@ -2227,13 +2227,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Хато ҳақида хабар қилиш" +msgid "_Report Bug" +msgstr "_Хато ҳақида хабар қилиш" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/_Ҳақида" +msgid "_About..." +msgstr "_Ҳақида" #: harddrake2:232 #, c-format @@ -2342,8 +2342,8 @@ msgstr "Фақат танланган кун учун кўрсатиш" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Файл/_Янги" +msgid "File/_New" +msgstr "Файл/_Янги" #: logdrake:75 #, c-format @@ -2352,8 +2352,8 @@ msgstr "Cyrillic_EN" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Файл/_Очиш" +msgid "File/_Open" +msgstr "Файл/_Очиш" #: logdrake:76 #, c-format @@ -2362,8 +2362,8 @@ msgstr "Cyrillic_O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Файл/_Сақлаш" +msgid "File/_Save" +msgstr "Файл/_Сақлаш" #: logdrake:77 #, c-format @@ -2372,23 +2372,23 @@ msgstr "Cyrillic_ES" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Файл/...сифатида с_ақлаш" +msgid "File/Save _As" +msgstr "Файл/...сифатида с_ақлаш" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Файл/-" +msgid "File/-" +msgstr "Файл/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Параметрлар/Синаш" +msgid "Options/Test" +msgstr "Параметрлар/Синаш" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Ёрдам/_Ҳақида" +msgid "Help/_About..." +msgstr "Ёрдам/_Ҳақида" #: logdrake:113 #, c-format @@ -3397,8 +3397,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Батафсил маълумот билан" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Принтерларни _авто-аниқлаш" +#~ msgid "Autodetect _printers" +#~ msgstr "Принтерларни _авто-аниқлаш" #~ msgid "OpenOffice.org" #~ msgstr "OpenOffice.org" diff --git a/perl-install/standalone/po/vi.po b/perl-install/standalone/po/vi.po index f5282b519..c71cc1fb5 100644 --- a/perl-install/standalone/po/vi.po +++ b/perl-install/standalone/po/vi.po @@ -47,13 +47,13 @@ msgstr "" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Tệp" +msgid "_File" +msgstr "_Tệp" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Tệp/T_hoát" +msgid "File/_Quit" +msgstr "Tệp/T_hoát" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2233,28 +2233,28 @@ msgstr "Tính năng" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/Tuỳ _chọn" +msgid "_Options" +msgstr "Tuỳ _chọn" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/Trợ _giúp" +msgid "_Help" +msgstr "Trợ _giúp" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Tự động dò mo_dem" +msgid "Autodetect _modems" +msgstr "Tự động dò mo_dem" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Tự động phát hiện _jaz drive" +msgid "Autodetect _jaz drives" +msgstr "Tự động phát hiện _jaz drive" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Tự động phát hiện parallel _zip drives" +msgid "Autodetect parallel _zip drives" +msgstr "Tự động phát hiện parallel _zip drives" #: harddrake2:192 #, fuzzy, c-format @@ -2263,13 +2263,13 @@ msgstr "Đồ thuật Cấu hình" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/T_hoát" +msgid "_Quit" +msgstr "T_hoát" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Mô tả các t_rường" +msgid "_Fields description" +msgstr "Mô tả các t_rường" #: harddrake2:212 #, c-format @@ -2301,13 +2301,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Báo cáo lỗi" +msgid "_Report Bug" +msgstr "_Báo cáo lỗi" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/Giới thiệ_u..." +msgid "_About..." +msgstr "Giới thiệ_u..." #: harddrake2:232 #, fuzzy, c-format @@ -2414,8 +2414,8 @@ msgstr "Chỉ hiển thị với ngày được chọn" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Tệp/M_ới" +msgid "File/_New" +msgstr "Tệp/M_ới" #: logdrake:75 #, c-format @@ -2424,8 +2424,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Tệp/M_ở" +msgid "File/_Open" +msgstr "Tệp/M_ở" #: logdrake:76 #, c-format @@ -2434,8 +2434,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Tệp/_Lưu" +msgid "File/_Save" +msgstr "Tệp/_Lưu" #: logdrake:77 #, c-format @@ -2444,23 +2444,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Tệp/Lưu l_à" +msgid "File/Save _As" +msgstr "Tệp/Lưu l_à" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Tệp/-" +msgid "File/-" +msgstr "Tệp/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Tuỳ chọn/Thử" +msgid "Options/Test" +msgstr "Tuỳ chọn/Thử" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Trợ giúp/Giới thiệ_u..." +msgid "Help/_About..." +msgstr "Trợ giúp/Giới thiệ_u..." #: logdrake:113 #, c-format @@ -3499,8 +3499,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Verbose" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Tự động dò Máy _in" +#~ msgid "Autodetect _printers" +#~ msgstr "Tự động dò Máy _in" #, fuzzy #~ msgid "Copyright (C) %s by Mageia" diff --git a/perl-install/standalone/po/wa.po b/perl-install/standalone/po/wa.po index 7b59e7c03..bd91d5e7e 100644 --- a/perl-install/standalone/po/wa.po +++ b/perl-install/standalone/po/wa.po @@ -51,13 +51,13 @@ msgstr "Nole enondrece di trvêye, askepiant on novea apontiaedje" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/_Fitchî" +msgid "_File" +msgstr "_Fitchî" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/Fitchî/Moussî _foû" +msgid "File/_Quit" +msgstr "Fitchî/Moussî _foû" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2251,28 +2251,28 @@ msgstr "Fonccionålités" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/_Tchuzes" +msgid "_Options" +msgstr "_Tchuzes" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/_Aidance" +msgid "_Help" +msgstr "_Aidance" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/Oto-detecter les _modems" +msgid "Autodetect _modems" +msgstr "Oto-detecter les _modems" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/Oto-detecter les lijheus _jaz" +msgid "Autodetect _jaz drives" +msgstr "Oto-detecter les lijheus _jaz" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/Oto-detecter les lijheus _ZIP paraleles" +msgid "Autodetect parallel _zip drives" +msgstr "Oto-detecter les lijheus _ZIP paraleles" #: harddrake2:192 #, c-format @@ -2281,13 +2281,13 @@ msgstr "Apontiaedje di l' éndjolreye" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/Moussî _foû" +msgid "_Quit" +msgstr "Moussî _foû" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/Discrijhaedje des _tchamps" +msgid "_Fields description" +msgstr "Discrijhaedje des _tchamps" #: harddrake2:212 #, c-format @@ -2319,13 +2319,13 @@ msgstr "" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/_Rapoirter on bug" +msgid "_Report Bug" +msgstr "_Rapoirter on bug" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/Å_d fwait..." +msgid "_About..." +msgstr "Å_d fwait..." #: harddrake2:232 #, c-format @@ -2434,8 +2434,8 @@ msgstr "Mostrer seulmint pol djoû tchoezi" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/Fitchî/_Novea" +msgid "File/_New" +msgstr "Fitchî/_Novea" #: logdrake:75 #, c-format @@ -2444,8 +2444,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/Fitchî/_Drovi" +msgid "File/_Open" +msgstr "Fitchî/_Drovi" #: logdrake:76 #, c-format @@ -2454,8 +2454,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/Fitchî/_Schaper" +msgid "File/_Save" +msgstr "Fitchî/_Schaper" #: logdrake:77 #, c-format @@ -2464,23 +2464,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/Fitchî/Schaper et r_lomer" +msgid "File/Save _As" +msgstr "Fitchî/Schaper et r_lomer" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/Fitchî/-" +msgid "File/-" +msgstr "Fitchî/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/Tchuzes/Saye" +msgid "Options/Test" +msgstr "Tchuzes/Saye" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/Aidance/Å_d fwait..." +msgid "Help/_About..." +msgstr "Aidance/Å_d fwait..." #: logdrake:113 #, c-format @@ -3532,8 +3532,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "Badjawe" -#~ msgid "/Autodetect _printers" -#~ msgstr "/Oto-detecter les _scrireces" +#~ msgid "Autodetect _printers" +#~ msgstr "Oto-detecter les _scrireces" #~ msgid "OpenOffice.org" #~ msgstr "OpenOffice.org" diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po index 353bc0753..230f26068 100644 --- a/perl-install/standalone/po/zh_CN.po +++ b/perl-install/standalone/po/zh_CN.po @@ -49,13 +49,13 @@ msgstr "未找到引导程序,创建新配置" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/文件(_F)" +msgid "_File" +msgstr "文件(_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/文件(F)/退出(_Q)" +msgid "File/_Quit" +msgstr "文件(F)/退出(_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2216,28 +2216,28 @@ msgstr "特性" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/选项(_O)" +msgid "_Options" +msgstr "选项(_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/帮助(_H)" +msgid "_Help" +msgstr "帮助(_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/自动检测调制解调器(_M)" +msgid "Autodetect _modems" +msgstr "自动检测调制解调器(_M)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/自动检测 jaz 驱动器(_J)" +msgid "Autodetect _jaz drives" +msgstr "自动检测 jaz 驱动器(_J)" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/自动检测并口 zip 驱动器(_Z)" +msgid "Autodetect parallel _zip drives" +msgstr "自动检测并口 zip 驱动器(_Z)" #: harddrake2:192 #, c-format @@ -2246,13 +2246,13 @@ msgstr "硬件配置" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/退出(_Q)" +msgid "_Quit" +msgstr "退出(_Q)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/域描述(_F)" +msgid "_Fields description" +msgstr "域描述(_F)" #: harddrake2:212 #, c-format @@ -2282,13 +2282,13 @@ msgstr "只要您选中了设备, 您就能看到在右侧框架(“信息”) #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/故障报告(_R)" +msgid "_Report Bug" +msgstr "故障报告(_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/关于(_A)..." +msgid "_About..." +msgstr "关于(_A)..." #: harddrake2:232 #, c-format @@ -2395,8 +2395,8 @@ msgstr "仅显示被选择的日期" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/文件(F)/新建(_N)" +msgid "File/_New" +msgstr "文件(F)/新建(_N)" #: logdrake:75 #, c-format @@ -2405,8 +2405,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/文件(F)/打开(_O)" +msgid "File/_Open" +msgstr "文件(F)/打开(_O)" #: logdrake:76 #, c-format @@ -2415,8 +2415,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/文件(F)/保存(_S)" +msgid "File/_Save" +msgstr "文件(F)/保存(_S)" #: logdrake:77 #, c-format @@ -2425,23 +2425,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/文件(F)/另存为(_A)" +msgid "File/Save _As" +msgstr "文件(F)/另存为(_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/文件(F)/-" +msgid "File/-" +msgstr "文件(F)/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/选项(O)/测试" +msgid "Options/Test" +msgstr "选项(O)/测试" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/帮助(H)/关于(_A)..." +msgid "Help/_About..." +msgstr "帮助(H)/关于(_A)..." #: logdrake:113 #, c-format @@ -3456,8 +3456,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "详细" -#~ msgid "/Autodetect _printers" -#~ msgstr "/自动检测打印机(_P)" +#~ msgid "Autodetect _printers" +#~ msgstr "自动检测打印机(_P)" #~ msgid "Its GDB trace is:" #~ msgstr "GDB 跟踪在此:" diff --git a/perl-install/standalone/po/zh_TW.po b/perl-install/standalone/po/zh_TW.po index c1c29bb1c..ed73d116f 100644 --- a/perl-install/standalone/po/zh_TW.po +++ b/perl-install/standalone/po/zh_TW.po @@ -47,13 +47,13 @@ msgstr "找不到開機管理程式,正在建立新的設定" #: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74 #, c-format -msgid "/_File" -msgstr "/檔案 (_F)" +msgid "_File" +msgstr "檔案 (_F)" #: drakboot:89 logdrake:80 #, c-format -msgid "/File/_Quit" -msgstr "/檔案 (F)/結束 (_Q)" +msgid "File/_Quit" +msgstr "檔案 (F)/結束 (_Q)" #: drakboot:89 harddrake2:199 logdrake:80 #, c-format @@ -2204,28 +2204,28 @@ msgstr "功能" #. -PO: please keep all "/" characters !!! #: harddrake2:181 logdrake:81 #, c-format -msgid "/_Options" -msgstr "/選項 (_O)" +msgid "_Options" +msgstr "選項 (_O)" #: harddrake2:182 harddrake2:208 logdrake:83 #, c-format -msgid "/_Help" -msgstr "/說明 (_H)" +msgid "_Help" +msgstr "說明 (_H)" #: harddrake2:186 #, c-format -msgid "/Autodetect _modems" -msgstr "/自動偵測數據機 (_M)" +msgid "Autodetect _modems" +msgstr "自動偵測數據機 (_M)" #: harddrake2:187 #, c-format -msgid "/Autodetect _jaz drives" -msgstr "/自動偵測 Jaz 裝置 (_J)" +msgid "Autodetect _jaz drives" +msgstr "自動偵測 Jaz 裝置 (_J)" #: harddrake2:188 #, c-format -msgid "/Autodetect parallel _zip drives" -msgstr "/自動偵測平行埠的 ZIP 磁碟 (_Z)" +msgid "Autodetect parallel _zip drives" +msgstr "自動偵測平行埠的 ZIP 磁碟 (_Z)" #: harddrake2:192 #, c-format @@ -2234,13 +2234,13 @@ msgstr "硬體組態設定" #: harddrake2:199 #, c-format -msgid "/_Quit" -msgstr "/結束 (_Q)" +msgid "_Quit" +msgstr "結束 (_Q)" #: harddrake2:210 #, c-format -msgid "/_Fields description" -msgstr "/欄位的描述資訊 (_F)" +msgid "_Fields description" +msgstr "欄位的描述資訊 (_F)" #: harddrake2:212 #, c-format @@ -2270,13 +2270,13 @@ msgstr "只要您選擇了一項裝置,您就能在右方的欄位 (\"資訊\" #: harddrake2:227 #, c-format -msgid "/_Report Bug" -msgstr "/報告錯誤 (_R)" +msgid "_Report Bug" +msgstr "報告錯誤 (_R)" #: harddrake2:229 #, c-format -msgid "/_About..." -msgstr "/關於 (_A)" +msgid "_About..." +msgstr "關於 (_A)" #: harddrake2:232 #, c-format @@ -2383,8 +2383,8 @@ msgstr "僅顯示所選取日期" #: logdrake:75 #, c-format -msgid "/File/_New" -msgstr "/檔案/新增 (_N)" +msgid "File/_New" +msgstr "檔案/新增 (_N)" #: logdrake:75 #, c-format @@ -2393,8 +2393,8 @@ msgstr "N" #: logdrake:76 #, c-format -msgid "/File/_Open" -msgstr "/檔案/開啟 (_O)" +msgid "File/_Open" +msgstr "檔案/開啟 (_O)" #: logdrake:76 #, c-format @@ -2403,8 +2403,8 @@ msgstr "O" #: logdrake:77 #, c-format -msgid "/File/_Save" -msgstr "/檔案/儲存 (_S)" +msgid "File/_Save" +msgstr "檔案/儲存 (_S)" #: logdrake:77 #, c-format @@ -2413,23 +2413,23 @@ msgstr "S" #: logdrake:78 #, c-format -msgid "/File/Save _As" -msgstr "/檔案/另存新檔 (_A)" +msgid "File/Save _As" +msgstr "檔案/另存新檔 (_A)" #: logdrake:79 #, c-format -msgid "/File/-" -msgstr "/檔案/-" +msgid "File/-" +msgstr "檔案/-" #: logdrake:82 #, c-format -msgid "/Options/Test" -msgstr "/選項/測試" +msgid "Options/Test" +msgstr "選項/測試" #: logdrake:84 #, c-format -msgid "/Help/_About..." -msgstr "/說明/關於 (_A)" +msgid "Help/_About..." +msgstr "說明/關於 (_A)" #: logdrake:113 #, c-format @@ -3449,8 +3449,8 @@ msgstr "" #~ msgid "Verbose" #~ msgstr "顯示詳細訊息" -#~ msgid "/Autodetect _printers" -#~ msgstr "/自動偵測印表機 (_P)" +#~ msgid "Autodetect _printers" +#~ msgstr "自動偵測印表機 (_P)" #~ msgid "Its GDB trace is:" #~ msgstr "它的 GDB 追蹤為:" -- cgit v1.2.1 From 3d821129bc8a7b6ea0a9b3648ed295a23c0b753d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 17:22:51 +0100 Subject: temporary disable the graphical clock needs more work --- perl-install/standalone/drakclock | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index ec814dcec..d7b229242 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -194,6 +194,7 @@ $drawing_area->set_events(${ Gtk3::Gdk::EventMask->new([ 'button_press_mask', 'b $drawing_area->signal_connect(draw => \&draw); $drawing_area->signal_connect(realize => sub { my $window = $drawing_area->get_window; + return; #FIXME $pixmap = Gtk3::Gdk::Pixmap->new($window, @image_size, $window->get_depth); }); @@ -228,7 +229,7 @@ $timer = Glib::Timeout->add(120, \&update_time); $drawing_area->show; $my_win->{window}->show_all; -my ($midx, $midy) = ($drawing_area->get_allocation->width/2, $drawing_area->get_allocation->height/2); +my ($midx, $midy); # FIXME = ($drawing_area->get_allocation->width/2, $drawing_area->get_allocation->height/2); $my_win->main; ugtk3->exit(0); @@ -315,6 +316,7 @@ sub determine_radian { sub draw { my ($widget, $event) = @_; + return; #FIXME my ($x, $y, $width, $height) = $event->area->get_values; $widget->get_window->draw_drawable($widget->get_style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); 0; @@ -340,6 +342,7 @@ sub Repaint { my ($drawing_area, $o_update_time) = @_; my ($sec, $min, $hour) = localtime(time()); time_to_rad($sec, $min, $hour) if $o_update_time; + return; #FIXME my ($width, $height) = ($drawing_area->get_allocation->width, $drawing_area->get_allocation->height); my $dRadians_hour_real = $dRadians_hour + $dRadians_min / 12; my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; -- cgit v1.2.1 From 2e76e64f6df89d576a3585b27fa7320908e4d6f4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 19:05:17 +0100 Subject: latest perl-Gtk3 needs GdkX11-3.0.typelib --- perl-install/install/share/list.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 2dd9de1d0..cf771b0b7 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -97,6 +97,7 @@ 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 -- cgit v1.2.1 From ec0513e059d437920ee55bc3838eb969ac42b7e1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 24 Nov 2013 22:35:33 +0100 Subject: fix displaying ads by default after commit 81bb64a79ef, this was no longer true --- perl-install/mygtk3.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 6db4651c9..421a9f419 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -185,9 +185,8 @@ sub _gtk_any_Button { $w->set_relief(delete $opts->{relief}) if exists $opts->{relief}; if (my $text_ref = delete $opts->{text_ref}) { - $$text_ref ||= ''; my $set = sub { - eval { $w->set_label(may_apply($w->{format}, $$text_ref)) }; + eval { $w->set_label(may_apply($w->{format}, $$text_ref || '')) }; }; gtkval_register($w, $text_ref, $set); $set->(); -- cgit v1.2.1 From 8b3280fc5a7d3cbc4b82774c4b71bd52a66893d0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 25 Nov 2013 00:20:43 +0100 Subject: shrink a translation (& make it like others) --- perl-install/install/share/po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po index 094e9cfed..7b26aa0f8 100644 --- a/perl-install/install/share/po/fr.po +++ b/perl-install/install/share/po/fr.po @@ -809,7 +809,7 @@ msgstr "Un environnement de bureau rapide et léger avec peu d'outils" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "Environnement de bureau Enlightenment e17" +msgstr "Station de travail Enlightenment e17" #: share/meta-task/compssUsers.pl:190 #, c-format -- cgit v1.2.1 From bd5b12f509eb7afb4e5debcf0aad85957716284a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 23 Nov 2013 16:56:24 +0100 Subject: 16.0 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 13 +++++++++++++ perl-install/install/NEWS | 8 ++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index a20dae1de..301a8fd9e 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=15.73.1 +VERSION:=16.0 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 07306b038..adce397e7 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,16 @@ +Version 16.0 - 23 November 2013 + +- switch from Gtk+-2 to Gtk+-3: + o Banners: most themes work OK but Oxygen-gtk3... + o diskdrake: most themes work OK but Oxygen-gtk3... + o drakclock cannot temporary changes the clock + o notifications work again for net_applet +- detect_devices: + fix ids to be numeric +- drakxservices: + o simplify: just use tooltips for service descriptions" +- drakx-in-chroot: + o add --depth in order to force 16bit colors mode - drakclock: o assume chrony rather than ntp when neither is installed - draksec: diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 62443f6c8..c57b89f9b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,11 @@ +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 + Version 15.73.1 - 19 November 2013 - debug image: -- cgit v1.2.1 From c295f5ddc1c3f04f4856af7dc488f08ad446a646 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 25 Nov 2013 01:48:43 +0100 Subject: fix a crash with some USB keys --- perl-install/diskdrake/hd_gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 4a67ecdbb..583df7ae2 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -342,7 +342,7 @@ sub create_buttons4partitions { my $p = find { $entry->{dm_name} eq $_->{dmcrypt_name} } @{$all_hds->{dmcrypts}}; $entry = $p if $p; } - my $info = $entry->{mntpoint} || $entry->{device_LABEL}; + my $info = $entry->{mntpoint} || $entry->{device_LABEL} || ''; $info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info; my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label'); $w->signal_connect(clicked => sub { -- cgit v1.2.1 From b328b7d17d7ebf0d856fea0ecd6a5d7d2b46d8fa Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 25 Nov 2013 02:31:42 +0100 Subject: drop unused function --- perl-install/standalone/harddrake2 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 08a81b913..0ee0c4b35 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -583,11 +583,6 @@ sub show_hide { if ($bool) { $button->show } else { $button->hide } } - -sub strip_first_underscore { - join '', map { s/_//; $_ } @_; -} - sub lookup_field { my ($field) = @_; my $class = find { defined $fields{$_} && defined $fields{$_}{$field} } ($current_class, 'generic'); -- cgit v1.2.1 From a809a08f1f5559d10037af145b986a528b18095c Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 25 Nov 2013 19:03:31 +0200 Subject: Fix Ukrainian translation --- perl-install/standalone/po/uk.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/standalone/po/uk.po b/perl-install/standalone/po/uk.po index 9c4858103..008a95af2 100644 --- a/perl-install/standalone/po/uk.po +++ b/perl-install/standalone/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_standalone\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-10-14 19:58+0300\n" +"PO-Revision-Date: 2013-11-25 19:58+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -2246,12 +2246,12 @@ msgstr "Автовизначення _модемів" #: harddrake2:187 #, c-format msgid "Autodetect _jaz drives" -msgstr "Автоматично визначати др_айвери jaz" +msgstr "Автовизн_ачення пристроїв jaz" #: harddrake2:188 #, c-format msgid "Autodetect parallel _zip drives" -msgstr "Автовизначення паралельних п_риводів zip" +msgstr "Автовизначення паралельних п_ристроїв zip" #: harddrake2:192 #, c-format @@ -2299,7 +2299,7 @@ msgstr "" #: harddrake2:227 #, c-format msgid "_Report Bug" -msgstr "_R Повідомити про помилку" +msgstr "По_відомити про помилку" #: harddrake2:229 #, c-format -- cgit v1.2.1 From bdc19668c810357546979373e1d2f5c1c42719e7 Mon Sep 17 00:00:00 2001 From: kiki Date: Tue, 26 Nov 2013 19:52:50 +0700 Subject: Updated Indonesian translations --- perl-install/install/share/po/id.po | 308 +++++++++++------------------------- 1 file changed, 92 insertions(+), 216 deletions(-) diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po index 66c528ee7..e7ac3ab63 100644 --- a/perl-install/install/share/po/id.po +++ b/perl-install/install/share/po/id.po @@ -1,32 +1,30 @@ -# Instalator Grafis Mandriva Linux -# Copyright (C) 1999 Mandriva -# Budi Rachmanto , 2001-2003 -# Linux Indonesia , 1999-2001 -# Mohammad DAMT , 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 , 2005 # Andy , 1999 +# Bayu Artanto , 2005 +# erwiensamantha , 2005 +# Firdaus , 2005 # Kelana , 1999 -# Willy Sudiarto Raharjo , 2004 - 2007. -# Erwien Samantha , 2005. -# Bayu Artanto , 2005. -# Ahmad Ramadhana , 2005. -# Firdaus , 2005. -# Sofian , 2005. -# Kiki Syahadat , 2013 +# Sofian , 2005 msgid "" msgstr "" -"Project-Id-Version: drakx_install\n" +"Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-04 12:55+0700\n" -"Last-Translator: Kiki Syahadat \n" -"Language-Team: Indonesia , Translation list \n" -"Language: id\n" +"PO-Revision-Date: 2013-11-12 09:25+0000\n" +"Last-Translator: kiki.syahadat \n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\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" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../../advertising/01_IM_mageia.pl:1 #, c-format @@ -83,7 +81,8 @@ msgstr "Bebaskan!" msgid "Do you have further supplementary media?" msgstr "Apakah Anda memiliki media bantu lanjutan?" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: any.pm:114 #, c-format msgid "" @@ -91,11 +90,7 @@ msgid "" "\n" "\n" "Do you have a supplementary installation medium to configure?" -msgstr "" -"Media berikut ditemukan dan akan digunakan selama instalasi: %s.\n" -"\n" -"\n" -"Apakah Anda memiliki media instalasi bantu untuk dikonfigurasi?" +msgstr "Media berikut ditemukan dan akan digunakan selama instalasi: %s.\n\n\nApakah Anda memiliki media instalasi bantu untuk dikonfigurasi?" #: any.pm:122 #, c-format @@ -130,14 +125,12 @@ msgstr "URL harus diawali dengan ftp:// atau http://" #: any.pm:190 #, c-format msgid "Contacting %s web site to get the list of available mirrors..." -msgstr "" -"Menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia..." +msgstr "Menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia..." #: any.pm:195 #, c-format msgid "Failed contacting %s web site to get the list of available mirrors" -msgstr "" -"Gagal menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia" +msgstr "Gagal menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia" #: any.pm:205 #, c-format @@ -184,9 +177,7 @@ msgstr "Media bantu" msgid "" "Can't find a package list file on this mirror. Make sure the location is " "correct." -msgstr "" -"Tidak bisa menemukan file daftar paket pada mirror ini. Pastikan lokasinya " -"benar." +msgstr "Tidak bisa menemukan file daftar paket pada mirror ini. Pastikan lokasinya benar." #: any.pm:319 #, c-format @@ -206,11 +197,9 @@ msgstr "Nonfree Rilis" #: any.pm:351 #, c-format msgid "" -"Some hardware on your machine needs some non free firmwares in order for the " -"free software drivers to work." -msgstr "" -"Beberapa hardware pada komputer Anda memerlukan beberapa firmwares non free " -"agar driver free software bisa bekerja." +"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:352 #, c-format @@ -232,33 +221,25 @@ msgstr "\"%s\" berisi software non free.\n" 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, ...)" +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:380 #, 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." +"\"%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:381 #, 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." +msgstr "Juga berisi software dari \"%s\" yang dibangun ulang dengan kemampuan tambahan." #: any.pm:387 #, c-format msgid "Here you can enable more media if you want." -msgstr "" -"Di sini Anda bisa menghidupkan lebih banyak media jika Anda menginginkannya" +msgstr "Di sini Anda bisa menghidupkan lebih banyak media jika Anda menginginkannya" #: any.pm:404 #, c-format @@ -280,7 +261,8 @@ msgstr "Menemukan paket untuk diupgrade..." msgid "Removing packages prior to upgrade..." msgstr "Menghapus paket sebelum upgrade..." -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: any.pm:743 #, c-format msgid "" @@ -288,11 +270,7 @@ msgid "" "\n" "\n" "Do you really want to remove these packages?\n" -msgstr "" -"Paket berikut akan dihapus untuk memungkinkan upgrade sistem Anda: %s\n" -"\n" -"\n" -"Apakah Anda benar-benar ingin menghapus paket ini?\n" +msgstr "Paket berikut akan dihapus untuk memungkinkan upgrade sistem Anda: %s\n\n\nApakah Anda benar-benar ingin menghapus paket ini?\n" #: any.pm:962 #, c-format @@ -384,10 +362,7 @@ msgstr "Anda juga harus memformat %s" msgid "" "Some hardware on your computer needs ``proprietary'' drivers to work.\n" "You can find some information about them at: %s" -msgstr "" -"Beberapa hardware pada komputer Anda memerlukan driver ``proprietari'' untuk " -"bekerja.\n" -"Anda bisa menemukan informasinya di: %s" +msgstr "Beberapa hardware pada komputer Anda memerlukan driver ``proprietari'' untuk bekerja.\nAnda bisa menemukan informasinya di: %s" #: interactive.pm:22 #, c-format @@ -452,8 +427,7 @@ 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" +msgstr "Tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s" #: pkgs.pm:119 #, c-format @@ -465,9 +439,7 @@ msgstr "Tidak ada deskripsi" msgid "" "Some packages requested by %s cannot be installed:\n" "%s" -msgstr "" -"Beberapa paket yang diminta oleh %s tidak bisa diinstall:\n" -"%s" +msgstr "Beberapa paket yang diminta oleh %s tidak bisa diinstall:\n%s" #: pkgs.pm:383 pkgs.pm:410 #, c-format @@ -509,9 +481,7 @@ msgstr "Workstation Perkantoran" msgid "" "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets " "(LibreOffice Calc, Kspread), PDF viewers, etc" -msgstr "" -"Program perkantoran: pengolah kata (LibreOffice Writer, Kword), spreadsheets " -"(LibreOffice Calc, Kspread), pembaca PDF, dll" +msgstr "Program perkantoran: pengolah kata (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), pembaca PDF, dll" #: share/meta-task/compssUsers.pl:24 #, c-format @@ -543,9 +513,7 @@ msgstr "Komputer Internet" msgid "" "Set of tools to read and send mail and news (mutt, tin..) and to browse the " "Web" -msgstr "" -"Kumpulan peralatan untuk membaca dan mengirim surat dan berita (mutt, tin..) " -"dan menjelajahi Web" +msgstr "Kumpulan peralatan untuk membaca dan mengirim surat dan berita (mutt, tin..) dan menjelajahi Web" #: share/meta-task/compssUsers.pl:40 #, c-format @@ -736,11 +704,9 @@ msgstr "Workstation KDE" #: share/meta-task/compssUsers.pl:151 #, c-format msgid "" -"The K Desktop Environment, the basic graphical environment with a collection " -"of accompanying tools" -msgstr "" -"K Desktop Environment, lingkungan grafis dasar dengan kumpulan peralatan " -"yang menyertainya" +"The K Desktop Environment, the basic graphical environment with a collection" +" of accompanying tools" +msgstr "K Desktop Environment, lingkungan grafis dasar dengan kumpulan peralatan yang menyertainya" #: share/meta-task/compssUsers.pl:156 #, c-format @@ -752,38 +718,34 @@ msgstr "Workstation GNOME" msgid "" "A graphical environment with user-friendly set of applications and desktop " "tools" -msgstr "" -"Sebuah lingkungan grafis dengan kumpulan aplikasi dan peralatan desktop yang " -"mudah digunakan" +msgstr "Sebuah lingkungan grafis dengan kumpulan aplikasi dan peralatan desktop yang mudah digunakan" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Workstation KDE" +msgstr "Lingkungan kerja XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" -msgstr "" -"Sebuah lingkungan grafis dengan kumpulan aplikasi dan peralatan desktop yang " -"mudah digunakan" +msgstr "Lingkungan grafis yang ringan dengan seperangkat aplikasi dan peralatan desktop yang mudah digunakan" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Workstation GNOME" +msgstr "Lingkungan kerja MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Workstation" +msgstr "Lingkungan kerja Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Lingkungan Grafis" +msgstr "Lingkungan grafis berbasis GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -795,31 +757,27 @@ msgstr "Desktop LXDE" msgid "" "A lightweight & fast graphical environment with user-friendly set of " "applications and desktop tools" -msgstr "" -"Sebuah lingkungan grafis yang ringan & cepat dengan kumpulan aplikasi dan " -"peralatan desktop yang mudah digunakan" +msgstr "Sebuah lingkungan grafis yang ringan & cepat dengan kumpulan aplikasi dan peralatan desktop yang mudah digunakan" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Desktop kustomisasi" +msgstr "Desktop RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Lingkungan grafis cepat dan ringan yang kurang dikembangkan" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Desktop Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Sebuah lingkungan grafis yang ringan & cepat dengan kumpulan aplikasi dan " -"peralatan desktop yang mudah digunakan" +msgstr "Lingkungan grafis yang cepat dan ringan" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -827,9 +785,9 @@ msgid "Other Graphical Desktops" msgstr "Desktop Grafis Lainnya" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, dsb" +msgstr "Window Maker, Fvwm, dsb" #: share/meta-task/compssUsers.pl:217 #, c-format @@ -876,22 +834,15 @@ msgstr "Wizard untuk mengkonfigurasi server" msgid "" "An error occurred, but I do not know how to handle it nicely.\n" "Continue at your own risk." -msgstr "" -"Terjadi error yang tidak diketahui cara yang baik untuk menanganinya.\n" -"Lanjutkan dengan resiko yang Anda tanggung sendiri." +msgstr "Terjadi error yang tidak diketahui cara yang baik untuk menanganinya.\nLanjutkan dengan resiko yang Anda tanggung sendiri." #: steps.pm:458 #, c-format msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" -"\"\n" -msgstr "" -"Beberapa paket penting tidak terinstall dengan benar.\n" -"Mungkin drive cdrom atau cdrom Anda rusak.\n" -"Periksa cdrom pada komputer yang sudah terinstall menggunakan \"rpm -qpl " -"media/main/*.rpm\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n" +msgstr "Beberapa paket penting tidak terinstall dengan benar.\nMungkin drive cdrom atau cdrom Anda rusak.\nPeriksa cdrom pada komputer yang sudah terinstall menggunakan \"rpm -qpl media/main/*.rpm\"\n" #: steps_auto_install.pm:71 steps_stdio.pm:27 #, c-format @@ -919,12 +870,7 @@ msgid "" "Your system is low on resources. You may have some problem installing\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 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'." +msgstr "Sistem Anda memiliki sumber daya yang rendah. Anda mungkin menemukan beberapa\nmasalah instalasi %s. Jika ini terjadi, Anda bisa mencoba instalasi berbasis teks.\nUntuk melakukannya, tekan `F1' saat booting pada CDROM, lalu masukkan `text'." #: steps_gtk.pm:240 steps_gtk.pm:757 #, c-format @@ -1041,9 +987,7 @@ msgstr "untuk menjaga %s" msgid "" "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 lagi ruang tersisa untuk " -"menginstall" +msgstr "Anda tidak bisa memilih paket ini karena tidak ada lagi ruang tersisa untuk menginstall" #: steps_gtk.pm:473 #, c-format @@ -1129,8 +1073,7 @@ msgstr "(memperkirakan...)" #, c-format msgid "%d package" msgid_plural "%d packages" -msgstr[0] "paket %d" -msgstr[1] "paket-paket %d" +msgstr[0] "%d paket" #: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43 #, c-format @@ -1152,22 +1095,14 @@ msgstr "tidak terkonfigurasi" msgid "" "The following installation media have been found.\n" "If you want to skip some of them, you can unselect them now." -msgstr "" -"Media instalasi berikut telah ditemukan.\n" -"Jika Anda ingin melewati beberapa, Anda bisa tidak memilihnya." +msgstr "Media instalasi berikut telah ditemukan.\nJika Anda ingin melewati beberapa, Anda bisa tidak memilihnya." #: steps_gtk.pm:782 steps_interactive.pm:349 #, c-format msgid "" -"You have the option to copy the contents of the CDs onto the hard disk drive " -"before installation.\n" -"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 dari CD ke hard disk sebelum " -"instalasi.\n" -"Proses kemudian akan dilanjutkan dari hard disk dan paket akan tetap " -"tersedia setelah sistem terinstall." +"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 disk drive and the packages will remain available once the system is fully installed." +msgstr "Anda memiliki opsi untuk menyalin isi dari CD ke hard disk sebelum instalasi.\nProses kemudian akan dilanjutkan dari hard disk dan paket akan tetap tersedia setelah sistem terinstall." #: steps_gtk.pm:784 steps_interactive.pm:351 #, c-format @@ -1241,14 +1176,7 @@ msgid "" "\n" "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\"." +msgstr "Installer telah mendeteksi bahwa Linux yang terinstall di sistem Anda\ntidak bisa diupgrade dengan aman ke %s.\n\nInstalasi baru untuk menggantikan sistem lama Anda direkomendasikan.\n\nPeringatan : Anda harus membackup semua data pribadi Anda sebelum memilih \n\"Instalasi Baru\"." #: steps_interactive.pm:264 #, c-format @@ -1265,9 +1193,7 @@ msgstr "Mengkonfigurasi IDE" 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! Instalasi akan dilanjutkan, tapi untuk " -"boot system, Anda perlu membuat partisi bootstrap pada DiskDrake" +msgstr "Tidak ada ruang 1MB untuk bootstrap! Instalasi akan dilanjutkan, tapi untuk boot system, Anda perlu membuat partisi bootstrap pada DiskDrake" #: steps_interactive.pm:306 #, c-format @@ -1275,23 +1201,15 @@ 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 perlu membuat bootstrap PPC PReP Boot! Instalasi akan dilanjutkan, tapi " -"untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake" +msgstr "Anda perlu membuat bootstrap PPC PReP Boot! Instalasi akan dilanjutkan, tapi untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake" #: steps_interactive.pm:382 #, c-format msgid "" "Change your Cd-Rom!\n" -"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when " -"done.\n" +"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n" "If you do not have it, press Cancel to avoid installation from this Cd-Rom." -msgstr "" -"Ganti Cd-Rom Anda!\n" -"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." +msgstr "Ganti Cd-Rom Anda!\nSilakan masukkan Cd-Rom berlabel \"%s\" ke drive Anda dan tekan Ok setelahnya.\nJika Anda tidak memilikinya, tekan Batal untuk menghindari instalasi dari Cd-Rom ini." #: steps_interactive.pm:400 #, c-format @@ -1303,18 +1221,14 @@ msgstr "Mencari paket yang tersedia..." msgid "" "Your system does not have enough space left for installation or upgrade " "(%dMB > %dMB)" -msgstr "" -"Sistem Anda tidak memiliki cukup ruang tersisa untuk instalasi atau upgrade " -"(%dMB > %dMB)" +msgstr "Sistem Anda tidak memiliki cukup ruang tersisa untuk instalasi atau upgrade (%dMB > %dMB)" #: steps_interactive.pm:456 #, c-format msgid "" "Please choose load or save package selection.\n" "The format is the same as auto_install generated files." -msgstr "" -"Silakan pilih muat atau simpan pemilihan paket.\n" -"Formatnya sama dengan file yang dihasilkan auto_install." +msgstr "Silakan pilih muat atau simpan pemilihan paket.\nFormatnya sama dengan file yang dihasilkan auto_install." #: steps_interactive.pm:458 #, c-format @@ -1366,9 +1280,7 @@ msgstr "Tipe install" msgid "" "You have not selected any group of packages.\n" "Please choose the minimal installation you want:" -msgstr "" -"Anda belum memilih grup paket apapun.\n" -"Silakan pilih instalasi minimal yang Anda inginkan:" +msgstr "Anda belum memilih grup paket apapun.\nSilakan pilih instalasi minimal yang Anda inginkan:" #: steps_interactive.pm:606 #, c-format @@ -1466,14 +1378,7 @@ msgid "" "connection.\n" "\n" "Do you want to install the updates?" -msgstr "" -"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 ini, Anda memerlukan koneksi Internet.\n" -"\n" -"Apakah Anda ingin menginstall update?" +msgstr "Sekarang Anda memiliki kesempatan untuk mendownload paket update. Paket ini\ntelah diupdate setelah distribusi dirilis. Paket ini mungkin\nberisi perbaikan keamanan atau bug.\n\nUntuk mendownload paket ini, Anda memerlukan koneksi Internet.\n\nApakah Anda ingin menginstall update?" #. -PO: example: lilo-graphic on /dev/hda1 #: steps_interactive.pm:881 @@ -1500,17 +1405,14 @@ msgstr "Apakah Anda memiliki perangkat suara ISA?" #: steps_interactive.pm:956 #, c-format msgid "" -"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound " -"card" -msgstr "" -"Jalankan \"alsaconf\" atau \"sndconfig\" setelah instalasi untuk " -"mengkonfigurasi perangkat suara Anda" +"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound" +" card" +msgstr "Jalankan \"alsaconf\" atau \"sndconfig\" setelah instalasi untuk mengkonfigurasi perangkat suara Anda" #: steps_interactive.pm:958 #, c-format msgid "No sound card detected. Try \"harddrake\" after installation" -msgstr "" -"Tidak ada perangkat suara terdeteksi. Coba \"harddrake\" setelah instalasi" +msgstr "Tidak ada perangkat suara terdeteksi. Coba \"harddrake\" setelah instalasi" #: steps_interactive.pm:966 #, c-format @@ -1580,20 +1482,14 @@ msgid "" "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 "" -"Tampaknya Anda memiliki komputer Kuno atau Tidak diketahui, bootloader " -"yaboot tidak bisa bekerja. Instalasi akan dilanjutkan, tapi Anda harus " -"menggunakan BootX atau cara lain untuk boot komputer Anda. Argumen kernel " -"untuk fs root adalah: root=%s" +msgstr "Tampaknya Anda memiliki komputer Kuno atau Tidak diketahui, bootloader yaboot tidak bisa bekerja. Instalasi akan dilanjutkan, tapi Anda harus menggunakan BootX atau cara lain untuk boot komputer Anda. Argumen kernel untuk fs root adalah: root=%s" #: steps_interactive.pm:1090 #, c-format msgid "" "In this security level, access to the files in the Windows partition is " "restricted to the administrator." -msgstr "" -"Pada level keamanan ini, akses ke file di dalam partisi Windows terbatas " -"pada administrator." +msgstr "Pada level keamanan ini, akses ke file di dalam partisi Windows terbatas pada administrator." #: steps_interactive.pm:1122 #, c-format @@ -1611,10 +1507,7 @@ msgid "" "Some steps are not completed.\n" "\n" "Do you really want to quit now?" -msgstr "" -"Beberapa langkah tidak selesai.\n" -"\n" -"Apakah Anda ingin keluar sekarang?" +msgstr "Beberapa langkah tidak selesai.\n\nApakah Anda ingin keluar sekarang?" #: steps_interactive.pm:1145 #, c-format @@ -1626,7 +1519,8 @@ msgstr "Selamat" msgid "Reboot" msgstr "Reboot" -#. -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 "" @@ -1757,21 +1651,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Keluar" - -#~ msgid "Welcome" -#~ msgstr "Selamat datang" - -#~ msgid "People!" -#~ msgstr "Orang-orang!" - -#~ msgid "For people" -#~ msgstr "Untuk semua orang" - -#~ msgid "For contributors" -#~ msgstr "Untuk kontributor" - -#~ msgid "For you" -#~ msgstr "Untuk Anda" - -#~ msgid "Welcome!" -#~ msgstr "Selamat datang!" -- cgit v1.2.1 From f608773cfe15f3ee7e41226a8a9c865c5654869f Mon Sep 17 00:00:00 2001 From: kiki Date: Tue, 26 Nov 2013 19:56:11 +0700 Subject: Updated Indonesian translations --- perl-install/standalone/po/id.po | 474 ++++++++++++--------------------------- 1 file changed, 140 insertions(+), 334 deletions(-) diff --git a/perl-install/standalone/po/id.po b/perl-install/standalone/po/id.po index 69c9b8042..cad04cb8d 100644 --- a/perl-install/standalone/po/id.po +++ b/perl-install/standalone/po/id.po @@ -1,31 +1,27 @@ -# Instalator Grafis %s Linux -# Copyright (C) 1999 %s -# Budi Rachmanto , 2001-2003 -# Linux Indonesia , 1999-2001 -# Mohammad DAMT , 1999-2001 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# +# Translators: +# Ahmad Ramadhana , 2005 # Andy , 1999 +# Bayu Artanto , 2005 +# erwiensamantha , 2005 +# Firdaus , 2005 # Kelana , 1999 -# Willy Sudiarto Raharjo , 2004 - 2005. -# Erwien Samantha , 2005. -# Bayu Artanto , 2005. -# Ahmad Ramadhana , 2005. -# Firdaus , 2005. -# Sofian , 2005. -# Kiki Syahadat , 2012. -# +# kiki.syahadat , 2012-2013 +# Sofian , 2005 msgid "" msgstr "" -"Project-Id-Version: libDrakX-standalone\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-15 05:41+0700\n" -"Last-Translator: Kiki Syahadat \n" -"Language-Team: Indonesia , Translation list \n" -"Language: id\n" +"PO-Revision-Date: 2013-11-25 16:54+0000\n" +"Last-Translator: Yuri Chornoivan \n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -93,9 +89,7 @@ msgstr "Peringatan" msgid "" "Your system bootloader is not in framebuffer mode. To activate graphical " "boot, select a graphic video mode from the bootloader configuration tool." -msgstr "" -"Bootloader sistem Anda tidak pada mode framebuffer. Untuk mengaktifkan boot " -"grafis, pilih mode video grafis dari alat konfigurasi bootloader." +msgstr "Bootloader sistem Anda tidak pada mode framebuffer. Untuk mengaktifkan boot grafis, pilih mode video grafis dari alat konfigurasi bootloader." #: drakboot:138 #, c-format @@ -165,13 +159,9 @@ msgstr "Mode video" #: drakboot:266 #, c-format msgid "" -"Please choose a video mode, it will be applied to each of the boot entries " -"selected below.\n" +"Please choose a video mode, it will be applied to each of the boot entries selected below.\n" "Be sure your video card supports the mode you choose." -msgstr "" -"Silakan pilih mode video, ini akan diterapkan ke setiap entri boot terpilih " -"di bawah.\n" -"Pastikan perangkat video Anda mendukung mode yang Anda pilih." +msgstr "Silakan pilih mode video, ini akan diterapkan ke setiap entri boot terpilih di bawah.\nPastikan perangkat video Anda mendukung mode yang Anda pilih." #: drakbug:52 drakbug:140 #, c-format @@ -245,9 +235,7 @@ msgstr "Pilih Alat %s:" msgid "" "or Application Name\n" "(or Full Path):" -msgstr "" -"atau Nama Aplikasi\n" -"(atau Path Lengkap):" +msgstr "atau Nama Aplikasi\n(atau Path Lengkap):" #: drakbug:103 #, c-format @@ -283,28 +271,18 @@ msgstr "Tema digunakan: %s" #, c-format msgid "" "To submit a bug report, click on the report button. \n" -"This will open a web browser window on %s where you'll find a form to fill " -"in. The information displayed above will be transferred to that server" -msgstr "" -"Untuk mengirim laporan bug, klik pada tombol laporan. \n" -"Ini akan membuka jendela browser pada %s di mana Anda akan menemukan form " -"untuk diisi. Informasi yang ditampilkan di atas akan ditransfer ke server " -"tersebut" +"This will open a web browser window on %s where you'll find a form to fill in. The information displayed above will be transferred to that server" +msgstr "Untuk mengirim laporan bug, klik pada tombol laporan. \nIni akan membuka jendela browser pada %s di mana Anda akan menemukan form untuk diisi. Informasi yang ditampilkan di atas akan ditransfer ke server tersebut" #: drakbug:148 #, c-format msgid "" -"It would be very useful to attach to your report the output of the following " -"command: %s." +"It would be very useful to attach to your report the output of the following" +" command: %s." msgid_plural "" "Things useful to attach to your report are the output of the following " "commands: %s." -msgstr[0] "" -"Akan sangat berguna jika dilampirkan ke laporan Anda output dari perintah " -"berikut: %s." -msgstr[1] "" -"Akan sangat berguna jika dilampirkan ke laporan Anda output perintah-" -"perintah berikut: %s." +msgstr[0] "Akan sangat berguna jika dilampirkan ke dalam laporan Anda keluaran dari perintah berikut: %s." #: drakbug:151 #, c-format @@ -341,9 +319,7 @@ msgstr "Paket tidak terinstall" msgid "" "You must type in what you were doing when this bug happened in order to " "enable us to reproduce this bug and to increase the odds of fixing it" -msgstr "" -"Anda harus mengetikkan apa yang Anda lakukan ketika bug ini terjadi untuk " -"memungkinkan kami mereproduksi bug dan meningkatkan peluang memperbaikinya" +msgstr "Anda harus mengetikkan apa yang Anda lakukan ketika bug ini terjadi untuk memungkinkan kami mereproduksi bug dan meningkatkan peluang memperbaikinya" #: drakbug:252 #, c-format @@ -395,9 +371,7 @@ msgstr "Protokol Waktu Jaringan" msgid "" "Your computer can synchronize its clock\n" " with a remote time server using NTP" -msgstr "" -"Komputer Anda bisa mensinkronkan jam\n" -" dengan server waktu remote menggunakan NTP" +msgstr "Komputer Anda bisa mensinkronkan jam\n dengan server waktu remote menggunakan NTP" #: drakclock:77 #, c-format @@ -513,10 +487,7 @@ msgid "" "X11 Display Manager allows you to graphically log\n" "into your system with the X Window System running and supports running\n" "several different X sessions on your local machine at the same time." -msgstr "" -"X11 Display Manager memungkinkan Anda masuk ke dalam sistem secara\n" -"grafis dengan X Window System yang berjalan dan mendukung untuk menjalankan\n" -"beberapa sesi X berbeda pada komputer lokal Anda pada waktu yang sama." +msgstr "X11 Display Manager memungkinkan Anda masuk ke dalam sistem secara\ngrafis dengan X Window System yang berjalan dan mendukung untuk menjalankan\nbeberapa sesi X berbeda pada komputer lokal Anda pada waktu yang sama." #: drakedm:74 #, c-format @@ -528,9 +499,7 @@ msgstr "Perubahan selesai, apakah Anda ingin merestart layanan dm?" msgid "" "You are going to close all running programs and lose your current session. " "Are you really sure that you want to restart the dm service?" -msgstr "" -"Anda akan menutup semua program yang berjalan dan kehilangan sesi saat ini. " -"Apakah Anda yakin ingin merestart layanan dm?" +msgstr "Anda akan menutup semua program yang berjalan dan kehilangan sesi saat ini. Apakah Anda yakin ingin merestart layanan dm?" #: drakfont:187 #, c-format @@ -626,17 +595,10 @@ msgstr "Tahan File Font" #: drakfont:440 #, c-format msgid "" -"Before installing any fonts, be sure that you have the right to use and " -"install them on your system.\n" +"Before installing any fonts, be sure that you have the right to use and install them on your system.\n" "\n" -"You can install the fonts the normal way. In rare cases, bogus fonts may " -"hang up your X Server." -msgstr "" -"Sebelum menginstall font, pastikan Anda memiliki hak untuk menggunakan dan " -"menginstalnya pada sistem Anda.\n" -"\n" -"Anda bisa menginstall font dengan cara normal. Terkadang, font palsu bisa " -"membuat Server X Anda hang." +"You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server." +msgstr "Sebelum menginstall font, pastikan Anda memiliki hak untuk menggunakan dan menginstalnya pada sistem Anda.\n\nAnda bisa menginstall font dengan cara normal. Terkadang, font palsu bisa membuat Server X Anda hang." #: drakfont:479 #, c-format @@ -693,24 +655,14 @@ msgstr "Hak Cipta (C) %s oleh %s" msgid "Font installer." msgstr "Installer font." -#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") -#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") +#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith +#. ") +#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith +#. ") #: drakfont:533 harddrake2:242 #, c-format msgid "_: Translator(s) name(s) & email(s)\n" -msgstr "" -"Budi Rachmanto \n" -"Linux Indonesia \n" -"Mohammad DAMT \n" -"Andy \n" -"Kelana \n" -"Willy Sudiarto Raharjo \n" -"Erwien Samantha \n" -"Bayu Artanto \n" -"Ahmad Ramadhana \n" -"Firdaus \n" -"Sofian \n" -"Kiki Syahadat \n" +msgstr "Budi Rachmanto \nLinux Indonesia \nMohammad DAMT \nAndy \nKelana \nWilly Sudiarto Raharjo \nErwien Samantha \nBayu Artanto \nAhmad Ramadhana \nFirdaus \nSofian \nKiki Syahadat \n" #: drakfont:543 #, c-format @@ -848,18 +800,10 @@ msgid "" " drakhelp 0.1\n" "Copyright (C) %s Mandriva.\n" "Copyright (C) %s Mageia.\n" -"This is free software and may be redistributed under the terms of the GNU " -"GPL.\n" +"This is free software and may be redistributed under the terms of the GNU GPL.\n" "\n" "Usage: \n" -msgstr "" -" drakhelp 0.1\n" -"Hak Cipta (C) %s Mandriva.\n" -"Hak Cipta (C) %s Mageia.\n" -"Ini adalah free software dan boleh didistribusikan di bawah ketentuan GNU " -"GPL.\n" -"\n" -"Penggunaan: \n" +msgstr " drakhelp 0.1\nHak Cipta (C) %s Mandriva.\nHak Cipta (C) %s Mageia.\nIni adalah free software dan boleh didistribusikan di bawah ketentuan GNU GPL.\n\nPenggunaan: \n" #: drakhelp:23 #, c-format @@ -870,17 +814,14 @@ msgstr " --help - tampilkan bantuan ini \n" #, c-format msgid "" " --id - load the html help page which refers to id_label\n" -msgstr "" -" --id - muat halaman bantuan html yang mengacu ke id_label\n" +msgstr " --id - muat halaman bantuan html yang mengacu ke id_label\n" #: drakhelp:25 #, c-format msgid "" " --doc - link to another web page ( for WM welcome " "frontend)\n" -msgstr "" -" --doc - link ke halaman web lain ( untuk frontend sambutan " -"WM)\n" +msgstr " --doc - link ke halaman web lain ( untuk frontend sambutan WM)\n" #: drakhelp:53 #, c-format @@ -950,22 +891,16 @@ msgstr "Edit aturan saat ini" #: drakperm:110 #, c-format msgid "" -"Here you can see files to use in order to fix permissions, owners, and " -"groups via msec.\n" +"Here you can see files to use in order to fix permissions, owners, and groups via msec.\n" "You can also edit your own rules which will overwrite the default rules." -msgstr "" -"Di sini Anda bisa melihat file yang digunakan untuk memperbaiki perizinan, " -"pemilik, dan grup via msec.\n" -"Anda juga bisa mengedit aturan sendiri yang akan mengganti aturan default." +msgstr "Di sini Anda bisa melihat file yang digunakan untuk memperbaiki perizinan, pemilik, dan grup via msec.\nAnda juga bisa mengedit aturan sendiri yang akan mengganti aturan default." #: drakperm:112 #, c-format msgid "" "The current security level is %s.\n" "Select permissions to see/edit" -msgstr "" -"Level keamanan saat ini adalah %s.\n" -"Pilih perizinan untuk melihat/mengedit" +msgstr "Level keamanan saat ini adalah %s.\nPilih perizinan untuk melihat/mengedit" #: drakperm:124 #, c-format @@ -1080,9 +1015,7 @@ msgstr "Sticky-bit" msgid "" "Used for directory:\n" " only owner of directory or file in this directory can delete it" -msgstr "" -"Digunakan untuk direktori:\n" -" hanya pemilik direktori atau file di dalam direktori yang bisa menghapus" +msgstr "Digunakan untuk direktori:\n hanya pemilik direktori atau file di dalam direktori yang bisa menghapus" #: drakperm:272 #, c-format @@ -1139,9 +1072,7 @@ msgstr "Properti" msgid "" "The first character of the path must be a slash (\"/\"):\n" "\"%s\"" -msgstr "" -"Karakter pertama path harus berupa garis miring (\"/\"):\n" -"\"%s\"" +msgstr "Karakter pertama path harus berupa garis miring (\"/\"):\n\"%s\"" #: drakperm:386 #, c-format @@ -1333,16 +1264,14 @@ msgstr "Boot" msgid "No Sound Card detected!" msgstr "Tidak ada Perangkat Suara yang terdeteksi!" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: draksound:51 #, c-format msgid "" "No Sound Card has been detected on your machine. Please verify that a Linux-" "supported Sound Card is correctly plugged in" -msgstr "" -"Tidak ada Perangkat Suara yang terdeteksi pada komputer Anda. Silakan " -"periksa bahwa Perangkat Suara yang didukung Linux telah terpasang dengan " -"benar" +msgstr "Tidak ada Perangkat Suara yang terdeteksi pada komputer Anda. Silakan periksa bahwa Perangkat Suara yang didukung Linux telah terpasang dengan benar" #: draksound:54 #, c-format @@ -1350,15 +1279,8 @@ msgid "" "\n" "\n" "\n" -"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or " -"the sndconfig program. Just type \"alsaconf\" or \"sndconfig\" in a console." -msgstr "" -"\n" -"\n" -"\n" -"Catatan: jika Anda memiliki perangkat suara ISA PnP, Anda harus menggunakan " -"program alsaconf atau sndconfig. Cukup ketikkan \"alsaconf\" atau " -"\"sndconfig\" pada konsol." +"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program. Just type \"alsaconf\" or \"sndconfig\" in a console." +msgstr "\n\n\nCatatan: jika Anda memiliki perangkat suara ISA PnP, Anda harus menggunakan program alsaconf atau sndconfig. Cukup ketikkan \"alsaconf\" atau \"sndconfig\" pada konsol." #: drakups:71 #, c-format @@ -1381,23 +1303,15 @@ msgid "" "Welcome to the UPS configuration utility.\n" "\n" "Here, you'll add a new UPS to your system.\n" -msgstr "" -"Selamat datang di utilitas konfigurasi UPS.\n" -"\n" -"Di sini Anda akan menambah UPS baru ke sistem Anda.\n" +msgstr "Selamat datang di utilitas konfigurasi UPS.\n\nDi sini Anda akan menambah UPS baru ke sistem Anda.\n" #: drakups:88 #, c-format msgid "" "We're going to add an UPS device.\n" "\n" -"Do you want to autodetect UPS devices connected to this machine or to " -"manually select them?" -msgstr "" -"Kita akan menambahkan device UPS.\n" -"\n" -"Apakah Anda ingin mendeteksi otomatis device UPS yang terhubung ke komputer " -"ini atau memilih secara manual?" +"Do you want to autodetect UPS devices connected to this machine or to manually select them?" +msgstr "Kita akan menambahkan device UPS.\n\nApakah Anda ingin mendeteksi otomatis device UPS yang terhubung ke komputer ini atau memilih secara manual?" #: drakups:91 #, c-format @@ -1444,9 +1358,7 @@ msgstr "Pabrikan / Model:" msgid "" "We are configuring the \"%s\" UPS from \"%s\".\n" "Please fill in its name, its driver and its port." -msgstr "" -"Mengkonfigurasi UPS \"%s\" dari \"%s\".\n" -"Silakan isi nama, driver dan port." +msgstr "Mengkonfigurasi UPS \"%s\" dari \"%s\".\nSilakan isi nama, driver dan port." #: drakups:143 #, c-format @@ -1569,15 +1481,14 @@ msgstr "Selamat datang di peralatan konfigurasi UPS" msgid "No TV Card detected!" msgstr "Tidak ada Perangkat TV yang terdeteksi!" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: drakxtv:69 #, c-format msgid "" "No TV Card has been detected on your machine. Please verify that a Linux-" "supported Video/TV Card is correctly plugged in." -msgstr "" -"Tidak ada Perangkat TV yang terdeteksi pada komputer Anda. Silakan periksa " -"bahwa Perangkat Video/TV yang didukung Linux telah terpasang dengan benar." +msgstr "Tidak ada Perangkat TV yang terdeteksi pada komputer Anda. Silakan periksa bahwa Perangkat Video/TV yang didukung Linux telah terpasang dengan benar." #: finish-install:60 #, c-format @@ -1650,9 +1561,7 @@ msgstr "Identifikasi bus" msgid "" "- PCI and USB devices: this lists the vendor, device, subvendor and " "subdevice PCI/USB ids" -msgstr "" -"- device PCI dan USB: daftar id PCI/USB vendor, device, subvendor dan " -"subdevice" +msgstr "- device PCI dan USB: daftar id PCI/USB vendor, device, subvendor dan subdevice" #: harddrake2:39 #, c-format @@ -1665,10 +1574,7 @@ msgid "" "- pci devices: this gives the PCI slot, device and function of this card\n" "- eide devices: the device is either a slave or a master device\n" "- scsi devices: the scsi bus and the scsi device ids" -msgstr "" -"- device pci: memberikan slot PCI, device dan fungsi dari perangkat ini\n" -"- device eide: device berupa slave atau master\n" -"- device scsi: bus scsi dan id device scsi" +msgstr "- device pci: memberikan slot PCI, device dan fungsi dari perangkat ini\n- device eide: device berupa slave atau master\n- device scsi: bus scsi dan id device scsi" #: harddrake2:43 #, c-format @@ -1678,8 +1584,7 @@ msgstr "Kapasitas drive" #: harddrake2:43 #, c-format msgid "special capacities of the driver (burning ability and or DVD support)" -msgstr "" -"kapasitas spesial dari driver (kemampuan burning dan atau dukungan DVD)" +msgstr "kapasitas spesial dari driver (kemampuan burning dan atau dukungan DVD)" #: harddrake2:44 #, c-format @@ -1903,10 +1808,7 @@ msgid "" "the GNU/Linux kernel needs to run a calculation loop at boot time to " "initialize a timer counter. Its result is stored as bogomips as a way to " "\"benchmark\" the cpu." -msgstr "" -"kernel GNU/Linux perlu menjalankan lingkaran kalkulasi saat boot untuk " -"menginisialisasi penghitung timer. Hasilnya disimpan sebagai bogomips " -"sebagai cara untuk \"benchmark\" cpu." +msgstr "kernel GNU/Linux perlu menjalankan lingkaran kalkulasi saat boot untuk menginisialisasi penghitung timer. Hasilnya disimpan sebagai bogomips sebagai cara untuk \"benchmark\" cpu." #: harddrake2:75 #, c-format @@ -1949,10 +1851,7 @@ msgid "" "the CPU frequency in MHz (Megahertz which in first approximation may be " "coarsely assimilated to number of instructions the cpu is able to execute " "per second)" -msgstr "" -"frekuensi CPU dalam MHz (Megahertz di mana perkiraan pertama bisa berupa " -"asimilasi kasar dengan jumlah instruksi cpu mampu mengeksekusi dalam setiap " -"detik)" +msgstr "frekuensi CPU dalam MHz (Megahertz di mana perkiraan pertama bisa berupa asimilasi kasar dengan jumlah instruksi cpu mampu mengeksekusi dalam setiap detik)" #: harddrake2:79 #, c-format @@ -2055,10 +1954,7 @@ msgid "" "the WP flag in the CR0 register of the cpu enforce write protection at the " "memory page level, thus enabling the processor to prevent unchecked kernel " "accesses to user memory (aka this is a bug guard)" -msgstr "" -"flag WP pada register CR0 cpu memaksakan proteksi penulisan pada level " -"halaman memori, sehingga memungkinkan prosesor mencegah akses kernel ke " -"memori pengguna yang tidak diuji (alias bug guard)" +msgstr "flag WP pada register CR0 cpu memaksakan proteksi penulisan pada level halaman memori, sehingga memungkinkan prosesor mencegah akses kernel ke memori pengguna yang tidak diuji (alias bug guard)" #: harddrake2:97 #, c-format @@ -2103,13 +1999,9 @@ msgstr "Nomor unit logical" #: harddrake2:104 #, c-format msgid "" -"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are " -"uniquely identified by a\n" +"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are uniquely identified by a\n" "channel number, a target id and a logical unit number" -msgstr "" -"Logical Unit Number (LUN) SCSI. Device SCSI yang terhubung ke host " -"diidentifikasi oleh\n" -"nomor channel, id target dan nomor unit logical" +msgstr "Logical Unit Number (LUN) SCSI. Device SCSI yang terhubung ke host diidentifikasi oleh\nnomor channel, id target dan nomor unit logical" #. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...) #: harddrake2:111 @@ -2171,8 +2063,7 @@ msgstr "File device" #, c-format msgid "" "the device file used to communicate with the kernel driver for the mouse" -msgstr "" -"file device digunakan untuk berkomunikasi dengan driver kernel untuk mouse" +msgstr "file device digunakan untuk berkomunikasi dengan driver kernel untuk mouse" #: harddrake2:121 #, c-format @@ -2300,9 +2191,7 @@ msgstr "Bantuan Harddrake" msgid "" "Description of the fields:\n" "\n" -msgstr "" -"Deskripsi dari kolom:\n" -"\n" +msgstr "Deskripsi dari kolom:\n\n" #: harddrake2:221 #, c-format @@ -2314,9 +2203,7 @@ msgstr "Pilih sebuah device!" msgid "" "Once you've selected a device, you'll be able to see the device information " "in fields displayed on the right frame (\"Information\")" -msgstr "" -"Setelah Anda memilih device, Anda bisa melihat informasi device pada kolom " -"yang ditampilkan pada frame sebelah kanan (\"Informasi\")" +msgstr "Setelah Anda memilih device, Anda bisa melihat informasi device pada kolom yang ditampilkan pada frame sebelah kanan (\"Informasi\")" #: harddrake2:227 #, c-format @@ -2363,9 +2250,7 @@ msgstr "Jalankan alat konfigurasi" msgid "" "Click on a device in the tree on the left in order to display its " "information here." -msgstr "" -"Klik device pada pohon di sebelah kiri untuk menampilkan informasinya di " -"sini." +msgstr "Klik device pada pohon di sebelah kiri untuk menampilkan informasinya di sini." #: harddrake2:321 notify-x11-free-driver-switch:13 #, c-format @@ -2417,7 +2302,8 @@ msgstr "LocaleDrake" msgid "You should install the following packages: %s" msgstr "Anda harus menginstall paket berikut: %s" -#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit" +#. -PO: the following is used to combine packages names. eg: "initscripts, +#. harddrake, yudit" #: localedrake:49 #, c-format msgid ", " @@ -2642,10 +2528,7 @@ msgid "" "Welcome to the mail configuration utility.\n" "\n" "Here, you'll be able to set up the alert system.\n" -msgstr "" -"Selamat datang di utilitas konfigurasi surat.\n" -"\n" -"Di sini, Anda bisa mengatur sistem peringatan.\n" +msgstr "Selamat datang di utilitas konfigurasi surat.\n\nDi sini, Anda bisa mengatur sistem peringatan.\n" #: logdrake:417 #, c-format @@ -2662,8 +2545,7 @@ msgstr "Pengaturan Layanan" msgid "" "You will receive an alert if one of the selected services is no longer " "running" -msgstr "" -"Akan akan menerima peringatan jika satu dari layanan terpilih tidak berjalan" +msgstr "Akan akan menerima peringatan jika satu dari layanan terpilih tidak berjalan" #: logdrake:432 #, c-format @@ -2715,11 +2597,9 @@ msgstr "\"%s\" bukan email valid atau bukan pengguna lokal!" #: logdrake:453 #, c-format msgid "" -"\"%s\" is a local user, but you did not select a local smtp, so you must use " -"a complete email address!" -msgstr "" -"\"%s\" adalah pengguna lokal, tapi Anda tidak memilih smtp lokal, jadi Anda " -"harus menggunakan alamat email lengkap!" +"\"%s\" is a local user, but you did not select a local smtp, so you must use" +" a complete email address!" +msgstr "\"%s\" adalah pengguna lokal, tapi Anda tidak memilih smtp lokal, jadi Anda harus menggunakan alamat email lengkap!" #: logdrake:460 #, c-format @@ -2757,10 +2637,7 @@ msgid "" "SANE packages need to be installed to use scanners.\n" "\n" "Do you want to install the SANE packages?" -msgstr "" -"Paket SANE perlu diinstall untuk menggunakan scanner.\n" -"\n" -"Apakah Anda ingin menginstall paket SANE?" +msgstr "Paket SANE perlu diinstall untuk menggunakan scanner.\n\nApakah Anda ingin menginstall paket SANE?" #: scannerdrake:53 #, c-format @@ -2771,9 +2648,7 @@ msgstr "Membatalkan Scannerdrake." #, c-format msgid "" "Could not install the packages needed to set up a scanner with Scannerdrake." -msgstr "" -"Tidak bisa menginstall paket yang diperlukan untuk mengatur scanner dengan " -"Scannerdrake." +msgstr "Tidak bisa menginstall paket yang diperlukan untuk mengatur scanner dengan Scannerdrake." #: scannerdrake:59 #, c-format @@ -2858,11 +2733,9 @@ msgstr "Firmware Scanner" #: scannerdrake:171 scannerdrake:223 #, c-format msgid "" -"It is possible that your %s needs its firmware to be uploaded everytime when " -"it is turned on." -msgstr "" -"Kemungkinan %s Anda memerlukan firmware untuk diupload setiap kali " -"dinyalakan." +"It is possible that your %s needs its firmware to be uploaded everytime when" +" it is turned on." +msgstr "Kemungkinan %s Anda memerlukan firmware untuk diupload setiap kali dinyalakan." #: scannerdrake:172 scannerdrake:224 #, c-format @@ -2874,18 +2747,14 @@ msgstr "Jika kasusnya seperti ini, Anda bisa melakukannya secara otomatis." msgid "" "To do so, you need to supply the firmware file for your scanner so that it " "can be installed." -msgstr "" -"Untuk melakukannya, Anda perlu menyediakan file firmware untuk scanner Anda " -"sehingga bisa diinstall." +msgstr "Untuk melakukannya, Anda perlu menyediakan file firmware untuk scanner Anda sehingga bisa diinstall." #: scannerdrake:174 scannerdrake:228 #, c-format msgid "" "You find the file on the CD or floppy coming with the scanner, on the " "manufacturer's home page, or on your Windows partition." -msgstr "" -"Anda temukan file pada CD atau floppy yang ada pada scanner, pada halaman " -"web pembuat, atau pada partisi Windows Anda." +msgstr "Anda temukan file pada CD atau floppy yang ada pada scanner, pada halaman web pembuat, atau pada partisi Windows Anda." #: scannerdrake:176 scannerdrake:235 #, c-format @@ -2922,27 +2791,21 @@ msgstr "File firmware %s tidak ada atau tidak terbaca!" msgid "" "It is possible that your scanners need their firmware to be uploaded " "everytime when they are turned on." -msgstr "" -"Kemungkinan scanner Anda memerlukan firmware untuk diupload setiap kali " -"dinyalakan." +msgstr "Kemungkinan scanner Anda memerlukan firmware untuk diupload setiap kali dinyalakan." #: scannerdrake:226 #, c-format msgid "" -"To do so, you need to supply the firmware files for your scanners so that it " -"can be installed." -msgstr "" -"Untuk melakukannya, Anda perlu menyediakan file firmware untuk scanner Anda " -"sehingga bisa diinstall." +"To do so, you need to supply the firmware files for your scanners so that it" +" can be installed." +msgstr "Untuk melakukannya, Anda perlu menyediakan file firmware untuk scanner Anda sehingga bisa diinstall." #: scannerdrake:229 #, c-format msgid "" "If you have already installed your scanner's firmware you can update the " "firmware here by supplying the new firmware file." -msgstr "" -"Jika Anda sudah menginstall firmware scanner Anda, Anda bisa mengupdate " -"firmware di sini dengan menyediakan file firmware baru." +msgstr "Jika Anda sudah menginstall firmware scanner Anda, Anda bisa mengupdate firmware di sini dengan menyediakan file firmware baru." #: scannerdrake:231 #, c-format @@ -2973,12 +2836,8 @@ msgstr "%s tidak didukung" #, c-format msgid "" "The %s must be configured by system-config-printer.\n" -"You can launch system-config-printer from the %s Control Center in Hardware " -"section." -msgstr "" -"%s harus dikonfigurasikan oleh system-config-printer.\n" -"Anda bisa menjalankan system-config-printer dari Pusat Kendali %s pada " -"bagian Hardware." +"You can launch system-config-printer from the %s Control Center in Hardware section." +msgstr "%s harus dikonfigurasikan oleh system-config-printer.\nAnda bisa menjalankan system-config-printer dari Pusat Kendali %s pada bagian Hardware." #: scannerdrake:318 #, c-format @@ -3025,49 +2884,36 @@ msgstr "Perhatian!" msgid "" "Your %s cannot be configured fully automatically.\n" "\n" -"Manual adjustments are required. Please edit the configuration file /etc/" -"sane.d/%s.conf. " -msgstr "" -"%s Anda tidak bisa dikonfigurasikan secara otomatis.\n" -"\n" -"Pengaturan manual diperlukan. Silakan edit file konfigurasi /etc/sane.d/%s." -"conf. " +"Manual adjustments are required. Please edit the configuration file /etc/sane.d/%s.conf. " +msgstr "%s Anda tidak bisa dikonfigurasikan secara otomatis.\n\nPengaturan manual diperlukan. Silakan edit file konfigurasi /etc/sane.d/%s.conf. " #: scannerdrake:405 scannerdrake:414 #, c-format msgid "" "More info in the driver's manual page. Run the command \"man sane-%s\" to " "read it." -msgstr "" -"Info lebih lanjut pada halaman manual driver. Jalankan perintah \"man sane-%s" -"\" untuk membaca." +msgstr "Info lebih lanjut pada halaman manual driver. Jalankan perintah \"man sane-%s\" untuk membaca." #: scannerdrake:407 scannerdrake:416 #, c-format msgid "" -"After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/" -"Graphics in the applications menu." -msgstr "" -"Setelah itu Anda bisa men-scan dokumen menggunakan \"XSane\" atau \"%s\" " -"dari Multimedia/Grafis di menu aplikasi." +"After that you may scan documents using \"XSane\" or \"%s\" from " +"Multimedia/Graphics in the applications menu." +msgstr "Setelah itu Anda bisa men-scan dokumen menggunakan \"XSane\" atau \"%s\" dari Multimedia/Grafis di menu aplikasi." #: scannerdrake:411 #, c-format msgid "" "Your %s has been configured, but it is possible that additional manual " "adjustments are needed to get it to work. " -msgstr "" -"%s Anda telah dikonfigurasi, tapi mungkin pengaturan manual tambahan " -"diperlukan agar bisa bekerja." +msgstr "%s Anda telah dikonfigurasi, tapi mungkin pengaturan manual tambahan diperlukan agar bisa bekerja." #: scannerdrake:412 #, c-format msgid "" "If it does not appear in the list of configured scanners in the main window " "of Scannerdrake or if it does not work correctly, " -msgstr "" -"Jika tidak muncul pada daftar scanner yang terkonfigurasi pada jendela utama " -"Scannerdrake atau jika tidak bekerja dengan benar, " +msgstr "Jika tidak muncul pada daftar scanner yang terkonfigurasi pada jendela utama Scannerdrake atau jika tidak bekerja dengan benar, " #: scannerdrake:413 #, c-format @@ -3083,12 +2929,8 @@ msgstr "Selamat!" #, c-format msgid "" "Your %s has been configured.\n" -"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/" -"Graphics in the applications menu." -msgstr "" -"%s Anda telah terkonfigurasi.\n" -"Sekarang Anda bisa men-scan dokumen menggunakan \"XSane\" atau \"%s\" dari " -"Multimedia/Grafis di menu aplikasi." +"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu." +msgstr "%s Anda telah terkonfigurasi.\nSekarang Anda bisa men-scan dokumen menggunakan \"XSane\" atau \"%s\" dari Multimedia/Grafis di menu aplikasi." #: scannerdrake:444 #, c-format @@ -3097,11 +2939,7 @@ msgid "" "\n" "%s\n" "are available on your system.\n" -msgstr "" -"Scanner berikut\n" -"\n" -"%s\n" -"tersedia pada sistem Anda.\n" +msgstr "Scanner berikut\n\n%s\ntersedia pada sistem Anda.\n" #: scannerdrake:445 #, c-format @@ -3110,11 +2948,7 @@ msgid "" "\n" "%s\n" "is available on your system.\n" -msgstr "" -"Scanner berikut\n" -"\n" -"%s\n" -"tersedia pada sistem Anda.\n" +msgstr "Scanner berikut\n\n%s\ntersedia pada sistem Anda.\n" #: scannerdrake:447 scannerdrake:450 #, c-format @@ -3164,20 +2998,16 @@ msgstr "Sharing Scanner" #: scannerdrake:594 #, c-format msgid "" -"Here you can choose whether the scanners connected to this machine should be " -"accessible by remote machines and by which remote machines." -msgstr "" -"Di sini Anda bisa memilih apakah scanner yang terhubung pada komputer ini " -"bisa diakses oleh komputer remote dan oleh komputer remote yang mana." +"Here you can choose whether the scanners connected to this machine should be" +" accessible by remote machines and by which remote machines." +msgstr "Di sini Anda bisa memilih apakah scanner yang terhubung pada komputer ini bisa diakses oleh komputer remote dan oleh komputer remote yang mana." #: scannerdrake:595 #, c-format msgid "" "You can also decide here whether scanners on remote machines should be made " "available on this machine." -msgstr "" -"Di sini juga Anda bisa menentukan apakah scanner dari komputer remote harus " -"tersedia pada komputer ini." +msgstr "Di sini juga Anda bisa menentukan apakah scanner dari komputer remote harus tersedia pada komputer ini." #: scannerdrake:598 #, c-format @@ -3214,9 +3044,7 @@ msgstr "Sharing scanner lokal" msgid "" "These are the machines on which the locally connected scanner(s) should be " "available:" -msgstr "" -"Ini adalah komputer di mana scanner yang terhubung secara lokal harus " -"tersedia:" +msgstr "Ini adalah komputer di mana scanner yang terhubung secara lokal harus tersedia:" #: scannerdrake:656 scannerdrake:806 #, c-format @@ -3275,10 +3103,7 @@ msgid "" "saned needs to be installed to share the local scanner(s).\n" "\n" "Do you want to install the saned package?" -msgstr "" -"saned perlu diinstall untuk sharing scanner lokal.\n" -"\n" -"Apakah Anda ingin menginstall paket saned?" +msgstr "saned perlu diinstall untuk sharing scanner lokal.\n\nApakah Anda ingin menginstall paket saned?" #: scannerdrake:956 scannerdrake:960 #, c-format @@ -3288,8 +3113,7 @@ msgstr "Scanner Anda tidak akan tersedia pada jaringan." #: scannerdrake:959 #, c-format msgid "Could not install the packages needed to share your scanner(s)." -msgstr "" -"Tidak bisa menginstall paket yang diperlukan untuk sharing scanner Anda." +msgstr "Tidak bisa menginstall paket yang diperlukan untuk sharing scanner Anda." #: service_harddrake:157 #, c-format @@ -3350,14 +3174,10 @@ msgstr "Masalah driver display" #, c-format msgid "" "The display driver currently configured requires you to use the 'nokmsboot' " -"boot option to prevent the KMS driver of the kernel from being loaded in the " -"boot process. Startup of the X server may now fail as that option was not " +"boot option to prevent the KMS driver of the kernel from being loaded in the" +" boot process. Startup of the X server may now fail as that option was not " "specified." -msgstr "" -"Driver display yang terkonfigurasi saat ini mengharuskan Anda menggunakan " -"opsi boot 'nokmsboot' untuk mencegah driver KMS kernel dimuat saat proses " -"boot. Startup server X sekarang mungkin akan gagal karena opsi tersebut " -"tidak ditentukan." +msgstr "Driver display yang terkonfigurasi saat ini mengharuskan Anda menggunakan opsi boot 'nokmsboot' untuk mencegah driver KMS kernel dimuat saat proses boot. Startup server X sekarang mungkin akan gagal karena opsi tersebut tidak ditentukan." #: service_harddrake:437 #, c-format @@ -3365,10 +3185,7 @@ msgid "" "Detected a loaded display driver kernel module which conflicts with the " "driver the X server is configured to use. Startup of the X server may now " "fail." -msgstr "" -"Terdeteksi sebuah modul kernel driver display yang dimuat yang konflik " -"dengan driver server X terkonfigurasi yang digunakan. Startup server X " -"sekarang mungkin akan gagal." +msgstr "Terdeteksi sebuah modul kernel driver display yang dimuat yang konflik dengan driver server X terkonfigurasi yang digunakan. Startup server X sekarang mungkin akan gagal." #: service_harddrake:452 #, c-format @@ -3409,118 +3226,107 @@ msgid "Language & country configuration" msgstr "Konfigurasi bahasa & negara" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Konfigurasi peringatan Surat" +msgstr "Jalankan Konfigurasi Otentikasi Mageia" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Otentikasi Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Konfigurasi Boot" +msgstr "Jalankan Konfigurasi Boot Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Boot Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Konfigurasi peringatan Surat" +msgstr "Jalankan Konfigurasi Tanggal dan Waktu Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Tanggal dan Waktu Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Jalankan Editor Layout Disk Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Editor Layout Disk Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Konfigurasi bahasa & negara" +msgstr "Jalankan Konfigurasi Pengelola Login Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Pengelola Login Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Konfigurasi bahasa & negara" +msgstr "Jalankan Konfigurasi Font Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Font Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Konfigurasi Server Grafis" +msgstr "Jalankan Konfigurasi Hardware Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Hardware Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Jalankan Penampil Log Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Penampil Log Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Konfigurasi Server Grafis" +msgstr "Jalankan Konfigurasi Perizinan Keamanan Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Perizinan Keamanan Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Konfigurasi Server Grafis" +msgstr "Jalankan Konfigurasi Pemindai Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Pemindai Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Konfigurasi peringatan Surat" +msgstr "Jalankan Konfigurasi Keamanan Aplikasi Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Keamanan Aplikasi Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Konfigurasi UPS" +msgstr "Jalankan Konfigurasi UPS Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi UPS Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Konfigurasi Server Grafis" +msgstr "Jalankan Konfigurasi Layanan Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" +msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Layanan Mageia" -- cgit v1.2.1 From fc737ec82c38e0c92f5b808a2542c34e04a0005b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 26 Nov 2013 07:01:35 +0100 Subject: fix a warning when checking root password strength include dialog-warning-symbolic --- perl-install/install/NEWS | 2 ++ perl-install/install/share/list.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c57b89f9b..9e21655a8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix a warning: include dialog-warning-symbolic + Version 16.0 - 23 November 2013 - switch from Gtk+-2 to Gtk+-3: diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index cf771b0b7..094f59ce7 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -243,6 +243,8 @@ /usr/bin/drakx-matchbox-window-manager /usr/share/matchbox/mbnoapp.xpm + /usr/share/icons/gnome/scalable/status/dialog-warning-symbolic.svg + /etc/pki/tls/certs/ca-bundle.crt /usr/lib/systemd/systemd-udevd -- cgit v1.2.1 From af481cd351669dfb5cca7ae1e827844814d80e7e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 26 Nov 2013 18:21:53 +0100 Subject: restore galaxy RC file (mga#11773) it's still needed for gtk2 tools --- perl-install/Makefile.drakxtools | 1 + perl-install/NEWS | 2 ++ perl-install/share/themes-galaxy.rc | 40 +++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 perl-install/share/themes-galaxy.rc diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index c0aef55b6..1ef2bf6d1 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -55,6 +55,7 @@ install: install -m 644 *.pm $(LIBDEST) for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done install -m 644 pixmaps/*.* $(PIXDIR) + install -m 644 share/*.rc $(DATADIR)/$(NAME) install -m 644 share/*.css $(DATADIR)/$(NAME) install -d $(PREFIX)/etc/security diff --git a/perl-install/NEWS b/perl-install/NEWS index adce397e7..2acfa2627 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- restore galaxy RC file (mga#11773) + Version 16.0 - 23 November 2013 - switch from Gtk+-2 to Gtk+-3: diff --git a/perl-install/share/themes-galaxy.rc b/perl-install/share/themes-galaxy.rc new file mode 100644 index 000000000..b0e4f4b5b --- /dev/null +++ b/perl-install/share/themes-galaxy.rc @@ -0,0 +1,40 @@ +gtk-button-images=0 + +style "white-on-blue" +{ + base[NORMAL] = { 0.28, 0.38, 0.66 } + bg[NORMAL] = "#548EE6" + + text[NORMAL] = "#FFFFFF" + fg[NORMAL] = "#FFFFFF" +} + +style "step-categories" +{ + fg[NORMAL] = "#32A9DD" +} +style "banner" +{ + fg[NORMAL] = "#5A8AD6" + fg[ACTIVE] = "#5A8AD6" + fg[PRELIGHT] = "#5A8AD6" +} + +style "background" +{ + bg[NORMAL] = "#FFFFFF" +} + +style "Left_background" +{ + bg[NORMAL] = "#2859B5" + base[NORMAL] = "#2859B5" + fg[NORMAL] = "#FFD200" +} + +widget "*Steps*" style "white-on-blue" +widget "*Step-categories*" style "step-categories" +widget "*Left_background*" style "Left_background" +widget "*logo*" style "white-on-blue" +widget "*background*" style "background" +widget "*Banner*" style "banner" -- cgit v1.2.1 From cc5ebdf0f317e2048909600c1da45cfb394a815d Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Tue, 26 Nov 2013 20:59:39 +0100 Subject: updated Dutch translation --- perl-install/standalone/po/nl.po | 67 +++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/perl-install/standalone/po/nl.po b/perl-install/standalone/po/nl.po index 462f00f06..b125cc8b0 100644 --- a/perl-install/standalone/po/nl.po +++ b/perl-install/standalone/po/nl.po @@ -10,14 +10,15 @@ # Rob Teng , 2005, 2008. # C. Verschuuren , 2006. # Remco Rijnders , 2011-2013. +# Marja van Waes , 2013 msgid "" msgstr "" "Project-Id-Version: libDrakX-standalone\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-03-10 08:14+0100\n" -"Last-Translator: Remco Rijnders \n" -"Language-Team: Nederlands\n" +"PO-Revision-Date: 2013-11-26 20:54+0100\n" +"Last-Translator: Marja van Waes \n" +"Language-Team: Nederlands \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3423,121 +3424,117 @@ msgid "Language & country configuration" msgstr "Taal- & landconfiguratie" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Configuratie van waarschuwing per e-mail" +msgstr "Start de Mageia Aunthenticatieconfiguratie" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"Authenticatie is nodig om de Mageia Authenticatieconfiguratie te starten" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Opstartconfiguratie" +msgstr "Start de Mageia Opstartconfiguratie" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Opstartconfiguratie te starten" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Configuratie van waarschuwing per e-mail" +msgstr "Start de Mageia Datum- en Tijdconfiguratie" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" +"Authenticatie is nodig om de Mageia Datum- en Tijdconfiguratie te starten" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Start de Mageia Schijfindelingsbewerker" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Schijfindelingsbewerker te starten" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Taal- & landconfiguratie" +msgstr "Start de Mageia Loginbeheerconfiguratie" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Loginbeheerconfiguratie te starten" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Taal- & landconfiguratie" +msgstr "Start de Mageia Fontconfiguratie" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Fontconfiguratie te starten" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Configuratie van grafische server" +msgstr "Start de Mageia Apparaatconfiguratie" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Apparaatconfiguratie te starten" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Start de Mageia Logviewer" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Logviewer te starten" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Configuratie van grafische server" +msgstr "Start de Mageia Veiligheidsrechtenconfiguratie" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" +"Authenticatie is nodig om de Mageia Veiligheidsrechtenconfiguratie te " +"starten" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Configuratie van grafische server" +msgstr "Start de Mageia Scannerconfiguratie" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" msgstr "" +"Authenticatie is nodig om de Mageia Scannerconfiguratie te starten" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Configuratie van waarschuwing per e-mail" +msgstr "Start de Mageia Programmaveiligheidsconfiguratie" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" +"Authenticatie is nodig om de Mageia Programmaveiligheidsconfiguratie te " +"starten" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "UPS-configuratie" +msgstr "Start de Mageia UPS-configuratie" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia UPS-configuratie te starten" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Configuratie van grafische server" +msgstr "Start de Mageia Dienstenconfiguratie" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" +msgstr "Authenticatie is nodig om de Mageia Dienstenconfiguratie te starten" #~ msgid "Verbose" #~ msgstr "Uitgebreid" -- cgit v1.2.1 From d548cdafae2dc267f272ea5103090d444645f96a Mon Sep 17 00:00:00 2001 From: dglent Date: Wed, 27 Nov 2013 06:01:12 +0100 Subject: Update Greek translation --- perl-install/install/share/po/el.po | 42 ++++++++++++------------ perl-install/standalone/po/el.po | 64 +++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/perl-install/install/share/po/el.po b/perl-install/install/share/po/el.po index 55216d792..27dc63883 100644 --- a/perl-install/install/share/po/el.po +++ b/perl-install/install/share/po/el.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-03 13:04+0200\n" +"PO-Revision-Date: 2013-11-27 05:49+0100\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: ../../advertising/01_IM_mageia.pl:1 #, c-format @@ -754,31 +754,31 @@ msgid "" msgstr "Ένα γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Σταθμός εργασίας KDE" +msgstr "Σταθμός εργασίας XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" -msgstr "Ένα γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές" +msgstr "Ένα ελαφρύ γραφικό περιβάλλον με φιλικά εργαλεία και εφαρμογές" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Σταθμός Εργασίας Gnome" +msgstr "Σταθμός Εργασίας MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Σταθμός εργασίας" +msgstr "Σταθμός εργασίας Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Γραφικό περιβάλλον" +msgstr "Γραφικό περιβάλλον βασισμένο στο GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -795,26 +795,24 @@ msgstr "" "εφαρμογών" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Προσαρμοσμένο περιβάλλον εργασίας" +msgstr "Περιβάλλον εργασίας RazorQt" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Ένα υποανάπτυξη ελαφρύ και γρήγορο γραφικό περιβάλλον" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Περιβάλλον εργασίας Enlightenment e17 " #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Ένα ελαφρύ & γρήγορο γραφικό περιβάλλον με ένα σύνολο φιλικών εργαλείων και " -"εφαρμογών" +msgstr "Ένα ελαφρύ & γρήγορο γραφικό περιβάλλον με αφοσιωμένους οπαδούς " #: share/meta-task/compssUsers.pl:193 #, c-format @@ -822,9 +820,9 @@ msgid "Other Graphical Desktops" msgstr "Άλλα γραφικά περιβάλλοντα" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, κλπ" +msgstr "Window Maker, Fvwm, κλπ" #: share/meta-task/compssUsers.pl:217 #, c-format diff --git a/perl-install/standalone/po/el.po b/perl-install/standalone/po/el.po index e9e4837cd..d2c262593 100644 --- a/perl-install/standalone/po/el.po +++ b/perl-install/standalone/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_standalone\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-14 06:37+0100\n" +"PO-Revision-Date: 2013-11-27 06:00+0100\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -1452,7 +1452,7 @@ msgstr "Όνομα:" #: drakups:143 #, c-format msgid "The name of your ups" -msgstr "Το όνομα του ups σας" +msgstr "Το όνομα του UPS σας" #: drakups:144 #, c-format @@ -3432,121 +3432,123 @@ msgid "Language & country configuration" msgstr "Ρύθμιση της γλώσσας και της χώρας" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Ρύθμιση των συναγερμών μέσω αλληλογραφίας" +msgstr "Εκτέλεση της Διαμόρφωσης Πιστοποίησης Mageia" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Πιστοποίησης Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Ρύθμιση της εκκίνησης" +msgstr "Εκτέλεση της Διαμόρφωσης Εκκίνησης Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Εκκίνησης Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Ρύθμιση των συναγερμών μέσω αλληλογραφίας" +msgstr "Εκτέλεση της Διαμόρφωσης Ημερομηνίας και Ώρας Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Ημερομηνίας και Ώρας " +"Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Εκτέλεση του Επεξεργαστή Διάταξης Δίσκων Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση του Επεξεργαστή Διάταξης Δίσκων Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Ρύθμιση της γλώσσας και της χώρας" +msgstr "Εκτέλεση της Διαμόρφωσης του Διαχειριστή Σύνδεσης Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης του Διαχειριστή " +"Σύνδεσης Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Ρύθμιση της γλώσσας και της χώρας" +msgstr "Εκτέλεση της Διαμόρφωσης Γραμματοσειρών Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Γραμματοσειρών Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Ρύθμιση του εξυπηρετητή γραφικών" +msgstr "Εκτέλεση της Διαμόρφωσης Υλικού Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Υλικού Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Εκτέλεση του Προβολέα Καταγραφών Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Απαιτείται πιστοποίηση για την εκτέλεση του Προβολέα Καταγραφών Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Ρύθμιση του εξυπηρετητή γραφικών" +msgstr "Εκτέλεση της Διαμόρφωσης Αδειών Ασφαλείας Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Αδειών Ασφαλείας " +"Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Ρύθμιση του εξυπηρετητή γραφικών" +msgstr "Εκτέλεση της Διαμόρφωσης Σαρωτή Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Σαρωτή Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Ρύθμιση των συναγερμών μέσω αλληλογραφίας" +msgstr "Εκτέλεση της Διαμόρφωσης Ασφαλείας Εφαρμογών Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Ασφαλείας Εφαρμογών " +"Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Ρύθμιση του UPS" +msgstr "Εκτέλεση της Διαμόρφωσης UPS Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης UPS Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Ρύθμιση του εξυπηρετητή γραφικών" +msgstr "Εκτέλεση της Διαμόρφωσης Υπηρεσιών Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" msgstr "" +"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης Υπηρεσιών Mageia" #~ msgid "Verbose" #~ msgstr "Γραφικό με κείμενο" -- cgit v1.2.1 From 9f849f3c8bac06fc5eec7176f717c9b3e1384070 Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Wed, 27 Nov 2013 18:40:39 +0100 Subject: improve Dutch translation --- perl-install/standalone/po/nl.po | 54 +++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/perl-install/standalone/po/nl.po b/perl-install/standalone/po/nl.po index b125cc8b0..0e4fc9549 100644 --- a/perl-install/standalone/po/nl.po +++ b/perl-install/standalone/po/nl.po @@ -3425,116 +3425,114 @@ msgstr "Taal- & landconfiguratie" #: ../polkit/org.mageia.drakauth.policy.in.h:1 msgid "Run Mageia Authentication Configuration" -msgstr "Start de Mageia Aunthenticatieconfiguratie" +msgstr "Start Mageia's Aunthenticatieconfiguratie" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" -"Authenticatie is nodig om de Mageia Authenticatieconfiguratie te starten" +"Authenticatie is nodig om Mageia's Authenticatieconfiguratie te starten" #: ../polkit/org.mageia.drakboot.policy.in.h:1 msgid "Run Mageia Boot Configuration" -msgstr "Start de Mageia Opstartconfiguratie" +msgstr "Start Mageia's Opstartconfiguratie" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "Authenticatie is nodig om de Mageia Opstartconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Opstartconfiguratie te starten" #: ../polkit/org.mageia.drakclock.policy.in.h:1 msgid "Run Mageia Date and Time Configuration" -msgstr "Start de Mageia Datum- en Tijdconfiguratie" +msgstr "Start Mageia's Datum- en Tijdconfiguratie" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" -"Authenticatie is nodig om de Mageia Datum- en Tijdconfiguratie te starten" +"Authenticatie is nodig om Mageia's Datum- en Tijdconfiguratie te starten" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "Start de Mageia Schijfindelingsbewerker" +msgstr "Start Mageia's Schijfindelingsbewerker" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "Authenticatie is nodig om de Mageia Schijfindelingsbewerker te starten" +msgstr "Authenticatie is nodig om Mageia's Schijfindelingsbewerker te starten" #: ../polkit/org.mageia.drakdm.policy.in.h:1 msgid "Run Mageia Login Manager Configuration" -msgstr "Start de Mageia Loginbeheerconfiguratie" +msgstr "Start Mageia's Login-beheerderconfiguratie" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "Authenticatie is nodig om de Mageia Loginbeheerconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Login-beheerderconfiguratie te starten" #: ../polkit/org.mageia.drakfont.policy.in.h:1 msgid "Run Mageia Font Configuration" -msgstr "Start de Mageia Fontconfiguratie" +msgstr "Start Mageia's Fontconfiguratie" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "Authenticatie is nodig om de Mageia Fontconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Fontconfiguratie te starten" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 msgid "Run Mageia Hardware Configuration" -msgstr "Start de Mageia Apparaatconfiguratie" +msgstr "Start Mageia's Apparaatconfiguratie" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "Authenticatie is nodig om de Mageia Apparaatconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Apparaatconfiguratie te starten" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "Start de Mageia Logviewer" +msgstr "Start Mageia's Logviewer" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "Authenticatie is nodig om de Mageia Logviewer te starten" +msgstr "Authenticatie is nodig om Mageia's Logviewer te starten" #: ../polkit/org.mageia.drakperm.policy.in.h:1 msgid "Run Mageia Security Permissions Configuration" -msgstr "Start de Mageia Veiligheidsrechtenconfiguratie" +msgstr "Start Mageia's Veiligheidsrechten-configuratie" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" -"Authenticatie is nodig om de Mageia Veiligheidsrechtenconfiguratie te " -"starten" +"Authenticatie is nodig om Mageia's Veiligheidsrechten-configuratie te starten" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 msgid "Run Mageia Scanner Configuration" -msgstr "Start de Mageia Scannerconfiguratie" +msgstr "Start Mageia's Scannerconfiguratie" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" -"Authenticatie is nodig om de Mageia Scannerconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Scannerconfiguratie te starten" #: ../polkit/org.mageia.draksec.policy.in.h:1 msgid "Run Mageia Application Security Configuration" -msgstr "Start de Mageia Programmaveiligheidsconfiguratie" +msgstr "Start Mageia's Programma-veiligheidsconfiguratie" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" -"Authenticatie is nodig om de Mageia Programmaveiligheidsconfiguratie te " +"Authenticatie is nodig om Mageia's Programma-veiligheidsconfiguratie te " "starten" #: ../polkit/org.mageia.drakups.policy.in.h:1 msgid "Run Mageia UPS Configuration" -msgstr "Start de Mageia UPS-configuratie" +msgstr "Start Mageia's UPS-configuratie" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "Authenticatie is nodig om de Mageia UPS-configuratie te starten" +msgstr "Authenticatie is nodig om Mageia's UPS-configuratie te starten" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 msgid "Run Mageia Service Configuration" -msgstr "Start de Mageia Dienstenconfiguratie" +msgstr "Start Mageia's Dienstenconfiguratie" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "Authenticatie is nodig om de Mageia Dienstenconfiguratie te starten" +msgstr "Authenticatie is nodig om Mageia's Dienstenconfiguratie te starten" #~ msgid "Verbose" #~ msgstr "Uitgebreid" -- cgit v1.2.1 From 42d5da0b26a0816cffd327a2297d10f1d7a97d0f Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Wed, 27 Nov 2013 20:58:28 +0100 Subject: update Dutch translation --- perl-install/install/share/po/nl.po | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po index c7fa06452..4f21ee3ed 100644 --- a/perl-install/install/share/po/nl.po +++ b/perl-install/install/share/po/nl.po @@ -9,13 +9,14 @@ # Peter Bosch , 2002. # Rob Teng , 2005, 2008. # Remco Rijnders , 2011-2013. +# Marja van Waes , 2013. msgid "" msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-03-07 18:23+0100\n" -"Last-Translator: Remco Rijnders \n" +"PO-Revision-Date: 2013-11-27 20:55+0100\n" +"Last-Translator: Marja van Waes \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -26,52 +27,50 @@ msgstr "" #: ../../advertising/01_IM_mageia.pl:1 #, c-format msgid "Join Us!" -msgstr "" +msgstr "Sluit u bij ons aan!" #: ../../advertising/02_IM_mageia.pl:1 #, c-format msgid "Make it yours!" -msgstr "" +msgstr "Maak het u eigen!" #: ../../advertising/03_IM_mageia.pl:1 #, c-format msgid "Your choice!" -msgstr "" +msgstr "Uw keuze!" #: ../../advertising/04_IM_mageia.pl:1 -#, fuzzy, c-format msgid "Office tools" -msgstr "Kantooromgeving" +msgstr "Kantoortools" #: ../../advertising/05_IM_mageia.pl:1 #, c-format msgid "Home entertainment" -msgstr "" +msgstr "Home-entertainment" #: ../../advertising/06_IM_mageia.pl:1 #, c-format msgid "For kids" -msgstr "" +msgstr "Voor kinderen" #: ../../advertising/07_IM_mageia.pl:1 #, c-format msgid "For family!" -msgstr "" +msgstr "Voor gezinnen!" #: ../../advertising/08_IM_mageia.pl:1 -#, fuzzy, c-format msgid "For developers!" -msgstr "Voor ontwikkelaars" +msgstr "Voor ontwikkelaars!" #: ../../advertising/09_IM_mageia.pl:1 #, c-format msgid "Thank you!" -msgstr "" +msgstr "Dank u!" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "" +msgstr "Wees Vrij!" #: any.pm:111 #, c-format -- cgit v1.2.1 From f1fc9d3e4ccb4a7a27e7c080d338fa78ea7fa3e6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 09:30:18 +0100 Subject: kill empty line --- perl-install/share/themes-galaxy.css | 1 - 1 file changed, 1 deletion(-) diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 45c22d14a..7bbbbddcc 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -11,7 +11,6 @@ #Logo, #Steps { /* base[NORMAL] = { 0.28, 0.38, 0.66 }; */ background-color: #548EE6; - color: #FFFFFF; } -- cgit v1.2.1 From 1285c7382105cba7e4567c3a4c890cec2708b4a2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 09:31:26 +0100 Subject: fix left panel text being black instead of white (mga#11792) issue introduced in commit 7bebddbde7bc6aeef0cbacc46df5bd3a4162160a when switching from gtk2 RC files to gtk3 CSS: we need to add "*" to match children widgets too --- perl-install/install/NEWS | 1 + perl-install/share/themes-galaxy.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9e21655a8..82f0d68b6 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - fix a warning: include dialog-warning-symbolic +- fix left panel text being black instead of white (mga#11792) Version 16.0 - 23 November 2013 diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 7bbbbddcc..617e25d3f 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -8,7 +8,7 @@ */ -#Logo, #Steps { +#Logo, #Steps * { /* base[NORMAL] = { 0.28, 0.38, 0.66 }; */ background-color: #548EE6; color: #FFFFFF; -- cgit v1.2.1 From 4d4666ef4068f7f7e9bf8fd7b376c407dddbe1b5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 09:32:56 +0100 Subject: fix calling "child1_shrink" via package "Gtk3::HPaned" (mga#11797) fix can't locate object method "child1_shrink" via package "Gtk3::HPaned" --- perl-install/fs/partitioning_wizard.pm | 6 ++---- perl-install/install/NEWS | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index fdb61cf7c..b8d68a382 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -332,10 +332,8 @@ sub create_display_box { $ratio * MB(600), 0)); my $hpane = Gtk3::HPaned->new; - $hpane->add1($part_widget); - $hpane->child1_shrink(0); - $hpane->add2($mdv_widget); - $hpane->child2_shrink(0); + $hpane->pack1($part_widget, 1, 0); + $hpane->pack2($mdv_widget, 1, 0); $hpane->set_position(ceil($ratio * $entry->{req_size})); ugtk3::gtkset_size_request($hpane, $entry->{width}, 0); ugtk3::gtkpack__($display_box, $hpane); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 82f0d68b6..6474730bc 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - 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) Version 16.0 - 23 November 2013 -- cgit v1.2.1 From 2f8ee0ef2b920ad8125b34339bce7b4f241e2812 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 13:21:02 +0100 Subject: use new Toolbar API (mga#11791) old toolbar API is no more available: Can't locate object method "append_item" via package Gtk3:Toolbar" at ugtk3.pm line 954 --- perl-install/install/NEWS | 1 + perl-install/ugtk3.pm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 6474730bc..193d30c08 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - 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) Version 16.0 - 23 November 2013 diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index dad860cb8..ce3db3e31 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -951,7 +951,8 @@ sub ask_browse_tree_info { } my %toolbar = @toolbar; foreach (grep_index { $::i % 2 == 0 } @toolbar) { - $toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]); + my $t = gtknew('ToolButton', tooltip => $toolbar{$_}[0], file => "$_.png", clicked => $toolbar{$_}[1]); + $toolbar->insert($t, -1); } $pixcolumn->{is_pix} = 1; -- cgit v1.2.1 From 3a91f72da3a6a3ecee49c5da105c1fa611f89a39 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 13:45:34 +0100 Subject: better log --- perl-install/NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 2acfa2627..6307c89c6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,5 @@ -- restore galaxy RC file (mga#11773) +- mcc: + o restore galaxy RC file, thus fixing left panel text color (mga#11773) Version 16.0 - 23 November 2013 -- cgit v1.2.1 From ee095e6e14e98fe19b2b3392734274c100ffed88 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 13:46:03 +0100 Subject: fix Gtk2 banners' text position (mga#11778) in commit aa1b536467c9b11d9dd3ff3a0369ca5097642fec, the blue background image has been shrinked of its white part for Gtk3 banners as a side effect, gtk2 banners (where we removed 48px of white background) now displayed their text too far at left, on the actual blue part. => add 10px instead of removing 48px --- perl-install/NEWS | 1 + perl-install/ugtk2.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 6307c89c6..ba1820720 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - mcc: o restore galaxy RC file, thus fixing left panel text color (mga#11773) + o fix Gtk2 banners' text position (mga#11778) Version 16.0 - 23 November 2013 diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 3db9ff814..931f377a7 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -1467,8 +1467,8 @@ sub new { my $d_width = $darea->allocation->width; my $x_blue = $is_rtl ? $d_width - $blue_width : 0; my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; - # here: 48 is the amount of white background in the blue background we wish to ignore: - my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48; + # here: 10 is the amount of padding (white background) wish to add betwen text & blue background: + my $x_text = $is_rtl ? $d_width - $blue_width - 10 - $darea->{txt_width} : $blue_width + 10; $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size); $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'), 0, 0, $x_blue, 0, -1, -1, 'none', 0, 0); -- cgit v1.2.1 From f13a8c6e1a5b9ea7bbc0e8c824ff73279359a7a3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 13:40:24 +0100 Subject: align banner text to left instead of centering it This was though better when reinventing banners in gtk3. However: - mcc is still gtk2 and it display a left aligned banner for embedded tools - it can be seen as a regression --- perl-install/NEWS | 2 ++ perl-install/ugtk3.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index ba1820720..c65b6c94b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - mcc: o restore galaxy RC file, thus fixing left panel text color (mga#11773) o fix Gtk2 banners' text position (mga#11778) +- Banners: + o align text to left instead of centering it Version 16.0 - 23 November 2013 diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index ce3db3e31..bbca18213 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1383,7 +1383,7 @@ sub new { my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]); - my $label = gtknew('Label', text => $text); # for update_text() + my $label = gtknew('Label', text => $text, padding => [ 100, 0 ], alignment => [ 0, 0.5 ]); # for update_text() my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [ gtknew('Overlay', main_child => $img, children => [ my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]), -- cgit v1.2.1 From ac770b60cddb20587a87bafb35b61c6810a0bf42 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 14:03:26 +0100 Subject: banners text is rendered as blue again in commit f5ed08a589bc9081c68188c464a5a978557d0b2a, we mistakely removed the widget name... --- perl-install/NEWS | 1 + perl-install/ugtk3.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index c65b6c94b..63cae8189 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,7 @@ o fix Gtk2 banners' text position (mga#11778) - Banners: o align text to left instead of centering it + o text is rendered as blue again Version 16.0 - 23 November 2013 diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index bbca18213..8f8fdcc21 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -1384,7 +1384,7 @@ sub new { my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]); my $label = gtknew('Label', text => $text, padding => [ 100, 0 ], alignment => [ 0, 0.5 ]); # for update_text() - my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [ + my $w = gtknew('Overlay', height => $d_height, widget_name => 'Banner', main_child => $label, children => [ gtknew('Overlay', main_child => $img, children => [ my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]), ]) -- cgit v1.2.1 From e779a9401a2971e0338fdf3e7dffaa60629d3b28 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 27 Nov 2013 16:51:55 +0100 Subject: prevent looping forever when sizing partition tabs spot while trying to reproduce mga#11779 this code has always been tricky and has bugs since introduced (see eg: resizing occuring when switching partition tabs) --- perl-install/NEWS | 2 ++ perl-install/diskdrake/hd_gtk.pm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 63cae8189..a1bf32067 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,8 @@ - Banners: o align text to left instead of centering it o text is rendered as blue again +- diskdrake: + o prevent looping forever when sizing partition tabs Version 16.0 - 23 November 2013 diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 583df7ae2..d98f25cac 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -324,7 +324,8 @@ sub create_buttons4partitions { $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 25 if $w->{window}->get_window; my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; - while (1) { + my $i = 1; + while ($i < 30) { my $totalwidth = sum(map { $_->{size} * $ratio + $minwidth } @parts); $totalwidth <= $width and last; $ratio /= $totalwidth / $width * 1.1; -- cgit v1.2.1 From 24e5026cdc82292243c9f313d5c90d318bb9abd6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 14:47:57 +0100 Subject: wrap too big labels in summary dialog (mga#11793) --- perl-install/install/NEWS | 1 + perl-install/install/steps_gtk.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 193d30c08..210197a65 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -2,6 +2,7 @@ - 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 diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index ff396e123..3fc72b597 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -700,7 +700,7 @@ sub summary_prompt { gtknew('Title1', 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 { -- cgit v1.2.1 From 139725a86f58091d6a4efe312a3550bb1c35eae0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 14:48:41 +0100 Subject: 16.1 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 301a8fd9e..2f965c425 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.0 +VERSION:=16.1 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index a1bf32067..e2fdb703c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.1 - 28 November 2013 + - mcc: o restore galaxy RC file, thus fixing left panel text color (mga#11773) o fix Gtk2 banners' text position (mga#11778) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 210197a65..a195b285f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +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) -- cgit v1.2.1 From 4a4c4aead90724a76abc12fd489742336b6f3912 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 14:58:15 +0100 Subject: factorize a variable (needed for next commit) --- perl-install/standalone/logdrake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 8ad314f0f..532cd6087 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -197,8 +197,9 @@ sub quit() { ugtk3->exit(0) } # search functions #------------------------------------------------------------- sub search() { - return if !$log_text->get_window; - $log_text->get_window->freeze_updates; + my $window = $log_text->get_window; + return if !$window; + $window->freeze_updates; $log_buf->set_text(''); if ($isFile) { parse_file($File, $File); @@ -207,7 +208,7 @@ sub search() { parse_file($files{$_}{file}, $files{$_}{desc}) if $toggle{$_}->get_active; } } - $log_text->get_window->thaw_updates; + $window->thaw_updates; $log_text->show; gtkflush(); } -- cgit v1.2.1 From db60d04d9590eb219cdeef087f487ec0b9ab981a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 15:03:35 +0100 Subject: fix Gtk3::TextView::get_window() passed too few parameters (mga#11807) commit e5d2e80a09845619e90d736ac9c0f5fb3665574d replaced perlish ->window by ->get_window but TextView overrides ->get_window()... --- perl-install/NEWS | 2 ++ perl-install/standalone/logdrake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index e2fdb703c..22da1490b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -8,6 +8,8 @@ Version 16.1 - 28 November 2013 o text is rendered as blue again - diskdrake: o prevent looping forever when sizing partition tabs +- logdrake: + o fix Gtk3::TextView::get_window() passed too few parameters (mga#11807) Version 16.0 - 23 November 2013 diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 532cd6087..af5559ef7 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -197,7 +197,7 @@ sub quit() { ugtk3->exit(0) } # search functions #------------------------------------------------------------- sub search() { - my $window = $log_text->get_window; + my $window = $log_text->get_window('widget'); return if !$window; $window->freeze_updates; $log_buf->set_text(''); -- cgit v1.2.1 From 862730c409e8d36320ae1cd1f2684b3af2e2f921 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 15:08:10 +0100 Subject: fix missing bit in commit e779a9401a2971e0338fdf3e7dffaa60629d3b28 --- perl-install/diskdrake/hd_gtk.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index d98f25cac..5ddc91230 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -326,6 +326,7 @@ sub create_buttons4partitions { my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; my $i = 1; while ($i < 30) { + $i++; my $totalwidth = sum(map { $_->{size} * $ratio + $minwidth } @parts); $totalwidth <= $width and last; $ratio /= $totalwidth / $width * 1.1; -- cgit v1.2.1 From aa396b6e2c1e185d4bc12a4cecbca83fbc52d767 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 15:37:42 +0100 Subject: drop SVN bits --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 79744281d..450240d46 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,6 @@ install_only: make -C rescue install STAGE2_DEST=$(STAGE2_DEST) make -C advertising install ROOTDEST=$(ROOTDEST) - LC_ALL=C svn info ChangeLog | egrep '^Revision|^Last Changed Date' > $(STAGE2_DEST)/VERSION - clean: # force taking new rpms from repository rm -rf images/RPMS -- cgit v1.2.1 From 1aec107f40a116a509d792519627e8bfd432cc87 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 17:35:45 +0100 Subject: reindent so that lines are shorter --- perl-install/standalone/drakclock | 224 +++++++++++++++++++------------------- 1 file changed, 113 insertions(+), 111 deletions(-) diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index d7b229242..0c8cc47ee 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -41,13 +41,13 @@ my $button_time = gtknew('Button', text => N("Change Time Zone")); my @timezones = eval { timezone::getTimeZones() }; my $err = $@; $button_time->signal_connect(clicked => sub { - local $::isEmbedded = 0; # to prevent sub window embedding - if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) { - $timezone->{UTC} = $in->ask_yesorno(N("GMT - DrakClock"), N("Is your hardware clock set to GMT?"), $timezone->{UTC}); - timezone::write($timezone); - } - $label_timezone->set_text($timezone->{timezone}); - }); + local $::isEmbedded = 0; # to prevent sub window embedding + if ($timezone->{timezone} = $in->ask_from_treelist(N("Timezone - DrakClock"), N("Which is your timezone?"), '/', \@timezones, $timezone->{timezone})) { + $timezone->{UTC} = $in->ask_yesorno(N("GMT - DrakClock"), N("Is your hardware clock set to GMT?"), $timezone->{UTC}); + timezone::write($timezone); + } + $label_timezone->set_text($timezone->{timezone}); + }); if (!@timezones) { warn "Failed to retrieve timezone list: $err\n"; $button_time->set_sensitive(0); @@ -66,110 +66,112 @@ my (undef, undef, $h_old, $old_day, $old_month, $old_year) = localtime(time()); my @image_size = (200, 200); -$my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, children => [ - 1, gtknew('HBox', children => [ - 1, gtknew('VBox', children => [ - 0, $calendar, - 1, gtknew('Frame', text => N("Network Time Protocol"), shadow_type => 'etched_in', child => - gtknew('VBox', border_width => 5, children => [ - 0, gtknew('Label', text => N("Your computer can synchronize its clock\n with a remote time server using NTP")), - 0, gtksignal_connect(gtkset_active($check_ntp = gtknew('CheckButton', text => N("Enable Network Time Protocol")), $mode), clicked => sub { - $mode = !$mode; - $hb_ntp->set_sensitive($mode); - if ($mode == 1 && !$in->do_pkgs->is_installed('ntp') && !$in->do_pkgs->is_installed('chrony')) { - install_ntp(); - } - }), - 0, $hb_ntp = gtknew('HBox', border_width => 5, children => [ - 0, gtknew('Label', text => N("Server:")), - 1, $combo_ntpserver = Gtk3::ComboBoxText->new - ]) - ])) - ]), - 0, gtknew('VBox', children => [ - 0, gtknew('HBox', children => [ - 0, $drawing_area = gtkset_size_request(Gtk3::DrawingArea->new, @image_size), - ]), - 0, my $time_box = gtknew('HBox', homogenous => 1, children => [ - 0, my $spinner_h = Gtk3::SpinButton->new($adjh, 0, 0), - 0, my $spinner_m = Gtk3::SpinButton->new($adjm, 0, 0), - 0, my $spinner_s = Gtk3::SpinButton->new($adjs, 0, 0), - ]), - 1, gtknew('Frame', text => N("Timezone"), shadow_type => 'etched_in', child => - gtknew('VBox', border_width => 5, children_tight => [ - $label_timezone, - $button_time ])), - ]), - ]), - 0, create_okcancel(my $w = - { - cancel_clicked => sub { ugtk3->exit(0) }, - ok_clicked => sub { - my $need_date = 1; - any::disable_x_screensaver(); - if ($check_ntp->get_active) { - my $choosed_serv = $combo_ntpserver->entry->get_text; - $choosed_serv =~ s/^[^:]+: (.+)/$1/; - if (!$choosed_serv) { - err_dialog(N("Error"), N("Please enter a valid NTP server address.")); - return; - } - timezone::set_ntp_server($choosed_serv); - system('systemctl', 'enable', "$ntpd.service"); - system('systemctl', 'stop', "$ntpd.service"); - #verify that we have a valid hostname (thx sam) - $choosed_serv =~ s/[^-a-zA-Z0-9.]//g; - my $sync_ok; - if ($ntpd eq "chronyd") { - system('systemctl', 'start', "$ntpd.service"); - # Wait up to 30s for sync - $sync_ok = !system('chronyc', 'waitsync', '30', '0.1'); - system('systemctl', 'stop', "$ntpd.service") if (!$sync_ok); - } else { - $sync_ok = !system('/usr/sbin/ntpdate', $choosed_serv); - system('systemctl', 'start', "$ntpd.service") if ($sync_ok); - } - if ($sync_ok) { - update_time(); #- get the new time before updating the hwclock - $need_date = 0; - } else { - $in->ask_from_no_check({ - title => N("Error"), - messages => N("Could not synchronize with %s.", $choosed_serv), - ok => N("Quit"), - cancel => N("Retry"), - }, []) or return; - } - } else { - if (is_ntp_daemon_running()) { - system('systemctl', 'stop', "$ntpd.service"); - system('systemctl', 'disable', "$ntpd.service"); - } - } - if ($need_date) { - my ($year, $month, $day) = $calendar->get_date; - $month++; - my ($hour, $min, $sec) = ($adjh->get_value, $adjm->get_value, $adjs->get_value); - system("date " . - join('', map { print_it0($_) } ($month, $day, $hour, $min, $year)) . '.' . print_it0($sec)); - } - -e '/sbin/hwclock' and system('/sbin/hwclock', '--systohc'); - any::enable_x_screensaver(); - system(qw(dcop kicker Panel restart)) if $ENV{DESKTOP} eq 'kde'; - ugtk3->exit(0); - }, - }, - undef, undef, '', - [ N("Reset"), sub { - $its_reset = 1; - $timer = Glib::Timeout->add(120, \&update_time); - Repaint($drawing_area, 1); - $button_reset->set_sensitive(0); - $its_reset = 0; - } ] - ), - ]) - ); +$my_win->{window}->add( + gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, children => [ + 1, gtknew('HBox', children => [ + 1, gtknew('VBox', children => [ + 0, $calendar, + 1, gtknew('Frame', text => N("Network Time Protocol"), shadow_type => 'etched_in', child => + gtknew('VBox', border_width => 5, children => [ + 0, gtknew('Label', text => N("Your computer can synchronize its clock\n with a remote time server using NTP")), + 0, gtksignal_connect(gtkset_active($check_ntp = gtknew('CheckButton', text => N("Enable Network Time Protocol")), $mode), clicked => sub { + $mode = !$mode; + $hb_ntp->set_sensitive($mode); + if ($mode == 1 && !$in->do_pkgs->is_installed('ntp') && !$in->do_pkgs->is_installed('chrony')) { + install_ntp(); + } + }), + 0, $hb_ntp = gtknew('HBox', border_width => 5, children => [ + 0, gtknew('Label', text => N("Server:")), + 1, $combo_ntpserver = Gtk3::ComboBoxText->new + ]) + ])) + ]), + 0, gtknew('VBox', children => [ + 0, gtknew('HBox', children => [ + 0, $drawing_area = gtkset_size_request(Gtk3::DrawingArea->new, @image_size), + ]), + 0, my $time_box = gtknew('HBox', homogenous => 1, children => [ + 0, my $spinner_h = Gtk3::SpinButton->new($adjh, 0, 0), + 0, my $spinner_m = Gtk3::SpinButton->new($adjm, 0, 0), + 0, my $spinner_s = Gtk3::SpinButton->new($adjs, 0, 0), + ]), + 1, gtknew('Frame', text => N("Timezone"), shadow_type => 'etched_in', child => + gtknew('VBox', border_width => 5, children_tight => [ + $label_timezone, + $button_time ])), + ]), + ]), + 0, create_okcancel( + my $w = + { + cancel_clicked => sub { ugtk3->exit(0) }, + ok_clicked => sub { + my $need_date = 1; + any::disable_x_screensaver(); + if ($check_ntp->get_active) { + my $choosed_serv = $combo_ntpserver->entry->get_text; + $choosed_serv =~ s/^[^:]+: (.+)/$1/; + if (!$choosed_serv) { + err_dialog(N("Error"), N("Please enter a valid NTP server address.")); + return; + } + timezone::set_ntp_server($choosed_serv); + system('systemctl', 'enable', "$ntpd.service"); + system('systemctl', 'stop', "$ntpd.service"); + #verify that we have a valid hostname (thx sam) + $choosed_serv =~ s/[^-a-zA-Z0-9.]//g; + my $sync_ok; + if ($ntpd eq "chronyd") { + system('systemctl', 'start', "$ntpd.service"); + # Wait up to 30s for sync + $sync_ok = !system('chronyc', 'waitsync', '30', '0.1'); + system('systemctl', 'stop', "$ntpd.service") if (!$sync_ok); + } else { + $sync_ok = !system('/usr/sbin/ntpdate', $choosed_serv); + system('systemctl', 'start', "$ntpd.service") if ($sync_ok); + } + if ($sync_ok) { + update_time(); #- get the new time before updating the hwclock + $need_date = 0; + } else { + $in->ask_from_no_check({ + title => N("Error"), + messages => N("Could not synchronize with %s.", $choosed_serv), + ok => N("Quit"), + cancel => N("Retry"), + }, []) or return; + } + } else { + if (is_ntp_daemon_running()) { + system('systemctl', 'stop', "$ntpd.service"); + system('systemctl', 'disable', "$ntpd.service"); + } + } + if ($need_date) { + my ($year, $month, $day) = $calendar->get_date; + $month++; + my ($hour, $min, $sec) = ($adjh->get_value, $adjm->get_value, $adjs->get_value); + system("date " . + join('', map { print_it0($_) } ($month, $day, $hour, $min, $year)) . '.' . print_it0($sec)); + } + -e '/sbin/hwclock' and system('/sbin/hwclock', '--systohc'); + any::enable_x_screensaver(); + system(qw(dcop kicker Panel restart)) if $ENV{DESKTOP} eq 'kde'; + ugtk3->exit(0); + }, + }, + undef, undef, '', + [ N("Reset"), sub { + $its_reset = 1; + $timer = Glib::Timeout->add(120, \&update_time); + Repaint($drawing_area, 1); + $button_reset->set_sensitive(0); + $its_reset = 0; + } ] + ), + ]) + ); $button_reset = $w->{buttons}{N("Reset")}; $time_box->set_direction('ltr'); -- cgit v1.2.1 From 9f610b4bf578c2600c094a9d0e91f1f2d39c74d8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Nov 2013 17:36:18 +0100 Subject: perl_checker cleanups --- perl-install/standalone/drakclock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock index 0c8cc47ee..7b64ed508 100755 --- a/perl-install/standalone/drakclock +++ b/perl-install/standalone/drakclock @@ -126,10 +126,10 @@ $my_win->{window}->add( system('systemctl', 'start', "$ntpd.service"); # Wait up to 30s for sync $sync_ok = !system('chronyc', 'waitsync', '30', '0.1'); - system('systemctl', 'stop', "$ntpd.service") if (!$sync_ok); + system('systemctl', 'stop', "$ntpd.service") if !$sync_ok; } else { $sync_ok = !system('/usr/sbin/ntpdate', $choosed_serv); - system('systemctl', 'start', "$ntpd.service") if ($sync_ok); + system('systemctl', 'start', "$ntpd.service") if $sync_ok; } if ($sync_ok) { update_time(); #- get the new time before updating the hwclock -- cgit v1.2.1 From 6ce787c7633bee44459624ddc0dc079eaee91a10 Mon Sep 17 00:00:00 2001 From: tarakbumba Date: Thu, 28 Nov 2013 20:16:19 +0200 Subject: Updated Turkish translation --- perl-install/install/help/po/tr.po | 277 ++++++++++++++++++++----------------- 1 file changed, 153 insertions(+), 124 deletions(-) diff --git a/perl-install/install/help/po/tr.po b/perl-install/install/help/po/tr.po index d8c07201d..e7b24faea 100644 --- a/perl-install/install/help/po/tr.po +++ b/perl-install/install/help/po/tr.po @@ -2,30 +2,30 @@ # Copyright (C) 2000,2003 Free Software Foundation, Inc. # Copyright (c) 2000 Mandriva # ############################################ -# # Ömer Fadıl USTA , 1999-2003. # Tuncay YENİAY ,2002. # Nazmi Savga ,2001. # Durmuş Celep ,2002. # Erçin EKER , 2003. -# # ############################################# -# +# Atilla ÖNTAŞ , 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 \n" -"Language-Team: Turkish \n" +"PO-Revision-Date: 2013-11-28 20:15+0300\n" +"Last-Translator: Atilla ÖNTAŞ \n" +"Language-Team: Mageia Turkish Translation Team \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Virtaal 0.7.1\n" #: ../help.pm:14 -#, fuzzy, c-format +#, c-format msgid "" "Before continuing, you should carefully read the terms of the license. It\n" "covers the entire Mageia distribution. If you agree with all the\n" @@ -33,13 +33,12 @@ msgid "" "button will reboot your computer." msgstr "" "Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n" -"Mageia dağıtımını kapsar, bu koşullarını tamamını kabul " -"ediyorsanız,\n" +"Mageia dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n" "\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n" "makinenizi yeniden başlatabilirsiniz." #: ../help.pm:20 -#, fuzzy, c-format +#, c-format msgid "" "GNU/Linux is a multi-user system which means each user can have his or her\n" "own preferences, own files and so on. But unlike \"root\", who is the\n" @@ -78,49 +77,62 @@ msgid "" "security), choose the desired user and window manager, then click on\n" "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box." msgstr "" -"GNU/Linux çok kullanıcılı bir sistemdir, yani her kullanıcının kendi\n" -"tercihleri, kendi dosyaları, v.s. olabilir. Daha fazla bilgi edinmek için\n" -"\"Kullanıcı Kılavuzu\"nu okuyunuz. Sistem Yöneticisi olan \"root\" dışındaki " -"kullanıcılar kendi dosyaları ve yapılandırmaları dışında hiçbir\n" -"şeyi değiştiremezler. Kendiniz için en az bir normal kullanıcı " -"oluşturmalısınız.\n" -"Bu hesabı sıradan işler için kullanacaksınız. Sisteminizi \"root\" olarak\n" -"kullanmak çok pratik gibi görünse de aslında çok tehlikelidir. En küçük bir\n" -"yanlışlık sisteminizin çalışmamasıyla sonuçlanabilir. Ama normal kullanıcı\n" -"olarak bir sürü yanlış da yapsanız sadece kendi bilgilerinize zarar vermiş\n" -"olursunuz, sisteminize zarar veremezsiniz.\n" -"\n" -"İl alan gerçek isminizi girmeniz içindir. Tabii ki sorunlu değildir, " -"herhangi bir\n" -"şey yazabilirsiniz. DrakX bu bölüme ilk girdiğiniz kelimeyi \"%s\" bölümüne\n" -"kopyalayacak ki bu sisteme giriş için kullanılacak kullanıcı adıdır. " -"İsterseniz\n" -"kullanıcı adını değiştirebilirsiniz. Sonra buraya bir parola gireceksiniz. " -"Bir\n" -"normal kullanıcının parolası \"root\" parolası kadar önemli değildir.\n" -"Fakat bu boş yada basit bir şifre kullanmak için bir gerekçe değildir,\n" -"sonuç olarak kişisel dosyalarınızı tehlikeye atmış olursunuz.\n" -"\n" -"\"%s\"e tıklayarak ile kullanıcı için öntanımlı \"kabuk\"u " -"değiştirebilirsiniz\n" -"(öntanımlı olan bash'dir).\n" -"\n" -"Kullanıcı eklemeyi tamamladıktan sonra, sistem açıldıktan sonra otomatik\n" -"giriş yapılacak kullanıcı sorulacaktır. Eğer bu konu ile ilgileniyorsanızı " -"(ve\n" -"yerel güvenliğe önem vermiyorsanız), istediğiniz kullanıcıyı ve pencere\n" -"yöneticisini seçin ve \"%s\"e tıklayın. Eğer bu konu ilginizi çekmiyorsa\n" -"\"%s\" seçimini kaldırın ve devam edin." +"GNU/Linux, her kullanıcının kendi ayarlarına, kendi dosyalarına v.b. sahip " +"olabileceği çok kullanıcılı bir\n" +"sistemdir. Sistem yöneticisi olan \"kök\" aksine bu noktada eklediğiniz " +"kullanıcılar kendi\n" +"dosyaları ve ve kendi yapılandırmaları haricinde herhangi bir şeyi " +"değiştirme yetkisine sahip\n" +"olmayacaklardır ki böylece bir bütün olarak sistem istenmeyen veya zararlı " +"değişikliklerden korunacaktır.\n" +"Kendiniz için en azından bir normal kullanıcı oluşturmak zorundasınız -- bu, " +"günlük olarak kullanacağınız\n" +"hesap olacaktır. Her ne kadar her şeyi yapabilmek için \"kök\" olarak oturum " +"açabilmeniz mümkünse de\n" +"bu işlem çok tehlikeli olabilir! Çok basit bir hata sisteminizin bir daha " +"işlememesine neden olabilir.\n" +"Normal bir kullanıcı olarak ciddi bir hata yaparsanız en kötü durumda biraz " +"veri kaybedersiniz;\n" +"ama bu, tüm sistemi etkilemeyecektir.\n" +"\n" +"İlk alan gerçek adınızı sorar. Elbette, bu zorunlu değildir -- ne isterseniz " +"onu yazabilirsiniz.\n" +"DrakX yazdığınız ilk sözcüğü alır ve \"%s\" olarak kopyalar. Bu, kullanıcının " +"oturum açarken\n" +"gireceği isimdir. İsterseniz öntanımlı olan kullanıcı ismini " +"değiştirebilirsiniz. Sonraki adım\n" +"bir parola girmektir. Güvenlik açısından, bir tam yetkilendirilmemiş " +"(normal) kullanıcı parolası\n" +"\"kök\" parolası kadar önemli değildir. Ancak, bunu boş geçmek veya çok basit " +"belirlemek için\n" +"bir neden yoktur: sonuçta, risk altına girebilecek olan kendi " +"dosyalarınızdır.\n" +"\n" +"\"%s\" üzerine tıkladığınızda, diğer kullanıcıları da ekleyebilirsiniz. " +"Arkadaşlarınız, babanız, kardeşiniz v.b.\n" +"her biri için bir kullanıcı ekleyin. Bitirdiğinizde \"%s\" üzerine tıklayın.\n" +"\n" +"\"%s\" düğmesine tıklamak o kullanıcı için öntanımlı \"kabuk\"u değiştirmenizi " +"sağlayacaktır.\n" +"(Öntanımılı olan bash kabuktur)\n" +"\n" +"Kullanıcıları eklemeyi bitirdiğinizde, bilgisayar başladığında kendiliğinden " +"oturum açacak kullanıcı\n" +"sorulacaktır. Bu özelliği kullanmak istiyorsanız (ve yerel güvenlik " +"endişeniz yoksa) istediğiniz\n" +"kullanıcıyı ve pencere yöneticisini seçin. Sonra \"%s\" üzerine tıklayın. Bu " +"özelliği kullanmak istemiyorsanız\n" +"\"%s\" kutusundaki işareti kaldırın." #: ../help.pm:54 #, c-format msgid "User name" -msgstr "" +msgstr "Kullanıcı adı" #: ../help.pm:54 #, c-format msgid "Accept user" -msgstr "" +msgstr "Kullanıcıyı kabul et" #: ../help.pm:54 #, c-format @@ -481,7 +493,7 @@ msgstr "" #: ../help.pm:213 #, c-format msgid "Hardware clock set to GMT" -msgstr "" +msgstr "Donanım saati GMT olarak ayarla" #: ../help.pm:213 #, c-format @@ -571,6 +583,12 @@ msgid "" "monitor connected to your machine. If it is not correct, you can choose\n" "from this list the monitor which is connected to your computer." msgstr "" +"Monitör\n" +"\n" +" Normalde kurulum aracı makinenize bağlı olan monitörü kendiliğinden " +"algılar ve yapılandırır.\n" +"Doğru ayarlama yapılmamışsa, bilgisayarınıza bağlı olan monitörü bu listeden " +"seçebilirsiniz." #: ../help.pm:298 #, c-format @@ -582,6 +600,13 @@ msgid "" "able to make changes after the installation). A sample of the chosen\n" "configuration is shown in the monitor picture." msgstr "" +"Çözünürlük\n" +"\n" +" Burada ekran kartınız için uygun olan çözünürlükleri ve renk " +"derinliklerini seçebilirsiniz. İhtiyacınıza\n" +"en uygun olanını seçin (kurulum sonrasında değişiklik yapabilirsiniz). " +"Seçilen yapılandırma\n" +"örneği monitör resminde görüntülenir." #: ../help.pm:306 #, c-format @@ -590,9 +615,12 @@ msgid "" "or without 3D acceleration, you're asked to choose the server which best\n" "suits your needs." msgstr "" +"Ekran kartınız için farklı sunucuların mümkün olduğu durumlarda, 3B " +"hızlandırma etkin veya devredışı,\n" +"ihtiyaçlarınıza en uygun sunucuyu seçmeniz istenir." #: ../help.pm:311 -#, fuzzy, c-format +#, c-format msgid "" "Options\n" "\n" @@ -601,15 +629,16 @@ msgid "" "want to check \"%s\" if your machine is to act as a server, or if you were\n" "not successful in getting the display configured." msgstr "" -"Son olarak açılış sırasında grafik arayüzle başlamak isteyip istemediğiniz\n" -"sorulacaktır. Yapılandırmanızı denemeyi seçmemiş bile olsanız bu soru yine " -"de\n" -"sorulacaktır. Ekranınızı iyi yapılandıramamışsanız ya da makinanızın bir\n" -"sunucu rolü üstlenmesini seçmişseniz bu soruya \"Hayır\" cevabı vermeniz\n" -"önerilir." +"Seçenekler\n" +"\n" +" Bu adımlar önyüklemede makinenizin grafiksel arayüze kendiliğinden " +"geçmesini isteyip istemediğinizi\n" +"seçmenizi sağlar. Elbette, makineniz bir sunucu olarak çalışacaksa veya " +"görüntü almayı başaramadıysanız\n" +"\"%s\" seçeneğini işaretleyebilirsiniz." #: ../help.pm:319 -#, fuzzy, c-format +#, c-format msgid "" "You now need to decide where you want to install the Mageia\n" "operating system on your hard disk drive. If your hard disk drive is empty or if an\n" @@ -672,69 +701,73 @@ msgid "" "experience. For more instructions on how to use the DiskDrake utility,\n" "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''." msgstr "" -"Bu noktada, Mageia işletim sisteminizi sabit diskinizde\n" -"nereye kuracağınızı seçmeniz gerekiyor. Diskiniz boşsa, ya da\n" -"halihazırda bir işletim sistemi diskin tamamını kullanıyorsa\n" -"diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski\n" -"bölümlendirmek, Mageia sistemini kurabilmek için onu\n" -"mantıksal olarak bölmek ve böylece boş alan oluşturmak anlamına\n" +"Bu noktada, Mageia işletim sisteminizi sabit diskinizde nereye kuracağınızı " +"seçmeniz\n" +"gerekiyor. Diskiniz boşsa, ya da halihazırda bir işletim sistemi diskin " +"tamamını kullanıyorsa\n" +"diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski " +"bölümlendirmek, Mageia sistemini\n" +"kurabilmek için onu mantıksal olarak bölmek ve böylece boş alan oluşturmak " +"anlamına\n" "gelir.\n" "\n" -"Bölümlendirme işlemi gerellikle geri alınamaz ve zaten kurulu bir\n" -"işletim sisteminiz var ise bilgi kaybına yol açabilir. Bu işlem, eğer\n" -"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mageia,\n" -"bu işlemi oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan\n" -"önce lütfen aşağıdaki okumak için zaman ayrın.\n" +"Bölümlendirme işlemi genellikle geri alınamaz ve zaten kurulu bir işletim " +"sisteminiz var ise bilgi kaybına yol\n" +"açabilir. Bu işlem, eğer tecrübesizseniz, korkutucu ve stresli bir iş " +"olabilir. Şansınıza, DrakX bu işlemi\n" +"oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan önce lütfen " +"aşağıdaki okumak için zaman ayrın.\n" "\n" -"Sabit disk yapınıza bağlı olarak, birkaç seçenek mevcut: \n" +"Sabit disk yapınıza bağlı olarak, birkaç seçenek mevcuttur: \n" "\n" -" * \"%s\": bu seçenek boş sabit disk(ler)iniz üzerinde otomatik " -"bölümlendirme\n" -"gerçeklerştirir. Bu seçeneği seçerseniz konu hakkında soru sorulmayacak\n" +" * \"%s\": Bu seçenek boş sabit disk(ler)iniz üzerinde otomatik bölümlendirme " +"gerçekleştirir. Bu seçeneği\n" +"seçerseniz konu hakkında soru sorulmayacaktır.\n" "\n" -" * \"%s\" sihirbaz sabit diskiniz üstünde bir ya da daha fazla Linux bölümü\n" -"buldu. Eğer bunları kullanmak istiyorsanız bu seçeneği kullanın. Sonra ki\n" -"adımda bu bölümler ile ilişkili bağlama noktaları seçmeniz istenecek.\n" +" * \"%s\": Sihirbaz sabit diskiniz üstünde bir ya da daha fazla Linux bölümü " +"buldu. Bunları kullanmak istiyorsanız\n" +"bu seçeneği kullanın. Sonraki adımda bu bölümler ile ilişkili bağlama " +"noktaları seçmeniz istenecektir.\n" "Bağlama noktaları öntanımlı olarak seçilir ve genellikle olduğu gibi " -"bırakmak\n" -"en iyisidir.\n" -"\n" -" * \"%s\": eğer sisteminizde Microsoft Windows kurulu ve tük disk " -"kapasitesini\n" -"kullanıyorsa Linux'un kullanabilmesi için yer açmanız gerekecektir. Bunun " -"için,\n" -"Microsoft Window disk bölümünü ve bilgileri silebilir (``Tüm Diski Sil''e " -"bakın)\n" -"yada Microsoft Windows FAT bölümünüzü yeniden boyutlandırabilirsiniz. Bu\n" -"işlem sırasında eğer Windows bölümünüzü birleştirmiş ve biçimi FAT ise\n" -"herhangi bir veri kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle " -"önerilir.\n" -"Eğer aynı bilgisayarda hem Mageia hem de Windows kullanamk\n" -"istiyorsanız bu seçeneği seçmeniz önerilir.\n" -"\n" -" Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft\n" -"Windows disk bölümünüz küçülmüş olacak. Yeni yazılımları yüklemek ya da " -"kişisel\n" -"verilerinizi saklamak için Microsoft Windows altında daha az boş alanınız " -"olacak.\n" -"\n" -" * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir " -"Mageia\n" -"kurulumu yapmak için bu seçeneği seçin. Lütfen bu seçeneği kullanırken " -"dikkatli\n" -"olun, çünkü onayladıktan sonra geri alma şansınız bulunmuyor.\n" -"\n" -" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi " -"silinecektir. !!\n" -"\n" -" * \"%s\": Bu seçenek tüm sabit diski silecek ve disk bölümlerini baştan " -"oluşturacak.\n" -"Diskinizdeki tüm bilgiler silinecektir.\n" -"\n" -" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgileri " -"kaybedeceksiniz. !!\n" -"\n" -" * \"%s\": Sabit diskinizi kendiniz bölümlendirmek istiyorsanız bu seçeneği " +"bırakmak en iyisidir.\n" +"\n" +" * \"%s\": Sisteminizde Microsoft Windows kurulu ve tüm disk alanını " +"kullanıyorsa GNU/Linux 'un\n" +"kullanabilmesi için yer açmanız gerekecektir. Bunun için, Microsoft Window " +"disk bölümünü ve bilgilerini\n" +"tümüyle silebilir (``Tüm Diski Sil''e bakın) ya da Microsoft Windows FAT " +"veya NTFS bölümünüzü yeniden\n" +"boyutlandırabilirsiniz. Bu işlem sırasında eğer Windows bölümünüzü " +"birleştirmişseniz herhangi bir veri\n" +"kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle önerilir. Aynı " +"bilgisayarda hem Mageia hem de\n" +"Windows kullanmak istiyorsanız bu seçeneği seçmeniz önerilir.\n" +"\n" +" Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft " +"Windows\n" +"disk bölümünüz küçülmüş olacak. Yeni yazılımları yüklemek ya da kişisel " +"verilerinizi saklamak için\n" +"Microsoft Windows altında daha az boş alanınız olacaktır.\n" +"\n" +" * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir Mageia " +"kurulumu yapmak için\n" +"bu seçeneği seçin. Lütfen bu seçeneği kullanırken dikkatli olun, çünkü " +"onayladıktan sonra geri alma\n" +"şansınız bulunmuyor.\n" +"\n" +" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi silinecektir. " +"!!\n" +"\n" +" * \"%s\": Bu seçenek tüm sabit disk alanı Microsoft Windows tarafından " +"alınmışsa görüntülenir.\n" +"Bu seçeneği seçmek basitçe disk üzerindeki herşeyi silecek ve en baştan yeni " +"bir bölümlendirme\n" +"oluşturacaktır.\n" +"\n" +" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi silinecektir. " +"!!\n" +"\n" +"* \"%s\": Sabit diskinizi kendiniz bölümlendirmek istiyorsanız bu seçeneği " "seçin.\n" "Dikkati olun -- oldukça güçlü bir seçenektir ama veri kaybetmek oldukça " "kolaydır.\n" @@ -754,7 +787,7 @@ msgstr "Geçerli bölümlendirmeyi kullan" #: ../help.pm:370 #, c-format msgid "Use the free space on the Microsoft Windows® partition" -msgstr "" +msgstr "Microsoft Windows® bölümündeki boş alan kullanılsın" #: ../help.pm:370 #, c-format @@ -799,8 +832,7 @@ msgid "" "/dev/fd0\"." msgstr "" "Buraya kadar geldiyseniz kurulum tamamlanmış ve GNU/Linux sisteminizi\n" -"kullanmaya hazırsınız demektir. \"TAMAM\" düğmesine tıkladığınızda " -"sisteminiz\n" +"kullanmaya hazırsınız demektir. \"TAMAM\" düğmesine tıkladığınızda sisteminiz\n" "yeniden başlatılacaktır. Hem Windows hem de GNU/Linux kullanımını " "seçtiyseniz\n" "makinanızın her açılışında bu sistemlerden biri için tercihinizi\n" @@ -809,16 +841,14 @@ msgstr "" "\"Gelişmiş\" düğmesine (Uzman kipinde görünür) tıkladığınızda size iki\n" "seçenek sunulacaktır:\n" "\n" -" * \"Otomatik kurulum disketi oluşturulsun\": yaptığınız kuruluma benzer " -"bir\n" +" * \"Otomatik kurulum disketi oluşturulsun\": yaptığınız kuruluma benzer bir\n" " kurulumu herhangi bir yardım gerekmeksizin otomatik olarak " "yapılabilmesini\n" " sağlayacak bir kurulum disketi oluşturabilirsiniz.\n" "\n" " Bu seçeneği kullanmaya karar verdiğinizde size iki seçenek sunulacaktır:\n" "\n" -" * \"Etkileşimli\": bu sadece disk bölümlemesinin etkileşimli olduğu " -"yarı\n" +" * \"Etkileşimli\": bu sadece disk bölümlemesinin etkileşimli olduğu yarı\n" " otomatik kurulumdur.\n" "\n" " * \"Otomatik\": sabit diskin tamamen silinip yeniden yazılması\n" @@ -831,8 +861,7 @@ msgstr "" " * \"Paket seçim listesini kaydet\"(*): kurulum sırasında seçtiğiniz\n" " paketlerin listesi kaydedilir. Bir başka kurulum sırasında disketi\n" " sürücüye yerleştirdikten sonra [F1] tuşuna bastıktan sonra\n" -" »linux defcfg=\"floppy\"« yazarak kurulumu yardım ekranına kadar " -"ilerletin\n" +" »linux defcfg=\"floppy\"« yazarak kurulumu yardım ekranına kadar ilerletin\n" "\n" " (*) Bu seçenek için FAT biçemli bir diskete ihtiyacınız olacak. Bu " "disketi\n" @@ -1661,9 +1690,9 @@ msgid "" msgstr "" #: ../help.pm:809 -#, fuzzy, c-format +#, c-format msgid "TV card" -msgstr "ISDN kartı" +msgstr "TV kartı" #: ../help.pm:809 #, c-format @@ -1676,7 +1705,7 @@ msgid "Graphical Interface" msgstr "Grafiksel Arabirim" #: ../help.pm:861 -#, fuzzy, c-format +#, c-format msgid "" "Choose the hard disk drive you want to erase in order to install your new\n" "Mageia partition. Be careful, all data on this drive will be lost\n" @@ -1687,7 +1716,7 @@ msgstr "" "mümkün olmayacağını unutmayın!" #: ../help.pm:866 -#, fuzzy, c-format +#, c-format msgid "" "Click on \"%s\" if you want to delete all data and partitions present on\n" "this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n" -- cgit v1.2.1 From 6a2944da4c056d5f65909c7ce674de0e03cd85e4 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 29 Nov 2013 08:12:49 +0200 Subject: Chinese Traditional update by You-Cheng Hsieh --- perl-install/standalone/po/zh_TW.po | 367 +++++++++++------------------------- 1 file changed, 112 insertions(+), 255 deletions(-) diff --git a/perl-install/standalone/po/zh_TW.po b/perl-install/standalone/po/zh_TW.po index ed73d116f..4a58fa892 100644 --- a/perl-install/standalone/po/zh_TW.po +++ b/perl-install/standalone/po/zh_TW.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# +# +# Translators: +# You-Cheng Hsieh , 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_standalone\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-15 09:55+0800\n" +"PO-Revision-Date: 2013-11-29 02:50+0000\n" "Last-Translator: You-Cheng Hsieh \n" -"Language-Team: Traditional Chinese \n" -"Language: zh_TW\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -82,9 +82,7 @@ msgstr "警告" msgid "" "Your system bootloader is not in framebuffer mode. To activate graphical " "boot, select a graphic video mode from the bootloader configuration tool." -msgstr "" -"您的系統開機管理程式並未使用 framebuffer 模式。要啟用圖形開機,請從開機管理程" -"式設定工具選擇一種圖形顯示模式。" +msgstr "您的系統開機管理程式並未使用 framebuffer 模式。要啟用圖形開機,請從開機管理程式設定工具選擇一種圖形顯示模式。" #: drakboot:138 #, c-format @@ -154,12 +152,9 @@ msgstr "顯示模式" #: drakboot:266 #, c-format msgid "" -"Please choose a video mode, it will be applied to each of the boot entries " -"selected below.\n" +"Please choose a video mode, it will be applied to each of the boot entries selected below.\n" "Be sure your video card supports the mode you choose." -msgstr "" -"請選擇顯示模式,它將被用在下列選擇的每一個的開機項目。\n" -"請確定您的顯示卡支援您選擇的模式。" +msgstr "請選擇顯示模式,它將被用在下列選擇的每一個的開機項目。\n請確定您的顯示卡支援您選擇的模式。" #: drakbug:52 drakbug:140 #, c-format @@ -233,9 +228,7 @@ msgstr "請選擇 %s 工具:" msgid "" "or Application Name\n" "(or Full Path):" -msgstr "" -"或應用程式名稱\n" -"(或完整路徑):" +msgstr "或應用程式名稱\n(或完整路徑):" #: drakbug:103 #, c-format @@ -271,18 +264,14 @@ msgstr "使用的主題:%s" #, c-format msgid "" "To submit a bug report, click on the report button. \n" -"This will open a web browser window on %s where you'll find a form to fill " -"in. The information displayed above will be transferred to that server" -msgstr "" -"要回報臭蟲問題,請點選回報的按鈕。\n" -" 這將會在 %s 開啟瀏覽器,並有一表格可填入。以上顯示的資訊將會被傳送到該伺服" -"器。" +"This will open a web browser window on %s where you'll find a form to fill in. The information displayed above will be transferred to that server" +msgstr "要回報臭蟲問題,請點選回報的按鈕。\n 這將會在 %s 開啟瀏覽器,並有一表格可填入。以上顯示的資訊將會被傳送到該伺服器。" #: drakbug:148 #, c-format msgid "" -"It would be very useful to attach to your report the output of the following " -"command: %s." +"It would be very useful to attach to your report the output of the following" +" command: %s." msgid_plural "" "Things useful to attach to your report are the output of the following " "commands: %s." @@ -323,9 +312,7 @@ msgstr "套件尚未安裝" msgid "" "You must type in what you were doing when this bug happened in order to " "enable us to reproduce this bug and to increase the odds of fixing it" -msgstr "" -"您必須輸入當這個臭蟲發生的時候您正在作什麼,以讓我們能夠重現這隻臭蟲並增進它" -"被修正的機會" +msgstr "您必須輸入當這個臭蟲發生的時候您正在作什麼,以讓我們能夠重現這隻臭蟲並增進它被修正的機會" #: drakbug:252 #, c-format @@ -377,9 +364,7 @@ msgstr "網路時間協定" msgid "" "Your computer can synchronize its clock\n" " with a remote time server using NTP" -msgstr "" -"您的電腦可以利用 NTP 將它的時鐘與一個遠端的時間\n" -"伺服器同步" +msgstr "您的電腦可以利用 NTP 將它的時鐘與一個遠端的時間\n伺服器同步" #: drakclock:77 #, c-format @@ -495,9 +480,7 @@ msgid "" "X11 Display Manager allows you to graphically log\n" "into your system with the X Window System running and supports running\n" "several different X sessions on your local machine at the same time." -msgstr "" -"X11 顯示管理程式讓您從圖形介面登入已經執行 X Window 系統的電腦\n" -"並且支援同時在您的本地端主機上執行數個不同的 X 作業階段。" +msgstr "X11 顯示管理程式讓您從圖形介面登入已經執行 X Window 系統的電腦\n並且支援同時在您的本地端主機上執行數個不同的 X 作業階段。" #: drakedm:74 #, c-format @@ -509,9 +492,7 @@ msgstr "改變完成,您要重新啟動 dm 服務嗎?" msgid "" "You are going to close all running programs and lose your current session. " "Are you really sure that you want to restart the dm service?" -msgstr "" -"您將要關閉所有執行中的程式並結束目前的工作階段。您真的確定要重新啟動 dm 服務" -"嗎?" +msgstr "您將要關閉所有執行中的程式並結束目前的工作階段。您真的確定要重新啟動 dm 服務嗎?" #: drakfont:187 #, c-format @@ -607,16 +588,10 @@ msgstr "不刪除字型檔" #: drakfont:440 #, c-format msgid "" -"Before installing any fonts, be sure that you have the right to use and " -"install them on your system.\n" +"Before installing any fonts, be sure that you have the right to use and install them on your system.\n" "\n" -"You can install the fonts the normal way. In rare cases, bogus fonts may " -"hang up your X Server." -msgstr "" -"安裝任何字型前,請確認您有權限能夠安裝與使用。\n" -"\n" -"您仍然可以用正常方式安裝字型。在極端情況下,不正確的字型\n" -"可能會使您的 X 伺服器中止或失去回應。" +"You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server." +msgstr "安裝任何字型前,請確認您有權限能夠安裝與使用。\n\n您仍然可以用正常方式安裝字型。在極端情況下,不正確的字型\n可能會使您的 X 伺服器中止或失去回應。" #: drakfont:479 #, c-format @@ -673,14 +648,14 @@ msgstr "Copyright (C) %s by %s" msgid "Font installer." msgstr "字型安裝程式" -#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") -#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith ") +#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith +#. ") +#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith +#. ") #: drakfont:533 harddrake2:242 #, c-format msgid "_: Translator(s) name(s) & email(s)\n" -msgstr "" -"Shiva Huang \n" -"You-Cheng Hsieh \n" +msgstr "Shiva Huang \nYou-Cheng Hsieh \n" #: drakfont:543 #, c-format @@ -818,17 +793,10 @@ msgid "" " drakhelp 0.1\n" "Copyright (C) %s Mandriva.\n" "Copyright (C) %s Mageia.\n" -"This is free software and may be redistributed under the terms of the GNU " -"GPL.\n" +"This is free software and may be redistributed under the terms of the GNU GPL.\n" "\n" "Usage: \n" -msgstr "" -" drakhelp 0.1\n" -"Copyright (C) %s Mandriva.\n" -"Copyright (C) %s Mageia.\n" -"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n" -"\n" -"用法:\n" +msgstr " drakhelp 0.1\nCopyright (C) %s Mandriva.\nCopyright (C) %s Mageia.\n這是自由軟體並可於 GNU GPL 條款下重新散佈。\n\n用法:\n" #: drakhelp:23 #, c-format @@ -916,21 +884,16 @@ msgstr "編輯目前的規則" #: drakperm:110 #, c-format msgid "" -"Here you can see files to use in order to fix permissions, owners, and " -"groups via msec.\n" +"Here you can see files to use in order to fix permissions, owners, and groups via msec.\n" "You can also edit your own rules which will overwrite the default rules." -msgstr "" -"這裡讓您可以藉由 msec 檢視以及修改重要檔案的權限、擁有者、群組等資訊。\n" -"另外您也可以編輯自訂的規則以取代預設的項目。" +msgstr "這裡讓您可以藉由 msec 檢視以及修改重要檔案的權限、擁有者、群組等資訊。\n另外您也可以編輯自訂的規則以取代預設的項目。" #: drakperm:112 #, c-format msgid "" "The current security level is %s.\n" "Select permissions to see/edit" -msgstr "" -"目前的安全性層級是 %s。\n" -"請選擇要檢視/編輯的權限" +msgstr "目前的安全性層級是 %s。\n請選擇要檢視/編輯的權限" #: drakperm:124 #, c-format @@ -1045,9 +1008,7 @@ msgstr "Sticky-Bit" msgid "" "Used for directory:\n" " only owner of directory or file in this directory can delete it" -msgstr "" -"使用於目錄:\n" -" 只有該檔案或目錄的擁有者才可以刪除它" +msgstr "使用於目錄:\n 只有該檔案或目錄的擁有者才可以刪除它" #: drakperm:272 #, c-format @@ -1104,9 +1065,7 @@ msgstr "特性" msgid "" "The first character of the path must be a slash (\"/\"):\n" "\"%s\"" -msgstr "" -"路徑的第一個字母必須是斜線(\"/\"):\n" -"\"%s\"" +msgstr "路徑的第一個字母必須是斜線(\"/\"):\n\"%s\"" #: drakperm:386 #, c-format @@ -1298,7 +1257,8 @@ msgstr "開機" msgid "No Sound Card detected!" msgstr "偵測不到系統有任何音效裝置!" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: draksound:51 #, c-format msgid "" @@ -1312,14 +1272,8 @@ msgid "" "\n" "\n" "\n" -"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or " -"the sndconfig program. Just type \"alsaconf\" or \"sndconfig\" in a console." -msgstr "" -"\n" -"\n" -"\n" -"請注意:若您使用的是 ISA PnP 音效卡的話,您需要使用 alsaconf 或 sndconfig 程" -"式來設定。請在終端機中輸入 \"alsaconf\" 或 \"sndconfig\" 即可。" +"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program. Just type \"alsaconf\" or \"sndconfig\" in a console." +msgstr "\n\n\n請注意:若您使用的是 ISA PnP 音效卡的話,您需要使用 alsaconf 或 sndconfig 程式來設定。請在終端機中輸入 \"alsaconf\" 或 \"sndconfig\" 即可。" #: drakups:71 #, c-format @@ -1342,22 +1296,15 @@ msgid "" "Welcome to the UPS configuration utility.\n" "\n" "Here, you'll add a new UPS to your system.\n" -msgstr "" -"歡迎來到 UPS 設定工具。\n" -"\n" -"在這裡,您能夠為您的系統增加新的 UPS。\n" +msgstr "歡迎來到 UPS 設定工具。\n\n在這裡,您能夠為您的系統增加新的 UPS。\n" #: drakups:88 #, c-format msgid "" "We're going to add an UPS device.\n" "\n" -"Do you want to autodetect UPS devices connected to this machine or to " -"manually select them?" -msgstr "" -"現在將要新增一台 UPS 裝置。\n" -"\n" -"您要自動偵測連接到這台電腦的 UPS 裝置或自己手動選擇?" +"Do you want to autodetect UPS devices connected to this machine or to manually select them?" +msgstr "現在將要新增一台 UPS 裝置。\n\n您要自動偵測連接到這台電腦的 UPS 裝置或自己手動選擇?" #: drakups:91 #, c-format @@ -1404,9 +1351,7 @@ msgstr "製造廠商 / 型號:" msgid "" "We are configuring the \"%s\" UPS from \"%s\".\n" "Please fill in its name, its driver and its port." -msgstr "" -"我們正要設定位於 \"%2$s\" 的 UPS \"%1$s\"。\n" -"請輸入它的名稱、驅動程式以及通訊埠。" +msgstr "我們正要設定位於 \"%2$s\" 的 UPS \"%1$s\"。\n請輸入它的名稱、驅動程式以及通訊埠。" #: drakups:143 #, c-format @@ -1529,7 +1474,8 @@ msgstr "歡迎使用 UPS 設定工具" msgid "No TV Card detected!" msgstr "系統偵測不到任何電視卡!" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: drakxtv:69 #, c-format msgid "" @@ -1608,8 +1554,7 @@ msgstr "匯流排描述" msgid "" "- PCI and USB devices: this lists the vendor, device, subvendor and " "subdevice PCI/USB ids" -msgstr "" -"- PCI 與 USB 裝置:這列出了廠商名稱、裝置名稱、附屬廠商與 PCI/USB IDS 資訊" +msgstr "- PCI 與 USB 裝置:這列出了廠商名稱、裝置名稱、附屬廠商與 PCI/USB IDS 資訊" #: harddrake2:39 #, c-format @@ -1622,10 +1567,7 @@ msgid "" "- pci devices: this gives the PCI slot, device and function of this card\n" "- eide devices: the device is either a slave or a master device\n" "- scsi devices: the scsi bus and the scsi device ids" -msgstr "" -"- PCI 裝置 :包含 PCI 插曹, 介面卡裝置的功能\n" -"- EIDE 裝置:包含 Master 或者是 Slave 裝置項目\n" -"- SCSI 裝置:包含 SCSI 匯流排裝置與 SCSI 裝置的 IDS" +msgstr "- PCI 裝置 :包含 PCI 插曹, 介面卡裝置的功能\n- EIDE 裝置:包含 Master 或者是 Slave 裝置項目\n- SCSI 裝置:包含 SCSI 匯流排裝置與 SCSI 裝置的 IDS" #: harddrake2:43 #, c-format @@ -1859,9 +1801,7 @@ msgid "" "the GNU/Linux kernel needs to run a calculation loop at boot time to " "initialize a timer counter. Its result is stored as bogomips as a way to " "\"benchmark\" the cpu." -msgstr "" -"GNU/Linux 核心需要在啟動時執行一個計算迴圈來初始化計時器。它的結果會儲存為 " -"bogomips 來作為 \"benchmark\" 這顆 CPU 的方法。" +msgstr "GNU/Linux 核心需要在啟動時執行一個計算迴圈來初始化計時器。它的結果會儲存為 bogomips 來作為 \"benchmark\" 這顆 CPU 的方法。" #: harddrake2:75 #, c-format @@ -1904,9 +1844,7 @@ msgid "" "the CPU frequency in MHz (Megahertz which in first approximation may be " "coarsely assimilated to number of instructions the cpu is able to execute " "per second)" -msgstr "" -"CPU 的工作頻率,以 MHz 為單位 (百萬赫茲,一般而言近似於 CPU 每秒能夠處理的指" -"令數)" +msgstr "CPU 的工作頻率,以 MHz 為單位 (百萬赫茲,一般而言近似於 CPU 每秒能夠處理的指令數)" #: harddrake2:79 #, c-format @@ -2009,9 +1947,7 @@ msgid "" "the WP flag in the CR0 register of the cpu enforce write protection at the " "memory page level, thus enabling the processor to prevent unchecked kernel " "accesses to user memory (aka this is a bug guard)" -msgstr "" -"位於CPU 內 CR0 暫存器的 WP 旗標會強制在記憶體分頁層級作寫入保護,因此讓處理器" -"能夠避免沒有檢查的核心存取使用者記憶體 (亦即這是一個臭蟲守衛)" +msgstr "位於CPU 內 CR0 暫存器的 WP 旗標會強制在記憶體分頁層級作寫入保護,因此讓處理器能夠避免沒有檢查的核心存取使用者記憶體 (亦即這是一個臭蟲守衛)" #: harddrake2:97 #, c-format @@ -2056,13 +1992,9 @@ msgstr "邏輯單位號碼" #: harddrake2:104 #, c-format msgid "" -"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are " -"uniquely identified by a\n" +"the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are uniquely identified by a\n" "channel number, a target id and a logical unit number" -msgstr "" -"SCSI 邏輯單位號碼 (LUN)。連結到主機的 SCSI 裝置會藉由一個頻道號碼、目標 ID," -"以及邏輯單位號碼,\n" -"來達到單一識別。" +msgstr "SCSI 邏輯單位號碼 (LUN)。連結到主機的 SCSI 裝置會藉由一個頻道號碼、目標 ID,以及邏輯單位號碼,\n來達到單一識別。" #. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...) #: harddrake2:111 @@ -2252,9 +2184,7 @@ msgstr "Harddrake 說明" msgid "" "Description of the fields:\n" "\n" -msgstr "" -"欄位的描述資訊:\n" -"\n" +msgstr "欄位的描述資訊:\n\n" #: harddrake2:221 #, c-format @@ -2365,7 +2295,8 @@ msgstr "LocaleDrake" msgid "You should install the following packages: %s" msgstr "您應該安裝下列套件: %s" -#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit" +#. -PO: the following is used to combine packages names. eg: "initscripts, +#. harddrake, yudit" #: localedrake:49 #, c-format msgid ", " @@ -2590,10 +2521,7 @@ msgid "" "Welcome to the mail configuration utility.\n" "\n" "Here, you'll be able to set up the alert system.\n" -msgstr "" -"歡迎來到郵件設定工具。\n" -"\n" -"在這裡, 您能夠設定您的警示通知的方式。\n" +msgstr "歡迎來到郵件設定工具。\n\n在這裡, 您能夠設定您的警示通知的方式。\n" #: logdrake:417 #, c-format @@ -2662,11 +2590,9 @@ msgstr "\"%s\" 既不是有效的信箱也不是既有的本地使用者!" #: logdrake:453 #, c-format msgid "" -"\"%s\" is a local user, but you did not select a local smtp, so you must use " -"a complete email address!" -msgstr "" -"\"%s\" 是一位本地使用者,但您沒有選擇一個本地的 smtp,所以您必須使用完整的郵" -"件位址!" +"\"%s\" is a local user, but you did not select a local smtp, so you must use" +" a complete email address!" +msgstr "\"%s\" 是一位本地使用者,但您沒有選擇一個本地的 smtp,所以您必須使用完整的郵件位址!" #: logdrake:460 #, c-format @@ -2704,10 +2630,7 @@ msgid "" "SANE packages need to be installed to use scanners.\n" "\n" "Do you want to install the SANE packages?" -msgstr "" -"要使用掃描器需要安裝套件 SANE。\n" -"\n" -"您要安裝它嗎?" +msgstr "要使用掃描器需要安裝套件 SANE。\n\n您要安裝它嗎?" #: scannerdrake:53 #, c-format @@ -2803,8 +2726,8 @@ msgstr "掃描器軔體" #: scannerdrake:171 scannerdrake:223 #, c-format msgid "" -"It is possible that your %s needs its firmware to be uploaded everytime when " -"it is turned on." +"It is possible that your %s needs its firmware to be uploaded everytime when" +" it is turned on." msgstr "您的 %s 可能每次啟動時都需要下載它的韌體檔。" #: scannerdrake:172 scannerdrake:224 @@ -2824,9 +2747,7 @@ msgstr "要這樣作的話,請提供您掃描器的韌體檔以供安裝。" msgid "" "You find the file on the CD or floppy coming with the scanner, on the " "manufacturer's home page, or on your Windows partition." -msgstr "" -"您可以在隨著您掃描器附上的光碟或磁片、廠商的網頁、或者是您的 Windows 磁區上找" -"到這個檔案。" +msgstr "您可以在隨著您掃描器附上的光碟或磁片、廠商的網頁、或者是您的 Windows 磁區上找到這個檔案。" #: scannerdrake:176 scannerdrake:235 #, c-format @@ -2868,8 +2789,8 @@ msgstr "這可能是因為您的掃描器每次啟動時都需要下載它的韌 #: scannerdrake:226 #, c-format msgid "" -"To do so, you need to supply the firmware files for your scanners so that it " -"can be installed." +"To do so, you need to supply the firmware files for your scanners so that it" +" can be installed." msgstr "要這樣作的話,請提供您掃描器的韌體檔以供安裝。" #: scannerdrake:229 @@ -2908,11 +2829,8 @@ msgstr "不支援 %s" #, c-format msgid "" "The %s must be configured by system-config-printer.\n" -"You can launch system-config-printer from the %s Control Center in Hardware " -"section." -msgstr "" -"%s 必須由 system-config-printer 來設定。\n" -"您可以由 %s 控制中心的硬體項目中啟動 system-config-printer。" +"You can launch system-config-printer from the %s Control Center in Hardware section." +msgstr "%s 必須由 system-config-printer 來設定。\n您可以由 %s 控制中心的硬體項目中啟動 system-config-printer。" #: scannerdrake:318 #, c-format @@ -2959,29 +2877,22 @@ msgstr "注意!" msgid "" "Your %s cannot be configured fully automatically.\n" "\n" -"Manual adjustments are required. Please edit the configuration file /etc/" -"sane.d/%s.conf. " -msgstr "" -"您的 %s 無法完全自動設定。\n" -"\n" -"您需要手動調整設定。請編輯設定檔 /etc/sane.d/%s.conf。" +"Manual adjustments are required. Please edit the configuration file /etc/sane.d/%s.conf. " +msgstr "您的 %s 無法完全自動設定。\n\n您需要手動調整設定。請編輯設定檔 /etc/sane.d/%s.conf。" #: scannerdrake:405 scannerdrake:414 #, c-format msgid "" "More info in the driver's manual page. Run the command \"man sane-%s\" to " "read it." -msgstr "" -"驅動程式使用手冊中有更多的資訊。請執行如下指令 \"man sane-%s\" 來閱讀。" +msgstr "驅動程式使用手冊中有更多的資訊。請執行如下指令 \"man sane-%s\" 來閱讀。" #: scannerdrake:407 scannerdrake:416 #, c-format msgid "" -"After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/" -"Graphics in the applications menu." -msgstr "" -"之後您就可以使用應用程式選單的多媒體/圖形分類中的 \"XSane\" 或 \"%s\" 來掃描" -"文件。" +"After that you may scan documents using \"XSane\" or \"%s\" from " +"Multimedia/Graphics in the applications menu." +msgstr "之後您就可以使用應用程式選單的多媒體/圖形分類中的 \"XSane\" 或 \"%s\" 來掃描文件。" #: scannerdrake:411 #, c-format @@ -2995,8 +2906,7 @@ msgstr "您的 %s 已經設定完成,但是它可能需要經過額外的手 msgid "" "If it does not appear in the list of configured scanners in the main window " "of Scannerdrake or if it does not work correctly, " -msgstr "" -"如果它沒有出現在 Scannerdrake 主畫面已設定的掃描器清單中,或它並未正常運作," +msgstr "如果它沒有出現在 Scannerdrake 主畫面已設定的掃描器清單中,或它並未正常運作," #: scannerdrake:413 #, c-format @@ -3012,12 +2922,8 @@ msgstr "恭喜!" #, c-format msgid "" "Your %s has been configured.\n" -"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/" -"Graphics in the applications menu." -msgstr "" -"您的 %s 已經設定完成。\n" -"您現在可以立即使用應用程式選單的多媒體/圖形分類中的 \"XSane\" 或 \"%s\"來掃描" -"文件。" +"You may now scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu." +msgstr "您的 %s 已經設定完成。\n您現在可以立即使用應用程式選單的多媒體/圖形分類中的 \"XSane\" 或 \"%s\"來掃描文件。" #: scannerdrake:444 #, c-format @@ -3026,11 +2932,7 @@ msgid "" "\n" "%s\n" "are available on your system.\n" -msgstr "" -"下列掃描器\n" -"\n" -"%s\n" -"可以在您的系統上使用。\n" +msgstr "下列掃描器\n\n%s\n可以在您的系統上使用。\n" #: scannerdrake:445 #, c-format @@ -3039,11 +2941,7 @@ msgid "" "\n" "%s\n" "is available on your system.\n" -msgstr "" -"下列掃描器\n" -"\n" -"%s\n" -"可以在您的系統上使用。\n" +msgstr "下列掃描器\n\n%s\n可以在您的系統上使用。\n" #: scannerdrake:447 scannerdrake:450 #, c-format @@ -3093,11 +2991,9 @@ msgstr "掃描器分享" #: scannerdrake:594 #, c-format msgid "" -"Here you can choose whether the scanners connected to this machine should be " -"accessible by remote machines and by which remote machines." -msgstr "" -"您可以在這裡選擇連接到這部電腦的掃描器是否允許遠端電腦使用,以及允許那些電腦" -"使用。" +"Here you can choose whether the scanners connected to this machine should be" +" accessible by remote machines and by which remote machines." +msgstr "您可以在這裡選擇連接到這部電腦的掃描器是否允許遠端電腦使用,以及允許那些電腦使用。" #: scannerdrake:595 #, c-format @@ -3200,10 +3096,7 @@ msgid "" "saned needs to be installed to share the local scanner(s).\n" "\n" "Do you want to install the saned package?" -msgstr "" -"需要安裝 saned 套件以便分享本機掃描器。\n" -"\n" -"您要安裝 saned 套件嗎?" +msgstr "需要安裝 saned 套件以便分享本機掃描器。\n\n您要安裝 saned 套件嗎?" #: scannerdrake:956 scannerdrake:960 #, c-format @@ -3274,12 +3167,10 @@ msgstr "顯示卡驅動程式問題" #, c-format msgid "" "The display driver currently configured requires you to use the 'nokmsboot' " -"boot option to prevent the KMS driver of the kernel from being loaded in the " -"boot process. Startup of the X server may now fail as that option was not " +"boot option to prevent the KMS driver of the kernel from being loaded in the" +" boot process. Startup of the X server may now fail as that option was not " "specified." -msgstr "" -"目前設定的顯示卡驅動程式需要您使用 'nokmsboot' 開機選項來避免核心中的 KMS 驅" -"動程式在開機過程中被載入。若未指定該選項,X 伺服器可能無法啟動。" +msgstr "目前設定的顯示卡驅動程式需要您使用 'nokmsboot' 開機選項來避免核心中的 KMS 驅動程式在開機過程中被載入。若未指定該選項,X 伺服器可能無法啟動。" #: service_harddrake:437 #, c-format @@ -3287,9 +3178,7 @@ msgid "" "Detected a loaded display driver kernel module which conflicts with the " "driver the X server is configured to use. Startup of the X server may now " "fail." -msgstr "" -"偵測到載入的顯示驅動核心模組和 X server 設定要使用的驅動衝突。現在啟動 X " -"server 可能會失敗。" +msgstr "偵測到載入的顯示驅動核心模組和 X server 設定要使用的驅動衝突。現在啟動 X server 可能會失敗。" #: service_harddrake:452 #, c-format @@ -3330,139 +3219,107 @@ msgid "Language & country configuration" msgstr "語言與國家設定" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "郵件警示通知組態設定" +msgstr "執行 Mageia 認證設定" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" -msgstr "" +msgstr "執行 Mageia 認證設定需要認證" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "開機組態設定" +msgstr "執行 Mageia 開機設定" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "執行 Mageia 開機設定需要認證" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "郵件警示通知組態設定" +msgstr "執行 Mageia 時間和日期設定" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" -msgstr "" +msgstr "執行 Mageia 時間和日期設定需要認證" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "執行 Mageia 磁碟分割設定" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "" +msgstr "執行 Mageia 磁碟分割設定需要認證" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "語言與國家設定" +msgstr "執行 Mageia 登入管理員設定" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "執行 Mageia 登入管理員設定需要認證" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "語言與國家設定" +msgstr "執行 Mageia 字型設定" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "執行 Mageia 字型設定需要認證" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "圖形伺服器組態設定" +msgstr "執行 Mageia 硬體設定" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "執行 Mageia 硬體設定需要認證" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "執行 Mageia 記錄檔檢視器" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "執行 Mageia 記錄檔檢視器需要認證" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "圖形伺服器組態設定" +msgstr "執行 Mageia 安全權限設定" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" -msgstr "" +msgstr "執行 Mageia 安全權限設定需要認證" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "圖形伺服器組態設定" +msgstr "執行 Mageia 掃描器設定" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "執行 Mageia 掃描器設定需要認證" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "郵件警示通知組態設定" +msgstr "執行 Mageia 應用程式安全設定" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" -msgstr "" +msgstr "執行 Mageia 應用程式安全設定需要認證" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "UPS 組態設定" +msgstr "執行 Mageia UPS 設定" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "執行 Mageia UPS 設定需要認證" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "圖形伺服器組態設定" +msgstr "執行 Mageia 服務設定" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" - -#~ msgid "Verbose" -#~ msgstr "顯示詳細訊息" - -#~ msgid "Autodetect _printers" -#~ msgstr "自動偵測印表機 (_P)" - -#~ msgid "Its GDB trace is:" -#~ msgstr "它的 GDB 追蹤為:" - -#~ msgid "OpenOffice.org" -#~ msgstr "OpenOffice.org" - -#~ msgid "" -#~ "The proprietary driver for your graphic card cannot be found, the system " -#~ "is now using the free software driver (%s)." -#~ msgstr "" -#~ "找不到您的顯示卡的專利驅動程式,系統現在會使用自由軟體的驅動程式 (%s)。" - -#~ msgid "Copyright (C) %s by Mageia" -#~ msgstr "Copyright (C) %s by Mageia" +msgstr "執行 Mageia 服務設定需要認證" -- cgit v1.2.1 From 2f6403f1065305835a7fe7232ed9a60f4559980d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:14:55 +0100 Subject: set language --- perl-install/install/share/po/br.po | 2 +- perl-install/share/po/br.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po index 2b80f490d..1ac44198e 100644 --- a/perl-install/install/share/po/br.po +++ b/perl-install/install/share/po/br.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2013-05-03 10:54+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" -"Language: \n" +"Language: br\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po index 714781423..e019d5bbc 100644 --- a/perl-install/share/po/br.po +++ b/perl-install/share/po/br.po @@ -10,7 +10,7 @@ msgstr "" "PO-Revision-Date: 2013-05-07 13:29+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" -"Language: \n" +"Language: br\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -- cgit v1.2.1 From 3ef1c5edebbd4dd98744e31fd71442e860fafb40 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:18:40 +0100 Subject: update --- perl-install/install/share/po/br.po | 40 ++++++++++++++++++------------------- perl-install/share/po/br.po | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po index 1ac44198e..06f7cba7d 100644 --- a/perl-install/install/share/po/br.po +++ b/perl-install/install/share/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: DrakX 10.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-03 10:54+0200\n" +"PO-Revision-Date: 2013-11-29 09:15+0100\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" "Language: br\n" @@ -40,7 +40,7 @@ msgstr "Ostilhoù burevek" #: ../../advertising/05_IM_mageia.pl:1 #, c-format msgid "Home entertainment" -msgstr "" +msgstr "Evit ho plijadur" #: ../../advertising/06_IM_mageia.pl:1 #, c-format @@ -65,7 +65,7 @@ msgstr "Trugarez !" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "" +msgstr "Bezit dieub !" #: any.pm:111 #, c-format @@ -146,7 +146,7 @@ msgstr "Mank ar ra anv an ostiz" #: any.pm:241 #, c-format msgid "Directory must begin with \"/\"" -msgstr "" +msgstr "Dao en eus anv ur renkell kregiñ gant ur « / »" #: any.pm:245 #, c-format @@ -175,17 +175,17 @@ msgstr "" #: any.pm:319 #, c-format msgid "Core Release" -msgstr "" +msgstr "Core Release" #: any.pm:321 #, c-format msgid "Tainted Release" -msgstr "" +msgstr "Tainted Release" #: any.pm:323 #, c-format msgid "Nonfree Release" -msgstr "" +msgstr "Nonfree Release" #: any.pm:351 #, c-format @@ -197,7 +197,7 @@ msgstr "" #: any.pm:352 #, c-format msgid "You should enable \"%s\"" -msgstr "" +msgstr "Gwelloc'h e vefe deoc'h bevaat « %s »" #: any.pm:377 #, c-format @@ -419,7 +419,7 @@ msgstr "marteze" #: pkgs.pm:102 #, c-format msgid "Getting package information from XML meta-data..." -msgstr "" +msgstr "O tegas titouroù ar pakadoù eus an titouroù XML ..." #: pkgs.pm:111 #, c-format @@ -722,9 +722,9 @@ msgid "" msgstr "" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Post burevek KDE" +msgstr "Post burevek XFCE" #: share/meta-task/compssUsers.pl:163 #, c-format @@ -734,14 +734,14 @@ msgid "" msgstr "" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Post burevek GNOME" +msgstr "Post burevek MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Post labour" +msgstr "Post labour Cinnamon" #: share/meta-task/compssUsers.pl:173 #, fuzzy, c-format @@ -761,9 +761,9 @@ msgid "" msgstr "" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Burev diouzhoc'h" +msgstr "Burev RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format @@ -773,7 +773,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Burev Enlightenment e17" #: share/meta-task/compssUsers.pl:190 #, c-format @@ -786,9 +786,9 @@ msgid "Other Graphical Desktops" msgstr "Burevioù c'hrafek all" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, etc" +msgstr "Window Maker, Fvwm, hag all" #: share/meta-task/compssUsers.pl:217 #, c-format diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po index e019d5bbc..08e405503 100644 --- a/perl-install/share/po/br.po +++ b/perl-install/share/po/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 10.2\n" "POT-Creation-Date: 2013-09-30 21:17+0200\n" -"PO-Revision-Date: 2013-05-07 13:29+0200\n" +"PO-Revision-Date: 2013-11-29 09:17+0100\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" "Language: br\n" @@ -2683,7 +2683,7 @@ msgstr "Kinnig eo deoc'h gant ar skoazeller parzhadur DrakX :" #: fs/partitioning_wizard.pm:518 #, c-format msgid "Here is the content of your disk drive " -msgstr "" +msgstr "Setu ar pezh a zo war ho pladenn " #: fs/partitioning_wizard.pm:602 #, c-format @@ -2847,7 +2847,7 @@ msgstr "" #: fsedit.pm:550 #, c-format msgid "Not enough free space for auto-allocating" -msgstr "" +msgstr "N'eus ket plas dieub a-walac'h" #: fsedit.pm:552 #, c-format @@ -3103,7 +3103,7 @@ msgstr "Gortozit mar plij, o lakaat ar c'hefluniadur" #: harddrake/sound.pm:331 #, c-format msgid "Enable PulseAudio" -msgstr "" +msgstr "Bevaat PulseAudio" #: harddrake/sound.pm:336 #, c-format -- cgit v1.2.1 From 3369521cac0cc6e290cd19d9eb30e59f1fef4508 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:23:34 +0100 Subject: drop OSS to ALSA map OSS is not available for years --- perl-install/NEWS | 3 + perl-install/harddrake/sound.pm | 160 +--------------------------------------- 2 files changed, 4 insertions(+), 159 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 22da1490b..7dbc7dfbe 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- draksound: + o do not offer to switch to OSS + Version 16.1 - 28 November 2013 - mcc: diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 8a560f03d..8c2c9fbc7 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -22,162 +22,6 @@ use list_modules; use detect_devices; use log; - -our %alsa2oss = - ( - if_(arch() =~ /ppc/, "snd_powermac" => [ "dmasound_pmac" ]), - if_(arch() =~ /sparc/, - "snd_sun_amd7930" => [ "unknown" ], - "snd_sun_cs4231" => [ "unknown" ], - "snd_sun_dbri" => [ "unknown" ], - ), - "snd_ad1816a" => [ "ad1816" ], # isa - "snd_ad1848" => [ "ad1848", "pss" ], # isa - "snd_ad1889" => [ "ad1889" ], - "snd_ali5451" => [ "trident" ], - "snd_als100" => [ "sb" ], # isa - "snd_als300" => [ "unknown" ], - "snd_als4000" => [ "unknown" ], - "snd_aoa" => [ "unknown" ], - "snd_asihpi" => [ "unknown" ], - "snd_atiixp" => [ "unknown" ], - "snd_au8810" => [ "unknown" ], - "snd_au8820" => [ "unknown" ], - "snd_au8830" => [ "unknown" ], - "snd_audigyls" => [ "unknown" ], # pci, renamed as snd_ca0106 - "snd_azt2320" => [ "unknown" ], # isa - "snd_azt3328" => [ "unknown" ], # isa - "snd_azx" => [ "unknown" ], - "snd_bt87x" => [ "btaudio" ], - "snd_ca0106" => [ "unknown" ], # pci - "snd_cmi8330" => [ "sb" ], # isa - "snd_cmi8788" => [ "unknown" ], # pci - "snd_cmipci" => [ "cmpci" ], - "snd_cs4231" => [ "unknown" ], # isa - "snd_cs4232" => [ "cs4232" ], # isa - "snd_cs4236" => [ "ad1848" ], # isa - "snd_cs4281" => [ "cs4281" ], - "snd_cs46xx" => [ "cs46xx" ], - "snd_cs5530" => [ "unknown" ], - "snd_cs5535audio" => [ "unknown" ], - "snd_darla20" => [ "unknown" ], - "snd_darla24" => [ "unknown" ], - "snd_dt0197h" => [ "unknown" ], # isa - "snd_dt019x" => [ "unknown" ], # isa - "snd_echo3g" => [ "unknown" ], - "snd_emu10k1" => [ "audigy", "emu10k1" ], - "snd_emu10k1x" => [ "unknown" ], - "snd_ens1370" => [ "es1370" ], - "snd_ens1371" => [ "es1371" ], - "snd_es1688" => [ "sb" ], # isa - "snd_es18xx" => [ "sb" ], # isa - "snd_es1938" => [ "esssolo1" ], - "snd_es1968" => [ "maestro" ], # isa - "snd_es968" => [ "sb" ], - "snd_fm801" => [ "forte" ], - "snd_gina20" => [ "unknown" ], - "snd_gina24" => [ "unknown" ], - "snd_gina3g" => [ "unknown" ], - "snd_gusclassic" => [ "gus" ], # isa - "snd_gusextreme" => [ "gus" ], # isa - "snd_gusmax" => [ "gus" ], # isa - "snd_hda_intel" => [ "unknown" ], - "snd_hdspm" => [ "unknown" ], - "snd_hdsp" => [ "unknown" ], - "snd_ice1712" => [ "unknown" ], # isa - "snd_ice1724" => [ "unknown" ], # isa - "snd_indi" => [ "unknown" ], # pci - "snd_indigo" => [ "unknown" ], # pci - "snd_indigodj" => [ "unknown" ], # pci - "snd_indigoio" => [ "unknown" ], # pci - "snd_intel8x0" => [ "ali5455", "i810_audio", "nvaudio" ], - "snd_interwave" => [ "gus" ], # isa - "snd_interwave_stb" => [ "unknown" ], # isa - "snd_korg1212" => [ "unknown" ], # isa - "snd_layla20" => [ "unknown" ], - "snd_layla24" => [ "unknown" ], - "snd_layla3g" => [ "unknown" ], - "snd_maestro3" => [ "maestro3" ], - "snd_mia" => [ "unknown" ], - "snd_mixart" => [ "unknown" ], - "snd_mona" => [ "unknown" ], - "snd_mpu401" => [ "mpu401" ], - "snd_nm256" => [ "nm256_audio" ], - "snd_opl3sa2" => [ "opl3", "opl3sa", "opl3sa2" ], # isa - "snd_opti92x_ad1848" => [ "unknown" ], # isa - "snd_opti92x_cs4231" => [ "unknown" ], # isa - "snd_opti93x" => [ "mad16" ], - "snd_pcxhr" => [ "unknown" ], # pci - "snd_riptide" => [ "unknown" ], - "snd_rme32" => [ "unknown" ], # isa - "snd_rme96" => [ "rme96xx" ], # pci - "snd_rme9652" => [ "rme96xx" ], # pci - "snd_sb16" => ["sscape", "sb"], - "snd_sb8" => [ "sb" ], - "snd_sbawe" => [ "awe_wave" ], - "snd_sgalaxy" => [ "sgalaxy" ], # isa - "snd_sonicvibes" => [ "sonicvibes" ], - "snd_sscape" => [ "sscape" ], # isa - "snd_trident" => [ "trident" ], - "snd_usb_audio" => [ "audio" ], # usb - "snd_usb_caiaq" => [ "unknown" ], - "snd_usb_usx2y" => [ "unknown" ], - "snd_via82xx" => [ "via82cxxx_audio" ], - "snd_vx222" => [ "unknown" ], - "snd_vxp440" => [ "unknown" ], # pcmcia - "snd_vxpocket" => [ "unknown" ], # pcmcia - "snd_wavefront" => [ "wavefront" ], # isa - "snd_ymfpci" => [ "ymfpci" ], - ); - - -our %oss2alsa = - ( - if_(arch() =~ /ppc/, "dmasound_pmac" => [ "snd_powermac" ]), - "ad1816" => [ "snd_ad1816a" ], - "ad1848" => [ "snd_ad1848", "snd_cs4236" ], - "ad1889" => [ "snd_ad1889" ], - "ali5455" => [ "snd_intel8x0" ], - "audigy" => [ "snd_emu10k1" ], - "audio" => [ "snd_usb_audio" ], # usb - "awe_wave" => [ "snd_sbawe" ], - "btaudio" => [ "snd_bt87x" ], - "cmpci" => [ "snd_cmipci" ], - "cs4232" => [ "snd_cs4232" ], - "cs4281" => [ "snd_cs4281" ], - "cs46xx" => [ "snd_cs46xx" ], - "emu10k1" => [ "snd_emu10k1" ], - "es1370" => [ "snd_ens1370" ], - "es1371" => [ "snd_ens1371" ], - "esssolo1" => [ "snd_es1938" ], - "forte" => [ "snd_fm801" ], - "gus" => ["snd_interwave", "snd_gusclassic", "snd_gusmax", "snd_gusextreme"], - "i810_audio" => [ "snd_intel8x0" ], - "ice1712" => [ "snd_ice1712" ], - "mad16" => [ "snd_opti93x" ], - "maestro" => [ "snd_es1968" ], - "maestro3" => [ "snd_maestro3" ], - "mpu401" => [ "snd_mpu401" ], - "msnd_pinnacle" => [ "unknown" ], - "nm256_audio" => [ "snd_nm256" ], - "nvaudio" => [ "snd_intel8x0" ], - "opl3" => [ "snd_opl3sa2" ], - "opl3sa" => [ "snd_opl3sa2" ], - "opl3sa2" => [ "snd_opl3sa2" ], - "pas2" => [ "unknown" ], - "pss" => [ "snd_ad1848" ], - "rme96xx" => [ "snd_rme96", "snd_rme9652" ], - "sam9407" => [ "unknown" ], - "sb" => [ "snd_als100", "snd_cmi8330", "snd_es1688", "snd_es18xx", "snd_es968", "snd_sb8", "snd_sb16" ], - "sgalaxy" => [ "snd_sgalaxy" ], - "sonicvibes" => [ "snd_sonicvibes" ], - "sscape" => [ "snd_sb16", "snd_sscape" ], - "trident" => [ "snd_ali5451", "snd_trident" ], - "via82cxxx_audio" => [ "snd_via82xx" ], - "wavefront" => [ "snd_wavefront" ], - "ymfpci" => [ "snd_ymfpci" ], - ); - my @blacklist = qw(cs46xx cs4281); my $blacklisted = 0; @@ -259,9 +103,7 @@ sub load { } sub get_alternative { - my ($driver) = @_; - my $list = $alsa2oss{$driver} || $oss2alsa{$driver}; - $list ? @$list : "unknown"; + "unknown"; } sub do_switch { -- cgit v1.2.1 From 074db254db6b6c39807f308ddc1b4f7b7d22648c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:25:59 +0100 Subject: drop support for blacklist rationale: all blacklisted drivers were OSS and disapeared years ago... --- perl-install/harddrake/sound.pm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 8c2c9fbc7..44de4ef02 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -22,9 +22,6 @@ use list_modules; use detect_devices; use log; -my @blacklist = qw(cs46xx cs4281); -my $blacklisted = 0; - sub is_pulseaudio_enabled() { my $soundprofile = common::read_alternative('soundprofile'); $soundprofile =~ /pulse$/; @@ -95,11 +92,11 @@ sub set_PA_autospan { sub rooted { run_program::rooted($::prefix, @_) } -sub unload { modules::unload(@_) if $::isStandalone || $blacklisted } +sub unload { modules::unload(@_) if $::isStandalone } sub load { my ($modules_conf, $name) = @_; - modules::load_and_configure($modules_conf, $name) if $::isStandalone || $blacklisted; + modules::load_and_configure($modules_conf, $name) if $::isStandalone; } sub get_alternative { @@ -112,8 +109,8 @@ sub do_switch { my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration")); log::explanations("removing old $old_driver\n"); if ($::isStandalone) { - rooted("service sound stop") unless $blacklisted; - rooted("service alsa stop") if $old_driver =~ /^snd_/ && !$blacklisted; + rooted("service sound stop"); + rooted("service alsa stop") if $old_driver =~ /^snd_/; unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ... } $modules_conf->remove_module($old_driver); @@ -122,20 +119,19 @@ sub do_switch { if ($new_driver =~ /^snd_/) { # new driver is an alsa one $in->do_pkgs->ensure_binary_is_installed(qw(alsa-utils alsactl), 1); $in->do_pkgs->ensure_binary_is_installed(qw(aoss aoss), 1); - rooted("service alsa start") if $::isStandalone && !$blacklisted; + rooted("service alsa start") if $::isStandalone; rooted("/sbin/chkconfig --add alsa") if $::isStandalone; load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy } else { rooted("/sbin/chkconfig --del alsa") } log::explanations("loading new $new_driver\n"); rooted("/sbin/chkconfig --add sound"); # just in case ... - rooted("service sound start") if $::isStandalone && !$blacklisted; + rooted("service sound start") if $::isStandalone; } sub switch { my ($in, $modules_conf, $device) = @_; my $driver = $device->{current_driver} || $device->{driver}; - foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ } my @alternative = $driver ne 'unknown' ? get_alternative($driver) : (); unless ($driver eq $device->{driver} || member($device->{driver}, @alternative)) { push @alternative, get_alternative($device->{driver}), $device->{driver}; @@ -238,9 +234,6 @@ To use alsa, one can either use: $write_config->(); return if $new_driver eq $device->{current_driver}; log::explanations("switching audio driver from '" . $device->{current_driver} . "' to '$new_driver'\n"); - $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n -It has been reported to oops the kernel on unloading.\n -The new \"%s\" driver will only be used on next bootstrap.", $device->{current_driver}, $new_driver)) if $blacklisted; do_switch($in, $modules_conf, $device->{current_driver}, $new_driver, $device->{sound_slot_index}); $device->{current_driver} = $new_driver; } -- cgit v1.2.1 From a3892591195934279d9be528e9662cad5e4142b9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:29:48 +0100 Subject: (get_alternative) kill it since we no more can choose between OSS & ALSA --- perl-install/harddrake/sound.pm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 44de4ef02..6a48c302e 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -99,10 +99,6 @@ sub load { modules::load_and_configure($modules_conf, $name) if $::isStandalone; } -sub get_alternative { - "unknown"; -} - sub do_switch { my ($in, $modules_conf, $old_driver, $new_driver, $index) = @_; return if $old_driver eq $new_driver; @@ -132,9 +128,9 @@ sub switch { my ($in, $modules_conf, $device) = @_; my $driver = $device->{current_driver} || $device->{driver}; - my @alternative = $driver ne 'unknown' ? get_alternative($driver) : (); - unless ($driver eq $device->{driver} || member($device->{driver}, @alternative)) { - push @alternative, get_alternative($device->{driver}), $device->{driver}; + my @alternative; + if ($driver ne $device->{driver}) { + push @alternative, $device->{driver}; } if (@alternative) { my $new_driver = $driver; @@ -342,7 +338,7 @@ sub configure_sound_slots { my $altered = 0; each_index { my $default_driver = $modules_conf->get_alias("sound-slot-$::i"); - if (!member($default_driver, get_alternative($_->{driver}), $_->{driver})) { + if (!member($default_driver, $_->{driver})) { $altered ||= $default_driver; configure_one_sound_slot($modules_conf, $::i, $_->{driver}); } -- cgit v1.2.1 From 16af9628dc9ba7a8b32aae17c70c60c3d76a7bc4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:31:24 +0100 Subject: simplify --- perl-install/harddrake/sound.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 6a48c302e..c24e84fd7 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -128,10 +128,7 @@ sub switch { my ($in, $modules_conf, $device) = @_; my $driver = $device->{current_driver} || $device->{driver}; - my @alternative; - if ($driver ne $device->{driver}) { - push @alternative, $device->{driver}; - } + my @alternative = $driver ne $device->{driver} ? $device->{driver} : (); if (@alternative) { my $new_driver = $driver; push @alternative, $driver; -- cgit v1.2.1 From 008e2d1b4296b86fdc30531677df4a91256c68de Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:33:44 +0100 Subject: (switch) merge it with config rationale: config() only calls switch() and switch() does more than offering old OSS<->ALSA switch --- perl-install/harddrake/sound.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index c24e84fd7..abb135dbc 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -124,7 +124,7 @@ sub do_switch { rooted("service sound start") if $::isStandalone; } -sub switch { +sub config { my ($in, $modules_conf, $device) = @_; my $driver = $device->{current_driver} || $device->{driver}; @@ -244,12 +244,6 @@ To use alsa, one can either use: end: } -sub config { - my ($in, $modules_conf, $device) = @_; - switch($in, $modules_conf, $device); -} - - sub trouble { my ($in) = @_; $in->ask_warn(N("Sound troubleshooting"), -- cgit v1.2.1 From baada4e5edbb3f95f0d00631bba0a4b1303f0883 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:38:23 +0100 Subject: drop the Bad driver logic rationale: we don't have any proprietary driver listed in ldetect-lst at all --- perl-install/harddrake/sound.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index abb135dbc..7605012b8 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -230,11 +230,6 @@ To use alsa, one can either use: do_switch($in, $modules_conf, $device->{current_driver}, $new_driver, $device->{sound_slot_index}); $device->{current_driver} = $new_driver; } - } elsif ($driver =~ /^Bad:/) { - $driver =~ s/^Bad://; - $in->ask_warn(N("No open source driver"), - N("There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\".", - $device->{description}, $driver)); } elsif ($driver eq "unknown") { $in->ask_from(N("No known driver"), N("There's no known driver for your sound card (%s)", -- cgit v1.2.1 From 89850eb2cbdc105293b3661abad91910fff231ca Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:42:50 +0100 Subject: reverse the if branches rationale: since we no more offer an OSS alternative, the list is empty and thus we were not offering the dialog anymore. However it does more than offering to switch between OSS & ALSA: we do want to offer to configure PA even if we cannot switch to another driver. Thus the GUI is now either show an error dialog if there's no supported sound card of showing PA options --- perl-install/harddrake/sound.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 7605012b8..ce565e03b 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -129,7 +129,12 @@ sub config { my $driver = $device->{current_driver} || $device->{driver}; my @alternative = $driver ne $device->{driver} ? $device->{driver} : (); - if (@alternative) { + if ($driver eq "unknown") { + $in->ask_from(N("No known driver"), + N("There's no known driver for your sound card (%s)", + $device->{description}), + [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]); + } else { my $new_driver = $driver; push @alternative, $driver; my %des = modules::category2modules_and_description('multimedia/sound'); @@ -212,6 +217,7 @@ To use alsa, one can either use: }, }, [ + if_(@alternative, { label => N("Driver:"), val => \$new_driver, list => \@alternative, default => $new_driver, sort =>1, allow_empty_list => 1, @@ -220,7 +226,7 @@ To use alsa, one can either use: sprintf(($des{$drv} ? "$des{$drv} (%s [%s])" : "%s [%s]"), $drv, $drv =~ /^snd_/ ? 'ALSA' : 'OSS'); } - }, + }), @common, ])) { @@ -230,11 +236,6 @@ To use alsa, one can either use: do_switch($in, $modules_conf, $device->{current_driver}, $new_driver, $device->{sound_slot_index}); $device->{current_driver} = $new_driver; } - } elsif ($driver eq "unknown") { - $in->ask_from(N("No known driver"), - N("There's no known driver for your sound card (%s)", - $device->{description}), - [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]); } end: } -- cgit v1.2.1 From b7332d01b1811952e6480ae4e20a53436c6ca181 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:43:15 +0100 Subject: do not offer to switch to another driver if there's none --- perl-install/NEWS | 1 + perl-install/harddrake/sound.pm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 7dbc7dfbe..b5f6cca74 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - draksound: o do not offer to switch to OSS + o do not offer to switch to another driver if there's none Version 16.1 - 28 November 2013 diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index ce565e03b..d34ecdc67 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -220,7 +220,6 @@ To use alsa, one can either use: if_(@alternative, { label => N("Driver:"), val => \$new_driver, list => \@alternative, default => $new_driver, sort =>1, - allow_empty_list => 1, format => sub { my ($drv) = @_; $drv eq 'unknown' ? $drv : sprintf(($des{$drv} ? "$des{$drv} (%s [%s])" -- cgit v1.2.1 From 8daa5c273bb87486f9efe587b47f4751c8c095fc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 09:45:29 +0100 Subject: do not offer to pick a random driver when we've a default one --- perl-install/NEWS | 1 + perl-install/harddrake/sound.pm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index b5f6cca74..ddd9cec1e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,7 @@ - draksound: o do not offer to switch to OSS o do not offer to switch to another driver if there's none + o do not offer to pick a random driver when we've a default one Version 16.1 - 28 November 2013 diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index d34ecdc67..efad47d78 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -162,7 +162,6 @@ sub config { }; my @common = ( - get_any_driver_entry($in, $modules_conf, $driver, $device), { text => N("Enable PulseAudio"), type => 'bool', val => \$is_pulseaudio_enabled, -- cgit v1.2.1 From 265ce1285a10e4da33853758197a5fb7b02778dd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 12:41:58 +0100 Subject: make shrinking window work again (eg: draknfs) --- perl-install/NEWS | 2 ++ perl-install/ugtk3.pm | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index ddd9cec1e..aadb2e923 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,8 @@ o do not offer to switch to OSS o do not offer to switch to another driver if there's none o do not offer to pick a random driver when we've a default one +- ugtk3 layer: + o make shrinking window work again (eg: draknfs) Version 16.1 - 28 November 2013 diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 8f8fdcc21..445c50780 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -765,8 +765,7 @@ sub sync { sub flush() { gtkflush() } sub shrink_topwindow { my ($o) = @_; - warn "NOT IMPLEMENTED !!!!\n"; return; - $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1)); + $o->{real_window}->resize(1, 1); } sub exit { gtkset_mousecursor_normal(); #- for restoring a normal in any case -- cgit v1.2.1 From 4722ca4f3b0a21e254e0becbf763665910939a7d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 25 Nov 2013 14:55:01 +0100 Subject: add support for RadioMenuItems for rpmdrake --- perl-install/NEWS | 2 ++ perl-install/mygtk3.pm | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index aadb2e923..43aed295e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,8 @@ o do not offer to switch to OSS o do not offer to switch to another driver if there's none o do not offer to pick a random driver when we've a default one +- mygtk3 layer: + o add support for RadioMenuItems for rpmdrake - ugtk3 layer: o make shrinking window work again (eg: draknfs) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index 421a9f419..d3564a31c 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -561,6 +561,9 @@ sub _gtk__ActionGroup { if ($opts->{actions}) { $w->add_actions(delete $opts->{actions}, undef); $w->add_toggle_actions(delete $opts->{toggle_actions}, undef) if $opts->{toggle_actions}; + if (my $radios = delete $opts->{radio_actions}) { + $w->add_radio_actions(@$_) foreach @$radios; + } } } $w; @@ -585,7 +588,7 @@ sub _gtk__UIManager { $w = Gtk3::UIManager->new; if ($opts->{actions}) { $w->insert_action_group(gtknew('ActionGroup', name => 'Actions', - map { exists $opts->{$_} ? ($_ => delete $opts->{$_}) : () } qw(actions toggle_actions)), + map { exists $opts->{$_} ? ($_ => delete $opts->{$_}) : () } qw(actions radio_actions toggle_actions)), 0); } $w->add_ui_from_string(delete $opts->{string}) if exists $opts->{string}; -- cgit v1.2.1 From c5275f0b77863e5348435d0ed246e8cefdd8dffb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 17:39:57 +0100 Subject: no more run urpmi.update when adding media this is uneeded with urpmi-7.27+ basically reverting commit 810c20b3 --- perl-install/NEWS | 3 +++ perl-install/any.pm | 12 ------------ perl-install/install/NEWS | 3 +++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 43aed295e..c6c378006 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,9 @@ o do not offer to switch to OSS o do not offer to switch to another driver if there's none o do not offer to pick a random driver when we've a default one +- finish-install: + o no more run urpmi.update when adding media + (uneeded with urpmi-7.27+) - mygtk3 layer: o add support for RadioMenuItems for rpmdrake - ugtk3 layer: diff --git a/perl-install/any.pm b/perl-install/any.pm index ea96ed8c6..27b505f82 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -976,18 +976,6 @@ sub urpmi_add_all_media { my $log_file = '/root/drakx/updates.log'; my $val = run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options); - if ($val) { - #- enable Nonfree/Tainted repositories if a package having a matching name is installed - #- FIXME: this only works for Nonfree for now thanks to kernel-firmware-nonfree - #- for Tainted to work and for better Nonfree support, we should search in package releases as well - foreach my $media (qw(Nonfree Tainted)) { - $in->do_pkgs->are_installed("*" . lc($media) . "*") or next; - foreach my $type (qw(Release Updates)) { - run_program::rooted($::prefix, '/usr/libexec/urpmi.update', '--no-ignore', "$media $type"); - } - } - } - undef $wait; $val; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a195b285f..013caea5d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- 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 -- cgit v1.2.1 From cb2bb1873b8120bd1b3b0dadd0aa9222f336b904 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 17:54:08 +0100 Subject: fix dialog keeping growing when switching tabs move partition labels to toolips labels broke sizing by enlarging partition ToggleButtons --- perl-install/NEWS | 3 +++ perl-install/diskdrake/hd_gtk.pm | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index c6c378006..ead60dda3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix dialog keeping growing when switching tabs (mga#11822): + move partition labels to toolips - draksound: o do not offer to switch to OSS o do not offer to switch to another driver if there's none diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 5ddc91230..688a476f1 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -321,7 +321,7 @@ sub create_automatic_notebooks { sub create_buttons4partitions { my ($kind, $totalsectors, @parts) = @_; - $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 25 if $w->{window}->get_window; + $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 50 if $w->{window}->get_window; my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; my $i = 1; @@ -346,7 +346,8 @@ sub create_buttons4partitions { } my $info = $entry->{mntpoint} || $entry->{device_LABEL} || ''; $info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info; - my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label'); + my $w = Gtk3::ToggleButton->new() or internal_error('new_with_label'); + $w->set_tooltip_text($info); $w->signal_connect(clicked => sub { $current_button != $w or return; current_entry_changed($kind, $entry); -- cgit v1.2.1 From 40bdb1facddef1d217ab7936aa67105b5ae380d9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 29 Nov 2013 21:44:41 +0100 Subject: 16.2 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 2f965c425..567358d38 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.1 +VERSION:=16.2 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index ead60dda3..e2321f9d8 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.2 - 29 November 2013 + - diskdrake: o fix dialog keeping growing when switching tabs (mga#11822): move partition labels to toolips diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 013caea5d..16c5a726c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.2 - 29 November 2013 + - no more run urpmi.update when adding media (uneeded with urpmi-7.27+) -- cgit v1.2.1 From 84f79bf3ccc9a21ed7fe947d265f6061d8e3773d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 30 Nov 2013 19:25:06 +0100 Subject: sync with code --- perl-install/share/po/af.po | 95 +++++++++++++++++----------------- perl-install/share/po/am.po | 67 ++++++++++-------------- perl-install/share/po/ar.po | 92 ++++++++++++++++----------------- perl-install/share/po/az.po | 93 ++++++++++++++++----------------- perl-install/share/po/be.po | 63 ++++++++--------------- perl-install/share/po/bg.po | 72 +++++++++++--------------- perl-install/share/po/bn.po | 93 ++++++++++++++++----------------- perl-install/share/po/br.po | 66 +++++++++--------------- perl-install/share/po/bs.po | 96 +++++++++++++++++----------------- perl-install/share/po/ca.po | 93 ++++++++++++++++----------------- perl-install/share/po/cs.po | 93 ++++++++++++++++----------------- perl-install/share/po/cy.po | 93 ++++++++++++++++----------------- perl-install/share/po/da.po | 93 ++++++++++++++++----------------- perl-install/share/po/de.po | 93 ++++++++++++++++----------------- perl-install/share/po/el.po | 93 ++++++++++++++++----------------- perl-install/share/po/eo.po | 75 ++++++++++++--------------- perl-install/share/po/es.po | 93 ++++++++++++++++----------------- perl-install/share/po/et.po | 93 ++++++++++++++++----------------- perl-install/share/po/eu.po | 95 +++++++++++++++++----------------- perl-install/share/po/fa.po | 93 ++++++++++++++++----------------- perl-install/share/po/fi.po | 93 ++++++++++++++++----------------- perl-install/share/po/fr.po | 95 +++++++++++++++++----------------- perl-install/share/po/fur.po | 63 ++++++++--------------- perl-install/share/po/ga.po | 63 ++++++++--------------- perl-install/share/po/gl.po | 93 ++++++++++++++++----------------- perl-install/share/po/he.po | 93 ++++++++++++++++----------------- perl-install/share/po/hi.po | 93 ++++++++++++++++----------------- perl-install/share/po/hr.po | 67 ++++++++++-------------- perl-install/share/po/hu.po | 95 +++++++++++++++++----------------- perl-install/share/po/id.po | 93 ++++++++++++++++----------------- perl-install/share/po/is.po | 93 ++++++++++++++++----------------- perl-install/share/po/it.po | 94 +++++++++++++++++----------------- perl-install/share/po/ja.po | 93 ++++++++++++++++----------------- perl-install/share/po/ko.po | 63 ++++++++--------------- perl-install/share/po/ky.po | 93 ++++++++++++++++----------------- perl-install/share/po/libDrakX.pot | 58 +++++++-------------- perl-install/share/po/lt.po | 63 ++++++++--------------- perl-install/share/po/ltg.po | 94 +++++++++++++++++----------------- perl-install/share/po/lv.po | 95 +++++++++++++++++----------------- perl-install/share/po/mk.po | 94 +++++++++++++++++----------------- perl-install/share/po/mn.po | 63 ++++++++--------------- perl-install/share/po/ms.po | 79 ++++++++++++++-------------- perl-install/share/po/mt.po | 93 ++++++++++++++++----------------- perl-install/share/po/nb.po | 91 ++++++++++++++++----------------- perl-install/share/po/nl.po | 97 +++++++++++++++++------------------ perl-install/share/po/nn.po | 91 ++++++++++++++++----------------- perl-install/share/po/pa_IN.po | 93 ++++++++++++++++----------------- perl-install/share/po/pl.po | 93 ++++++++++++++++----------------- perl-install/share/po/pt.po | 93 ++++++++++++++++----------------- perl-install/share/po/pt_BR.po | 93 ++++++++++++++++----------------- perl-install/share/po/ro.po | 93 ++++++++++++++++----------------- perl-install/share/po/ru.po | 95 +++++++++++++++++----------------- perl-install/share/po/sc.po | 75 ++++++++++++--------------- perl-install/share/po/sk.po | 93 ++++++++++++++++----------------- perl-install/share/po/sl.po | 91 ++++++++++++++++----------------- perl-install/share/po/sq.po | 95 +++++++++++++++++----------------- perl-install/share/po/sr.po | 93 ++++++++++++++++----------------- perl-install/share/po/sr@Latn.po | 93 ++++++++++++++++----------------- perl-install/share/po/sv.po | 95 +++++++++++++++++----------------- perl-install/share/po/ta.po | 75 ++++++++++++--------------- perl-install/share/po/tg.po | 96 +++++++++++++++++----------------- perl-install/share/po/th.po | 63 ++++++++--------------- perl-install/share/po/tl.po | 93 ++++++++++++++++----------------- perl-install/share/po/tr.po | 99 +++++++++++++++++------------------- perl-install/share/po/uk.po | 95 +++++++++++++++++----------------- perl-install/share/po/uz.po | 68 ++++++++++--------------- perl-install/share/po/uz@cyrillic.po | 66 +++++++++--------------- perl-install/share/po/vi.po | 93 ++++++++++++++++----------------- perl-install/share/po/wa.po | 95 +++++++++++++++++----------------- perl-install/share/po/zh_CN.po | 93 ++++++++++++++++----------------- perl-install/share/po/zh_TW.po | 89 ++++++++++++++++---------------- 71 files changed, 2867 insertions(+), 3299 deletions(-) diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po index 4527cdf15..7b1509a4f 100644 --- a/perl-install/share/po/af.po +++ b/perl-install/share/po/af.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-af\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-04-21 17:33+0200\n" "Last-Translator: Dirk van der Walt \n" "Language-Team: Afrikaans\n" @@ -204,11 +204,6 @@ msgstr "U kan nie 'n lêerstelsel met enkripsie vir hegpunt %s gebruik nie." msgid "Password (again)" msgstr "Wagwoord (weer)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Maak /tmp skoon met elke herlaai" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3146,7 +3141,18 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Wag asb... Konfigurasie word toegpas" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Geen drywer bekend" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" +"Daar is geen drywer, sover ons weet, beskikbaar vir klankkaart (%s) nie" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3249,47 +3255,7 @@ msgstr "" msgid "Driver:" msgstr "Drywer:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Die ou \"%s\" drywer is op 'n swartlys.\n" -"\n" -"Dit is geraporteer dat die die kernel 'oops' as dit aflaai.\n" -"\n" -"Die nuwe \"%s\" drywer sal met die volgende selflaai gebruik word." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Geen oopbron drywer" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Daar is geen gratis drywer vir u klankkaart (%s) nie, daar is wel 'n " -"gepatenteerde een by \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Geen drywer bekend" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" -"Daar is geen drywer, sover ons weet, beskikbaar vir klankkaart (%s) nie" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Klank foutopsporing" @@ -6032,11 +5998,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-bediener" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6925,6 +6896,32 @@ msgstr "" msgid "Installation failed" msgstr "Installasie het gefaal!" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Maak /tmp skoon met elke herlaai" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Die ou \"%s\" drywer is op 'n swartlys.\n" +#~ "\n" +#~ "Dit is geraporteer dat die die kernel 'oops' as dit aflaai.\n" +#~ "\n" +#~ "Die nuwe \"%s\" drywer sal met die volgende selflaai gebruik word." + +#~ msgid "No open source driver" +#~ msgstr "Geen oopbron drywer" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Daar is geen gratis drywer vir u klankkaart (%s) nie, daar is wel 'n " +#~ "gepatenteerde een by \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po index 59f74414e..2973ffa54 100644 --- a/perl-install/share/po/am.po +++ b/perl-install/share/po/am.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-06-01 03:36+0100\n" "Last-Translator: Alemayehu \n" "Language-Team: Amharic \n" @@ -186,11 +186,6 @@ msgstr "" msgid "Password (again)" msgstr "ሚስጢራዊ ቃል (እንደገና)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "በየጅማሬው /tmpን አጽዳ" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3008,7 +3003,17 @@ msgstr "ሲፒዩ #" msgid "Please Wait... Applying the configuration" msgstr "እባክዎ ይጠብቁ... ምርጫውን በስራ ላይ አያዋለ ነው" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, fuzzy, c-format +msgid "No known driver" +msgstr "(ስለ ቃላት አጻጻፍ አስተያየት የለም)" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3089,39 +3094,7 @@ msgstr "" msgid "Driver:" msgstr "" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, fuzzy, c-format -msgid "No open source driver" -msgstr "ስለ የነፃው ሶፍትዌር መረጃ አሳይ" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, fuzzy, c-format -msgid "No known driver" -msgstr "(ስለ ቃላት አጻጻፍ አስተያየት የለም)" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5741,11 +5714,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP ሰርቨር" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6465,6 +6443,13 @@ msgstr "" msgid "Installation failed" msgstr "%s አልተገኘም" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "በየጅማሬው /tmpን አጽዳ" + +#, fuzzy +#~ msgid "No open source driver" +#~ msgstr "ስለ የነፃው ሶፍትዌር መረጃ አሳይ" + #~ msgid "File sharing" #~ msgstr "ሰነድ መጋራት" diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po index 6e5e596c6..19c74fbbf 100644 --- a/perl-install/share/po/ar.po +++ b/perl-install/share/po/ar.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2011-05-19 13:12+0000\n" "Last-Translator: salim salim \n" "Language-Team: LANGUAGE \n" @@ -205,11 +205,6 @@ msgstr "" msgid "Password (again)" msgstr "كلمة المرور (مجدداً)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "تنظيف /tmp عند كل إقلاع" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3119,7 +3114,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "يرجى الإنتظار... جاري تطبيق التهيئة" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "لا يوجد مشغل معروف" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "لا يوجد مشغل معروف لبطاقة الصوت (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3214,45 +3219,7 @@ msgstr "" msgid "Driver:" msgstr "المُشغّل:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"وضع مشغل \"%s\" القديم على القائمة السوداء.\n" -"\n" -"أُفيد أنّه يتسبّب في بعض الحالات بانهيار في النواة عند ازالة التركيب.\n" -"\n" -"مشغل \"%s\" الجديد سيتم استخدامه عند تشغيل الجهاز في المرة القادمة." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "لا يوجد مشغل مفتوح المصدر" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"لا يوجد مشغل مفتوح المصدر لبطاقة الصوت (%s)، لكن هناك مشغل تجاري في \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "لا يوجد مشغل معروف" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "لا يوجد مشغل معروف لبطاقة الصوت (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "حل مشاكل الصوت" @@ -5942,11 +5909,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "خادم NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6799,6 +6771,32 @@ msgstr "" msgid "Installation failed" msgstr "فشل التّثبيت" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "تنظيف /tmp عند كل إقلاع" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "وضع مشغل \"%s\" القديم على القائمة السوداء.\n" +#~ "\n" +#~ "أُفيد أنّه يتسبّب في بعض الحالات بانهيار في النواة عند ازالة التركيب.\n" +#~ "\n" +#~ "مشغل \"%s\" الجديد سيتم استخدامه عند تشغيل الجهاز في المرة القادمة." + +#~ msgid "No open source driver" +#~ msgstr "لا يوجد مشغل مفتوح المصدر" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "لا يوجد مشغل مفتوح المصدر لبطاقة الصوت (%s)، لكن هناك مشغل تجاري في \"%s" +#~ "\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po index fc886d6ea..2e12389df 100644 --- a/perl-install/share/po/az.po +++ b/perl-install/share/po/az.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-az\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-03-31 14:21+0200\n" "Last-Translator: Mətin Əmirov \n" "Language-Team: Azerbaijani \n" @@ -204,11 +204,6 @@ msgstr "" msgid "Password (again)" msgstr "Şifrə (təkrar)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "/tmp-i hər açılışda təmizlə" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3155,7 +3150,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Xahiş edirik, gözləyin... Qurğular tətbiq edilir" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Bilinən sürücü yoxdur" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Sizin (%s) səs kartınız üçün sürücü mövcud deyil" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3257,46 +3262,7 @@ msgstr "" msgid "Driver:" msgstr "Sürücü:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Köhnə \"%s\" sürücüsü artıq qara siyahıdadır.\n" -"\n" -"O çəyirdəyin açılması sırasında xətalar yaradır.\n" -"\n" -"Növbəti açılışda ancaq \"%s\" sürücüsü istifadə ediləcək." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Açıq mənbəli sürücü yoxdur" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"(%s) səs kartınız üçün pulsuz sürücü mövcud deyil, ancaq \"%s\" ünvanında " -"lazım olan sürücünü tapa bilərsiniz." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Bilinən sürücü yoxdur" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Sizin (%s) səs kartınız üçün sürücü mövcud deyil" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Səs problemini həll et" @@ -6141,11 +6107,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Verici" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7021,6 +6992,32 @@ msgstr "" msgid "Installation failed" msgstr "Qurulum bacarılmadı" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "/tmp-i hər açılışda təmizlə" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Köhnə \"%s\" sürücüsü artıq qara siyahıdadır.\n" +#~ "\n" +#~ "O çəyirdəyin açılması sırasında xətalar yaradır.\n" +#~ "\n" +#~ "Növbəti açılışda ancaq \"%s\" sürücüsü istifadə ediləcək." + +#~ msgid "No open source driver" +#~ msgstr "Açıq mənbəli sürücü yoxdur" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "(%s) səs kartınız üçün pulsuz sürücü mövcud deyil, ancaq \"%s\" ünvanında " +#~ "lazım olan sürücünü tapa bilərsiniz." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po index 02e47bc1e..fb4cdea2a 100644 --- a/perl-install/share/po/be.po +++ b/perl-install/share/po/be.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2000-09-24 12:30 +0100\n" "Last-Translator: Alexander Bokovoy \n" "Language-Team: be\n" @@ -186,11 +186,6 @@ msgstr "Вы не можаце разбіваць на разделы, паме msgid "Password (again)" msgstr "Паўтарыце пароль" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Ачышчаць /tmp пры кожнай загрузцы" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3032,7 +3027,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "Праверка параметраў настройкі" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3113,39 +3118,7 @@ msgstr "" msgid "Driver:" msgstr "Прылада %d" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5781,11 +5754,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NIS сэервер:" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6578,6 +6556,9 @@ msgstr "" msgid "Installation failed" msgstr "Усталяванне SILO" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Ачышчаць /tmp пры кожнай загрузцы" + #, fuzzy #~ msgid "File sharing" #~ msgstr "Мэнэджэр файлаў" diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po index 629f3f00f..e4e1b8a27 100644 --- a/perl-install/share/po/bg.po +++ b/perl-install/share/po/bg.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-bg\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2009-03-21 13:58+0200\n" "Last-Translator: Kolio Kolev \n" "Language-Team: Bulgarian \n" "Language-Team: Bangla \n" @@ -204,11 +204,6 @@ msgstr "আপনি %s মাউন্ট পয়েন্টের জন্য msgid "Password (again)" msgstr "পাসওয়ার্ড (পুনরায়)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "প্রতি বুটে /tmp পরিষ্কার করো" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3166,7 +3161,17 @@ msgstr "সিপিউ #" msgid "Please Wait... Applying the configuration" msgstr "অনুগ্রহ করে অপেক্ষা করুন.... কনফিগারেশন প্রস্তাব করা হচ্ছে" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "কোন পরিচিত ড্রাইভার নেই" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "আপনার সাউন্ড কার্ড (%s)-এর জন্য কোন পরিচিত ড্রাইভার নেই" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3269,46 +3274,7 @@ msgstr "" msgid "Driver:" msgstr "ড্রাইভার" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"পুরাতন \"%s\" ড্রাইভার কালো তালিকা ভুক্ত।\n" -"\n" -"এটি কার্ণেল আনলোড করার সময় oops কে রিপোর্ট করে।\n" -"\n" -"নতুন \"%s\" শুধুমাত্র পরবর্তী বুটস্ট্র্যাপে ব্যবহৃত হবে।" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "কোন ওপেন সোর্স ড্রাইভার নেই" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"আপনার সাউন্ড কার্ডের (%s) জন্য কোন ফ্রী ড্রাইভার নেই, কিন্তু একটি অংশিদারী ড্রাইভার " -"\"%s\"-এ আছে।" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "কোন পরিচিত ড্রাইভার নেই" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "আপনার সাউন্ড কার্ড (%s)-এর জন্য কোন পরিচিত ড্রাইভার নেই" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "সাউন্ড ট্রাবল শুটিং" @@ -6096,12 +6062,17 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP সার্ভার" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" # সাম -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7022,6 +6993,32 @@ msgstr "" msgid "Installation failed" msgstr "ইনস্টলেশন ব্যর্থ হয়েছে" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "প্রতি বুটে /tmp পরিষ্কার করো" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "পুরাতন \"%s\" ড্রাইভার কালো তালিকা ভুক্ত।\n" +#~ "\n" +#~ "এটি কার্ণেল আনলোড করার সময় oops কে রিপোর্ট করে।\n" +#~ "\n" +#~ "নতুন \"%s\" শুধুমাত্র পরবর্তী বুটস্ট্র্যাপে ব্যবহৃত হবে।" + +#~ msgid "No open source driver" +#~ msgstr "কোন ওপেন সোর্স ড্রাইভার নেই" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "আপনার সাউন্ড কার্ডের (%s) জন্য কোন ফ্রী ড্রাইভার নেই, কিন্তু একটি অংশিদারী " +#~ "ড্রাইভার \"%s\"-এ আছে।" + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po index 08e405503..1f33091b1 100644 --- a/perl-install/share/po/br.po +++ b/perl-install/share/po/br.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 10.2\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-11-29 09:17+0100\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Brezhoneg \n" @@ -189,11 +189,6 @@ msgstr "Gellout a rit implij ur ger-tremen gant %s" msgid "Password (again)" msgstr "Tremenger (adarre)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Skarañ /tmp bep ma loc'her" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3100,7 +3095,17 @@ msgstr "kewerier # " msgid "Please Wait... Applying the configuration" msgstr "Gortozit mar plij, o lakaat ar c'hefluniadur" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Mollad anavez" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "N'eus sturier ebet evit ho kartenn gwelet (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Bevaat PulseAudio" @@ -3189,39 +3194,7 @@ msgstr "" msgid "Driver:" msgstr "Sturier :" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "N'eo ket ur mollad dieub" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Mollad anavez" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "N'eus sturier ebet evit ho kartenn gwelet (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Difaziañ un diaester klevet" @@ -5880,11 +5853,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servijer NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6668,6 +6646,12 @@ msgstr "" msgid "Installation failed" msgstr "Sac'het eo ar staliadur" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Skarañ /tmp bep ma loc'her" + +#~ msgid "No open source driver" +#~ msgstr "N'eo ket ur mollad dieub" + #~ msgid "command %s missing" #~ msgstr "mankout a ra an urzhiad %s" diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po index ac8833ffe..3f526cc49 100644 --- a/perl-install/share/po/bs.po +++ b/perl-install/share/po/bs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: bs\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2006-09-13 19:15+0200\n" "Last-Translator: Vedran Ljubovic \n" "Language-Team: Bosnian \n" @@ -210,11 +210,6 @@ msgstr "Ne možete koristiti šifrovani datotečni sistem za tačku montiranja % msgid "Password (again)" msgstr "Šifra (ponovo)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Očisti /tmp prilikom svakog starta" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3204,7 +3199,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Molim sačekajte... Primjenjujem konfiguraciju" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nema nijedan poznat drajver" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nema poznatih drajvera za vašu zvučnu karticu (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3307,47 +3312,7 @@ msgstr "" msgid "Driver:" msgstr "Drajver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Stari \"%s\" drajver je na crnoj listi.\n" -"\n" -"Prijavljeno je da ovaj drajver prilikom deinstalacije izaziva oops kernela.\n" -"\n" -"Stoga će novi drajver \"%s\" biti korišten tek nakon idućeg pokretanja " -"sistema." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nema open source drajver" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nema slobodnih drajvera za vašu zvučnu karticu (%s), ali postoji vlasnički " -"drajver na \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nema nijedan poznat drajver" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nema poznatih drajvera za vašu zvučnu karticu (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Rješavanje problema sa zvukom" @@ -6191,11 +6156,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7082,6 +7052,34 @@ msgstr "" msgid "Installation failed" msgstr "Instalacija nije uspjela" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Očisti /tmp prilikom svakog starta" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Stari \"%s\" drajver je na crnoj listi.\n" +#~ "\n" +#~ "Prijavljeno je da ovaj drajver prilikom deinstalacije izaziva oops " +#~ "kernela.\n" +#~ "\n" +#~ "Stoga će novi drajver \"%s\" biti korišten tek nakon idućeg pokretanja " +#~ "sistema." + +#~ msgid "No open source driver" +#~ msgstr "Nema open source drajver" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nema slobodnih drajvera za vašu zvučnu karticu (%s), ali postoji " +#~ "vlasnički drajver na \"%s\"." + #~ msgid "command %s missing" #~ msgstr "naredba %s nedostaje" diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po index 906378c54..a66bf888a 100644 --- a/perl-install/share/po/ca.po +++ b/perl-install/share/po/ca.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-06-29 11:37+0200\n" "Last-Translator: Francesc Pinyol\n" "Language-Team: Catalan \n" @@ -202,11 +202,6 @@ msgstr "No podeu fer servir una contrasenya amb %s" msgid "Password (again)" msgstr "Contrasenya (un altre cop)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Buida /tmp en cada arrencada" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3194,7 +3189,17 @@ msgstr "CPU #" msgid "Please Wait... Applying the configuration" msgstr "Espereu si us plau... s'està aplicant la configuració" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "No hi ha cap controlador conegut" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "No hi ha cap controlador conegut per a la vostra targeta de so (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Habilita PulseAudio" @@ -3298,46 +3303,7 @@ msgstr "" msgid "Driver:" msgstr "Controlador:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"L'antic controlador «%s» ha estat desaprovat.\n" -"\n" -"S'ha vist que causa problemes al nucli en descarregar-se.\n" -"\n" -"El nou controlador «%s» només s'usarà en la següent arrencada." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "No hi ha cap programa de control de codi obert" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"No hi ha cap programa de control gratuït per a la vostra targeta de so (%s), " -"però n'hi ha un de propietat a «%s»." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "No hi ha cap controlador conegut" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "No hi ha cap controlador conegut per a la vostra targeta de so (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Resolució de problemes amb el so" @@ -6078,11 +6044,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servidor NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Estableix els paràmetres de freqüència de la CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6958,6 +6929,32 @@ msgstr "" msgid "Installation failed" msgstr "La instal·lació ha fallat" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Buida /tmp en cada arrencada" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "L'antic controlador «%s» ha estat desaprovat.\n" +#~ "\n" +#~ "S'ha vist que causa problemes al nucli en descarregar-se.\n" +#~ "\n" +#~ "El nou controlador «%s» només s'usarà en la següent arrencada." + +#~ msgid "No open source driver" +#~ msgstr "No hi ha cap programa de control de codi obert" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "No hi ha cap programa de control gratuït per a la vostra targeta de so " +#~ "(%s), però n'hi ha un de propietat a «%s»." + #~ msgid "command %s missing" #~ msgstr "l'ordre %s no existeix" diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po index 4c1a0dd54..b05e3c23f 100644 --- a/perl-install/share/po/cs.po +++ b/perl-install/share/po/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2012-03-10 14:30+0000\n" "Last-Translator: Oliver Burger \n" "Language-Team: LANGUAGE \n" @@ -205,11 +205,6 @@ msgstr "Nemůžete použít heslo s %s" msgid "Password (again)" msgstr "Heslo (podruhé)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Vyčistit adresář /tmp při každém startu" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3187,7 +3182,17 @@ msgstr "cpu #" msgid "Please Wait... Applying the configuration" msgstr "Čekejte prosím... Aktivuji konfiguraci" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nebyl rozpoznán žádný ovladač" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Pro vaši zvukovou kartu (%s) není žádný známý ovladač" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Povolit PulseAudio" @@ -3289,46 +3294,7 @@ msgstr "" msgid "Driver:" msgstr "Ovladač:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Starší ovladač \"%s\" je na černé listině.\n" -"\n" -"Bylo u něj zjištěno, že při odebrání způsobí pád jádra.\n" -"\n" -"Při dalším spuštění bude použit pouze nový ovladač \"%s\" " - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Není dostupný žádný open source ovladač" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Pro vaši zvukovou kartu (%s) není žádný vhodný volně použitelný ovladač, ale " -"existuje alternativní proprietární ovladač na \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nebyl rozpoznán žádný ovladač" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Pro vaši zvukovou kartu (%s) není žádný známý ovladač" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Řešení problémů se zvukem" @@ -6127,11 +6093,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi je démon ZeroConf implementující vrstvu mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Nastavit volby frekvence CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7030,6 +7001,32 @@ msgstr "" msgid "Installation failed" msgstr "Instalace selhala" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Vyčistit adresář /tmp při každém startu" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Starší ovladač \"%s\" je na černé listině.\n" +#~ "\n" +#~ "Bylo u něj zjištěno, že při odebrání způsobí pád jádra.\n" +#~ "\n" +#~ "Při dalším spuštění bude použit pouze nový ovladač \"%s\" " + +#~ msgid "No open source driver" +#~ msgstr "Není dostupný žádný open source ovladač" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Pro vaši zvukovou kartu (%s) není žádný vhodný volně použitelný ovladač, " +#~ "ale existuje alternativní proprietární ovladač na \"%s\"." + #~ msgid "command %s missing" #~ msgstr "chybí příkaz %s" diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po index 6bb42e9a6..ea5ab9cbf 100644 --- a/perl-install/share/po/cy.po +++ b/perl-install/share/po/cy.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia DrakX.cy\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2009-10-01 20:12-0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg \n" @@ -205,11 +205,6 @@ msgstr "Nid oes modd defnyddio cyfrinair gyda %s" msgid "Password (again)" msgstr "Cyfrinair (eto)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3191,7 +3186,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Arhoswch...Gosod y ffurfweddiad" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Dim gyrrwr hysbys" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nid oes gyrrwr hysbys ar gyfer eich cerdyn sain (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Galluogi PulseAudio" @@ -3295,46 +3300,7 @@ msgstr "" msgid "Driver:" msgstr "Gyrrwr:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n" -"\n" -"Mae'n effeithio'n andwyol ar y cnewyllyn\n" -"\n" -"Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Dim gyrrwr cod agored" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr " -"perchnogol yn \"%s\" ." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Dim gyrrwr hysbys" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nid oes gyrrwr hysbys ar gyfer eich cerdyn sain (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Datrys problemau sain" @@ -6178,11 +6144,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Gweinydd NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7084,6 +7055,32 @@ msgstr "" msgid "Installation failed" msgstr "Methodd y gosod" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n" +#~ "\n" +#~ "Mae'n effeithio'n andwyol ar y cnewyllyn\n" +#~ "\n" +#~ "Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn" + +#~ msgid "No open source driver" +#~ msgstr "Dim gyrrwr cod agored" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr " +#~ "perchnogol yn \"%s\" ." + #~ msgid "command %s missing" #~ msgstr "gorchymyn %s ar goll" diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po index 900ba78e6..8ffcd4af6 100644 --- a/perl-install/share/po/da.po +++ b/perl-install/share/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: da\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-06-06 12:39+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -210,11 +210,6 @@ msgstr "Du kan ikke bruge en adgangskode med %s" msgid "Password (again)" msgstr "Adgangskode (igen)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Rens /tmp ved hver systemopstart" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3196,7 +3191,17 @@ msgstr "cpu-nummer " msgid "Please Wait... Applying the configuration" msgstr "Vent venligst... Sætter konfigurationen i anvendelse" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ingen kendt driverrutine" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Der findes intet kendt drivprogram for lydkortet (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Aktivér PulseAudio" @@ -3299,46 +3304,7 @@ msgstr "" msgid "Driver:" msgstr "Drivprogram:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Den gamle \"%s\"-driver er sortlistet.\n" -"\n" -"Den er blevet rapporteret at lave fejl i kernen ved afslutningen.\n" -"\n" -"Den nye \"%s\"-driver vil først blive brugt ved næste systemopstart." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ingen open source driverrutine" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Der findes ingen fri driver for lydkortet (%s) men der er en leverandørejet " -"driver på '%s'" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ingen kendt driverrutine" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Der findes intet kendt drivprogram for lydkortet (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Problemløsning omkring lyd" @@ -6162,11 +6128,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi er en ZeroConf-dæmon som implementerer en mDNS-stak" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Opsæt indstillinger for CPU-frekvens" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7068,6 +7039,32 @@ msgstr "" msgid "Installation failed" msgstr "Installation mislykkedes" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Rens /tmp ved hver systemopstart" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Den gamle \"%s\"-driver er sortlistet.\n" +#~ "\n" +#~ "Den er blevet rapporteret at lave fejl i kernen ved afslutningen.\n" +#~ "\n" +#~ "Den nye \"%s\"-driver vil først blive brugt ved næste systemopstart." + +#~ msgid "No open source driver" +#~ msgstr "Ingen open source driverrutine" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Der findes ingen fri driver for lydkortet (%s) men der er en " +#~ "leverandørejet driver på '%s'" + #~ msgid "command %s missing" #~ msgstr "kommando %s mangler" diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po index 7d0c511fc..7ad3fe087 100644 --- a/perl-install/share/po/de.po +++ b/perl-install/share/po/de.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-01-09 09:58+0100\n" "Last-Translator: Oliver Burger \n" "Language-Team: German \n" @@ -208,11 +208,6 @@ msgstr "Sie können kein Passwort mit %s benutzen" msgid "Password (again)" msgstr "Passwort (erneut)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr " „/tmp“ bei jedem Systemstart säubern" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3251,7 +3246,17 @@ msgstr "CPU #" msgid "Please Wait... Applying the configuration" msgstr "Einen Moment ... Die Konfiguration wird eingerichtet" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Kein bekannter Treiber" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Es gibt keinen bekannten Treiber für Ihre Soundkarte (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio aktivieren" @@ -3354,46 +3359,7 @@ msgstr "" msgid "Driver:" msgstr "Treiber:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Der alte „%s“-Treiber steht auf einer schwarzen Liste.\n" -"\n" -"Der Treiber soll Fehlfunktionen verursachen.\n" -"\n" -"Der neue „%s“-Treiber steht nach einem Neustart zur Verfügung." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Kein OpenSource-Treiber" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Es existiert kein freier Treiber für Ihre Soundkarte (%s), aber es gibt " -"einen proprietären Treiber unter „%s“." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Kein bekannter Treiber" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Es gibt keinen bekannten Treiber für Ihre Soundkarte (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Soundprobleme beheben" @@ -6261,11 +6227,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi ist ein ZeroConf Dämon, der einen mDNS-Stack implementiert. " #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-Server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Richte die CPU-Frequenz-Einstellungen ein" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7199,6 +7170,32 @@ msgstr "" msgid "Installation failed" msgstr "Die Installation schlug fehl" +#~ msgid "Clean /tmp at each boot" +#~ msgstr " „/tmp“ bei jedem Systemstart säubern" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Der alte „%s“-Treiber steht auf einer schwarzen Liste.\n" +#~ "\n" +#~ "Der Treiber soll Fehlfunktionen verursachen.\n" +#~ "\n" +#~ "Der neue „%s“-Treiber steht nach einem Neustart zur Verfügung." + +#~ msgid "No open source driver" +#~ msgstr "Kein OpenSource-Treiber" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Es existiert kein freier Treiber für Ihre Soundkarte (%s), aber es gibt " +#~ "einen proprietären Treiber unter „%s“." + #~ msgid "command %s missing" #~ msgstr "Kommando %s fehlt" diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po index 0ddc423a3..2afe9166a 100644 --- a/perl-install/share/po/el.po +++ b/perl-install/share/po/el.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-14 09:32+0200\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" @@ -219,11 +219,6 @@ msgstr "Δεν μπορείτε να χρησιμοποιήσετε έναν κ msgid "Password (again)" msgstr "Κωδικός πρόσβασης (ξανά)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Καθαρισμός του φακέλου /tmp σε κάθε εκκίνηση" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3264,7 +3259,17 @@ msgstr "επεξεργαστής # " msgid "Please Wait... Applying the configuration" msgstr "Παρακαλώ περιμένετε... Εφαρμογή των ρυθμίσεων" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Κανένας γνωστός οδηγός" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Δεν υπάρχει κάποιος γνωστός οδηγός για την κάρτα ήχου σας (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Ενεργοποίηση του PulseAudio" @@ -3369,46 +3374,7 @@ msgstr "" msgid "Driver:" msgstr "Οδηγός:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Ο παλιός οδηγός «%s» είναι στη μαύρη λίστα.\n" -"\n" -"Έχουν αναφερθεί προβλήματα στον πυρήνα κατά τον τερματισμό του.\n" -"\n" -"Ο νέος οδηγός «%s» θα χρησιμοποιηθεί στην επόμενη εκκίνηση." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Κανένας οδηγός ανοιχτού κώδικα" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Δεν υπάρχει κάποιος ελεύθερος οδηγός συσκευής για την κάρτα ήχου σας (%s), " -"υπάρχει όμως ένας ιδιόκτητος οδηγός στο «%s»." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Κανένας γνωστός οδηγός" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Δεν υπάρχει κάποιος γνωστός οδηγός για την κάρτα ήχου σας (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Αντιμετώπιση προβλημάτων ήχου" @@ -6360,11 +6326,16 @@ msgstr "" "Το avahi είναι ένας ZeroConf δαίμονας ο οποίος ενσωματώνει ένα στρώμα mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Εξυπηρετητής NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Καθορισμός ρυθμίσεων της συχνότητας του επεξεργαστή" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7298,6 +7269,32 @@ msgstr "" msgid "Installation failed" msgstr "Η εγκατάσταση απέτυχε" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Καθαρισμός του φακέλου /tmp σε κάθε εκκίνηση" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Ο παλιός οδηγός «%s» είναι στη μαύρη λίστα.\n" +#~ "\n" +#~ "Έχουν αναφερθεί προβλήματα στον πυρήνα κατά τον τερματισμό του.\n" +#~ "\n" +#~ "Ο νέος οδηγός «%s» θα χρησιμοποιηθεί στην επόμενη εκκίνηση." + +#~ msgid "No open source driver" +#~ msgstr "Κανένας οδηγός ανοιχτού κώδικα" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Δεν υπάρχει κάποιος ελεύθερος οδηγός συσκευής για την κάρτα ήχου σας " +#~ "(%s), υπάρχει όμως ένας ιδιόκτητος οδηγός στο «%s»." + #~ msgid "command %s missing" #~ msgstr "η εντολή %s λείπει" diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po index 4aa59d58c..cb2aa2eaf 100644 --- a/perl-install/share/po/eo.po +++ b/perl-install/share/po/eo.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2003-03-12 18:31-0400\n" "Last-Translator: Vilhelmo Lutermano \n" "Language-Team: esperanto \n" @@ -192,11 +192,6 @@ msgstr "Vi ne povas uzi kriptan dosiersistemon por surmetingo %s" msgid "Password (again)" msgstr "Pasvorto (denove)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Purigu /tmp dum ĉiuj startadoj" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3116,7 +3111,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Bonvole atendu... Mi aplikas la konfiguraĵon" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nenia konata pelilo" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Ne ekzistas konata pelilo por via sonkarto (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3203,41 +3208,7 @@ msgstr "" msgid "Driver:" msgstr "Pelilo:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nenia liberfonta pelilo" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Ne ekzistas libera pelilo por via sonkarto (%s), sed ekzistas proprieta " -"pelilo ĉe \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nenia konata pelilo" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Ne ekzistas konata pelilo por via sonkarto (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5907,11 +5878,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Servilo" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6775,6 +6751,19 @@ msgstr "" msgid "Installation failed" msgstr "Instalado malsukcesis" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Purigu /tmp dum ĉiuj startadoj" + +#~ msgid "No open source driver" +#~ msgstr "Nenia liberfonta pelilo" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Ne ekzistas libera pelilo por via sonkarto (%s), sed ekzistas proprieta " +#~ "pelilo ĉe \"%s\"." + #~ msgid "" #~ "Launch packet filtering for Linux kernel 2.2 series, to set\n" #~ "up a firewall to protect your machine from network attacks." diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po index a22ec3880..0aed2348b 100644 --- a/perl-install/share/po/es.po +++ b/perl-install/share/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-06 20:41-0500\n" "Last-Translator: Diego Bello \n" "Language-Team: Spanish \n" @@ -206,11 +206,6 @@ msgstr "No puede usar una contraseña con %s" msgid "Password (again)" msgstr "Contraseña (de nuevo)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Limpiar /tmp en cada inicio del equipo" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3223,7 +3218,17 @@ msgstr "cpu #" msgid "Please Wait... Applying the configuration" msgstr "Espere, por favor... Aplicando la configuración" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "No hay controlador conocido" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "No hay un controlador conocido para su tarjeta de sonido (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Habilitar PulseAudio" @@ -3326,46 +3331,7 @@ msgstr "" msgid "Driver:" msgstr "Controlador:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"El controlador antiguo \"%s\" está en la lista negra.\n" -"\n" -"Ha sido reportado como problemático para el núcleo al descargarlo.\n" -"\n" -"El controlador nuevo \"%s\" sólo se utilizará en el próximo arranque." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "No hay controlador de código libre" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"No hay controlador libre para su tarjeta de sonido (%s), pero hay uno " -"propietario en \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "No hay controlador conocido" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "No hay un controlador conocido para su tarjeta de sonido (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Solución de problemas de sonido" @@ -6297,11 +6263,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi es un demonio ZeroConf que implementa una pila mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servidor NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Establecer los parámetros de frecuencia de CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7231,6 +7202,32 @@ msgstr "" msgid "Installation failed" msgstr "Falló la instalación" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Limpiar /tmp en cada inicio del equipo" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "El controlador antiguo \"%s\" está en la lista negra.\n" +#~ "\n" +#~ "Ha sido reportado como problemático para el núcleo al descargarlo.\n" +#~ "\n" +#~ "El controlador nuevo \"%s\" sólo se utilizará en el próximo arranque." + +#~ msgid "No open source driver" +#~ msgstr "No hay controlador de código libre" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "No hay controlador libre para su tarjeta de sonido (%s), pero hay uno " +#~ "propietario en \"%s\"." + #~ msgid "command %s missing" #~ msgstr "falta el comando %s" diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po index 77f0ee266..8ca0a5d06 100644 --- a/perl-install/share/po/et.po +++ b/perl-install/share/po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-05-05 23:21+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: LANGUAGE \n" @@ -206,11 +206,6 @@ msgstr "%s puhul ei saa parooli kasutada" msgid "Password (again)" msgstr "Parool (uuesti)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "/tmp puhastatakse igal käivitumisel" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3182,7 +3177,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Palun oodake... Rakendatakse seadistused" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Draiverit ei õnnestunud tuvastada" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio lubamine" @@ -3285,46 +3290,7 @@ msgstr "" msgid "Driver:" msgstr "Draiver: " -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Vana \"%s\" draiver on mustas nimekirjas.\n" -"\n" -"On teatatud, et see tekitab mahalaadimisel kernelile jama.\n" -"\n" -"Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Vabavara-draiver puudub" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Pole teada ühtegi vabavara-draiverit Teie helikaardile (%s), kuid on olemas " -"tootja draiver, mille asukoht on \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Draiverit ei õnnestunud tuvastada" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Heliprobleemide lahendamine" @@ -6227,11 +6193,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi on Zeroconfi deemon, mis teostab mDNS protokollistikku" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Protsessori sageduse kindlaks määramine" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7120,6 +7091,32 @@ msgstr "" msgid "Installation failed" msgstr "Paigaldamine nurjus" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "/tmp puhastatakse igal käivitumisel" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Vana \"%s\" draiver on mustas nimekirjas.\n" +#~ "\n" +#~ "On teatatud, et see tekitab mahalaadimisel kernelile jama.\n" +#~ "\n" +#~ "Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel." + +#~ msgid "No open source driver" +#~ msgstr "Vabavara-draiver puudub" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Pole teada ühtegi vabavara-draiverit Teie helikaardile (%s), kuid on " +#~ "olemas tootja draiver, mille asukoht on \"%s\"." + #~ msgid "command %s missing" #~ msgstr "käsk %s puudub" diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po index 59898bea9..b6bd9d2f1 100644 --- a/perl-install/share/po/eu.po +++ b/perl-install/share/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-06-29 13:27+0200\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque \n" @@ -209,11 +209,6 @@ msgstr "Ezin duzu %s-rekin pasahitz bat erabili" msgid "Password (again)" msgstr "Pasahitza (berriro)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Garbitu /tmp abiatzen den bakoitzean" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3204,7 +3199,17 @@ msgstr "puz zk. " msgid "Please Wait... Applying the configuration" msgstr "Itxaron mesedez... Konfiguraketa aplikatzen" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Kontrolatzaile ezagunik ez" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Ez dago soinu txartelarentzako (%s) kontrolatzaile ezagunik" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio gaitu" @@ -3307,47 +3312,7 @@ msgstr "" msgid "Driver:" msgstr "Kontrolatzailea:" -# unloading : deskargatu ???? zama???? -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"\"%s\" kontrolatzaile zaharra zerrenda beltzean dago.\n" -"\n" -"Deskargatzean nukleoa trabatzen duela jakinarazi dute.\n" -"\n" -"\"%s\" kontrolatzaile berria ez da erabiliko makina berriz abiarazi arte." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Iturburu irekiko kontrolatzailerik ez" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Ez dago kontrolatzaile librerik zure soinu txartelarentzat (%s), baina " -"badago kontrolatzaile jabedun bat \"%s\"(e)n." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Kontrolatzaile ezagunik ez" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Ez dago soinu txartelarentzako (%s) kontrolatzaile ezagunik" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Soinu-arazoak konpontzea" @@ -6205,11 +6170,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi mDNS pila bat inplementatzen duen ZeroConf deabru bat da" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Zerbitzaria" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Ezarri PUZ maiztasunaren ezarpenak" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7123,6 +7093,33 @@ msgstr "" msgid "Installation failed" msgstr "Instalazioak huts egin du" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Garbitu /tmp abiatzen den bakoitzean" + +# unloading : deskargatu ???? zama???? +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "\"%s\" kontrolatzaile zaharra zerrenda beltzean dago.\n" +#~ "\n" +#~ "Deskargatzean nukleoa trabatzen duela jakinarazi dute.\n" +#~ "\n" +#~ "\"%s\" kontrolatzaile berria ez da erabiliko makina berriz abiarazi arte." + +#~ msgid "No open source driver" +#~ msgstr "Iturburu irekiko kontrolatzailerik ez" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Ez dago kontrolatzaile librerik zure soinu txartelarentzat (%s), baina " +#~ "badago kontrolatzaile jabedun bat \"%s\"(e)n." + #~ msgid "command %s missing" #~ msgstr "%s komandoa falta da" diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po index 52881805c..5310640fe 100644 --- a/perl-install/share/po/fa.po +++ b/perl-install/share/po/fa.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-fa\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-02-26 06:31+0100\n" "Last-Translator: Abbas Izad \n" "Language-Team: Persian\n" @@ -207,11 +207,6 @@ msgstr "" msgid "Password (again)" msgstr "گذرواژه (دوباره)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "پاک کردن شاخه‌ی /tmp در هر آغازگری" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3177,7 +3172,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "لطفاً صبر کنید... در حال بکار بستن پیکربندی" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "هیچ راه‌انداز آشنایی" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "راه‌انداز شناخته شده‌ای برای کارت صوت (%s) شما وجود ندارد" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3281,46 +3286,7 @@ msgstr "" msgid "Driver:" msgstr "راه‌انداز:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"راه‌انداز قدیمی \"%s\" در لیست سیاه است.\n" -"\n" -"این برای برداشتن از هسته گزارش شده است.\n" -"\n" -"راه‌انداز جدید \"%s\" فقط در bootstrap بعدی استفاده خواهد شد." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "هیچ راه‌انداز منبع آزاد" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"هیچ راه‌انداز آزاد برای کارت صوتی شما (%s) وجود ندارد، اما یک راه‌انداز تجاری " -"در \"%s\" وجود دارد." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "هیچ راه‌انداز آشنایی" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "راه‌انداز شناخته شده‌ای برای کارت صوت (%s) شما وجود ندارد" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "اشکال‌زدایی صوت" @@ -6123,11 +6089,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "کارگزار NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7013,6 +6984,32 @@ msgstr "" msgid "Installation failed" msgstr "نصب شکست خورد" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "پاک کردن شاخه‌ی /tmp در هر آغازگری" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "راه‌انداز قدیمی \"%s\" در لیست سیاه است.\n" +#~ "\n" +#~ "این برای برداشتن از هسته گزارش شده است.\n" +#~ "\n" +#~ "راه‌انداز جدید \"%s\" فقط در bootstrap بعدی استفاده خواهد شد." + +#~ msgid "No open source driver" +#~ msgstr "هیچ راه‌انداز منبع آزاد" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "هیچ راه‌انداز آزاد برای کارت صوتی شما (%s) وجود ندارد، اما یک راه‌انداز " +#~ "تجاری در \"%s\" وجود دارد." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po index ff809f483..425d91b01 100644 --- a/perl-install/share/po/fi.po +++ b/perl-install/share/po/fi.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX-fi\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2011-08-08 22:43+0300\n" "Last-Translator: Jani Välimaa \n" "Language-Team: Finnish \n" @@ -217,11 +217,6 @@ msgstr "Et voi käyttää salasanaa %s kanssa" msgid "Password (again)" msgstr "Salasana (uudelleen)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Tyhjennä /tmp jokaisella käynnistyskerralla" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3234,7 +3229,17 @@ msgstr "CPU # " msgid "Please Wait... Applying the configuration" msgstr "Odota hetki... Otetaan asetukset käyttöön" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ei tunnettua ajuria" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Ei tunnettua ajuria äänikortillesi (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Ota PulseAudio käyttöön" @@ -3336,46 +3341,7 @@ msgstr "" msgid "Driver:" msgstr "Ajuri:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Vanha ajuri \"%s\" \"mustalla listalla\".\n" -"\n" -"Sen on raportoitu kaatavan ytimen, kun sitä poistetaan käytöstä.\n" -"\n" -"Uusi ajuri \"%s\" otetaan käyttöön seuraavassa käynnistyksessä." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ei avoimen lähdekoodin ajuria" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Äänikortille \"%s\" ei löydy vapaata ajuria, mutta suljettu ajuri löytyy " -"osoitteesta \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ei tunnettua ajuria" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Ei tunnettua ajuria äänikortillesi (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Äänen vianetsintä" @@ -6338,11 +6304,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi on ZeroConf-taustaprosessi, joka toteuttaa mDNS-pinon" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-palvelin" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Asettaa prosessorin kellotaajuuden asetukset" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7243,6 +7214,32 @@ msgstr "" msgid "Installation failed" msgstr "Asennus epäonnistui" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Tyhjennä /tmp jokaisella käynnistyskerralla" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Vanha ajuri \"%s\" \"mustalla listalla\".\n" +#~ "\n" +#~ "Sen on raportoitu kaatavan ytimen, kun sitä poistetaan käytöstä.\n" +#~ "\n" +#~ "Uusi ajuri \"%s\" otetaan käyttöön seuraavassa käynnistyksessä." + +#~ msgid "No open source driver" +#~ msgstr "Ei avoimen lähdekoodin ajuria" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Äänikortille \"%s\" ei löydy vapaata ajuria, mutta suljettu ajuri löytyy " +#~ "osoitteesta \"%s\"." + #~ msgid "command %s missing" #~ msgstr "komento %s puuttuu" diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po index 152668e09..c3950a035 100644 --- a/perl-install/share/po/fr.po +++ b/perl-install/share/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-25 00:16+0100\n" "Last-Translator: Yann Ciret \n" "Language-Team: French \n" @@ -210,11 +210,6 @@ msgstr "Vous ne pouvez pas utiliser de mot de passe avec %s" msgid "Password (again)" msgstr "Mot de passe (vérification)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Vider le dossier /tmp à chaque démarrage" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3243,7 +3238,17 @@ msgstr "processeur n°" msgid "Please Wait... Applying the configuration" msgstr "Veuillez patienter… Mise en place de la configuration" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Aucun pilote connu" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Il n'y a pas de pilote connu pour votre carte son (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Activer PulseAudio" @@ -3346,47 +3351,7 @@ msgstr "" msgid "Driver:" msgstr "Pilote :" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"L'ancien pilote « %s » est sur liste noire.\n" -"\n" -"Plusieurs personnes ont rapporté des problèmes avec le noyau lors de son " -"arrêt.\n" -"\n" -"Le nouveau pilote « %s » ne sera utilisé qu'au prochain démarrage." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Pas de pilote open-source" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Il n'existe pas de pilote libre pour votre carte son (%s), mais il en existe " -"un propriétaire à « %s »." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Aucun pilote connu" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Il n'y a pas de pilote connu pour votre carte son (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Dépannage du son" @@ -6311,11 +6276,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi est un service ZeroConf qui implémente une pile mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Serveur NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Définir les paramètres de fréquence CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7245,6 +7215,33 @@ msgstr "" msgid "Installation failed" msgstr "Échec de l'installation" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Vider le dossier /tmp à chaque démarrage" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "L'ancien pilote « %s » est sur liste noire.\n" +#~ "\n" +#~ "Plusieurs personnes ont rapporté des problèmes avec le noyau lors de son " +#~ "arrêt.\n" +#~ "\n" +#~ "Le nouveau pilote « %s » ne sera utilisé qu'au prochain démarrage." + +#~ msgid "No open source driver" +#~ msgstr "Pas de pilote open-source" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Il n'existe pas de pilote libre pour votre carte son (%s), mais il en " +#~ "existe un propriétaire à « %s »." + #~ msgid "command %s missing" #~ msgstr "commande %s manquante" diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po index 5ce8e5779..da3ef710e 100644 --- a/perl-install/share/po/fur.po +++ b/perl-install/share/po/fur.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-06-28 17:41+0200\n" "Last-Translator: Andrea Gracco \n" "Language-Team: furlan \n" @@ -187,11 +187,6 @@ msgstr "" msgid "Password (again)" msgstr "Password (ancjemò)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Nete /tmp a ducj i inviaments" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3023,7 +3018,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3104,39 +3109,7 @@ msgstr "" msgid "Driver:" msgstr "" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5754,11 +5727,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6480,6 +6458,9 @@ msgstr "" msgid "Installation failed" msgstr "Instalazion falade" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Nete /tmp a ducj i inviaments" + #~ msgid "File sharing" #~ msgstr "Condivision file" diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po index 4d074610a..8b5512fb7 100644 --- a/perl-install/share/po/ga.po +++ b/perl-install/share/po/ga.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-09-12 18:04+0200\n" "Last-Translator: Alastair McKinstry \n" "Language-Team: Irish \n" @@ -185,11 +185,6 @@ msgstr "" msgid "Password (again)" msgstr "Pasfhocal (arís)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Glan /tmp nuair a thosnaigh an coráis" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3024,7 +3019,17 @@ msgstr "LAP # " msgid "Please Wait... Applying the configuration" msgstr "Fan tamall... ag cur na cumraíochta i bhfeidhm" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3105,39 +3110,7 @@ msgstr "" msgid "Driver:" msgstr "Tiománaí:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5794,11 +5767,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Freastalaí NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6518,6 +6496,9 @@ msgstr "" msgid "Installation failed" msgstr "Theip ar shuiteáil" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Glan /tmp nuair a thosnaigh an coráis" + #~ msgid "File sharing" #~ msgstr "Roinnt na gComhad" diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po index a13f04961..27393862e 100644 --- a/perl-install/share/po/gl.po +++ b/perl-install/share/po/gl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX-gl\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2009-09-25 18:43+0200\n" "Last-Translator: Alejo Pacín Jul \n" "Language-Team: Galician \n" @@ -211,11 +211,6 @@ msgstr "Non pode usar un contrasinal con %s" msgid "Password (again)" msgstr "Contrasinal (de novo)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Baleirar /tmp en cada arrinque" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3208,7 +3203,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Por Favor, Agarde... Aplicando a configuración" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Controlador descoñecido" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Non hai ningún driver coñecido para a súa tarxeta de son (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Habilitar PulseAudio" @@ -3311,46 +3316,7 @@ msgstr "" msgid "Driver:" msgstr "Controlador:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"O antigo driver \"%s\" está na lista negra.\n" -"\n" -"Comunicouse que bloquea o kernel ó descargarse.\n" -"\n" -"Só se usará o novo driver \"%s\" no seguinte inicio." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Non hai un controlador de código aberto" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Non hai un driver libre para a súa tarxeta de son (%s), pero hai un driver " -"propietario en \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Controlador descoñecido" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Non hai ningún driver coñecido para a súa tarxeta de son (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Solución de problemas co son" @@ -6222,11 +6188,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servidor NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7118,6 +7089,32 @@ msgstr "" msgid "Installation failed" msgstr "Fallou a instalación" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Baleirar /tmp en cada arrinque" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "O antigo driver \"%s\" está na lista negra.\n" +#~ "\n" +#~ "Comunicouse que bloquea o kernel ó descargarse.\n" +#~ "\n" +#~ "Só se usará o novo driver \"%s\" no seguinte inicio." + +#~ msgid "No open source driver" +#~ msgstr "Non hai un controlador de código aberto" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Non hai un driver libre para a súa tarxeta de son (%s), pero hai un " +#~ "driver propietario en \"%s\"." + #~ msgid "command %s missing" #~ msgstr "Non se atopa o comando %s" diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po index e188ff6fe..24a2b4a5e 100644 --- a/perl-install/share/po/he.po +++ b/perl-install/share/po/he.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2008-03-24 03:26+0200\n" "Last-Translator: Dotan Kamber \n" "Language-Team: Hebrew\n" @@ -210,11 +210,6 @@ msgstr "אסור להשתמש בסיסמה עם %s" msgid "Password (again)" msgstr "סיסמה (שוב)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "ניקוי קבצים זמניים בספריית tmp/ בכל אתחול" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3154,7 +3149,17 @@ msgstr "מעבד # " msgid "Please Wait... Applying the configuration" msgstr "נא להמתין... מיישם את ההגדרות" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "אין מנהל התקן ידוע" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "אין פה מנהל התקן ידוע לכרטיס הקול שלך (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "אפשר את PulseAudio" @@ -3253,46 +3258,7 @@ msgstr "" msgid "Driver:" msgstr "מנהל התקן:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"התקן ההינע הישן \"%s\" נמצא ברשימה השחורה.\n" -"\n" -"דווח כי הוא גורם לתקלה קריטית בגלעין המערכת בעת הסרה.\n" -"\n" -"התקן ההינע החדש \"%s\" יכנס לשימוש בתהליך האתחול הבא." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "אין מנהל התקן בקוד פתוח" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"לא קיים מנהל התקן חופשי עבור כרטיס המסך שלך (%s), אבל קיים מנהל התקן קנייני " -"באתר \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "אין מנהל התקן ידוע" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "אין פה מנהל התקן ידוע לכרטיס הקול שלך (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "פתרון בעיות קול" @@ -6105,11 +6071,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "שרת NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6994,6 +6965,32 @@ msgstr "" msgid "Installation failed" msgstr "ההתקנה נכשלה" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "ניקוי קבצים זמניים בספריית tmp/ בכל אתחול" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "התקן ההינע הישן \"%s\" נמצא ברשימה השחורה.\n" +#~ "\n" +#~ "דווח כי הוא גורם לתקלה קריטית בגלעין המערכת בעת הסרה.\n" +#~ "\n" +#~ "התקן ההינע החדש \"%s\" יכנס לשימוש בתהליך האתחול הבא." + +#~ msgid "No open source driver" +#~ msgstr "אין מנהל התקן בקוד פתוח" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "לא קיים מנהל התקן חופשי עבור כרטיס המסך שלך (%s), אבל קיים מנהל התקן " +#~ "קנייני באתר \"%s\"." + #~ msgid "command %s missing" #~ msgstr "הפקודה %s חסרה" diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po index b7fab6806..a36a9ec5a 100644 --- a/perl-install/share/po/hi.po +++ b/perl-install/share/po/hi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-hi\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-04-04 21:54+0530\n" "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) \n" "Language-Team: हिन्दी (Hindi) \n" @@ -197,11 +197,6 @@ msgstr "आरोह बिन्दु %s के लिए आप एक गू msgid "Password (again)" msgstr "कूट-शब्द (पुनः बतायें)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "/tmp निर्देशिका को प्रत्येक बूट के समय साफ़ करें" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3152,7 +3147,17 @@ msgstr "सीपीयू #" msgid "Please Wait... Applying the configuration" msgstr "कृपया प्रतीक्षा करें... संरचना को लागू करें" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "कोई ज्ञात चालक नहीं" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "आपके सांउड कार्ड (%s) के लिए कोई ज्ञात चालक नहीं है" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3255,46 +3260,7 @@ msgstr "" msgid "Driver:" msgstr "चालक:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"प्राचीन \"%s\" चालक को अयोग्य घोषित कर दिया गया है।\n" -"\n" -"अनलोडिंग करने पर, इसे कर्नल को ऊप्स करने के लिए रिपोर्ट किया जा चुका है।\n" -"\n" -"आगामी बूटस्ट्रैप के समय ही सिर्फ़ नये चालक \"%s\" का उपयोग किया जायेगा।" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "कोई मुक्त स्रोत चालक नहीं" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"आपके साउन्ड कार्ड (%s) के लिए को निशुल्क चालक नहीं है, परन्तु \"%s\" पर एक स्वामिगत " -"चालक है ।" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "कोई ज्ञात चालक नहीं" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "आपके सांउड कार्ड (%s) के लिए कोई ज्ञात चालक नहीं है" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "सांउड समस्या के निवारण हेतु खोज़" @@ -6092,11 +6058,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "एन०टी०पी० सर्वर" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6842,6 +6813,32 @@ msgstr "" msgid "Installation failed" msgstr "संसाधन असफ़ल" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "/tmp निर्देशिका को प्रत्येक बूट के समय साफ़ करें" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "प्राचीन \"%s\" चालक को अयोग्य घोषित कर दिया गया है।\n" +#~ "\n" +#~ "अनलोडिंग करने पर, इसे कर्नल को ऊप्स करने के लिए रिपोर्ट किया जा चुका है।\n" +#~ "\n" +#~ "आगामी बूटस्ट्रैप के समय ही सिर्फ़ नये चालक \"%s\" का उपयोग किया जायेगा।" + +#~ msgid "No open source driver" +#~ msgstr "कोई मुक्त स्रोत चालक नहीं" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "आपके साउन्ड कार्ड (%s) के लिए को निशुल्क चालक नहीं है, परन्तु \"%s\" पर एक स्वामिगत " +#~ "चालक है ।" + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po index 14f98316e..f85c49496 100644 --- a/perl-install/share/po/hr.po +++ b/perl-install/share/po/hr.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 0\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-01-04 21:25+CET\n" "Last-Translator: auto\n" "Language-Team: Croatian \n" @@ -201,11 +201,6 @@ msgstr "" msgid "Password (again)" msgstr "Lozinka (provjera)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Očisti /tmp na svakom podizanju" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3149,7 +3144,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Molimo pričekajte... Primjenjujem konfiguraciju" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, fuzzy, c-format +msgid "No known driver" +msgstr "X upravljački program" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3230,39 +3235,7 @@ msgstr "" msgid "Driver:" msgstr "Upravljački program:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, fuzzy, c-format -msgid "No open source driver" -msgstr "X upravljački program" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, fuzzy, c-format -msgid "No known driver" -msgstr "X upravljački program" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -6057,11 +6030,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Poslužitelj" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6882,6 +6860,13 @@ msgstr "" msgid "Installation failed" msgstr "Instalacija nije uspjela" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Očisti /tmp na svakom podizanju" + +#, fuzzy +#~ msgid "No open source driver" +#~ msgstr "X upravljački program" + #~ msgid "" #~ "Launch packet filtering for Linux kernel 2.2 series, to set\n" #~ "up a firewall to protect your machine from network attacks." diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po index 02b04795b..89408cd30 100644 --- a/perl-install/share/po/hu.po +++ b/perl-install/share/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX-2010.1\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-06-20 19:10+0100\n" "Last-Translator: Gergely Lónyai \n" "Language-Team: Hungarian \n" @@ -213,11 +213,6 @@ msgstr "Nem használható jelszó ezzel: %s" msgid "Password (again)" msgstr "Jelszó (még egyszer)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "A /tmp törlése minden újraindulásnál" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3222,7 +3217,17 @@ msgstr "CPU # " msgid "Please Wait... Applying the configuration" msgstr "Kis türelmet - a beállítások módosítása" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nincs ismert meghajtó" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nincs ismert meghajtó a hangkártyához (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio engedélyezése" @@ -3327,47 +3332,7 @@ msgstr "" msgid "Driver:" msgstr "Meghajtó:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"A régi \"%s\" meghajtóval gondok lehetnek.\n" -"\n" -"Leállításkor problémákat okozhat a kernelben.\n" -"\n" -"Az új \"%s\" meghajtó csak a következő indítástól kezdve lesz használva." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nincs nyílt forrású meghajtó" - -# a 2. %s egy drivert jelöl -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nincs szabadon használható meghajtó a hangkártyához (%s), viszont létezik " -"kötött licencelésű meghajtó: \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nincs ismert meghajtó" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nincs ismert meghajtó a hangkártyához (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Hangprobléma elhárítása" @@ -6275,11 +6240,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Az Avahi egy ZeroConf démon, ami egy mDNS implementáció" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP kiszolgáló" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "CPU frekvencia beállítása" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7196,6 +7166,33 @@ msgstr "" msgid "Installation failed" msgstr "A telepítés hibával ért véget." +#~ msgid "Clean /tmp at each boot" +#~ msgstr "A /tmp törlése minden újraindulásnál" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "A régi \"%s\" meghajtóval gondok lehetnek.\n" +#~ "\n" +#~ "Leállításkor problémákat okozhat a kernelben.\n" +#~ "\n" +#~ "Az új \"%s\" meghajtó csak a következő indítástól kezdve lesz használva." + +#~ msgid "No open source driver" +#~ msgstr "Nincs nyílt forrású meghajtó" + +# a 2. %s egy drivert jelöl +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nincs szabadon használható meghajtó a hangkártyához (%s), viszont létezik " +#~ "kötött licencelésű meghajtó: \"%s\"." + #~ msgid "command %s missing" #~ msgstr "hiányzó parancs: %s" diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po index 16e7c2b13..9528c034f 100644 --- a/perl-install/share/po/id.po +++ b/perl-install/share/po/id.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-07 06:33+0700\n" "Last-Translator: Kiki Syahadat \n" "Language-Team: Indonesia , Translation list \n" "Language-Team: Icelandic \n" @@ -211,11 +211,6 @@ msgstr "Þú getur ekki notað lykilorð með %s" msgid "Password (again)" msgstr "Lykilorð (aftur)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Hreinsa /tmp við hverja ræsingu" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3188,7 +3183,17 @@ msgstr "örgjörvi # " msgid "Please Wait... Applying the configuration" msgstr "Augnablik... Framkvæmi stillingar" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Enginn þekktur rekill" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Það er enginn þekktur rekill fyrir hljóðkortið þitt (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Virkja PulseAudio" @@ -3290,46 +3295,7 @@ msgstr "" msgid "Driver:" msgstr "Rekill:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Gamli \"%s\" rekillinn er á svörtum lista.\n" -"\n" -"Hann hefur valdið kerfisvillum þegar honum er afhlaðið.\n" -"\n" -"Nýi \"%s\" rekillinn verður aðeins notaður við næstu ræsingu." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Enginn \"frjáls hugbúnaðar\" rekill" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Það er enginn \"frjáls\" rekill fyrir hljóðkortið þitt (%s) en það er til " -"rekill framleiðanda á \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Enginn þekktur rekill" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Það er enginn þekktur rekill fyrir hljóðkortið þitt (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Vandamálaleit hljóðkorta" @@ -6156,11 +6122,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP þjónn" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7039,6 +7010,32 @@ msgstr "" msgid "Installation failed" msgstr "Innsetning mistókst" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Hreinsa /tmp við hverja ræsingu" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Gamli \"%s\" rekillinn er á svörtum lista.\n" +#~ "\n" +#~ "Hann hefur valdið kerfisvillum þegar honum er afhlaðið.\n" +#~ "\n" +#~ "Nýi \"%s\" rekillinn verður aðeins notaður við næstu ræsingu." + +#~ msgid "No open source driver" +#~ msgstr "Enginn \"frjáls hugbúnaðar\" rekill" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Það er enginn \"frjáls\" rekill fyrir hljóðkortið þitt (%s) en það er til " +#~ "rekill framleiðanda á \"%s\"." + #~ msgid "command %s missing" #~ msgstr "skipun %s vantar" diff --git a/perl-install/share/po/it.po b/perl-install/share/po/it.po index 2bb79f1c9..fc75b333d 100644 --- a/perl-install/share/po/it.po +++ b/perl-install/share/po/it.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-03-07 13:10+0100\n" "Last-Translator: Matteo Pasotti \n" "Language-Team: Italian \n" @@ -207,11 +207,6 @@ msgstr "Non puoi usare una password con %s" msgid "Password (again)" msgstr "Password (ripeti)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Svuota /tmp ad ogni avvio" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3212,7 +3207,17 @@ msgstr "CPU n. " msgid "Please Wait... Applying the configuration" msgstr "Bisogna attendere, ... sto applicando la configurazione" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nessun driver conosciuto" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Non esistono driver conosciuti per questa scheda audio (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Attiva PulseAudio" @@ -3315,46 +3320,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Il vecchio driver \"%s \" è sulla lista nera.\n" -"\n" -"È stato riferito che, quando viene fermato, può creare problemi al kernel.\n" -"\n" -"Il nuovo driver \"%s\"sarà utilizzabile solo dopo il prossimo riavvio." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nessun driver open source" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Non esiste nessun driver libero per questa scheda audio(%s), ma ce n'è uno " -"commerciale a \"%s\"" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nessun driver conosciuto" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Non esistono driver conosciuti per questa scheda audio (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Risoluzione problemi al suono" @@ -6290,11 +6256,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi è un demone ZeroConf che implementa lo stack mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Impostazione della frequenza della CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7204,6 +7175,33 @@ msgstr "" msgid "Installation failed" msgstr "Installazione non riuscita" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Svuota /tmp ad ogni avvio" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Il vecchio driver \"%s \" è sulla lista nera.\n" +#~ "\n" +#~ "È stato riferito che, quando viene fermato, può creare problemi al " +#~ "kernel.\n" +#~ "\n" +#~ "Il nuovo driver \"%s\"sarà utilizzabile solo dopo il prossimo riavvio." + +#~ msgid "No open source driver" +#~ msgstr "Nessun driver open source" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Non esiste nessun driver libero per questa scheda audio(%s), ma ce n'è " +#~ "uno commerciale a \"%s\"" + #~ msgid "command %s missing" #~ msgstr "manca il comando %s" diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po index e4eaf4441..98bb9dba7 100644 --- a/perl-install/share/po/ja.po +++ b/perl-install/share/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX-ja\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2009-02-22 19:41+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -209,11 +209,6 @@ msgstr "%s にはパスワードは使えません" msgid "Password (again)" msgstr "パスワード (再入力)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "起動するたびに /tmp 以下を消す" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3176,7 +3171,17 @@ msgstr "CPU # " msgid "Please Wait... Applying the configuration" msgstr "設定を適用しています。お待ちください..." -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "既知のドライバがありません" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "お使いのサウンドカード (%s) 用の既知のドライバはありません" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio を有効にする" @@ -3276,46 +3281,7 @@ msgstr "" msgid "Driver:" msgstr "ドライバ:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"この古い %s ドライバはブラックリストに載っています。\n" -"\n" -"アンロード時にカーネルに悪影響を及ぼすとの報告があります。\n" -"\n" -"新しい %s ドライバは次のブートストラップから使用されます。" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "オープンソースのドライバがありません" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"お使いのサウンドカード (%s) 用のフリードライバはありませが、\n" -"%s にプロプラエタリドライバがあります。" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "既知のドライバがありません" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "お使いのサウンドカード (%s) 用の既知のドライバはありません" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "サウンドのトラブルシューティング" @@ -6105,11 +6071,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP サーバ" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6997,6 +6968,32 @@ msgstr "" msgid "Installation failed" msgstr "インストール失敗" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "起動するたびに /tmp 以下を消す" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "この古い %s ドライバはブラックリストに載っています。\n" +#~ "\n" +#~ "アンロード時にカーネルに悪影響を及ぼすとの報告があります。\n" +#~ "\n" +#~ "新しい %s ドライバは次のブートストラップから使用されます。" + +#~ msgid "No open source driver" +#~ msgstr "オープンソースのドライバがありません" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "お使いのサウンドカード (%s) 用のフリードライバはありませが、\n" +#~ "%s にプロプラエタリドライバがあります。" + #~ msgid "command %s missing" #~ msgstr "コマンド %s がありません" diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po index 25f66dca2..b51ce03b5 100644 --- a/perl-install/share/po/ko.po +++ b/perl-install/share/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2007-09-26 20:12+0200\n" "Last-Translator: Jaegeum Cze \n" "Language-Team: Korean \n" @@ -205,11 +205,6 @@ msgstr " %s 마운트 위치에는 암호를 사용할 수 없습니다.다. " msgid "Password (again)" msgstr "암호 (확인)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "부팅시 /tmp 디렉토리 자동 청소" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3144,7 +3139,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "기다려 주세요... 설정을 적용하고 있습니다." -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3225,39 +3230,7 @@ msgstr "" msgid "Driver:" msgstr "드라이버:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5908,11 +5881,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP 서버" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6706,6 +6684,9 @@ msgstr "" msgid "Installation failed" msgstr "설치 실패." +#~ msgid "Clean /tmp at each boot" +#~ msgstr "부팅시 /tmp 디렉토리 자동 청소" + #~ msgid "command %s missing" #~ msgstr "잘못된 명령 %s " diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po index 1bde194ad..855d02ab1 100644 --- a/perl-install/share/po/ky.po +++ b/perl-install/share/po/ky.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-ky\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-04-20 20:27+0500\n" "Last-Translator: Nurlan Borubaev \n" "Language-Team: Kyrgyz\n" @@ -209,11 +209,6 @@ msgstr "Сиз %s биригүү чекити үчүн шифрделген фа msgid "Password (again)" msgstr "Пароль (дагы бир жолу)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Ар бир жүктөгөн сайын /tmp каталогун тазалоо" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3161,7 +3156,17 @@ msgstr "процессор # " msgid "Please Wait... Applying the configuration" msgstr "Күтө туруңуз... Конфигурация колдонулууда" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Белгилүү драйвер жок" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Сиздин добуш картаңыз (%s) үчүн белгилүү драйвер жок" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3265,46 +3270,7 @@ msgstr "" msgid "Driver:" msgstr "Драйвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"\"%s\" эски драйвери кара тизмеге кошулган.\n" -"\n" -"Ядро ишин аяктоо учурунда аны эскертүү үчүн, ал жөнүндө отчет түзүлгөн.\n" -"\n" -"Жаңы драйвер \"%s\" кийинки жүктөө учурунда гана колдонулат." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ачык баштапкы кодду драйвер жок" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Сиздин добуш картаңыз (%s) үчүн бекер драйвер жок, бирок мында: \"%s\" " -"өзүнүн драйвери жатат." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Белгилүү драйвер жок" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Сиздин добуш картаңыз (%s) үчүн белгилүү драйвер жок" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Добуш бузугун издөө жана арылуу" @@ -5933,11 +5899,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NIS сервери" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6659,6 +6630,32 @@ msgstr "" msgid "Installation failed" msgstr "Орнотуу ийгиликсиз аяктады" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Ар бир жүктөгөн сайын /tmp каталогун тазалоо" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "\"%s\" эски драйвери кара тизмеге кошулган.\n" +#~ "\n" +#~ "Ядро ишин аяктоо учурунда аны эскертүү үчүн, ал жөнүндө отчет түзүлгөн.\n" +#~ "\n" +#~ "Жаңы драйвер \"%s\" кийинки жүктөө учурунда гана колдонулат." + +#~ msgid "No open source driver" +#~ msgstr "Ачык баштапкы кодду драйвер жок" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Сиздин добуш картаңыз (%s) үчүн бекер драйвер жок, бирок мында: \"%s\" " +#~ "өзүнүн драйвери жатат." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot index 33b689288..f4b691125 100644 --- a/perl-install/share/po/libDrakX.pot +++ b/perl-install/share/po/libDrakX.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -180,11 +180,6 @@ msgstr "" msgid "Password (again)" msgstr "" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "" - #: any.pm:459 #, c-format msgid "Init Message" @@ -2941,7 +2936,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3014,37 +3019,7 @@ msgstr "" msgid "Driver:" msgstr "" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5587,11 +5562,16 @@ msgstr "" #: services.pm:26 #, c-format -msgid "Set CPU frequency settings" +msgid "An NTP client/server" msgstr "" #: services.pm:27 #, c-format +msgid "Set CPU frequency settings" +msgstr "" + +#: services.pm:28 +#, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" "at periodic scheduled times. vixie cron adds a number of features to the basic\n" diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po index 69c57862d..b3a3b3966 100644 --- a/perl-install/share/po/lt.po +++ b/perl-install/share/po/lt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX VERSION\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2000-12-23 13:50+0200\n" "Last-Translator: Mykolas Norvai­as \n" "Language-Team: Lithuanian \n" @@ -186,11 +186,6 @@ msgstr "" msgid "Password (again)" msgstr "Slaptažodis (vėl)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Išvalyti /tmp kiekvieną kartą įkrovus" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3089,7 +3084,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "Nustatymų tikrinimas" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3170,39 +3175,7 @@ msgstr "" msgid "Driver:" msgstr "Tvarkyklė" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5854,11 +5827,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NIS serveris" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6638,6 +6616,9 @@ msgstr "" msgid "Installation failed" msgstr "Įdiegimas nepavyko" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Išvalyti /tmp kiekvieną kartą įkrovus" + #~ msgid "Restrict command line options" #~ msgstr "Griežtos komandinės eilutės parinktys" diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po index 5d90e7eb2..827b0f7b6 100644 --- a/perl-install/share/po/ltg.po +++ b/perl-install/share/po/ltg.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-02-24 13:01+0200\n" "Last-Translator: Māris Laureckis \n" "Language-Team: Latgalian \n" @@ -191,11 +191,6 @@ msgstr "Jius navarit lītuot šifreitū failsistemu monteišonys punktā %s" msgid "Password (again)" msgstr "Parole (atkāuotuoti)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Izteireit /tmp kotrys suokneišonys laikā" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3133,7 +3128,17 @@ msgstr "procesors # " msgid "Please Wait... Applying the configuration" msgstr "Lyudzu pagaidit ... konfiguracejis pīmāruošona" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nav zynuomu draiveru" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nav zynuomu draiveru jiusu skanis kartei (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3222,46 +3227,7 @@ msgstr "" msgid "Driver:" msgstr "Draivers:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Vacais \"%s\" draivers ir malnajā sarokstā.\n" -"\n" -"Ir sajimtys zinis par tuo slyktū darbeibu pi kūdula izluodis.\n" -"\n" -"Jaunais \"%s\" draivers tiks lītuots tikai pi nuokūšuos īluodis." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nav atgvārtuo koda draiveru" - -#: harddrake/sound.pm:408 -#, fuzzy, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nav zināms alternatīvs OSS/ALSA draiveris priekš Jūsu skaņu kartes (%s) kura " -"patreiz izmanto \"%s\"" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nav zynuomu draiveru" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nav zynuomu draiveru jiusu skanis kartei (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5934,11 +5900,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP servers" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6726,6 +6697,33 @@ msgstr "" msgid "Installation failed" msgstr "Instalaceja naizadeve" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Izteireit /tmp kotrys suokneišonys laikā" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Vacais \"%s\" draivers ir malnajā sarokstā.\n" +#~ "\n" +#~ "Ir sajimtys zinis par tuo slyktū darbeibu pi kūdula izluodis.\n" +#~ "\n" +#~ "Jaunais \"%s\" draivers tiks lītuots tikai pi nuokūšuos īluodis." + +#~ msgid "No open source driver" +#~ msgstr "Nav atgvārtuo koda draiveru" + +#, fuzzy +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nav zināms alternatīvs OSS/ALSA draiveris priekš Jūsu skaņu kartes (%s) " +#~ "kura patreiz izmanto \"%s\"" + #~ msgid "File sharing" #~ msgstr "Failu kūplītuošuona" diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po index ac06ad4e8..d000c681f 100644 --- a/perl-install/share/po/lv.po +++ b/perl-install/share/po/lv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2002-09-27 17:45+0200\n" "Last-Translator: Raivo Saars \n" "Language-Team: Latvian \n" @@ -191,11 +191,6 @@ msgstr "Jūs nevarat lietot šifrēto failsistēmu montēšanas punktā %s" msgid "Password (again)" msgstr "Parole (atkārtoti)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Iztīrīt /tmp katras sāknēšanas laikā" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3123,7 +3118,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "Lūdzu uzgaidiet ... konfigurācijas piemērošana" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nav zināmu draiveru" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nav zināmu draiveru jūsu skaņu kartei (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3212,46 +3217,7 @@ msgstr "" msgid "Driver:" msgstr "Draiveris:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Vecais \"%s\" draiveris ir melnajā sarakstā.\n" -"\n" -"Ir saņemtas ziņas par tā sliktu uzvedību pie izlādes.\n" -"\n" -"Jaunais \"%s\" draiveris tiks lietots tikai pie nākamās ielādes." - -#: harddrake/sound.pm:407 -#, fuzzy, c-format -msgid "No open source driver" -msgstr "Nav zināmu draiveru" - -#: harddrake/sound.pm:408 -#, fuzzy, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nav zināms alternatīvs OSS/ALSA draiveris priekš Jūsu skaņu kartes (%s) kura " -"patreiz izmanto \"%s\"" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nav zināmu draiveru" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nav zināmu draiveru jūsu skaņu kartei (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5915,11 +5881,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP serveris" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6705,6 +6676,34 @@ msgstr "" msgid "Installation failed" msgstr "Instalēšana neizdevās" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Iztīrīt /tmp katras sāknēšanas laikā" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Vecais \"%s\" draiveris ir melnajā sarakstā.\n" +#~ "\n" +#~ "Ir saņemtas ziņas par tā sliktu uzvedību pie izlādes.\n" +#~ "\n" +#~ "Jaunais \"%s\" draiveris tiks lietots tikai pie nākamās ielādes." + +#, fuzzy +#~ msgid "No open source driver" +#~ msgstr "Nav zināmu draiveru" + +#, fuzzy +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nav zināms alternatīvs OSS/ALSA draiveris priekš Jūsu skaņu kartes (%s) " +#~ "kura patreiz izmanto \"%s\"" + #~ msgid "File sharing" #~ msgstr "Failu koplietošana" diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po index 8f0e38cec..5082283fb 100644 --- a/perl-install/share/po/mk.po +++ b/perl-install/share/po/mk.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-mk\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-11-03 18:47+0100\n" "Last-Translator: Зоран Димовски \n" "Language-Team: Macedonian \n" @@ -205,11 +205,6 @@ msgstr "Не може да користите криптиран фајлсис msgid "Password (again)" msgstr "Лозинка (повторно)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Чисти го /tmp при секое подигање" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3169,7 +3164,17 @@ msgstr "cpu #" msgid "Please Wait... Applying the configuration" msgstr "Почекајте... Примена на конфигурацијата" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Нема познат драјвер" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Нема познат драјвер за Вашата звучна (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3271,46 +3276,7 @@ msgstr "" msgid "Driver:" msgstr "Драјвер:" -#: harddrake/sound.pm:399 -#, fuzzy, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Стариот драјвер \"%s\" е во црната листа.\n" -"\n" -"Има извештаи дека го oops-ува крнелот при исклучување.\n" -"\n" -"Новио драјвер \"%s\" ќе се употреби на наредното подигање." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Нема познат драјвер со отворен код" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Нема бесплатен драјвер за вашата звучка картичка (%s), но има платен драјвер " -"на \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Нема познат драјвер" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Нема познат драјвер за Вашата звучна (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Отстранување на проблемот за звукот" @@ -6121,11 +6087,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP сервер" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, fuzzy, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6977,6 +6948,33 @@ msgstr "" msgid "Installation failed" msgstr "Неуспешна инсталација" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Чисти го /tmp при секое подигање" + +#, fuzzy +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Стариот драјвер \"%s\" е во црната листа.\n" +#~ "\n" +#~ "Има извештаи дека го oops-ува крнелот при исклучување.\n" +#~ "\n" +#~ "Новио драјвер \"%s\" ќе се употреби на наредното подигање." + +#~ msgid "No open source driver" +#~ msgstr "Нема познат драјвер со отворен код" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Нема бесплатен драјвер за вашата звучка картичка (%s), но има платен " +#~ "драјвер на \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po index 0824f9108..f9a55c432 100644 --- a/perl-install/share/po/mn.po +++ b/perl-install/share/po/mn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-01-02 00:35+0100\n" "Last-Translator: Sanlig Badral \n" "Language-Team: Mongolian \n" @@ -189,11 +189,6 @@ msgstr "Та Цэг" msgid "Password (again)" msgstr "Нууц үг (дахин)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3010,7 +3005,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "Хүлээх" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, fuzzy, c-format +msgid "No known driver" +msgstr "Нэллтэй эх код бүхий драйвер алга" + +#: harddrake/sound.pm:134 +#, fuzzy, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Алдаа: Таны дууны картны \"%s\" драйвер жагсаалтанд байхгүй байна" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3091,39 +3096,7 @@ msgstr "" msgid "Driver:" msgstr "Драйвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Нэллтэй эх код бүхий драйвер алга" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, fuzzy, c-format -msgid "No known driver" -msgstr "Нэллтэй эх код бүхий драйвер алга" - -#: harddrake/sound.pm:412 -#, fuzzy, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Алдаа: Таны дууны картны \"%s\" драйвер жагсаалтанд байхгүй байна" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, fuzzy, c-format msgid "Sound troubleshooting" msgstr "Асуудал гарч байна" @@ -5784,11 +5757,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Сервер" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, fuzzy, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6529,6 +6507,9 @@ msgstr "" msgid "Installation failed" msgstr "Хэлбэр!" +#~ msgid "No open source driver" +#~ msgstr "Нэллтэй эх код бүхий драйвер алга" + #, fuzzy #~ msgid "File sharing" #~ msgstr "Файл" diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po index 9c5a04b38..f98b7ada4 100644 --- a/perl-install/share/po/ms.po +++ b/perl-install/share/po/ms.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2008-05-04 13:34+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: Malay \n" @@ -191,11 +191,6 @@ msgstr "fail" msgid "Password (again)" msgstr "Katalaluan (sekali lagi)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3018,7 +3013,17 @@ msgstr "" "Menerapkan perubahan.\n" "Sila tunggu..." -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, fuzzy, c-format +msgid "No known driver" +msgstr "(tiada cadangan ejaan)" + +#: harddrake/sound.pm:134 +#, fuzzy, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "tidak" + +#: harddrake/sound.pm:166 #, fuzzy, c-format msgid "Enable PulseAudio" msgstr "Hidupkan animasi" @@ -3099,39 +3104,7 @@ msgstr "Buka Bunyi Sistem on asas dan Lanjutan Bunyi USB dan" msgid "Driver:" msgstr "Pemacu :" -#: harddrake/sound.pm:399 -#, fuzzy, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "on on." - -#: harddrake/sound.pm:407 -#, fuzzy, c-format -msgid "No open source driver" -msgstr "Pustaka kriptografi sumber terbuka." - -#: harddrake/sound.pm:408 -#, fuzzy, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "tidak." - -#: harddrake/sound.pm:411 -#, fuzzy, c-format -msgid "No known driver" -msgstr "(tiada cadangan ejaan)" - -#: harddrake/sound.pm:412 -#, fuzzy, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "tidak" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, fuzzy, c-format msgid "Sound troubleshooting" msgstr "Ralat merakam bunyi" @@ -5753,11 +5726,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Pelayan FTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, fuzzy, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6489,6 +6467,25 @@ msgstr "" msgid "Installation failed" msgstr "Instalasi gagal" +#, fuzzy +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "on on." + +#, fuzzy +#~ msgid "No open source driver" +#~ msgstr "Pustaka kriptografi sumber terbuka." + +#, fuzzy +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "tidak." + #, fuzzy #~ msgid "command %s missing" #~ msgstr "Arahan pencetak: " diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po index 143e8ffd8..78a77862e 100644 --- a/perl-install/share/po/mt.po +++ b/perl-install/share/po/mt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mt\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-10-04 18:45+0200\n" "Last-Translator: Ramon Casha \n" "Language-Team: Maltese \n" @@ -208,11 +208,6 @@ msgstr "Ma tistax tuża filesystem iċċifrat għall-punt ta' mmuntar %s" msgid "Password (again)" msgstr "Password (erġa')" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Naddaf /tmp kull meta tixgħel" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3180,7 +3175,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Stenna ftit... qed napplika l-konfigurazzjoni" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ebda drajver magħruf" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "M'hemm ebda drajver magħruf għall-kard awdjo tiegħek (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3282,46 +3287,7 @@ msgstr "" msgid "Driver:" msgstr "Drajver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Id-drajver \"%s\" antik huwa mmarkat li hu ħażin.\n" -"\n" -"Huwa rrapportat li jikkawża problemi fil-kernel waqt it-tneħħija.\n" -"\n" -"Id-drajver il-ġdid \"%s\" jintuża biss għall-istartjar li jmiss." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ebda drajver sors miftuħ" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"M'hemm ebda drajver ab'xejn OSS/ALSA għall-kard awdjo tiegħek (%s),imma hemm " -"drajver propjetarju f' \"%s\"" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ebda drajver magħruf" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "M'hemm ebda drajver magħruf għall-kard awdjo tiegħek (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Sib problemi fl-awdjo" @@ -6069,11 +6035,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6879,6 +6850,32 @@ msgstr "" msgid "Installation failed" msgstr "Installazzjoni falliet" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Naddaf /tmp kull meta tixgħel" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Id-drajver \"%s\" antik huwa mmarkat li hu ħażin.\n" +#~ "\n" +#~ "Huwa rrapportat li jikkawża problemi fil-kernel waqt it-tneħħija.\n" +#~ "\n" +#~ "Id-drajver il-ġdid \"%s\" jintuża biss għall-istartjar li jmiss." + +#~ msgid "No open source driver" +#~ msgstr "Ebda drajver sors miftuħ" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "M'hemm ebda drajver ab'xejn OSS/ALSA għall-kard awdjo tiegħek (%s),imma " +#~ "hemm drajver propjetarju f' \"%s\"" + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po index 685bf9a73..2c555c066 100644 --- a/perl-install/share/po/nb.po +++ b/perl-install/share/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-06-06 23:21+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Norwegian Bokmål \n" @@ -220,11 +220,6 @@ msgstr "Du kan ikke bruke et passord som inneholder «%s»" msgid "Password (again)" msgstr "Passord (på nytt)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Tøm «/tmp» ved hver oppstart" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3187,7 +3182,17 @@ msgstr "Prosessornummer " msgid "Please Wait... Applying the configuration" msgstr "Vent litt … Legger til oppsettet" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ingen kjent driver" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Det er ingen kjent driver for lydkortet ditt («%s»)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Bruk PulseAudio" @@ -3286,45 +3291,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Den gamle «%s»-driveren er svartelista, da han visstnok kan «oopsa» kjernen " -"ved utlasting.\n" -"\n" -"Den nye «%s»-driveren blir bare brukt ved neste oppstart." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ingen åpen kildekode-driver" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Det finnes ingen fri driver for lydkortet ditt («%s»), men det finnes en " -"godseid driver på «%s»." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ingen kjent driver" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Det er ingen kjent driver for lydkortet ditt («%s»)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Feilsøking av lyd" @@ -6154,11 +6121,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi er en ZeroConf-tjeneste som implementerer en mDNS-stabel" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-tjener" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Frekvensinnstillinger for CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7053,6 +7025,31 @@ msgstr "" msgid "Installation failed" msgstr "Feil ved installering." +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Tøm «/tmp» ved hver oppstart" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Den gamle «%s»-driveren er svartelista, da han visstnok kan «oopsa» " +#~ "kjernen ved utlasting.\n" +#~ "\n" +#~ "Den nye «%s»-driveren blir bare brukt ved neste oppstart." + +#~ msgid "No open source driver" +#~ msgstr "Ingen åpen kildekode-driver" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Det finnes ingen fri driver for lydkortet ditt («%s»), men det finnes en " +#~ "godseid driver på «%s»." + #~ msgid "command %s missing" #~ msgstr "kommandoen %s mangler" diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po index 63717912f..b48432b9c 100644 --- a/perl-install/share/po/nl.po +++ b/perl-install/share/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-03-10 09:06+0100\n" "Last-Translator: Remco Rijnders \n" "Language-Team: Nederlands\n" @@ -219,11 +219,6 @@ msgstr "U kunt geen wachtwoord gebruiken met %s" msgid "Password (again)" msgstr "Wachtwoord (nogmaals)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Elke keer bij opstarten /tmp legen" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3233,7 +3228,17 @@ msgstr "CVE # " msgid "Please Wait... Applying the configuration" msgstr "Even geduld... bezig met toepassen van de configuratie" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Geen stuurprogramma bekend" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Er is geen stuurprogramma bekend voor uw geluidskaart (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio inschakelen" @@ -3337,48 +3342,7 @@ msgstr "" msgid "Driver:" msgstr "Stuurprogramma:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Het oude \"%s\"-stuurprogramma staat op de zwarte lijst.\n" -"\n" -"Er is gerapporteerd dat het kernel-oopses veroorzaakt bij\n" -"het uitladen.\n" -"\n" -"Het nieuwe \"%s\"-stuurprogramma zal slechts gebruikt worden\n" -"bij de volgende \"bootstrap\"." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Geen stuurprogramma met vrije broncode" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Er is geen vrij stuurprogramma beschikbaar voor uw geluidskaart (%s), maar " -"er is een fabrikantsgebonden stuurprogramma op \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Geen stuurprogramma bekend" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Er is geen stuurprogramma bekend voor uw geluidskaart (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Geluidsproblemen aanpakken" @@ -6261,11 +6225,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi is een ZeroConf daemon welke een mDNS stack implementeert" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Stel CPU-frequentieinstellingen in" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7189,6 +7158,34 @@ msgstr "" msgid "Installation failed" msgstr "Installatie mislukt" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Elke keer bij opstarten /tmp legen" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Het oude \"%s\"-stuurprogramma staat op de zwarte lijst.\n" +#~ "\n" +#~ "Er is gerapporteerd dat het kernel-oopses veroorzaakt bij\n" +#~ "het uitladen.\n" +#~ "\n" +#~ "Het nieuwe \"%s\"-stuurprogramma zal slechts gebruikt worden\n" +#~ "bij de volgende \"bootstrap\"." + +#~ msgid "No open source driver" +#~ msgstr "Geen stuurprogramma met vrije broncode" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Er is geen vrij stuurprogramma beschikbaar voor uw geluidskaart (%s), " +#~ "maar er is een fabrikantsgebonden stuurprogramma op \"%s\"." + #~ msgid "command %s missing" #~ msgstr "opdracht %s is niet aanwezig" diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po index 586d94f36..20bcd2eba 100644 --- a/perl-install/share/po/nn.po +++ b/perl-install/share/po/nn.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-06-07 22:03+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -203,11 +203,6 @@ msgstr "Du kan ikkje bruka eit passord som inneheld «%s»." msgid "Password (again)" msgstr "Passord (på nytt)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Tøm «/tmp» ved kvar oppstart" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3173,7 +3168,17 @@ msgstr "Prosessornummer " msgid "Please Wait... Applying the configuration" msgstr "Vent litt … Gjer klar oppsett" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ingen kjend drivar" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Bruk PulseAudio" @@ -3271,45 +3276,7 @@ msgstr "" msgid "Driver:" msgstr "Drivar:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Den gamle «%s»-drivaren er svartelista, då han visstnok kan «oopsa» kjernen " -"ved utlasting.\n" -"\n" -"Den nye «%s»-drivaren vert berre brukt ved neste oppstart." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ingen open kjeldekode-drivar" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein " -"godseigd drivar på «%s»." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ingen kjend drivar" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Feilsøking av lyd" @@ -6153,11 +6120,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi er ei Zeroconf-teneste med ein mDNS-stakk" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-tenar" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Vel prosessorfrekvensar" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7052,6 +7024,31 @@ msgstr "" msgid "Installation failed" msgstr "Feil ved installering." +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Tøm «/tmp» ved kvar oppstart" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Den gamle «%s»-drivaren er svartelista, då han visstnok kan «oopsa» " +#~ "kjernen ved utlasting.\n" +#~ "\n" +#~ "Den nye «%s»-drivaren vert berre brukt ved neste oppstart." + +#~ msgid "No open source driver" +#~ msgstr "Ingen open kjeldekode-drivar" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein " +#~ "godseigd drivar på «%s»." + #~ msgid "command %s missing" #~ msgstr "Kommandoen %s manglar" diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po index bd916d764..849a23727 100644 --- a/perl-install/share/po/pa_IN.po +++ b/perl-install/share/po/pa_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-03-27 17:55+0530\n" "Last-Translator: Jaswinder Singh Phulewala \n" "Language-Team: Punjabi \n" @@ -205,11 +205,6 @@ msgstr "ਤੁਸੀਂ ਮਾਊਂਟ %s ਸਥਿਤੀ ਲਈ ਇਨਕ੍ msgid "Password (again)" msgstr "ਗੁਪਤ-ਕੋਡ (ਫਿਰ)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "ਹਰੇਕ ਬੂਟ ਦੌਰਾਨ /tmp ਸਾਫ ਕਰੋ" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3129,7 +3124,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ... ਸੰਰਚਨਾ ਲਾਗੂ ਹੋ ਰਹੀ ਹੈ" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "ਕੋਈ ਜਾਣਿਆ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "ਇੱਥੇ ਤੁਹਾਡੇ ਸਾਊਂਡ ਕਾਰਡ (%s) ਲਈ ਕੋਈ ਜਾਣਿਆ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3228,46 +3233,7 @@ msgstr "" msgid "Driver:" msgstr "ਡਰਾਈਵਰ:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"ਪੁਰਾਣਾ \"%s\" ਡਰਾਈਵਰ ਕਾਲੀ-ਸੂਚੀ ਵਿੱਚ ਹੈ।\n" -"\n" -"ਇਹ ਅਨ-ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕਰਨਲ ਨੂੰ oops ਕਰਨ ਲਈ ਰਿਪੋਰਟ ਕੀਤਾ ਹੈ।\n" -"\n" -"ਨਵਾਂ \"%s\" ਡਰਾਈਵਰ ਸਿਰਫ ਨਵੇਂ ਬੂਟਸਟਰੈਪ ਦੌਰਾਨ ਵਰਤਿਆ ਜਾਵੇਗਾ।" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "ਕੋਈ ਖੁੱਲਾ ਸਰੋਤ ਡਰਾਈਵਰ ਨਹੀਂ" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"ਇੱਥੇ ਤੁਹਾਡੇ ਸਾਊਂਡ ਕਾਰਡ (%s) ਲਈ ਕੋਈ ਫਰੀ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ, ਪਰ \"%s\" ਤੇ ਇੱਕ ਮਲਕੀਅਤ ਡਰਾਈਵਰ " -"ਹੈ।" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "ਕੋਈ ਜਾਣਿਆ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "ਇੱਥੇ ਤੁਹਾਡੇ ਸਾਊਂਡ ਕਾਰਡ (%s) ਲਈ ਕੋਈ ਜਾਣਿਆ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "ਸਾਊਂਡ ਸਮੱਸਿਆ ਨਿਪਟਾਰਾ" @@ -5980,11 +5946,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP ਸਰਵਰ" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6783,6 +6754,32 @@ msgstr "" msgid "Installation failed" msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "ਹਰੇਕ ਬੂਟ ਦੌਰਾਨ /tmp ਸਾਫ ਕਰੋ" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "ਪੁਰਾਣਾ \"%s\" ਡਰਾਈਵਰ ਕਾਲੀ-ਸੂਚੀ ਵਿੱਚ ਹੈ।\n" +#~ "\n" +#~ "ਇਹ ਅਨ-ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕਰਨਲ ਨੂੰ oops ਕਰਨ ਲਈ ਰਿਪੋਰਟ ਕੀਤਾ ਹੈ।\n" +#~ "\n" +#~ "ਨਵਾਂ \"%s\" ਡਰਾਈਵਰ ਸਿਰਫ ਨਵੇਂ ਬੂਟਸਟਰੈਪ ਦੌਰਾਨ ਵਰਤਿਆ ਜਾਵੇਗਾ।" + +#~ msgid "No open source driver" +#~ msgstr "ਕੋਈ ਖੁੱਲਾ ਸਰੋਤ ਡਰਾਈਵਰ ਨਹੀਂ" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "ਇੱਥੇ ਤੁਹਾਡੇ ਸਾਊਂਡ ਕਾਰਡ (%s) ਲਈ ਕੋਈ ਫਰੀ ਡਰਾਈਵਰ ਨਹੀਂ ਹੈ, ਪਰ \"%s\" ਤੇ ਇੱਕ ਮਲਕੀਅਤ " +#~ "ਡਰਾਈਵਰ ਹੈ।" + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po index 735133810..3da66bc64 100644 --- a/perl-install/share/po/pl.po +++ b/perl-install/share/po/pl.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-02-18 08:32+0100\n" "Last-Translator: Marek Walczak \n" "Language-Team: \n" @@ -220,11 +220,6 @@ msgstr "Nie można użyć hasła z %s" msgid "Password (again)" msgstr "Hasło (powtórnie)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Czyszczenie /tmp przy każdym uruchomieniu systemu" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3232,7 +3227,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Proszę czekać... Stosowanie konfiguracji" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Brak znanego sterownika" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Brak znanego sterownika dla twojej karty dźwiękowej (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Włącz PulseAudio" @@ -3335,46 +3340,7 @@ msgstr "" msgid "Driver:" msgstr "Sterownik:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Stary sterownik \"%s\" znajduje się na czarnej liście.\n" -"\n" -"Zanotowano, że spowodował on błąd jądra podczas doładowywania.\n" -"\n" -"Nowy sterownik \"%s\" zostanie wykorzystany po następnym uruchomieniu." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Brak wolnodostępnego sterownika" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nie istnieje wolnodostępny sterownik dla karty dźwiękowej (%s), ale istnieje " -"sterownik komercyjny na \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Brak znanego sterownika" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Brak znanego sterownika dla twojej karty dźwiękowej (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Wykrywanie problemów z dźwiękiem" @@ -6237,11 +6203,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Serwer NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7135,6 +7106,32 @@ msgstr "" msgid "Installation failed" msgstr "Instalacja zakończyła się niepowodzeniem" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Czyszczenie /tmp przy każdym uruchomieniu systemu" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Stary sterownik \"%s\" znajduje się na czarnej liście.\n" +#~ "\n" +#~ "Zanotowano, że spowodował on błąd jądra podczas doładowywania.\n" +#~ "\n" +#~ "Nowy sterownik \"%s\" zostanie wykorzystany po następnym uruchomieniu." + +#~ msgid "No open source driver" +#~ msgstr "Brak wolnodostępnego sterownika" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nie istnieje wolnodostępny sterownik dla karty dźwiękowej (%s), ale " +#~ "istnieje sterownik komercyjny na \"%s\"." + #~ msgid "command %s missing" #~ msgstr "polecenie %s nie istnieje" diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po index 751a9a2bf..f1dfa0ebd 100644 --- a/perl-install/share/po/pt.po +++ b/perl-install/share/po/pt.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2012-07-02 03:07+0100\n" "Last-Translator: Pedro \n" "Language-Team: Portuguese <>\n" @@ -217,11 +217,6 @@ msgstr "Não pode usar uma senha com %s" msgid "Password (again)" msgstr "Senha (novamente)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Limpar /tmp a cada arranque" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3226,7 +3221,17 @@ msgstr "processador # " msgid "Please Wait... Applying the configuration" msgstr "Por favor aguarde... A aplicar a configuração" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nenhum controlador conhecido" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Não existe nenhum controlador conhecido para a sua placa de som (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Ativar PulseAudio" @@ -3329,46 +3334,7 @@ msgstr "" msgid "Driver:" msgstr "Controlador:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"O antigo controlador \"%s\" está na lista negra.\n" -"\n" -"Foi indicado que provoca erros no kernel ao descarregar.\n" -"\n" -"O novo controlador \"%s\" será apenas usado no próximo arranque." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nenhum controlador de código livre" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Não existe nenhum controlador livre para a sua placa de som (%s), mas existe " -"um controlador proprietário em \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nenhum controlador conhecido" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Não existe nenhum controlador conhecido para a sua placa de som (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Correção de problemas de som" @@ -6234,11 +6200,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "O avahi é um serviço ZeroConf que implementa uma pilha mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servidor NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Definir as configurações de frequência do CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7155,6 +7126,32 @@ msgstr "" msgid "Installation failed" msgstr "Instalação falhada" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Limpar /tmp a cada arranque" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "O antigo controlador \"%s\" está na lista negra.\n" +#~ "\n" +#~ "Foi indicado que provoca erros no kernel ao descarregar.\n" +#~ "\n" +#~ "O novo controlador \"%s\" será apenas usado no próximo arranque." + +#~ msgid "No open source driver" +#~ msgstr "Nenhum controlador de código livre" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Não existe nenhum controlador livre para a sua placa de som (%s), mas " +#~ "existe um controlador proprietário em \"%s\"." + #~ msgid "command %s missing" #~ msgstr "comando %s em falta" diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po index 3016f557e..2f7002741 100644 --- a/perl-install/share/po/pt_BR.po +++ b/perl-install/share/po/pt_BR.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-02-17 15:33-0300\n" "Last-Translator: padula \n" "Language-Team: Brazilian Portuguese \n" @@ -222,11 +222,6 @@ msgstr "Você não pode usar uma senha com %s" msgid "Password (again)" msgstr "Repita a senha" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Limpar /tmp a cada inicialização" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3235,7 +3230,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Aplicando a configuração" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nenhum driver conhecido" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Não há nenhum driver de som conhecido para sua placa de som (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Habilitar o PulseAudio" @@ -3338,46 +3343,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"O driver antigo \"%s\" está na lista negra.\n" -"\n" -"Foi relatado que ele provoca erros no kernel ao descarregar.\n" -"\n" -"O novo driver \"%s\" só será utilizado na próxima inicialização." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nenhum driver de código aberto" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Não há nenhum driver livre para sua placa de som (%s), mas existe um driver " -"proprietário em \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nenhum driver conhecido" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Não há nenhum driver de som conhecido para sua placa de som (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Resolução de problemas de som" @@ -6239,11 +6205,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi é um daemon ZeroConf que implementa uma camada mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Servidor NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Defina as configurações de frequência da CPU" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7165,6 +7136,32 @@ msgstr "" msgid "Installation failed" msgstr "Falha na instalação" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Limpar /tmp a cada inicialização" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "O driver antigo \"%s\" está na lista negra.\n" +#~ "\n" +#~ "Foi relatado que ele provoca erros no kernel ao descarregar.\n" +#~ "\n" +#~ "O novo driver \"%s\" só será utilizado na próxima inicialização." + +#~ msgid "No open source driver" +#~ msgstr "Nenhum driver de código aberto" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Não há nenhum driver livre para sua placa de som (%s), mas existe um " +#~ "driver proprietário em \"%s\"." + #~ msgid "command %s missing" #~ msgstr "comando %s não encontrado" diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po index 4a2ed58e9..7a8909aa9 100644 --- a/perl-install/share/po/ro.po +++ b/perl-install/share/po/ro.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-05 10:25+0000\n" "Last-Translator: Florin Cătălin RUSSEN \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia-test/" @@ -243,11 +243,6 @@ msgstr "Nu puteți utiliza o parolă cu %s" msgid "Password (again)" msgstr "Verificare parolă" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Curăță /tmp la fiecare pornire" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3243,7 +3238,17 @@ msgstr "CPU # " msgid "Please Wait... Applying the configuration" msgstr "Așteptați vă rog... Configurare în curs de aplicare" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nu există pilot cunoscut" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nu există un pilot cunoscut pentru placa de sunet (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Activează PulseAudio" @@ -3346,46 +3351,7 @@ msgstr "" msgid "Driver:" msgstr "Pilot:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Vechiul pilot %s se află pe lista neagră.\n" -"\n" -"Utilizatorii au raportat probleme cu el la oprirea nucleului.\n" -"\n" -"Noul pilot „%s” va fi utilizat de la viitoarea pornire." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nu există pilot cu sursă deschisă" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nu există un pilot liber pentru placa voastră de sunet (%s), dar există unul " -"proprietar la „%s”." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nu există pilot cunoscut" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nu există un pilot cunoscut pentru placa de sunet (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Depanarea sunetului" @@ -6252,11 +6218,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi este un demon ZeroConf ce implementează o stivă mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Configurează parametrii de frecvență ai procesorului" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7170,6 +7141,32 @@ msgstr "" msgid "Installation failed" msgstr "Instalarea a eșuat" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Curăță /tmp la fiecare pornire" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Vechiul pilot %s se află pe lista neagră.\n" +#~ "\n" +#~ "Utilizatorii au raportat probleme cu el la oprirea nucleului.\n" +#~ "\n" +#~ "Noul pilot „%s” va fi utilizat de la viitoarea pornire." + +#~ msgid "No open source driver" +#~ msgstr "Nu există pilot cu sursă deschisă" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nu există un pilot liber pentru placa voastră de sunet (%s), dar există " +#~ "unul proprietar la „%s”." + #~ msgid "command %s missing" #~ msgstr "comanda %s lipsește" diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po index bf5d5f6d1..96cb6ac84 100644 --- a/perl-install/share/po/ru.po +++ b/perl-install/share/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-05-12 22:45-0000\n" "Last-Translator: AlexL \n" "Language-Team: Russian \n" @@ -214,11 +214,6 @@ msgstr "Нельзя использовать пароль с %s" msgid "Password (again)" msgstr "Пароль (повтор)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Очищать /tmp при каждой загрузке" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3213,7 +3208,17 @@ msgstr "процессор # " msgid "Please Wait... Applying the configuration" msgstr "Подождите... Применяются настройки" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Отсутствует известный драйвер" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Для вашей звуковой карты отсутствует известный драйвер (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Включить PulseAudio" @@ -3317,47 +3322,7 @@ msgstr "" msgid "Driver:" msgstr "Драйвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Старый драйвер \"%s\" занесен в черный список.\n" -"\n" -"О нем был создан отчет, чтобы предупредить ядро при выгрузке.\n" -"\n" -"Новый драйвер \"%s\" будет использован только при следующей начальной\n" -"загрузке." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Нет драйвера с открытым исходным кодом" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Для вашей звуковой карты (%s) нет свободного драйвера, но имеется " -"собственный драйвер на \"%s\"" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Отсутствует известный драйвер" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Для вашей звуковой карты отсутствует известный драйвер (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Решение проблем со звуком" @@ -6297,11 +6262,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi - это демон ZeroConf, который реализует стек mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Сервер NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Задание настроек частоты процессора" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7215,6 +7185,33 @@ msgstr "" msgid "Installation failed" msgstr "Установка завершилась неудачей" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Очищать /tmp при каждой загрузке" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Старый драйвер \"%s\" занесен в черный список.\n" +#~ "\n" +#~ "О нем был создан отчет, чтобы предупредить ядро при выгрузке.\n" +#~ "\n" +#~ "Новый драйвер \"%s\" будет использован только при следующей начальной\n" +#~ "загрузке." + +#~ msgid "No open source driver" +#~ msgstr "Нет драйвера с открытым исходным кодом" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Для вашей звуковой карты (%s) нет свободного драйвера, но имеется " +#~ "собственный драйвер на \"%s\"" + #~ msgid "command %s missing" #~ msgstr "отсутствует команда %s" diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po index ae0e4c1b8..d9eac4cb2 100644 --- a/perl-install/share/po/sc.po +++ b/perl-install/share/po/sc.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-sc\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-09-14 11:29+0100\n" "Last-Translator: Antoni Pistis \n" "Language-Team: Sardu\n" @@ -193,11 +193,6 @@ msgstr "No fait a impreai unu filesystem cuau po su puntu de càrrigu %s" msgid "Password (again)" msgstr "Password (torra)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Lìmpia /tmp a dònnia alluidura" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3084,7 +3079,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Abeta... Àprigu s'assètiu" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nisçunu driver connotu" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "No connosçu driver po sa skeda àudio (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3165,41 +3170,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nisçunu driver open source" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"No dui est unu driver lìberu po sa skeda àudio (%s), ma nci nd'at unu " -"propiedàriu in \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nisçunu driver connotu" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "No connosçu driver po sa skeda àudio (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5830,11 +5801,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6556,6 +6532,19 @@ msgstr "" msgid "Installation failed" msgstr "Aposentadura faddia" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Lìmpia /tmp a dònnia alluidura" + +#~ msgid "No open source driver" +#~ msgstr "Nisçunu driver open source" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "No dui est unu driver lìberu po sa skeda àudio (%s), ma nci nd'at unu " +#~ "propiedàriu in \"%s\"." + #~ msgid "" #~ "Option ``Restrict command line options'' is of no use without a password" #~ msgstr "" diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po index 087676e82..e327b5536 100644 --- a/perl-install/share/po/sk.po +++ b/perl-install/share/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-09-21 14:03+0100\n" "Last-Translator: Tibor Pittich \n" "Language-Team: \n" @@ -205,11 +205,6 @@ msgstr "Nemôžete použiť kryptovaný súborový systém pre bod pripojenia %s msgid "Password (again)" msgstr "Heslo (znova)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Vyčistiť /tmp pri každom štarte" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3167,7 +3162,17 @@ msgstr "cpu #" msgid "Please Wait... Applying the configuration" msgstr "Prosím čakajte... Aplikuje sa konfigurácia" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Žiaden známy ovládač" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nie je žiaden známy ovládač pre vašu zvukovú kartu (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3270,46 +3275,7 @@ msgstr "" msgid "Driver:" msgstr "Ovládač:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Starý ovládač \"%s\" nie je odporúčaný.\n" -"\n" -"Boli oznámené havárie jadra pri jeho odstraňovaní.\n" -"\n" -"Nový ovládač \"%s\" bude použitý iba po nasledovnom štarte systému." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Žiaden známy open source ovládač" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Nie je žiaden voľne dostupný ovládač pre vašu zvukovú kartu (%s), ale je k " -"dispozícii proprietárny ovládač \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Žiaden známy ovládač" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nie je žiaden známy ovládač pre vašu zvukovú kartu (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Hľadanie chyby v súvislosti so zvukom" @@ -6170,11 +6136,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7055,6 +7026,32 @@ msgstr "" msgid "Installation failed" msgstr "Inštalácia zlyhala" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Vyčistiť /tmp pri každom štarte" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Starý ovládač \"%s\" nie je odporúčaný.\n" +#~ "\n" +#~ "Boli oznámené havárie jadra pri jeho odstraňovaní.\n" +#~ "\n" +#~ "Nový ovládač \"%s\" bude použitý iba po nasledovnom štarte systému." + +#~ msgid "No open source driver" +#~ msgstr "Žiaden známy open source ovládač" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Nie je žiaden voľne dostupný ovládač pre vašu zvukovú kartu (%s), ale je " +#~ "k dispozícii proprietárny ovládač \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po index d2a02a8e3..7852171c0 100644 --- a/perl-install/share/po/sl.po +++ b/perl-install/share/po/sl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-10-24 19:42+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" "Language-Team: Albanian \n" @@ -202,11 +202,6 @@ msgstr "" msgid "Password (again)" msgstr "Parulla (përsëri)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Zbraze repertorin /tmp në çdo nisje" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3175,7 +3170,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Një moment ju lutemi... Përshtatja e konfigurimit" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Asnjë pilot i njoftur" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Nuk ka pilotë të njoftur për kartelën tuaj të zërit (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3279,47 +3284,7 @@ msgstr "" msgid "Driver:" msgstr "Pilot:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Piloti i vjetër \"%s\" gjindet në listën e zezë.\n" -"\n" -"Shumica e personelit ka shkaktuar probleme me kernel gjatë ndaljes së " -"kompjuterit.\n" -"\n" -"Piloti i ri \"%s\" do të jetë në përdorim vetëm mbas nisjes së ardhëshme." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Asnjë burim i hapur për pilotin" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Asnjë pilot i lirë për kartelën tuaj të zërit (%s), mirëpo aty gjindet një " -"pilot me pronë në \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Asnjë pilot i njoftur" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Nuk ka pilotë të njoftur për kartelën tuaj të zërit (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Telashe gjate ndaljes së kartelës së zërit" @@ -6163,11 +6128,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Server NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7048,6 +7018,33 @@ msgstr "" msgid "Installation failed" msgstr "Instalimi dështio" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Zbraze repertorin /tmp në çdo nisje" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Piloti i vjetër \"%s\" gjindet në listën e zezë.\n" +#~ "\n" +#~ "Shumica e personelit ka shkaktuar probleme me kernel gjatë ndaljes së " +#~ "kompjuterit.\n" +#~ "\n" +#~ "Piloti i ri \"%s\" do të jetë në përdorim vetëm mbas nisjes së ardhëshme." + +#~ msgid "No open source driver" +#~ msgstr "Asnjë burim i hapur për pilotin" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Asnjë pilot i lirë për kartelën tuaj të zërit (%s), mirëpo aty gjindet " +#~ "një pilot me pronë në \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po index 612554e6c..29eb285bf 100644 --- a/perl-install/share/po/sr.po +++ b/perl-install/share/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-09-15 13:33+0200\n" "Last-Translator: Toma Jankovic \n" "Language-Team: Serbian \n" @@ -201,11 +201,6 @@ msgstr "Не можете користити енкриптовани фајл msgid "Password (again)" msgstr "Лозинка (поновите)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Очисти /tmp при сваком стартању" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3136,7 +3131,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Само моменат... примена конфигурације" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Нема познатог драјвера" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Не постоји познати драјвер за вашу звучну картицу (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3239,46 +3244,7 @@ msgstr "" msgid "Driver:" msgstr "Драјвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Стари \"%s\" драјвер је на црној листи.\n" -"\n" -"Пријављено је да опструише кернел при рестартовању.\n" -"\n" -"Нови \"%s\" драјвер ће бити коришћен само при следећем стартању система." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Нема open source драјвера" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Не постоји бесплатан драјвер за вашу звучну картицу (%s), али постоји " -"лиценцирани драјвер на \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Нема познатог драјвера" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Не постоји познати драјвер за вашу звучну картицу (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Помоћ за подешавање звука" @@ -6215,11 +6181,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Сервер" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7089,6 +7060,32 @@ msgstr "" msgid "Installation failed" msgstr "Инсталација није успела" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Очисти /tmp при сваком стартању" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Стари \"%s\" драјвер је на црној листи.\n" +#~ "\n" +#~ "Пријављено је да опструише кернел при рестартовању.\n" +#~ "\n" +#~ "Нови \"%s\" драјвер ће бити коришћен само при следећем стартању система." + +#~ msgid "No open source driver" +#~ msgstr "Нема open source драјвера" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Не постоји бесплатан драјвер за вашу звучну картицу (%s), али постоји " +#~ "лиценцирани драјвер на \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po index 024bf47f0..22ffbc163 100644 --- a/perl-install/share/po/sr@Latn.po +++ b/perl-install/share/po/sr@Latn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-09-15 13:34+0200\n" "Last-Translator: Toma Jankovic_\n" "Language-Team: Serbian \n" @@ -201,11 +201,6 @@ msgstr "Ne možete koristiti enkriptovani fajl sistem za tačku montiranja %s" msgid "Password (again)" msgstr "Lozinka (ponovite)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Očisti /tmp pri svakom startanju" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3137,7 +3132,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Samo momenat... primena konfiguracije" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nema poznatog drajvera" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Ne postoji poznati drajver za vašu zvučnu karticu (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3240,46 +3245,7 @@ msgstr "" msgid "Driver:" msgstr "Drajver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Stari \"%s\" drajver je na crnoj listi.\n" -"\n" -"Prijavljeno je da opstruiše kernel pri restartovanju.\n" -"\n" -"Novi \"%s\" drajver će biti korišćen samo pri sledećem startanju sistema." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nema open source drajvera" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Ne postoji besplatan drajver za vašu zvučnu karticu (%s), ali postoji " -"licencirani drajver na \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nema poznatog drajvera" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Ne postoji poznati drajver za vašu zvučnu karticu (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Pomoć za podešavanje zvuka" @@ -6217,11 +6183,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7094,6 +7065,32 @@ msgstr "" msgid "Installation failed" msgstr "Instalacija nije uspela" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Očisti /tmp pri svakom startanju" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Stari \"%s\" drajver je na crnoj listi.\n" +#~ "\n" +#~ "Prijavljeno je da opstruiše kernel pri restartovanju.\n" +#~ "\n" +#~ "Novi \"%s\" drajver će biti korišćen samo pri sledećem startanju sistema." + +#~ msgid "No open source driver" +#~ msgstr "Nema open source drajvera" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Ne postoji besplatan drajver za vašu zvučnu karticu (%s), ali postoji " +#~ "licencirani drajver na \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po index 58fd84336..5f4f339c5 100644 --- a/perl-install/share/po/sv.po +++ b/perl-install/share/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX-sv\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2011-05-24 21:32+0200\n" "Last-Translator: Thomas Backlund \n" "Language-Team: Swedish \n" @@ -214,11 +214,6 @@ msgstr "Du kan inte använda ett lösenord med %s" msgid "Password (again)" msgstr "Lösenord (bekräfta)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Rensa /tmp vid varje start" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3208,7 +3203,17 @@ msgstr "processor nummer " msgid "Please Wait... Applying the configuration" msgstr "Vänta... verkställer konfigurationen" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ingen känd drivrutin" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Det finns ingen känd drivrutin för ljudkortet (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Aktivera PulseAudio" @@ -3312,47 +3317,7 @@ msgstr "" msgid "Driver:" msgstr "Drivrutin:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Den gamla drivrutinen \"%s\" är svartlistad.\n" -"\n" -"Det har rapporterats att den ger fel i kärnan vid urladdning.\n" -"\n" -"Den nya drivrutinen \"%s\" kommer endast att användas vid nästa \"bootstrap" -"\"." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ingen drivrutin med öppen källkod" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Det finns ingen fri drivrutin för ljudkortet (%s), men det finns en sluten " -"på \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ingen känd drivrutin" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Det finns ingen känd drivrutin för ljudkortet (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Felsökning av ljud" @@ -6186,11 +6151,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi är en ZeroConf demon som implementerar en mDNS stack" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP-server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Ange CPU frekvensinställningar" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7096,6 +7066,33 @@ msgstr "" msgid "Installation failed" msgstr "Installationen misslyckades" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Rensa /tmp vid varje start" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Den gamla drivrutinen \"%s\" är svartlistad.\n" +#~ "\n" +#~ "Det har rapporterats att den ger fel i kärnan vid urladdning.\n" +#~ "\n" +#~ "Den nya drivrutinen \"%s\" kommer endast att användas vid nästa " +#~ "\"bootstrap\"." + +#~ msgid "No open source driver" +#~ msgstr "Ingen drivrutin med öppen källkod" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Det finns ingen fri drivrutin för ljudkortet (%s), men det finns en " +#~ "sluten på \"%s\"." + #~ msgid "command %s missing" #~ msgstr "kommando %s saknas" diff --git a/perl-install/share/po/ta.po b/perl-install/share/po/ta.po index 908cea0c8..a71632f7d 100644 --- a/perl-install/share/po/ta.po +++ b/perl-install/share/po/ta.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX 1.0\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2002-09-06 00:35+0800\n" "Last-Translator: prabu anand \n" "Language-Team: Tamil \n" @@ -201,11 +201,6 @@ msgstr "மறைக்குறியீடு செய்யப்பட் msgid "Password (again)" msgstr "கடவுச்ெசால் (மீண்டும்)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "/tmp அடைவை ஒவ்வொரு முறைத் துவங்கும்போதும் துடைத்து விடு" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3097,7 +3092,17 @@ msgstr "ெசயலகம் # " msgid "Please Wait... Applying the configuration" msgstr "தயவுசெய்து காத்திருக்கவும்...செயல்படுத்தப்படுகிறது" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "இயக்கநிரல் ஏதுமில்ைல" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "உங்கள் ஒலியட்ைடக்கு (%s) இயக்கநிரல் ஏதுமில்ைல" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3179,41 +3184,7 @@ msgstr "" msgid "Driver:" msgstr "இயக்கநிரல்:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "விடுவிக்கப்பட்ட இயக்கநிரல் ஏதுமில்ைல" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"உங்கள் ஒலியட்ைடக்கு (%s), விடுவிக்கப்பட்ட இயக்கநிரல் ஏதுமில்ைலமாற்று இயக்கநிரல் \"%s\" " -"உள்ளது" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "இயக்கநிரல் ஏதுமில்ைல" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "உங்கள் ஒலியட்ைடக்கு (%s) இயக்கநிரல் ஏதுமில்ைல" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "ஒலியை சரிபார்த்தல்" @@ -5965,11 +5936,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP சேவையகம்" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6694,6 +6670,19 @@ msgstr "" msgid "Installation failed" msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "/tmp அடைவை ஒவ்வொரு முறைத் துவங்கும்போதும் துடைத்து விடு" + +#~ msgid "No open source driver" +#~ msgstr "விடுவிக்கப்பட்ட இயக்கநிரல் ஏதுமில்ைல" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "உங்கள் ஒலியட்ைடக்கு (%s), விடுவிக்கப்பட்ட இயக்கநிரல் ஏதுமில்ைலமாற்று இயக்கநிரல் \"%s" +#~ "\" உள்ளது" + #~ msgid "File sharing" #~ msgstr "கோப்பு பகிர்தல்" diff --git a/perl-install/share/po/tg.po b/perl-install/share/po/tg.po index 3c256a8f5..7c5f9f220 100644 --- a/perl-install/share/po/tg.po +++ b/perl-install/share/po/tg.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-tg\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-09-17 16:03+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" @@ -222,11 +222,6 @@ msgstr "" msgid "Password (again)" msgstr "Гузарвожа (боз)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Дар ҳар худборшавӣ /tmp-ро тоза кунед" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3212,7 +3207,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Марҳамат карда Интизор шавед... Батанзимдарорӣ истифода шуда истодааст" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Ронандаи номаълум" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Барои корти овоздори шумо ронандаи маълум мавҷуд нест (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3316,47 +3321,7 @@ msgstr "" msgid "Driver:" msgstr "Гардонанда:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Ронандаи кӯҳнаи \"%s\" ба рӯйхати сиёҳ дохил шуд.\n" -"\n" -"Дар хусуси он ҳисобот тартиб дода шудааст, ки асосро ҳангоми ба кор " -"наандохтанпешакӣ огоҳ менамояд.\n" -"\n" -"Ронандаи нави \"%s\" танҳо ҳангоми кор андохтани навбатӣ истифода хоҳад шуд." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ронанда бо сарчашмаи аввалаи кушода мавҷуд нест" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Барои корти овозии (%s)-и шумо гардонандаи озод мавҷуд нест, лекин " -"гардонандаи шахсӣ дар \"%s\" ҳаст." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Ронандаи номаълум" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Барои корти овоздори шумо ронандаи маълум мавҷуд нест (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Ҳалли муаммои ба овоз тааллуқ дошта" @@ -6229,11 +6194,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Хидматрасон" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7146,6 +7116,34 @@ msgstr "" msgid "Installation failed" msgstr "Коргузорӣ бо нокомӣ анҷомид" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Дар ҳар худборшавӣ /tmp-ро тоза кунед" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Ронандаи кӯҳнаи \"%s\" ба рӯйхати сиёҳ дохил шуд.\n" +#~ "\n" +#~ "Дар хусуси он ҳисобот тартиб дода шудааст, ки асосро ҳангоми ба кор " +#~ "наандохтанпешакӣ огоҳ менамояд.\n" +#~ "\n" +#~ "Ронандаи нави \"%s\" танҳо ҳангоми кор андохтани навбатӣ истифода хоҳад " +#~ "шуд." + +#~ msgid "No open source driver" +#~ msgstr "Ронанда бо сарчашмаи аввалаи кушода мавҷуд нест" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Барои корти овозии (%s)-и шумо гардонандаи озод мавҷуд нест, лекин " +#~ "гардонандаи шахсӣ дар \"%s\" ҳаст." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po index 73492659e..417284854 100644 --- a/perl-install/share/po/th.po +++ b/perl-install/share/po/th.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2001-09-10 14:24GMT+7\n" "Last-Translator: Wachara Chinsettawong \n" "Language-Team: Thai \n" @@ -187,11 +187,6 @@ msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำ msgid "Password (again)" msgstr "รหัสผ่าน (ใส่อีกครั้ง)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "ลบ /tmp ตอน boot ทุกครั้ง" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3076,7 +3071,17 @@ msgstr "" msgid "Please Wait... Applying the configuration" msgstr "กรุณารอสักครู่ ..." -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3157,39 +3162,7 @@ msgstr "" msgid "Driver:" msgstr "Driver" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -5925,11 +5898,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "เซิร์ฟเวอร์ NIS" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6683,6 +6661,9 @@ msgstr "" msgid "Installation failed" msgstr "การติดตั้งไม่สำเร็จ" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "ลบ /tmp ตอน boot ทุกครั้ง" + #~ msgid "Restrict command line options" #~ msgstr "อ็อปชั่นจำเพาะที่ใช้กับคอมมานด์ไลน์" diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po index bce02e9fa..758c15e03 100644 --- a/perl-install/share/po/tl.po +++ b/perl-install/share/po/tl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-tl\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2004-09-15 13:35+0200\n" "Last-Translator: Arys P. Deloso \n" "Language-Team: Filipino \n" @@ -203,11 +203,6 @@ msgstr "" msgid "Password (again)" msgstr "Password (ulit)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Linisin ang /tmp bawa boot" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3188,7 +3183,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Maghintay Lamang... Ina-apply ang configuration" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Walang kilalang driver" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Walang kilalang driver para sa inyong sound card na (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3293,46 +3298,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Ang lumang driver na \"%s\" ay naka-blacklist.\n" -"\n" -"Napaulat na ito ay ino-oops ang kernel sa pag-a-unload.\n" -"\n" -"Ang bagong driver na \"%s\" ay magagamit lamang sa susunod na bootstrap." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Walang \"open source\" na driver" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Walang libreng driver para sa inyong sound card na (%s), pero may " -"proprietary na driver sa \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Walang kilalang driver" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Walang kilalang driver para sa inyong sound card na (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Pagto-troubleshoot ng sound" @@ -6221,11 +6187,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP Server" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7135,6 +7106,32 @@ msgstr "" msgid "Installation failed" msgstr "Pag-i-install nabigo" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Linisin ang /tmp bawa boot" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Ang lumang driver na \"%s\" ay naka-blacklist.\n" +#~ "\n" +#~ "Napaulat na ito ay ino-oops ang kernel sa pag-a-unload.\n" +#~ "\n" +#~ "Ang bagong driver na \"%s\" ay magagamit lamang sa susunod na bootstrap." + +#~ msgid "No open source driver" +#~ msgstr "Walang \"open source\" na driver" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Walang libreng driver para sa inyong sound card na (%s), pero may " +#~ "proprietary na driver sa \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po index 380c27276..5bf749ab6 100644 --- a/perl-install/share/po/tr.po +++ b/perl-install/share/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-11-18 00:32+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Mageia Turkish Translation Team \n" @@ -207,11 +207,6 @@ msgstr "%s ile bir parola kullanamazsınız" msgid "Password (again)" msgstr "Parola (tekrar)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "/tmp dizinini her açılışta temizle" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3198,7 +3193,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Lütfen Bekleyiniz... Yapılandırmalar uygulanıyor" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Bilinmeyen sürücü" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Ses kartınız (%s) için bilinen bir sürücü yok" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio' yu etkinleştir" @@ -3302,46 +3307,7 @@ msgstr "" msgid "Driver:" msgstr "Sürücü:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Eski \"%s\" sürücüsü kara listededir.\n" -"\n" -"Çekirdek yüklenirken sürekli hatalar raporlamaktadır.\n" -"\n" -"Yeni \"%s\" sürücüsü ancak sonraki açılışta kullanılabilir." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Açık kaynak sürücü yok" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Ses kartınız (%s) için özgür yazılım bir sürücü yok, ama \"%s\" adresinde " -"bir tescilli sürücü var." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Bilinmeyen sürücü" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Ses kartınız (%s) için bilinen bir sürücü yok" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Ses sorunu giderme" @@ -4900,8 +4866,7 @@ msgstr "" #. -PO: Only write something if needed: #: messages.pm:11 #, c-format -msgid "" -"_: You can warn about unofficial translation here" +msgid "_: You can warn about unofficial translation here" msgstr "" "UYARI: Bu lisans belgesinin çevirisi gayriresmi nitelikte olup hukuki bir " "belge olarak kullanılamaz." @@ -5028,7 +4993,8 @@ msgstr "" "Yazılım Ürünleri ve yanlarında gelen belgeler \"oldukları gibi\", ve " "kanunların izin verdiği\n" "ölçüde garanti dışıdırlar.\n" -"Ne Mageia ne de lisans sağlayıcıları veya destekleyicileri hiçbir koşulda ve\n" +"Ne Mageia ne de lisans sağlayıcıları veya destekleyicileri hiçbir koşulda " +"ve\n" "yasaların izin verdiği oranda, kullanıcının\n" "Yazılım Ürünlerini kullanmak konusunda\n" "yetkin olmaması nedeniyle oluşan (iş kaybı, işin aksaması,\n" @@ -6243,11 +6209,16 @@ msgstr "" "artsürecidir." #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Zaman sunucusu" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "CPU frekanslarını ayarla" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7154,6 +7125,32 @@ msgstr "" msgid "Installation failed" msgstr "Kurulum başarısız!" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "/tmp dizinini her açılışta temizle" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Eski \"%s\" sürücüsü kara listededir.\n" +#~ "\n" +#~ "Çekirdek yüklenirken sürekli hatalar raporlamaktadır.\n" +#~ "\n" +#~ "Yeni \"%s\" sürücüsü ancak sonraki açılışta kullanılabilir." + +#~ msgid "No open source driver" +#~ msgstr "Açık kaynak sürücü yok" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Ses kartınız (%s) için özgür yazılım bir sürücü yok, ama \"%s\" adresinde " +#~ "bir tescilli sürücü var." + #~ msgid "command %s missing" #~ msgstr "%s komutu kayıp" diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po index 59cef1186..bf9328b86 100644 --- a/perl-install/share/po/uk.po +++ b/perl-install/share/po/uk.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-06 22:12+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -205,11 +205,6 @@ msgstr "Ви не можете використовувати пароль ра msgid "Password (again)" msgstr "Пароль (ще раз)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Очищати /tmp при кожному перезавантаженні" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3206,7 +3201,17 @@ msgstr "процесор # " msgid "Please Wait... Applying the configuration" msgstr "Зачекайте, будь ласка... Йде застосування конфігурації" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Немає відомого драйвера" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Немає відомого драйвера для вашої звукової плати (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "Увімкнути PulseAudio" @@ -3309,47 +3314,7 @@ msgstr "" msgid "Driver:" msgstr "Драйвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Старий драйвер \"%s\" занесено в чорний список.\n" -"\n" -"Про нього створено звіт, щоб попередити ядро при вивантаженні.\n" -"\n" -"Новий драйвер \"%s\" буде використано тільки при наступному початковому\n" -"завантаженні." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Немає драйвера з відкритим кодом" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Для вашої звукової карти (%s) немає безкоштовного драйвера, але є власний " -"драйвер на \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Немає відомого драйвера" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Немає відомого драйвера для вашої звукової плати (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Вирішення проблем зі звуком" @@ -6257,11 +6222,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi — це фонова служба ZeroConf, яка реалізує стек mDNS" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Сервер NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "Встановити параметри керування частотою процесора" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7185,6 +7155,33 @@ msgstr "" msgid "Installation failed" msgstr "Встановлення завершилося невдало" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Очищати /tmp при кожному перезавантаженні" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Старий драйвер \"%s\" занесено в чорний список.\n" +#~ "\n" +#~ "Про нього створено звіт, щоб попередити ядро при вивантаженні.\n" +#~ "\n" +#~ "Новий драйвер \"%s\" буде використано тільки при наступному початковому\n" +#~ "завантаженні." + +#~ msgid "No open source driver" +#~ msgstr "Немає драйвера з відкритим кодом" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Для вашої звукової карти (%s) немає безкоштовного драйвера, але є власний " +#~ "драйвер на \"%s\"." + #~ msgid "command %s missing" #~ msgstr "немає команди %s" diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po index 3ab182d84..2fe3668c9 100644 --- a/perl-install/share/po/uz.po +++ b/perl-install/share/po/uz.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-01-15 08:03+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: Uzbek (Cyrillic) \n" @@ -209,11 +209,6 @@ msgstr "Maxfiy soʻzdan %s bilan foydalana olmaysiz" msgid "Password (again)" msgstr "Maxfiy soʻz (yana)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Tizimni yuklashda /tmp direktoriyasini tozalash" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3181,7 +3176,18 @@ msgstr "protsessor # " msgid "Please Wait... Applying the configuration" msgstr "Iltimos kutib turing... Moslamalar qoʻllanilmoqda" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Maʼlum boʻlgan drayver yoʻq" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "" +"Sizning \"%s\" tovush kartangiz uchun maʼlum boʻlgan drayver mavjud emas." + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio'ni yoqish" @@ -3270,40 +3276,7 @@ msgstr "" msgid "Driver:" msgstr "Drayver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Ochiq kodli drayver mavjud emas" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Maʼlum boʻlgan drayver yoʻq" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "" -"Sizning \"%s\" tovush kartangiz uchun maʼlum boʻlgan drayver mavjud emas." - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Tovush nosozliklarini topish va bartaraf qilish" @@ -6078,11 +6051,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP serveri" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6815,6 +6793,12 @@ msgstr "" msgid "Installation failed" msgstr "Oʻrnatish muvaffaqiyatsiz tugadi" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Tizimni yuklashda /tmp direktoriyasini tozalash" + +#~ msgid "No open source driver" +#~ msgstr "Ochiq kodli drayver mavjud emas" + #~ msgid "command %s missing" #~ msgstr "%s buyrugʻi yetishmayapti" diff --git a/perl-install/share/po/uz@cyrillic.po b/perl-install/share/po/uz@cyrillic.po index f494a3bed..e6e0cf77f 100644 --- a/perl-install/share/po/uz@cyrillic.po +++ b/perl-install/share/po/uz@cyrillic.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2010-01-15 08:03+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: Uzbek (Cyrillic) \n" @@ -209,11 +209,6 @@ msgstr "Махфий сўздан %s билан фойдалана олмайс msgid "Password (again)" msgstr "Махфий сўз (яна)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Тизимни юклашда /tmp директориясини тозалаш" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3170,7 +3165,17 @@ msgstr "процессор # " msgid "Please Wait... Applying the configuration" msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Маълум бўлган драйвер йўқ" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас." + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "PulseAudio'ни ёқиш" @@ -3259,39 +3264,7 @@ msgstr "" msgid "Driver:" msgstr "Драйвер:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Очиқ кодли драйвер мавжуд эмас" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Маълум бўлган драйвер йўқ" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас." - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Товуш носозликларини топиш ва бартараф қилиш" @@ -6051,11 +6024,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP сервери" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6787,6 +6765,12 @@ msgstr "" msgid "Installation failed" msgstr "Ўрнатиш муваффақиятсиз тугади" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Тизимни юклашда /tmp директориясини тозалаш" + +#~ msgid "No open source driver" +#~ msgstr "Очиқ кодли драйвер мавжуд эмас" + #~ msgid "command %s missing" #~ msgstr "%s буйруғи етишмаяпти" diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po index e49a3c02f..4e8a20456 100644 --- a/perl-install/share/po/vi.po +++ b/perl-install/share/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX-vi version\n" "Report-Msgid-Bugs-To: tmthanh@yahoo.com\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2005-06-02 21:17+0700\n" "Last-Translator: Larry Nguyen \n" "Language-Team: \n" @@ -205,11 +205,6 @@ msgstr "Không thể dùng một hệ thống file đã mã hóa cho điểm g msgid "Password (again)" msgstr "Nhập lại mật khẩu" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Làm sạch /tmp mỗi khi khởi động" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3159,7 +3154,17 @@ msgstr "cpu # " msgid "Please Wait... Applying the configuration" msgstr "Hãy chờ...đang áp dụng cấu hình" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Không xác định được driver nào" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "Không xác định được driver nào cho card âm thanh của bạn (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3263,46 +3268,7 @@ msgstr "" msgid "Driver:" msgstr "Driver:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Driver cũ \"%s\" đã bị ghi sổ đen.\n" -"\n" -"Nó được ghi nhận là làm rối kernel khi thôi nạp.\n" -"\n" -"Driver mới \"%s\" sẽ chỉ được dùng trên bootstrap tiếp theo." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Không có driver nguồn mở" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"Không có driver miễn phí cho card âm thanh của bạn (%s), nhưng có driver " -"thương mại tại \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Không xác định được driver nào" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "Không xác định được driver nào cho card âm thanh của bạn (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "Gỡ lỗi âm thanh" @@ -6109,11 +6075,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Máy chủ NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6995,6 +6966,32 @@ msgstr "" msgid "Installation failed" msgstr "Không cài đặt được" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Làm sạch /tmp mỗi khi khởi động" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Driver cũ \"%s\" đã bị ghi sổ đen.\n" +#~ "\n" +#~ "Nó được ghi nhận là làm rối kernel khi thôi nạp.\n" +#~ "\n" +#~ "Driver mới \"%s\" sẽ chỉ được dùng trên bootstrap tiếp theo." + +#~ msgid "No open source driver" +#~ msgstr "Không có driver nguồn mở" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "Không có driver miễn phí cho card âm thanh của bạn (%s), nhưng có driver " +#~ "thương mại tại \"%s\"." + #~ msgid "" #~ "The classic bug sound tester is to run the following commands:\n" #~ "\n" diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po index acf0b1d42..6bb75f751 100644 --- a/perl-install/share/po/wa.po +++ b/perl-install/share/po/wa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DrakX\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2006-09-05 23:14+0200\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: Walloon \n" @@ -212,11 +212,6 @@ msgstr "Vos n' poloz nén eployî on scret avou %s" msgid "Password (again)" msgstr "Sicret (co ene feye)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "Netyî «/tmp» a tchaeke renondaedje" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3206,7 +3201,17 @@ msgstr "processeu l° " msgid "Please Wait... Applying the configuration" msgstr "Tårdjîz s' i vs plait, dji mete en alaedje l' apontiaedje" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "Nou mineu di cnoxhou" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "I gn a nou mineu di cnoxhou po vosse cåte son (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "" @@ -3309,47 +3314,7 @@ msgstr "" msgid "Driver:" msgstr "Mineu:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"Li vî mineu «%s» a stî metou dins ene boere djivêye.\n" -"\n" -"I gn a-st avou sacwants rapoirts dijhant k' i fjheut des problinmes\n" -"avou l' nawea (des «oops») å moumint del distcherdjî.\n" -"\n" -"Li novea mineu «%s» srè eployî seulmint a pårti do renondaedje ki vént." - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "Nou mineu libe di cnoxhou" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"I gn a nou mineu libe po vosse cåte son (%s), mins i gn a-st on mineu " -"prôpietaire so «%s»." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "Nou mineu di cnoxhou" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "I gn a nou mineu di cnoxhou po vosse cåte son (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "" @@ -6121,11 +6086,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "Sierveu NTP" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -7030,6 +7000,33 @@ msgstr "" msgid "Installation failed" msgstr "L' astalaedje a fwait berwete" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "Netyî «/tmp» a tchaeke renondaedje" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "Li vî mineu «%s» a stî metou dins ene boere djivêye.\n" +#~ "\n" +#~ "I gn a-st avou sacwants rapoirts dijhant k' i fjheut des problinmes\n" +#~ "avou l' nawea (des «oops») å moumint del distcherdjî.\n" +#~ "\n" +#~ "Li novea mineu «%s» srè eployî seulmint a pårti do renondaedje ki vént." + +#~ msgid "No open source driver" +#~ msgstr "Nou mineu libe di cnoxhou" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "I gn a nou mineu libe po vosse cåte son (%s), mins i gn a-st on mineu " +#~ "prôpietaire so «%s»." + #~ msgid "command %s missing" #~ msgstr "i manke li comande %s" diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po index 279f14a6d..f390343ef 100644 --- a/perl-install/share/po/zh_CN.po +++ b/perl-install/share/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zh_CN\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2009-04-09 11:48+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: Mageia i18n Team \n" @@ -203,11 +203,6 @@ msgstr "您在 %s 时不能使用密码" msgid "Password (again)" msgstr "密码(请再输一次)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "每次启动时清除 /tmp" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3126,7 +3121,17 @@ msgstr "CPU # " msgid "Please Wait... Applying the configuration" msgstr "请稍候...正在应用配置" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "没有已知驱动程序" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "没有已知的驱动程序可以用在您的声卡(%s)上" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "启用 PulseAudio" @@ -3223,46 +3228,7 @@ msgstr "" msgid "Driver:" msgstr "驱动程序: " -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"旧的“%s”驱动程序已列于黑名单。\n" -"\n" -"据报告该程序可能在卸装时使内核崩溃。\n" -"\n" -"新的“%s”驱动程序仅会在下此启动时使用。" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "没有开放源代码的驱动程序" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "" -"没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上, 不过在“%s”有一个专有" -"的驱动程序。" - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "没有已知驱动程序" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "没有已知的驱动程序可以用在您的声卡(%s)上" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "声音疑难解决" @@ -6008,11 +5974,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP 服务器" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6856,6 +6827,32 @@ msgstr "" msgid "Installation failed" msgstr "安装失败" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "每次启动时清除 /tmp" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "旧的“%s”驱动程序已列于黑名单。\n" +#~ "\n" +#~ "据报告该程序可能在卸装时使内核崩溃。\n" +#~ "\n" +#~ "新的“%s”驱动程序仅会在下此启动时使用。" + +#~ msgid "No open source driver" +#~ msgstr "没有开放源代码的驱动程序" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "" +#~ "没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上, 不过在“%s”有一个专" +#~ "有的驱动程序。" + #~ msgid "command %s missing" #~ msgstr "缺少命令 %s" diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po index d32bee322..89e670093 100644 --- a/perl-install/share/po/zh_TW.po +++ b/perl-install/share/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" -"POT-Creation-Date: 2013-09-30 21:17+0200\n" +"POT-Creation-Date: 2013-11-30 19:21+0100\n" "PO-Revision-Date: 2013-04-08 15:16+0800\n" "Last-Translator: You-Cheng Hsieh \n" "Language-Team: Traditional Chinese \n" @@ -204,11 +204,6 @@ msgstr "您不能在密碼中使用 %s" msgid "Password (again)" msgstr "密碼 (再一次)" -#: any.pm:449 -#, c-format -msgid "Clean /tmp at each boot" -msgstr "每次開機時清理 /tmp" - #: any.pm:459 #, c-format msgid "Init Message" @@ -3122,7 +3117,17 @@ msgstr "CPU 編號" msgid "Please Wait... Applying the configuration" msgstr "請稍待... 正在套用該設定" -#: harddrake/sound.pm:331 +#: harddrake/sound.pm:133 +#, c-format +msgid "No known driver" +msgstr "無已知的驅動程式" + +#: harddrake/sound.pm:134 +#, c-format +msgid "There's no known driver for your sound card (%s)" +msgstr "您使用的音效卡尚未有已知的驅動程式 (%s)" + +#: harddrake/sound.pm:166 #, c-format msgid "Enable PulseAudio" msgstr "啟用 PulseAudio" @@ -3220,44 +3225,7 @@ msgstr "" msgid "Driver:" msgstr "驅動程式:" -#: harddrake/sound.pm:399 -#, c-format -msgid "" -"The old \"%s\" driver is blacklisted.\n" -"\n" -"It has been reported to oops the kernel on unloading.\n" -"\n" -"The new \"%s\" driver will only be used on next bootstrap." -msgstr "" -"舊的 \"%s\" 驅動程式已被列入黑名單。\n" -"\n" -"它曾被回報會導致核心在解除模組時產生 Oops 錯誤。\n" -"\n" -"於下一次開機時將只會使用新的 \"%s\" 驅動程式。" - -#: harddrake/sound.pm:407 -#, c-format -msgid "No open source driver" -msgstr "無開放原始碼的驅動程式可用" - -#: harddrake/sound.pm:408 -#, c-format -msgid "" -"There's no free driver for your sound card (%s), but there's a proprietary " -"driver at \"%s\"." -msgstr "您的音效卡 (%s) 沒有自由的驅動程式,但是有私有的驅動程式於 \"%s\"." - -#: harddrake/sound.pm:411 -#, c-format -msgid "No known driver" -msgstr "無已知的驅動程式" - -#: harddrake/sound.pm:412 -#, c-format -msgid "There's no known driver for your sound card (%s)" -msgstr "您使用的音效卡尚未有已知的驅動程式 (%s)" - -#: harddrake/sound.pm:427 +#: harddrake/sound.pm:243 #, c-format msgid "Sound troubleshooting" msgstr "解決音效問題" @@ -6014,11 +5982,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi 是一個實作 mDNS 堆疊的 ZeroConf 伺服程式" #: services.pm:26 +#, fuzzy, c-format +msgid "An NTP client/server" +msgstr "NTP 伺服器" + +#: services.pm:27 #, c-format msgid "Set CPU frequency settings" msgstr "設定 CPU 頻率選項" -#: services.pm:27 +#: services.pm:28 #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" @@ -6885,6 +6858,30 @@ msgstr "" msgid "Installation failed" msgstr "安裝失敗" +#~ msgid "Clean /tmp at each boot" +#~ msgstr "每次開機時清理 /tmp" + +#~ msgid "" +#~ "The old \"%s\" driver is blacklisted.\n" +#~ "\n" +#~ "It has been reported to oops the kernel on unloading.\n" +#~ "\n" +#~ "The new \"%s\" driver will only be used on next bootstrap." +#~ msgstr "" +#~ "舊的 \"%s\" 驅動程式已被列入黑名單。\n" +#~ "\n" +#~ "它曾被回報會導致核心在解除模組時產生 Oops 錯誤。\n" +#~ "\n" +#~ "於下一次開機時將只會使用新的 \"%s\" 驅動程式。" + +#~ msgid "No open source driver" +#~ msgstr "無開放原始碼的驅動程式可用" + +#~ msgid "" +#~ "There's no free driver for your sound card (%s), but there's a " +#~ "proprietary driver at \"%s\"." +#~ msgstr "您的音效卡 (%s) 沒有自由的驅動程式,但是有私有的驅動程式於 \"%s\"." + #~ msgid "command %s missing" #~ msgstr "指令 %s 遺失" -- cgit v1.2.1 From 30c7450def88bfa2b8870598b70e2420ecaccb65 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sat, 30 Nov 2013 21:39:27 +0200 Subject: Update Ukrainian translation --- perl-install/share/po/uk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po index bf9328b86..8b135270e 100644 --- a/perl-install/share/po/uk.po +++ b/perl-install/share/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-04-06 22:12+0300\n" +"PO-Revision-Date: 2013-11-30 22:12+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -6222,9 +6222,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi — це фонова служба ZeroConf, яка реалізує стек mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Сервер NTP" +msgstr "Сервер і сервер NTP" #: services.pm:27 #, c-format -- cgit v1.2.1 From af389e89fcced08b9b949e6671452dc1728543da Mon Sep 17 00:00:00 2001 From: filip Date: Sat, 30 Nov 2013 21:27:23 +0100 Subject: Slovenian translation updated --- perl-install/share/po/sl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po index 7852171c0..d2ef5dd71 100644 --- a/perl-install/share/po/sl.po +++ b/perl-install/share/po/sl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-10-24 19:42+0100\n" +"PO-Revision-Date: 2013-11-30 20:23+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" @@ -6207,9 +6207,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi je pritajeni program za ZeroConf, ki podpira sklad mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Strežnik NTP" +msgstr "Odjemalec/strežnik NTP" #: services.pm:27 #, c-format -- cgit v1.2.1 From bfae167c7d2cd36992d3675c2a6cfcd4185ca8db Mon Sep 17 00:00:00 2001 From: tarakbumba Date: Sat, 30 Nov 2013 23:21:54 +0200 Subject: Updated Turkish translation --- perl-install/share/po/tr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po index 5bf749ab6..b2a817e7b 100644 --- a/perl-install/share/po/tr.po +++ b/perl-install/share/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-11-18 00:32+0300\n" +"PO-Revision-Date: 2013-11-30 23:20+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Mageia Turkish Translation Team \n" "Language: tr\n" @@ -4866,7 +4866,8 @@ msgstr "" #. -PO: Only write something if needed: #: messages.pm:11 #, c-format -msgid "_: You can warn about unofficial translation here" +msgid "" +"_: You can warn about unofficial translation here" msgstr "" "UYARI: Bu lisans belgesinin çevirisi gayriresmi nitelikte olup hukuki bir " "belge olarak kullanılamaz." @@ -6209,9 +6210,9 @@ msgstr "" "artsürecidir." #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Zaman sunucusu" +msgstr "Bir NTP istemcisi/sunucusu" #: services.pm:27 #, c-format -- cgit v1.2.1 From 66ddc1feac1059e64cbcd8232499a2207e973fd7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 30 Nov 2013 22:45:53 +0100 Subject: update --- perl-install/share/po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po index c3950a035..b48119350 100644 --- a/perl-install/share/po/fr.po +++ b/perl-install/share/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-04-25 00:16+0100\n" +"PO-Revision-Date: 2013-11-30 22:45+0100\n" "Last-Translator: Yann Ciret \n" "Language-Team: French \n" "Language: fr\n" @@ -6276,9 +6276,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi est un service ZeroConf qui implémente une pile mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Serveur NTP" +msgstr "Un client/serveur NTP" #: services.pm:27 #, c-format -- cgit v1.2.1 From 334bc349c4ab45f810334b1b2016556e3b29af81 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 30 Nov 2013 22:56:26 +0100 Subject: fix starting after draksound drop OSS/ALSA switch --- perl-install/NEWS | 3 +++ perl-install/standalone/harddrake2 | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index e2321f9d8..786123616 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- harddrake: + o fix starting after draksound drop OSS/ALSA switch + Version 16.2 - 29 November 2013 - diskdrake: diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 0ee0c4b35..76445e803 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -410,13 +410,6 @@ foreach (@classes) { $_->{capacity} =~ s/DVD/$dvd/; } $configurator .= harddrake::data::set_removable_configurator($Ident, $_); - if ($Ident eq "AUDIO") { - require harddrake::sound; - my @alter = harddrake::sound::get_alternative($_->{driver}); - if (my $alternative_drivers = join(', ', @alter)) { - $_->{alternative_drivers} = $alternative_drivers; - } - } if ($Ident eq "HARDDISK") { my $hd = $_; my $info = find { $_->{device} eq $hd->{device} } @{$all_hds->{hds}}; -- cgit v1.2.1 From 2ef425177b5ff4f61edb0f26255904d91aa3e733 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 30 Nov 2013 23:00:38 +0100 Subject: 16.3 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 567358d38..cb900f5f4 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.2 +VERSION:=16.3 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 786123616..b0d4358a3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.3 - 30 November 2013 + - harddrake: o fix starting after draksound drop OSS/ALSA switch -- cgit v1.2.1 From 39b8eedb565aa4d1c408b86e837d642ef71127c7 Mon Sep 17 00:00:00 2001 From: dglent Date: Sun, 1 Dec 2013 09:42:07 +0100 Subject: Update Greek translation --- perl-install/share/po/el.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po index 2afe9166a..77032c8e4 100644 --- a/perl-install/share/po/el.po +++ b/perl-install/share/po/el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-04-14 09:32+0200\n" +"PO-Revision-Date: 2013-12-01 09:41+0100\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 @@ -3317,7 +3317,7 @@ msgstr "" "Εδώ μπορείτε να επιλέξετε έναν εναλλακτικό οδηγό (OSS ή ALSA) για την κάρτα " "ήχου σας (%s)" -#. -PO: here the first %s is either "OSS" or "ALSA", +#. -PO: here the first %s is either "OSS" or "ALSA", #. -PO: the second %s is the name of the current driver #. -PO: and the third %s is the name of the default driver #: harddrake/sound.pm:369 @@ -6326,9 +6326,9 @@ msgstr "" "Το avahi είναι ένας ZeroConf δαίμονας ο οποίος ενσωματώνει ένα στρώμα mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Εξυπηρετητής NTP" +msgstr "Ένας εξυπηρετητής/πελάτης NTP" #: services.pm:27 #, c-format -- cgit v1.2.1 From 38a37508919ec7ee04bb740ee1b6a72011ab32cc Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 1 Dec 2013 13:00:29 +0000 Subject: Ignore the built rescue.sqfs --- rescue/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 rescue/.gitignore diff --git a/rescue/.gitignore b/rescue/.gitignore new file mode 100644 index 000000000..7b75a3e33 --- /dev/null +++ b/rescue/.gitignore @@ -0,0 +1 @@ +rescue.sqfs -- cgit v1.2.1 From 073ec448d66a2fca506c9665ff1162fdd7356473 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 1 Dec 2013 22:21:08 +0000 Subject: images: Allow the BOOT_AUTOMATIC_METHOD env var to work in rescue mode too --- images/make_boot_img | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/make_boot_img b/images/make_boot_img index 2ac8eb189..48f106e85 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -731,7 +731,7 @@ sub boot_iso { output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot)); if ($ENV{BOOT_AUTOMATIC_METHOD}) { - _ "sed -i 's|splash quiet\$|splash quiet automatic=$ENV{BOOT_AUTOMATIC_METHOD}|' .boot_iso/isolinux/isolinux.cfg" + _ "sed -i 's#\\(append .*\\)\\(splash quiet\\|rescue\\)\$#\\1\\2 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/isolinux/isolinux.cfg" } _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso"; -- cgit v1.2.1 From 038fd7ccc8c37fba4225cd86ab9ab285528ef8c7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 07:09:56 +0100 Subject: fix diskdrake colorized partition tabs with Adwaita (bgo#719624) "In the GTK+ CSS interpreter (and CSS in general), background-image takes precedence over background-color, so the gradients set by Adwaita on focused windows' buttons still takes precedence over your custom background-color, this doesn't happen on unfocused windows because no background-image is set for buttons there." --- perl-install/NEWS | 3 +++ perl-install/share/diskdrake.css | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index b0d4358a3..8ccc4837d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix diskdrake colorized partition tabs with Adwaita (bgo#719624) + Version 16.3 - 30 November 2013 - harddrake: diff --git a/perl-install/share/diskdrake.css b/perl-install/share/diskdrake.css index 3ba4144df..186b605bd 100644 --- a/perl-install/share/diskdrake.css +++ b/perl-install/share/diskdrake.css @@ -9,6 +9,7 @@ #PART_ext2, #PART_ext3, #PART_ext4 { background-color: #ff0000; + background-image: none; } #PART_ext2:hover:hover, #PART_ext3:hover, #PART_ext4:hover { background-color: #e60000; @@ -19,6 +20,7 @@ #PART_xfs { background-color: #ff9900; + background-image: none; } #PART_xfs:hover { background-color: #e66600; @@ -29,6 +31,7 @@ #PART_swap { background-color: #66cc00; + background-image: none; } #PART_swap:active, #PART_swap:hover { background-color: #66b700; @@ -36,6 +39,7 @@ #PART_vfat, #PART_ntfs, #PART_ntfs-3g { background-color: #00b7ff; + background-image: none; } #PART_vfat:hover, #PART_ntfs:hover, #PART_ntfs-3g:hover { background-color: #0099e6; @@ -46,6 +50,7 @@ #PART_empty { background-color: #ffffff; + background-image: none; } #PART_empty:hover, #PART_empty:active { background-color: #e6e6e6; @@ -53,9 +58,11 @@ #PART_other { background-color: #929eab; + background-image: none; } #PART_new { background-color: #1f429c; + background-image: none; color: #ffffff; } -- cgit v1.2.1 From bc0277714b36ec3207002a22e009317dae65c16e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 07:16:38 +0100 Subject: include "sdhci-acpi" for eMMC (mga#11812) --- images/NEWS | 2 ++ kernel/list_modules.pm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/images/NEWS b/images/NEWS index 76f27e00d..54c54a47f 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- include "sdhci-acpi" for eMMC (mga#11812) + Version 2.2 - 13 November 2013 by Colin Guthrie - pass the modules we want in modules.alias, but not in the initrd through to diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index c4ee7674d..63a382012 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -332,7 +332,8 @@ our %l = ( other => [ qw(defxx ide-floppy ide-tape loop lp nbd sg st), qw(parport_pc parport_serial), - qw(btaudio mmc_block), + qw(btaudio), + qw(mmc_block sdhci-acpi), # eMMC 'cryptoloop', if_(arch() =~ /sparc/, 'openprom'), -- cgit v1.2.1 From 0bd4b8c6da4c1886d554ac0d6b0dc2617fc33f27 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 07:17:25 +0100 Subject: 2.3 --- images/Makefile | 2 +- images/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index 1cd48e38e..f80c4f732 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.2 +VERSION=2.3 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 54c54a47f..7329388f3 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +Version 2.3 - 2 December 2013 by Thierry Vignaud + - include "sdhci-acpi" for eMMC (mga#11812) Version 2.2 - 13 November 2013 by Colin Guthrie -- cgit v1.2.1 From 3f440ab9ee220189ddc4d3d940bd287529c65f2c Mon Sep 17 00:00:00 2001 From: kiki Date: Mon, 2 Dec 2013 18:21:20 +0700 Subject: Updated Indonesian translations --- perl-install/share/po/id.po | 1495 +++++++++---------------------------------- 1 file changed, 318 insertions(+), 1177 deletions(-) diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po index 9528c034f..258ad242d 100644 --- a/perl-install/share/po/id.po +++ b/perl-install/share/po/id.po @@ -1,31 +1,27 @@ -# Instalator Grafis Mandriva Linux -# Copyright (C) 1999 Mandriva -# Budi Rachmanto , 2001-2003 -# Linux Indonesia , 1999-2001 -# Mohammad DAMT , 1999-2001 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# +# Translators: +# Ahmad Ramadhana , 2005 # Andy , 1999 +# Bayu Artanto , 2005 +# erwiensamantha , 2005 +# Firdaus , 2005 # Kelana , 1999 -# Willy Sudiarto Raharjo , 2004 - 2007. -# Erwien Samantha , 2005. -# Bayu Artanto , 2005. -# Ahmad Ramadhana , 2005. -# Firdaus , 2005. -# Sofian , 2005. -# Kiki Syahadat , 2012. -# +# kiki.syahadat , 2012-2013 +# Sofian , 2005 msgid "" msgstr "" -"Project-Id-Version: drakx_share\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-04-07 06:33+0700\n" -"Last-Translator: Kiki Syahadat \n" -"Language-Team: Indonesia , Translation list \n" -"Language: id\n" +"PO-Revision-Date: 2013-12-02 11:18+0000\n" +"Last-Translator: kiki.syahadat \n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 @@ -45,17 +41,11 @@ msgstr "Instalasi bootloader sedang berjalan" #, c-format msgid "" "LILO wants to assign a new Volume ID to drive %s. However, changing\n" -"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows " -"error.\n" +"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n" "This caution does not apply to Windows 95 or 98, or to NT data disks.\n" "\n" "Assign a new Volume ID?" -msgstr "" -"LILO akan memberi Volume ID baru pada drive %s. Tetapi, mengubah Volume\n" -"ID disk boot Windows NT, 2000, atau XP adalah error Windows yang fatal.\n" -"Peringatan ini tidak berlaku untuk disk data Windows 95 atau 98, atau NT.\n" -"\n" -"Beri Volume ID baru?" +msgstr "LILO akan memberi Volume ID baru pada drive %s. Tetapi, mengubah Volume\nID disk boot Windows NT, 2000, atau XP adalah error Windows yang fatal.\nPeringatan ini tidak berlaku untuk disk data Windows 95 atau 98, atau NT.\n\nBeri Volume ID baru?" #: any.pm:277 #, c-format @@ -71,28 +61,16 @@ msgid "" " setenv boot-device %s,\\\\:tbxi\n" " Then type: shut-down\n" "At your next boot you should see the bootloader prompt." -msgstr "" -"Anda mungkin perlu mengubah boot-device Open Firmware Anda untuk\n" -" menghidupkan bootloader. Jika Anda tidak melihat prompt bootloader\n" -" saat reboot, tekan Command-Option-O-F saat reboot dan masukkan:\n" -" setenv boot-device %s,\\\\:tbxi\n" -" Lalu ketik: shut-down\n" -"Saat boot berikutnya Anda seharusnya bisa melihat prompt bootloader." +msgstr "Anda mungkin perlu mengubah boot-device Open Firmware Anda untuk\n menghidupkan bootloader. Jika Anda tidak melihat prompt bootloader\n saat reboot, tekan Command-Option-O-F saat reboot dan masukkan:\n setenv boot-device %s,\\\\:tbxi\n Lalu ketik: shut-down\nSaat boot berikutnya Anda seharusnya bisa melihat prompt bootloader." #: any.pm:323 #, c-format msgid "" "You decided to install the bootloader on a partition.\n" -"This implies you already have a bootloader on the hard disk drive you boot " -"(eg: System Commander).\n" +"This implies you already have a bootloader on the hard disk drive you boot (eg: System Commander).\n" "\n" "On which drive are you booting?" -msgstr "" -"Anda memutuskan untuk menginstall bootloader pada partisi.\n" -"Ini artinya Anda sudah memiliki bootloader pada drive hard disk yang akan " -"diboot (misal: System Commander).\n" -"\n" -"Pada drive mana Anda booting?" +msgstr "Anda memutuskan untuk menginstall bootloader pada partisi.\nIni artinya Anda sudah memiliki bootloader pada drive hard disk yang akan diboot (misal: System Commander).\n\nPada drive mana Anda booting?" #: any.pm:334 #, c-format @@ -355,9 +333,7 @@ msgstr "Konfigurasi Bootloader" msgid "" "Here are the entries on your boot menu so far.\n" "You can create additional entries or change the existing ones." -msgstr "" -"Ini adalah daftar pada menu boot Anda saat ini.\n" -"Anda bisa membuat entri tambahan atau mengubah yang sudah ada." +msgstr "Ini adalah daftar pada menu boot Anda saat ini.\nAnda bisa membuat entri tambahan atau mengubah yang sudah ada." #: any.pm:860 #, c-format @@ -404,9 +380,7 @@ msgstr "Silakan berikan nama pengguna" msgid "" "The user name must start with a lower case letter followed by only lower " "cased letters, numbers, `-' and `_'" -msgstr "" -"Nama pengguna harus dimulai dengan huruf kecil diikuti oleh hanya huruf " -"kecil, nomor, `-' dan `_'" +msgstr "Nama pengguna harus dimulai dengan huruf kecil diikuti oleh hanya huruf kecil, nomor, `-' dan `_'" #: any.pm:879 #, c-format @@ -491,8 +465,7 @@ msgstr "Login otomatis" #: any.pm:1012 #, c-format msgid "I can set up your computer to automatically log on one user." -msgstr "" -"Kita bisa mengatur komputer agar login secara otomatis ke satu pengguna." +msgstr "Kita bisa mengatur komputer agar login secara otomatis ke satu pengguna." #: any.pm:1013 #, c-format @@ -555,10 +528,7 @@ msgid "" "%s can support multiple languages. Select\n" "the languages you would like to install. They will be available\n" "when your installation is complete and you restart your system." -msgstr "" -"%s bisa mendukung banyak bahasa. Pilih\n" -"bahasa yang ingin Anda install. Mereka akan tersedia\n" -"setelah instalasi selesai dan Anda merestart sistem." +msgstr "%s bisa mendukung banyak bahasa. Pilih\nbahasa yang ingin Anda install. Mereka akan tersedia\nsetelah instalasi selesai dan Anda merestart sistem." #: any.pm:1160 fs/partitioning_wizard.pm:180 #, c-format @@ -644,42 +614,30 @@ msgstr "Kustomisasi" #, c-format msgid "" "Would you like to allow users to share some of their directories?\n" -"Allowing this will permit users to simply click on \"Share\" in konqueror " -"and nautilus.\n" +"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n" "\n" "\"Custom\" permit a per-user granularity.\n" -msgstr "" -"Apakah Anda akan mengzinkan pengguna menshare beberapa direktori mereka?\n" -"Mengizinkan ini akan memungkinkan pengguna untuk mengklik pada \"Share\" di " -"konqueror dan nautilus.\n" -"\n" -"\"Kustomisasi\" izin per-pengguna.\n" +msgstr "Apakah Anda akan mengzinkan pengguna menshare beberapa direktori mereka?\nMengizinkan ini akan memungkinkan pengguna untuk mengklik pada \"Share\" di konqueror dan nautilus.\n\n\"Kustomisasi\" izin per-pengguna.\n" #: any.pm:1358 #, c-format msgid "" "NFS: the traditional Unix file sharing system, with less support on Mac and " "Windows." -msgstr "" -"NFS: sistem sharing file tradisional Unix, dengan sedikit dukungan untuk Mac " -"dan Windows." +msgstr "NFS: sistem sharing file tradisional Unix, dengan sedikit dukungan untuk Mac dan Windows." #: any.pm:1361 #, c-format msgid "" "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux " "systems." -msgstr "" -"SMB: sistem sharing file yang digunakan oleh Windows, Mac OS X dan banyak " -"sistem Linux modern." +msgstr "SMB: sistem sharing file yang digunakan oleh Windows, Mac OS X dan banyak sistem Linux modern." #: any.pm:1369 #, c-format msgid "" "You can export using NFS or SMB. Please select which you would like to use." -msgstr "" -"Anda bisa mengekspor menggunakan NFS atau SMB. Silakan pilih mana yang ingin " -"Anda gunakan." +msgstr "Anda bisa mengekspor menggunakan NFS atau SMB. Silakan pilih mana yang ingin Anda gunakan." #: any.pm:1397 #, c-format @@ -691,18 +649,14 @@ msgstr "Jalankan userdrake" msgid "" "The per-user sharing uses the group \"fileshare\". \n" "You can use userdrake to add a user to this group." -msgstr "" -"Sharing per-pengguna menggunakan grup \"fileshare\". \n" -"Anda bisa menggunakan userdrake untuk menambahkan pengguna ke grup ini." +msgstr "Sharing per-pengguna menggunakan grup \"fileshare\". \nAnda bisa menggunakan userdrake untuk menambahkan pengguna ke grup ini." #: any.pm:1506 #, c-format msgid "" -"You need to logout and back in again for changes to take effect. Press OK to " -"logout now." -msgstr "" -"Anda perlu logout dan masuk kembali agar perubahan berlaku. Tekan OK untuk " -"logout sekarang." +"You need to logout and back in again for changes to take effect. Press OK to" +" logout now." +msgstr "Anda perlu logout dan masuk kembali agar perubahan berlaku. Tekan OK untuk logout sekarang." #: any.pm:1510 #, c-format @@ -788,8 +742,7 @@ msgstr "File lokal:" #, c-format msgid "" "Use local for all authentication and information user tell in local file" -msgstr "" -"Gunakan lokal untuk semua otentikasi dan informasi pengguna dalam file lokal" +msgstr "Gunakan lokal untuk semua otentikasi dan informasi pengguna dalam file lokal" #: authentication.pm:66 #, c-format @@ -801,10 +754,7 @@ msgstr "LDAP:" msgid "" "Tells your computer to use LDAP for some or all authentication. LDAP " "consolidates certain types of information within your organization." -msgstr "" -"Beritahu komputer untuk menggunakan LDAP untuk beberapa atau semua " -"otentikasi. LDAP mengkonsolidasi beberapa tipe informasi dalam organisasi " -"Anda." +msgstr "Beritahu komputer untuk menggunakan LDAP untuk beberapa atau semua otentikasi. LDAP mengkonsolidasi beberapa tipe informasi dalam organisasi Anda." #: authentication.pm:67 #, c-format @@ -816,9 +766,7 @@ msgstr "NIS:" msgid "" "Allows you to run a group of computers in the same Network Information " "Service domain with a common password and group file." -msgstr "" -"Memungkinkan Anda menjalankan sebuah grup komputer pada domain Layanan " -"Informasi Jaringan yang sama dengan sandi dan file grup umum." +msgstr "Memungkinkan Anda menjalankan sebuah grup komputer pada domain Layanan Informasi Jaringan yang sama dengan sandi dan file grup umum." #: authentication.pm:68 #, c-format @@ -830,9 +778,7 @@ msgstr "Domain Windows:" msgid "" "Winbind allows the system to retrieve information and authenticate users in " "a Windows domain." -msgstr "" -"Winbind memungkinkan sistem untuk menerima informasi dan otentikasi pengguna " -"dalam domain Windows." +msgstr "Winbind memungkinkan sistem untuk menerima informasi dan otentikasi pengguna dalam domain Windows." #: authentication.pm:69 #, c-format @@ -842,8 +788,7 @@ msgstr "Kerberos 5 :" #: authentication.pm:69 #, c-format msgid "With Kerberos and LDAP for authentication in Active Directory Server " -msgstr "" -"Dengan Kerberos dan LDAP untuk otentikasi dalam Server Direktori Aktif " +msgstr "Dengan Kerberos dan LDAP untuk otentikasi dalam Server Direktori Aktif " #: authentication.pm:106 authentication.pm:140 authentication.pm:159 #: authentication.pm:160 authentication.pm:186 authentication.pm:210 @@ -863,8 +808,7 @@ msgstr "Selamat Datang di Wizard Otentikasi" msgid "" "You have selected LDAP authentication. Please review the configuration " "options below " -msgstr "" -"Anda telah memilih otentikasi LDAP. Silakan lihat opsi konfigurasi di bawah " +msgstr "Anda telah memilih otentikasi LDAP. Silakan lihat opsi konfigurasi di bawah " #: authentication.pm:111 authentication.pm:166 #, c-format @@ -940,11 +884,9 @@ msgstr "Basis bayangan" #: authentication.pm:143 #, c-format msgid "" -"You have selected Kerberos 5 authentication. Please review the configuration " -"options below " -msgstr "" -"Anda telah memilih otentikasi Kerberos 5. Silakan lihat opsi konfigurasi di " -"bawah " +"You have selected Kerberos 5 authentication. Please review the configuration" +" options below " +msgstr "Anda telah memilih otentikasi Kerberos 5. Silakan lihat opsi konfigurasi di bawah " #: authentication.pm:145 #, c-format @@ -981,9 +923,7 @@ msgstr "Gunakan LDAP untuk informasi pengguna" msgid "" "You have selected Kerberos 5 for authentication, now you must choose the " "type of users information " -msgstr "" -"Anda telah memilih Kerberos 5 untuk otentikasi, sekarang Anda harus memilih " -"tipe informasi pengguna " +msgstr "Anda telah memilih Kerberos 5 untuk otentikasi, sekarang Anda harus memilih tipe informasi pengguna " #: authentication.pm:168 #, c-format @@ -995,8 +935,7 @@ msgstr "Fecth base Dn " msgid "" "You have selected NIS authentication. Please review the configuration " "options below " -msgstr "" -"Anda telah memilih otentikasi NIS. Silakan lihat opsi konfigurasi di bawah " +msgstr "Anda telah memilih otentikasi NIS. Silakan lihat opsi konfigurasi di bawah " #: authentication.pm:191 #, c-format @@ -1013,9 +952,7 @@ msgstr "Server NIS" msgid "" "You have selected Windows Domain authentication. Please review the " "configuration options below " -msgstr "" -"Anda telah memilih otentikasi Domain Windows. Silakan lihat opsi konfigurasi " -"di bawah " +msgstr "Anda telah memilih otentikasi Domain Windows. Silakan lihat opsi konfigurasi di bawah " #: authentication.pm:217 #, c-format @@ -1083,7 +1020,8 @@ msgstr "Nama Pengguna Admin Domain" msgid "Domain Admin Password" msgstr "Sandi Admin Domain" -#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) +#. -PO: these messages will be displayed at boot time in the BIOS, use only +#. ASCII (7bit) #: bootloader.pm:1019 #, c-format msgid "" @@ -1092,12 +1030,7 @@ msgid "" "Choose an operating system from the list above or\n" "wait for default boot.\n" "\n" -msgstr "" -"Selamat datang di pemilih sistem operasi!\n" -"\n" -"Pilih sistem operasi dari daftar di atas atau\n" -"tunggu boot default.\n" -"\n" +msgstr "Selamat datang di pemilih sistem operasi!\n\nPilih sistem operasi dari daftar di atas atau\ntunggu boot default.\n\n" #: bootloader.pm:1211 #, c-format @@ -1144,18 +1077,14 @@ msgstr "Anda tidak bisa menginstall bootloader pada partisi %s\n" msgid "" "Your bootloader configuration must be updated because partition has been " "renumbered" -msgstr "" -"Konfigurasi bootloader Anda harus diupdate karena partisi telah mengalami " -"penomoran ulang" +msgstr "Konfigurasi bootloader Anda harus diupdate karena partisi telah mengalami penomoran ulang" #: bootloader.pm:2271 #, c-format msgid "" "The bootloader cannot be installed correctly. You have to boot rescue and " "choose \"%s\"" -msgstr "" -"Bootloader tidak bisa diinstall dengan benar. Anda harus melakukan boot " -"rescue dan memilih \"%s\"" +msgstr "Bootloader tidak bisa diinstall dengan benar. Anda harus melakukan boot rescue dan memilih \"%s\"" #: bootloader.pm:2272 #, c-format @@ -1209,11 +1138,7 @@ msgid "" "locally, and treat it like a local filesystem (provided the web server is\n" "configured as a WebDAV server). If you would like to add WebDAV mount\n" "points, select \"New\"." -msgstr "" -"WebDAV adalah protokol yang memungkinkan Anda memount direktori server web\n" -"secara lokal, dan memperlakukannya seperti sistem file lokal (menyediakan\n" -"server web adalah mengkonfigurasikannya sebagai server WebDAV). Jika Anda\n" -"ingin menambah titik mount WebDAV, pilih \"Baru\"." +msgstr "WebDAV adalah protokol yang memungkinkan Anda memount direktori server web\nsecara lokal, dan memperlakukannya seperti sistem file lokal (menyediakan\nserver web adalah mengkonfigurasikannya sebagai server WebDAV). Jika Anda\ningin menambah titik mount WebDAV, pilih \"Baru\"." #: diskdrake/dav.pm:25 #, c-format @@ -1332,8 +1257,7 @@ msgstr "Mempartisi" #: diskdrake/hd_gtk.pm:73 #, c-format msgid "Click on a partition, choose a filesystem type then choose an action" -msgstr "" -"Klik pada sebuah partisi, pilih tipe sistem file lalu pilih sebuah aksi" +msgstr "Klik pada sebuah partisi, pilih tipe sistem file lalu pilih sebuah aksi" #: diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:1197 #: diskdrake/interactive.pm:1207 diskdrake/interactive.pm:1260 @@ -1351,7 +1275,7 @@ msgstr "Silakan backup terlebih dahulu data Anda" msgid "Exit" msgstr "Keluar" -#: diskdrake/hd_gtk.pm:117 +#: diskdrake/hd_gtk.pm:117 diskdrake/hd_gtk.pm:117 diskdrake/hd_gtk.pm:117 #, c-format msgid "Continue" msgstr "Lanjutkan" @@ -1369,10 +1293,7 @@ msgid "" "You have one big Microsoft Windows partition.\n" "I suggest you first resize that partition\n" "(click on it, then click on \"Resize\")" -msgstr "" -"Anda memiliki satu partisi besar Windows Microsoft.\n" -"Disarankan untuk mengubah ukuran partisi tersebut\n" -"(klik partisi tersebut, lalu klik \"Ubah ukuran\")" +msgstr "Anda memiliki satu partisi besar Windows Microsoft.\nDisarankan untuk mengubah ukuran partisi tersebut\n(klik partisi tersebut, lalu klik \"Ubah ukuran\")" #: diskdrake/hd_gtk.pm:246 #, c-format @@ -1506,7 +1427,8 @@ msgstr "Apakah Anda ingin menyimpan modifikasi/etc/fstab?" #: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:291 #, c-format -msgid "You need to reboot for the partition table modifications to take effect" +msgid "" +"You need to reboot for the partition table modifications to take effect" msgstr "Anda harus reboot agar modifikasi tabel partisi bisa berlaku" #: diskdrake/interactive.pm:306 @@ -1515,10 +1437,7 @@ msgid "" "You should format partition %s.\n" "Otherwise no entry for mount point %s will be written in fstab.\n" "Quit anyway?" -msgstr "" -"Anda harus memformat partisi %s.\n" -"Atau tidak ada entri untuk titik mount %s akan ditulis dalam fstab.\n" -"Keluar saja?" +msgstr "Anda harus memformat partisi %s.\nAtau tidak ada entri untuk titik mount %s akan ditulis dalam fstab.\nKeluar saja?" #: diskdrake/interactive.pm:319 #, c-format @@ -1560,9 +1479,7 @@ msgstr "Tidak bisa menambah lagi partisi" msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" -msgstr "" -"Untuk menambah partisi, silakan hapus satu agar dapat membuat sebuah partisi " -"extended" +msgstr "Untuk menambah partisi, silakan hapus satu agar dapat membuat sebuah partisi extended" #: diskdrake/interactive.pm:384 #, c-format @@ -1705,10 +1622,7 @@ msgid "" "You cannot create a new partition\n" "(since you reached the maximal number of primary partitions).\n" "First remove a primary partition and create an extended partition." -msgstr "" -"Anda tidak bisa membuat partisi baru\n" -"(karena jumlah maksimal partisi primary telah tercapai).\n" -"Hapus sebuah partisi primary dan buat sebuah partisi extended." +msgstr "Anda tidak bisa membuat partisi baru\n(karena jumlah maksimal partisi primary telah tercapai).\nHapus sebuah partisi primary dan buat sebuah partisi extended." #: diskdrake/interactive.pm:597 #, c-format @@ -1719,8 +1633,7 @@ msgstr "Hapus file loopback?" #, c-format msgid "" "After changing type of partition %s, all data on this partition will be lost" -msgstr "" -"Setelah mengubah tipe partisi %s, semua data pada partisi ini akan hilang" +msgstr "Setelah mengubah tipe partisi %s, semua data pada partisi ini akan hilang" #: diskdrake/interactive.pm:636 #, c-format @@ -1777,10 +1690,7 @@ msgstr "Di mana Anda ingin memount device %s?" msgid "" "Cannot unset mount point as this partition is used for loop back.\n" "Remove the loopback first" -msgstr "" -"Tidak bisa menghapus titik mount karena partisi ini digunakan untuk loop " -"back.\n" -"Hapus loopback terlebih dahulu" +msgstr "Tidak bisa menghapus titik mount karena partisi ini digunakan untuk loop back.\nHapus loopback terlebih dahulu" #: diskdrake/interactive.pm:743 #, c-format @@ -1838,10 +1748,7 @@ msgstr "Ukuran maksimal: %s MB" msgid "" "To ensure data integrity after resizing the partition(s),\n" "filesystem checks will be run on your next boot into Microsoft Windows®" -msgstr "" -"Untuk memastikan integritas data setelah mengubah ukuran partisi,\n" -"pengujian sistem file akan dilakukan pada boot berikutnya ke Microsoft " -"Windows®" +msgstr "Untuk memastikan integritas data setelah mengubah ukuran partisi,\npengujian sistem file akan dilakukan pada boot berikutnya ke Microsoft Windows®" #: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1507 #, c-format @@ -1898,10 +1805,7 @@ msgstr "\"%s\" sudah ada" msgid "" "Physical volume %s is still in use.\n" "Do you want to move used physical extents on this volume to other volumes?" -msgstr "" -"Volume fisik %s masih digunakan.\n" -"Apakah Anda ingin memindahkan perluasan fisik yang digunakan pada volume ini " -"ke volume lain?" +msgstr "Volume fisik %s masih digunakan.\nApakah Anda ingin memindahkan perluasan fisik yang digunakan pada volume ini ke volume lain?" #: diskdrake/interactive.pm:1049 #, c-format @@ -1923,7 +1827,7 @@ msgstr "Loopback" msgid "Loopback file name: " msgstr "Nama file loopback: " -#: diskdrake/interactive.pm:1086 +#: diskdrake/interactive.pm:1086 diskdrake/interactive.pm:1086 #, c-format msgid "Give a file name" msgstr "Berikan sebuah nama file" @@ -2019,16 +1923,8 @@ msgid "" "Directory %s already contains data\n" "(%s)\n" "\n" -"You can either choose to move the files into the partition that will be " -"mounted there or leave them where they are (which results in hiding them by " -"the contents of the mounted partition)" -msgstr "" -"Direktori %s sudah berisi data\n" -"(%s)\n" -"\n" -"Anda bisa memilih untuk memindahkan file ke partisi yang akan dimount atau " -"membiarkan tetap di tempatnya (yang berarti akan disembunyikan oleh konten " -"dari partisi yang dimount)" +"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)" +msgstr "Direktori %s sudah berisi data\n(%s)\n\nAnda bisa memilih untuk memindahkan file ke partisi yang akan dimount atau membiarkan tetap di tempatnya (yang berarti akan disembunyikan oleh konten dari partisi yang dimount)" #: diskdrake/interactive.pm:1337 #, c-format @@ -2156,18 +2052,14 @@ msgstr " (tidak aktif)" msgid "" "Loopback file(s):\n" " %s\n" -msgstr "" -"File loopback:\n" -" %s\n" +msgstr "File loopback:\n %s\n" #: diskdrake/interactive.pm:1427 #, c-format msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" -msgstr "" -"Partisi yang diboot secara default\n" -" (untuk boot MS-DOS, bukan untuk lilo)\n" +msgstr "Partisi yang diboot secara default\n (untuk boot MS-DOS, bukan untuk lilo)\n" #: diskdrake/interactive.pm:1429 #, c-format @@ -2196,11 +2088,7 @@ msgid "" "Chances are, this partition is\n" "a Driver partition. You should\n" "probably leave it alone.\n" -msgstr "" -"\n" -"Mungkin partisi ini adalah\n" -"partisi Driver. Sebaiknya\n" -"biarkan begitu saja.\n" +msgstr "\nMungkin partisi ini adalah\npartisi Driver. Sebaiknya\nbiarkan begitu saja.\n" #: diskdrake/interactive.pm:1439 #, c-format @@ -2209,11 +2097,7 @@ msgid "" "This special Bootstrap\n" "partition is for\n" "dual-booting your system.\n" -msgstr "" -"\n" -"Partisi Bootstrap khusus\n" -"ini adalah untuk\n" -"dualboot sistem Anda.\n" +msgstr "\nPartisi Bootstrap khusus\nini adalah untuk\ndualboot sistem Anda.\n" #: diskdrake/interactive.pm:1448 #, c-format @@ -2262,7 +2146,8 @@ msgstr "Pilih kunci enkripsi sistem file Anda" #: diskdrake/interactive.pm:1511 #, c-format -msgid "This encryption key is too simple (must be at least %d characters long)" +msgid "" +"This encryption key is too simple (must be at least %d characters long)" msgstr "Kunci enkripsi ini terlalu sederhana (harus setidaknya %d karakter)" #: diskdrake/interactive.pm:1518 @@ -2307,9 +2192,7 @@ msgstr "Yang lain" #, c-format msgid "" "Please enter your username, password and domain name to access this host." -msgstr "" -"Silakan masukkan nama pengguna Anda, sandi dan nama domain untuk mengakses " -"host ini." +msgstr "Silakan masukkan nama pengguna Anda, sandi dan nama domain untuk mengakses host ini." #: diskdrake/smbnfs_gtk.pm:180 #, c-format @@ -2366,9 +2249,7 @@ msgstr "Menghapus paket..." msgid "" "An error occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem" -msgstr "" -"Terjadi error - tidak ada device valid ditemukan pada sistem file baru yang " -"akan dibuat. Silakan periksa hardware Anda untuk penyebab dari masalah" +msgstr "Terjadi error - tidak ada device valid ditemukan pada sistem file baru yang akan dibuat. Silakan periksa hardware Anda untuk penyebab dari masalah" #: fs/any.pm:75 fs/partitioning_wizard.pm:70 #, c-format @@ -2450,29 +2331,21 @@ msgstr "Hidupkan akunting kuota disk grup dan paksa batas disk secara opsional" msgid "" "Do not update inode access times on this filesystem\n" "(e.g, for faster access on the news spool to speed up news servers)." -msgstr "" -"Jangan update waktu akses inode pada sistem file ini\n" -"(misal, untuk akses lebih cepat pada spool berita untuk mempercepat server " -"berita)." +msgstr "Jangan update waktu akses inode pada sistem file ini\n(misal, untuk akses lebih cepat pada spool berita untuk mempercepat server berita)." #: fs/mount_options.pm:123 #, c-format msgid "" "Update inode access times on this filesystem in a more efficient way\n" "(e.g, for faster access on the news spool to speed up news servers)." -msgstr "" -"Update waktu akses inode pada sistem file ini dengan cara lebih efisien\n" -"(misal, untuk akses lebih cepat pada spool berita untuk mempercepat server " -"berita)." +msgstr "Update waktu akses inode pada sistem file ini dengan cara lebih efisien\n(misal, untuk akses lebih cepat pada spool berita untuk mempercepat server berita)." #: fs/mount_options.pm:126 #, c-format msgid "" "Can only be mounted explicitly (i.e.,\n" "the -a option will not cause the filesystem to be mounted)." -msgstr "" -"Hanya bisa dimount secara eksplisit (misal,\n" -"opsi -a tidak akan menyebabkan sistem file dimount)." +msgstr "Hanya bisa dimount secara eksplisit (misal,\nopsi -a tidak akan menyebabkan sistem file dimount)." #: fs/mount_options.pm:129 #, c-format @@ -2485,10 +2358,7 @@ msgid "" "Do not allow execution of any binaries on the mounted\n" "filesystem. This option might be useful for a server that has filesystems\n" "containing binaries for architectures other than its own." -msgstr "" -"Jangan izinkan eksekusi binari apapun pada sistem file yang\n" -"dimount. Opsi ini akan berguna untuk server yang memiliki sistem file\n" -"yang berisi binari untuk arsitektur yang berbeda." +msgstr "Jangan izinkan eksekusi binari apapun pada sistem file yang\ndimount. Opsi ini akan berguna untuk server yang memiliki sistem file\nyang berisi binari untuk arsitektur yang berbeda." #: fs/mount_options.pm:135 #, c-format @@ -2496,10 +2366,7 @@ msgid "" "Do not allow set-user-identifier or set-group-identifier\n" "bits to take effect. (This seems safe, but is in fact rather unsafe if you\n" "have suidperl(1) installed.)" -msgstr "" -"Jangan izinkan bit set-user-identifier atau set-group-identifier\n" -"berpengaruh. (Sepertinya aman, tapi faktanya lebih tidak aman jika Anda\n" -"memiliki suidperl(1) yang terinstall.)" +msgstr "Jangan izinkan bit set-user-identifier atau set-group-identifier\nberpengaruh. (Sepertinya aman, tapi faktanya lebih tidak aman jika Anda\nmemiliki suidperl(1) yang terinstall.)" #: fs/mount_options.pm:139 #, c-format @@ -2571,9 +2438,7 @@ msgstr "Pilih partisi yang ingin Anda format" msgid "" "Failed to check filesystem %s. Do you want to repair the errors? (beware, " "you can lose data)" -msgstr "" -"Gagal memeriksa sistem file %s. Apakah Anda ingin memperbaiki error? (hati-" -"hati, Anda bisa kehilangan data)" +msgstr "Gagal memeriksa sistem file %s. Apakah Anda ingin memperbaiki error? (hati-hati, Anda bisa kehilangan data)" #: fs/partitioning.pm:78 #, c-format @@ -2586,10 +2451,7 @@ msgid "" "You must have a root partition.\n" "To accomplish this, create a partition (or click on an existing one).\n" "Then choose action ``Mount point'' and set it to `/'" -msgstr "" -"Anda harus memiliki partisi root.\n" -"Untuk melakukan ini, buat sebuah partisi (atau klik yang sudah ada).\n" -"Lalu pilih aksi ``Titik mount'' dan atur ke `/'" +msgstr "Anda harus memiliki partisi root.\nUntuk melakukan ini, buat sebuah partisi (atau klik yang sudah ada).\nLalu pilih aksi ``Titik mount'' dan atur ke `/'" #: fs/partitioning_wizard.pm:67 #, c-format @@ -2597,10 +2459,7 @@ msgid "" "You do not have a swap partition.\n" "\n" "Continue anyway?" -msgstr "" -"Anda tidak memiliki partisi swap.\n" -"\n" -"Lanjutkan saja?" +msgstr "Anda tidak memiliki partisi swap.\n\nLanjutkan saja?" #: fs/partitioning_wizard.pm:101 #, c-format @@ -2643,10 +2502,7 @@ msgid "" "Your Microsoft Windows® partition is too fragmented. Please reboot your " "computer under Microsoft Windows®, run the ``defrag'' utility, then restart " "the %s installation." -msgstr "" -"Partisi Microsoft Windows® Anda terlalu terfragmentasi. Silakan reboot " -"komputer Anda ke Microsoft Windows®, jalankan utilitas ``defrag'', lalu " -"mulai ulang instalasi %s." +msgstr "Partisi Microsoft Windows® Anda terlalu terfragmentasi. Silakan reboot komputer Anda ke Microsoft Windows®, jalankan utilitas ``defrag'', lalu mulai ulang instalasi %s." #: fs/partitioning_wizard.pm:188 #, c-format @@ -2657,33 +2513,14 @@ msgid "" "Your Microsoft Windows® partition will be now resized.\n" "\n" "\n" -"Be careful: this operation is dangerous. If you have not already done so, " -"you first need to exit the installation, run \"chkdsk c:\" from a Command " -"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk" -"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " -"optionally run defrag, then restart the installation. You should also backup " -"your data.\n" +"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n" "\n" "\n" "When sure, press %s." -msgstr "" -"PERINGATAN!\n" -"\n" -"\n" -"Ukuran partisi Microsoft Windows® Anda sekarang akan diubah.\n" -"\n" -"\n" -"Hati-hati: operasi ini berbahaya. Jika Anda belum melakukannya, Anda perlu " -"keluar dari instalasi, jalankan \"chkdsk c:\" dari Command Prompt pada " -"Microsoft Windows® (hati-hati, menjalankan program grafis \"scandisk\" " -"tidaklah cukup, pastikan untuk menggunakan \"chkdsk\" dalam Command " -"Prompt!), jalankan defrag sebagai opsi, lalu mulai ulang instalasi. Anda " -"juga harus membackup data Anda.\n" -"\n" -"\n" -"Jika sudah yakin, tekan %s." +msgstr "PERINGATAN!\n\n\nUkuran partisi Microsoft Windows® Anda sekarang akan diubah.\n\n\nHati-hati: operasi ini berbahaya. Jika Anda belum melakukannya, Anda perlu keluar dari instalasi, jalankan \"chkdsk c:\" dari Command Prompt pada Microsoft Windows® (hati-hati, menjalankan program grafis \"scandisk\" tidaklah cukup, pastikan untuk menggunakan \"chkdsk\" dalam Command Prompt!), jalankan defrag sebagai opsi, lalu mulai ulang instalasi. Anda juga harus membackup data Anda.\n\n\nJika sudah yakin, tekan %s." -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: fs/partitioning_wizard.pm:197 fs/partitioning_wizard.pm:565 #: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519 #, c-format @@ -2698,9 +2535,7 @@ msgstr "Mempartisi" #: fs/partitioning_wizard.pm:203 #, c-format msgid "Which size do you want to keep for Microsoft Windows® on partition %s?" -msgstr "" -"Ukuran mana yang ingin Anda pertahankan untuk Microsoft Windows® pada " -"partisi %s?" +msgstr "Ukuran mana yang ingin Anda pertahankan untuk Microsoft Windows® pada partisi %s?" #: fs/partitioning_wizard.pm:204 #, c-format @@ -2720,8 +2555,7 @@ msgstr "Mengubah ukuran FAT gagal: %s" #: fs/partitioning_wizard.pm:234 #, c-format msgid "There is no FAT partition to resize (or not enough space left)" -msgstr "" -"Tidak ada partisi FAT untuk diubah ukuran (atau tidak cukup ruang tersisa)" +msgstr "Tidak ada partisi FAT untuk diubah ukuran (atau tidak cukup ruang tersisa)" #: fs/partitioning_wizard.pm:239 #, c-format @@ -2738,9 +2572,7 @@ msgstr "Hapus dan gunakan seluruh disk" msgid "" "You have more than one hard disk drive, which one do you want the installer " "to use?" -msgstr "" -"Anda memiliki lebih dari satu drive hard disk, mana yang ingin Anda gunakan " -"untuk installer?" +msgstr "Anda memiliki lebih dari satu drive hard disk, mana yang ingin Anda gunakan untuk installer?" #: fs/partitioning_wizard.pm:251 fsedit.pm:634 #, c-format @@ -2762,9 +2594,7 @@ msgstr "Gunakan fdisk" msgid "" "You can now partition %s.\n" "When you are done, do not forget to save using `w'" -msgstr "" -"Anda sekarang bisa mempartisi %s.\n" -"Setelah selesai, jangan lupa untuk menyimpan menggunakan `w'" +msgstr "Anda sekarang bisa mempartisi %s.\nSetelah selesai, jangan lupa untuk menyimpan menggunakan `w'" #: fs/partitioning_wizard.pm:409 #, c-format @@ -2824,21 +2654,13 @@ msgstr "Software RAID BIOS terdeteksi pada disk %s. Aktifkan?" #: fsedit.pm:247 #, c-format msgid "" -"I cannot read the partition table of device %s, it's too corrupted for me :" -"(\n" +"I cannot read the partition table of device %s, it's too corrupted for me :(\n" "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" "The other solution is to not allow DrakX to modify the partition table.\n" "(the error is %s)\n" "\n" "Do you agree to lose all the partitions?\n" -msgstr "" -"Tidak bisa membaca tabel partisi device %s, sudah sangat rusak :(\n" -"Bisa dicoba dilanjutkan, menghapus semua partisi yang rusak (SEMUA DATA akan " -"hilang!).\n" -"Solusi lainnya adalah tidak mengizinkan DrakX memodifikasi tabel partisi.\n" -"(errornya adalah %s)\n" -"\n" -"Apakah Anda setuju untuk kehilangan semua partisi?\n" +msgstr "Tidak bisa membaca tabel partisi device %s, sudah sangat rusak :(\nBisa dicoba dilanjutkan, menghapus semua partisi yang rusak (SEMUA DATA akan hilang!).\nSolusi lainnya adalah tidak mengizinkan DrakX memodifikasi tabel partisi.\n(errornya adalah %s)\n\nApakah Anda setuju untuk kehilangan semua partisi?\n" #: fsedit.pm:427 #, c-format @@ -2861,28 +2683,21 @@ msgid "" "You've selected a software RAID partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "Please be sure to add a separate /boot partition" -msgstr "" -"Anda telah memilih partisi RAID software sebagai root (/).\n" -"Tidak ada bootloader yang bisa menangani ini tanpa partisi /boot.\n" -"Silakan yakinkan untuk membuat partisi /boot terpisah" +msgstr "Anda telah memilih partisi RAID software sebagai root (/).\nTidak ada bootloader yang bisa menangani ini tanpa partisi /boot.\nSilakan yakinkan untuk membuat partisi /boot terpisah" #: fsedit.pm:440 #, c-format msgid "" "Metadata version unsupported for a boot partition. Please be sure to add a " "separate /boot partition." -msgstr "" -"Versi metadata tidak mendukung partisi boot. Silakan yakinkan untuk membuat " -"partisi /boot terpisah." +msgstr "Versi metadata tidak mendukung partisi boot. Silakan yakinkan untuk membuat partisi /boot terpisah." #: fsedit.pm:448 #, c-format msgid "" "You've selected a software RAID partition as /boot.\n" "No bootloader is able to handle this." -msgstr "" -"Anda telah memilih partisi RAID software sebagai /boot.\n" -"Tidak ada bootloader yang bisa menangani ini." +msgstr "Anda telah memilih partisi RAID software sebagai /boot.\nTidak ada bootloader yang bisa menangani ini." #: fsedit.pm:452 #, c-format @@ -2895,37 +2710,27 @@ msgid "" "You've selected an encrypted partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "Please be sure to add a separate /boot partition" -msgstr "" -"Anda telah memilih partisi terenkripsi sebagai root (/).\n" -"Tidak ada bootloader yang bisa menangani ini tanpa partisi /boot.\n" -"Silakan yakinkan untuk membuat partisi /boot terpisah" +msgstr "Anda telah memilih partisi terenkripsi sebagai root (/).\nTidak ada bootloader yang bisa menangani ini tanpa partisi /boot.\nSilakan yakinkan untuk membuat partisi /boot terpisah" #: fsedit.pm:465 fsedit.pm:485 #, c-format msgid "You cannot use an encrypted filesystem for mount point %s" -msgstr "" -"Anda tidak bisa menggunakan sistem file terenkripsi untuk titik mount %s" +msgstr "Anda tidak bisa menggunakan sistem file terenkripsi untuk titik mount %s" #: fsedit.pm:469 #, c-format msgid "" "You cannot use the LVM Logical Volume for mount point %s since it spans " "physical volumes" -msgstr "" -"Anda tidak bisa menggunakan Volume Logical LVM untuk titik mount %s karena " -"melebihi volume fisik" +msgstr "Anda tidak bisa menggunakan Volume Logical LVM untuk titik mount %s karena melebihi volume fisik" #: fsedit.pm:471 #, c-format msgid "" "You've selected the LVM Logical Volume as root (/).\n" -"The bootloader is not able to handle this when the volume spans physical " -"volumes.\n" +"The bootloader is not able to handle this when the volume spans physical volumes.\n" "You should create a separate /boot partition first" -msgstr "" -"Anda telah memilih Volume Logical LVM sebagai root (/).\n" -"Bootloader tidak bisa menangani ini ketika volume melebihi volume fisik.\n" -"Anda harus membuat partisi /boot terpisah terlebih dahulu" +msgstr "Anda telah memilih Volume Logical LVM sebagai root (/).\nBootloader tidak bisa menangani ini ketika volume melebihi volume fisik.\nAnda harus membuat partisi /boot terpisah terlebih dahulu" #: fsedit.pm:475 fsedit.pm:477 #, c-format @@ -2937,9 +2742,7 @@ msgstr "Direktori ini harus tetap ada di dalam sistem file root" msgid "" "You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount " "point\n" -msgstr "" -"Anda perlu sistem file nyata (ext2/3/4, reiserfs, xfs, or jfs) untuk titik " -"mount ini\n" +msgstr "Anda perlu sistem file nyata (ext2/3/4, reiserfs, xfs, or jfs) untuk titik mount ini\n" #: fsedit.pm:550 #, c-format @@ -3237,9 +3040,7 @@ msgstr "Tidak ada driver alternatif" msgid "" "There's no known OSS/ALSA alternative driver for your sound card (%s) which " "currently uses \"%s\"" -msgstr "" -"Tidak ada driver alternatif OSS/ALSA yang diketahui untuk perangkat suara " -"Anda (%s) yang saat ini menggunakan \"%s\"" +msgstr "Tidak ada driver alternatif OSS/ALSA yang diketahui untuk perangkat suara Anda (%s) yang saat ini menggunakan \"%s\"" #: harddrake/sound.pm:362 #, c-format @@ -3251,11 +3052,9 @@ msgstr "Konfigurasi suara" msgid "" "Here you can select an alternative driver (either OSS or ALSA) for your " "sound card (%s)." -msgstr "" -"Di sini Anda bisa memilih driver alternatif (OSS atau ALSA) untuk perangkat " -"suara Anda (%s)." +msgstr "Di sini Anda bisa memilih driver alternatif (OSS atau ALSA) untuk perangkat suara Anda (%s)." -#. -PO: here the first %s is either "OSS" or "ALSA", +#. -PO: here the first %s is either "OSS" or "ALSA", #. -PO: the second %s is the name of the current driver #. -PO: and the third %s is the name of the default driver #: harddrake/sound.pm:369 @@ -3263,47 +3062,24 @@ msgstr "" msgid "" "\n" "\n" -"Your card currently uses the %s\"%s\" driver (the default driver for your " -"card is \"%s\")" -msgstr "" -"\n" -"\n" -"Perangkat suara Anda saat ini menggunakan driver %s\"%s\" (driver default " -"untuk perangkat suara Anda adalah \"%s\")" +"Your card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")" +msgstr "\n\nPerangkat suara Anda saat ini menggunakan driver %s\"%s\" (driver default untuk perangkat suara Anda adalah \"%s\")" #: harddrake/sound.pm:371 #, c-format msgid "" -"OSS (Open Sound System) was the first sound API. It's an OS independent " -"sound API (it's available on most UNIX(tm) systems) but it's a very basic " -"and limited API.\n" +"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" "What's more, OSS drivers all reinvent the wheel.\n" "\n" -"ALSA (Advanced Linux Sound Architecture) is a modularized architecture " -"which\n" +"ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n" "supports quite a large range of ISA, USB and PCI cards.\n" "\n" "It also provides a much higher API than OSS.\n" "\n" "To use alsa, one can either use:\n" "- the old compatibility OSS API\n" -"- the new ALSA API that provides many enhanced features but requires using " -"the ALSA library.\n" -msgstr "" -"OSS (Open Sound System) adalah API suara pertama. Ini adalah API suara " -"independen OS (tersedia pada kebanyakan sistem UNIX(tm)) tapi ini API sangat " -"dasar dan terbatas.\n" -"Selebihnya, driver OSS bisa menjalankan semuanya.\n" -"\n" -"ALSA (Advanced Linux Sound Architecture) adalah arsitektur termodulasi yang\n" -"mendukung cukup banyak perangkat ISA, USB dan PCI.\n" -"\n" -"Ini juga menyediakan API lebih tinggi dari OSS.\n" -"\n" -"Untuk menggunakan alsa, Anda bisa menggunakan:\n" -"- kompatibilitas lama API OSS\n" -"- API ALSA baru yang menyediakan banyak peningkatan fitur tapi perlu " -"menggunakan library ALSA.\n" +"- the new ALSA API that provides many enhanced features but requires using the ALSA library.\n" +msgstr "OSS (Open Sound System) adalah API suara pertama. Ini adalah API suara independen OS (tersedia pada kebanyakan sistem UNIX(tm)) tapi ini API sangat dasar dan terbatas.\nSelebihnya, driver OSS bisa menjalankan semuanya.\n\nALSA (Advanced Linux Sound Architecture) adalah arsitektur termodulasi yang\nmendukung cukup banyak perangkat ISA, USB dan PCI.\n\nIni juga menyediakan API lebih tinggi dari OSS.\n\nUntuk menggunakan alsa, Anda bisa menggunakan:\n- kompatibilitas lama API OSS\n- API ALSA baru yang menyediakan banyak peningkatan fitur tapi perlu menggunakan library ALSA.\n" #: harddrake/sound.pm:385 harddrake/sound.pm:487 #, c-format @@ -3315,120 +3091,50 @@ msgstr "Driver:" msgid "Sound troubleshooting" msgstr "Pemecahan masalah suara" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: harddrake/sound.pm:430 #, c-format msgid "" -"Below are some basic tips to help debug audio problems, but for accurate and " -"up-to-date tips and tricks, please see:\n" +"Below are some basic tips to help debug audio problems, but for accurate and up-to-date tips and tricks, please see:\n" "\n" "https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" "\n" "\n" "\n" -"- General Recommendation: Enable PulseAudio. If you have opted to not to use " -"PulseAudio, we would strongly advise you enable it. For the vast majority of " -"desktop use cases, PulseAudio is the recommended and best supported option.\n" +"- General Recommendation: Enable PulseAudio. If you have opted to not to use PulseAudio, we would strongly advise you enable it. For the vast majority of desktop use cases, PulseAudio is the recommended and best supported option.\n" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol" -"\" (generic) will launch graphical applications to allow you to view your " -"sound devices and adjust volume levels\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol\" (generic) will launch graphical applications to allow you to view your sound devices and adjust volume levels\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n" "\n" "\n" -"- \"pactl stat\" will check that you can connect to the PulseAudio daemon " -"correctly.\n" +"- \"pactl stat\" will check that you can connect to the PulseAudio daemon correctly.\n" "\n" "\n" -"- \"pactl list sink-inputs\" will tell you which programs are currently " -"playing sound via PulseAudio.\n" +"- \"pactl list sink-inputs\" will tell you which programs are currently playing sound via PulseAudio.\n" "\n" "\n" -"- \"systemctl status osspd.service\" will tell you the current state of the " -"OSS Proxy Daemon. This is used to enable sound from legacy applications " -"which use the OSS sound API. You should install the \"ossp\" package if you " -"need this functionality.\n" +"- \"systemctl status osspd.service\" will tell you the current state of the OSS Proxy Daemon. This is used to enable sound from legacy applications which use the OSS sound API. You should install the \"ossp\" package if you need this functionality.\n" "\n" "\n" -"- \"pacmd ls\" will give you a LOT of debug information about the current " -"state of your audio.\n" +"- \"pacmd ls\" will give you a LOT of debug information about the current state of your audio.\n" "\n" "\n" -"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver " -"your card uses by default.\n" +"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver your card uses by default.\n" "\n" "\n" -"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound " -"related kernel modules (drivers) are loaded.\n" +"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound related kernel modules (drivers) are loaded.\n" "\n" "\n" -"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA " -"mixer controls for first sound card\n" +"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA mixer controls for first sound card\n" "\n" "\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are " -"currently using the sound card directly (normally this should only show " -"PulseAudio)\n" -msgstr "" -"Di bawah adalah beberapa tips dasar untuk membantu mendebug masalah audio, " -"tapi untuk tips dan trik akurat dan terbaru, silakan lihat:\n" -"\n" -"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" -"\n" -"\n" -"\n" -"- Rekomendasi Umum: Hidupkan PulseAudio. Jika Anda telah memilih untuk tidak " -"menggunakan PulseAudio, sangat dianjurkan untuk menghidupkannya. Untuk " -"penggunaan desktop secara luas, PulseAudio adalah pilihan terbaik dan " -"direkomendasikan.\n" -"\n" -"\n" -"\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) dan \"pauvucontrol" -"\" (generik) akan menjalankan aplikasi grafis yang memungkinkan Anda untuk " -"melihat perangkat suara dan menyesuaikan level volume\n" -"\n" -"\n" -"- \"ps aux | grep pulseaudio\" akan memeriksa bahwa PulseAudio berjalan.\n" -"\n" -"\n" -"- \"pactl stat\" akan memeriksa bahwa Anda bisa terhubung ke daemon " -"PulseAudio dengan benar.\n" -"\n" -"\n" -"- \"pactl list sink-inputs\" akan memberitahu Anda program mana yang sedang " -"memainkan suara melalui PulseAudio.\n" -"\n" -"\n" -"- \"systemctl status osspd.service\" akan memberitahu Anda status dari " -"Daemon Proxy OSS. Ini digunakan untuk menghidupkan suara dari aplikasi yang " -"menggunakan API suara OSS. Anda harus menginstall paket \"ossp\" jika Anda " -"memerlukan fungsionalitas ini.\n" -"\n" -"\n" -"- \"pacmd ls\" akan memberi Anda BANYAK informasi debug tentang status dari " -"perangkat suara Anda.\n" -"\n" -"\n" -"- \"lspcidrake -v | grep -i audio\" akan memberitahu Anda driver level bawah " -"yang mana yang digunakan oleh perangkat Anda secara default.\n" -"\n" -"\n" -"- \"/usr/sbin/lsmod | grep snd\" akan memungkinkan Anda untuk memeriksa " -"modul kernel (driver) yang terkait dengan suara yang mana yang dimuat.\n" -"\n" -"\n" -"- \"alsamixer -c 0\" akan memberikan Anda mixer berbasis teks untuk kontrol " -"mixer ALSA level bawah untuk perangkat suara pertama\n" -"\n" -"\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" akan memberitahu program " -"mana yang sedang menggunakan perangkat suara secara langsung (normalnya ini " -"hanya menampilkan PulseAudio)\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are currently using the sound card directly (normally this should only show PulseAudio)\n" +msgstr "Di bawah adalah beberapa tips dasar untuk membantu mendebug masalah audio, tapi untuk tips dan trik akurat dan terbaru, silakan lihat:\n\nhttps://wiki.mageia.org/en/Support:DebuggingSoundProblems\n\n\n\n- Rekomendasi Umum: Hidupkan PulseAudio. Jika Anda telah memilih untuk tidak menggunakan PulseAudio, sangat dianjurkan untuk menghidupkannya. Untuk penggunaan desktop secara luas, PulseAudio adalah pilihan terbaik dan direkomendasikan.\n\n\n\n- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) dan \"pauvucontrol\" (generik) akan menjalankan aplikasi grafis yang memungkinkan Anda untuk melihat perangkat suara dan menyesuaikan level volume\n\n\n- \"ps aux | grep pulseaudio\" akan memeriksa bahwa PulseAudio berjalan.\n\n\n- \"pactl stat\" akan memeriksa bahwa Anda bisa terhubung ke daemon PulseAudio dengan benar.\n\n\n- \"pactl list sink-inputs\" akan memberitahu Anda program mana yang sedang memainkan suara melalui PulseAudio.\n\n\n- \"systemctl status osspd.service\" akan memberitahu Anda status dari Daemon Proxy OSS. Ini digunakan untuk menghidupkan suara dari aplikasi yang menggunakan API suara OSS. Anda harus menginstall paket \"ossp\" jika Anda memerlukan fungsionalitas ini.\n\n\n- \"pacmd ls\" akan memberi Anda BANYAK informasi debug tentang status dari perangkat suara Anda.\n\n\n- \"lspcidrake -v | grep -i audio\" akan memberitahu Anda driver level bawah yang mana yang digunakan oleh perangkat Anda secara default.\n\n\n- \"/usr/sbin/lsmod | grep snd\" akan memungkinkan Anda untuk memeriksa modul kernel (driver) yang terkait dengan suara yang mana yang dimuat.\n\n\n- \"alsamixer -c 0\" akan memberikan Anda mixer berbasis teks untuk kontrol mixer ALSA level bawah untuk perangkat suara pertama\n\n\n- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" akan memberitahu program mana yang sedang menggunakan perangkat suara secara langsung (normalnya ini hanya menampilkan PulseAudio)\n" #: harddrake/sound.pm:476 #, c-format @@ -3440,20 +3146,16 @@ msgstr "Pilih sembarang driver" msgid "Choosing an arbitrary driver" msgstr "Memilih sembarang driver" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: harddrake/sound.pm:482 #, c-format msgid "" -"If you really think that you know which driver is the right one for your " -"card\n" +"If you really think that you know which driver is the right one for your card\n" "you can pick one from the above list.\n" "\n" "The current driver for your \"%s\" sound card is \"%s\" " -msgstr "" -"Jika Anda pikir Anda mengetahui driver mana yang tepat untuk perangkat Anda\n" -"Anda bisa memilih satu dari daftar di atas.\n" -"\n" -"Driver saat ini untuk perangkat suara \"%s\" Anda adalah \"%s\" " +msgstr "Jika Anda pikir Anda mengetahui driver mana yang tepat untuk perangkat Anda\nAnda bisa memilih satu dari daftar di atas.\n\nDriver saat ini untuk perangkat suara \"%s\" Anda adalah \"%s\" " #: harddrake/v4l.pm:12 #, c-format @@ -3478,15 +3180,9 @@ msgstr "Tidak diketahui|CPH06X (bt878) [banyak vendor]" #: harddrake/v4l.pm:475 #, c-format msgid "" -"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-" -"detect the rights parameters.\n" -"If your card is misdetected, you can force the right tuner and card types " -"here. Just select your TV card parameters if needed." -msgstr "" -"Untuk kebanyakan perangkat TV modern, modul bttv dari kernel GNU/Linux " -"langsung mendeteksi otomatis parameter yang benar.\n" -"Jika perangkat Anda salah terdeteksi, Anda bisa memaksa tuner yang benar dan " -"tipe perangkat di sini. Pilih parameter perangkat TV Anda jika perlu." +"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" +"If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed." +msgstr "Untuk kebanyakan perangkat TV modern, modul bttv dari kernel GNU/Linux langsung mendeteksi otomatis parameter yang benar.\nJika perangkat Anda salah terdeteksi, Anda bisa memaksa tuner yang benar dan tipe perangkat di sini. Pilih parameter perangkat TV Anda jika perlu." #: harddrake/v4l.pm:478 #, c-format @@ -3581,9 +3277,7 @@ msgstr "Pilihan Anda? (default %s) " msgid "" "Entries you'll have to fill:\n" "%s" -msgstr "" -"Entri yang harus Anda isi:\n" -"%s" +msgstr "Entri yang harus Anda isi:\n%s" #: interactive/stdio.pm:70 #, c-format @@ -3621,19 +3315,14 @@ msgid "" "Please choose the first number of the 10-range you wish to edit,\n" "or just hit Enter to proceed.\n" "Your choice? " -msgstr "" -"Silakan pilih nomor pertama dari 10 yang ingin Anda edit,\n" -"atau tekan Enter untuk melanjutkan.\n" -"Pilihan Anda? " +msgstr "Silakan pilih nomor pertama dari 10 yang ingin Anda edit,\natau tekan Enter untuk melanjutkan.\nPilihan Anda? " #: interactive/stdio.pm:144 #, c-format msgid "" "=> Notice, a label changed:\n" "%s" -msgstr "" -"=> Perhatikan, label berubah:\n" -"%s" +msgstr "=> Perhatikan, label berubah:\n%s" #: interactive/stdio.pm:151 #, c-format @@ -4867,10 +4556,7 @@ msgstr "Bootloader tidak bisa menangani /boot pada volume fisik multiple" #: messages.pm:11 #, c-format msgid "_: You can warn about unofficial translation here" -msgstr "" -"Perjanjian Lisensi resmi adalah License Agreement berbahasa Inggris. " -"Terjemahan bahasa Indonesia ini dibuat sebagai informasi untuk memudahkan " -"pengguna berbahasa Indonesia memahami isi dari License Agreement tersebut." +msgstr "Perjanjian Lisensi resmi adalah License Agreement berbahasa Inggris. Terjemahan bahasa Indonesia ini dibuat sebagai informasi untuk memudahkan pengguna berbahasa Indonesia memahami isi dari License Agreement tersebut." #: messages.pm:18 #, c-format @@ -4880,25 +4566,12 @@ msgstr "Pengantar" #: messages.pm:20 #, c-format msgid "" -"The operating system and the different components available in the Mageia " -"distribution \n" -"shall be called the \"Software Products\" hereafter. The Software Products " -"include, but are not \n" -"restricted to, the set of programs, methods, rules and documentation related " -"to the operating \n" -"system and the different components of the Mageia distribution, and any " -"applications \n" +"The operating system and the different components available in the Mageia distribution \n" +"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n" +"restricted to, the set of programs, methods, rules and documentation related to the operating \n" +"system and the different components of the Mageia distribution, and any applications \n" "distributed with these products provided by Mageia's licensors or suppliers." -msgstr "" -"Sistem operasi dan berbagai komponen yang tersedia dalam distribusi Mageia " -"akan disebut \n" -"\"Produk Software\". Produk Software termasuk, namun tidak terbatas pada, " -"sekumpulan \n" -"program, metode, aturan dan dokumentasi yang berkaitan dengan sistem operasi " -"dan komponen \n" -"yang berbeda dari distribusi Mageia, dan setiap aplikasi yang " -"didistribusikan dengan \n" -"produk yang disediakan oleh pemberi lisensi Mageia atau pemasok." +msgstr "Sistem operasi dan berbagai komponen yang tersedia dalam distribusi Mageia akan disebut \n\"Produk Software\". Produk Software termasuk, namun tidak terbatas pada, sekumpulan \nprogram, metode, aturan dan dokumentasi yang berkaitan dengan sistem operasi dan komponen \nyang berbeda dari distribusi Mageia, dan setiap aplikasi yang didistribusikan dengan \nproduk yang disediakan oleh pemberi lisensi Mageia atau pemasok." #: messages.pm:27 #, c-format @@ -4908,129 +4581,51 @@ msgstr "1. Perjanjian Lisensi" #: messages.pm:29 #, c-format msgid "" -"Please read this document carefully. This document is a license agreement " -"between you and \n" +"Please read this document carefully. This document is a license agreement between you and \n" "Mageia which applies to the Software Products.\n" -"By installing, duplicating or using any of the Software Products in any " -"manner, you explicitly \n" -"accept and fully agree to conform to the terms and conditions of this " -"License. \n" -"If you disagree with any portion of the License, you are not allowed to " -"install, duplicate or use \n" +"By installing, duplicating or using any of the Software Products in any manner, you explicitly \n" +"accept and fully agree to conform to the terms and conditions of this License. \n" +"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n" "the Software Products. \n" -"Any attempt to install, duplicate or use the Software Products in a manner " -"which does not comply \n" -"with the terms and conditions of this License is void and will terminate " -"your rights under this \n" -"License. Upon termination of the License, you must immediately destroy all " -"copies of the \n" +"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n" +"with the terms and conditions of this License is void and will terminate your rights under this \n" +"License. Upon termination of the License, you must immediately destroy all copies of the \n" "Software Products." -msgstr "" -"Silakan baca dokumen ini secara seksama. Dokumen ini adalah perjanjian " -"lisensi antara Anda \n" -"dan Mageia yang berlaku untuk Produk Software.\n" -"Dengan menginstall, menduplikasi atau menggunakan Produk Software dengan " -"cara apapun, Anda secara \n" -"eksplisit menerima dan setuju untuk sesuai dengan syarat dan ketentuan dari " -"Lisensi ini. \n" -"Jika Anda tidak setuju dengan bagian manapun dari Lisensi, Anda tidak " -"diizinkan untuk menginstall, \n" -"menduplikasi atau menggunakan Produk Software. \n" -"Setiap usaha untuk menginstall, menduplikasi atau menggunakan Produk " -"Software dengan tujuan yang \n" -"tidak sesuai dengan syarat dan ketentuan akan membatalkan hak-hak Anda di " -"bawah Lisensi ini. \n" -"Pada saat berakhirnya Lisensi, Anda harus segera memusnahkan semua salinan " -"dari Produk Software." +msgstr "Silakan baca dokumen ini secara seksama. Dokumen ini adalah perjanjian lisensi antara Anda \ndan Mageia yang berlaku untuk Produk Software.\nDengan menginstall, menduplikasi atau menggunakan Produk Software dengan cara apapun, Anda secara \neksplisit menerima dan setuju untuk sesuai dengan syarat dan ketentuan dari Lisensi ini. \nJika Anda tidak setuju dengan bagian manapun dari Lisensi, Anda tidak diizinkan untuk menginstall, \nmenduplikasi atau menggunakan Produk Software. \nSetiap usaha untuk menginstall, menduplikasi atau menggunakan Produk Software dengan tujuan yang \ntidak sesuai dengan syarat dan ketentuan akan membatalkan hak-hak Anda di bawah Lisensi ini. \nPada saat berakhirnya Lisensi, Anda harus segera memusnahkan semua salinan dari Produk Software." #: messages.pm:41 #, c-format msgid "2. Limited Warranty" msgstr "2. Jaminan Terbatas" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: messages.pm:44 #, c-format msgid "" -"The Software Products and attached documentation are provided \"as is\", " -"with no warranty, to the \n" +"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n" "extent permitted by law.\n" -"Neither Mageia nor its licensors or suppliers will, in any circumstances and " -"to the extent \n" -"permitted by law, be liable for any special, incidental, direct or indirect " -"damages whatsoever \n" -"(including without limitation damages for loss of business, interruption of " -"business, financial \n" -"loss, legal fees and penalties resulting from a court judgment, or any other " -"consequential loss) \n" -"arising out of the use or inability to use the Software Products, even if " -"Mageia or its \n" -"licensors or suppliers have been advised of the possibility or occurrence of " -"such damages.\n" -"\n" -"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME " -"COUNTRIES\n" -"\n" -"To the extent permitted by law, neither Mageia nor its licensors, suppliers " -"or\n" -"distributors will, in any circumstances, be liable for any special, " -"incidental, direct or indirect \n" -"damages whatsoever (including without limitation damages for loss of " -"business, interruption of \n" -"business, financial loss, legal fees and penalties resulting from a court " -"judgment, or any \n" -"other consequential loss) arising out of the possession and use of software " -"components or \n" -"arising out of downloading software components from one of Mageia sites " -"which are \n" +"Neither Mageia nor its licensors or suppliers will, in any circumstances and to the extent \n" +"permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever \n" +"(including without limitation damages for loss of business, interruption of business, financial \n" +"loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) \n" +"arising out of the use or inability to use the Software Products, even if Mageia or its \n" +"licensors or suppliers have been advised of the possibility or occurrence of such damages.\n" +"\n" +"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n" +"\n" +"To the extent permitted by law, neither Mageia nor its licensors, suppliers or\n" +"distributors will, in any circumstances, be liable for any special, incidental, direct or indirect \n" +"damages whatsoever (including without limitation damages for loss of business, interruption of \n" +"business, financial loss, legal fees and penalties resulting from a court judgment, or any \n" +"other consequential loss) arising out of the possession and use of software components or \n" +"arising out of downloading software components from one of Mageia sites which are \n" "prohibited or restricted in some countries by local laws.\n" -"This limited liability applies to, but is not restricted to, the strong " -"cryptography components \n" +"This limited liability applies to, but is not restricted to, the strong cryptography components \n" "included in the Software Products.\n" -"However, because some jurisdictions do not allow the exclusion or limitation " -"of liability for \n" -"consequential or incidental damages, the above limitation may not apply to " -"you." -msgstr "" -"Produk Software dan dokumentasi terlampir disediakan \"seperti\", dengan " -"tanpa jaminan, sampai \n" -"batas yang diizinkan oleh hukum.\n" -"Tidak Mageia tidak juga pelisensinya atau pemasok akan, dalam situasi apapun " -"dan sejauh yang diizinkan \n" -"oleh hukum, bertanggung jawab atas kerusakan khusus, insidental, langsung " -"atau tidak langsung \n" -"(termasuk tanpa batasan untuk kerugian bisnis, gangguan bisnis, kerugian " -"finansial, biaya hukum \n" -"dan denda dari hasil keputusan pengadilan, atau konsekuensi kerugian " -"lainnya) yang timbul dari \n" -"penggunaan atau ketidakmampuan untuk menggunakan Produk Software, bahkan " -"jika Mageia atau pemberi \n" -"lisensi atau pemasok telah diberitahukan mengenai kemungkinan akan " -"terjadinya kerusakan tersebut.\n" -"\n" -"KEWAJIBAN TERBATAS TERKAIT DENGAN PENGGUNAAN SOFTWARE YANG DILARANG DI " -"BEBERAPA NEGARA\n" -"\n" -"Sejauh yang diizinkan oleh hukum, tidak Mageia tidak juga pelisensinya, " -"pemasok atau distributor \n" -"akan, dalam situasi apapun, bertanggung atas kerusakan khusus, insidental, " -"langsung atau \n" -"tidak langsung apapun (termasuk tanpa batasan untuk kerugian bisnis, " -"gangguan bisnis, \n" -"kerugian finansial, biaya hukum dan denda dari hasil keputusan pengadilan, " -"atau konsekuensi \n" -"kerugian lainya) yang timbul dari penggunaan komponen software atau timbul " -"dari mendownload \n" -"komponen software dari salah satu situs Mageia yang dilarang atau dibatasi " -"di beberapa negara \n" -"oleh hukum setempat.\n" -"Kewajiban terbatas ini berlaku untuk, tapi tidak terbatas pada, komponen " -"kriptografi yang kuat \n" -"yang disertakan dalam Produk Software.\n" -"Namun, karena beberapa wilayah hukum tidak mengizinkan pengecualian atau " -"pembatasan atau kewajiban \n" -"untuk kerusakan konsekuensional atau insidental, pembatasan di atas mungkin " -"tidak berlaku." +"However, because some jurisdictions do not allow the exclusion or limitation of liability for \n" +"consequential or incidental damages, the above limitation may not apply to you." +msgstr "Produk Software dan dokumentasi terlampir disediakan \"seperti\", dengan tanpa jaminan, sampai \nbatas yang diizinkan oleh hukum.\nTidak Mageia tidak juga pelisensinya atau pemasok akan, dalam situasi apapun dan sejauh yang diizinkan \noleh hukum, bertanggung jawab atas kerusakan khusus, insidental, langsung atau tidak langsung \n(termasuk tanpa batasan untuk kerugian bisnis, gangguan bisnis, kerugian finansial, biaya hukum \ndan denda dari hasil keputusan pengadilan, atau konsekuensi kerugian lainnya) yang timbul dari \npenggunaan atau ketidakmampuan untuk menggunakan Produk Software, bahkan jika Mageia atau pemberi \nlisensi atau pemasok telah diberitahukan mengenai kemungkinan akan terjadinya kerusakan tersebut.\n\nKEWAJIBAN TERBATAS TERKAIT DENGAN PENGGUNAAN SOFTWARE YANG DILARANG DI BEBERAPA NEGARA\n\nSejauh yang diizinkan oleh hukum, tidak Mageia tidak juga pelisensinya, pemasok atau distributor \nakan, dalam situasi apapun, bertanggung atas kerusakan khusus, insidental, langsung atau \ntidak langsung apapun (termasuk tanpa batasan untuk kerugian bisnis, gangguan bisnis, \nkerugian finansial, biaya hukum dan denda dari hasil keputusan pengadilan, atau konsekuensi \nkerugian lainya) yang timbul dari penggunaan komponen software atau timbul dari mendownload \nkomponen software dari salah satu situs Mageia yang dilarang atau dibatasi di beberapa negara \noleh hukum setempat.\nKewajiban terbatas ini berlaku untuk, tapi tidak terbatas pada, komponen kriptografi yang kuat \nyang disertakan dalam Produk Software.\nNamun, karena beberapa wilayah hukum tidak mengizinkan pengecualian atau pembatasan atau kewajiban \nuntuk kerusakan konsekuensional atau insidental, pembatasan di atas mungkin tidak berlaku." #: messages.pm:68 #, c-format @@ -5040,32 +4635,14 @@ msgstr "3. Lisensi GPL dan Lisensi Terkait" #: messages.pm:70 #, c-format msgid "" -"The Software Products consist of components created by different persons or " -"entities.\n" -"Most of these licenses allow you to use, duplicate, adapt or redistribute " -"the components which \n" -"they cover. Please read carefully the terms and conditions of the license " -"agreement for each component \n" -"before using any component. Any question on a component license should be " -"addressed to the component \n" +"The Software Products consist of components created by different persons or entities.\n" +"Most of these licenses allow you to use, duplicate, adapt or redistribute the components which \n" +"they cover. Please read carefully the terms and conditions of the license agreement for each component \n" +"before using any component. Any question on a component license should be addressed to the component \n" "licensor or supplier and not to Mageia.\n" -"The programs developed by Mageia are governed by the GPL License. " -"Documentation written \n" +"The programs developed by Mageia are governed by the GPL License. Documentation written \n" "by Mageia is governed by \"%s\" License." -msgstr "" -"Produk Software terdiri dari komponen yang dibuat oleh orang atau badan yang " -"berbeda.\n" -"Kebanyakan dari lisensi ini mengizinkan Anda untuk menggunakan, " -"menduplikasi, menyesuaikan atau \n" -"menyebarluaskan komponen mereka. Silakan baca secara seksama syarat dan " -"ketentuan dari perjanjian \n" -"lisensi dari setiap komponen sebelum menggunakannya. Setiap pertanyaan pada " -"lisensi komponen \n" -"harus ditujukan ke pemberi lisensi atau pemasok komponen dan bukan ke " -"Mageia.\n" -"Program yang dikembangkan oleh Mageia diatur oleh Lisensi GPL. Dokumentasi " -"yang ditulis oleh \n" -"Mageia diatur oleh Lisensi \"%s\"." +msgstr "Produk Software terdiri dari komponen yang dibuat oleh orang atau badan yang berbeda.\nKebanyakan dari lisensi ini mengizinkan Anda untuk menggunakan, menduplikasi, menyesuaikan atau \nmenyebarluaskan komponen mereka. Silakan baca secara seksama syarat dan ketentuan dari perjanjian \nlisensi dari setiap komponen sebelum menggunakannya. Setiap pertanyaan pada lisensi komponen \nharus ditujukan ke pemberi lisensi atau pemasok komponen dan bukan ke Mageia.\nProgram yang dikembangkan oleh Mageia diatur oleh Lisensi GPL. Dokumentasi yang ditulis oleh \nMageia diatur oleh Lisensi \"%s\"." #: messages.pm:79 #, c-format @@ -5075,24 +4652,12 @@ msgstr "4. Hak Kekayaan Intelektual" #: messages.pm:81 #, c-format msgid "" -"All rights to the components of the Software Products belong to their " -"respective authors and are \n" -"protected by intellectual property and copyright laws applicable to software " -"programs.\n" -"Mageia and its suppliers and licensors reserves their rights to modify or " -"adapt the Software \n" +"All rights to the components of the Software Products belong to their respective authors and are \n" +"protected by intellectual property and copyright laws applicable to software programs.\n" +"Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software \n" "Products, as a whole or in parts, by all means and for all purposes.\n" "\"Mageia\" and associated logos are trademarks of %s" -msgstr "" -"Semua hak atas komponen Produk Software adalah milik penulis yang " -"bersangkutan dan dilindungi \n" -"oleh hak kekayaan intelektual dan hukum hak cipta yang berlaku untuk program " -"software.\n" -"Mageia dan pemasok dan pemberi lisensi menggunakan hak tersebut untuk " -"memodifikasi atau menyesuaikan \n" -"Produk Software, secara keseluruhan atau sebagian, dengan semua cara dan " -"untuk semua keperluan.\n" -"\"Mageia\" dan logo terkait adalah merk dagang dari %s" +msgstr "Semua hak atas komponen Produk Software adalah milik penulis yang bersangkutan dan dilindungi \noleh hak kekayaan intelektual dan hukum hak cipta yang berlaku untuk program software.\nMageia dan pemasok dan pemberi lisensi menggunakan hak tersebut untuk memodifikasi atau menyesuaikan \nProduk Software, secara keseluruhan atau sebagian, dengan semua cara dan untuk semua keperluan.\n\"Mageia\" dan logo terkait adalah merk dagang dari %s" #: messages.pm:88 #, c-format @@ -5102,60 +4667,31 @@ msgstr "5. Wilayah Hukum" #: messages.pm:90 #, c-format msgid "" -"If any portion of this agreement is held void, illegal or inapplicable by a " -"court judgment, this \n" -"portion is excluded from this contract. You remain bound by the other " -"applicable sections of the \n" +"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n" +"portion is excluded from this contract. You remain bound by the other applicable sections of the \n" "agreement.\n" -"The terms and conditions of this License are governed by the Laws of " -"France.\n" -"All disputes on the terms of this license will preferably be settled out of " -"court. As a last \n" -"resort, the dispute will be referred to the appropriate Courts of Law of " -"Paris - France.\n" +"The terms and conditions of this License are governed by the Laws of France.\n" +"All disputes on the terms of this license will preferably be settled out of court. As a last \n" +"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n" "For any question on this document, please contact Mageia." -msgstr "" -"Jika ada bagian dari perjanjian ini yang dibatalkan, ilegal atau tidak dapat " -"diterapkan oleh \n" -"keputusan pengadilan, bagian tersebut akan dikecualikan dari kontrak ini. " -"Anda tetap terikat \n" -"oleh bagian lain yang masih berlaku dari perjanjian ini.\n" -"Syarat dan ketentuan dari Lisensi ini diatur oleh Undang-Undang Perancis.\n" -"Semua perselisihan tentang syarat-syarat lisensi ini sebaiknya diselesaikan " -"di luar pengadilan. \n" -"Sebagai usaha terakhir, perselisihan tersebut akan dirujuk ke Pengadilan " -"sesuai Hukum Paris - \n" -"Perancis. Untuk pertanyaan dari dokumen ini, silakan kontak Mageia." +msgstr "Jika ada bagian dari perjanjian ini yang dibatalkan, ilegal atau tidak dapat diterapkan oleh \nkeputusan pengadilan, bagian tersebut akan dikecualikan dari kontrak ini. Anda tetap terikat \noleh bagian lain yang masih berlaku dari perjanjian ini.\nSyarat dan ketentuan dari Lisensi ini diatur oleh Undang-Undang Perancis.\nSemua perselisihan tentang syarat-syarat lisensi ini sebaiknya diselesaikan di luar pengadilan. \nSebagai usaha terakhir, perselisihan tersebut akan dirujuk ke Pengadilan sesuai Hukum Paris - \nPerancis. Untuk pertanyaan dari dokumen ini, silakan kontak Mageia." #: messages.pm:102 #, c-format msgid "" "Warning: Free Software may not necessarily be patent free, and some Free\n" -"Software included may be covered by patents in your country. For example, " -"the\n" +"Software included may be covered by patents in your country. For example, the\n" "MP3 decoders included may require a license for further usage (see\n" -"http://www.mp3licensing.com for more details). If you are unsure if a " -"patent\n" +"http://www.mp3licensing.com for more details). If you are unsure if a patent\n" "may be applicable to you, check your local laws." -msgstr "" -"Peringatan: Free Software belum tentu bebas paten, dan beberapa Free " -"Software\n" -"yang disertakan mungkin dilindungi oleh paten di negara Anda. Contohnya, " -"dekoder\n" -"MP3 yang disertakan mungkin memerlukan lisensi untuk penggunaan lebih lanjut " -"(lihat\n" -"http://www.mp3licensing.com untuk lebih jelasnya). Jika Anda tidak yakin " -"paten\n" -"mungkin berlaku untuk Anda, periksa hukum lokal di daerah Anda." +msgstr "Peringatan: Free Software belum tentu bebas paten, dan beberapa Free Software\nyang disertakan mungkin dilindungi oleh paten di negara Anda. Contohnya, dekoder\nMP3 yang disertakan mungkin memerlukan lisensi untuk penggunaan lebih lanjut (lihat\nhttp://www.mp3licensing.com untuk lebih jelasnya). Jika Anda tidak yakin paten\nmungkin berlaku untuk Anda, periksa hukum lokal di daerah Anda." #: messages.pm:111 #, c-format msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press Enter to reboot." -msgstr "" -"Selamat, instalasi selesai.\n" -"Keluarkan media boot dan tekan Enter untuk reboot." +msgstr "Selamat, instalasi selesai.\nKeluarkan media boot dan tekan Enter untuk reboot." #: messages.pm:113 #, c-format @@ -5163,19 +4699,14 @@ msgid "" "For information on fixes which are available for this release of Mageia,\n" "consult the Errata available from:\n" "%s" -msgstr "" -"Untuk informasi tentang perbaikan yang tersedia untuk rilis Mageia ini,\n" -"silakan lihat Errata yang tersedia pada:\n" -"%s" +msgstr "Untuk informasi tentang perbaikan yang tersedia untuk rilis Mageia ini,\nsilakan lihat Errata yang tersedia pada:\n%s" #: messages.pm:115 #, c-format msgid "" "Information on configuring your system is available in the post\n" "install chapter of the Official Mageia User's Guide." -msgstr "" -"Informasi tentang konfigurasi sistem Anda tersedia pada bab pasca\n" -"install di Panduan Pengguna Resmi Mageia." +msgstr "Informasi tentang konfigurasi sistem Anda tersedia pada bab pasca\ninstall di Panduan Pengguna Resmi Mageia." #: modules/interactive.pm:19 #, c-format @@ -5249,10 +4780,7 @@ msgstr "Mengkonfigurasi Hardware" msgid "" "You may now provide options to module %s.\n" "Note that any address should be entered with the prefix 0x like '0x123'" -msgstr "" -"Sekarang Anda bisa memberikan opsi untuk modul %s.\n" -"Perhatikan bahwa setiap alamat harus dimasukkan dengan awalan 0x seperti " -"'0x123'" +msgstr "Sekarang Anda bisa memberikan opsi untuk modul %s.\nPerhatikan bahwa setiap alamat harus dimasukkan dengan awalan 0x seperti '0x123'" #: modules/interactive.pm:117 #, c-format @@ -5260,10 +4788,7 @@ msgid "" "You may now provide options to module %s.\n" "Options are in format ``name=value name2=value2 ...''.\n" "For instance, ``io=0x300 irq=7''" -msgstr "" -"Sekarang Anda bisa memberikan opsi untuk modul %s.\n" -"Opsi dalam format ``nama=nilai nama2=nilai2 ...''.\n" -"Contohnya, ``io=0x300 irq=7''" +msgstr "Sekarang Anda bisa memberikan opsi untuk modul %s.\nOpsi dalam format ``nama=nilai nama2=nilai2 ...''.\nContohnya, ``io=0x300 irq=7''" #: modules/interactive.pm:119 #, c-format @@ -5280,22 +4805,11 @@ msgstr "Driver %s mana yang harus dicoba?" #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" -"properly, although it normally works fine without them. Would you like to " -"specify\n" +"properly, although it normally works fine without them. Would you like to specify\n" "extra options for it or allow the driver to probe your machine for the\n" -"information it needs? Occasionally, probing will hang a computer, but it " -"should\n" +"information it needs? Occasionally, probing will hang a computer, but it should\n" "not cause any damage." -msgstr "" -"Dalam beberapa kasus, driver %s harus memiliki informasi tambahan agar bisa " -"bekerja\n" -"dengan baik, walaupun biasanya tetap bisa bekerja tanpanya. Apakah Anda " -"ingin menentukan\n" -"opsi tambahan atau membiarkan driver mendeteksi komputer untuk mendapatkan " -"informasi yang\n" -"diperlukan? Kadang-kadang, pendeteksian menyebabkan komputer hang, tapi ini " -"tidak\n" -"akan menyebabkan kerusakan." +msgstr "Dalam beberapa kasus, driver %s harus memiliki informasi tambahan agar bisa bekerja\ndengan baik, walaupun biasanya tetap bisa bekerja tanpanya. Apakah Anda ingin menentukan\nopsi tambahan atau membiarkan driver mendeteksi komputer untuk mendapatkan informasi yang\ndiperlukan? Kadang-kadang, pendeteksian menyebabkan komputer hang, tapi ini tidak\nakan menyebabkan kerusakan." #: modules/interactive.pm:145 #, c-format @@ -5312,9 +4826,7 @@ msgstr "Tentukan opsi" msgid "" "Loading module %s failed.\n" "Do you want to try again with other parameters?" -msgstr "" -"Memuat modul %s gagal.\n" -"Apakah Anda ingin mencoba lagi dengan parameter lain?" +msgstr "Memuat modul %s gagal.\nApakah Anda ingin mencoba lagi dengan parameter lain?" #: mygtk2.pm:1229 #, c-format @@ -5350,24 +4862,16 @@ msgstr "Partisi extended tidak didukung pada platform ini" #, c-format msgid "" "You have a hole in your partition table but I cannot use it.\n" -"The only solution is to move your primary partitions to have the hole next " -"to the extended partitions." -msgstr "" -"Anda memiliki celah pada tabel partisi tetapi tidak bisa digunakan.\n" -"Solusi satu-satunya adalah memindahkan partisi primary Anda yang memiliki " -"celah ke samping partisi extended." +"The only solution is to move your primary partitions to have the hole next to the extended partitions." +msgstr "Anda memiliki celah pada tabel partisi tetapi tidak bisa digunakan.\nSolusi satu-satunya adalah memindahkan partisi primary Anda yang memiliki celah ke samping partisi extended." #: partition_table/raw.pm:296 #, c-format msgid "" "Something bad is happening on your hard disk drive. \n" "A test to check the integrity of data has failed. \n" -"It means writing anything on the disk will end up with random, corrupted " -"data." -msgstr "" -"Sesuatu terjadi pada drive hard disk Anda. \n" -"Tes untuk memeriksa integritas data gagal. \n" -"Ini berarti menulis apapun pada disk akan menghasilkan data acak yang rusak." +"It means writing anything on the disk will end up with random, corrupted data." +msgstr "Sesuatu terjadi pada drive hard disk Anda. \nTes untuk memeriksa integritas data gagal. \nIni berarti menulis apapun pada disk akan menghasilkan data acak yang rusak." #: pkgs.pm:254 pkgs.pm:257 pkgs.pm:270 #, c-format @@ -5389,9 +4893,7 @@ msgstr "Menemukan paket lokalisasi tak terpakai..." msgid "" "We have detected that some packages are not needed for your system " "configuration." -msgstr "" -"Terdeteksi beberapa paket yang tidak diperlukan untuk konfigurasi sistem " -"Anda." +msgstr "Terdeteksi beberapa paket yang tidak diperlukan untuk konfigurasi sistem Anda." #: pkgs.pm:272 #, c-format @@ -5473,7 +4975,8 @@ msgstr "Terima echo icmp." msgid "Allow autologin." msgstr "Izinkan login otomatis." -#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is +#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as +#. "ALL" is #: security/help.pm:21 #, c-format msgid "" @@ -5482,13 +4985,7 @@ msgid "" "If set to \"None\", no issues are allowed.\n" "\n" "Else only /etc/issue is allowed." -msgstr "" -"Jika diatur ke \"SEMUA\", /etc/issue dan /etc/issue.net diizinkan untuk " -"ada.\n" -"\n" -"Jika diatur ke \"Tidak ada\", tidak ada issue yang diizinkan.\n" -"\n" -"Selain itu hanya /etc/issue yang diizinkan." +msgstr "Jika diatur ke \"SEMUA\", /etc/issue dan /etc/issue.net diizinkan untuk ada.\n\nJika diatur ke \"Tidak ada\", tidak ada issue yang diizinkan.\n\nSelain itu hanya /etc/issue yang diizinkan." #: security/help.pm:27 #, c-format @@ -5518,11 +5015,7 @@ msgid "" "passing from the root account to the other users.\n" "\n" "See pam_xauth(8) for more details.'" -msgstr "" -"Izinkan mengekspor display ketika\n" -"berpindah dari akun root ke pengguna lain.\n" -"\n" -"Lihat pam_xauth(8) untuk lebih rinci.'" +msgstr "Izinkan mengekspor display ketika\nberpindah dari akun root ke pengguna lain.\n\nLihat pam_xauth(8) untuk lebih rinci.'" #: security/help.pm:40 #, c-format @@ -5534,51 +5027,30 @@ msgid "" "- \"Local\" (only connection from local machine),\n" "\n" "- \"None\" (no connection)." -msgstr "" -"Izinkan koneksi X:\n" -"\n" -"- \"Semua\" (semua koneksi diizinkan),\n" -"\n" -"- \"Lokal\" (hanya koneksi dari komputer lokal),\n" -"\n" -"- \"Tidak ada\" (tidak ada koneksi)." +msgstr "Izinkan koneksi X:\n\n- \"Semua\" (semua koneksi diizinkan),\n\n- \"Lokal\" (hanya koneksi dari komputer lokal),\n\n- \"Tidak ada\" (tidak ada koneksi)." #: security/help.pm:48 #, c-format msgid "" "The argument specifies if clients are authorized to connect\n" "to the X server from the network on the tcp port 6000 or not." -msgstr "" -"Argumen menentukan apakah klien diizinkan terhubung ke\n" -"server X dari jaringan pada port tcp 6000 atau tidak." +msgstr "Argumen menentukan apakah klien diizinkan terhubung ke\nserver X dari jaringan pada port tcp 6000 atau tidak." -#. -PO: here "ALL", "Local" and "None" are values in a pull-down menu; translate them the same as they're +#. -PO: here "ALL", "Local" and "None" are values in a pull-down menu; +#. translate them the same as they're #: security/help.pm:53 #, c-format msgid "" "Authorize:\n" "\n" -"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if " -"set to \"ALL\",\n" +"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n" "\n" "- only local ones if set to \"Local\"\n" "\n" "- none if set to \"None\".\n" "\n" -"To authorize the services you need, use /etc/hosts.allow (see hosts." -"allow(5))." -msgstr "" -"Otorisasi:\n" -"\n" -"- semua layanan dikontrol oleh tcp_wrappers (lihat manual hosts.deny(5)) " -"jika diatur ke \"SEMUA\",\n" -"\n" -"- hanya yang lokal jika diatur ke \"Lokal\"\n" -"\n" -"- tidak ada jika diatur ke \"Tidak ada\".\n" -"\n" -"Untuk otorisasi layanan yang Anda perlukan, gunakan /etc/hosts.allow (lihat " -"hosts.allow(5))." +"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))." +msgstr "Otorisasi:\n\n- semua layanan dikontrol oleh tcp_wrappers (lihat manual hosts.deny(5)) jika diatur ke \"SEMUA\",\n\n- hanya yang lokal jika diatur ke \"Lokal\"\n\n- tidak ada jika diatur ke \"Tidak ada\".\n\nUntuk otorisasi layanan yang Anda perlukan, gunakan /etc/hosts.allow (lihat hosts.allow(5))." #: security/help.pm:63 #, c-format @@ -5591,15 +5063,7 @@ msgid "" "The /etc/security/msec/server is used by chkconfig --add to decide to\n" "add a service if it is present in the file during the installation of\n" "packages." -msgstr "" -"Jika SERVER_LEVEL (atau SECURE_LEVEL jika tidak ada)\n" -"lebih besar dari 3 dalam /etc/security/msec/security.conf, buat\n" -"symlink /etc/security/msec/server menunjuk ke\n" -"/etc/security/msec/server..\n" -"\n" -"/etc/security/msec/server digunakan oleh chkconfig --add untuk\n" -"menambah layanan jika sudah ada di dalam file selama instalasi\n" -"paket." +msgstr "Jika SERVER_LEVEL (atau SECURE_LEVEL jika tidak ada)\nlebih besar dari 3 dalam /etc/security/msec/security.conf, buat\nsymlink /etc/security/msec/server menunjuk ke\n/etc/security/msec/server..\n\n/etc/security/msec/server digunakan oleh chkconfig --add untuk\nmenambah layanan jika sudah ada di dalam file selama instalasi\npaket." #: security/help.pm:72 #, c-format @@ -5608,11 +5072,7 @@ msgid "" "\n" "Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1)\n" "and crontab(1))." -msgstr "" -"Hidupkan crontab dan at untuk pengguna.\n" -"\n" -"Tempatkan pengguna yang diizinkan di /etc/cron.allow dan /etc/at.allow\n" -"(lihat manual at(1) dan crontab(1))." +msgstr "Hidupkan crontab dan at untuk pengguna.\n\nTempatkan pengguna yang diizinkan di /etc/cron.allow dan /etc/at.allow\n(lihat manual at(1) dan crontab(1))." #: security/help.pm:77 #, c-format @@ -5624,9 +5084,7 @@ msgstr "Hidupkan laporan syslog ke konsol 12" msgid "" "Enable name resolution spoofing protection. If\n" "\"%s\" is true, also reports to syslog." -msgstr "" -"Hidupkan proteksi pemalsuan resolusi nama. Jika\n" -"\"%s\" benar, laporkan juga ke syslog." +msgstr "Hidupkan proteksi pemalsuan resolusi nama. Jika\n\"%s\" benar, laporkan juga ke syslog." #: security/help.pm:80 #, c-format @@ -5656,11 +5114,9 @@ msgstr "Hidupkan pemeriksaan keamanan msec perjam." #: security/help.pm:90 #, c-format msgid "" -"Enable su only from members of the wheel group. If set to no, allows su from " -"any user." -msgstr "" -"Hidupkan su hanya dari anggota grup wheel. Jika diatur ke tidak, izinkan su " -"dari pengguna manapun." +"Enable su only from members of the wheel group. If set to no, allows su from" +" any user." +msgstr "Hidupkan su hanya dari anggota grup wheel. Jika diatur ke tidak, izinkan su dari pengguna manapun." #: security/help.pm:92 #, c-format @@ -5684,15 +5140,14 @@ msgstr "Hidupkan sulogin(8) pada level pengguna tunggal." #: security/help.pm:100 #, c-format -msgid "Add the name as an exception to the handling of password aging by msec." -msgstr "" -"Tambahkan nama sebagai pengecualian untuk penanganan umur sandi oleh msec." +msgid "" +"Add the name as an exception to the handling of password aging by msec." +msgstr "Tambahkan nama sebagai pengecualian untuk penanganan umur sandi oleh msec." #: security/help.pm:102 #, c-format msgid "Set password aging to \"max\" days and delay to change to \"inactive\"." -msgstr "" -"Atur umur sandi ke \"maks\" hari dan jeda untuk mengubah ke \"tidak aktif\"." +msgstr "Atur umur sandi ke \"maks\" hari dan jeda untuk mengubah ke \"tidak aktif\"." #: security/help.pm:104 #, c-format @@ -5704,9 +5159,7 @@ msgstr "Atur panjang riwayat sandi untuk mencegah penggunaan ulang sandi." msgid "" "Set the password minimum length and minimum number of digit and minimum " "number of capitalized letters." -msgstr "" -"Atur panjang minimal sandi dan minimal jumlah digit dan minimal huruf " -"kapital." +msgstr "Atur panjang minimal sandi dan minimal jumlah digit dan minimal huruf kapital." #: security/help.pm:108 #, c-format @@ -5728,20 +5181,12 @@ msgid "" "- no password in /etc/shadow\n" "\n" "- for users with the 0 id other than root." -msgstr "" -"jika diatur ke ya, periksa:\n" -"\n" -"- sandi kosong,\n" -"\n" -"- tidak ada sandi di /etc/shadow\n" -"\n" -"- untuk pengguna dengan id 0 selain root." +msgstr "jika diatur ke ya, periksa:\n\n- sandi kosong,\n\n- tidak ada sandi di /etc/shadow\n\n- untuk pengguna dengan id 0 selain root." #: security/help.pm:117 #, c-format msgid "if set to yes, check permissions of files in the users' home." -msgstr "" -"jika diatur ke ya, perika perizinan dari file dalam direktori home pengguna." +msgstr "jika diatur ke ya, perika perizinan dari file dalam direktori home pengguna." #: security/help.pm:118 #, c-format @@ -5781,9 +5226,7 @@ msgstr "jika diatur ke ya, laporkan file tanpa pemilik." #: security/help.pm:125 #, c-format msgid "if set to yes, check files/directories writable by everybody." -msgstr "" -"jika diatur ke ya, periksa file/direktori yang bisa ditulisi oleh semua " -"orang." +msgstr "jika diatur ke ya, periksa file/direktori yang bisa ditulisi oleh semua orang." #: security/help.pm:126 #, c-format @@ -5809,8 +5252,7 @@ msgstr "Jangan kirim surat jika tidak ada yang perlu diperingatkan" #: security/help.pm:130 #, c-format msgid "if set to yes, run some checks against the rpm database." -msgstr "" -"jika diatur ke ya, jalankan beberapa pemeriksaan terhadap database rpm." +msgstr "jika diatur ke ya, jalankan beberapa pemeriksaan terhadap database rpm." #: security/help.pm:131 #, c-format @@ -6074,7 +5516,8 @@ msgstr "Jangan kirim laporan surat kosong" #: security/l10n.pm:58 #, c-format -msgid "If set, send the mail report to this email address else send it to root" +msgid "" +"If set, send the mail report to this email address else send it to root" msgstr "Jika diatur, kirim laporan ke alamat email ini lainnya kirim ke root" #: security/l10n.pm:59 @@ -6116,41 +5559,24 @@ msgstr "Aman" #, c-format msgid "" "This level is to be used with care, as it disables all additional security\n" -"provided by msec. Use it only when you want to take care of all aspects of " -"system security\n" +"provided by msec. Use it only when you want to take care of all aspects of system security\n" "on your own." -msgstr "" -"Level ini untuk digunakan dengan hati-hati, karena ini mematikan semua " -"keamanan\n" -"tambahan yang disediakan oleh msec. Gunakan hanya ketika Anda ingin mengurus " -"semua aspek keamanan\n" -"sistem Anda sendiri." +msgstr "Level ini untuk digunakan dengan hati-hati, karena ini mematikan semua keamanan\ntambahan yang disediakan oleh msec. Gunakan hanya ketika Anda ingin mengurus semua aspek keamanan\nsistem Anda sendiri." #: security/level.pm:55 #, c-format msgid "" "This is the standard security recommended for a computer that will be used " "to connect to the Internet as a client." -msgstr "" -"Ini adalah keamanan standar yang direkomendasikan untuk komputer yang " -"digunakan untuk terhubung ke Internet sebagai klien." +msgstr "Ini adalah keamanan standar yang direkomendasikan untuk komputer yang digunakan untuk terhubung ke Internet sebagai klien." #: security/level.pm:56 #, c-format msgid "" -"With this security level, the use of this system as a server becomes " -"possible.\n" -"The security is now high enough to use the system as a server which can " -"accept\n" -"connections from many clients. Note: if your machine is only a client on the " -"Internet, you should choose a lower level." -msgstr "" -"Dengan level keamanan ini, penggunaan sistem sebagai server menjadi " -"mungkin.\n" -"Keamanan cukup tinggi untuk menggunakan sistem sebagai server yang akan " -"menerima\n" -"koneksi dari banyak klien. Catatan: jika komputer Anda hanya klien, Anda " -"seharunya memilih level yang lebih rendah." +"With this security level, the use of this system as a server becomes possible.\n" +"The security is now high enough to use the system as a server which can accept\n" +"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level." +msgstr "Dengan level keamanan ini, penggunaan sistem sebagai server menjadi mungkin.\nKeamanan cukup tinggi untuk menggunakan sistem sebagai server yang akan menerima\nkoneksi dari banyak klien. Catatan: jika komputer Anda hanya klien, Anda seharunya memilih level yang lebih rendah." #: security/level.pm:63 #, c-format @@ -6162,7 +5588,8 @@ msgstr "Opsi Dasar DrakSec" msgid "Please choose the desired security level" msgstr "Silakan pilih level keamanan yang diinginkan" -#. -PO: this string is used to properly format ": " +#. -PO: this string is used to properly format ": " #: security/level.pm:70 #, c-format msgid "%s: %s" @@ -6198,18 +5625,14 @@ msgstr "Anacron adalah penjadwal perintah periodik." msgid "" "apmd is used for monitoring battery status and logging it via syslog.\n" "It can also be used for shutting down the machine when the battery is low." -msgstr "" -"apmd digunakan untuk monitoring status baterai dan mencatatnya via syslog.\n" -"Bisa juga digunakan untuk mematikan komputer ketika baterai lemah." +msgstr "apmd digunakan untuk monitoring status baterai dan mencatatnya via syslog.\nBisa juga digunakan untuk mematikan komputer ketika baterai lemah." #: services.pm:23 #, c-format msgid "" "Runs commands scheduled by the at command at the time specified when\n" "at was run, and runs batch commands when the load average is low enough." -msgstr "" -"Jalankan perintah terjadwal dengan perintah at pada waktu yang ditentukan\n" -"ketika at dijalankan, dan jalankan perintah batch ketika beban cukup rendah." +msgstr "Jalankan perintah terjadwal dengan perintah at pada waktu yang ditentukan\nketika at dijalankan, dan jalankan perintah batch ketika beban cukup rendah." #: services.pm:25 #, c-format @@ -6217,9 +5640,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi adalah daemon ZeroConf yang mengimplementasikan susunan mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Server NTP" +msgstr "Klien/server NTP" #: services.pm:27 #, c-format @@ -6230,21 +5653,15 @@ msgstr "Atur pengaturan frekuensi CPU" #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" -"at periodic scheduled times. vixie cron adds a number of features to the " -"basic\n" +"at periodic scheduled times. vixie cron adds a number of features to the basic\n" "UNIX cron, including better security and more powerful configuration options." -msgstr "" -"cron adalah program UNIX standar yang menjalankan program pengguna\n" -"pada waktu terjadwal. vixie cron menambahkan sejumlah fitur pada cron UNIX " -"dasar,\n" -"termasuk keamanan yang lebih baik dan opsi konfigurasi yang lebih canggih." +msgstr "cron adalah program UNIX standar yang menjalankan program pengguna\npada waktu terjadwal. vixie cron menambahkan sejumlah fitur pada cron UNIX dasar,\ntermasuk keamanan yang lebih baik dan opsi konfigurasi yang lebih canggih." #: services.pm:30 #, c-format msgid "" "Common UNIX Printing System (CUPS) is an advanced printer spooling system" -msgstr "" -"Common UNIX Printing System (CUPS) adalah sistem spooling printer canggih" +msgstr "Common UNIX Printing System (CUPS) adalah sistem spooling printer canggih" #: services.pm:31 #, c-format @@ -6254,88 +5671,54 @@ msgstr "Menjalankan manajer display grafis" #: services.pm:32 #, c-format msgid "" -"FAM is a file monitoring daemon. It is used to get reports when files " -"change.\n" +"FAM is a file monitoring daemon. It is used to get reports when files change.\n" "It is used by GNOME and KDE" -msgstr "" -"FAM adalah daemon monitoring file. Digunakan untuk mendapatkan laporan " -"ketika\n" -"file berubah. Digunakan oleh GNOME dan KDE" +msgstr "FAM adalah daemon monitoring file. Digunakan untuk mendapatkan laporan ketika\nfile berubah. Digunakan oleh GNOME dan KDE" #: services.pm:34 #, c-format msgid "" "G15Daemon allows users access to all extra keys by decoding them and \n" -"pushing them back into the kernel via the linux UINPUT driver. This driver " -"must be loaded \n" -"before g15daemon can be used for keyboard access. The G15 LCD is also " -"supported. By default, \n" -"with no other clients active, g15daemon will display a clock. Client " -"applications and \n" +"pushing them back into the kernel via the linux UINPUT driver. This driver must be loaded \n" +"before g15daemon can be used for keyboard access. The G15 LCD is also supported. By default, \n" +"with no other clients active, g15daemon will display a clock. Client applications and \n" "scripts can access the LCD via a simple API." -msgstr "" -"G15Daemon memungkinkan pengguna mengakses semua kunci ektra dengan cara " -"decoding \n" -"dan mendorong kembali ke kernel via driver UINPUT linux. Driver ini harus " -"dimuat sebelum \n" -"g15daemon bisa digunakan untuk akses keyboard. LCD G15 juga didukung. Secara " -"default, \n" -"tanpa klien lain aktif, g15daemon akan menampilkan jam. Aplikasi dan skrip " -"klien \n" -"bisa mengakses LCD via API sederhana." +msgstr "G15Daemon memungkinkan pengguna mengakses semua kunci ektra dengan cara decoding \ndan mendorong kembali ke kernel via driver UINPUT linux. Driver ini harus dimuat sebelum \ng15daemon bisa digunakan untuk akses keyboard. LCD G15 juga didukung. Secara default, \ntanpa klien lain aktif, g15daemon akan menampilkan jam. Aplikasi dan skrip klien \nbisa mengakses LCD via API sederhana." #: services.pm:39 #, c-format msgid "" "GPM adds mouse support to text-based Linux applications such the\n" -"Midnight Commander. It also allows mouse-based console cut-and-paste " -"operations,\n" +"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n" "and includes support for pop-up menus on the console." -msgstr "" -"GPM menambahkan dukungan mouse pada aplikasi Linux berbasis teks seperti\n" -"Midnight Commander. Juga memungkinkan konsol berbasis mouse melakukan " -"operasi \n" -"potong-dan-tempel, dan menyertakan dukungan untuk menu pop-up pada konsol." +msgstr "GPM menambahkan dukungan mouse pada aplikasi Linux berbasis teks seperti\nMidnight Commander. Juga memungkinkan konsol berbasis mouse melakukan operasi \npotong-dan-tempel, dan menyertakan dukungan untuk menu pop-up pada konsol." #: services.pm:42 #, c-format msgid "HAL is a daemon that collects and maintains information about hardware" -msgstr "" -"HAL adalah daemon yang mengumpulkan dan menjaga informasi tentang hardware" +msgstr "HAL adalah daemon yang mengumpulkan dan menjaga informasi tentang hardware" #: services.pm:43 #, c-format msgid "" "HardDrake runs a hardware probe, and optionally configures\n" "new/changed hardware." -msgstr "" -"HardDrake menjalankan pendeteksian hardware, dan secara opsional\n" -"mengkonfigurasi hardware baru/berubah." +msgstr "HardDrake menjalankan pendeteksian hardware, dan secara opsional\nmengkonfigurasi hardware baru/berubah." #: services.pm:45 #, c-format msgid "" "Apache is a World Wide Web server. It is used to serve HTML files and CGI." -msgstr "" -"Apache adalah server World Wide Web. Digunakan untuk melayani file HTML dan " -"CGI." +msgstr "Apache adalah server World Wide Web. Digunakan untuk melayani file HTML dan CGI." #: services.pm:46 #, c-format msgid "" "The internet superserver daemon (commonly called inetd) starts a\n" -"variety of other internet services as needed. It is responsible for " -"starting\n" -"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd " -"disables\n" +"variety of other internet services as needed. It is responsible for starting\n" +"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n" "all of the services it is responsible for." -msgstr "" -"Daemon superserver internet (biasa disebut inetd) memulai berbagai\n" -"layanan internet lain yang diperlukan. Bertanggung jawab untuk memulai " -"banyak\n" -"layanan, termasuk telnet, ftp, rsh, dan rlogin. Mematikan inetd berarti " -"mematikan\n" -"semua layanan yang harus dijalankannya." +msgstr "Daemon superserver internet (biasa disebut inetd) memulai berbagai\nlayanan internet lain yang diperlukan. Bertanggung jawab untuk memulai banyak\nlayanan, termasuk telnet, ftp, rsh, dan rlogin. Mematikan inetd berarti mematikan\nsemua layanan yang harus dijalankannya." #: services.pm:50 #, c-format @@ -6351,8 +5734,7 @@ msgstr "Mengotomatiskan penyaringan paket firewall dengan iptables" #, c-format msgid "" "Evenly distributes IRQ load across multiple CPUs for enhanced performance" -msgstr "" -"Meratakan distribusi beban IRQ ke beberapa CPU untuk meningkatkan performa" +msgstr "Meratakan distribusi beban IRQ ke beberapa CPU untuk meningkatkan performa" #: services.pm:53 #, c-format @@ -6360,19 +5742,14 @@ msgid "" "This package loads the selected keyboard map as set in\n" "/etc/sysconfig/keyboard. This can be selected using the kbdconfig utility.\n" "You should leave this enabled for most machines." -msgstr "" -"Paket ini memuat peta keyboard terpilih yang diatur di\n" -"/etc/sysconfig/keyboard. Ini bisa dipilih menggunakan utilitas kbdconfig.\n" -"Anda harus menghidupkan ini di sebagian besar komputer." +msgstr "Paket ini memuat peta keyboard terpilih yang diatur di\n/etc/sysconfig/keyboard. Ini bisa dipilih menggunakan utilitas kbdconfig.\nAnda harus menghidupkan ini di sebagian besar komputer." #: services.pm:56 #, c-format msgid "" "Automatic regeneration of kernel header in /boot for\n" "/usr/include/linux/{autoconf,version}.h" -msgstr "" -"Regenerasi otomatis header kernel dalam /boot untuk\n" -"/usr/include/linux/{autoconf,version}.h" +msgstr "Regenerasi otomatis header kernel dalam /boot untuk\n/usr/include/linux/{autoconf,version}.h" #: services.pm:58 #, c-format @@ -6389,27 +5766,21 @@ msgstr "Optimalkan perilaku sistem untuk memperpanjang umur baterai" msgid "" "Linuxconf will sometimes arrange to perform various tasks\n" "at boot-time to maintain the system configuration." -msgstr "" -"Linuxconf terkadang mencoba melakukan berbagai macam tugas\n" -"saat boot untuk memelihara konfigurasi sistem." +msgstr "Linuxconf terkadang mencoba melakukan berbagai macam tugas\nsaat boot untuk memelihara konfigurasi sistem." #: services.pm:62 #, c-format msgid "" "lpd is the print daemon required for lpr to work properly. It is\n" "basically a server that arbitrates print jobs to printer(s)." -msgstr "" -"lpd adalah daemon print yang diperlukan untuk lpr agar bekerja dengan baik.\n" -"Yang pada dasarnya adalah server yang memberi perintah print kepada printer." +msgstr "lpd adalah daemon print yang diperlukan untuk lpr agar bekerja dengan baik.\nYang pada dasarnya adalah server yang memberi perintah print kepada printer." #: services.pm:64 #, c-format msgid "" "Linux Virtual Server, used to build a high-performance and highly\n" "available server." -msgstr "" -"Linux Virtual Server, digunakan untuk membangun server dengan performa\n" -"dan kapasitas tinggi." +msgstr "Linux Virtual Server, digunakan untuk membangun server dengan performa\ndan kapasitas tinggi." #: services.pm:66 #, c-format @@ -6426,8 +5797,7 @@ msgstr "Pengawasan dan manajemen RAID software" msgid "" "DBUS is a daemon which broadcasts notifications of system events and other " "messages" -msgstr "" -"DBUS adalah daemon yang menyebarluaskan pemberitahuan sistem dan pesan lain" +msgstr "DBUS adalah daemon yang menyebarluaskan pemberitahuan sistem dan pesan lain" #: services.pm:69 #, c-format @@ -6439,9 +5809,7 @@ msgstr "Hidupkan kebijakan keamanan MSEC saat memulai sistem" msgid "" "named (BIND) is a Domain Name Server (DNS) that is used to resolve host " "names to IP addresses." -msgstr "" -"named (BIND) adalah Domain Name Server (DNS) yang digunakan untuk " -"menerjemahkan nama host ke alamat IP." +msgstr "named (BIND) adalah Domain Name Server (DNS) yang digunakan untuk menerjemahkan nama host ke alamat IP." #: services.pm:71 #, c-format @@ -6453,18 +5821,14 @@ msgstr "Inisialisasi pencatatan konsol jaringan" msgid "" "Mounts and unmounts all Network File System (NFS), SMB (Lan\n" "Manager/Windows), and NCP (NetWare) mount points." -msgstr "" -"Mount dan unmount semua titik mount Network File System (NFS),\n" -"SMB (Lan Manager/Windows), dan NCP (NetWare)." +msgstr "Mount dan unmount semua titik mount Network File System (NFS),\nSMB (Lan Manager/Windows), dan NCP (NetWare)." #: services.pm:74 #, c-format msgid "" "Activates/Deactivates all network interfaces configured to start\n" "at boot time." -msgstr "" -"Aktifkan/Nonaktifkan semua antarmuka jaringan terkonfigurasi untuk\n" -"mulai saat boot." +msgstr "Aktifkan/Nonaktifkan semua antarmuka jaringan terkonfigurasi untuk\nmulai saat boot." #: services.pm:76 #, c-format @@ -6482,19 +5846,14 @@ msgid "" "NFS is a popular protocol for file sharing across TCP/IP networks.\n" "This service provides NFS server functionality, which is configured via the\n" "/etc/exports file." -msgstr "" -"NFS adalah protokol populer untuk sharing file melalui jaringan TCP/IP.\n" -"Layanan ini menyediakan fungsionalitas server NFS, yang terkonfigurasi via\n" -"file /etc/exports." +msgstr "NFS adalah protokol populer untuk sharing file melalui jaringan TCP/IP.\nLayanan ini menyediakan fungsionalitas server NFS, yang terkonfigurasi via\nfile /etc/exports." #: services.pm:81 #, c-format msgid "" "NFS is a popular protocol for file sharing across TCP/IP\n" "networks. This service provides NFS file locking functionality." -msgstr "" -"NFS adalah protokol populer untuk sharing file melalui jaringan\n" -"TCP/IP. Layanan ini menyediakan fungsionalitas penguncian file NFS." +msgstr "NFS adalah protokol populer untuk sharing file melalui jaringan\nTCP/IP. Layanan ini menyediakan fungsionalitas penguncian file NFS." #: services.pm:83 #, c-format @@ -6506,9 +5865,7 @@ msgstr "Sinkronisasi waktu sistem menggunakan Network Time Protocol (NTP)" msgid "" "Automatically switch on numlock key locker under console\n" "and Xorg at boot." -msgstr "" -"Nyalakan tombol numlock secara otomatis pada konsol dan\n" -"Xorg saat boot." +msgstr "Nyalakan tombol numlock secara otomatis pada konsol dan\nXorg saat boot." #: services.pm:86 #, c-format @@ -6524,26 +5881,17 @@ msgstr "Periksa jika ada partisi yang hampir penuh" #, c-format msgid "" "PCMCIA support is usually to support things like ethernet and\n" -"modems in laptops. It will not get started unless configured so it is safe " -"to have\n" +"modems in laptops. It will not get started unless configured so it is safe to have\n" "it installed on machines that do not need it." -msgstr "" -"Dukungan PCMCIA biasanya untuk mendukung hal seperti ethernet dan\n" -"modem pada laptop. Ini tidak akan dijalankan kecuali terkonfigurasi sehingga " -"aman jika\n" -"terinstall pada komputer yang tidak memerlukannya." +msgstr "Dukungan PCMCIA biasanya untuk mendukung hal seperti ethernet dan\nmodem pada laptop. Ini tidak akan dijalankan kecuali terkonfigurasi sehingga aman jika\nterinstall pada komputer yang tidak memerlukannya." #: services.pm:91 #, c-format msgid "" "The portmapper manages RPC connections, which are used by\n" -"protocols such as NFS and NIS. The portmap server must be running on " -"machines\n" +"protocols such as NFS and NIS. The portmap server must be running on machines\n" "which act as servers for protocols which make use of the RPC mechanism." -msgstr "" -"Portmapper mengelola koneksi RPC, yang digunakan oleh protokol\n" -"seperti NFS dan NIS. Server portmap harus berjalan pada komputer yang\n" -"bertindak sebagai server untuk protokol yang menggunakan mekanisme RPC." +msgstr "Portmapper mengelola koneksi RPC, yang digunakan oleh protokol\nseperti NFS dan NIS. Server portmap harus berjalan pada komputer yang\nbertindak sebagai server untuk protokol yang menggunakan mekanisme RPC." #: services.pm:94 #, c-format @@ -6553,29 +5901,23 @@ msgstr "Menyiapkan beberapa port TCP" #: services.pm:95 #, c-format msgid "" -"Postfix is a Mail Transport Agent, which is the program that moves mail from " -"one machine to another." -msgstr "" -"Postfix adalah Mail Transport Agent, yaitu program yang memindahkan surat " -"dari satu komputer ke komputer lain." +"Postfix is a Mail Transport Agent, which is the program that moves mail from" +" one machine to another." +msgstr "Postfix adalah Mail Transport Agent, yaitu program yang memindahkan surat dari satu komputer ke komputer lain." #: services.pm:96 #, c-format msgid "" "Saves and restores system entropy pool for higher quality random\n" "number generation." -msgstr "" -"Menyimpan dan mengembalikan pool entropi sistem untuk pembuatan\n" -"nomor acak yang lebih kualitas." +msgstr "Menyimpan dan mengembalikan pool entropi sistem untuk pembuatan\nnomor acak yang lebih kualitas." #: services.pm:98 #, c-format msgid "" "Assign raw devices to block devices (such as hard disk drive\n" "partitions), for the use of applications such as Oracle or DVD players" -msgstr "" -"Menetapkan device raw ke device block (seperti partisi drive hard\n" -"disk), untuk penggunaan aplikasi seperti Oracle atau pemutar DVD" +msgstr "Menetapkan device raw ke device block (seperti partisi drive hard\ndisk), untuk penggunaan aplikasi seperti Oracle atau pemutar DVD" #: services.pm:100 #, c-format @@ -6588,55 +5930,42 @@ msgid "" "The routed daemon allows for automatic IP router table updated via\n" "the RIP protocol. While RIP is widely used on small networks, more complex\n" "routing protocols are needed for complex networks." -msgstr "" -"Daemon routed memungkinkan untuk update tabel router IP otomatis via\n" -"protokol RIP. Sementara RIP lebih digunakan pada jaringan kecil, protokol\n" -"routing lebih kompleks diperlukan untuk jaringan kompleks." +msgstr "Daemon routed memungkinkan untuk update tabel router IP otomatis via\nprotokol RIP. Sementara RIP lebih digunakan pada jaringan kecil, protokol\nrouting lebih kompleks diperlukan untuk jaringan kompleks." #: services.pm:104 #, c-format msgid "" "The rstat protocol allows users on a network to retrieve\n" "performance metrics for any machine on that network." -msgstr "" -"Protokol rstat memungkinkan pengguna pada jaringan untuk mengambil\n" -"metrik performa untuk komputer manapun pada jaringan tersebut." +msgstr "Protokol rstat memungkinkan pengguna pada jaringan untuk mengambil\nmetrik performa untuk komputer manapun pada jaringan tersebut." #: services.pm:106 #, c-format msgid "" "Syslog is the facility by which many daemons use to log messages to various " "system log files. It is a good idea to always run rsyslog." -msgstr "" -"Syslog adalah fasilitas yang digunakan oleh banyak daemon untuk mencatat " -"pesan ke berbagai file log sistem. Akan sangat baik jika rsyslog selalu " -"dijalankan." +msgstr "Syslog adalah fasilitas yang digunakan oleh banyak daemon untuk mencatat pesan ke berbagai file log sistem. Akan sangat baik jika rsyslog selalu dijalankan." #: services.pm:107 #, c-format msgid "" "The rusers protocol allows users on a network to identify who is\n" "logged in on other responding machines." -msgstr "" -"Protokol rusers memungkinkan pengguna pada jaringan mengidentifikasi\n" -"siapa yang login pada komputer lain yang merespon." +msgstr "Protokol rusers memungkinkan pengguna pada jaringan mengidentifikasi\nsiapa yang login pada komputer lain yang merespon." #: services.pm:109 #, c-format msgid "" "The rwho protocol lets remote users get a list of all of the users\n" "logged into a machine running the rwho daemon (similar to finger)." -msgstr "" -"Protokol rwho membiarkan pengguna remote mendapatkan daftar semua pengguna\n" -"yang login ke komputer yang menjalankan daemon rwho (serupa dengan finger)." +msgstr "Protokol rwho membiarkan pengguna remote mendapatkan daftar semua pengguna\nyang login ke komputer yang menjalankan daemon rwho (serupa dengan finger)." #: services.pm:111 #, c-format msgid "" -"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..." -msgstr "" -"SANE (Scanner Access Now Easy) memungkinkan akses ke scanners, video " -"cameras, ..." +"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, " +"..." +msgstr "SANE (Scanner Access Now Easy) memungkinkan akses ke scanners, video cameras, ..." #: services.pm:112 #, c-format @@ -6648,9 +5977,7 @@ msgstr "Firewall penyaringan paket" msgid "" "The SMB/CIFS protocol enables to share access to files & printers and also " "integrates with a Windows Server domain" -msgstr "" -"Protokol SMB/CIFS memungkinkan share akses ke file & printer dan juga " -"terintegrasi dengan domain Server Windows" +msgstr "Protokol SMB/CIFS memungkinkan share akses ke file & printer dan juga terintegrasi dengan domain Server Windows" #: services.pm:114 #, c-format @@ -6667,19 +5994,14 @@ msgstr "layer untuk analisis ucapan" msgid "" "Secure Shell is a network protocol that allows data to be exchanged over a " "secure channel between two computers" -msgstr "" -"Secure Shell adalah protokol jaringan yang memungkinkan pertukaran data " -"melalui saluran aman antara dua komputer" +msgstr "Secure Shell adalah protokol jaringan yang memungkinkan pertukaran data melalui saluran aman antara dua komputer" #: services.pm:117 #, c-format msgid "" "Syslog is the facility by which many daemons use to log messages\n" "to various system log files. It is a good idea to always run syslog." -msgstr "" -"Syslog adalah fasilitas yang digunakan oleh banyak daemon untuk mencatat " -"pesan\n" -"ke berbagai file log sistem. Akan sangat baik jika syslog selalu dijalankan." +msgstr "Syslog adalah fasilitas yang digunakan oleh banyak daemon untuk mencatat pesan\nke berbagai file log sistem. Akan sangat baik jika syslog selalu dijalankan." #: services.pm:119 #, c-format @@ -6773,9 +6095,7 @@ msgstr "Layanan dan daemon" msgid "" "No additional information\n" "about this service, sorry." -msgstr "" -"Tidak ada informasi tambahan\n" -"tentang layanan ini, maaf." +msgstr "Tidak ada informasi tambahan\ntentang layanan ini, maaf." #: services.pm:257 ugtk2.pm:924 #, c-format @@ -6817,23 +6137,8 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -"USA.\n" -msgstr "" -"Program ini adalah free software; Anda bisa menyebarluaskan dan/atau\n" -"memodifikasinya di bawah ketentuan GNU General Public License seperti yang\n" -"diterbitkan oleh Free Software Foundation; baik versi 2, atau (opsi Anda)\n" -"versi terbaru manapun.\n" -"\n" -"Program ini didistribusikan dengan harapan akan berguna, tapi\n" -"TANPA JAMINAN APAPUN; bahkan tanpa jaminan sebagai implikasi\n" -"DAGANG atau PENGGUNAAN UNTUK TUJUAN TERTENTU. Lihat GNU\n" -"General Public License untuk lebih rinci.\n" -"\n" -"Anda seharusnya menerima salinan dari GNU General Public License\n" -"bersama dengan program ini; jika tidak, tulis ke Free Software\n" -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -"USA.\n" +"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" +msgstr "Program ini adalah free software; Anda bisa menyebarluaskan dan/atau\nmemodifikasinya di bawah ketentuan GNU General Public License seperti yang\nditerbitkan oleh Free Software Foundation; baik versi 2, atau (opsi Anda)\nversi terbaru manapun.\n\nProgram ini didistribusikan dengan harapan akan berguna, tapi\nTANPA JAMINAN APAPUN; bahkan tanpa jaminan sebagai implikasi\nDAGANG atau PENGGUNAAN UNTUK TUJUAN TERTENTU. Lihat GNU\nGeneral Public License untuk lebih rinci.\n\nAnda seharusnya menerima salinan dari GNU General Public License\nbersama dengan program ini; jika tidak, tulis ke Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" #: standalone.pm:45 #, c-format @@ -6844,23 +6149,11 @@ msgid "" "--default : save default directories.\n" "--debug : show all debug messages.\n" "--show-conf : list of files or directories to backup.\n" -"--config-info : explain configuration file options (for non-X " -"users).\n" +"--config-info : explain configuration file options (for non-X users).\n" "--daemon : use daemon configuration. \n" "--help : show this message.\n" "--version : show version number.\n" -msgstr "" -"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n" -"Aplikasi Backup dan Restore\n" -"\n" -"--default : simpan direktori default.\n" -"--debug : tampilkan semua pesan debug.\n" -"--show-conf : daftar file atau direktori yang dibackup.\n" -"--config-info : jelaskan opsi file konfigurasi (untuk pengguna non-" -"X).\n" -"--daemon : gunakan konfigurasi daemon. \n" -"--help : tampilkan pesan ini.\n" -"--version : tampilkan nomor versi.\n" +msgstr "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\nAplikasi Backup dan Restore\n\n--default : simpan direktori default.\n--debug : tampilkan semua pesan debug.\n--show-conf : daftar file atau direktori yang dibackup.\n--config-info : jelaskan opsi file konfigurasi (untuk pengguna non-X).\n--daemon : gunakan konfigurasi daemon. \n--help : tampilkan pesan ini.\n--version : tampilkan nomor versi.\n" #: standalone.pm:57 #, c-format @@ -6869,11 +6162,7 @@ msgid "" "OPTIONS:\n" " --boot - enable to configure boot loader\n" "default mode: offer to configure autologin feature" -msgstr "" -"[--boot]\n" -"OPSI:\n" -" --boot - memungkinkan mengkonfigurasi boot loader\n" -"mode default: menawarkan untuk mengkonfigurasi fitur login otomatis" +msgstr "[--boot]\nOPSI:\n --boot - memungkinkan mengkonfigurasi boot loader\nmode default: menawarkan untuk mengkonfigurasi fitur login otomatis" #: standalone.pm:61 #, c-format @@ -6884,13 +6173,7 @@ msgid "" " --help - print this help message.\n" " --report - program should be one of %s tools\n" " --incident - program should be one of %s tools" -msgstr "" -"[OPSI] [NAMA_PROGRAM]\n" -"\n" -"OPSI:\n" -" --help - tampilkan pesan bantuan ini.\n" -" --report - program harus salah satu dari peralatan %s\n" -" --incident - program harus salah satu dari peralatan %s" +msgstr "[OPSI] [NAMA_PROGRAM]\n\nOPSI:\n --help - tampilkan pesan bantuan ini.\n --report - program harus salah satu dari peralatan %s\n --incident - program harus salah satu dari peralatan %s" #: standalone.pm:67 #, c-format @@ -6901,13 +6184,7 @@ msgid "" " --skip-wizard - manage connections\n" " --internet - configure internet\n" " --wizard - like --add" -msgstr "" -"[--add]\n" -" --add - wizard \"tambah antarmuka jaringan\"\n" -" --del - wizard \"hapus antarmuka jaringan\"\n" -" --skip-wizard - kelola koneksi\n" -" --internet - konfigurasi internet\n" -" --wizard - seperti --add" +msgstr "[--add]\n --add - wizard \"tambah antarmuka jaringan\"\n --del - wizard \"hapus antarmuka jaringan\"\n --skip-wizard - kelola koneksi\n --internet - konfigurasi internet\n --wizard - seperti --add" #: standalone.pm:73 #, c-format @@ -6925,20 +6202,7 @@ msgid "" " : 1 all application available supported.\n" " : name_of_application like so for staroffice \n" " : and gs for ghostscript for only this one." -msgstr "" -"\n" -"Impor Font dan aplikasi monitoring\n" -"\n" -"OPSI:\n" -"--windows_import : impor dari semua partisi windows yang ada.\n" -"--xls_fonts : tampilkan semua font yang sudah ada dari xls\n" -"--install : terima sembarang file font dan direktori.\n" -"--uninstall : uninstall font apapun atau direktori font.\n" -"--replace : ganti semua font jika sudah ada\n" -"--application : 0 tanpa aplikasi.\n" -" : 1 semua aplikasi didukung yang ada.\n" -" : nama_aplikasi seperti so untuk staroffice \n" -" : dan gs untuk ghostscript hanya untuk yang ini." +msgstr "\nImpor Font dan aplikasi monitoring\n\nOPSI:\n--windows_import : impor dari semua partisi windows yang ada.\n--xls_fonts : tampilkan semua font yang sudah ada dari xls\n--install : terima sembarang file font dan direktori.\n--uninstall : uninstall font apapun atau direktori font.\n--replace : ganti semua font jika sudah ada\n--application : 0 tanpa aplikasi.\n : 1 semua aplikasi didukung yang ada.\n : nama_aplikasi seperti so untuk staroffice \n : dan gs untuk ghostscript hanya untuk yang ini." #: standalone.pm:88 #, c-format @@ -6950,27 +6214,10 @@ msgid "" "--start : start MTS\n" "--stop : stop MTS\n" "--adduser : add an existing system user to MTS (requires username)\n" -"--deluser : delete an existing system user from MTS (requires " -"username)\n" -"--addclient : add a client machine to MTS (requires MAC address, IP, " -"nbi image name)\n" -"--delclient : delete a client machine from MTS (requires MAC address, " -"IP, nbi image name)" -msgstr "" -"[OPSI]...\n" -"Konfigurator Server Terminal %s\n" -"--enable : hidupkan MTS\n" -"--disable : matikan MTS\n" -"--start : mulai MTS\n" -"--stop : hentikan MTS\n" -"--adduser : tambahkan pengguna sistem yang ada ke MTS (memerlukan " -"nama pengguna)\n" -"--deluser : hapus pengguna sistem yang ada dari MTS (memerlukan nama " -"pengguna)\n" -"--addclient : tambahkan komputer klien ke MTS (memerlukan alamat MAC, " -"IP, nama image nbi)\n" -"--delclient : hapus komputer klien dari MTS (memerlukan alamat MAC, IP, " -"nama image nbi)" +"--deluser : delete an existing system user from MTS (requires username)\n" +"--addclient : add a client machine to MTS (requires MAC address, IP, nbi image name)\n" +"--delclient : delete a client machine from MTS (requires MAC address, IP, nbi image name)" +msgstr "[OPSI]...\nKonfigurator Server Terminal %s\n--enable : hidupkan MTS\n--disable : matikan MTS\n--start : mulai MTS\n--stop : hentikan MTS\n--adduser : tambahkan pengguna sistem yang ada ke MTS (memerlukan nama pengguna)\n--deluser : hapus pengguna sistem yang ada dari MTS (memerlukan nama pengguna)\n--addclient : tambahkan komputer klien ke MTS (memerlukan alamat MAC, IP, nama image nbi)\n--delclient : hapus komputer klien dari MTS (memerlukan alamat MAC, IP, nama image nbi)" #: standalone.pm:100 #, c-format @@ -6994,45 +6241,24 @@ msgid "" "--force : used with (dis)connect : force (dis)connection.\n" "--status : returns 1 if connected 0 otherwise, then exit.\n" "--quiet : do not be interactive. To be used with (dis)connect." -msgstr "" -"[OPSI]\n" -"Koneksi jaringan & Internet dan aplikasi monitoring\n" -"\n" -"--defaultintf interface : tampilkan antarmuka ini secara default\n" -"--connect : hubungkan ke internet jika belum terhubung\n" -"--disconnect : putuskan hubungan jika sudah terhubung\n" -"--force : digunakan dengan (dis)connect : paksa hubungan.\n" -"--status : kembalikan 1 jika terhubung 0 jika tidak, lalu keluar.\n" -"--quiet : jangan interaktif. Untuk digunakan dengan (dis)connect." +msgstr "[OPSI]\nKoneksi jaringan & Internet dan aplikasi monitoring\n\n--defaultintf interface : tampilkan antarmuka ini secara default\n--connect : hubungkan ke internet jika belum terhubung\n--disconnect : putuskan hubungan jika sudah terhubung\n--force : digunakan dengan (dis)connect : paksa hubungan.\n--status : kembalikan 1 jika terhubung 0 jika tidak, lalu keluar.\n--quiet : jangan interaktif. Untuk digunakan dengan (dis)connect." #: standalone.pm:112 #, c-format msgid "" "[OPTION]...\n" -" --no-confirmation do not ask first confirmation question in %s Update " -"mode\n" +" --no-confirmation do not ask first confirmation question in %s Update mode\n" " --no-verify-rpm do not verify packages signatures\n" -" --changelog-first display changelog before filelist in the " -"description window\n" +" --changelog-first display changelog before filelist in the description window\n" " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" -msgstr "" -"[OPSI]...\n" -" --no-confirmation jangan tanya konfirmasi pertama pada mode Update " -"%s\n" -" --no-verify-rpm jangan verifikasi tanda tangan paket\n" -" --changelog-first tampilkan changelog sebelum filelist dalam jendela " -"deskripsi\n" -" --merge-all-rpmnew usulkan untuk menggabung semua file .rpmnew/." -"rpmsave yang ditemukan" +msgstr "[OPSI]...\n --no-confirmation jangan tanya konfirmasi pertama pada mode Update %s\n --no-verify-rpm jangan verifikasi tanda tangan paket\n --changelog-first tampilkan changelog sebelum filelist dalam jendela deskripsi\n --merge-all-rpmnew usulkan untuk menggabung semua file .rpmnew/.rpmsave yang ditemukan" #: standalone.pm:117 #, c-format msgid "" "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-" "usbtable] [--dynamic=dev]" -msgstr "" -"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-" -"usbtable] [--dynamic=dev]" +msgstr "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]" #: standalone.pm:118 #, c-format @@ -7040,21 +6266,14 @@ msgid "" " [everything]\n" " XFdrake [--noauto] monitor\n" " XFdrake resolution" -msgstr "" -" [semuanya]\n" -" XFdrake [--noauto] awasi\n" -" resolusi XFdrake" +msgstr " [semuanya]\n XFdrake [--noauto] awasi\n resolusi XFdrake" #: standalone.pm:154 #, c-format msgid "" "\n" -"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--" -"testing] [-v|--version] " -msgstr "" -"\n" -"Penggunaan: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--" -"testing] [-v|--version] " +"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " +msgstr "\nPenggunaan: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " #: timezone.pm:161 timezone.pm:162 #, c-format @@ -7126,87 +6345,9 @@ msgstr "Anda memilih file, bukan direktori" msgid "" "%s is not installed\n" "Click \"Next\" to install or \"Cancel\" to quit" -msgstr "" -"%s tidak terinstall\n" -"Klik \"Berikutnya\" untuk menginstall atau \"Batal\" untuk keluar" +msgstr "%s tidak terinstall\nKlik \"Berikutnya\" untuk menginstall atau \"Batal\" untuk keluar" #: wizards.pm:100 #, c-format msgid "Installation failed" msgstr "Instalasi gagal" - -#~ msgid "Clean /tmp at each boot" -#~ msgstr "Bersihkan /tmp setiap boot" - -#~ msgid "" -#~ "The old \"%s\" driver is blacklisted.\n" -#~ "\n" -#~ "It has been reported to oops the kernel on unloading.\n" -#~ "\n" -#~ "The new \"%s\" driver will only be used on next bootstrap." -#~ msgstr "" -#~ "Driver \"%s\" lama sudah diblacklist.\n" -#~ "\n" -#~ "Telah dilaporkan merusak kernel saat unloading.\n" -#~ "\n" -#~ "Driver \"%s\" baru akan digunakan pada bootstrap berikutnya." - -#~ msgid "No open source driver" -#~ msgstr "Tidak ada driver open source" - -#~ msgid "" -#~ "There's no free driver for your sound card (%s), but there's a " -#~ "proprietary driver at \"%s\"." -#~ msgstr "" -#~ "Tidak ada driver free untuk perangkat suara Anda (%s), tapi ada driver " -#~ "proprietari di \"%s\"." - -#~ msgid "command %s missing" -#~ msgstr "perintah %s tidak ada" - -#~ msgid "" -#~ "The classic bug sound tester is to run the following commands:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card " -#~ "uses\n" -#~ "by default\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n" -#~ "currently uses\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n" -#~ "loaded or not\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" " -#~ "will\n" -#~ "tell you if sound and alsa services are configured to be run on\n" -#~ "initlevel 3\n" -#~ "\n" -#~ "- \"aumix -q\" will tell you if the sound volume is muted or not\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound " -#~ "card.\n" -#~ msgstr "" -#~ "Tester suara bug klasik adalah menjalankan perintah berikut:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" memberitahu Anda driver mana yang\n" -#~ "digunakan oleh perangkat suara Anda secara default\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" memberitahu Anda driver apa\n" -#~ "yang saat ini digunakan\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" akan memungkinkan Anda memeriksa jika modul (driver)\n" -#~ "dimuat atau tidak\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" dan \"/sbin/chkconfig --list alsa\" " -#~ "akan\n" -#~ "memberitahu Anda jika suara dan layanan alsa terkonfigurasi agar berjalan " -#~ "pada\n" -#~ "initlevel 3\n" -#~ "\n" -#~ "- \"aumix -q\" memberitahu Anda jika volume suara mute atau tidak\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" memberitahu program mana yang menggunakan " -#~ "perangkat suara.\n" -- cgit v1.2.1 From 11ba82c878d478bd7707dd7a5d1083b19ecd4060 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 14:29:38 +0100 Subject: fix titles not being blue anymore in CSS, we need to match sub widgets too for installer --- perl-install/install/NEWS | 2 ++ perl-install/share/themes-galaxy.css | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 16c5a726c..8d453f778 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix titles not being blue anymore + Version 16.2 - 29 November 2013 - no more run urpmi.update when adding media diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 617e25d3f..16c98b819 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -18,7 +18,7 @@ color: #32A9DD; } -#Banner { +#Banner * { color: #5A8AD6; } -- cgit v1.2.1 From fc2864c02f790599312cb7b9fe351f5b70e90141 Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Mon, 2 Dec 2013 16:38:01 +0100 Subject: updated Dutch translation --- perl-install/install/share/po/nl.po | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po index 4f21ee3ed..021536111 100644 --- a/perl-install/install/share/po/nl.po +++ b/perl-install/install/share/po/nl.po @@ -753,33 +753,33 @@ msgstr "" "en bureaublad-programma's" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "KDE-werkomgeving" +msgstr "XFCE-werkomgeving" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen " -"en bureaublad-programma's" +"Een lichtere grafische omgeving met een gebruiksvriendelijke set " +"toepassingen en bureaublad-programma's" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "GNOME-werkomgeving" +msgstr "MATE-werkomgeving" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Werkstation" +msgstr "Cinnamon-werkomgeving" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Grafische omgeving" +msgstr "Een op GNOME gebaseerde grafische omgeving" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -796,25 +796,25 @@ msgstr "" "toepassingen en bureaublad-programma's" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Aangepaste werkomgeving" +msgstr "RazorQT-werkomgeving" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Een minder ontwikkelde, snelle lichtgewicht grafische omgeving" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Enlightnement e17-werkomgeving" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" -"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set " +"Een snelle lichtgewicht grafische omgeving met gebruiksvriendelijke set " "toepassingen en bureaublad-programma's" #: share/meta-task/compssUsers.pl:193 @@ -823,9 +823,9 @@ msgid "Other Graphical Desktops" msgstr "Andere grafische omgevingen" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, etc" +msgstr "Window Maker, Fvwm, enz" #: share/meta-task/compssUsers.pl:217 #, c-format -- cgit v1.2.1 From 2c83a3b4351a6cbe3b91dd962883ce8d6e74f120 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 14:54:47 +0100 Subject: previous commit acutally helps oxygen-gtk too --- perl-install/NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index 8ccc4837d..8cac29300 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- fix banners not being blue anymore with Oxygen-gtk theme (kbo#328270) - diskdrake: o fix diskdrake colorized partition tabs with Adwaita (bgo#719624) -- cgit v1.2.1 From 80ca8cd488b50c30842f29481ed8aac5d259ef83 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 17:06:35 +0100 Subject: fix partionning wizard moving the main window to left (mga#11790) widgets were too wide with gtk3 + oxygen-gtk3 we either have to change the horizontal scrolling policty to 'automatic' (thus having an ugly horizontal scrolling bar) or shrink those widgets --- perl-install/fs/partitioning_wizard.pm | 4 ++-- perl-install/install/NEWS | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index b8d68a382..c9486c5d1 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -295,7 +295,7 @@ sub create_display_box { my @parts = diskdrake::hd_gtk::kind2parts($kind); my $totalsectors = diskdrake::hd_gtk::kind2sectors($kind, @parts); - my $width = 540; + my $width = 520; my $minwidth = 40; my $display_box = ugtk3::gtkset_size_request(Gtk3::HBox->new(0,0), -1, 26); @@ -460,7 +460,7 @@ sub display_choices { $item = Gtk3::EventBox->new; my $b2 = gtknew("Image", file => "small-logo"); $item->add($b2); - $item->set_size_request(540,26); + $item->set_size_request(520,26); $item->set_name("PART_new"); } elsif ($s eq 'diskdrake') { } else { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8d453f778..f6814486b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix partionning wizard moving the main window to left (mga#11790) - fix titles not being blue anymore Version 16.2 - 29 November 2013 -- cgit v1.2.1 From cc7f01e0a9727f6ef9b98b58e200e1c431f6f0dc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 2 Dec 2013 17:08:03 +0100 Subject: 16.4 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index cb900f5f4..c43c5057e 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.3 +VERSION:=16.4 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 8cac29300..d061e574d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.4 - 2 December 2013 + - fix banners not being blue anymore with Oxygen-gtk theme (kbo#328270) - diskdrake: o fix diskdrake colorized partition tabs with Adwaita (bgo#719624) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f6814486b..bd771b91f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.4 - 2 December 2013 + - fix partionning wizard moving the main window to left (mga#11790) - fix titles not being blue anymore -- cgit v1.2.1 From c96c38582e9eeee8bfc9ac58cda2849280c3c189 Mon Sep 17 00:00:00 2001 From: Marja van Waes Date: Mon, 2 Dec 2013 17:29:44 +0100 Subject: update revision date --- perl-install/install/share/po/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po index 021536111..a91834881 100644 --- a/perl-install/install/share/po/nl.po +++ b/perl-install/install/share/po/nl.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-11-27 20:55+0100\n" +"PO-Revision-Date: 2013-12-01 16:35+0100\n" "Last-Translator: Marja van Waes \n" "Language-Team: Dutch \n" "Language: nl\n" -- cgit v1.2.1 From 67fc828cc11e67cbeb1813280e235f197ba801b6 Mon Sep 17 00:00:00 2001 From: kiki Date: Tue, 3 Dec 2013 06:19:01 +0700 Subject: Updated Russian translations --- perl-install/share/po/ru.po | 1855 ++++++++++++++++++++----------------------- 1 file changed, 872 insertions(+), 983 deletions(-) diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po index 96cb6ac84..5f8b47193 100644 --- a/perl-install/share/po/ru.po +++ b/perl-install/share/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-05-12 22:45-0000\n" +"PO-Revision-Date: 2013-12-03 02:39+0300\n" "Last-Translator: AlexL \n" "Language-Team: Russian \n" "Language: ru\n" @@ -22,11 +22,19 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" "X-Language: ru_RU\n" -#: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 -#: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 -#: diskdrake/interactive.pm:1049 diskdrake/interactive.pm:1279 -#: diskdrake/interactive.pm:1337 do_pkgs.pm:242 do_pkgs.pm:287 -#: harddrake/sound.pm:270 interactive.pm:588 pkgs.pm:287 +#: any.pm:255 +#: any.pm:966 +#: diskdrake/interactive.pm:645 +#: diskdrake/interactive.pm:869 +#: diskdrake/interactive.pm:931 +#: diskdrake/interactive.pm:1049 +#: diskdrake/interactive.pm:1279 +#: diskdrake/interactive.pm:1337 +#: do_pkgs.pm:242 +#: do_pkgs.pm:287 +#: harddrake/sound.pm:270 +#: interactive.pm:588 +#: pkgs.pm:287 #, c-format msgid "Please wait" msgstr "Подождите, пожалуйста" @@ -40,18 +48,14 @@ msgstr "Выполняется установка начального загр #, c-format msgid "" "LILO wants to assign a new Volume ID to drive %s. However, changing\n" -"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows " -"error.\n" +"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n" "This caution does not apply to Windows 95 or 98, or to NT data disks.\n" "\n" "Assign a new Volume ID?" msgstr "" -"LILO желает прописать новый Volume ID для диска %s. Примите к сведению, " -"что\n" -"изменение Volume ID для загрузочного диска Windows NT, 2000 или XP фатально " -"для Windows.\n" -"Это предупреждение не актуально для Windows 95, 98 или для дисков с данными " -"NT.\n" +"LILO желает прописать новый Volume ID для диска %s. Примите к сведению, что\n" +"изменение Volume ID для загрузочного диска Windows NT, 2000 или XP фатально для Windows.\n" +"Это предупреждение не актуально для Windows 95, 98 или для дисков с данными NT.\n" "\n" "Назначить новый Volume ID?" @@ -82,8 +86,7 @@ msgstr "" #, c-format msgid "" "You decided to install the bootloader on a partition.\n" -"This implies you already have a bootloader on the hard disk drive you boot " -"(eg: System Commander).\n" +"This implies you already have a bootloader on the hard disk drive you boot (eg: System Commander).\n" "\n" "On which drive are you booting?" msgstr "" @@ -123,7 +126,9 @@ msgstr "Первый сектор корневого раздела" msgid "On Floppy" msgstr "На дискету" -#: any.pm:370 pkgs.pm:283 ugtk2.pm:526 +#: any.pm:370 +#: pkgs.pm:283 +#: ugtk2.pm:526 #, c-format msgid "Skip" msgstr "Пропустить" @@ -133,7 +138,9 @@ msgstr "Пропустить" msgid "Boot Style Configuration" msgstr "Настройка стиля загрузки" -#: any.pm:420 any.pm:453 any.pm:454 +#: any.pm:420 +#: any.pm:453 +#: any.pm:454 #, c-format msgid "Bootloader main options" msgstr "Главные параметры начального загрузчика" @@ -143,12 +150,14 @@ msgstr "Главные параметры начального загрузчи msgid "Bootloader" msgstr "Начальный загрузчик" -#: any.pm:425 any.pm:457 +#: any.pm:425 +#: any.pm:457 #, c-format msgid "Bootloader to use" msgstr "Используемый начальный загрузчик" -#: any.pm:428 any.pm:460 +#: any.pm:428 +#: any.pm:460 #, c-format msgid "Boot device" msgstr "Загрузочное устройство" @@ -183,23 +192,30 @@ msgstr "Включить APIC" msgid "Enable Local APIC" msgstr "Включить Local APIC" -#: any.pm:438 security/level.pm:63 +#: any.pm:438 +#: security/level.pm:63 #, c-format msgid "Security" msgstr "Безопасность" -#: any.pm:439 any.pm:901 any.pm:920 authentication.pm:249 +#: any.pm:439 +#: any.pm:901 +#: any.pm:920 +#: authentication.pm:249 #: diskdrake/smbnfs_gtk.pm:181 #, c-format msgid "Password" msgstr "Пароль" -#: any.pm:442 authentication.pm:260 +#: any.pm:442 +#: authentication.pm:260 #, c-format msgid "The passwords do not match" msgstr "Пароли не совпадают" -#: any.pm:442 authentication.pm:260 diskdrake/interactive.pm:1512 +#: any.pm:442 +#: authentication.pm:260 +#: diskdrake/interactive.pm:1512 #, c-format msgid "Please try again" msgstr "Попробуйте ещё раз" @@ -209,7 +225,10 @@ msgstr "Попробуйте ещё раз" msgid "You cannot use a password with %s" msgstr "Нельзя использовать пароль с %s" -#: any.pm:448 any.pm:904 any.pm:922 authentication.pm:250 +#: any.pm:448 +#: any.pm:904 +#: any.pm:922 +#: authentication.pm:250 #, c-format msgid "Password (again)" msgstr "Пароль (повтор)" @@ -249,12 +268,14 @@ msgstr "ОС по умолчанию?" msgid "Image" msgstr "Образ" -#: any.pm:540 any.pm:554 +#: any.pm:540 +#: any.pm:554 #, c-format msgid "Root" msgstr "Root" -#: any.pm:541 any.pm:567 +#: any.pm:541 +#: any.pm:567 #, c-format msgid "Append" msgstr "Дополнение" @@ -284,12 +305,17 @@ msgstr "Initrd" msgid "Network profile" msgstr "Сетевой профиль" -#: any.pm:559 any.pm:564 any.pm:566 diskdrake/interactive.pm:411 +#: any.pm:559 +#: any.pm:564 +#: any.pm:566 +#: diskdrake/interactive.pm:411 #, c-format msgid "Label" msgstr "Метка" -#: any.pm:561 any.pm:569 harddrake/v4l.pm:438 +#: any.pm:561 +#: any.pm:569 +#: harddrake/v4l.pm:438 #, c-format msgid "Default" msgstr "По умолчанию" @@ -400,12 +426,8 @@ msgstr "Укажите имя пользователя" #: any.pm:878 #, c-format -msgid "" -"The user name must start with a lower case letter followed by only lower " -"cased letters, numbers, `-' and `_'" -msgstr "" -"Имя пользователя должно содержать только буквы в нижнем регистре, цифры , " -"`-' и `_'" +msgid "The user name must start with a lower case letter followed by only lower cased letters, numbers, `-' and `_'" +msgstr "Имя пользователя должно содержать только буквы в нижнем регистре, цифры , `-' и `_'" #: any.pm:879 #, c-format @@ -417,12 +439,14 @@ msgstr "Имя пользователя слишком длинное" msgid "This user name has already been added" msgstr "Это имя пользователя уже добавлено" -#: any.pm:886 any.pm:924 +#: any.pm:886 +#: any.pm:924 #, c-format msgid "User ID" msgstr "ID пользователя" -#: any.pm:886 any.pm:925 +#: any.pm:886 +#: any.pm:925 #, c-format msgid "Group ID" msgstr "ID группы" @@ -447,7 +471,8 @@ msgstr "Управление пользователями" msgid "Enable guest account" msgstr "Включить аккаунт гостя" -#: any.pm:900 authentication.pm:236 +#: any.pm:900 +#: authentication.pm:236 #, c-format msgid "Set administrator (root) password" msgstr "Установка пароля администратора (root)" @@ -482,7 +507,8 @@ msgstr "Командный процессор" msgid "Please wait, adding media..." msgstr "Подождите. Добавляется источник..." -#: any.pm:1011 security/l10n.pm:14 +#: any.pm:1011 +#: security/l10n.pm:14 #, c-format msgid "Autologin" msgstr "Автоматический вход" @@ -490,8 +516,7 @@ msgstr "Автоматический вход" #: any.pm:1012 #, c-format msgid "I can set up your computer to automatically log on one user." -msgstr "" -"Я могу настроить ваш компьютер на автовход в систему одного пользователя." +msgstr "Я могу настроить ваш компьютер на автовход в систему одного пользователя." #: any.pm:1013 #, c-format @@ -508,12 +533,16 @@ msgstr "Выберите пользователя по умолчанию:" msgid "Choose the window manager to run:" msgstr "Выберите запускаемый оконный менеджер:" -#: any.pm:1026 any.pm:1040 any.pm:1108 +#: any.pm:1026 +#: any.pm:1040 +#: any.pm:1108 #, c-format msgid "Release Notes" msgstr "Заметки о релизе" -#: any.pm:1047 any.pm:1397 interactive/gtk.pm:821 +#: any.pm:1047 +#: any.pm:1397 +#: interactive/gtk.pm:821 #, c-format msgid "Close" msgstr "Закрыть" @@ -523,7 +552,9 @@ msgstr "Закрыть" msgid "License agreement" msgstr "Лицензионное соглашение" -#: any.pm:1096 diskdrake/dav.pm:26 mygtk2.pm:1229 +#: any.pm:1096 +#: diskdrake/dav.pm:26 +#: mygtk2.pm:1229 #, c-format msgid "Quit" msgstr "Выход" @@ -543,7 +574,8 @@ msgstr "Принять" msgid "Refuse" msgstr "Отказаться" -#: any.pm:1130 any.pm:1193 +#: any.pm:1130 +#: any.pm:1193 #, c-format msgid "Please choose a language to use" msgstr "Выберите используемый язык" @@ -559,7 +591,8 @@ msgstr "" "языки, которые необходимо установить. Они будут доступны после\n" "завершения установки и перезапуска системы." -#: any.pm:1160 fs/partitioning_wizard.pm:180 +#: any.pm:1160 +#: fs/partitioning_wizard.pm:180 #, c-format msgid "Mageia" msgstr "Mageia" @@ -574,7 +607,8 @@ msgstr "Многоязычность" msgid "Select Additional Languages" msgstr "Выберите дополнительные языки" -#: any.pm:1171 any.pm:1202 +#: any.pm:1171 +#: any.pm:1202 #, c-format msgid "Old compatibility (non UTF-8) encoding" msgstr "Кодировка для обратной совместимости (не UTF-8)" @@ -609,7 +643,9 @@ msgstr "Здесь представлен полный список имеющи msgid "Other Countries" msgstr "Другие страны" -#: any.pm:1252 interactive.pm:489 interactive/gtk.pm:445 +#: any.pm:1252 +#: interactive.pm:489 +#: interactive/gtk.pm:445 #, c-format msgid "Advanced" msgstr "Дополнительно" @@ -643,8 +679,7 @@ msgstr "Выборочно" #, c-format msgid "" "Would you like to allow users to share some of their directories?\n" -"Allowing this will permit users to simply click on \"Share\" in konqueror " -"and nautilus.\n" +"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n" "\n" "\"Custom\" permit a per-user granularity.\n" msgstr "" @@ -655,29 +690,18 @@ msgstr "" #: any.pm:1358 #, c-format -msgid "" -"NFS: the traditional Unix file sharing system, with less support on Mac and " -"Windows." -msgstr "" -"NFS: традиционная для Unix система раздачи файлов, имеет слабую поддержку в " -"Mac и Windows." +msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows." +msgstr "NFS: традиционная для Unix система раздачи файлов, имеет слабую поддержку в Mac и Windows." #: any.pm:1361 #, c-format -msgid "" -"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux " -"systems." -msgstr "" -"SMB: система совместного использования файлов, используется в Windows, Mac " -"OS X и в большинстве современных систем Linux." +msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems." +msgstr "SMB: система совместного использования файлов, используется в Windows, Mac OS X и в большинстве современных систем Linux." #: any.pm:1369 #, c-format -msgid "" -"You can export using NFS or SMB. Please select which you would like to use." -msgstr "" -"Вы можете экспортировать при помощи NFS или SMB. Пожалуйста, выберите, " -"который из них вы желаете использовать." +msgid "You can export using NFS or SMB. Please select which you would like to use." +msgstr "Вы можете экспортировать при помощи NFS или SMB. Пожалуйста, выберите, который из них вы желаете использовать." #: any.pm:1397 #, c-format @@ -695,12 +719,8 @@ msgstr "" #: any.pm:1506 #, c-format -msgid "" -"You need to logout and back in again for changes to take effect. Press OK to " -"logout now." -msgstr "" -"Чтобы изменения вступили в силу, необходимо выполнить повторный вход в " -"систему. Нажмите кнопку «ОК», чтобы выйти сейчас." +msgid "You need to logout and back in again for changes to take effect. Press OK to logout now." +msgstr "Чтобы изменения вступили в силу, необходимо выполнить повторный вход в систему. Нажмите кнопку «ОК», чтобы выйти сейчас." #: any.pm:1510 #, c-format @@ -717,7 +737,8 @@ msgstr "Часовой пояс" msgid "Which is your timezone?" msgstr "Какой у вас часовой пояс?" -#: any.pm:1568 any.pm:1570 +#: any.pm:1568 +#: any.pm:1570 #, c-format msgid "Date, Clock & Time Zone Settings" msgstr "Настройка даты, времени и часового пояса" @@ -767,7 +788,8 @@ msgstr "NIS" msgid "Smart Card" msgstr "Смарт-карта" -#: authentication.pm:28 authentication.pm:215 +#: authentication.pm:28 +#: authentication.pm:215 #, c-format msgid "Windows Domain" msgstr "Домен Windows" @@ -784,11 +806,8 @@ msgstr "Локальный файл:" #: authentication.pm:65 #, c-format -msgid "" -"Use local for all authentication and information user tell in local file" -msgstr "" -"Аутентификация выполняется локально, сведения о пользователях заносится в " -"локальный файл" +msgid "Use local for all authentication and information user tell in local file" +msgstr "Аутентификация выполняется локально, сведения о пользователях заносится в локальный файл" #: authentication.pm:66 #, c-format @@ -797,13 +816,8 @@ msgstr "LDAP:" #: authentication.pm:66 #, c-format -msgid "" -"Tells your computer to use LDAP for some or all authentication. LDAP " -"consolidates certain types of information within your organization." -msgstr "" -"Сообщает вашему компьютеру, что он должен использовать LDAP для всех или " -"некоторых авторизаций. LDAP объединяет определенные типы информации внутри " -"вашей организации." +msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization." +msgstr "Сообщает вашему компьютеру, что он должен использовать LDAP для всех или некоторых авторизаций. LDAP объединяет определенные типы информации внутри вашей организации." #: authentication.pm:67 #, c-format @@ -812,12 +826,8 @@ msgstr "NIS:" #: authentication.pm:67 #, c-format -msgid "" -"Allows you to run a group of computers in the same Network Information " -"Service domain with a common password and group file." -msgstr "" -"Позволяет группе компьютеров работать в одинаковом домене Network " -"Information Service с общими файлами паролей и групп." +msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file." +msgstr "Позволяет группе компьютеров работать в одинаковом домене Network Information Service с общими файлами паролей и групп." #: authentication.pm:68 #, c-format @@ -826,12 +836,8 @@ msgstr "Домен Windows:" #: authentication.pm:68 #, c-format -msgid "" -"Winbind allows the system to retrieve information and authenticate users in " -"a Windows domain." -msgstr "" -"Winbind позволяет системе получать информацию и аутентифицировать " -"пользователей в домене Windows." +msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain." +msgstr "Winbind позволяет системе получать информацию и аутентифицировать пользователей в домене Windows." #: authentication.pm:69 #, c-format @@ -843,14 +849,20 @@ msgstr "Kerberos 5 :" msgid "With Kerberos and LDAP for authentication in Active Directory Server " msgstr "С Kerberos и LDAP для аутентификации на сервере с Active Directory" -#: authentication.pm:106 authentication.pm:140 authentication.pm:159 -#: authentication.pm:160 authentication.pm:186 authentication.pm:210 +#: authentication.pm:106 +#: authentication.pm:140 +#: authentication.pm:159 +#: authentication.pm:160 +#: authentication.pm:186 +#: authentication.pm:210 #: authentication.pm:865 #, c-format msgid " " msgstr " " -#: authentication.pm:107 authentication.pm:141 authentication.pm:187 +#: authentication.pm:107 +#: authentication.pm:141 +#: authentication.pm:187 #: authentication.pm:211 #, c-format msgid "Welcome to the Authentication Wizard" @@ -858,17 +870,17 @@ msgstr "Вас приветствует мастер настройки ауте #: authentication.pm:109 #, c-format -msgid "" -"You have selected LDAP authentication. Please review the configuration " -"options below " +msgid "You have selected LDAP authentication. Please review the configuration options below " msgstr "Выбрана аутентификация типа LDAP. Проверьте конфигурационные параметры" -#: authentication.pm:111 authentication.pm:166 +#: authentication.pm:111 +#: authentication.pm:166 #, c-format msgid "LDAP Server" msgstr "LDAP-сервер" -#: authentication.pm:112 authentication.pm:167 +#: authentication.pm:112 +#: authentication.pm:167 #, c-format msgid "Base dn" msgstr "База DN" @@ -878,38 +890,46 @@ msgstr "База DN" msgid "Fetch base Dn " msgstr "Получить базу DN" -#: authentication.pm:115 authentication.pm:170 +#: authentication.pm:115 +#: authentication.pm:170 #, c-format msgid "Use encrypt connection with TLS " msgstr "Использовать шифрованное соединение с TLS" -#: authentication.pm:116 authentication.pm:171 +#: authentication.pm:116 +#: authentication.pm:171 #, c-format msgid "Download CA Certificate " msgstr "Загрузить сертификат CA" -#: authentication.pm:118 authentication.pm:151 +#: authentication.pm:118 +#: authentication.pm:151 #, c-format msgid "Use Disconnect mode " msgstr "Использовать автономный режим" -#: authentication.pm:119 authentication.pm:172 +#: authentication.pm:119 +#: authentication.pm:172 #, c-format msgid "Use anonymous BIND " msgstr "Использовать анонимный BIND" -#: authentication.pm:120 authentication.pm:123 authentication.pm:125 +#: authentication.pm:120 +#: authentication.pm:123 +#: authentication.pm:125 #: authentication.pm:129 #, c-format msgid " " msgstr " " -#: authentication.pm:121 authentication.pm:173 +#: authentication.pm:121 +#: authentication.pm:173 #, c-format msgid "Bind DN " msgstr "Привязка DN" -#: authentication.pm:122 authentication.pm:174 +#: authentication.pm:122 +#: authentication.pm:174 #, c-format msgid "Bind Password " msgstr "Привязка пароля" @@ -936,11 +956,8 @@ msgstr "База shadow" #: authentication.pm:143 #, c-format -msgid "" -"You have selected Kerberos 5 authentication. Please review the configuration " -"options below " -msgstr "" -"Выбрана аутентификация типа Kerberos 5. Проверьте конфигурационные параметры" +msgid "You have selected Kerberos 5 authentication. Please review the configuration options below " +msgstr "Выбрана аутентификация типа Kerberos 5. Проверьте конфигурационные параметры" #: authentication.pm:145 #, c-format @@ -974,12 +991,8 @@ msgstr "Использовать LDAP с данными о пользовате #: authentication.pm:162 #, c-format -msgid "" -"You have selected Kerberos 5 for authentication, now you must choose the " -"type of users information " -msgstr "" -"Выбрана аутентификация типа Kerberos 5. Теперь необходимо выбрать тип данных " -"пользователей" +msgid "You have selected Kerberos 5 for authentication, now you must choose the type of users information " +msgstr "Выбрана аутентификация типа Kerberos 5. Теперь необходимо выбрать тип данных пользователей" #: authentication.pm:168 #, c-format @@ -988,9 +1001,7 @@ msgstr "Получить базу Dn" #: authentication.pm:189 #, c-format -msgid "" -"You have selected NIS authentication. Please review the configuration " -"options below " +msgid "You have selected NIS authentication. Please review the configuration options below " msgstr "Выбрана аутентификация типа NIS. Проверьте конфигурационные параметры" #: authentication.pm:191 @@ -1005,11 +1016,8 @@ msgstr "Сервер NIS" #: authentication.pm:213 #, c-format -msgid "" -"You have selected Windows Domain authentication. Please review the " -"configuration options below " -msgstr "" -"Выбрана аутентификация в домене Windows. Проверьте конфигурационные параметры" +msgid "You have selected Windows Domain authentication. Please review the configuration options below " +msgstr "Выбрана аутентификация в домене Windows. Проверьте конфигурационные параметры" #: authentication.pm:217 #, c-format @@ -1031,7 +1039,8 @@ msgstr "Домен DNS" msgid "DC Server" msgstr "Сервер DC" -#: authentication.pm:235 authentication.pm:251 +#: authentication.pm:235 +#: authentication.pm:251 #, c-format msgid "Authentication" msgstr "Аутентификация" @@ -1134,21 +1143,13 @@ msgstr "Начальный загрузчик нельзя установить #: bootloader.pm:2258 #, c-format -msgid "" -"Your bootloader configuration must be updated because partition has been " -"renumbered" -msgstr "" -"Так как был изменён номера раздела, необходимо обновить конфигурацию " -"начального загрузчика" +msgid "Your bootloader configuration must be updated because partition has been renumbered" +msgstr "Так как был изменён номера раздела, необходимо обновить конфигурацию начального загрузчика" #: bootloader.pm:2271 #, c-format -msgid "" -"The bootloader cannot be installed correctly. You have to boot rescue and " -"choose \"%s\"" -msgstr "" -"Начальный загрузчик не может быть корректно установлен. Вам необходимо " -"загрузиться в режиме rescue и выбрать \"%s\"" +msgid "The bootloader cannot be installed correctly. You have to boot rescue and choose \"%s\"" +msgstr "Начальный загрузчик не может быть корректно установлен. Вам необходимо загрузиться в режиме rescue и выбрать \"%s\"" #: bootloader.pm:2272 #, c-format @@ -1175,7 +1176,8 @@ msgstr "МБ" msgid "GB" msgstr "ГБ" -#: common.pm:142 common.pm:151 +#: common.pm:142 +#: common.pm:151 #, c-format msgid "TB" msgstr "ТБ" @@ -1202,23 +1204,23 @@ msgid "" "locally, and treat it like a local filesystem (provided the web server is\n" "configured as a WebDAV server). If you would like to add WebDAV mount\n" "points, select \"New\"." -msgstr "" -"WebDAV является протоколом, который позволяет вам локально монтировать " -"директорию веб-сервера, интерпретируя ее как локальную файловую систему (при " -"условии, что веб-сервер настроен как сервер WebDAV). Если вы захотите " -"добавить точки монтирования WebDAV, выберите \"Новая\"." +msgstr "WebDAV является протоколом, который позволяет вам локально монтировать директорию веб-сервера, интерпретируя ее как локальную файловую систему (при условии, что веб-сервер настроен как сервер WebDAV). Если вы захотите добавить точки монтирования WebDAV, выберите \"Новая\"." #: diskdrake/dav.pm:25 #, c-format msgid "New" msgstr "Новая" -#: diskdrake/dav.pm:63 diskdrake/interactive.pm:418 diskdrake/smbnfs_gtk.pm:75 +#: diskdrake/dav.pm:63 +#: diskdrake/interactive.pm:418 +#: diskdrake/smbnfs_gtk.pm:75 #, c-format msgid "Unmount" msgstr "Размонтировать" -#: diskdrake/dav.pm:64 diskdrake/interactive.pm:414 diskdrake/smbnfs_gtk.pm:76 +#: diskdrake/dav.pm:64 +#: diskdrake/interactive.pm:414 +#: diskdrake/smbnfs_gtk.pm:76 #, c-format msgid "Mount" msgstr "Монтировать" @@ -1228,44 +1230,76 @@ msgstr "Монтировать" msgid "Server" msgstr "Сервер" -#: diskdrake/dav.pm:66 diskdrake/interactive.pm:408 -#: diskdrake/interactive.pm:722 diskdrake/interactive.pm:740 -#: diskdrake/interactive.pm:744 diskdrake/removable.pm:23 +#: diskdrake/dav.pm:66 +#: diskdrake/interactive.pm:408 +#: diskdrake/interactive.pm:722 +#: diskdrake/interactive.pm:740 +#: diskdrake/interactive.pm:744 +#: diskdrake/removable.pm:23 #: diskdrake/smbnfs_gtk.pm:79 #, c-format msgid "Mount point" msgstr "Точка монтирования" -#: diskdrake/dav.pm:67 diskdrake/interactive.pm:410 -#: diskdrake/interactive.pm:1176 diskdrake/removable.pm:24 +#: diskdrake/dav.pm:67 +#: diskdrake/interactive.pm:410 +#: diskdrake/interactive.pm:1176 +#: diskdrake/removable.pm:24 #: diskdrake/smbnfs_gtk.pm:80 #, c-format msgid "Options" msgstr "Параметры" -#: diskdrake/dav.pm:68 interactive.pm:388 interactive/gtk.pm:457 +#: diskdrake/dav.pm:68 +#: interactive.pm:388 +#: interactive/gtk.pm:457 #, c-format msgid "Remove" msgstr "Удалить" -#: diskdrake/dav.pm:69 diskdrake/hd_gtk.pm:203 diskdrake/removable.pm:26 -#: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151 +#: diskdrake/dav.pm:69 +#: diskdrake/hd_gtk.pm:203 +#: diskdrake/removable.pm:26 +#: diskdrake/smbnfs_gtk.pm:82 +#: interactive/http.pm:151 #, c-format msgid "Done" msgstr "Готово" -#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:135 diskdrake/hd_gtk.pm:309 -#: diskdrake/interactive.pm:247 diskdrake/interactive.pm:260 -#: diskdrake/interactive.pm:456 diskdrake/interactive.pm:527 -#: diskdrake/interactive.pm:545 diskdrake/interactive.pm:550 -#: diskdrake/interactive.pm:712 diskdrake/interactive.pm:1015 -#: diskdrake/interactive.pm:1067 diskdrake/interactive.pm:1222 -#: diskdrake/interactive.pm:1235 diskdrake/interactive.pm:1238 -#: diskdrake/interactive.pm:1512 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 -#: do_pkgs.pm:28 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:83 -#: fsedit.pm:246 interactive/http.pm:117 interactive/http.pm:118 -#: modules/interactive.pm:19 scanner.pm:95 scanner.pm:106 scanner.pm:113 -#: scanner.pm:120 wizards.pm:96 wizards.pm:100 wizards.pm:122 +#: diskdrake/dav.pm:78 +#: diskdrake/hd_gtk.pm:135 +#: diskdrake/hd_gtk.pm:309 +#: diskdrake/interactive.pm:247 +#: diskdrake/interactive.pm:260 +#: diskdrake/interactive.pm:456 +#: diskdrake/interactive.pm:527 +#: diskdrake/interactive.pm:545 +#: diskdrake/interactive.pm:550 +#: diskdrake/interactive.pm:712 +#: diskdrake/interactive.pm:1015 +#: diskdrake/interactive.pm:1067 +#: diskdrake/interactive.pm:1222 +#: diskdrake/interactive.pm:1235 +#: diskdrake/interactive.pm:1238 +#: diskdrake/interactive.pm:1512 +#: diskdrake/smbnfs_gtk.pm:42 +#: do_pkgs.pm:23 +#: do_pkgs.pm:28 +#: do_pkgs.pm:44 +#: do_pkgs.pm:60 +#: do_pkgs.pm:65 +#: do_pkgs.pm:83 +#: fsedit.pm:246 +#: interactive/http.pm:117 +#: interactive/http.pm:118 +#: modules/interactive.pm:19 +#: scanner.pm:95 +#: scanner.pm:106 +#: scanner.pm:113 +#: scanner.pm:120 +#: wizards.pm:96 +#: wizards.pm:100 +#: wizards.pm:122 #, c-format msgid "Error" msgstr "Ошибка" @@ -1280,13 +1314,24 @@ msgstr "Пожалуйста, введите URL сервера WebDAV" msgid "The URL must begin with http:// or https://" msgstr "URL должен начинаться с http:// или https://" -#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:434 diskdrake/interactive.pm:306 -#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:597 -#: diskdrake/interactive.pm:815 diskdrake/interactive.pm:880 -#: diskdrake/interactive.pm:1047 diskdrake/interactive.pm:1089 -#: diskdrake/interactive.pm:1090 diskdrake/interactive.pm:1322 -#: diskdrake/interactive.pm:1360 diskdrake/interactive.pm:1511 do_pkgs.pm:19 -#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:78 harddrake/sound.pm:399 +#: diskdrake/dav.pm:106 +#: diskdrake/hd_gtk.pm:434 +#: diskdrake/interactive.pm:306 +#: diskdrake/interactive.pm:391 +#: diskdrake/interactive.pm:597 +#: diskdrake/interactive.pm:815 +#: diskdrake/interactive.pm:880 +#: diskdrake/interactive.pm:1047 +#: diskdrake/interactive.pm:1089 +#: diskdrake/interactive.pm:1090 +#: diskdrake/interactive.pm:1322 +#: diskdrake/interactive.pm:1360 +#: diskdrake/interactive.pm:1511 +#: do_pkgs.pm:19 +#: do_pkgs.pm:39 +#: do_pkgs.pm:57 +#: do_pkgs.pm:78 +#: harddrake/sound.pm:399 #, c-format msgid "Warning" msgstr "Внимание" @@ -1301,23 +1346,32 @@ msgstr "Вы уверены, что хотите удалить эту точк msgid "Server: " msgstr "Сервер: " -#: diskdrake/dav.pm:125 diskdrake/interactive.pm:501 -#: diskdrake/interactive.pm:1384 diskdrake/interactive.pm:1472 +#: diskdrake/dav.pm:125 +#: diskdrake/interactive.pm:501 +#: diskdrake/interactive.pm:1384 +#: diskdrake/interactive.pm:1472 #, c-format msgid "Mount point: " msgstr "Точка монтирования:" -#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1479 +#: diskdrake/dav.pm:126 +#: diskdrake/interactive.pm:1479 #, c-format msgid "Options: %s" msgstr "Параметры: %s" -#: diskdrake/hd_gtk.pm:61 diskdrake/interactive.pm:301 -#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:108 -#: fs/partitioning_wizard.pm:61 fs/partitioning_wizard.pm:244 -#: fs/partitioning_wizard.pm:252 fs/partitioning_wizard.pm:291 -#: fs/partitioning_wizard.pm:439 fs/partitioning_wizard.pm:502 -#: fs/partitioning_wizard.pm:585 fs/partitioning_wizard.pm:588 +#: diskdrake/hd_gtk.pm:61 +#: diskdrake/interactive.pm:301 +#: diskdrake/smbnfs_gtk.pm:22 +#: fs/mount_point.pm:108 +#: fs/partitioning_wizard.pm:61 +#: fs/partitioning_wizard.pm:244 +#: fs/partitioning_wizard.pm:252 +#: fs/partitioning_wizard.pm:291 +#: fs/partitioning_wizard.pm:439 +#: fs/partitioning_wizard.pm:502 +#: fs/partitioning_wizard.pm:585 +#: fs/partitioning_wizard.pm:588 #, c-format msgid "Partitioning" msgstr "Разметка диска" @@ -1327,8 +1381,10 @@ msgstr "Разметка диска" msgid "Click on a partition, choose a filesystem type then choose an action" msgstr "Выберите раздел, смените файловую систему, затем выберите действие" -#: diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:1197 -#: diskdrake/interactive.pm:1207 diskdrake/interactive.pm:1260 +#: diskdrake/hd_gtk.pm:116 +#: diskdrake/interactive.pm:1197 +#: diskdrake/interactive.pm:1207 +#: diskdrake/interactive.pm:1260 #, c-format msgid "Read carefully" msgstr "Прочтите внимательно" @@ -1338,7 +1394,8 @@ msgstr "Прочтите внимательно" msgid "Please make a backup of your data first" msgstr "Пожалуйста, сделайте резервную копию данных сначала" -#: diskdrake/hd_gtk.pm:117 diskdrake/interactive.pm:240 +#: diskdrake/hd_gtk.pm:117 +#: diskdrake/interactive.pm:240 #, c-format msgid "Exit" msgstr "Выход" @@ -1348,8 +1405,12 @@ msgstr "Выход" msgid "Continue" msgstr "Продолжить" -#: diskdrake/hd_gtk.pm:198 fs/partitioning_wizard.pm:561 interactive.pm:654 -#: interactive/gtk.pm:813 interactive/gtk.pm:831 interactive/gtk.pm:862 +#: diskdrake/hd_gtk.pm:198 +#: fs/partitioning_wizard.pm:561 +#: interactive.pm:654 +#: interactive/gtk.pm:813 +#: interactive/gtk.pm:831 +#: interactive/gtk.pm:862 #: ugtk2.pm:936 #, c-format msgid "Help" @@ -1371,7 +1432,8 @@ msgstr "" msgid "Please click on a partition" msgstr "Пожалуйста, щелкните на разделе" -#: diskdrake/hd_gtk.pm:260 diskdrake/smbnfs_gtk.pm:63 +#: diskdrake/hd_gtk.pm:260 +#: diskdrake/smbnfs_gtk.pm:63 #, c-format msgid "Details" msgstr "Подробности" @@ -1391,37 +1453,45 @@ msgstr "Неизвестный" msgid "Ext4" msgstr "Ext4" -#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409 +#: diskdrake/hd_gtk.pm:405 +#: fs/partitioning_wizard.pm:409 #, c-format msgid "XFS" msgstr "XFS" -#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409 +#: diskdrake/hd_gtk.pm:405 +#: fs/partitioning_wizard.pm:409 #, c-format msgid "Swap" msgstr "Своп" -#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409 +#: diskdrake/hd_gtk.pm:405 +#: fs/partitioning_wizard.pm:409 #, c-format msgid "SunOS" msgstr "SunOS" -#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409 +#: diskdrake/hd_gtk.pm:405 +#: fs/partitioning_wizard.pm:409 #, c-format msgid "HFS" msgstr "HFS" -#: diskdrake/hd_gtk.pm:405 fs/partitioning_wizard.pm:409 +#: diskdrake/hd_gtk.pm:405 +#: fs/partitioning_wizard.pm:409 #, c-format msgid "Windows" msgstr "Windows" -#: diskdrake/hd_gtk.pm:406 fs/partitioning_wizard.pm:410 services.pm:193 +#: diskdrake/hd_gtk.pm:406 +#: fs/partitioning_wizard.pm:410 +#: services.pm:193 #, c-format msgid "Other" msgstr "Другие" -#: diskdrake/hd_gtk.pm:406 diskdrake/interactive.pm:1399 +#: diskdrake/hd_gtk.pm:406 +#: diskdrake/interactive.pm:1399 #: fs/partitioning_wizard.pm:410 #, c-format msgid "Empty" @@ -1447,8 +1517,10 @@ msgstr "Используйте сначала ``Размонтировать''" msgid "Use ``%s'' instead (in expert mode)" msgstr "Вместо этого используйте ``%s'' (в режиме эксперта)" -#: diskdrake/hd_gtk.pm:443 diskdrake/interactive.pm:409 -#: diskdrake/interactive.pm:639 diskdrake/removable.pm:25 +#: diskdrake/hd_gtk.pm:443 +#: diskdrake/interactive.pm:409 +#: diskdrake/interactive.pm:639 +#: diskdrake/removable.pm:25 #: diskdrake/removable.pm:48 #, c-format msgid "Type" @@ -1464,14 +1536,17 @@ msgstr "Выберите другой раздел" msgid "Choose a partition" msgstr "Выберите раздел" -#: diskdrake/interactive.pm:273 diskdrake/interactive.pm:382 +#: diskdrake/interactive.pm:273 +#: diskdrake/interactive.pm:382 #: interactive/curses.pm:532 #, c-format msgid "More" msgstr "Больше" -#: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294 -#: diskdrake/interactive.pm:1306 mygtk2.pm:1228 +#: diskdrake/interactive.pm:281 +#: diskdrake/interactive.pm:294 +#: diskdrake/interactive.pm:1306 +#: mygtk2.pm:1228 #, c-format msgid "Confirmation" msgstr "Подтверждение" @@ -1496,11 +1571,11 @@ msgstr "Выйти без записи таблицы разделов?" msgid "Do you want to save the /etc/fstab modifications?" msgstr "Желаете сохранить изменения /etc/fstab" -#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:291 +#: diskdrake/interactive.pm:301 +#: fs/partitioning_wizard.pm:291 #, c-format msgid "You need to reboot for the partition table modifications to take effect" -msgstr "" -"Вам нужно перезагрузиться, чтобы изменения таблицы разделов вступили в силу" +msgstr "Вам нужно перезагрузиться, чтобы изменения таблицы разделов вступили в силу" #: diskdrake/interactive.pm:306 #, c-format @@ -1550,12 +1625,8 @@ msgstr "Добавление новых разделов невозможно" #: diskdrake/interactive.pm:373 #, c-format -msgid "" -"To have more partitions, please delete one to be able to create an extended " -"partition" -msgstr "" -"Чтобы получить больше разделов, удалите один, чтобы получить возможность " -"создать расширенный раздел" +msgid "To have more partitions, please delete one to be able to create an extended partition" +msgstr "Чтобы получить больше разделов, удалите один, чтобы получить возможность создать расширенный раздел" #: diskdrake/interactive.pm:384 #, c-format @@ -1572,7 +1643,8 @@ msgstr "Подробная информация" msgid "View" msgstr "Вид" -#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:828 +#: diskdrake/interactive.pm:412 +#: diskdrake/interactive.pm:828 #, c-format msgid "Resize" msgstr "Изменить размер" @@ -1582,12 +1654,14 @@ msgstr "Изменить размер" msgid "Format" msgstr "Форматировать" -#: diskdrake/interactive.pm:415 diskdrake/interactive.pm:978 +#: diskdrake/interactive.pm:415 +#: diskdrake/interactive.pm:978 #, c-format msgid "Add to RAID" msgstr "Добавить в RAID" -#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:997 +#: diskdrake/interactive.pm:416 +#: diskdrake/interactive.pm:997 #, c-format msgid "Add to LVM" msgstr "Добавить в LVM" @@ -1637,7 +1711,8 @@ msgstr "Создать" msgid "Failed to mount partition" msgstr "Сбой монтирования раздела" -#: diskdrake/interactive.pm:490 diskdrake/interactive.pm:492 +#: diskdrake/interactive.pm:490 +#: diskdrake/interactive.pm:492 #, c-format msgid "Create a new partition" msgstr "Создать новый раздел" @@ -1647,12 +1722,14 @@ msgstr "Создать новый раздел" msgid "Start sector: " msgstr "Начальный сектор: " -#: diskdrake/interactive.pm:497 diskdrake/interactive.pm:1082 +#: diskdrake/interactive.pm:497 +#: diskdrake/interactive.pm:1082 #, c-format msgid "Size in MB: " msgstr "Размер в MB: " -#: diskdrake/interactive.pm:499 diskdrake/interactive.pm:1083 +#: diskdrake/interactive.pm:499 +#: diskdrake/interactive.pm:1083 #, c-format msgid "Filesystem type: " msgstr "Тип файловой системы: " @@ -1677,12 +1754,14 @@ msgstr "Шифрование раздела" msgid "Encryption key " msgstr "Ключ шифрования" -#: diskdrake/interactive.pm:512 diskdrake/interactive.pm:1516 +#: diskdrake/interactive.pm:512 +#: diskdrake/interactive.pm:1516 #, c-format msgid "Encryption key (again)" msgstr "Ключ шифрования (еще раз)" -#: diskdrake/interactive.pm:524 diskdrake/interactive.pm:1512 +#: diskdrake/interactive.pm:524 +#: diskdrake/interactive.pm:1512 #, c-format msgid "The encryption keys do not match" msgstr "Ключи шифрования не совпадают" @@ -1710,17 +1789,16 @@ msgstr "Удалить файл loopback?" #: diskdrake/interactive.pm:620 #, c-format -msgid "" -"After changing type of partition %s, all data on this partition will be lost" -msgstr "" -"После изменения типа раздела %s, все данные в этом разделе будут потеряны" +msgid "After changing type of partition %s, all data on this partition will be lost" +msgstr "После изменения типа раздела %s, все данные в этом разделе будут потеряны" #: diskdrake/interactive.pm:636 #, c-format msgid "Change partition type" msgstr "Изменить тип раздела" -#: diskdrake/interactive.pm:638 diskdrake/removable.pm:47 +#: diskdrake/interactive.pm:638 +#: diskdrake/removable.pm:47 #, c-format msgid "Which filesystem do you want?" msgstr "Какую файловую систему желаете?" @@ -1743,8 +1821,7 @@ msgstr "Осторожно, после проверки эти данные бу #: diskdrake/interactive.pm:683 #, c-format msgid "Beware, this will be written to disk only after formatting!" -msgstr "" -"Осторожно, эти данные будут записаны на диск только после форматирования!" +msgstr "Осторожно, эти данные будут записаны на диск только после форматирования!" #: diskdrake/interactive.pm:685 #, c-format @@ -1771,17 +1848,17 @@ msgstr "Куда вы хотите примонтировать устройст msgid "" "Cannot unset mount point as this partition is used for loop back.\n" "Remove the loopback first" -msgstr "" -"Невозможно снять точку монтирования, поскольку этот раздел используется для " -"loop back. Удалите сначала loopback" +msgstr "Невозможно снять точку монтирования, поскольку этот раздел используется для loop back. Удалите сначала loopback" #: diskdrake/interactive.pm:743 #, c-format msgid "Where do you want to mount %s?" msgstr "Куда вы хотите примонтировать %s?" -#: diskdrake/interactive.pm:773 diskdrake/interactive.pm:869 -#: fs/partitioning_wizard.pm:137 fs/partitioning_wizard.pm:213 +#: diskdrake/interactive.pm:773 +#: diskdrake/interactive.pm:869 +#: fs/partitioning_wizard.pm:137 +#: fs/partitioning_wizard.pm:213 #, c-format msgid "Resizing" msgstr "Изменение размера" @@ -1804,8 +1881,7 @@ msgstr "Для всех данных в этом разделе должна б #: diskdrake/interactive.pm:822 #, c-format msgid "After resizing partition %s, all data on this partition will be lost" -msgstr "" -"После изменения размера раздела %s все данные в этом разделе будут потеряны" +msgstr "После изменения размера раздела %s все данные в этом разделе будут потеряны" #: diskdrake/interactive.pm:829 #, c-format @@ -1827,7 +1903,8 @@ msgstr "Минимальный размер: %s МБ" msgid "Maximum size: %s MB" msgstr "Максимальный размер: %s МБ" -#: diskdrake/interactive.pm:880 fs/partitioning_wizard.pm:221 +#: diskdrake/interactive.pm:880 +#: fs/partitioning_wizard.pm:221 #, c-format msgid "" "To ensure data integrity after resizing the partition(s),\n" @@ -1837,7 +1914,8 @@ msgstr "" "разделов при следующей загрузке в Microsoft Windows® будет\n" "запущена проверка файловой системы" -#: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1507 +#: diskdrake/interactive.pm:946 +#: diskdrake/interactive.pm:1507 #, c-format msgid "Filesystem encryption key" msgstr "Ключ шифрования файловой системы: " @@ -1847,7 +1925,8 @@ msgstr "Ключ шифрования файловой системы: " msgid "Enter your filesystem encryption key" msgstr "Введите ключ шифрования файловой системы" -#: diskdrake/interactive.pm:948 diskdrake/interactive.pm:1515 +#: diskdrake/interactive.pm:948 +#: diskdrake/interactive.pm:1515 #, c-format msgid "Encryption key" msgstr "Ключ шифрования" @@ -1862,7 +1941,8 @@ msgstr "неправильный ключ" msgid "Choose an existing RAID to add to" msgstr "Выберите существующий RAID для добавления" -#: diskdrake/interactive.pm:980 diskdrake/interactive.pm:999 +#: diskdrake/interactive.pm:980 +#: diskdrake/interactive.pm:999 #, c-format msgid "new" msgstr "новый" @@ -1872,7 +1952,8 @@ msgstr "новый" msgid "Choose an existing LVM to add to" msgstr "Выберите существующий LVM для добавления" -#: diskdrake/interactive.pm:1009 diskdrake/interactive.pm:1018 +#: diskdrake/interactive.pm:1009 +#: diskdrake/interactive.pm:1018 #, c-format msgid "LVM name" msgstr "Имя LVM" @@ -1894,8 +1975,7 @@ msgid "" "Do you want to move used physical extents on this volume to other volumes?" msgstr "" "Физический раздел %s используется.\n" -"Желаете ли вы переместить используемые физические области на этом разделе на " -"другие разделы?" +"Желаете ли вы переместить используемые физические области на этом разделе на другие разделы?" #: diskdrake/interactive.pm:1049 #, c-format @@ -1932,7 +2012,8 @@ msgstr "Файл уже используется другим loopback, выбе msgid "File already exists. Use it?" msgstr "Файл уже существует. Использовать его?" -#: diskdrake/interactive.pm:1122 diskdrake/interactive.pm:1125 +#: diskdrake/interactive.pm:1122 +#: diskdrake/interactive.pm:1125 #, c-format msgid "Mount options" msgstr "Параметры монтирования" @@ -1982,7 +2063,9 @@ msgstr "Необходимо выполнить перегрузку, чтобы msgid "Partition table of drive %s is going to be written to disk" msgstr "Таблица разделов устройства %s будет записана на диск" -#: diskdrake/interactive.pm:1279 fs/format.pm:107 fs/format.pm:114 +#: diskdrake/interactive.pm:1279 +#: fs/format.pm:107 +#: fs/format.pm:114 #, c-format msgid "Formatting partition %s" msgstr "Форматируется раздел %s" @@ -1990,10 +2073,10 @@ msgstr "Форматируется раздел %s" #: diskdrake/interactive.pm:1292 #, c-format msgid "After formatting partition %s, all data on this partition will be lost" -msgstr "" -"После форматирования раздела %s, все данные на этом разделе будут потеряны" +msgstr "После форматирования раздела %s, все данные на этом разделе будут потеряны" -#: diskdrake/interactive.pm:1306 fs/partitioning.pm:48 +#: diskdrake/interactive.pm:1306 +#: fs/partitioning.pm:48 #, c-format msgid "Check for bad blocks?" msgstr "Выполнить проверку на сбойные сектора?" @@ -2014,16 +2097,12 @@ msgid "" "Directory %s already contains data\n" "(%s)\n" "\n" -"You can either choose to move the files into the partition that will be " -"mounted there or leave them where they are (which results in hiding them by " -"the contents of the mounted partition)" +"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)" msgstr "" "Каталог %s уже содержит данные\n" "(%s)\n" "\n" -"Вы можете или переместить файлы на раздел, который потом будет примонтирован " -"в этот каталог, или оставить оставить их нетронутыми (в результате чего они " -"будут скрыты примонтированным каталогом)." +"Вы можете или переместить файлы на раздел, который потом будет примонтирован в этот каталог, или оставить оставить их нетронутыми (в результате чего они будут скрыты примонтированным каталогом)." #: diskdrake/interactive.pm:1337 #, c-format @@ -2050,7 +2129,8 @@ msgstr "раздел %s теперь известен как %s" msgid "Partitions have been renumbered: " msgstr "У разделов были изменены номера: " -#: diskdrake/interactive.pm:1385 diskdrake/interactive.pm:1456 +#: diskdrake/interactive.pm:1385 +#: diskdrake/interactive.pm:1456 #, c-format msgid "Device: " msgstr "Устройство: " @@ -2070,13 +2150,15 @@ msgstr "UUID: " msgid "DOS drive letter: %s (just a guess)\n" msgstr "буква диска DOS: %s (просто предположение)\n" -#: diskdrake/interactive.pm:1392 diskdrake/interactive.pm:1401 +#: diskdrake/interactive.pm:1392 +#: diskdrake/interactive.pm:1401 #: diskdrake/interactive.pm:1475 #, c-format msgid "Type: " msgstr "Тип: " -#: diskdrake/interactive.pm:1396 diskdrake/interactive.pm:1460 +#: diskdrake/interactive.pm:1396 +#: diskdrake/interactive.pm:1460 #, c-format msgid "Name: " msgstr "Имя: " @@ -2258,9 +2340,7 @@ msgstr "Выберите ключ шифрования вашей файлово #: diskdrake/interactive.pm:1511 #, c-format msgid "This encryption key is too simple (must be at least %d characters long)" -msgstr "" -"Этот ключ шифрования слишком прост (должен быть длиной по крайней мере в %d " -"символов)" +msgstr "Этот ключ шифрования слишком прост (должен быть длиной по крайней мере в %d символов)" #: diskdrake/interactive.pm:1518 #, c-format @@ -2272,10 +2352,20 @@ msgstr "Алгоритм шифрования" msgid "Change type" msgstr "Изменить тип" -#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:130 interactive.pm:551 -#: interactive/curses.pm:267 interactive/http.pm:104 interactive/http.pm:160 -#: interactive/stdio.pm:39 interactive/stdio.pm:148 mygtk2.pm:846 -#: mygtk2.pm:1229 ugtk2.pm:415 ugtk2.pm:517 ugtk2.pm:526 ugtk2.pm:812 +#: diskdrake/smbnfs_gtk.pm:81 +#: interactive.pm:130 +#: interactive.pm:551 +#: interactive/curses.pm:267 +#: interactive/http.pm:104 +#: interactive/http.pm:160 +#: interactive/stdio.pm:39 +#: interactive/stdio.pm:148 +#: mygtk2.pm:846 +#: mygtk2.pm:1229 +#: ugtk2.pm:415 +#: ugtk2.pm:517 +#: ugtk2.pm:526 +#: ugtk2.pm:812 #, c-format msgid "Cancel" msgstr "Отмена" @@ -2285,7 +2375,8 @@ msgstr "Отмена" msgid "Cannot login using username %s (bad password?)" msgstr "Невозможно войти под пользователем %s (неверный пароль?)" -#: diskdrake/smbnfs_gtk.pm:168 diskdrake/smbnfs_gtk.pm:177 +#: diskdrake/smbnfs_gtk.pm:168 +#: diskdrake/smbnfs_gtk.pm:177 #, c-format msgid "Domain Authentication Required" msgstr "Требуется аутентификация домена" @@ -2302,11 +2393,8 @@ msgstr "Еще один" #: diskdrake/smbnfs_gtk.pm:178 #, c-format -msgid "" -"Please enter your username, password and domain name to access this host." -msgstr "" -"Пожалуйста, введите свои имя пользователя, пароль и имя домена, чтобы " -"получить доступ к хосту." +msgid "Please enter your username, password and domain name to access this host." +msgstr "Пожалуйста, введите свои имя пользователя, пароль и имя домена, чтобы получить доступ к хосту." #: diskdrake/smbnfs_gtk.pm:180 #, c-format @@ -2328,22 +2416,28 @@ msgstr "Поиск серверов" msgid "Search for new servers" msgstr "Поиск новых серверов" -#: do_pkgs.pm:19 do_pkgs.pm:57 +#: do_pkgs.pm:19 +#: do_pkgs.pm:57 #, c-format msgid "The package %s needs to be installed. Do you want to install it?" msgstr "Необходимо установить пакет %s. Хотите установить его?" -#: do_pkgs.pm:23 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:83 +#: do_pkgs.pm:23 +#: do_pkgs.pm:44 +#: do_pkgs.pm:60 +#: do_pkgs.pm:83 #, c-format msgid "Could not install the %s package!" msgstr "Невозможно установить пакет %s !" -#: do_pkgs.pm:28 do_pkgs.pm:65 +#: do_pkgs.pm:28 +#: do_pkgs.pm:65 #, c-format msgid "Mandatory package %s is missing" msgstr "Обязательный пакет %s отсутствует" -#: do_pkgs.pm:39 do_pkgs.pm:78 +#: do_pkgs.pm:39 +#: do_pkgs.pm:78 #, c-format msgid "The following packages need to be installed:\n" msgstr "Следующие пакеты должны быть установлены:\n" @@ -2353,22 +2447,19 @@ msgstr "Следующие пакеты должны быть установле msgid "Installing packages..." msgstr "Устанавливаются пакеты..." -#: do_pkgs.pm:287 pkgs.pm:287 +#: do_pkgs.pm:287 +#: pkgs.pm:287 #, c-format msgid "Removing packages..." msgstr "Удаляются пакеты..." #: fs/any.pm:18 #, c-format -msgid "" -"An error occurred - no valid devices were found on which to create new " -"filesystems. Please check your hardware for the cause of this problem" -msgstr "" -"Произошла ошибка - не были найдены верные устройства для создания новых " -"файловых систем. Пожалуйста, проверьте свое аппаратное обеспечение для " -"выяснения вероятной причины." +msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem" +msgstr "Произошла ошибка - не были найдены верные устройства для создания новых файловых систем. Пожалуйста, проверьте свое аппаратное обеспечение для выяснения вероятной причины." -#: fs/any.pm:75 fs/partitioning_wizard.pm:70 +#: fs/any.pm:75 +#: fs/partitioning_wizard.pm:70 #, c-format msgid "You must have a FAT partition mounted in /boot/efi" msgstr "У вас должен быть раздел FAT, примонтированный на /boot/efi" @@ -2393,7 +2484,8 @@ msgstr "не удалось установить метку для %s. Он от msgid "I do not know how to format %s in type %s" msgstr "Не знаю, как форматировать %s с типом %s" -#: fs/format.pm:189 fs/format.pm:191 +#: fs/format.pm:189 +#: fs/format.pm:191 #, c-format msgid "%s formatting of %s failed" msgstr "%s форматирование %s завершилось неудачно" @@ -2413,12 +2505,14 @@ msgstr "Монтируется раздел %s" msgid "mounting partition %s in directory %s failed" msgstr "монтирование раздела %s в каталог %s завершилось неудачно" -#: fs/mount.pm:92 fs/mount.pm:109 +#: fs/mount.pm:92 +#: fs/mount.pm:109 #, c-format msgid "Checking %s" msgstr "Проверяется %s" -#: fs/mount.pm:126 partition_table.pm:422 +#: fs/mount.pm:126 +#: partition_table.pm:422 #, c-format msgid "error unmounting %s: %s" msgstr "ошибка размонтирования %s: %s" @@ -2441,8 +2535,7 @@ msgstr "Очищать кэш записи при закрытии файла" #: fs/mount_options.pm:118 #, c-format msgid "Enable group disk quota accounting and optionally enforce limits" -msgstr "" -"Разрешить подсчет дисковых квот для групп и опционально установку лимитов" +msgstr "Разрешить подсчет дисковых квот для групп и опционально установку лимитов" #: fs/mount_options.pm:120 #, c-format @@ -2451,8 +2544,7 @@ msgid "" "(e.g, for faster access on the news spool to speed up news servers)." msgstr "" "Не обновлять время доступа к inode на этой файловой системе\n" -"(нужно для более быстрого доступа к спулу новостей для ускорения работы " -"серверов новостей)." +"(нужно для более быстрого доступа к спулу новостей для ускорения работы серверов новостей)." #: fs/mount_options.pm:123 #, c-format @@ -2460,10 +2552,8 @@ msgid "" "Update inode access times on this filesystem in a more efficient way\n" "(e.g, for faster access on the news spool to speed up news servers)." msgstr "" -"Обновлять время доступа к inode на этой файловой системе более эффективным " -"способом\n" -"(нужно для более быстрого доступа к спулу новостей для ускорения работы " -"серверов новостей)." +"Обновлять время доступа к inode на этой файловой системе более эффективным способом\n" +"(нужно для более быстрого доступа к спулу новостей для ускорения работы серверов новостей)." #: fs/mount_options.pm:126 #, c-format @@ -2477,9 +2567,7 @@ msgstr "" #: fs/mount_options.pm:129 #, c-format msgid "Do not interpret character or block special devices on the filesystem." -msgstr "" -"Не интерпретировать символьные или специальные блочные устройства в файловой " -"системе." +msgstr "Не интерпретировать символьные или специальные блочные устройства в файловой системе." #: fs/mount_options.pm:131 #, c-format @@ -2517,8 +2605,7 @@ msgstr "Все I/O для файловой системы должны быть #: fs/mount_options.pm:143 #, c-format msgid "Allow every user to mount and umount the filesystem." -msgstr "" -"Разрешить всем пользователям монтировать и размонтировать файловую систему." +msgstr "Разрешить всем пользователям монтировать и размонтировать файловую систему." #: fs/mount_options.pm:145 #, c-format @@ -2528,9 +2615,7 @@ msgstr "Разрешить обычному пользователям монт #: fs/mount_options.pm:147 #, c-format msgid "Enable user disk quota accounting, and optionally enforce limits" -msgstr "" -"Включить учёт дисковых квот для пользователей и, опционально, установку " -"лимитов." +msgstr "Включить учёт дисковых квот для пользователей и, опционально, установку лимитов." #: fs/mount_options.pm:149 #, c-format @@ -2574,19 +2659,13 @@ msgstr "Выберите разделы для форматирования" #: fs/partitioning.pm:75 #, c-format -msgid "" -"Failed to check filesystem %s. Do you want to repair the errors? (beware, " -"you can lose data)" -msgstr "" -"Ошибка проверки файловой системы %s. Исправить ошибки? (Внимание: возможна " -"потеря данных!)" +msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)" +msgstr "Ошибка проверки файловой системы %s. Исправить ошибки? (Внимание: возможна потеря данных!)" #: fs/partitioning.pm:78 #, c-format msgid "Not enough swap space to fulfill installation, please add some" -msgstr "" -"Недостаточно пространства для свопинга для завершения установки. Увеличьте " -"его размер" +msgstr "Недостаточно пространства для свопинга для завершения установки. Увеличьте его размер" #: fs/partitioning_wizard.pm:61 #, c-format @@ -2647,14 +2726,8 @@ msgstr "Размер какого из разделов нужно измени #: fs/partitioning_wizard.pm:180 #, c-format -msgid "" -"Your Microsoft Windows® partition is too fragmented. Please reboot your " -"computer under Microsoft Windows®, run the ``defrag'' utility, then restart " -"the %s installation." -msgstr "" -"Раздел Microsoft Windows® слишком фрагментирован. Перезагрузите компьютер в " -"систему Microsoft Windows®, запустите утилиту «defrag», а затем повторно " -"запустите установку %s." +msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the %s installation." +msgstr "Раздел Microsoft Windows® слишком фрагментирован. Перезагрузите компьютер в систему Microsoft Windows®, запустите утилиту «defrag», а затем повторно запустите установку %s." #: fs/partitioning_wizard.pm:188 #, c-format @@ -2665,12 +2738,7 @@ msgid "" "Your Microsoft Windows® partition will be now resized.\n" "\n" "\n" -"Be careful: this operation is dangerous. If you have not already done so, " -"you first need to exit the installation, run \"chkdsk c:\" from a Command " -"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk" -"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " -"optionally run defrag, then restart the installation. You should also backup " -"your data.\n" +"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n" "\n" "\n" "When sure, press %s." @@ -2681,19 +2749,17 @@ msgstr "" "Сейчас DrakX изменит размер вашего раздела Windows.\n" "\n" "\n" -"Будьте осторожны: эта операция опасна. Если вы еще этого не сделали, вам " -"стоит выйти из инсталляции, запустить \"chkdsk c:\" в командной строке под " -"Windows (имейте в виду, что запуска графической программы \"scandisk\" " -"недостаточно, обязательно запустите \"chkdsk\" в командной строке), по " -"желанию выполнить дефрагментацию (defrag), затем начать установку снова. Вы " -"также должны сделать резервную копию данных.\n" +"Будьте осторожны: эта операция опасна. Если вы еще этого не сделали, вам стоит выйти из инсталляции, запустить \"chkdsk c:\" в командной строке под Windows (имейте в виду, что запуска графической программы \"scandisk\" недостаточно, обязательно запустите \"chkdsk\" в командной строке), по желанию выполнить дефрагментацию (defrag), затем начать установку снова. Вы также должны сделать резервную копию данных.\n" "\n" "\n" "Если уверены, нажмите %s." #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX -#: fs/partitioning_wizard.pm:197 fs/partitioning_wizard.pm:565 -#: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519 +#: fs/partitioning_wizard.pm:197 +#: fs/partitioning_wizard.pm:565 +#: interactive.pm:550 +#: interactive/curses.pm:270 +#: ugtk2.pm:519 #, c-format msgid "Next" msgstr "Далее" @@ -2740,14 +2806,11 @@ msgstr "Очистить и использовать весь диск" #: fs/partitioning_wizard.pm:243 #, c-format -msgid "" -"You have more than one hard disk drive, which one do you want the installer " -"to use?" -msgstr "" -"Доступно более одного жёсткого диска. Какой из них следует использовать " -"инсталлятору?" +msgid "You have more than one hard disk drive, which one do you want the installer to use?" +msgstr "Доступно более одного жёсткого диска. Какой из них следует использовать инсталлятору?" -#: fs/partitioning_wizard.pm:251 fsedit.pm:634 +#: fs/partitioning_wizard.pm:251 +#: fsedit.pm:634 #, c-format msgid "ALL existing partitions and their data will be lost on drive %s" msgstr "На диске %s будут уничтожены ВСЕ существующие разделы и данные" @@ -2776,12 +2839,14 @@ msgstr "" msgid "Ext2/3/4" msgstr "Ext2/3/4" -#: fs/partitioning_wizard.pm:439 fs/partitioning_wizard.pm:585 +#: fs/partitioning_wizard.pm:439 +#: fs/partitioning_wizard.pm:585 #, c-format msgid "I cannot find any room for installing" msgstr "Отсутствует дисковое пространство для установки" -#: fs/partitioning_wizard.pm:448 fs/partitioning_wizard.pm:592 +#: fs/partitioning_wizard.pm:448 +#: fs/partitioning_wizard.pm:592 #, c-format msgid "The DrakX Partitioning wizard found the following solutions:" msgstr "Мастер разметки диска DrakX предлагает следующие решения:" @@ -2799,15 +2864,12 @@ msgstr "Ошибка разметки: %s" #: fs/type.pm:390 #, c-format msgid "You cannot use JFS for partitions smaller than 16MB" -msgstr "" -"Файловую систему JFS нельзя использовать на разделах размером менее 16 МБ" +msgstr "Файловую систему JFS нельзя использовать на разделах размером менее 16 МБ" #: fs/type.pm:391 #, c-format msgid "You cannot use ReiserFS for partitions smaller than 32MB" -msgstr "" -"Файловую систему ReiserFS нельзя использовать на разделах размером менее 32 " -"МБ" +msgstr "Файловую систему ReiserFS нельзя использовать на разделах размером менее 32 МБ" #: fsedit.pm:24 #, c-format @@ -2832,18 +2894,15 @@ msgstr "На дисках %s обнаружен программный (BIOS) RA #: fsedit.pm:247 #, c-format msgid "" -"I cannot read the partition table of device %s, it's too corrupted for me :" -"(\n" +"I cannot read the partition table of device %s, it's too corrupted for me :(\n" "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" "The other solution is to not allow DrakX to modify the partition table.\n" "(the error is %s)\n" "\n" "Do you agree to lose all the partitions?\n" msgstr "" -"Невозможно прочитать таблицу разделов на устройстве %s, она слишком " -"повреждена :(\n" -"Можно попытаться продолжить, очистив плохие разделы (ВСЯ ИНФОРМАЦИЯ будет " -"потеряна!).\n" +"Невозможно прочитать таблицу разделов на устройстве %s, она слишком повреждена :(\n" +"Можно попытаться продолжить, очистив плохие разделы (ВСЯ ИНФОРМАЦИЯ будет потеряна!).\n" "Другой вариант - не разрешить DrakX'у изменить таблицу разделов.\n" "(ошибка %s)\n" "\n" @@ -2877,12 +2936,8 @@ msgstr "" #: fsedit.pm:440 #, c-format -msgid "" -"Metadata version unsupported for a boot partition. Please be sure to add a " -"separate /boot partition." -msgstr "" -"Версия метаданных не поддерживается для загрузочного раздела. Убедитесь, что " -"добавили отдельный раздел /boot." +msgid "Metadata version unsupported for a boot partition. Please be sure to add a separate /boot partition." +msgstr "Версия метаданных не поддерживается для загрузочного раздела. Убедитесь, что добавили отдельный раздел /boot." #: fsedit.pm:448 #, c-format @@ -2909,45 +2964,39 @@ msgstr "" "Никакой загрузчик не в состоянии управлять им без раздела /boot.\n" "Пожалуйста, убедитесь, что отдельный раздел /boot добавлен" -#: fsedit.pm:465 fsedit.pm:485 +#: fsedit.pm:465 +#: fsedit.pm:485 #, c-format msgid "You cannot use an encrypted filesystem for mount point %s" -msgstr "" -"Вы не можете использовать зашифрованную файловую систему для точки " -"монтирования %s" +msgstr "Вы не можете использовать зашифрованную файловую систему для точки монтирования %s" #: fsedit.pm:469 #, c-format -msgid "" -"You cannot use the LVM Logical Volume for mount point %s since it spans " -"physical volumes" -msgstr "" -"Вы не можете использовать логический том LVM для точки монтирования %s, " -"поскольку он распределён по физическим разделам" +msgid "You cannot use the LVM Logical Volume for mount point %s since it spans physical volumes" +msgstr "Вы не можете использовать логический том LVM для точки монтирования %s, поскольку он распределён по физическим разделам" #: fsedit.pm:471 #, c-format msgid "" "You've selected the LVM Logical Volume as root (/).\n" -"The bootloader is not able to handle this when the volume spans physical " -"volumes.\n" +"The bootloader is not able to handle this when the volume spans physical volumes.\n" "You should create a separate /boot partition first" msgstr "" "Вы выбрали логический том LVM в качестве корневого (/).\n" -"Загрузчик не сможет управлять им, если том распределён по физическим " -"разделам.\n" +"Загрузчик не сможет управлять им, если том распределён по физическим разделам.\n" "Вам следует сначала создать отдельный раздел /boot" -#: fsedit.pm:475 fsedit.pm:477 +#: fsedit.pm:475 +#: fsedit.pm:477 #, c-format msgid "This directory should remain within the root filesystem" msgstr "Этот каталог должен оставаться в пределах корневой файловой системы" -#: fsedit.pm:479 fsedit.pm:481 fsedit.pm:483 +#: fsedit.pm:479 +#: fsedit.pm:481 +#: fsedit.pm:483 #, c-format -msgid "" -"You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount " -"point\n" +msgid "You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n" msgstr "" "Для этой точки монтирования требуется реальная файловая система\n" "(ext2/3/4, reiserfs, xfs или jfs)\n" @@ -3245,12 +3294,8 @@ msgstr "Альтернативный драйвер отсутствует" #: harddrake/sound.pm:355 #, c-format -msgid "" -"There's no known OSS/ALSA alternative driver for your sound card (%s) which " -"currently uses \"%s\"" -msgstr "" -"Для данной звуковой карты (%s) отсутствует альтернативный драйвер OSS/ALSA, " -"которая в данный момент использует «%s»" +msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"" +msgstr "Для данной звуковой карты (%s) отсутствует альтернативный драйвер OSS/ALSA, которая в данный момент использует «%s»" #: harddrake/sound.pm:362 #, c-format @@ -3259,14 +3304,10 @@ msgstr "Настройка звука" #: harddrake/sound.pm:364 #, c-format -msgid "" -"Here you can select an alternative driver (either OSS or ALSA) for your " -"sound card (%s)." -msgstr "" -"Здесь можно выбрать альтернативный драйвер (OSS или ALSA) для звуковой карты " -"(%s)" +msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)." +msgstr "Здесь можно выбрать альтернативный драйвер (OSS или ALSA) для звуковой карты (%s)" -#. -PO: here the first %s is either "OSS" or "ALSA", +#. -PO: here the first %s is either "OSS" or "ALSA", #. -PO: the second %s is the name of the current driver #. -PO: and the third %s is the name of the default driver #: harddrake/sound.pm:369 @@ -3274,50 +3315,40 @@ msgstr "" msgid "" "\n" "\n" -"Your card currently uses the %s\"%s\" driver (the default driver for your " -"card is \"%s\")" +"Your card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")" msgstr "" "\n" "\n" -"В настоящий момент для карты используется драйвер %s\"%s\" (драйвером по " -"умолчанию является \"%s\")" +"В настоящий момент для карты используется драйвер %s\"%s\" (драйвером по умолчанию является \"%s\")" #: harddrake/sound.pm:371 #, c-format msgid "" -"OSS (Open Sound System) was the first sound API. It's an OS independent " -"sound API (it's available on most UNIX(tm) systems) but it's a very basic " -"and limited API.\n" +"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" "What's more, OSS drivers all reinvent the wheel.\n" "\n" -"ALSA (Advanced Linux Sound Architecture) is a modularized architecture " -"which\n" +"ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n" "supports quite a large range of ISA, USB and PCI cards.\n" "\n" "It also provides a much higher API than OSS.\n" "\n" "To use alsa, one can either use:\n" "- the old compatibility OSS API\n" -"- the new ALSA API that provides many enhanced features but requires using " -"the ALSA library.\n" +"- the new ALSA API that provides many enhanced features but requires using the ALSA library.\n" msgstr "" -"OSS (открытая звуковая система) была первой звуковой API. Она является " -"звуковой API, не зависящей от ОС (доступна на большинстве UNIX-системах), но " -"она все-таки очень простая и ограниченная API.\n" +"OSS (открытая звуковая система) была первой звуковой API. Она является звуковой API, не зависящей от ОС (доступна на большинстве UNIX-системах), но она все-таки очень простая и ограниченная API.\n" "Куда уж больше, все драйверы OSS и так заново открывают колесо.\n" "\n" -"ALSA (расширенная звуковая архитектура Linux) представляет собой модульную " -"архитектуру, которая поддерживает довольно широкий диапазон ISA, USB и PCI-" -"карт.\n" +"ALSA (расширенная звуковая архитектура Linux) представляет собой модульную архитектуру, которая поддерживает довольно широкий диапазон ISA, USB и PCI-карт.\n" "\n" "Она также предоставляет значительно большую API, чем OSS.\n" "\n" "Для поддержки alsa можно использовать:\n" "- старую API, совместимую с OSS\n" -"- новую API ALSA, предоставляющую много расширенных возможностей, но " -"требующую библиотеку ALSA.\n" +"- новую API ALSA, предоставляющую много расширенных возможностей, но требующую библиотеку ALSA.\n" -#: harddrake/sound.pm:385 harddrake/sound.pm:487 +#: harddrake/sound.pm:385 +#: harddrake/sound.pm:487 #, c-format msgid "Driver:" msgstr "Драйвер:" @@ -3331,78 +3362,56 @@ msgstr "Решение проблем со звуком" #: harddrake/sound.pm:430 #, c-format msgid "" -"Below are some basic tips to help debug audio problems, but for accurate and " -"up-to-date tips and tricks, please see:\n" +"Below are some basic tips to help debug audio problems, but for accurate and up-to-date tips and tricks, please see:\n" "\n" "https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" "\n" "\n" "\n" -"- General Recommendation: Enable PulseAudio. If you have opted to not to use " -"PulseAudio, we would strongly advise you enable it. For the vast majority of " -"desktop use cases, PulseAudio is the recommended and best supported option.\n" +"- General Recommendation: Enable PulseAudio. If you have opted to not to use PulseAudio, we would strongly advise you enable it. For the vast majority of desktop use cases, PulseAudio is the recommended and best supported option.\n" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol" -"\" (generic) will launch graphical applications to allow you to view your " -"sound devices and adjust volume levels\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol\" (generic) will launch graphical applications to allow you to view your sound devices and adjust volume levels\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n" "\n" "\n" -"- \"pactl stat\" will check that you can connect to the PulseAudio daemon " -"correctly.\n" +"- \"pactl stat\" will check that you can connect to the PulseAudio daemon correctly.\n" "\n" "\n" -"- \"pactl list sink-inputs\" will tell you which programs are currently " -"playing sound via PulseAudio.\n" +"- \"pactl list sink-inputs\" will tell you which programs are currently playing sound via PulseAudio.\n" "\n" "\n" -"- \"systemctl status osspd.service\" will tell you the current state of the " -"OSS Proxy Daemon. This is used to enable sound from legacy applications " -"which use the OSS sound API. You should install the \"ossp\" package if you " -"need this functionality.\n" +"- \"systemctl status osspd.service\" will tell you the current state of the OSS Proxy Daemon. This is used to enable sound from legacy applications which use the OSS sound API. You should install the \"ossp\" package if you need this functionality.\n" "\n" "\n" -"- \"pacmd ls\" will give you a LOT of debug information about the current " -"state of your audio.\n" +"- \"pacmd ls\" will give you a LOT of debug information about the current state of your audio.\n" "\n" "\n" -"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver " -"your card uses by default.\n" +"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver your card uses by default.\n" "\n" "\n" -"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound " -"related kernel modules (drivers) are loaded.\n" +"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound related kernel modules (drivers) are loaded.\n" "\n" "\n" -"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA " -"mixer controls for first sound card\n" +"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA mixer controls for first sound card\n" "\n" "\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are " -"currently using the sound card directly (normally this should only show " -"PulseAudio)\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are currently using the sound card directly (normally this should only show PulseAudio)\n" msgstr "" -"Ниже приведены несколько простых советов, чтобы помочь отладить проблемы со " -"звуком, но для точных и актуальных советов и рекомендаций см..:\n" +"Ниже приведены несколько простых советов, чтобы помочь отладить проблемы со звуком, но для точных и актуальных советов и рекомендаций см..:\n" "\n" "https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" "\n" "\n" "\n" -"- Общая рекомендация: Включить PulseAudio. Если вы решили не использовать " -"PulseAudio, мы настоятельно советуем вам его включить. Для подавляющего " -"большинства вариантов использования, PulseAudio является рекомендуемым и " -"лучше поддерживается.\n" +"- Общая рекомендация: Включить PulseAudio. Если вы решили не использовать PulseAudio, мы настоятельно советуем вам его включить. Для подавляющего большинства вариантов использования, PulseAudio является рекомендуемым и лучше поддерживается.\n" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol" -"\" (generic) запустит графические приложения, чтобы позволить вам " -"просматривать ваши звуковые устройства и настраивать уровни громкости\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol\" (generic) запустит графические приложения, чтобы позволить вам просматривать ваши звуковые устройства и настраивать уровни громкости\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" проверить работает ли PulseAudio в системе.\n" @@ -3411,35 +3420,25 @@ msgstr "" "- \"pactl stat\" проверка соединения к службе PulseAudio.\n" "\n" "\n" -"- \"pactl list sink-inputs\" покажет вам, какие программы в настоящее время " -"проигрывают звук через PulseAudio.\n" +"- \"pactl list sink-inputs\" покажет вам, какие программы в настоящее время проигрывают звук через PulseAudio.\n" "\n" "\n" -"- \"systemctl status osspd.service\" скажет вам текущее состояние демона " -"OSS. Это используется, для того чтобы включить звук из унаследованных " -"приложений, которые используют звук OSS API. Вы должны установить \"ossp\" " -"пакет, если вам нужна эта функциональность.\n" +"- \"systemctl status osspd.service\" скажет вам текущее состояние демона OSS. Это используется, для того чтобы включить звук из унаследованных приложений, которые используют звук OSS API. Вы должны установить \"ossp\" пакет, если вам нужна эта функциональность.\n" "\n" "\n" -"- \"pacmd ls\" даст вам много отладочной информации о текущем состоянии " -"вашего аудио устройства.\n" +"- \"pacmd ls\" даст вам много отладочной информации о текущем состоянии вашего аудио устройства.\n" "\n" "\n" -"- \"lspcidrake -v | grep -i audio\" покажет вам, какой драйвер низкого " -"уровня вашей карты используется по умолчанию.\n" +"- \"lspcidrake -v | grep -i audio\" покажет вам, какой драйвер низкого уровня вашей карты используется по умолчанию.\n" "\n" "\n" -"- \"/usr/sbin/lsmod | grep snd\" позволит вам проверить, какие связанные " -"модули ядра (драйверы) для звука загружаются.\n" +"- \"/usr/sbin/lsmod | grep snd\" позволит вам проверить, какие связанные модули ядра (драйверы) для звука загружаются.\n" "\n" "\n" -"- \"alsamixer -c 0\" предоставит вам псевдографическое управление микшером " -"ALSA для первой звуковой карты\n" +"- \"alsamixer -c 0\" предоставит вам псевдографическое управление микшером ALSA для первой звуковой карты\n" "\n" "\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" покажет, какие программы в " -"настоящее время используют звуковой карту напрямую (как правило, должно " -"показать только касаемо PulseAudio)\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" покажет, какие программы в настоящее время используют звуковой карту напрямую (как правило, должно показать только касаемо PulseAudio)\n" #: harddrake/sound.pm:476 #, c-format @@ -3455,14 +3454,12 @@ msgstr "Выбор произвольного драйвера" #: harddrake/sound.pm:482 #, c-format msgid "" -"If you really think that you know which driver is the right one for your " -"card\n" +"If you really think that you know which driver is the right one for your card\n" "you can pick one from the above list.\n" "\n" "The current driver for your \"%s\" sound card is \"%s\" " msgstr "" -"Если вы действительно думаете, что сами знаете, какой драйвер является " -"верным\n" +"Если вы действительно думаете, что сами знаете, какой драйвер является верным\n" "для вашей карты, вы можете выбрать его из списка сверху.\n" "\n" "Текущим драйвером для вашей звуковой карты \"%s\" является \"%s\" " @@ -3472,7 +3469,9 @@ msgstr "" msgid "Auto-detect" msgstr "Автоопределение" -#: harddrake/v4l.pm:97 harddrake/v4l.pm:285 harddrake/v4l.pm:337 +#: harddrake/v4l.pm:97 +#: harddrake/v4l.pm:285 +#: harddrake/v4l.pm:337 #, c-format msgid "Unknown|Generic" msgstr "Неизвестный|Обычный" @@ -3490,16 +3489,11 @@ msgstr "Неизвестный|CPH06X (bt878) [большинство произ #: harddrake/v4l.pm:475 #, c-format msgid "" -"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-" -"detect the rights parameters.\n" -"If your card is misdetected, you can force the right tuner and card types " -"here. Just select your TV card parameters if needed." +"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" +"If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed." msgstr "" -"Для большинства современных ТВ-карт модуль bttv ядра GNU/Linux просто " -"автоматически определит правильные параметры.\n" -"Если ваша карта не определилась, то здесь вы можете принудительно включить " -"использование правильных типов тюнера и карты. Если необходимо, просто " -"выберите параметры своей ТВ-карты" +"Для большинства современных ТВ-карт модуль bttv ядра GNU/Linux просто автоматически определит правильные параметры.\n" +"Если ваша карта не определилась, то здесь вы можете принудительно включить использование правильных типов тюнера и карты. Если необходимо, просто выберите параметры своей ТВ-карты" #: harddrake/v4l.pm:478 #, c-format @@ -3511,20 +3505,35 @@ msgstr "Модель карты :" msgid "Tuner type:" msgstr "Тип тюнера :" -#: interactive.pm:129 interactive.pm:550 interactive/curses.pm:270 -#: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39 -#: interactive/stdio.pm:148 interactive/stdio.pm:149 mygtk2.pm:846 -#: ugtk2.pm:421 ugtk2.pm:519 ugtk2.pm:812 ugtk2.pm:835 +#: interactive.pm:129 +#: interactive.pm:550 +#: interactive/curses.pm:270 +#: interactive/http.pm:103 +#: interactive/http.pm:156 +#: interactive/stdio.pm:39 +#: interactive/stdio.pm:148 +#: interactive/stdio.pm:149 +#: mygtk2.pm:846 +#: ugtk2.pm:421 +#: ugtk2.pm:519 +#: ugtk2.pm:812 +#: ugtk2.pm:835 #, c-format msgid "Ok" msgstr "ОК" -#: interactive.pm:229 modules/interactive.pm:72 ugtk2.pm:811 wizards.pm:157 +#: interactive.pm:229 +#: modules/interactive.pm:72 +#: ugtk2.pm:811 +#: wizards.pm:157 #, c-format msgid "Yes" msgstr "Да" -#: interactive.pm:229 modules/interactive.pm:72 ugtk2.pm:811 wizards.pm:157 +#: interactive.pm:229 +#: modules/interactive.pm:72 +#: ugtk2.pm:811 +#: wizards.pm:157 #, c-format msgid "No" msgstr "Нет" @@ -3534,42 +3543,52 @@ msgstr "Нет" msgid "Choose a file" msgstr "Выберите файл" -#: interactive.pm:388 interactive/gtk.pm:457 +#: interactive.pm:388 +#: interactive/gtk.pm:457 #, c-format msgid "Add" msgstr "Добавить" -#: interactive.pm:388 interactive/gtk.pm:457 +#: interactive.pm:388 +#: interactive/gtk.pm:457 #, c-format msgid "Modify" msgstr "Изменить" -#: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519 +#: interactive.pm:550 +#: interactive/curses.pm:270 +#: ugtk2.pm:519 #, c-format msgid "Finish" msgstr "Завершить" -#: interactive.pm:551 interactive/curses.pm:267 ugtk2.pm:517 +#: interactive.pm:551 +#: interactive/curses.pm:267 +#: ugtk2.pm:517 #, c-format msgid "Previous" msgstr "Назад" -#: interactive/curses.pm:576 ugtk2.pm:872 +#: interactive/curses.pm:576 +#: ugtk2.pm:872 #, c-format msgid "No file chosen" msgstr "Файлы не выбраны" -#: interactive/curses.pm:580 ugtk2.pm:876 +#: interactive/curses.pm:580 +#: ugtk2.pm:876 #, c-format msgid "You have chosen a directory, not a file" msgstr "Вы указали каталог, а не файл" -#: interactive/curses.pm:582 ugtk2.pm:878 +#: interactive/curses.pm:582 +#: ugtk2.pm:878 #, c-format msgid "No such directory" msgstr "Нет такого каталога" -#: interactive/curses.pm:582 ugtk2.pm:878 +#: interactive/curses.pm:582 +#: ugtk2.pm:878 #, c-format msgid "No such file" msgstr "Нет такого файла" @@ -3579,12 +3598,14 @@ msgstr "Нет такого файла" msgid "Beware, Caps Lock is enabled" msgstr "Обратите внимание, CapsLock включен" -#: interactive/stdio.pm:29 interactive/stdio.pm:154 +#: interactive/stdio.pm:29 +#: interactive/stdio.pm:154 #, c-format msgid "Bad choice, try again\n" msgstr "Неудачный выбор, попробуйте еще раз\n" -#: interactive/stdio.pm:30 interactive/stdio.pm:155 +#: interactive/stdio.pm:30 +#: interactive/stdio.pm:155 #, c-format msgid "Your choice? (default %s) " msgstr "Что вы выбираете? (по умолчанию %s) " @@ -3666,7 +3687,8 @@ msgstr "default:LTR" msgid "Andorra" msgstr "Андорра" -#: lang.pm:221 timezone.pm:228 +#: lang.pm:221 +#: timezone.pm:228 #, c-format msgid "United Arab Emirates" msgstr "Объединенные арабские Эмираты" @@ -3711,7 +3733,8 @@ msgstr "Ангола" msgid "Antarctica" msgstr "Антарктика" -#: lang.pm:230 timezone.pm:273 +#: lang.pm:230 +#: timezone.pm:273 #, c-format msgid "Argentina" msgstr "Аргентина" @@ -3721,12 +3744,16 @@ msgstr "Аргентина" msgid "American Samoa" msgstr "Американские Самоа" -#: lang.pm:232 mirror.pm:12 timezone.pm:231 +#: lang.pm:232 +#: mirror.pm:12 +#: timezone.pm:231 #, c-format msgid "Austria" msgstr "Австрия" -#: lang.pm:233 mirror.pm:11 timezone.pm:269 +#: lang.pm:233 +#: mirror.pm:11 +#: timezone.pm:269 #, c-format msgid "Australia" msgstr "Австралия" @@ -3751,12 +3778,15 @@ msgstr "Босния и Герцеговина" msgid "Barbados" msgstr "Барбадос" -#: lang.pm:238 timezone.pm:213 +#: lang.pm:238 +#: timezone.pm:213 #, c-format msgid "Bangladesh" msgstr "Бангладеш" -#: lang.pm:239 mirror.pm:13 timezone.pm:233 +#: lang.pm:239 +#: mirror.pm:13 +#: timezone.pm:233 #, c-format msgid "Belgium" msgstr "Бельгия" @@ -3766,7 +3796,8 @@ msgstr "Бельгия" msgid "Burkina Faso" msgstr "Буркина-Фасо" -#: lang.pm:241 timezone.pm:234 +#: lang.pm:241 +#: timezone.pm:234 #, c-format msgid "Bulgaria" msgstr "Болгария" @@ -3801,7 +3832,9 @@ msgstr "Бруней Даруссалам" msgid "Bolivia" msgstr "Боливия" -#: lang.pm:248 mirror.pm:14 timezone.pm:274 +#: lang.pm:248 +#: mirror.pm:14 +#: timezone.pm:274 #, c-format msgid "Brazil" msgstr "Бразилия" @@ -3826,7 +3859,8 @@ msgstr "Остров Буве" msgid "Botswana" msgstr "Ботсвана" -#: lang.pm:253 timezone.pm:232 +#: lang.pm:253 +#: timezone.pm:232 #, c-format msgid "Belarus" msgstr "Беларусь" @@ -3836,7 +3870,9 @@ msgstr "Беларусь" msgid "Belize" msgstr "Белиз" -#: lang.pm:255 mirror.pm:15 timezone.pm:263 +#: lang.pm:255 +#: mirror.pm:15 +#: timezone.pm:263 #, c-format msgid "Canada" msgstr "Канада" @@ -3861,7 +3897,9 @@ msgstr "Центрально-африканская республика" msgid "Congo (Brazzaville)" msgstr "Конго (Brazzaville)" -#: lang.pm:260 mirror.pm:39 timezone.pm:257 +#: lang.pm:260 +#: mirror.pm:39 +#: timezone.pm:257 #, c-format msgid "Switzerland" msgstr "Швейцария" @@ -3876,7 +3914,8 @@ msgstr "Кот-д'Ивуар" msgid "Cook Islands" msgstr "Острова Кука" -#: lang.pm:263 timezone.pm:275 +#: lang.pm:263 +#: timezone.pm:275 #, c-format msgid "Chile" msgstr "Чили" @@ -3886,7 +3925,8 @@ msgstr "Чили" msgid "Cameroon" msgstr "Камерун" -#: lang.pm:265 timezone.pm:214 +#: lang.pm:265 +#: timezone.pm:214 #, c-format msgid "China" msgstr "Китай" @@ -3896,7 +3936,8 @@ msgstr "Китай" msgid "Colombia" msgstr "Колумбия" -#: lang.pm:267 mirror.pm:16 +#: lang.pm:267 +#: mirror.pm:16 #, c-format msgid "Costa Rica" msgstr "Коста-Рика" @@ -3926,12 +3967,16 @@ msgstr "Остров Рождества" msgid "Cyprus" msgstr "Кипр" -#: lang.pm:273 mirror.pm:17 timezone.pm:235 +#: lang.pm:273 +#: mirror.pm:17 +#: timezone.pm:235 #, c-format msgid "Czech Republic" msgstr "Чешская Республика" -#: lang.pm:274 mirror.pm:22 timezone.pm:240 +#: lang.pm:274 +#: mirror.pm:22 +#: timezone.pm:240 #, c-format msgid "Germany" msgstr "Германия" @@ -3941,7 +3986,9 @@ msgstr "Германия" msgid "Djibouti" msgstr "Джибути" -#: lang.pm:276 mirror.pm:18 timezone.pm:236 +#: lang.pm:276 +#: mirror.pm:18 +#: timezone.pm:236 #, c-format msgid "Denmark" msgstr "Дания" @@ -3966,7 +4013,9 @@ msgstr "Алжир" msgid "Ecuador" msgstr "Эквадор" -#: lang.pm:281 mirror.pm:19 timezone.pm:237 +#: lang.pm:281 +#: mirror.pm:19 +#: timezone.pm:237 #, c-format msgid "Estonia" msgstr "Эстония" @@ -3986,7 +4035,9 @@ msgstr "Западная Сахара" msgid "Eritrea" msgstr "Эритрея" -#: lang.pm:285 mirror.pm:37 timezone.pm:255 +#: lang.pm:285 +#: mirror.pm:37 +#: timezone.pm:255 #, c-format msgid "Spain" msgstr "Испания" @@ -3996,7 +4047,9 @@ msgstr "Испания" msgid "Ethiopia" msgstr "Эфиопия" -#: lang.pm:287 mirror.pm:20 timezone.pm:238 +#: lang.pm:287 +#: mirror.pm:20 +#: timezone.pm:238 #, c-format msgid "Finland" msgstr "Финляндия" @@ -4021,7 +4074,9 @@ msgstr "Микронезия" msgid "Faroe Islands" msgstr "Фарерские острова" -#: lang.pm:292 mirror.pm:21 timezone.pm:239 +#: lang.pm:292 +#: mirror.pm:21 +#: timezone.pm:239 #, c-format msgid "France" msgstr "Франция" @@ -4031,7 +4086,8 @@ msgstr "Франция" msgid "Gabon" msgstr "Габон" -#: lang.pm:294 timezone.pm:259 +#: lang.pm:294 +#: timezone.pm:259 #, c-format msgid "United Kingdom" msgstr "Объединенное Королевство" @@ -4086,7 +4142,9 @@ msgstr "Гваделупа" msgid "Equatorial Guinea" msgstr "Экваториальная Гвинея" -#: lang.pm:305 mirror.pm:23 timezone.pm:241 +#: lang.pm:305 +#: mirror.pm:23 +#: timezone.pm:241 #, c-format msgid "Greece" msgstr "Греция" @@ -4096,7 +4154,8 @@ msgstr "Греция" msgid "South Georgia and the South Sandwich Islands" msgstr "Южная Джорджия и Южные Сандвичевы острова " -#: lang.pm:307 timezone.pm:264 +#: lang.pm:307 +#: timezone.pm:264 #, c-format msgid "Guatemala" msgstr "Гватемала" @@ -4141,27 +4200,35 @@ msgstr "Хорватия" msgid "Haiti" msgstr "Гаити" -#: lang.pm:316 mirror.pm:24 timezone.pm:242 +#: lang.pm:316 +#: mirror.pm:24 +#: timezone.pm:242 #, c-format msgid "Hungary" msgstr "Венгрия" -#: lang.pm:317 timezone.pm:217 +#: lang.pm:317 +#: timezone.pm:217 #, c-format msgid "Indonesia" msgstr "Индонезия" -#: lang.pm:318 mirror.pm:25 timezone.pm:243 +#: lang.pm:318 +#: mirror.pm:25 +#: timezone.pm:243 #, c-format msgid "Ireland" msgstr "Ирландия" -#: lang.pm:319 mirror.pm:26 timezone.pm:219 +#: lang.pm:319 +#: mirror.pm:26 +#: timezone.pm:219 #, c-format msgid "Israel" msgstr "Израиль" -#: lang.pm:320 timezone.pm:216 +#: lang.pm:320 +#: timezone.pm:216 #, c-format msgid "India" msgstr "Индия" @@ -4176,7 +4243,8 @@ msgstr "Британская территория Индийского океа msgid "Iraq" msgstr "Ирак" -#: lang.pm:323 timezone.pm:218 +#: lang.pm:323 +#: timezone.pm:218 #, c-format msgid "Iran" msgstr "Иран" @@ -4186,7 +4254,9 @@ msgstr "Иран" msgid "Iceland" msgstr "Исландия" -#: lang.pm:325 mirror.pm:27 timezone.pm:244 +#: lang.pm:325 +#: mirror.pm:27 +#: timezone.pm:244 #, c-format msgid "Italy" msgstr "Италия" @@ -4201,7 +4271,9 @@ msgstr "Ямайка" msgid "Jordan" msgstr "Иордания" -#: lang.pm:328 mirror.pm:28 timezone.pm:220 +#: lang.pm:328 +#: mirror.pm:28 +#: timezone.pm:220 #, c-format msgid "Japan" msgstr "Япония" @@ -4241,7 +4313,8 @@ msgstr "Сент-Китс и Невис" msgid "Korea (North)" msgstr "Корея (Северная)" -#: lang.pm:336 timezone.pm:221 +#: lang.pm:336 +#: timezone.pm:221 #, c-format msgid "Korea" msgstr "Корея" @@ -4296,12 +4369,14 @@ msgstr "Либерия" msgid "Lesotho" msgstr "Лесото" -#: lang.pm:347 timezone.pm:245 +#: lang.pm:347 +#: timezone.pm:245 #, c-format msgid "Lithuania" msgstr "Литва" -#: lang.pm:348 timezone.pm:246 +#: lang.pm:348 +#: timezone.pm:246 #, c-format msgid "Luxembourg" msgstr "Люксембург" @@ -4401,12 +4476,14 @@ msgstr "Мальдивы" msgid "Malawi" msgstr "Малави" -#: lang.pm:368 timezone.pm:265 +#: lang.pm:368 +#: timezone.pm:265 #, c-format msgid "Mexico" msgstr "Мексика" -#: lang.pm:369 timezone.pm:222 +#: lang.pm:369 +#: timezone.pm:222 #, c-format msgid "Malaysia" msgstr "Малайзия" @@ -4446,12 +4523,16 @@ msgstr "Нигерия" msgid "Nicaragua" msgstr "Никарагуа" -#: lang.pm:377 mirror.pm:29 timezone.pm:247 +#: lang.pm:377 +#: mirror.pm:29 +#: timezone.pm:247 #, c-format msgid "Netherlands" msgstr "Нидерланды" -#: lang.pm:378 mirror.pm:31 timezone.pm:248 +#: lang.pm:378 +#: mirror.pm:31 +#: timezone.pm:248 #, c-format msgid "Norway" msgstr "Норвегия" @@ -4471,7 +4552,9 @@ msgstr "Науру" msgid "Niue" msgstr "Нью" -#: lang.pm:382 mirror.pm:30 timezone.pm:270 +#: lang.pm:382 +#: mirror.pm:30 +#: timezone.pm:270 #, c-format msgid "New Zealand" msgstr "Новая Зеландия" @@ -4501,7 +4584,8 @@ msgstr "Французская Полинезия" msgid "Papua New Guinea" msgstr "Папуа Новая Гвинея" -#: lang.pm:388 timezone.pm:223 +#: lang.pm:388 +#: timezone.pm:223 #, c-format msgid "Philippines" msgstr "Филиппины" @@ -4511,7 +4595,9 @@ msgstr "Филиппины" msgid "Pakistan" msgstr "Пакистан" -#: lang.pm:390 mirror.pm:32 timezone.pm:249 +#: lang.pm:390 +#: mirror.pm:32 +#: timezone.pm:249 #, c-format msgid "Poland" msgstr "Польша" @@ -4536,7 +4622,9 @@ msgstr "Пуэрто-Рико" msgid "Palestine" msgstr "Палестина" -#: lang.pm:395 mirror.pm:33 timezone.pm:250 +#: lang.pm:395 +#: mirror.pm:33 +#: timezone.pm:250 #, c-format msgid "Portugal" msgstr "Португалия" @@ -4561,12 +4649,14 @@ msgstr "Катар" msgid "Reunion" msgstr "Реюньон" -#: lang.pm:400 timezone.pm:251 +#: lang.pm:400 +#: timezone.pm:251 #, c-format msgid "Romania" msgstr "Румыния" -#: lang.pm:401 mirror.pm:34 +#: lang.pm:401 +#: mirror.pm:34 #, c-format msgid "Russia" msgstr "Россия" @@ -4596,12 +4686,15 @@ msgstr "Сейшельские Острова" msgid "Sudan" msgstr "Судан" -#: lang.pm:407 mirror.pm:38 timezone.pm:256 +#: lang.pm:407 +#: mirror.pm:38 +#: timezone.pm:256 #, c-format msgid "Sweden" msgstr "Швеция" -#: lang.pm:408 timezone.pm:224 +#: lang.pm:408 +#: timezone.pm:224 #, c-format msgid "Singapore" msgstr "Сингапур" @@ -4611,7 +4704,8 @@ msgstr "Сингапур" msgid "Saint Helena" msgstr "Святая Елена" -#: lang.pm:410 timezone.pm:254 +#: lang.pm:410 +#: timezone.pm:254 #, c-format msgid "Slovenia" msgstr "Словения" @@ -4621,7 +4715,9 @@ msgstr "Словения" msgid "Svalbard and Jan Mayen Islands" msgstr "Свалбард и острова Яна Майена" -#: lang.pm:412 mirror.pm:35 timezone.pm:253 +#: lang.pm:412 +#: mirror.pm:35 +#: timezone.pm:253 #, c-format msgid "Slovakia" msgstr "Словакия" @@ -4691,7 +4787,9 @@ msgstr "Французские южные территории" msgid "Togo" msgstr "Того" -#: lang.pm:426 mirror.pm:41 timezone.pm:226 +#: lang.pm:426 +#: mirror.pm:41 +#: timezone.pm:226 #, c-format msgid "Thailand" msgstr "Тайланд" @@ -4726,7 +4824,8 @@ msgstr "Тунис" msgid "Tonga" msgstr "Тонга" -#: lang.pm:433 timezone.pm:227 +#: lang.pm:433 +#: timezone.pm:227 #, c-format msgid "Turkey" msgstr "Турция" @@ -4741,17 +4840,21 @@ msgstr "Тринидад и Тобаго" msgid "Tuvalu" msgstr "Тувалу" -#: lang.pm:436 mirror.pm:40 timezone.pm:225 +#: lang.pm:436 +#: mirror.pm:40 +#: timezone.pm:225 #, c-format msgid "Taiwan" msgstr "Тайвань" -#: lang.pm:437 timezone.pm:210 +#: lang.pm:437 +#: timezone.pm:210 #, c-format msgid "Tanzania" msgstr "Танзания" -#: lang.pm:438 timezone.pm:258 +#: lang.pm:438 +#: timezone.pm:258 #, c-format msgid "Ukraine" msgstr "Украина" @@ -4766,7 +4869,9 @@ msgstr "Уганда" msgid "United States Minor Outlying Islands" msgstr "Соединенные штаты Малых Удаленных островов" -#: lang.pm:441 mirror.pm:42 timezone.pm:266 +#: lang.pm:441 +#: mirror.pm:42 +#: timezone.pm:266 #, c-format msgid "United States" msgstr "Соединенные Штаты" @@ -4836,7 +4941,9 @@ msgstr "Йемен" msgid "Mayotte" msgstr "Майот" -#: lang.pm:455 mirror.pm:36 timezone.pm:209 +#: lang.pm:455 +#: mirror.pm:36 +#: timezone.pm:209 #, c-format msgid "South Africa" msgstr "Южная Африка" @@ -4859,9 +4966,7 @@ msgstr "Добро пожаловать в %s" #: lvm.pm:92 #, c-format msgid "Moving used physical extents to other physical volumes failed" -msgstr "" -"Перемещение используемых физических областей на другой физический раздел не " -"удалось" +msgstr "Перемещение используемых физических областей на другой физический раздел не удалось" #: lvm.pm:152 #, c-format @@ -4876,9 +4981,7 @@ msgstr "Сначала удалите логические тома\n" #: lvm.pm:205 #, c-format msgid "The bootloader can't handle /boot on multiple physical volumes" -msgstr "" -"Загрузчик не может работать с разделом /boot на нескольких физических " -"разделах" +msgstr "Загрузчик не может работать с разделом /boot на нескольких физических разделах" #. -PO: Only write something if needed: #: messages.pm:11 @@ -4894,24 +4997,16 @@ msgstr "Введение" #: messages.pm:20 #, c-format msgid "" -"The operating system and the different components available in the Mageia " -"distribution \n" -"shall be called the \"Software Products\" hereafter. The Software Products " -"include, but are not \n" -"restricted to, the set of programs, methods, rules and documentation related " -"to the operating \n" -"system and the different components of the Mageia distribution, and any " -"applications \n" +"The operating system and the different components available in the Mageia distribution \n" +"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n" +"restricted to, the set of programs, methods, rules and documentation related to the operating \n" +"system and the different components of the Mageia distribution, and any applications \n" "distributed with these products provided by Mageia's licensors or suppliers." msgstr "" -"Операционная система и различные компоненты, доступные в дистрибутиве Mageia " -"Linux, далее будут \n" -"называться «Программными Продуктами». Программные Продукты включают (но не " -"ограничиваются) \n" -"программы, методы, правила и документацию, связанные с операционной системой " -"и различными \n" -"компонентами дистрибутива Mageia и любыми приложениями, распространяемыми с " -"этими \n" +"Операционная система и различные компоненты, доступные в дистрибутиве Mageia Linux, далее будут \n" +"называться «Программными Продуктами». Программные Продукты включают (но не ограничиваются) \n" +"программы, методы, правила и документацию, связанные с операционной системой и различными \n" +"компонентами дистрибутива Mageia и любыми приложениями, распространяемыми с этими \n" "продуктами лицензиарами или поставщиками компании Mageia." #: messages.pm:27 @@ -4922,43 +5017,28 @@ msgstr "1. Лицензионное соглашение" #: messages.pm:29 #, c-format msgid "" -"Please read this document carefully. This document is a license agreement " -"between you and \n" +"Please read this document carefully. This document is a license agreement between you and \n" "Mageia which applies to the Software Products.\n" -"By installing, duplicating or using any of the Software Products in any " -"manner, you explicitly \n" -"accept and fully agree to conform to the terms and conditions of this " -"License. \n" -"If you disagree with any portion of the License, you are not allowed to " -"install, duplicate or use \n" +"By installing, duplicating or using any of the Software Products in any manner, you explicitly \n" +"accept and fully agree to conform to the terms and conditions of this License. \n" +"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n" "the Software Products. \n" -"Any attempt to install, duplicate or use the Software Products in a manner " -"which does not comply \n" -"with the terms and conditions of this License is void and will terminate " -"your rights under this \n" -"License. Upon termination of the License, you must immediately destroy all " -"copies of the \n" +"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n" +"with the terms and conditions of this License is void and will terminate your rights under this \n" +"License. Upon termination of the License, you must immediately destroy all copies of the \n" "Software Products." msgstr "" "Внимательно прочтите данный документ. Этот документ является лицензионным \n" "соглашением, заключаемым между вами и компанией Mageia, применительно к \n" -"Программным Продуктам. Устанавливая, тиражируя или используя Программные " -"Продукты \n" -"в любых других целях, вы явным образом принимаете и полностью соглашаетесь " -"с \n" -"условиями и положениями данной Лицензии. Если вы не согласны с какой-либо " -"частью данной \n" -"Лицензии, вам не разрешается устанавливать, тиражировать или использовать " -"Программные \n" +"Программным Продуктам. Устанавливая, тиражируя или используя Программные Продукты \n" +"в любых других целях, вы явным образом принимаете и полностью соглашаетесь с \n" +"условиями и положениями данной Лицензии. Если вы не согласны с какой-либо частью данной \n" +"Лицензии, вам не разрешается устанавливать, тиражировать или использовать Программные \n" "Продукты.\n" -"Любые попытки использовать, тиражировать или использовать Программные " -"Продукты \n" -"способом, противоречащим условиям данной Лицензии, являются " -"аннулированием, \n" -"и освобождают вас от всех прав, предоставляемых данной Лицензией. При " -"прекращении \n" -"действия Лицензии вы должны немедленно удалить все копии Программных " -"Продуктов." +"Любые попытки использовать, тиражировать или использовать Программные Продукты \n" +"способом, противоречащим условиям данной Лицензии, являются аннулированием, \n" +"и освобождают вас от всех прав, предоставляемых данной Лицензией. При прекращении \n" +"действия Лицензии вы должны немедленно удалить все копии Программных Продуктов." #: messages.pm:41 #, c-format @@ -4969,87 +5049,52 @@ msgstr "2. Ограниченные гарантийные обязательс #: messages.pm:44 #, c-format msgid "" -"The Software Products and attached documentation are provided \"as is\", " -"with no warranty, to the \n" +"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n" "extent permitted by law.\n" -"Neither Mageia nor its licensors or suppliers will, in any circumstances and " -"to the extent \n" -"permitted by law, be liable for any special, incidental, direct or indirect " -"damages whatsoever \n" -"(including without limitation damages for loss of business, interruption of " -"business, financial \n" -"loss, legal fees and penalties resulting from a court judgment, or any other " -"consequential loss) \n" -"arising out of the use or inability to use the Software Products, even if " -"Mageia or its \n" -"licensors or suppliers have been advised of the possibility or occurrence of " -"such damages.\n" -"\n" -"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME " -"COUNTRIES\n" -"\n" -"To the extent permitted by law, neither Mageia nor its licensors, suppliers " -"or\n" -"distributors will, in any circumstances, be liable for any special, " -"incidental, direct or indirect \n" -"damages whatsoever (including without limitation damages for loss of " -"business, interruption of \n" -"business, financial loss, legal fees and penalties resulting from a court " -"judgment, or any \n" -"other consequential loss) arising out of the possession and use of software " -"components or \n" -"arising out of downloading software components from one of Mageia sites " -"which are \n" +"Neither Mageia nor its licensors or suppliers will, in any circumstances and to the extent \n" +"permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever \n" +"(including without limitation damages for loss of business, interruption of business, financial \n" +"loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) \n" +"arising out of the use or inability to use the Software Products, even if Mageia or its \n" +"licensors or suppliers have been advised of the possibility or occurrence of such damages.\n" +"\n" +"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n" +"\n" +"To the extent permitted by law, neither Mageia nor its licensors, suppliers or\n" +"distributors will, in any circumstances, be liable for any special, incidental, direct or indirect \n" +"damages whatsoever (including without limitation damages for loss of business, interruption of \n" +"business, financial loss, legal fees and penalties resulting from a court judgment, or any \n" +"other consequential loss) arising out of the possession and use of software components or \n" +"arising out of downloading software components from one of Mageia sites which are \n" "prohibited or restricted in some countries by local laws.\n" -"This limited liability applies to, but is not restricted to, the strong " -"cryptography components \n" +"This limited liability applies to, but is not restricted to, the strong cryptography components \n" "included in the Software Products.\n" -"However, because some jurisdictions do not allow the exclusion or limitation " -"of liability for \n" -"consequential or incidental damages, the above limitation may not apply to " -"you." +"However, because some jurisdictions do not allow the exclusion or limitation of liability for \n" +"consequential or incidental damages, the above limitation may not apply to you." msgstr "" -"Программные Продукты и прилагаемая документация предоставляются «как есть», " -"без какой-либо \n" +"Программные Продукты и прилагаемая документация предоставляются «как есть», без какой-либо \n" "гарантии, в пределах, дозволенных законом.\n" -"Ни компания Mageia, ни её лицензиары ни при каких условиях и в пределах, " -"дозволенных \n" -"законом, не несут ответственности за какие-либо специальные, случайные, " -"прямые или косвенные убытки \n" -"(включая неограниченные убытки от потери бизнеса, прерывания коммерческой " -"деятельности, финансовых \n" -"потерь, судебных издержек и штрафов, являющихся результатом судебного " -"решения, или любых других \n" -"косвенных потерь), являющихся результатом использования Программных " -"Продуктов, даже, если компании \n" -"Mageia или её лицензиарам было известно о возможности или случаях такого " -"ущерба.\n" -"\n" -"ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ " -"ЗАПРЕЩЁННОГО ПРОГРАММНОГО \n" +"Ни компания Mageia, ни её лицензиары ни при каких условиях и в пределах, дозволенных \n" +"законом, не несут ответственности за какие-либо специальные, случайные, прямые или косвенные убытки \n" +"(включая неограниченные убытки от потери бизнеса, прерывания коммерческой деятельности, финансовых \n" +"потерь, судебных издержек и штрафов, являющихся результатом судебного решения, или любых других \n" +"косвенных потерь), являющихся результатом использования Программных Продуктов, даже, если компании \n" +"Mageia или её лицензиарам было известно о возможности или случаях такого ущерба.\n" +"\n" +"ОГРАНИЧЕННАЯ ОТВЕТСТВЕННОСТЬ, СВЯЗАННАЯ С ВЛАДЕНИЕМ ИЛИ ИСПОЛЬЗОВАНИЕМ ЗАПРЕЩЁННОГО ПРОГРАММНОГО \n" "ОБЕСПЕЧЕНИЯ В НЕКОТОРЫХ СТРАНАХ\n" "\n" -"В пределах, дозволенных законом, ни компания Mageia, ни её лицензиары, " -"поставщики \n" -"или распространители ни при каких условиях не несут ответственности за какие-" -"либо специальные, \n" -"случайные, прямые или косвенные убытки (включая неограниченные убытки от " -"потери бизнеса, прерывания \n" -"коммерческой деятельности, финансовых потерь, судебных издержек и штрафов, " -"являющихся результатом \n" -"судебного решения, или любых других косвенных потерь), связанных с " -"владением, использованием \n" -"или загрузкой программных компонентов с одного из веб-сайтов Mageia, на " -"которые наложен \n" -"запрет или ограничение в некоторых странах согласно местному " -"законодательству.\n" -"Данная ограниченная ответственность применяется, но не ограничивается, к " -"компонентам усиленной \n" +"В пределах, дозволенных законом, ни компания Mageia, ни её лицензиары, поставщики \n" +"или распространители ни при каких условиях не несут ответственности за какие-либо специальные, \n" +"случайные, прямые или косвенные убытки (включая неограниченные убытки от потери бизнеса, прерывания \n" +"коммерческой деятельности, финансовых потерь, судебных издержек и штрафов, являющихся результатом \n" +"судебного решения, или любых других косвенных потерь), связанных с владением, использованием \n" +"или загрузкой программных компонентов с одного из веб-сайтов Mageia, на которые наложен \n" +"запрет или ограничение в некоторых странах согласно местному законодательству.\n" +"Данная ограниченная ответственность применяется, но не ограничивается, к компонентам усиленной \n" "криптографии, относящихся к Программным Продуктам.\n" -"Однако, поскольку в ряде юрисдикций не допускается исключение или " -"ограничение ответственности \n" -"за косвенные или случайные убытки, то указанные выше ограничения могут к вам " -"не относиться." +"Однако, поскольку в ряде юрисдикций не допускается исключение или ограничение ответственности \n" +"за косвенные или случайные убытки, то указанные выше ограничения могут к вам не относиться." #: messages.pm:68 #, c-format @@ -5059,34 +5104,22 @@ msgstr "3. Лицензия GPL и связанные лицензии" #: messages.pm:70 #, c-format msgid "" -"The Software Products consist of components created by different persons or " -"entities.\n" -"Most of these licenses allow you to use, duplicate, adapt or redistribute " -"the components which \n" -"they cover. Please read carefully the terms and conditions of the license " -"agreement for each component \n" -"before using any component. Any question on a component license should be " -"addressed to the component \n" +"The Software Products consist of components created by different persons or entities.\n" +"Most of these licenses allow you to use, duplicate, adapt or redistribute the components which \n" +"they cover. Please read carefully the terms and conditions of the license agreement for each component \n" +"before using any component. Any question on a component license should be addressed to the component \n" "licensor or supplier and not to Mageia.\n" -"The programs developed by Mageia are governed by the GPL License. " -"Documentation written \n" +"The programs developed by Mageia are governed by the GPL License. Documentation written \n" "by Mageia is governed by \"%s\" License." msgstr "" -"Программные Продукты состоят из компонентов, созданных различными людьми или " -"организациями.\n" -"Большинство этих лицензий позволяют вам использовать, тиражировать, " -"адаптировать \n" -"или перераспределять компоненты, на которые распространяется действие " -"лицензий. Перед \n" -"использованием какого-либо компонента внимательно прочтите положения и " -"условия лицензионного \n" -"соглашения для этого компонента. Любые вопросы относительно лицензии " -"компонента следует\n" +"Программные Продукты состоят из компонентов, созданных различными людьми или организациями.\n" +"Большинство этих лицензий позволяют вам использовать, тиражировать, адаптировать \n" +"или перераспределять компоненты, на которые распространяется действие лицензий. Перед \n" +"использованием какого-либо компонента внимательно прочтите положения и условия лицензионного \n" +"соглашения для этого компонента. Любые вопросы относительно лицензии компонента следует\n" "направлять разработчику компонента, а не компании Mageia.\n" -"На программы, разработанные компанией Mageia, распространяется действие " -"лицензии GPL. \n" -"На документацию, написанную компанией Mageia, распространяется действие " -"особой лицензии \"%s\". \n" +"На программы, разработанные компанией Mageia, распространяется действие лицензии GPL. \n" +"На документацию, написанную компанией Mageia, распространяется действие особой лицензии \"%s\". \n" "Дополнительные сведения см. в документации." #: messages.pm:79 @@ -5097,23 +5130,16 @@ msgstr "4. Права на объекты интеллектуальной со #: messages.pm:81 #, c-format msgid "" -"All rights to the components of the Software Products belong to their " -"respective authors and are \n" -"protected by intellectual property and copyright laws applicable to software " -"programs.\n" -"Mageia and its suppliers and licensors reserves their rights to modify or " -"adapt the Software \n" +"All rights to the components of the Software Products belong to their respective authors and are \n" +"protected by intellectual property and copyright laws applicable to software programs.\n" +"Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software \n" "Products, as a whole or in parts, by all means and for all purposes.\n" "\"Mageia\" and associated logos are trademarks of %s" msgstr "" -"Все права на компоненты Программных Продуктов принадлежат их соответствующим " -"авторам \n" -"и защищены законами об интеллектуальной собственности и авторском праве, " -"применительно \n" -"к программному обеспечению. Компания Mageia и её поставщики и лицензиары " -"сохраняют \n" -"за собой право изменять или адаптировать Программные Продукты (как целиком, " -"так и по частям) \n" +"Все права на компоненты Программных Продуктов принадлежат их соответствующим авторам \n" +"и защищены законами об интеллектуальной собственности и авторском праве, применительно \n" +"к программному обеспечению. Компания Mageia и её поставщики и лицензиары сохраняют \n" +"за собой право изменять или адаптировать Программные Продукты (как целиком, так и по частям) \n" "любым образом и для любых целей.\n" "«Mageia» и соответствующие логотипы являются товарными знаками \n" "компании %s" @@ -5126,49 +5152,36 @@ msgstr "5. Регулирующие законы" #: messages.pm:90 #, c-format msgid "" -"If any portion of this agreement is held void, illegal or inapplicable by a " -"court judgment, this \n" -"portion is excluded from this contract. You remain bound by the other " -"applicable sections of the \n" +"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n" +"portion is excluded from this contract. You remain bound by the other applicable sections of the \n" "agreement.\n" -"The terms and conditions of this License are governed by the Laws of " -"France.\n" -"All disputes on the terms of this license will preferably be settled out of " -"court. As a last \n" -"resort, the dispute will be referred to the appropriate Courts of Law of " -"Paris - France.\n" +"The terms and conditions of this License are governed by the Laws of France.\n" +"All disputes on the terms of this license will preferably be settled out of court. As a last \n" +"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n" "For any question on this document, please contact Mageia." msgstr "" -"Если какая-либо часть данного соглашения является недействительной, " -"противозаконной \n" -"или неприменимой по решению суда, эта часть исключается из данного " -"соглашения. \n" -"На вас по-прежнему налагаются ограничения других пригодных разделов " -"соглашения.\n" +"Если какая-либо часть данного соглашения является недействительной, противозаконной \n" +"или неприменимой по решению суда, эта часть исключается из данного соглашения. \n" +"На вас по-прежнему налагаются ограничения других пригодных разделов соглашения.\n" "Условия и положения данной Лицензии регулируются законодательством Франции.\n" -"Все споры по условиям и положениям данной лицензии лучше оспаривать вне " -"суда. В крайнем \n" -"случае спор будет передан в соответствующий суд общей юрисдикции Парижа, " -"Франция. \n" +"Все споры по условиям и положениям данной лицензии лучше оспаривать вне суда. В крайнем \n" +"случае спор будет передан в соответствующий суд общей юрисдикции Парижа, Франция. \n" "По любым вопросам, касающимся этого документа, обращайтесь в компанию Mageia" #: messages.pm:102 #, c-format msgid "" "Warning: Free Software may not necessarily be patent free, and some Free\n" -"Software included may be covered by patents in your country. For example, " -"the\n" +"Software included may be covered by patents in your country. For example, the\n" "MP3 decoders included may require a license for further usage (see\n" -"http://www.mp3licensing.com for more details). If you are unsure if a " -"patent\n" +"http://www.mp3licensing.com for more details). If you are unsure if a patent\n" "may be applicable to you, check your local laws." msgstr "" "Предупреждение: свободное программное обеспечение не обязательно может \n" "быть свободным от патентов, и некоторое свободное ПО в дистрибутиве \n" "может быть запатентовано в вашей стране. Например, для MP3-декодеров в \n" "дистрибутиве может потребоваться лицензия для дальнейшего использования \n" -"(подробности см. на веб-сайте http://www.mp3licensing.com). Если вы не " -"уверены \n" +"(подробности см. на веб-сайте http://www.mp3licensing.com). Если вы не уверены \n" "в наличии патента, ознакомьтесь со своим местным законодательством" #: messages.pm:111 @@ -5302,11 +5315,9 @@ msgstr "Какой %s драйвер попробовать?" #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" -"properly, although it normally works fine without them. Would you like to " -"specify\n" +"properly, although it normally works fine without them. Would you like to specify\n" "extra options for it or allow the driver to probe your machine for the\n" -"information it needs? Occasionally, probing will hang a computer, but it " -"should\n" +"information it needs? Occasionally, probing will hang a computer, but it should\n" "not cause any damage." msgstr "" "В некоторых случаях драйверу %s нужна некоторая дополнительная информация,\n" @@ -5339,7 +5350,8 @@ msgstr "" msgid "Are you sure you want to quit?" msgstr "Вы уверены, что хотите выйти?" -#: mygtk2.pm:1570 mygtk2.pm:1571 +#: mygtk2.pm:1570 +#: mygtk2.pm:1571 #, c-format msgid "Password is trivial to guess" msgstr "Пароль слишком прост" @@ -5349,7 +5361,8 @@ msgstr "Пароль слишком прост" msgid "Password should be resistant to basic attacks" msgstr "Пароль должен быть стойким к простым атакам" -#: mygtk2.pm:1573 mygtk2.pm:1574 +#: mygtk2.pm:1573 +#: mygtk2.pm:1574 #, c-format msgid "Password seems secure" msgstr "Пароль кажется безопасным" @@ -5368,26 +5381,25 @@ msgstr "Расширенный раздел не поддерживается н #, c-format msgid "" "You have a hole in your partition table but I cannot use it.\n" -"The only solution is to move your primary partitions to have the hole next " -"to the extended partitions." +"The only solution is to move your primary partitions to have the hole next to the extended partitions." msgstr "" "В таблице разделов есть свободное место, но её нельзя использовать.\n" -"Следует переместить основные разделы так, чтобы свободное место " -"располагалась сразу за расширенными разделами." +"Следует переместить основные разделы так, чтобы свободное место располагалась сразу за расширенными разделами." #: partition_table/raw.pm:296 #, c-format msgid "" "Something bad is happening on your hard disk drive. \n" "A test to check the integrity of data has failed. \n" -"It means writing anything on the disk will end up with random, corrupted " -"data." +"It means writing anything on the disk will end up with random, corrupted data." msgstr "" "С диском какие-то неполадки. \n" "Проверка целостности данных завершилась с ошибками. \n" "Это означает, что данные после записи на диск будут повреждены." -#: pkgs.pm:254 pkgs.pm:257 pkgs.pm:270 +#: pkgs.pm:254 +#: pkgs.pm:257 +#: pkgs.pm:270 #, c-format msgid "Unused packages removal" msgstr "Удаление неиспользуемых пакетов" @@ -5404,24 +5416,22 @@ msgstr "Поиск неиспользуемых пакетов локализа #: pkgs.pm:271 #, c-format -msgid "" -"We have detected that some packages are not needed for your system " -"configuration." -msgstr "" -"Было обнаружено, что некоторые пакеты не нужны в текущей конфигурации " -"системы." +msgid "We have detected that some packages are not needed for your system configuration." +msgstr "Было обнаружено, что некоторые пакеты не нужны в текущей конфигурации системы." #: pkgs.pm:272 #, c-format msgid "We will remove the following packages, unless you choose otherwise:" msgstr "Будут удалены следующие пакеты, если вы не измените выбор:" -#: pkgs.pm:275 pkgs.pm:276 +#: pkgs.pm:275 +#: pkgs.pm:276 #, c-format msgid "Unused hardware support" msgstr "Поддержка неиспользуемого оборудования" -#: pkgs.pm:279 pkgs.pm:280 +#: pkgs.pm:279 +#: pkgs.pm:280 #, c-format msgid "Unused localization" msgstr "Неиспользуемые локализации" @@ -5464,8 +5474,7 @@ msgstr "Scannerdrake" #: scanner.pm:201 #, c-format msgid "Could not install the packages needed to share your scanner(s)." -msgstr "" -"Не удалось установить пакеты, необходимые для общего доступа к сканерам" +msgstr "Не удалось установить пакеты, необходимые для общего доступа к сканерам" #: scanner.pm:202 #, c-format @@ -5502,8 +5511,7 @@ msgid "" "\n" "Else only /etc/issue is allowed." msgstr "" -"Если установлено «ВСЕ», разрешено существовать файлам /etc/issue и /etc/" -"issue.net.\n" +"Если установлено «ВСЕ», разрешено существовать файлам /etc/issue и /etc/issue.net.\n" "\n" "Если установлено «НЕТ», запрещены все issue-файлы.\n" "\n" @@ -5526,11 +5534,8 @@ msgstr "Разрешить администратору непосредстве #: security/help.pm:33 #, c-format -msgid "" -"Allow the list of users on the system on display managers (kdm and gdm)." -msgstr "" -"Разрешает/Запрещает вывод списка пользователей системы в оконных менеджерах " -"(kdm и gdm)." +msgid "Allow the list of users on the system on display managers (kdm and gdm)." +msgstr "Разрешает/Запрещает вывод списка пользователей системы в оконных менеджерах (kdm и gdm)." #: security/help.pm:35 #, c-format @@ -5579,27 +5584,23 @@ msgstr "" msgid "" "Authorize:\n" "\n" -"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if " -"set to \"ALL\",\n" +"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n" "\n" "- only local ones if set to \"Local\"\n" "\n" "- none if set to \"None\".\n" "\n" -"To authorize the services you need, use /etc/hosts.allow (see hosts." -"allow(5))." +"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))." msgstr "" "Разрешает:\n" "\n" -"- все службы, контролируемые tcp_wrappers'ами (см. hosts.deny(5) man page), " -"если установлено в \"ВСЕ\",\n" +"- все службы, контролируемые tcp_wrappers'ами (см. hosts.deny(5) man page), если установлено в \"ВСЕ\",\n" "\n" "- только локальные, если установлено в \"ЛОКАЛЬНЫЕ\"\n" "\n" "- ни одной, если установлено в \"НИ ОДНОГО\".\n" "\n" -"Для разрешения нужных вам служб используйте /etc/hosts.allow (см hosts.allow " -"(5))." +"Для разрешения нужных вам служб используйте /etc/hosts.allow (см hosts.allow (5))." #: security/help.pm:63 #, c-format @@ -5676,12 +5677,8 @@ msgstr "Разрешить msec'у проверять безопасность #: security/help.pm:90 #, c-format -msgid "" -"Enable su only from members of the wheel group. If set to no, allows su from " -"any user." -msgstr "" -"Разрешает su только для членов группы wheel. Если установлено в \"нет\", " -"разрешает su для любого пользователя." +msgid "Enable su only from members of the wheel group. If set to no, allows su from any user." +msgstr "Разрешает su только для членов группы wheel. Если установлено в \"нет\", разрешает su для любого пользователя." #: security/help.pm:92 #, c-format @@ -5706,32 +5703,22 @@ msgstr "Включает/Отключает sulogin(8) в однопользов #: security/help.pm:100 #, c-format msgid "Add the name as an exception to the handling of password aging by msec." -msgstr "" -"Добавление имени в качестве исключения в управление возрастом паролей, " -"осуществляемого msec'ом." +msgstr "Добавление имени в качестве исключения в управление возрастом паролей, осуществляемого msec'ом." #: security/help.pm:102 #, c-format msgid "Set password aging to \"max\" days and delay to change to \"inactive\"." -msgstr "" -"Установка возраста пароля в \"max\" дней и задержку для изменения на " -"\"inactive\"." +msgstr "Установка возраста пароля в \"max\" дней и задержку для изменения на \"inactive\"." #: security/help.pm:104 #, c-format msgid "Set the password history length to prevent password reuse." -msgstr "" -"Установка длительности истории пароля для предотвращения повторного " -"использования пароля." +msgstr "Установка длительности истории пароля для предотвращения повторного использования пароля." #: security/help.pm:106 #, c-format -msgid "" -"Set the password minimum length and minimum number of digit and minimum " -"number of capitalized letters." -msgstr "" -"Установка минимальной длины пароля, минимального количества цифр и " -"минимального количества символов в верхнем регистре." +msgid "Set the password minimum length and minimum number of digit and minimum number of capitalized letters." +msgstr "Установка минимальной длины пароля, минимального количества цифр и минимального количества символов в верхнем регистре." #: security/help.pm:108 #, c-format @@ -5765,16 +5752,12 @@ msgstr "" #: security/help.pm:117 #, c-format msgid "if set to yes, check permissions of files in the users' home." -msgstr "" -"если установлено Да, проверяются права доступа файлов в домашних каталогах " -"пользователей." +msgstr "если установлено Да, проверяются права доступа файлов в домашних каталогах пользователей." #: security/help.pm:118 #, c-format msgid "if set to yes, check if the network devices are in promiscuous mode." -msgstr "" -"если установлено Да, проверяется, работают ли сетевые устройства в режиме " -"promiscuous." +msgstr "если установлено Да, проверяется, работают ли сетевые устройства в режиме promiscuous." #: security/help.pm:119 #, c-format @@ -5784,8 +5767,7 @@ msgstr "если установлено Да, ежедневно выполня #: security/help.pm:120 #, c-format msgid "if set to yes, check additions/removals of sgid files." -msgstr "" -"если установлено Да, проверяется добавление/удаление файлов с sgid-битами." +msgstr "если установлено Да, проверяется добавление/удаление файлов с sgid-битами." #: security/help.pm:121 #, c-format @@ -5795,15 +5777,12 @@ msgstr "если установлено Да, проверяется налич #: security/help.pm:122 #, c-format msgid "if set to yes, verify checksum of the suid/sgid files." -msgstr "" -"если установлено Да, проверяется контрольная сумма файлов с битами suid/sgid." +msgstr "если установлено Да, проверяется контрольная сумма файлов с битами suid/sgid." #: security/help.pm:123 #, c-format msgid "if set to yes, check additions/removals of suid root files." -msgstr "" -"если установлено Да, проверяется добавление/удаление файлов root'а с suid-" -"битом." +msgstr "если установлено Да, проверяется добавление/удаление файлов root'а с suid-битом." #: security/help.pm:124 #, c-format @@ -5813,9 +5792,7 @@ msgstr "если установлено Да, создается отчет о #: security/help.pm:125 #, c-format msgid "if set to yes, check files/directories writable by everybody." -msgstr "" -"если установлено Да, проверяются файлы/каталоги с возможностью записи кем-" -"угодно." +msgstr "если установлено Да, проверяются файлы/каталоги с возможностью записи кем-угодно." #: security/help.pm:126 #, c-format @@ -5824,11 +5801,8 @@ msgstr "если установлено Да, выполняются прове #: security/help.pm:127 #, c-format -msgid "" -"if set, send the mail report to this email address else send it to root." -msgstr "" -"если установлено, письмо с отчетом отправляется на этот адрес, иначе " -"отправляется root'у." +msgid "if set, send the mail report to this email address else send it to root." +msgstr "если установлено, письмо с отчетом отправляется на этот адрес, иначе отправляется root'у." #: security/help.pm:128 #, c-format @@ -5838,8 +5812,7 @@ msgstr "если установлено Да, результаты провер #: security/help.pm:129 #, c-format msgid "Do not send mails if there's nothing to warn about" -msgstr "" -"если установлено Да, сообщения не отправляются, если не о чем предупреждать." +msgstr "если установлено Да, сообщения не отправляются, если не о чем предупреждать." #: security/help.pm:130 #, c-format @@ -5859,16 +5832,12 @@ msgstr "если установлено Да, результаты провер #: security/help.pm:134 #, c-format msgid "Set shell commands history size. A value of -1 means unlimited." -msgstr "" -"Устанавливает размер истории команд командного процессора. Значение -1 " -"означает неограниченную историю." +msgstr "Устанавливает размер истории команд командного процессора. Значение -1 означает неограниченную историю." #: security/help.pm:136 #, c-format msgid "Set the shell timeout. A value of zero means no timeout." -msgstr "" -"Устанавливает таймаут для командного процессора. Нулевое значение означает " -"отсутствие таймаута." +msgstr "Устанавливает таймаут для командного процессора. Нулевое значение означает отсутствие таймаута." #: security/help.pm:136 #, c-format @@ -6013,9 +5982,7 @@ msgstr "Нет возраста пароля для" #: security/l10n.pm:38 #, c-format msgid "Set password expiration and account inactivation delays" -msgstr "" -"Установить сроки действия паролей и предупреждений о блокировке учётных " -"записей" +msgstr "Установить сроки действия паролей и предупреждений о блокировке учётных записей" #: security/l10n.pm:39 #, c-format @@ -6115,9 +6082,7 @@ msgstr "Не отправлять пустые почтовые сообщени #: security/l10n.pm:58 #, c-format msgid "If set, send the mail report to this email address else send it to root" -msgstr "" -"Если установлено, отправляет письмо с отчетом на этот адрес, иначе " -"отправляет его root." +msgstr "Если установлено, отправляет письмо с отчетом на этот адрес, иначе отправляет его root." #: security/l10n.pm:59 #, c-format @@ -6158,21 +6123,16 @@ msgstr "Безопасность" #, c-format msgid "" "This level is to be used with care, as it disables all additional security\n" -"provided by msec. Use it only when you want to take care of all aspects of " -"system security\n" +"provided by msec. Use it only when you want to take care of all aspects of system security\n" "on your own." msgstr "" -"Этот уровень следует использовать с осторожностью, поскольку на нём " -"отключаются\n" -"все дополнительные средства защиты msec. Используйте его только если вы " -"будете\n" +"Этот уровень следует использовать с осторожностью, поскольку на нём отключаются\n" +"все дополнительные средства защиты msec. Используйте его только если вы будете\n" "самостоятельно контролировать все параметры защиты системы." #: security/level.pm:55 #, c-format -msgid "" -"This is the standard security recommended for a computer that will be used " -"to connect to the Internet as a client." +msgid "This is the standard security recommended for a computer that will be used to connect to the Internet as a client." msgstr "" "Это стандартный уровень безопасности, рекомендуемый для компьютера,\n" "который будет использоваться для подключения к Интернету в качестве клиента." @@ -6180,12 +6140,9 @@ msgstr "" #: security/level.pm:56 #, c-format msgid "" -"With this security level, the use of this system as a server becomes " -"possible.\n" -"The security is now high enough to use the system as a server which can " -"accept\n" -"connections from many clients. Note: if your machine is only a client on the " -"Internet, you should choose a lower level." +"With this security level, the use of this system as a server becomes possible.\n" +"The security is now high enough to use the system as a server which can accept\n" +"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level." msgstr "" "На этом уровне безопасности становится возможным использование системы \n" "в качестве сервера.\n" @@ -6228,8 +6185,7 @@ msgstr "Слушание и отправка ACPI событий из ядра" #: services.pm:19 #, c-format msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system" -msgstr "" -"Запустить звуковую систему ALSA (Расширенная звуковая архитектура Linux)" +msgstr "Запустить звуковую систему ALSA (Расширенная звуковая архитектура Linux)" #: services.pm:20 #, c-format @@ -6262,9 +6218,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi - это демон ZeroConf, который реализует стек mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Сервер NTP" +msgstr "NTP клиент/сервер" #: services.pm:27 #, c-format @@ -6275,8 +6231,7 @@ msgstr "Задание настроек частоты процессора" #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" -"at periodic scheduled times. vixie cron adds a number of features to the " -"basic\n" +"at periodic scheduled times. vixie cron adds a number of features to the basic\n" "UNIX cron, including better security and more powerful configuration options." msgstr "" "cron является стандартной программой UNIX, которая по расписанию запускает\n" @@ -6286,8 +6241,7 @@ msgstr "" #: services.pm:30 #, c-format -msgid "" -"Common UNIX Printing System (CUPS) is an advanced printer spooling system" +msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system" msgstr "CUPS - система печати Linux" #: services.pm:31 @@ -6298,8 +6252,7 @@ msgstr "Запуск экрана входа в систему" #: services.pm:32 #, c-format msgid "" -"FAM is a file monitoring daemon. It is used to get reports when files " -"change.\n" +"FAM is a file monitoring daemon. It is used to get reports when files change.\n" "It is used by GNOME and KDE" msgstr "" "FAM это демон слежения за файлами. Он используется для получения отчетов\n" @@ -6310,30 +6263,22 @@ msgstr "" #, c-format msgid "" "G15Daemon allows users access to all extra keys by decoding them and \n" -"pushing them back into the kernel via the linux UINPUT driver. This driver " -"must be loaded \n" -"before g15daemon can be used for keyboard access. The G15 LCD is also " -"supported. By default, \n" -"with no other clients active, g15daemon will display a clock. Client " -"applications and \n" +"pushing them back into the kernel via the linux UINPUT driver. This driver must be loaded \n" +"before g15daemon can be used for keyboard access. The G15 LCD is also supported. By default, \n" +"with no other clients active, g15daemon will display a clock. Client applications and \n" "scripts can access the LCD via a simple API." msgstr "" -"G15Daemon позволяет пользователям получать доступ ко всем дополнительным " -"ключам для их расшифровки\n" -"и помещать их обратно в ядро Linux с помощью драйвера UINPUT. Этот драйвер " -"должен быть загружен\n" -"перед g15daemon может получить доступ к клавиатуре. G15 LCD также " -"поддерживается. По умолчанию\n" -"без каких-либо других активных клиентов, g15daemon будет отображать часы. " -"Клиентские приложения и\n" +"G15Daemon позволяет пользователям получать доступ ко всем дополнительным ключам для их расшифровки\n" +"и помещать их обратно в ядро Linux с помощью драйвера UINPUT. Этот драйвер должен быть загружен\n" +"перед g15daemon может получить доступ к клавиатуре. G15 LCD также поддерживается. По умолчанию\n" +"без каких-либо других активных клиентов, g15daemon будет отображать часы. Клиентские приложения и\n" "сценарии могут получить доступ к LCD через простой API." #: services.pm:39 #, c-format msgid "" "GPM adds mouse support to text-based Linux applications such the\n" -"Midnight Commander. It also allows mouse-based console cut-and-paste " -"operations,\n" +"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n" "and includes support for pop-up menus on the console." msgstr "" "GPM добавляет поддержку мыши для приложений, работающих в текстовом режиме,\n" @@ -6344,8 +6289,7 @@ msgstr "" #: services.pm:42 #, c-format msgid "HAL is a daemon that collects and maintains information about hardware" -msgstr "" -"HAL - демон, собирающий информацию об аппаратном обеспечении компьютера" +msgstr "HAL - демон, собирающий информацию об аппаратном обеспечении компьютера" #: services.pm:43 #, c-format @@ -6358,20 +6302,15 @@ msgstr "" #: services.pm:45 #, c-format -msgid "" -"Apache is a World Wide Web server. It is used to serve HTML files and CGI." -msgstr "" -"Apache является сервером всемирной паутины. Он используется для обслуживания " -"файлов HTML и CGI." +msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI." +msgstr "Apache является сервером всемирной паутины. Он используется для обслуживания файлов HTML и CGI." #: services.pm:46 #, c-format msgid "" "The internet superserver daemon (commonly called inetd) starts a\n" -"variety of other internet services as needed. It is responsible for " -"starting\n" -"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd " -"disables\n" +"variety of other internet services as needed. It is responsible for starting\n" +"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n" "all of the services it is responsible for." msgstr "" "Демон internet superserver (зачастую называемый inetd) запускает по мере\n" @@ -6391,11 +6330,8 @@ msgstr "Автоматизация файервола пакетной филь #: services.pm:52 #, c-format -msgid "" -"Evenly distributes IRQ load across multiple CPUs for enhanced performance" -msgstr "" -"Равномерное распределение IRQ нагрузки между несколькими процессорами для " -"повышения производительности" +msgid "Evenly distributes IRQ load across multiple CPUs for enhanced performance" +msgstr "Равномерное распределение IRQ нагрузки между несколькими процессорами для повышения производительности" #: services.pm:53 #, c-format @@ -6442,8 +6378,7 @@ msgid "" "lpd is the print daemon required for lpr to work properly. It is\n" "basically a server that arbitrates print jobs to printer(s)." msgstr "" -"lpd является демоном печати, который необходим для нормальной работы lpr. " -"Это\n" +"lpd является демоном печати, который необходим для нормальной работы lpr. Это\n" "в основном сервер, распределяющий по принтерам задания на печать." #: services.pm:64 @@ -6467,9 +6402,7 @@ msgstr "Управление и мониторинг программным RAID #: services.pm:68 #, c-format -msgid "" -"DBUS is a daemon which broadcasts notifications of system events and other " -"messages" +msgid "DBUS is a daemon which broadcasts notifications of system events and other messages" msgstr "" "DBUS - демон, рассылающий широковещательные уведомления и другие сообщения\n" "программам" @@ -6481,12 +6414,8 @@ msgstr "Включение политик безопасности MSEC при #: services.pm:70 #, c-format -msgid "" -"named (BIND) is a Domain Name Server (DNS) that is used to resolve host " -"names to IP addresses." -msgstr "" -"named (BIND) является сервером доменных имен (DNS), который используется для " -"преобразования имен хостов в IP-адреса." +msgid "named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses." +msgstr "named (BIND) является сервером доменных имен (DNS), который используется для преобразования имен хостов в IP-адреса." #: services.pm:71 #, c-format @@ -6570,8 +6499,7 @@ msgstr "Проверка наличия места на разделе" #, c-format msgid "" "PCMCIA support is usually to support things like ethernet and\n" -"modems in laptops. It will not get started unless configured so it is safe " -"to have\n" +"modems in laptops. It will not get started unless configured so it is safe to have\n" "it installed on machines that do not need it." msgstr "" "Поддержка PCMCIA является обычной поддержкой устройств типа ethernet и\n" @@ -6582,8 +6510,7 @@ msgstr "" #, c-format msgid "" "The portmapper manages RPC connections, which are used by\n" -"protocols such as NFS and NIS. The portmap server must be running on " -"machines\n" +"protocols such as NFS and NIS. The portmap server must be running on machines\n" "which act as servers for protocols which make use of the RPC mechanism." msgstr "" "portmapper управляет соединениями RPC, которые используются протоколами,\n" @@ -6598,12 +6525,8 @@ msgstr "Резервирование определенных портов TCP" #: services.pm:95 #, c-format -msgid "" -"Postfix is a Mail Transport Agent, which is the program that moves mail from " -"one machine to another." -msgstr "" -"Postfix это Агент доставки почты, программа которая переправляет почту с " -"одной машины на другую." +msgid "Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another." +msgstr "Postfix это Агент доставки почты, программа которая переправляет почту с одной машины на другую." #: services.pm:96 #, c-format @@ -6637,8 +6560,7 @@ msgid "" "routing protocols are needed for complex networks." msgstr "" "Демон routed разрешает автоматическое обновление таблиц IP-маршрутизации\n" -"через протокол RIP. В то время как RIP широко используется в небольших " -"сетях,\n" +"через протокол RIP. В то время как RIP широко используется в небольших сетях,\n" "для сложных сетей необходимы более сложные протоколы маршрутизации." #: services.pm:104 @@ -6652,9 +6574,7 @@ msgstr "" #: services.pm:106 #, c-format -msgid "" -"Syslog is the facility by which many daemons use to log messages to various " -"system log files. It is a good idea to always run rsyslog." +msgid "Syslog is the facility by which many daemons use to log messages to various system log files. It is a good idea to always run rsyslog." msgstr "" "Syslog - это функция, которая используется многими демонами для\n" "регистрации сообщений в различных системных файлах логов. Неплохо было\n" @@ -6681,8 +6601,7 @@ msgstr "" #: services.pm:111 #, c-format -msgid "" -"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..." +msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..." msgstr "SANE - система работы со сканерами и камерами" #: services.pm:112 @@ -6692,12 +6611,8 @@ msgstr "Файервол фильтрации пакетов" #: services.pm:113 #, c-format -msgid "" -"The SMB/CIFS protocol enables to share access to files & printers and also " -"integrates with a Windows Server domain" -msgstr "" -"Протокол SMB/CIFS даёт возможность открыть общий доступ к файлам и принтерам " -"и интегрироваться в домен Windows Server" +msgid "The SMB/CIFS protocol enables to share access to files & printers and also integrates with a Windows Server domain" +msgstr "Протокол SMB/CIFS даёт возможность открыть общий доступ к файлам и принтерам и интегрироваться в домен Windows Server" #: services.pm:114 #, c-format @@ -6711,12 +6626,8 @@ msgstr "слой речевого анализа" #: services.pm:116 #, c-format -msgid "" -"Secure Shell is a network protocol that allows data to be exchanged over a " -"secure channel between two computers" -msgstr "" -"Secure Shell - это сетевой протокол, позволяющий обмениваться данными между " -"двумя компьютерами по шифрованному каналу" +msgid "Secure Shell is a network protocol that allows data to be exchanged over a secure channel between two computers" +msgstr "Secure Shell - это сетевой протокол, позволяющий обмениваться данными между двумя компьютерами по шифрованному каналу" #: services.pm:117 #, c-format @@ -6731,8 +6642,7 @@ msgstr "" #: services.pm:119 #, c-format msgid "Moves the generated persistent udev rules to /etc/udev/rules.d" -msgstr "" -"Перемещение сгенерированных постоянных правил udev в /etc/udev/rules.d" +msgstr "Перемещение сгенерированных постоянных правил udev в /etc/udev/rules.d" #: services.pm:120 #, c-format @@ -6786,7 +6696,8 @@ msgstr "Удаленное администрирование" msgid "Database Server" msgstr "Сервер базы данных" -#: services.pm:188 services.pm:225 +#: services.pm:188 +#: services.pm:225 #, c-format msgid "Services" msgstr "Службы" @@ -6794,8 +6705,7 @@ msgstr "Службы" #: services.pm:188 #, c-format msgid "Choose which services should be automatically started at boot time" -msgstr "" -"Выберите, какие службы должны быть автоматически запущены во время загрузки" +msgstr "Выберите, какие службы должны быть автоматически запущены во время загрузки" #: services.pm:206 #, c-format @@ -6826,7 +6736,8 @@ msgstr "" "Извините, дополнительная информация\n" "об этой службе отсутствует." -#: services.pm:257 ugtk2.pm:924 +#: services.pm:257 +#: ugtk2.pm:924 #, c-format msgid "Info" msgstr "Информация" @@ -6866,8 +6777,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -"USA.\n" +"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" msgstr "" "Эта программа является открытым программным обеспечением; вы можете\n" "распространять ее дальше и/или изменять ее при условии соблюдения GNU\n" @@ -6892,8 +6802,7 @@ msgid "" "--default : save default directories.\n" "--debug : show all debug messages.\n" "--show-conf : list of files or directories to backup.\n" -"--config-info : explain configuration file options (for non-X " -"users).\n" +"--config-info : explain configuration file options (for non-X users).\n" "--daemon : use daemon configuration. \n" "--help : show this message.\n" "--version : show version number.\n" @@ -6904,8 +6813,7 @@ msgstr "" "--default : сохранить каталоги по умолчанию.\n" "--debug : показать все отладочные сообщения.\n" "--show-conf : перечислить резервируемые файлы или каталоги.\n" -"--config-info : разъяснять параметры файла настройки (не для " -"пользователей Х).\n" +"--config-info : разъяснять параметры файла настройки (не для пользователей Х).\n" "--daemon : использовать конфигурацию демона.\n" "--help : показать это сообщение.\n" "--version : показать номер версии.\n" @@ -6998,12 +6906,9 @@ msgid "" "--start : start MTS\n" "--stop : stop MTS\n" "--adduser : add an existing system user to MTS (requires username)\n" -"--deluser : delete an existing system user from MTS (requires " -"username)\n" -"--addclient : add a client machine to MTS (requires MAC address, IP, " -"nbi image name)\n" -"--delclient : delete a client machine from MTS (requires MAC address, " -"IP, nbi image name)" +"--deluser : delete an existing system user from MTS (requires username)\n" +"--addclient : add a client machine to MTS (requires MAC address, IP, nbi image name)\n" +"--delclient : delete a client machine from MTS (requires MAC address, IP, nbi image name)" msgstr "" "[ОПЦИИ]...\n" "Конфигуратор Сервера терминалов %s\n" @@ -7011,14 +6916,10 @@ msgstr "" "--disable : выключить MTS\n" "--start : запустить MTS\n" "--stop : остановить MTS\n" -"--adduser : добавить существующего пользователя системы в MTS " -"(требуется имя пользователя)\n" -"--deluser : удалить существующего пользователя системы из MTS " -"(требуется имя пользователя)\n" -"--addclient : добавить клиентскую машину в MTS (требуется MAC-адрес, " -"IP, имя образа nbi)\n" -"--delclient : удалить клиентскую машину из MTS (требуется MAC-адрес, " -"IP, имя образа nbi)" +"--adduser : добавить существующего пользователя системы в MTS (требуется имя пользователя)\n" +"--deluser : удалить существующего пользователя системы из MTS (требуется имя пользователя)\n" +"--addclient : добавить клиентскую машину в MTS (требуется MAC-адрес, IP, имя образа nbi)\n" +"--delclient : удалить клиентскую машину из MTS (требуется MAC-адрес, IP, имя образа nbi)" #: standalone.pm:100 #, c-format @@ -7028,9 +6929,7 @@ msgstr "[клавиатура]" #: standalone.pm:101 #, c-format msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]" -msgstr "" -"[--file=мой_файл] [--word=мое_слово] [--explain=регулярное_выражение] [--" -"alert]" +msgstr "[--file=мой_файл] [--word=мое_слово] [--explain=регулярное_выражение] [--alert]" #: standalone.pm:102 #, c-format @@ -7059,30 +6958,21 @@ msgstr "" #, c-format msgid "" "[OPTION]...\n" -" --no-confirmation do not ask first confirmation question in %s Update " -"mode\n" +" --no-confirmation do not ask first confirmation question in %s Update mode\n" " --no-verify-rpm do not verify packages signatures\n" -" --changelog-first display changelog before filelist in the " -"description window\n" +" --changelog-first display changelog before filelist in the description window\n" " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" msgstr "" "[ОПЦИЯ]...\n" -" --no-confirmation не просить первого подтверждения в режиме %s " -"Update\n" +" --no-confirmation не просить первого подтверждения в режиме %s Update\n" " --no-verify-rpm не проверять подписи пакетов\n" -" --changelog-first показывать журнал изменений перед списком файлов в " -"окне описания\n" -" --merge-all-rpmnew предлагать объединить все найденные файлы .rpmnew/." -"rpmsave" +" --changelog-first показывать журнал изменений перед списком файлов в окне описания\n" +" --merge-all-rpmnew предлагать объединить все найденные файлы .rpmnew/.rpmsave" #: standalone.pm:117 #, c-format -msgid "" -"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-" -"usbtable] [--dynamic=dev]" -msgstr "" -"[--manual] [--device=устройство] [--update-sane=sane_source_dir] [--update-" -"usbtable] [--dynamic=устройство]" +msgid "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]" +msgstr "[--manual] [--device=устройство] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=устройство]" #: standalone.pm:118 #, c-format @@ -7099,14 +6989,13 @@ msgstr "" #, c-format msgid "" "\n" -"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--" -"testing] [-v|--version] " +"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " msgstr "" "\n" -"Использование: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] " -"[--testing] [-v|--version] " +"Использование: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " -#: timezone.pm:161 timezone.pm:162 +#: timezone.pm:161 +#: timezone.pm:162 #, c-format msgid "All servers" msgstr "Все серверы" -- cgit v1.2.1 From 90b6c91391425ad5f2bef237cbe984c19db458e8 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 23:50:47 +0000 Subject: tools: Prefer /usr/sbin over /usr/bin. The list already contains /sbin and /bin which are just symlinks to the above, but the order is different for / vs. /usr. Due to the symlinks we always prefer sbin over bin anyway, so this change doesn't technically change anything but does clarify things --- tools/install-xml-file-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 42a567ef5..0dc1b2e4e 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -258,7 +258,7 @@ sub install { } elsif ($expand eq 'binary') { $disallow_from_dir->(); - my @PATH = qw(/sbin /bin /usr/bin /usr/sbin /usr/X11R6/bin); + my @PATH = qw(/sbin /bin /usr/sbin /usr/bin /usr/X11R6/bin); foreach my $name (map { expand_macros($_) } @text_l) { my @l = grep { -x $_ } map { "$_/$name" } @PATH; @l or error("can't find binary $name"), next; -- cgit v1.2.1 From f97026e3a01ce14d30ff086c015c64dacd10ddb1 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 23:53:23 +0000 Subject: tools: Get rid of the 'many matches for binary' warning due to usrmove. This ignores /sbin and /bin paths then they are symlinks and avoids misleading messages being printed when building stage2 and rescue --- tools/install-xml-file-list | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 0dc1b2e4e..7bd0588fe 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -258,7 +258,9 @@ sub install { } elsif ($expand eq 'binary') { $disallow_from_dir->(); - my @PATH = qw(/sbin /bin /usr/sbin /usr/bin /usr/X11R6/bin); + my @PATH = qw(/usr/sbin /usr/bin /usr/X11R6/bin); + unshift(@PATH, "/bin") unless ( -l "/bin" ); + unshift(@PATH, "/sbin") unless ( -l "/sbin" ); foreach my $name (map { expand_macros($_) } @text_l) { my @l = grep { -x $_ } map { "$_/$name" } @PATH; @l or error("can't find binary $name"), next; -- cgit v1.2.1 From 539125d67d4261dbd7010695340cc3a6b0e8b478 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 09:40:13 +0100 Subject: typo fix --- perl-install/install/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index bd771b91f..fff8a7d7d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,6 @@ Version 16.4 - 2 December 2013 -- fix partionning wizard moving the main window to left (mga#11790) +- fix partitioning wizard moving the main window to left (mga#11790) - fix titles not being blue anymore Version 16.2 - 29 November 2013 -- cgit v1.2.1 From 8582508256cbd9e44d7acfdbf9ac2f9dc6fedfdd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 09:39:24 +0100 Subject: detect eMMc block devices (Luc Menut, mga#11812) --- perl-install/NEWS | 3 +++ perl-install/detect_devices.pm | 10 +++++++++- perl-install/install/NEWS | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index d061e574d..21a48e73b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o detect eMMc block devices (Luc Menut, mga#11812) + Version 16.4 - 2 December 2013 - fix banners not being blue anymore with Oxygen-gtk theme (kbo#328270) diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 6f70c92d2..184a1db31 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -33,7 +33,7 @@ sub get() { #- 2. The first SCSI device if SCSI exists. Or #- 3. The first RAID device if RAID exists. - getIDE(), getSCSI(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID(); + getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID(); } sub hds() { grep { may_be_a_hd($_) } get() } sub tapes() { grep { $_->{media_type} eq 'tape' } get() } @@ -401,6 +401,14 @@ sub getVirtIO() { glob("/sys/bus/virtio/devices/*/block/*"); } +sub getMmcBlk() { + -d '/sys/bus/mmc/devices' or return; + map { + { device => basename($_), info => "MMC block device", media_type => 'hd', bus => 'mmc' }; + } + glob("/sys/bus/mmc/devices/*/block/*"); +} + # cpu_name : arch() =~ /^alpha/ ? "cpu " : # arch() =~ /^ppc/ ? "processor" : "vendor_id" diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index fff8a7d7d..d669de58a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- partitioning: + o detect eMMc block devices (Luc Menut, mga#11812) + Version 16.4 - 2 December 2013 - fix partitioning wizard moving the main window to left (mga#11790) -- cgit v1.2.1 From ff8a9294dc6f9d1da88ccb7718f696b415a74fd1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 09:40:20 +0100 Subject: recognize partitions on eMMC (mga#11812) --- perl-install/devices.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 5162bd602..8ea66bd82 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -212,7 +212,7 @@ sub make($) { sub simple_partition_scan { my ($part) = @_; - $part->{device} =~ /((?:[hsv]|xv)d[a-z])(\d+)$/; + $part->{device} =~ /((?:[hsv]|xv)d[a-z]|mmcblk\d+p)(\d+)$/; } sub part_number { my ($part) = @_; -- cgit v1.2.1 From ee5d25217f323d435e06de59cc091586213d4ab7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 12:30:10 +0100 Subject: show labels on partition buttons again but make them ellipsized (mga#11858) --- perl-install/NEWS | 1 + perl-install/diskdrake/hd_gtk.pm | 5 +++-- perl-install/install/NEWS | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 21a48e73b..42f48471f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - diskdrake: o detect eMMc block devices (Luc Menut, mga#11812) + o show labels on partition buttons again but ellipsized (mga#11858) Version 16.4 - 2 December 2013 diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 688a476f1..c8e9215c8 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -321,7 +321,7 @@ sub create_automatic_notebooks { sub create_buttons4partitions { my ($kind, $totalsectors, @parts) = @_; - $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 50 if $w->{window}->get_window; + $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window; my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1; my $i = 1; @@ -346,7 +346,8 @@ sub create_buttons4partitions { } my $info = $entry->{mntpoint} || $entry->{device_LABEL} || ''; $info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info; - my $w = Gtk3::ToggleButton->new() or internal_error('new_with_label'); + my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label'); + $w->get_child->set_ellipsize('end'); $w->set_tooltip_text($info); $w->signal_connect(clicked => sub { $current_button != $w or return; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d669de58a..33acd6960 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - partitioning: o detect eMMc block devices (Luc Menut, mga#11812) + o show labels on partition buttons again but ellipsized (mga#11858) Version 16.4 - 2 December 2013 -- cgit v1.2.1 From 96b708cf3834b5b9def187ce80e9592cdfb2284a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 17:07:00 +0100 Subject: fix a crash in partitioning wizard (mga#11820) --- perl-install/NEWS | 1 + perl-install/fs/partitioning_wizard.pm | 2 +- perl-install/install/NEWS | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 42f48471f..f9d106ac3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - diskdrake: o detect eMMc block devices (Luc Menut, mga#11812) + o fix a crash in partitioning wizard (mga#11820) o show labels on partition buttons again but ellipsized (mga#11858) Version 16.4 - 2 December 2013 diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index c9486c5d1..4749deec1 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -369,7 +369,7 @@ sub create_display_box { }; $hpane->signal_connect('size-allocate' => sub { my (undef, $alloc) = @_; - $entry->{width} = $alloc->width; + $entry->{width} = $alloc->{width}; $update_ratio->(); 0; }); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 33acd6960..7bbb7fac0 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - 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 -- cgit v1.2.1 From 212f25b60eba5764d99b01f3e911f7833a8262bc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Dec 2013 17:07:36 +0100 Subject: 16.5 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index c43c5057e..4d93705b8 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.4 +VERSION:=16.5 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index f9d106ac3..816fc8291 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.5 - 3 December 2013 + - diskdrake: o detect eMMc block devices (Luc Menut, mga#11812) o fix a crash in partitioning wizard (mga#11820) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7bbb7fac0..82aa26dea 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +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) -- cgit v1.2.1 From 60665b8f4ee4267e32c5306e485dc3264d4246cb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 4 Dec 2013 15:07:50 +0100 Subject: fix blue background behind left panel text (mga#11866) Due to the switch from RC to CSS, the background color now got enforced by gtk3 (#11866) => drop the useless bg color. this affected both installer & (no yet released) mcc. Detected first while testing gtk3 mcc and then also reported once oxygen-gtk3 was fixed regarding Banners. Spotted by Hugo Pereira Da Costa in https://bugs.kde.org/show_bug.cgi?id=328383 --- perl-install/NEWS | 3 +++ perl-install/install/NEWS | 2 ++ perl-install/share/themes-galaxy.css | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 816fc8291..b989eb32c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- fix blue background behind left panel text (mga#11866) + (for not yet released gtk3 mcc) + Version 16.5 - 3 December 2013 - diskdrake: diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 82aa26dea..5686d6f46 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix blue background behind left panel text (mga#11866) + Version 16.5 - 3 December 2013 - partitioning: diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 16c98b819..5e5189002 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -10,7 +10,6 @@ #Logo, #Steps * { /* base[NORMAL] = { 0.28, 0.38, 0.66 }; */ - background-color: #548EE6; color: #FFFFFF; } -- cgit v1.2.1 From bbc016954b23c9daa87b9d78cce95c10bd5329e6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 4 Dec 2013 15:10:44 +0100 Subject: 16.6 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 4d93705b8..0d90e402a 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.5 +VERSION:=16.6 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index b989eb32c..f05aa12f9 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.6 - 4 December 2013 + - fix blue background behind left panel text (mga#11866) (for not yet released gtk3 mcc) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 5686d6f46..15a3f9920 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.6 - 4 December 2013 + - fix blue background behind left panel text (mga#11866) Version 16.5 - 3 December 2013 -- cgit v1.2.1 From fe91a26bf9bb3298605b76d226db3f329421b1c6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 4 Dec 2013 15:16:06 +0100 Subject: drop useless logo style unused since July 2008 see commits e5ebd1827, 5a380298d, 0aceb01fd, & 3ee8b0b2c --- perl-install/share/themes-galaxy.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 5e5189002..6540b30c8 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -8,7 +8,7 @@ */ -#Logo, #Steps * { +#Steps * { /* base[NORMAL] = { 0.28, 0.38, 0.66 }; */ color: #FFFFFF; } -- cgit v1.2.1 From 3648552d18fb07620fcaeff49bdf845a153e7945 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Dec 2013 07:34:19 +0100 Subject: fix a crash when creating partitins (mga#11876) --- perl-install/NEWS | 3 +++ perl-install/install/NEWS | 3 +++ perl-install/interactive/gtk.pm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index f05aa12f9..9a5a24d74 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o fix a crash when creating partitins (mga#11876) + Version 16.6 - 4 December 2013 - fix blue background behind left panel text (mga#11866) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 15a3f9920..b0a2f4115 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- partitioning: + o fix a crash when creating partitins (mga#11876) + Version 16.6 - 4 December 2013 - fix blue background behind left panel text (mga#11866) diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index b233ac01d..94739b356 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -393,7 +393,7 @@ sub create_widget { $w = ugtk3::gtkadd(Gtk3::CheckButton->new, gtkshow(gtkcreate_img($e->{image}))); } else { #- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text}; - $w = Gtk3::CheckButton->new_with_label($e->{text}); + $w = Gtk3::CheckButton->new_with_label($e->{text} || ''); } $w->signal_connect(clicked => $onchange->(sub { $w->get_active })); ${$e->{val}} ||= 0; -- cgit v1.2.1 From cd0533514f6b7fca36444402657605863c26db56 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Dec 2013 07:34:49 +0100 Subject: 16.7 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 0d90e402a..36019567a 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.6 +VERSION:=16.7 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 9a5a24d74..ff1b8634e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.7 - 5 December 2013 + - diskdrake: o fix a crash when creating partitins (mga#11876) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b0a2f4115..df69ea679 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.7 - 5 December 2013 + - partitioning: o fix a crash when creating partitins (mga#11876) -- cgit v1.2.1 From 1438c6cdb9448532f1a7f77367abc8c51c54df1f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Dec 2013 07:44:23 +0100 Subject: typo fix --- perl-install/NEWS | 2 +- perl-install/install/NEWS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index ff1b8634e..7f40afeb3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,7 +1,7 @@ Version 16.7 - 5 December 2013 - diskdrake: - o fix a crash when creating partitins (mga#11876) + o fix a crash when creating partitions (mga#11876) Version 16.6 - 4 December 2013 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index df69ea679..c0dd77dd1 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,7 +1,7 @@ Version 16.7 - 5 December 2013 - partitioning: - o fix a crash when creating partitins (mga#11876) + o fix a crash when creating partitions (mga#11876) Version 16.6 - 4 December 2013 -- cgit v1.2.1 From e889be299095f38df484a75e5c8ee9cb7f007b36 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Dec 2013 22:39:48 +0100 Subject: Revert "fix 'Too late to run INIT' with Gtk3" This reverts commit 527a624d8825348bcd9bd2ec0005409a89230315. Thus preventing drakxtools-backend to require Glib::Object::Introspection (mga#11842). The "Too late to run INIT" warning will happen anyway... --- perl-install/NEWS | 2 ++ perl-install/interactive.pm | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 7f40afeb3..ae2f16fe0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- prevent drakxtools-backend to require Glib::Object::Introspection (mga#11842) + Version 16.7 - 5 December 2013 - diskdrake: diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 9d5c6c3f3..34ae7a4de 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -112,10 +112,7 @@ sub vnew { } require_root_capability() if $su; if (check_for_xserver()) { - eval { - use Glib::Object::Introspection; - require interactive::gtk; - }; + eval { require interactive::gtk }; if (!$@) { my $o = interactive::gtk->new; if ($o_icon && $o_icon ne 'default' && !$::isWizard) { $o->{icon} = $o_icon } else { undef $o->{icon} } -- cgit v1.2.1 From 0cb50ec11165e41dae65bcb62d85129eb6cd4c31 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Dec 2013 22:43:53 +0100 Subject: 16.8 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 36019567a..6a2d8b65c 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.7 +VERSION:=16.8 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index ae2f16fe0..d3d195ee2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.8 - 5 December 2013 + - prevent drakxtools-backend to require Glib::Object::Introspection (mga#11842) Version 16.7 - 5 December 2013 -- cgit v1.2.1 From 7a946b33b5cc08b4ee85994d44ea60c6dc73ebf0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 11:29:40 +0100 Subject: fix retrieving network info from stage2 after dracut migration (mga#11504) dracut is now creating /tmp/ifcfg & /tmp/ifcfg-leases directories... --- perl-install/install/NEWS | 2 ++ perl-install/install/install2.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index c0dd77dd1..42c4cfe47 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix retrieving network info from stage2 after dracut migration (mga#11504) + Version 16.7 - 5 December 2013 - partitioning: diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index f6e30e8d8..661f3d4a8 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -415,7 +415,7 @@ sub read_stage1_net_conf() { #- get stage1 network configuration if any. log::l('found /tmp/network'); add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network')); - if (my ($file) = glob_('/tmp/ifcfg-*')) { + if (my ($file) = grep { -f $_ } glob_('/tmp/ifcfg-*')) { log::l("found network config file $file"); my $l = network::network::read_interface_conf($file); $o->{net}{ifcfg}{$l->{DEVICE}} ||= $l; -- cgit v1.2.1 From 338596b72f464cc01cffdb52914b5a67155d84d8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 11:31:07 +0100 Subject: 16.9 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 6a2d8b65c..acc21fccb 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.8 +VERSION:=16.9 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 42c4cfe47..dc73d857a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.9 - 6 December 2013 + - fix retrieving network info from stage2 after dracut migration (mga#11504) Version 16.7 - 5 December 2013 -- cgit v1.2.1 From 26d6fd17010abe9ffff058d8578d335a82d2f7cb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 14:32:43 +0100 Subject: add 'use_markup' parameter to Expanders --- perl-install/mygtk3.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index d3564a31c..a4f790d89 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -737,6 +737,7 @@ sub _gtk__Expander { } else { $w = Gtk3::Expander->new(delete $opts->{text} || ''); } + $w->set_use_markup(delete $opts->{use_markup}) if exists $opts->{use_markup}; $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate}; -- cgit v1.2.1 From af70f77e2a0860fbcbf01f4b6ac28bfa6fea9c6b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 14:35:22 +0100 Subject: (reallyChooseGroups) make bottom buttons always available by puting the scrolling window only around the package group check boxes --- perl-install/install/NEWS | 4 ++++ perl-install/install/steps_gtk.pm | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index dc73d857a..016ee9bfe 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- 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) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 3fc72b597..d5e0014d8 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -342,10 +342,8 @@ sub reallyChooseGroups { #- 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) } ugtk3::gtkadd($w->{window}, - gtknew('ScrolledWindow', child => - gtknew('VBox', children => [ - 1, $o->{gtk_display_compssUsers}->($entry), - 1, '', + 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), ), @@ -357,7 +355,7 @@ sub reallyChooseGroups { 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; -- cgit v1.2.1 From 5bb1ad14f7e51396c83ba3bf8452e1d14da38f3b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 14:38:06 +0100 Subject: (reallyChooseGroups) reindent after previous commit for clarity --- perl-install/install/steps_gtk.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index d5e0014d8..166bb7770 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -344,18 +344,18 @@ sub reallyChooseGroups { 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 }), - ]), - ], + 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; -- cgit v1.2.1 From df2bad0dab355858bf78c073b2ee7262cd206512 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 14:38:36 +0100 Subject: 16.10 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index acc21fccb..999524441 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.9 +VERSION:=16.10 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 016ee9bfe..145ddb876 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +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) -- cgit v1.2.1 From 04cc12c27f9aabca5af41ca25d6d082831bd8ec1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 15:05:00 +0100 Subject: fix a crash in rpmdrake when package list is empty (mga#11901) --- perl-install/NEWS | 2 ++ perl-install/ugtk3.pm | 1 + 2 files changed, 3 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index d3d195ee2..60afabf72 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix a crash in rpmdrake when package list is empty (mga#11901) + Version 16.8 - 5 December 2013 - prevent drakxtools-backend to require Glib::Object::Introspection (mga#11842) diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm index 445c50780..24447d236 100644 --- a/perl-install/ugtk3.pm +++ b/perl-install/ugtk3.pm @@ -242,6 +242,7 @@ sub gtktreeview_children { my @l; $model or return; my $p = $model->iter_children($iter); + $p or return; while ($model->iter_next($p)) { push @l, $p->copy; } -- cgit v1.2.1 From 42f6225c10bdcbfcf82d665f78502ace79eb0c68 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 15:05:18 +0100 Subject: 16.11 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 999524441..ea49e2bda 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.10 +VERSION:=16.11 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 60afabf72..0f137de52 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.11 - 6 December 2013 + - fix a crash in rpmdrake when package list is empty (mga#11901) Version 16.8 - 5 December 2013 -- cgit v1.2.1 From affee68a7ba250ba531750892a8ffe09c7dd6129 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 23:00:14 +0100 Subject: kill dead comment --- perl-install/harddrake/sound.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index efad47d78..afe70fa72 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -1,14 +1,4 @@ package harddrake::sound; -# lists filled with Danny Tholen help, enhanced by Thierry Vignaud -# -# No ALSA for OSS's -# o isa cards: msnd_pinnacle, pas2, -# o pci cards: ad1889, sam9407 -# No OSS for ALSA's -# o pci cards: snd_als4000, snd_es968, snd_hdsp -# o isa cards: snd_azt2320, snd_cs4231, snd_cs4236, -# snd_dt0197h, snd_korg1212, snd_rme32 -# o pcmcia cards: snd_vxp440 snd_vxpocket # TODO: # o ensure sound is not user (either dsp/midi/sequencer/mixer) -- cgit v1.2.1 From aaa94627d295056084f8be4a4778c3217135d729 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 23:02:57 +0100 Subject: kill message about alternative driver (mga#11824) the sound card description is kept b/c next messages start by "\n\n" --- perl-install/harddrake/sound.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index afe70fa72..bda359eb2 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -186,8 +186,7 @@ sub config { } } elsif ($in->ask_from_({ title => N("Sound configuration"), messages => - N("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s).", - $device->{description}) . + $device->{description}. #-PO: here the first %s is either "OSS" or "ALSA", #-PO: the second %s is the name of the current driver #-PO: and the third %s is the name of the default driver -- cgit v1.2.1 From be494369a6e372fa0fd0032220d4ffd83f39ce4e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 23:03:44 +0100 Subject: perl_checker cleanup --- perl-install/harddrake/sound.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index bda359eb2..5f19882c0 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -186,7 +186,7 @@ sub config { } } elsif ($in->ask_from_({ title => N("Sound configuration"), messages => - $device->{description}. + $device->{description} . #-PO: here the first %s is either "OSS" or "ALSA", #-PO: the second %s is the name of the current driver #-PO: and the third %s is the name of the default driver -- cgit v1.2.1 From 5af5435290d13142aedcf6c9787dfa7cd204cac1 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 6 Dec 2013 23:05:03 +0100 Subject: do not try to guess if driver is OSS or not, they all are ALSA --- perl-install/harddrake/sound.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 5f19882c0..754c7aa89 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -187,10 +187,10 @@ sub config { } elsif ($in->ask_from_({ title => N("Sound configuration"), messages => $device->{description} . - #-PO: here the first %s is either "OSS" or "ALSA", + #-PO: here the first %s is either "ALSA", #-PO: the second %s is the name of the current driver #-PO: and the third %s is the name of the default driver - N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", ($driver =~ /^snd_/ ? "ALSA " : "OSS "), $driver, $device->{driver}), + N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", "ALSA ", $driver, $device->{driver}), interactive_help => sub { N("OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API. What's more, OSS drivers all reinvent the wheel. -- cgit v1.2.1 From c0ccdccb16f6d9211ad5c8e13e3fd67f0562623a Mon Sep 17 00:00:00 2001 From: Marek Laane Date: Fri, 6 Dec 2013 16:53:32 +0200 Subject: Updated Estonian translations --- perl-install/install/share/po/et.po | 42 +++++++++++------------ perl-install/share/po/et.po | 6 ++-- perl-install/standalone/po/et.po | 67 ++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 63 deletions(-) diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po index 603a4c372..7e0a1526d 100644 --- a/perl-install/install/share/po/et.po +++ b/perl-install/install/share/po/et.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: drakx_install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-05-03 14:04+0000\n" +"PO-Revision-Date: 2013-12-06 13:42+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: LANGUAGE \n" "Language: et\n" @@ -739,31 +739,32 @@ msgid "" msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "KDE tööjaam" +msgstr "XFCE tööjaam" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" -msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega" +msgstr "" +"Kergemat sorti graafiline töökeskkond koos kasutajasõbralike rakendustega" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "GNOME tööjaam" +msgstr "MATE tööjaam" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Tööjaam" +msgstr "Cinnamoni tööjaam" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Graafiline keskkond" +msgstr "GNOME-l põhinev graafiline keskkond" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -776,30 +777,29 @@ 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 " +"Kergemat sorti kiire graafiline töökeskkond koos kasutajasõbralike " "rakenduste ja tööriistadega" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Kohandatud töölaud" +msgstr "RazorQT töölaud" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Kergemat sorti kiire graafiline töökeskkond" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Enlightenment e17 töölaud" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" -"Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike " -"rakenduste ja tööriistadega" +"Kergemat sorti kiire graafiline töökeskkond andunud kasutajaskonnaga" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -807,9 +807,9 @@ msgid "Other Graphical Desktops" msgstr "Muud graafilised töölauad" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "WindowMaker, Enlightenment, Fvwm jt" +msgstr "Window Maker, Fvwm jt" #: share/meta-task/compssUsers.pl:217 #, c-format diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po index 8ca0a5d06..c16b60091 100644 --- a/perl-install/share/po/et.po +++ b/perl-install/share/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-05-05 23:21+0000\n" +"PO-Revision-Date: 2013-12-06 15:37+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: LANGUAGE \n" "Language: et\n" @@ -6193,9 +6193,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi on Zeroconfi deemon, mis teostab mDNS protokollistikku" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "NTP server" +msgstr "NTP klient/server" #: services.pm:27 #, c-format diff --git a/perl-install/standalone/po/et.po b/perl-install/standalone/po/et.po index 22676b79c..e5d480a4f 100644 --- a/perl-install/standalone/po/et.po +++ b/perl-install/standalone/po/et.po @@ -2,13 +2,13 @@ # Copyright (C) 2003 Free Software Foundation, Inc. # Riho Kurg , 1999-2003. # Marek Laane , 2002-2010. -# Marek Laane , 2011. +# Marek Laane , 2011, 2013. # msgid "" msgstr "" "Project-Id-Version: drakx_standalone\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-01-21 16:25+0000\n" +"PO-Revision-Date: 2013-12-06 15:24+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: LANGUAGE \n" "Language: et\n" @@ -3374,121 +3374,110 @@ msgid "Language & country configuration" msgstr "Keele ja riigi seadistamine" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "E-kirjaga hoiatamise seadistamine" +msgstr "Mageia autentimise seadistamise käivitamine" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" -msgstr "" +msgstr "Mageia autentimise seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Alglaadimise seadistamine" +msgstr "Mageia alglaadimise seadistamise käivitamine" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "Mageia alglaadimise seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "E-kirjaga hoiatamise seadistamine" +msgstr "Mageia kuupäeva ja kellaaja seadistamise käivitamine" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" -msgstr "" +msgstr "Mageia kuupäeva ja kellaaja seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Mageia kettajagamise programmi käivitamine" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "" +msgstr "Mageia kettajagamise programm nõuab autentimist" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Keele ja riigi seadistamine" +msgstr "Mageia sisselogimishalduri seadistamise käivitamine" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "Mageia sisselogimishalduri seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Keele ja riigi seadistamine" +msgstr "Mageia fontide seadistamise käivitamine" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "Mageia fontide seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Graafikaserveri seadistamine" +msgstr "Mageia riistvara seadistamise käivitamine" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Mageia riistvara seadistamine nõuab autentimist" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Mageia loginäitaja käivitamine" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Mageia loginäitaja käivitamine nõuab autentimist" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Graafikaserveri seadistamine" +msgstr "Mageia turbeõiguste seadistamise käivitamine" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" -msgstr "" +msgstr "Mageia turbeõiguste seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Graafikaserveri seadistamine" +msgstr "Mageia skanneri seadistamise käivitamine" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Mageia skanneri seadistamine nõuab autentimist" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "E-kirjaga hoiatamise seadistamine" +msgstr "Mageia rakenduste turbe seadistamise käivitamine" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" -msgstr "" +msgstr "Mageia rakenduste turbe seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "UPS-i seadistamine" +msgstr "Mageia UPS-i seadistamise käivitamine" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Mageia UPS-i seadistamine nõuab autentimist" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Graafikaserveri seadistamine" +msgstr "Mageia teenuste seadistamise käivitamine" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" +msgstr "Mageia teenuste seadistamine nõuab autentimist" #~ msgid "Verbose" #~ msgstr "Jutukas" -- cgit v1.2.1 From 645e6932216fddd154865a9bebb0fd0e3beed301 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 1 Dec 2013 20:57:39 +0000 Subject: rescue: Avoid having to run dracut convertfs script by setting up the tree. We can easily avoid post processing the tree simply by moving the tree around and ensuring we set it up correctly (with the compat symlinks) early in the process. --- rescue/make_rescue_img | 15 +++++++++------ rescue/tree/bin/login | 2 -- rescue/tree/sbin/fakeshutdown | 39 --------------------------------------- rescue/tree/usr/bin/login | 2 ++ rescue/tree/usr/sbin/fakeshutdown | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 47 deletions(-) delete mode 100755 rescue/tree/bin/login delete mode 100755 rescue/tree/sbin/fakeshutdown create mode 100755 rescue/tree/usr/bin/login create mode 100755 rescue/tree/usr/sbin/fakeshutdown diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 18c045acb..432a6cf94 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -15,20 +15,23 @@ BEGIN { undef *_ } sub __ { print @_, "\n"; system(@_) } sub _ { __ @_; $? and die } +my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); _ "rm -rf $tmp" if -e $tmp; -_ "mkdir $tmp"; +_ "mkdir -p $tmp/usr/{bin,sbin,lib}"; +_ "ln -s usr/bin $tmp/bin"; +_ "ln -s usr/sbin $tmp/sbin"; +_ "ln -s usr/lib $tmp/lib"; +if ($arch eq "x86_64") { + _ "mkdir $tmp/usr/lib64"; + _ "ln -s usr/lib64 $tmp/lib64"; +} _ 'find . -name "*~" | xargs rm -f'; mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); _ "cp -a tree/* $tmp"; -_ "find $tmp -name .svn | xargs rm -rf"; substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; _ "../tools/install-xml-file-list list.xml $tmp"; -# / -> /usr move -_ "mkdir -p $tmp/usr/{,s}bin"; -_ "/usr/lib/dracut/modules.d/30convertfs/convertfs.sh $tmp"; - my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); foreach (keyboard::loadkeys_files(sub { warn @_ })) { diff --git a/rescue/tree/bin/login b/rescue/tree/bin/login deleted file mode 100755 index 4b2816926..000000000 --- a/rescue/tree/bin/login +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /bin/bash --login diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown deleted file mode 100755 index 309f26c6c..000000000 --- a/rescue/tree/sbin/fakeshutdown +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl - -# -# Guillaume Cottenceau (gc) -# -# Copyright 2001 Mandrakesoft -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -# From MDK::Common: -sub cat_ { open(my $F, '<', $_[0]) or die "cat of file $_[0] failed: $!\n"; my @l = <$F>; wantarray() ? @l : join '', @l } -print "\n"; - - -#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..) -print "Umounting:\n"; -my @mounts = cat_('/proc/mounts'); -my $something_moved; -do { - $something_moved = 0; - foreach (@mounts) { - my $where = (split)[1]; - next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-( - if (!system("umount $where 2>/dev/null")) { - print "\t$where\n"; - $something_moved++; - } - } -} while $something_moved; - - -#- shutdown with init -exec '/sbin/init', 6; diff --git a/rescue/tree/usr/bin/login b/rescue/tree/usr/bin/login new file mode 100755 index 000000000..4b2816926 --- /dev/null +++ b/rescue/tree/usr/bin/login @@ -0,0 +1,2 @@ +#!/bin/sh +exec /bin/bash --login diff --git a/rescue/tree/usr/sbin/fakeshutdown b/rescue/tree/usr/sbin/fakeshutdown new file mode 100755 index 000000000..309f26c6c --- /dev/null +++ b/rescue/tree/usr/sbin/fakeshutdown @@ -0,0 +1,39 @@ +#!/usr/bin/perl + +# +# Guillaume Cottenceau (gc) +# +# Copyright 2001 Mandrakesoft +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +# From MDK::Common: +sub cat_ { open(my $F, '<', $_[0]) or die "cat of file $_[0] failed: $!\n"; my @l = <$F>; wantarray() ? @l : join '', @l } +print "\n"; + + +#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..) +print "Umounting:\n"; +my @mounts = cat_('/proc/mounts'); +my $something_moved; +do { + $something_moved = 0; + foreach (@mounts) { + my $where = (split)[1]; + next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-( + if (!system("umount $where 2>/dev/null")) { + print "\t$where\n"; + $something_moved++; + } + } +} while $something_moved; + + +#- shutdown with init +exec '/sbin/init', 6; -- cgit v1.2.1 From c4634f60b5c6d67eedfedc02166499884e4d6625 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 1 Dec 2013 22:29:20 +0000 Subject: rescue: Use systemd as initsystem. This commit converts the rescue system to systemd rather than the legacy sysvinit. Besides being faster, one primary advantage of running systemd here is that we can "boot" the system we're inspecting via systemd-nspawn to properly test it. Note: Bits that don't work: * nspawn * old dracut initqueue udev rules in /etc/ are not cleaned out (drop in support error?) * the gui may loop differently now --- rescue/NEWS | 2 + rescue/aliases | 2 + rescue/dirs | 9 ++- rescue/list.xml | 92 ++++++++++++++++++++-- rescue/make_rescue_img | 13 +-- rescue/tree/etc/hostname | 1 + rescue/tree/etc/inittab | 16 ---- rescue/tree/etc/passwd | 2 - rescue/tree/etc/rc.reboot | 8 -- rescue/tree/etc/rc.sysinit | 87 -------------------- rescue/tree/usr/bin/mageia-rescue | 35 ++++++++ rescue/tree/usr/lib/CVS. | 0 .../tree/usr/lib/modules-load.d/mageia-rescue.conf | 17 ++++ rescue/tree/usr/lib/systemd/system/rescue.service | 20 +++++ .../systemd-udevd.service.d/dracut-rules.conf | 1 + rescue/tree/usr/sbin/fakeshutdown | 39 --------- rescue/tree/usr/share/symlinks | 4 - 17 files changed, 178 insertions(+), 170 deletions(-) create mode 100644 rescue/tree/etc/hostname delete mode 100644 rescue/tree/etc/inittab delete mode 100755 rescue/tree/etc/rc.reboot delete mode 100755 rescue/tree/etc/rc.sysinit create mode 100755 rescue/tree/usr/bin/mageia-rescue delete mode 100644 rescue/tree/usr/lib/CVS. create mode 100644 rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf create mode 100644 rescue/tree/usr/lib/systemd/system/rescue.service create mode 100644 rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf delete mode 100755 rescue/tree/usr/sbin/fakeshutdown delete mode 100644 rescue/tree/usr/share/symlinks diff --git a/rescue/NEWS b/rescue/NEWS index bb85b4dbd..7f84b4b3e 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,5 @@ +- use systemd as init in the rescue system + Version 1.46 - 20 October 2013 by Colin Guthrie - adapt to a dracut based stage1 diff --git a/rescue/aliases b/rescue/aliases index 59c96a124..ebb5a462e 100644 --- a/rescue/aliases +++ b/rescue/aliases @@ -1,2 +1,4 @@ /bin/vi vim-minimal /lib/modules /modules +/usr/sbin/init /usr/lib/systemd/systemd +/usr/lib/systemd/system/default.target rescue.target diff --git a/rescue/dirs b/rescue/dirs index 6b6d88a6f..256a7f0f7 100644 --- a/rescue/dirs +++ b/rescue/dirs @@ -1,4 +1,9 @@ -/lib +/dev +/proc +/run +/sys +/usr/bin +/usr/sbin +/usr/lib /tmp /modules -/proc diff --git a/rescue/list.xml b/rescue/list.xml index fb73f4df4..fd5a829a2 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -150,12 +150,6 @@ - - - init - - - /usr/lib/kbd/keymaps/include @@ -272,10 +266,94 @@ + systemd + systemd-cgroups-agent + systemd-shutdown + systemd-reply-password + systemd-fsck systemd-udevd + systemd-journald + systemd-sysctl + systemd-modules-load + systemd-vconsole-setup + system-generators/systemd-fstab-generator + + + + cryptsetup.target + emergency.target + sysinit.target + basic.target + halt.target + kexec.target + local-fs.target + local-fs-pre.target + remote-fs.target + remote-fs-pre.target + network.target + nss-lookup.target + nss-user-lookup.target + poweroff.target + reboot.target + rescue.target + rpcbind.target + shutdown.target + final.target + sigpwr.target + sockets.target + swap.target + timers.target + paths.target + umount.target + kmod-static-nodes.service + systemd-tmpfiles-setup-dev.service + systemd-ask-password-console.path + systemd-udevd-control.socket + systemd-udevd-kernel.socket + systemd-ask-password-plymouth.path + systemd-journald.socket + systemd-ask-password-console.service + systemd-modules-load.service + systemd-halt.service + systemd-poweroff.service + systemd-reboot.service + systemd-kexec.service + systemd-fsck@.service + systemd-udevd.service + systemd-udev-trigger.service + systemd-udev-settle.service + systemd-ask-password-plymouth.service + systemd-journald.service + systemd-vconsole-setup.service + + sysinit.target.wants/systemd-modules-load.service + sysinit.target.wants/systemd-ask-password-console.path + sysinit.target.wants/systemd-journald.service + sockets.target.wants/systemd-udevd-control.socket + sockets.target.wants/systemd-udevd-kernel.socket + sockets.target.wants/systemd-journald.socket + sysinit.target.wants/systemd-udevd.service + sysinit.target.wants/systemd-udev-trigger.service + sysinit.target.wants/kmod-static-nodes.service + sysinit.target.wants/systemd-tmpfiles-setup-dev.service + + ctrl-alt-del.target + syslog.socket + + slices.target + system.slice + + + + journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles systemd-nspawn + + + + ata_id + scsi_id - + 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 432a6cf94..50083d0b0 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -17,7 +17,7 @@ sub _ { __ @_; $? and die } my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); _ "rm -rf $tmp" if -e $tmp; -_ "mkdir -p $tmp/usr/{bin,sbin,lib}"; +_ "mkdir -p $tmp"; _ "ln -s usr/bin $tmp/bin"; _ "ln -s usr/sbin $tmp/sbin"; _ "ln -s usr/lib $tmp/lib"; @@ -25,13 +25,16 @@ if ($arch eq "x86_64") { _ "mkdir $tmp/usr/lib64"; _ "ln -s usr/lib64 $tmp/lib64"; } -_ 'find . -name "*~" | xargs rm -f'; -mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); _ "cp -a tree/* $tmp"; +_ "find $tmp -name '*~' -delete"; +mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; _ "../tools/install-xml-file-list list.xml $tmp"; +_ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release"; +_ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks"; + my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); foreach (keyboard::loadkeys_files(sub { warn @_ })) { @@ -56,11 +59,11 @@ foreach (cat_("aliases")) { if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) { substInFile { $_ = "export LANGUAGE=$LANGUAGE\n" . "export LC_ALL=$LANGUAGE\n" if /^#LANGUAGE/; - } "$tmp/etc/rc.sysinit"; + } "$tmp/usr/bin/mageia-rescue"; } exit 0 if $ARGV[0]; _ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null"; _ "chmod 755 $rescue"; -_ "rm -rf $tmp"; +#_ "rm -rf $tmp"; diff --git a/rescue/tree/etc/hostname b/rescue/tree/etc/hostname new file mode 100644 index 000000000..344f71bc8 --- /dev/null +++ b/rescue/tree/etc/hostname @@ -0,0 +1 @@ +rescue diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab deleted file mode 100644 index 6a30c0360..000000000 --- a/rescue/tree/etc/inittab +++ /dev/null @@ -1,16 +0,0 @@ -#Inittab for Mageia Rescue Disk -#Author: Daouda Lo -id:3:initdefault: - -si::sysinit:/etc/rc.sysinit -re:6:wait:/etc/rc.reboot -ca:12345:ctrlaltdel:/sbin/fakeshutdown - -1:12345:respawn:/sbin/mingetty --autologin root tty1 -2:23:respawn:/sbin/mingetty --autologin root tty2 -3:23:respawn:/sbin/mingetty --autologin root tty3 -4:23:respawn:/sbin/mingetty --autologin root tty4 -5:23:respawn:/sbin/mingetty --autologin root tty5 -6:23:respawn:/sbin/mingetty --autologin root tty6 -s0:2345:respawn:/sbin/agetty -h -t 60 ttyS0 9600 ansi -#s1:2345:respawn:/sbin/agetty -h -t 60 ttyS1 115200,9600 linux diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd index 3a1254f77..06677c9bf 100644 --- a/rescue/tree/etc/passwd +++ b/rescue/tree/etc/passwd @@ -1,3 +1 @@ root::0:0::/root:/bin/bash -shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown -halt:*:7:0:halt:/sbin:/sbin/halt diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot deleted file mode 100755 index 0b67416f1..000000000 --- a/rescue/tree/etc/rc.reboot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -sleep 1 -/sbin/killall5 -9 - -umount -a -f -t noproc - -reboot -i -d diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit deleted file mode 100755 index 551a4bc76..000000000 --- a/rescue/tree/etc/rc.sysinit +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -action() { echo $1; shift; $*; } -DATE=`date +%Y%m%d-%Hh%M` - -export PATH=/bin:/sbin:/usr/bin:/usr/sbin - -echo -e "\t\t\tWelcome to \\033[1;36mMageia\\033[0;39m Linux" - -action "Remounting root filesystem in read-write mode" mount -n -o remount,rw / - -echo "Starting udev" -mkdir /run -mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run -mkdir -p /run/udev/rules.d -export UDEVRULESD=/run/udev/rules.d - -/usr/lib/systemd/systemd-udevd --daemon --resolve-names=never -udevadm trigger --type=subsystems --action=add -udevadm trigger --type=devices --action=add - -ln -s /tmp/stage2/etc/* /etc 2>/dev/null -# make passwd changable -rm -f /etc/passwd -cp /tmp/stage2/etc/passwd /etc/ - -mkdir -p /mnt /var/log - ->/etc/mtab -mount -f / -mount -f /proc - -# Set the hostname. -action "Setting hostname rescue" hostname rescue -echo rescue > /etc/HOSTNAME - -# Loads common modules ( no kerneld :( ) -echo "Loading additional modules..." -load() { modprobe $* 2>/dev/null; } -load ide-gd_mod -load ide-cd_mod -load floppy -load af_packet -load isofs -load vfat -load ext3 -load ext4 -load reiserfs -load nilfs2 -load btrfs -load xfs -load jfs -load loop -load fuse -load sd_mod -load sr_mod - -action "Bringing up local loop interface" ifconfig lo up - -# disable the weird echoprt in cooked mode for user interaction: -stty sane - -#LANGUAGE (filled by make_rescue_img) - -grep -q noauto /proc/cmdline || drvinst SERIAL_USB - -partimage_default_dir=/data/box -partimage_dir=`perl -lne 'print $1 if /BOX=(\S+)/' /proc/cmdline` -[ -z "$partimage_dir" ] && partimage_dir=$partimage_default_dir -partimage_server=`perl -lne 'print $1 if /\bpserver=(\S+)/' /proc/cmdline` - -if grep -q save_all /proc/cmdline; then - partimage_whole_disk -s $partimage_server save_all $partimage_default_dir -elif grep -q rest_all /proc/cmdline; then - if [ -d /tmp/image$partimage_dir ]; then - partimage_whole_disk rest_all /tmp/image$partimage_dir - else - partimage_whole_disk -s $partimage_server rest_all $partimage_dir - fi -elif grep -q oem /proc/cmdline; then - /tmp/image/oem-rescue.sh -elif grep -q restore /proc/cmdline; then - /usr/sbin/restore-image.sh -elif ! grep -q expert /proc/cmdline; then - echo "starting GUI" - rescue-gui -fi diff --git a/rescue/tree/usr/bin/mageia-rescue b/rescue/tree/usr/bin/mageia-rescue new file mode 100755 index 000000000..c9dd35661 --- /dev/null +++ b/rescue/tree/usr/bin/mageia-rescue @@ -0,0 +1,35 @@ +#!/bin/sh + +# disable the weird echoprt in cooked mode for user interaction: +stty sane + +#LANGUAGE (filled by make_rescue_img) + +grep -q noauto /proc/cmdline || drvinst SERIAL_USB + +partimage_default_dir=/data/box +partimage_dir=`perl -lne 'print $1 if /BOX=(\S+)/' /proc/cmdline` +[ -z "$partimage_dir" ] && partimage_dir=$partimage_default_dir +partimage_server=`perl -lne 'print $1 if /\bpserver=(\S+)/' /proc/cmdline` + +LOOP="" +if grep -q save_all /proc/cmdline; then + partimage_whole_disk -s $partimage_server save_all $partimage_default_dir +elif grep -q rest_all /proc/cmdline; then + if [ -d /tmp/image$partimage_dir ]; then + partimage_whole_disk rest_all /tmp/image$partimage_dir + else + partimage_whole_disk -s $partimage_server rest_all $partimage_dir + fi +elif grep -q oem /proc/cmdline; then + /tmp/image/oem-rescue.sh +elif grep -q restore /proc/cmdline; then + /usr/sbin/restore-image.sh +elif ! grep -q expert /proc/cmdline; then + rescue-gui && LOOP=y +fi + +while [ "$LOOP" ]; do + bash --login + rescue-gui +done diff --git a/rescue/tree/usr/lib/CVS. b/rescue/tree/usr/lib/CVS. deleted file mode 100644 index e69de29bb..000000000 diff --git a/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf b/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf new file mode 100644 index 000000000..4111c0484 --- /dev/null +++ b/rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf @@ -0,0 +1,17 @@ +ide-gd_mod +ide-cd_mod +floppy +af_packet +isofs +vfat +ext3 +ext4 +reiserfs +nilfs2 +btrfs +xfs +jfs +loop +fuse +sd_mod +sr_mod diff --git a/rescue/tree/usr/lib/systemd/system/rescue.service b/rescue/tree/usr/lib/systemd/system/rescue.service new file mode 100644 index 000000000..336e06c22 --- /dev/null +++ b/rescue/tree/usr/lib/systemd/system/rescue.service @@ -0,0 +1,20 @@ +[Unit] +Description=Mageia Rescue +DefaultDependencies=no +Conflicts=shutdown.target +After=sysinit.target plymouth-start.service +Before=shutdown.target + +[Service] +Environment=HOME=/ +WorkingDirectory=/ +ExecStartPre=-/bin/plymouth quit +ExecStart=/usr/bin/mageia-rescue +ExecStopPost=-/usr/bin/systemctl --fail --no-block reboot +Type=idle +StandardInput=tty-force +StandardOutput=inherit +StandardError=inherit +KillMode=process +IgnoreSIGPIPE=no +SendSIGHUP=yes diff --git a/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf b/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf new file mode 100644 index 000000000..b75df2e4e --- /dev/null +++ b/rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf @@ -0,0 +1 @@ +ExecStartPre=-/usr/bin/rm -f /etc/udev/rules.d/10-console.rules diff --git a/rescue/tree/usr/sbin/fakeshutdown b/rescue/tree/usr/sbin/fakeshutdown deleted file mode 100755 index 309f26c6c..000000000 --- a/rescue/tree/usr/sbin/fakeshutdown +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl - -# -# Guillaume Cottenceau (gc) -# -# Copyright 2001 Mandrakesoft -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -# From MDK::Common: -sub cat_ { open(my $F, '<', $_[0]) or die "cat of file $_[0] failed: $!\n"; my @l = <$F>; wantarray() ? @l : join '', @l } -print "\n"; - - -#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..) -print "Umounting:\n"; -my @mounts = cat_('/proc/mounts'); -my $something_moved; -do { - $something_moved = 0; - foreach (@mounts) { - my $where = (split)[1]; - next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-( - if (!system("umount $where 2>/dev/null")) { - print "\t$where\n"; - $something_moved++; - } - } -} while $something_moved; - - -#- shutdown with init -exec '/sbin/init', 6; diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks deleted file mode 100644 index 091153872..000000000 --- a/rescue/tree/usr/share/symlinks +++ /dev/null @@ -1,4 +0,0 @@ -/boot -/etc/fstab -/etc/inittab -/etc/rc.sysinit -- cgit v1.2.1 From 8faa57a8737a0e1a163fbd91d86065784ea5d44d Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 22:28:45 +0000 Subject: rescue: add machined (and dbus as a dep) to the rescue. This allows us to actually mount and run the system inside a container for more advanced debugging. I've successfully booted my systemd, logged in, had a fiddle and then powered it off again. There are some delays and it's requried to umount the /mnt/proc which seems to get automatically mounted before running nspawn. Also audit support has to be turned off in the kernel too to allow a full boot to work properly (otherwise the authentication in the container doesn't work. This is a known problem in the kernel and will be fixed eventually. --- rescue/NEWS | 1 + rescue/aliases | 2 ++ rescue/list.xml | 15 ++++++++++++++- rescue/make_rescue_img | 1 + rescue/tree/etc/passwd | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/rescue/NEWS b/rescue/NEWS index 7f84b4b3e..cf8d6e3cf 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,4 +1,5 @@ - use systemd as init in the rescue system +- allowing systemd-nspawn "booting" of a mounted /mnt (after umount /mnt/proc) Version 1.46 - 20 October 2013 by Colin Guthrie - adapt to a dracut based stage1 diff --git a/rescue/aliases b/rescue/aliases index ebb5a462e..d92ea8ccf 100644 --- a/rescue/aliases +++ b/rescue/aliases @@ -2,3 +2,5 @@ /lib/modules /modules /usr/sbin/init /usr/lib/systemd/systemd /usr/lib/systemd/system/default.target rescue.target +/usr/lib/systemd/system/rescue.target.wants/sockets.target ../sockets.target +/usr/lib/systemd/system/dbus-org.freedesktop.machine1.service systemd-machined.service diff --git a/rescue/list.xml b/rescue/list.xml index fd5a829a2..29139f46d 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -273,6 +273,7 @@ systemd-fsck systemd-udevd systemd-journald + systemd-machined systemd-sysctl systemd-modules-load systemd-vconsole-setup @@ -281,6 +282,8 @@ cryptsetup.target + dbus.service + dbus.socket emergency.target sysinit.target basic.target @@ -324,11 +327,13 @@ systemd-udev-settle.service systemd-ask-password-plymouth.service systemd-journald.service + systemd-machined.service systemd-vconsole-setup.service sysinit.target.wants/systemd-modules-load.service sysinit.target.wants/systemd-ask-password-console.path sysinit.target.wants/systemd-journald.service + sockets.target.wants/dbus.socket sockets.target.wants/systemd-udevd-control.socket sockets.target.wants/systemd-udevd-kernel.socket sockets.target.wants/systemd-journald.socket @@ -345,7 +350,15 @@ - journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles systemd-nspawn + journalctl systemctl echo swapoff systemd-cgls systemd-tmpfiles systemd-nspawn dbus-daemon machinectl + + + + /etc/dbus-1/system.conf + /etc/dbus-1/system.d/org.freedesktop.systemd1.conf + /etc/dbus-1/system.d/org.freedesktop.machine1.conf + /usr/share/dbus-1/system-services/org.freedesktop.systemd1.service + /usr/share/dbus-1/system-services/org.freedesktop.machine1.service diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 50083d0b0..4b4301c55 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -34,6 +34,7 @@ _ "../tools/install-xml-file-list list.xml $tmp"; _ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release"; _ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks"; +_ "mkdir -p $tmp/usr/lib/systemd/system/rescue.target.wants"; my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd index 06677c9bf..c0274a116 100644 --- a/rescue/tree/etc/passwd +++ b/rescue/tree/etc/passwd @@ -1 +1,2 @@ root::0:0::/root:/bin/bash +messagebus:x:1:1::/:/sbin/nologin -- cgit v1.2.1 From 2ad4c4fc0b990dd0db23cdee815ac2a13c60929d Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 23:02:52 +0000 Subject: rescue: Rebuild the image when anything in the tree folder is changed. --- rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescue/Makefile b/rescue/Makefile index 064670531..473bdd14a 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -10,7 +10,7 @@ all: $(RESCUE) install: $(RESCUE) cp -f $< $(STAGE2_DEST) -$(RESCUE): list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img +$(RESCUE): $(wildcard tree/**/*) list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img dist: tar -- cgit v1.2.1 From e7aedc3aa7e08f3337c86085c6da10ca83445024 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Dec 2013 23:40:22 +0000 Subject: rescue: Move files around and introduce proper dep tracking. This moves any perl files into bin and sbin folders which will be directly installed in /usr/bin and /usr/sbin. This is done such that the extract modes in list.xml still work and the files end up in the right places. All other files have been moved into the tree folder in their final destination. --- rescue/Makefile | 2 +- rescue/bin/drvinst | 38 +++ rescue/bin/guessmounts | 145 +++++++++++ rescue/bin/install_bootloader | 72 ++++++ rescue/bin/lsparts | 45 ++++ rescue/bin/rescue-doc | 57 +++++ rescue/bin/restore_ms_boot | 74 ++++++ rescue/diskdrake-resize | 29 --- rescue/drvinst | 38 --- rescue/genpasswd | 13 - rescue/grabjournallogs | 51 ---- rescue/guessmounts | 145 ----------- rescue/install_bootloader | 72 ------ rescue/list.xml | 29 +-- rescue/lsparts | 45 ---- rescue/partimage_whole_disk | 264 -------------------- rescue/rescue-doc | 57 ----- rescue/restore-image-lib.sh | 80 ------ rescue/restore-image.sh | 412 ------------------------------- rescue/restore_ms_boot | 74 ------ rescue/sbin/partimage_whole_disk | 264 ++++++++++++++++++++ rescue/startssh | 27 -- rescue/tree/usr/lib/restore-image-lib.sh | 80 ++++++ rescue/tree/usr/sbin/diskdrake-resize | 29 +++ rescue/tree/usr/sbin/genpasswd | 13 + rescue/tree/usr/sbin/grabjournallogs | 51 ++++ rescue/tree/usr/sbin/restore-image.sh | 412 +++++++++++++++++++++++++++++++ rescue/tree/usr/sbin/startssh | 27 ++ 28 files changed, 1317 insertions(+), 1328 deletions(-) create mode 100755 rescue/bin/drvinst create mode 100755 rescue/bin/guessmounts create mode 100755 rescue/bin/install_bootloader create mode 100755 rescue/bin/lsparts create mode 100755 rescue/bin/rescue-doc create mode 100755 rescue/bin/restore_ms_boot delete mode 100755 rescue/diskdrake-resize delete mode 100755 rescue/drvinst delete mode 100755 rescue/genpasswd delete mode 100755 rescue/grabjournallogs delete mode 100755 rescue/guessmounts delete mode 100755 rescue/install_bootloader delete mode 100755 rescue/lsparts delete mode 100755 rescue/partimage_whole_disk delete mode 100755 rescue/rescue-doc delete mode 100755 rescue/restore-image-lib.sh delete mode 100755 rescue/restore-image.sh delete mode 100755 rescue/restore_ms_boot create mode 100755 rescue/sbin/partimage_whole_disk delete mode 100755 rescue/startssh create mode 100755 rescue/tree/usr/lib/restore-image-lib.sh create mode 100755 rescue/tree/usr/sbin/diskdrake-resize create mode 100755 rescue/tree/usr/sbin/genpasswd create mode 100755 rescue/tree/usr/sbin/grabjournallogs create mode 100755 rescue/tree/usr/sbin/restore-image.sh create mode 100755 rescue/tree/usr/sbin/startssh diff --git a/rescue/Makefile b/rescue/Makefile index 473bdd14a..64e9119e3 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -10,7 +10,7 @@ all: $(RESCUE) install: $(RESCUE) cp -f $< $(STAGE2_DEST) -$(RESCUE): $(wildcard tree/**/*) list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img +$(RESCUE): $(wildcard tree/**/*) $(wildcard bin/*) $(wildcard sbin/*) make_rescue_img list.xml aliases DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img dist: tar diff --git a/rescue/bin/drvinst b/rescue/bin/drvinst new file mode 100755 index 000000000..4868b42e0 --- /dev/null +++ b/rescue/bin/drvinst @@ -0,0 +1,38 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2000-2005 Mandriva +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use detect_devices; + +$ARGV[0] =~ /^--?h/ and die "usage: drivers_install [drivertype1 [drivertype2 ...]]\n"; +my @types = @ARGV; + +sub install_module { + my ($driver, $descr) = @_; + print STDERR qq(Installing driver $driver (for "$descr")\n); + system("/sbin/modprobe", $driver) and print "\tfailed\n"; +} + +#- start +foreach my $card (detect_devices::pci_probe()) { + # ignoring "unknown", "Card:foobar" and the like as well as video cards: + $card->{driver} eq 'unknown' || $card->{driver} =~ /:/ and next; + $card->{media_type} eq "DISPLAY_VGA" and next; + + # load drivers for selected categories or for everything if no args: + if (!@ARGV || find { $card->{media_type} =~ /$_/i } @types) { + install_module($card->{driver}, $card->{description}); + } +} diff --git a/rescue/bin/guessmounts b/rescue/bin/guessmounts new file mode 100755 index 000000000..27b920c9d --- /dev/null +++ b/rescue/bin/guessmounts @@ -0,0 +1,145 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2001-2005 Mandriva +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use devices; +use fs; +use fs::dmcrypt; +use fs::proc_partitions; +use fs::type; +use lvm; +use run_program; + +my @proc_mounts = fs::read_fstab('', '/proc/mounts'); + +my $target = '/mnt'; + +if (fs::get::mntpoint2part($target, \@proc_mounts)) { + print STDERR "$target is already mounted (according to /proc/mounts)\n"; + exit 0; +} + +system('drvinst', 'STORAGE'); + +print STDERR "\nPlease wait, trying to find your root device...\n"; + +mkdir_p($target); + +{ + local $::isInstall = 1; # so that detect_during_install() got called by init: + lvm::init(); +} +fs::dmcrypt::init; + +my @parts = map { + $_->{device} = delete $_->{dev}; + put_in_hash($_, fs::type::type_subpart_from_magic($_)); +} fs::proc_partitions::read_raw(); +my ($raid_parts, $normal_parts) = partition { isRawRAID($_) } @parts; + +if (@$raid_parts) { + require raid; + raid::detect_during_install(@$raid_parts); + my $raids = raid::get_existing(@$raid_parts); + push @$normal_parts, @$raids; +} + +my @roots; + +my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); +foreach (@$normal_parts) { + my $dev = devices::make($_->{device}); + + my $fs = find { + system("mount -t $_ $dev $target 2>/dev/null") == 0; + } fs::type::true_local_fs_types() or next; + + if (my $release_file = common::release_file($target)) { + my $release = chomp_(cat_("$target$release_file")); + print STDERR "=> found a $release root partition on $dev\n=> type $fs, version `\n"; + my @fstab = fs::read_fstab($target, '/etc/fstab'); + my $h = common::parse_release_file($target, $release_file, $_); + add2hash($h, { dev => $dev, fs => $fs, fstab => \@fstab, + pretty_name => "$h->{release} $h->{version} $h->{arch} on $dev" }); + # Offer to rescue only same arch: + $h->{pretty_name} .= " (cannot be rescued: $h->{arch} ne $arch;)" if $h->{arch} ne $arch; + push @roots, $h; + } + system('umount', $target) == 0 or die "error unmounting $target\n"; +} + +my ($root, $fs, @fstab); + +# Try Mageia first: +if (@roots) { + # Order by release number: + @roots = sort { $b->{version} cmp $a->{version} } @roots; + # Then pick mga over mdv: + @roots = map { @$_ } partition { $_->{release} =~ /Mageia/ } @roots; + + my $selected; + if (@roots == 1) { + $selected = first(@roots); + } else { + print "\n\nWhich system do you want to rescue?\n0: Abort\n"; + each_index { print $::i + 1, ": $_->{pretty_name}\n" } @roots; + my $res; + while ($res < 1 || $res > @roots) { + print "what is your choice (type the number of your selection or C^c to abort)?\n"; + $res = <>; + chomp($res); + if ($res eq "0") { + print "Aborting\n"; + exit(1); + } + } + $selected = $roots[$res-1]; + } + + $root = $selected->{dev}; + $fs = $selected->{fs}; + @fstab = @{$selected->{fstab}}; + print STDERR "=> Selecting $root as root fs\n"; +} + +if ($root) { + system("mount -t $fs $root $target 2>/dev/null"); + + print STDERR "\nMounting other partitions from fstab on $target...\n"; + foreach (@fstab) { + my ($valued_options, $options) = fs::mount_options::unpack($_); + + next if + !$_->{fs_type} || $_->{device} eq 'none' + || $valued_options->{noauto} + || $_->{mntpoint} eq '/' + || member($_->{fs_type}, 'swap', 'nfs', 'ntfs', 'ntfs-3g'); + + delete $valued_options->{'iocharset='}; + delete $valued_options->{'codepage='}; + fs::mount_options::pack($_, $valued_options, $options); #- vfat opts, we don't have the modules in rescue + + my $where = "$target$_->{mntpoint}"; + my $dev = fs::wild_device::from_part('', $_); + mkdir_p($where); + print STDERR "\t$dev on $where type $_->{fs_type} options $_->{options}\n"; + system("mount -t $_->{fs_type} $dev $where -o $_->{options}"); + } + system("mount -t proc proc $target/proc"); + print STDERR "\nYour system is ready on $target.\n\n"; +} else { + die "Could not find your root device :-(.\n"; +} + diff --git a/rescue/bin/install_bootloader b/rescue/bin/install_bootloader new file mode 100755 index 000000000..7328de1d2 --- /dev/null +++ b/rescue/bin/install_bootloader @@ -0,0 +1,72 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau +# +# Copyright 2001-2005 Mandriva +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use bootloader; +use fs; + +my $auto; +if ($ARGV[0] eq '--auto') { + $auto = shift @ARGV; +} + +$::prefix = '/mnt'; + +my $release = common::mageia_release($::prefix) || + do { + system('guessmounts') == 0 or die 'guessmounts failed'; + common::mageia_release($::prefix); + }; + +if ($release) { + $release =~ /Mageia|Mandriva/ or die "release file doesn't contain '%s', exiting.\n"; +} elsif (fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ])) { + die "unknown distribution mounted in $::prefix\n"; +} else { + die "Your root device isn't mounted on $::prefix\n"; +} + +my @main_methods = bootloader::configured_main_methods(); + +my $main_method; +if (@main_methods == 0) { + die "Cannot find a configured boot loader\n"; +} elsif (@main_methods == 1) { + ($main_method) = @main_methods; +} else { + while (1) { + print "Configuration files for Boot Loaders ", join(' and ', @main_methods), " were found.\n"; + print "Which one one should be installed? "; + chomp($main_method = ); + if (member($main_method, @main_methods)) { + last; + } else { + print "bad choice\n"; + } + } +} + +my $install = $bootloader::{'install_raw_' . $main_method} or die "unknown bootloader method install_raw_$main_method\n"; + +print "About to re-install Boot Loader $main_method of following %s distribution:\n\t", + $release, "\n"; +if (!$auto) { + print "=> ok? "; + =~ /^n/i and exit 0; +} + +run_program::run('mount', '--bind', '/dev', "$::prefix/dev"); +$install->(); +run_program::run('umount', "$::prefix/dev"); diff --git a/rescue/bin/lsparts b/rescue/bin/lsparts new file mode 100755 index 000000000..8d36a02f4 --- /dev/null +++ b/rescue/bin/lsparts @@ -0,0 +1,45 @@ +#!/usr/bin/perl +# +# Main author Pascal Rigaux (pixel) +# Put together by Guillaume Cottenceau +# +# Copyright 1999-2005 Mandriva +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +# Detects partition types using signatures +# + +use lib qw(/usr/lib/libDrakX); +use common; +use fs::type; +use fs::proc_partitions; + +my $params = join '', @ARGV; +my $verbose = $params =~ /-v/; + +$params =~ /-h/ and die "usage: lsparts [-v]\n"; + + +foreach (fs::proc_partitions::read_raw()) { + if (my $err = $_->{size} <= 1 ? + "Skipping <$_->{dev}> because too little blocks ($_->{size})" : + $_->{dev} !~ /\d$/ ? + "Skipping <$_->{dev}> because doesn't end with a number (e.g. seems to not be a partition)" : + $_->{dev} =~ /^loop\d+$/ ? + "Skipping <$_->{dev}>" : + '') { + print STDERR "$err\n" if $verbose; + } else { + $_->{device} = $_->{dev}; + if (my $type = fs::type::type_subpart_from_magic($_)) { + printf "$_->{dev}: %6s, fs %s (%s)\n", formatXiB($_->{size} * 512), $type->{fs_type}, fs::type::part2type_name($type); + } + } +} diff --git a/rescue/bin/rescue-doc b/rescue/bin/rescue-doc new file mode 100755 index 000000000..e6514b462 --- /dev/null +++ b/rescue/bin/rescue-doc @@ -0,0 +1,57 @@ +#!/usr/bin/perl + +# From MDK::Common: +sub output { my $f = shift; open(my $F, ">$f") or die "output in file $f failed: $!\n"; print $F $_ foreach @_ } + +output('/tmp/rescue-doc-contents', q( + Information regarding problems not directly addressed + by this rescue. + + +Are you certain "rescue mode" is the best tool for your specific +problem? + +The rescue system on this CD is a very basic text-based +environment for rescuing systems that no longer boot. You will +not find an easy-to-use graphical environment in this rescue +system, nor the detection/configuration libraries. + + +The vast majority of problems that can affect a Linux system are +much easier to repair on a running system than by booting into +"rescue mode". In fact, there are very few problems which aren't +easier to resolve in the comfortable environment of a fully +installed system than in this spartan "rescue system" shell. +Some of the most common problems include: + +- bad or missing X (video display) configuration +- adding/removing/reconfiguring hardware +- repairing problems caused by installing third-party software + with the "--force" and "--nodeps" options + +The general rule of thumb is: "If you can boot into the Linux +system without using rescue mode or this CD, there is no real +reason to use the rescue CD". + + +However, if you can no longer boot into the system, the rescue +system is the right tool. Some common examples include: + +- If you previously changed some parameters in the /etc/fstab and + the system will no longer boot, fix the offending line while in + rescue mode, then try to boot normally into your system. + +- If the problem cannot be completely resolved in rescue mode + (for example, if you need to reconfigure the video display), + just modify what's necessary to boot into a running system, + then complete the fix from there. + +For more information on troubleshooting your system, +please consult the official manuals, the documentation on +wiki.mageia.org or support forum at forum.mageia.org. + + +)); + +exec 'less /tmp/rescue-doc-contents'; + diff --git a/rescue/bin/restore_ms_boot b/rescue/bin/restore_ms_boot new file mode 100755 index 000000000..1f8cc2907 --- /dev/null +++ b/rescue/bin/restore_ms_boot @@ -0,0 +1,74 @@ +#!/usr/bin/perl +# +# Guillaume Cottenceau, Pixel +# +# Copyright 2002-2005 Mandriva +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +use lib qw(/usr/lib/libDrakX); +use common; +use bootloader; +use fs; +use fs::proc_partitions; +use partition_table::raw; + + +my @choices = map { + my $type = partition_table::raw::typeOfMBR($_->{dev}); + if_($type && member($type, bootloader::main_method_choices()) , [ $_->{dev}, $type ]); +} fs::proc_partitions::read_raw(); + +my $choice; + +if (!@choices) { + print "No known Linux bootloader has been found, nothing to do.\n"; +} elsif (@choices == 1) { + print "I've found a Linux bootloader only on <$choices[0][0]>.\n\n"; + $choice = $choices[0]; +} else { + print "I've found the following Linux bootloaders:\n", + (map_index { "\t" . $::i . ": <$_->[1]> \ton <$_->[0]>\n" } @choices), + "\n", + "Which disk/partition do you want to overwrite with the Windows bootloader?\n", + "\t "; + if ( =~ /^(\d+)$/i && $1 >= 1) { + $choice = $choices[$1 - 1]; + } +} + +if ($choice) { + print "I'm going to overwrite bootloader on <$choice->[0]> with +Windows bootloader. + +Ok? "; + =~ /^n/i and exit 0; + + system('dd', 'if=/usr/lib/extipl/aldebaran.bin', "of=/dev/$choice->[0]") == 0 + or print "\tFailed!\n"; +} + +#------------------------------------------------- +#- $Log$ +#- Revision 1.5 2005/06/13 04:33:50 prigaux +#- move functions using /proc/partitions out of fsedit to fs::proc_partitions +#- +#- Revision 1.4 2005/05/19 08:59:54 prigaux +#- rewrite using DrakX modules +#- +#- Revision 1.3 2005/04/19 12:49:39 prigaux +#- update copyright +#- +#- Revision 1.2 2004/07/20 02:42:12 prigaux +#- MandrakeSoft -> Mandrakesoft +#- +#- Revision 1.1 2002/02/27 13:31:30 gc +#- add "restore Windows Boot Loader" to rescue +#- +#- diff --git a/rescue/diskdrake-resize b/rescue/diskdrake-resize deleted file mode 100755 index 88372aac7..000000000 --- a/rescue/diskdrake-resize +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); - -use devices; -use log; -use resize_fat::main; -use diskdrake::resize_ntfs; -use diskdrake::resize_ext2; - -my ($device, $fs_type, $size) = @ARGV - or die "usage: $0 \n"; - -my %fs_pkgs = ( - vfat => 'resize_fat::main', - ntfs => 'diskdrake::resize_ntfs', - ext2 => 'diskdrake::resize_ext2', - ext3 => 'diskdrake::resize_ext2', - ext4 => 'diskdrake::resize_ext2', -); - -my $resize_pkg = $fs_pkgs{$fs_type} - or die "no support for $fs_type type\n"; - -log::l("resizing $device to $size"); - -my $resize = $resize_pkg->new($device, devices::make($device)) - or die "unable to initialize resize\n"; -$resize->resize($size); diff --git a/rescue/drvinst b/rescue/drvinst deleted file mode 100755 index 4868b42e0..000000000 --- a/rescue/drvinst +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/perl -# -# Guillaume Cottenceau -# -# Copyright 2000-2005 Mandriva -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -use lib qw(/usr/lib/libDrakX); -use common; -use detect_devices; - -$ARGV[0] =~ /^--?h/ and die "usage: drivers_install [drivertype1 [drivertype2 ...]]\n"; -my @types = @ARGV; - -sub install_module { - my ($driver, $descr) = @_; - print STDERR qq(Installing driver $driver (for "$descr")\n); - system("/sbin/modprobe", $driver) and print "\tfailed\n"; -} - -#- start -foreach my $card (detect_devices::pci_probe()) { - # ignoring "unknown", "Card:foobar" and the like as well as video cards: - $card->{driver} eq 'unknown' || $card->{driver} =~ /:/ and next; - $card->{media_type} eq "DISPLAY_VGA" and next; - - # load drivers for selected categories or for everything if no args: - if (!@ARGV || find { $card->{media_type} =~ /$_/i } @types) { - install_module($card->{driver}, $card->{description}); - } -} diff --git a/rescue/genpasswd b/rescue/genpasswd deleted file mode 100755 index 2f129673d..000000000 --- a/rescue/genpasswd +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/perl - -use strict; - -system "stty -echo"; -print STDERR "Give a password for ssh access: "; -chomp(my $word = ); -print STDERR "\n"; -system "stty echo"; - -my @salt = ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]; -print crypt($word, join('', @salt)); -print "\n"; diff --git a/rescue/grabjournallogs b/rescue/grabjournallogs deleted file mode 100755 index ef2ea4a1d..000000000 --- a/rescue/grabjournallogs +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -if ! mountpoint -q /mnt ; then - echo "I do not seem to see a Mageia install mounted on /mnt. You need to mount it first!" >&2 - exit 1 -fi - -if [ ! -f /mnt/etc/machine-id ]; then - echo "Cannot find machine-id file (/mnt/etc/machine-id)" >&2 - exit 1 -fi - -MID=$(cat /mnt/etc/machine-id) -echo -echo "Found machine-id: $MID" -if [ ! -d /mnt/var/log/journal/$MID ]; then - echo "Cannot find journal log directory (/mnt/var/log/journal/)" >&2 - exit 1 -fi - -TIMEFRAME=24 -if [ -n "$1" ]; then - NEWTIMEFRAME=$(( 0 + $1 )) - if [ $NEWTIMEFRAME -gt 0 ]; then - TIMEFRAME=$NEWTIMEFRAME - fi -fi -SINCE="$(LC_ALL=c date --date=$TIMEFRAME' hours ago' +'%F %T')" -echo "Will collect logs from the last $TIMEFRAME hour(s)" -echo " NB give numeric argument to override capture period" - -TEMPFILE=$(mktemp /tmp/grabjournallogs.XXXXXX) -echo -n "Extracting logs... " -journalctl -D /mnt/var/log/journal/$MID --since "$SINCE" -o short >$TEMPFILE -echo "done" - -if [ $(cat $TEMPFILE | wc -l) -lt 2 ]; then - rm -f $TEMPFILE - echo >&2 - echo "Cannot find any logs. Consider increasing the capture period by passing a" >&2 - echo "numeric argument larger than $TIMEFRAME." >&2 - exit 1 -fi - -echo -n "Compressing logs... " -cat $TEMPFILE | xz >/journallogs.xz -rm -f $TEMPFILE -echo "done" - -echo -echo "Your logs have been extracted to the file 'journallogs.xz'" diff --git a/rescue/guessmounts b/rescue/guessmounts deleted file mode 100755 index 27b920c9d..000000000 --- a/rescue/guessmounts +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/perl -# -# Guillaume Cottenceau -# -# Copyright 2001-2005 Mandriva -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -use lib qw(/usr/lib/libDrakX); -use common; -use devices; -use fs; -use fs::dmcrypt; -use fs::proc_partitions; -use fs::type; -use lvm; -use run_program; - -my @proc_mounts = fs::read_fstab('', '/proc/mounts'); - -my $target = '/mnt'; - -if (fs::get::mntpoint2part($target, \@proc_mounts)) { - print STDERR "$target is already mounted (according to /proc/mounts)\n"; - exit 0; -} - -system('drvinst', 'STORAGE'); - -print STDERR "\nPlease wait, trying to find your root device...\n"; - -mkdir_p($target); - -{ - local $::isInstall = 1; # so that detect_during_install() got called by init: - lvm::init(); -} -fs::dmcrypt::init; - -my @parts = map { - $_->{device} = delete $_->{dev}; - put_in_hash($_, fs::type::type_subpart_from_magic($_)); -} fs::proc_partitions::read_raw(); -my ($raid_parts, $normal_parts) = partition { isRawRAID($_) } @parts; - -if (@$raid_parts) { - require raid; - raid::detect_during_install(@$raid_parts); - my $raids = raid::get_existing(@$raid_parts); - push @$normal_parts, @$raids; -} - -my @roots; - -my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); -foreach (@$normal_parts) { - my $dev = devices::make($_->{device}); - - my $fs = find { - system("mount -t $_ $dev $target 2>/dev/null") == 0; - } fs::type::true_local_fs_types() or next; - - if (my $release_file = common::release_file($target)) { - my $release = chomp_(cat_("$target$release_file")); - print STDERR "=> found a $release root partition on $dev\n=> type $fs, version `\n"; - my @fstab = fs::read_fstab($target, '/etc/fstab'); - my $h = common::parse_release_file($target, $release_file, $_); - add2hash($h, { dev => $dev, fs => $fs, fstab => \@fstab, - pretty_name => "$h->{release} $h->{version} $h->{arch} on $dev" }); - # Offer to rescue only same arch: - $h->{pretty_name} .= " (cannot be rescued: $h->{arch} ne $arch;)" if $h->{arch} ne $arch; - push @roots, $h; - } - system('umount', $target) == 0 or die "error unmounting $target\n"; -} - -my ($root, $fs, @fstab); - -# Try Mageia first: -if (@roots) { - # Order by release number: - @roots = sort { $b->{version} cmp $a->{version} } @roots; - # Then pick mga over mdv: - @roots = map { @$_ } partition { $_->{release} =~ /Mageia/ } @roots; - - my $selected; - if (@roots == 1) { - $selected = first(@roots); - } else { - print "\n\nWhich system do you want to rescue?\n0: Abort\n"; - each_index { print $::i + 1, ": $_->{pretty_name}\n" } @roots; - my $res; - while ($res < 1 || $res > @roots) { - print "what is your choice (type the number of your selection or C^c to abort)?\n"; - $res = <>; - chomp($res); - if ($res eq "0") { - print "Aborting\n"; - exit(1); - } - } - $selected = $roots[$res-1]; - } - - $root = $selected->{dev}; - $fs = $selected->{fs}; - @fstab = @{$selected->{fstab}}; - print STDERR "=> Selecting $root as root fs\n"; -} - -if ($root) { - system("mount -t $fs $root $target 2>/dev/null"); - - print STDERR "\nMounting other partitions from fstab on $target...\n"; - foreach (@fstab) { - my ($valued_options, $options) = fs::mount_options::unpack($_); - - next if - !$_->{fs_type} || $_->{device} eq 'none' - || $valued_options->{noauto} - || $_->{mntpoint} eq '/' - || member($_->{fs_type}, 'swap', 'nfs', 'ntfs', 'ntfs-3g'); - - delete $valued_options->{'iocharset='}; - delete $valued_options->{'codepage='}; - fs::mount_options::pack($_, $valued_options, $options); #- vfat opts, we don't have the modules in rescue - - my $where = "$target$_->{mntpoint}"; - my $dev = fs::wild_device::from_part('', $_); - mkdir_p($where); - print STDERR "\t$dev on $where type $_->{fs_type} options $_->{options}\n"; - system("mount -t $_->{fs_type} $dev $where -o $_->{options}"); - } - system("mount -t proc proc $target/proc"); - print STDERR "\nYour system is ready on $target.\n\n"; -} else { - die "Could not find your root device :-(.\n"; -} - diff --git a/rescue/install_bootloader b/rescue/install_bootloader deleted file mode 100755 index 7328de1d2..000000000 --- a/rescue/install_bootloader +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/perl -# -# Guillaume Cottenceau -# -# Copyright 2001-2005 Mandriva -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -use lib qw(/usr/lib/libDrakX); -use common; -use bootloader; -use fs; - -my $auto; -if ($ARGV[0] eq '--auto') { - $auto = shift @ARGV; -} - -$::prefix = '/mnt'; - -my $release = common::mageia_release($::prefix) || - do { - system('guessmounts') == 0 or die 'guessmounts failed'; - common::mageia_release($::prefix); - }; - -if ($release) { - $release =~ /Mageia|Mandriva/ or die "release file doesn't contain '%s', exiting.\n"; -} elsif (fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ])) { - die "unknown distribution mounted in $::prefix\n"; -} else { - die "Your root device isn't mounted on $::prefix\n"; -} - -my @main_methods = bootloader::configured_main_methods(); - -my $main_method; -if (@main_methods == 0) { - die "Cannot find a configured boot loader\n"; -} elsif (@main_methods == 1) { - ($main_method) = @main_methods; -} else { - while (1) { - print "Configuration files for Boot Loaders ", join(' and ', @main_methods), " were found.\n"; - print "Which one one should be installed? "; - chomp($main_method = ); - if (member($main_method, @main_methods)) { - last; - } else { - print "bad choice\n"; - } - } -} - -my $install = $bootloader::{'install_raw_' . $main_method} or die "unknown bootloader method install_raw_$main_method\n"; - -print "About to re-install Boot Loader $main_method of following %s distribution:\n\t", - $release, "\n"; -if (!$auto) { - print "=> ok? "; - =~ /^n/i and exit 0; -} - -run_program::run('mount', '--bind', '/dev', "$::prefix/dev"); -$install->(); -run_program::run('umount', "$::prefix/dev"); diff --git a/rescue/list.xml b/rescue/list.xml index 29139f46d..d4c0adcb4 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -410,15 +410,18 @@ - - rescue-doc drvinst lsparts - guessmounts install_bootloader + + bin/rescue-doc + bin/drvinst + bin/lsparts + bin/guessmounts + bin/install_bootloader - restore_ms_boot + bin/restore_ms_boot - - partimage_whole_disk + + sbin/partimage_whole_disk @@ -439,20 +442,6 @@ dhcp-client - - - diskdrake-resize - genpasswd - startssh - grabjournallogs - - - restore-image.sh - - - restore-image-lib.sh - - dirname diff --git a/rescue/lsparts b/rescue/lsparts deleted file mode 100755 index 8d36a02f4..000000000 --- a/rescue/lsparts +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/perl -# -# Main author Pascal Rigaux (pixel) -# Put together by Guillaume Cottenceau -# -# Copyright 1999-2005 Mandriva -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -# Detects partition types using signatures -# - -use lib qw(/usr/lib/libDrakX); -use common; -use fs::type; -use fs::proc_partitions; - -my $params = join '', @ARGV; -my $verbose = $params =~ /-v/; - -$params =~ /-h/ and die "usage: lsparts [-v]\n"; - - -foreach (fs::proc_partitions::read_raw()) { - if (my $err = $_->{size} <= 1 ? - "Skipping <$_->{dev}> because too little blocks ($_->{size})" : - $_->{dev} !~ /\d$/ ? - "Skipping <$_->{dev}> because doesn't end with a number (e.g. seems to not be a partition)" : - $_->{dev} =~ /^loop\d+$/ ? - "Skipping <$_->{dev}>" : - '') { - print STDERR "$err\n" if $verbose; - } else { - $_->{device} = $_->{dev}; - if (my $type = fs::type::type_subpart_from_magic($_)) { - printf "$_->{dev}: %6s, fs %s (%s)\n", formatXiB($_->{size} * 512), $type->{fs_type}, fs::type::part2type_name($type); - } - } -} diff --git a/rescue/partimage_whole_disk b/rescue/partimage_whole_disk deleted file mode 100755 index ed0653a95..000000000 --- a/rescue/partimage_whole_disk +++ /dev/null @@ -1,264 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use standalone; -use fsedit; -use fs::format; -use fs::type; -use resize_fat::main; -use diskdrake::resize_ntfs; -use diskdrake::resize_ext2; -use common; -use partition_table::empty; -use Carp::Heavy; - -my %options = ( - save_home_directory => 1, - empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB - ask_before_modifying_home => 1, - bzip2 => 1, -); - -my ($server); -if ($ARGV[0] eq '-s') { - (undef, $server, @ARGV) = @ARGV; -} -my $action = shift @ARGV; - -sub usage() { die "partimage_whole_disk [-s ] (save_all | rest_all )\n" } - -$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; -$ENV{HOME} = '/'; -log::openLog("/var/log/partimage_whole_disk.log"); -my @partimage_cmd = ('partimage', if_($server, '-s', $server, '-n', '-L')); - -@ARGV == 1 or usage(); - -if ($server && !is_network_configured()) { - run_program::run('drvinst', 'NETWORK'); - run_program::run('dhcp-client'); -} - -run_program::run('drvinst', 'STORAGE_SCSI', 'STORAGE_IDE'); - -my $all_hds = fsedit::get_hds({}); - -if ($action eq 'save_all') { - save_all($ARGV[0]); -} elsif ($action eq 'rest_all') { - rest_all($ARGV[0]); -} - -sub save_all { - my ($dir) = @_; - - my $base_dir = $dir; - for (my $i = 0; read_part_list($dir); $i++) { - #- find a free dir - $dir = sprintf("$base_dir.%03d", $i); - } - - my $hd = $all_hds->{hds}[0] or die "no main hard drive\n"; - log::l("save_all on $hd->{device}"); - my $part_list = [ partition_table::get_normal_parts($hd) ]; - - foreach (@$part_list) { - $_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap'); - } - - if (!$options{save_home_directory}) { - #- shrink and don't save the last ext3 partition (which is the /home partition) - if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { - $part->{size} = min($part->{size}, 1024 * 1024 * 2); # not greater than 1GB - $part->{saved} = 0; - } - } - - foreach (grep { $_->{saved} } @$part_list) { - run_or_die(@partimage_cmd, - if_($options{bzip2}, '-z', 2), - '-V', 0, '--nombr', '--nodesc', '--nocheck', '-b', '-o', - 'save', devices::make($_->{device}), "$dir/$_->{device}"); - } - save_part_list($dir, $hd->{geom}, $part_list); -} -sub rest_all { - my ($dir) = @_; - - my ($forced_geom, $part_list) = read_part_list($dir) or error("read_part_list $dir failed"); - - (my $hd) = my @used_hds = uniq(map { - my $part = $_; - find { $part->{device} =~ /^\Q$_->{device}\E./ } fs::get::hds($all_hds) - or error("can't find hard drive for partition $part->{device}"); - } @$part_list); - - @used_hds >= 1 or error("no matching hd"); - @used_hds <= 1 or error("multiple hds: " . join(' ', map { $_->{device} } @used_hds)); - - fs::type::set_fs_type($_, $_->{fs_type}) foreach @$part_list; - put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @$part_list; - - my ($from_partimage, $other) = partition { $_->{saved} } @$part_list; - my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other; - - my $total = sum(map { $_->{size} } @$part_list); - if ($total > $hd->{totalsectors}) { - error("$dir doesn't fit: $total > $hd->{totalsectors}"); - } - - - foreach (@$from_resize) { - #- resize first - my $part = fs::get::device2part($_->{device}, [ fs::get::fstab($all_hds) ]); - if (!$part) { - log::l("partition to resize is missing ($_->{device})"); - $_->{missing} = 1; - next; - } - if ($part->{fs_type} ne $_->{fs_type}) { - log::l("partition $_->{device} doesn't have the right filesystem ($part->{fs_type} != $_->{fs_type})"); - $_->{missing} = 1; - next; - } - - if (@$from_resize == 1) { - my $half_size = int($hd->{totalsectors} / 2) - 2 * $hd->cylinder_size; - my $suggested_total = $total - $_->{size} + $half_size; - log::l("resizing bigger? (size $_->{size}, half_size $half_size, total $total, suggested_total $suggested_total)"); - if ($half_size > $_->{size} && $suggested_total < $hd->{totalsectors}) { - log::l("prefering to resize $_->{device} to size $half_size instead of $_->{size}"); - $_->{size} = $half_size; - } - } - - $_->{start} = $part->{start}; - if ($_->{size} < $part->{size}) { - log::l("resizing $_->{device} to $_->{size} (it is $part->{size})"); - my $resize_pkg = $_->{fs_type} eq 'vfat' ? 'resize_fat::main' : 'diskdrake::resize_ntfs'; - my $resize = $resize_pkg->new($_->{device}, devices::make($_->{device})); - $resize->resize($_->{size}); - } else { - log::l("no need to resize, instead setting $_->{device}'s size to $part->{size} instead of $_->{size}"); - $_->{size} = $part->{size}; - } - } - - put_in_hash($hd->{geom}, $forced_geom); - log::l("totalsectors $hd->{totalsectors} heads $hd->{geom}{heads} sectors $hd->{geom}{sectors}"); - partition_table::raw::compute_nb_cylinders($hd->{geom}, $hd->{totalsectors}); - - #- grow the last ext3 partition - if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { - $part->{ratio} = 1; - - if ($options{ask_before_modifying_home}) { - print "\nkeep existing /home? (Y/n) "; - if ( !~ /n/i) { - my $l = @$from_partimage > 1 ? $from_partimage : $created; - #- it was meant to be restored or formatted - my $p = pop @$l; - log::l("keeping existing /home: removing $p->{device}"); - } - } - } - - #- write the partition table - partition_table::raw::zero_MBR($hd); - foreach my $part (grep { $_->{rootDevice} eq $hd->{device} } @$part_list) { - next if $part->{missing}; - - my $hole = find { isEmpty($_) && $_->{size} >= $part->{size} } partition_table::get_normal_parts_and_holes($hd) or die "not enough room for $part->{device}"; - $part->{start} = $hole->{start}; - - log::l("handling $part->{device}"); - my $extended = $part->{device} =~ /(\d+)$/ && $1 > 4 && $hd->hasExtended; - - my %wanted_part = %$part; - if ($part->{ratio}) { - $part->{size} = $hole->{size} - ($options{empty_space_at_end_of_disk} || 0); - } else { - $part->{size} += $hd->{geom}{sectors} if $extended; - $part->{size} += $hd->cylinder_size if $part->{start} == 1; - } - log::l("adding $part->{device} with size $part->{size}"); - partition_table::add($hd, $part, $extended ? 'Extended' : 'Primary'); - foreach ('device', if_(!$part->{ratio}, 'size')) { - $part->{$_} eq $wanted_part{$_} or log::l("bad $_ for $part->{device}: $part->{$_} != $wanted_part{$_}"); - } - } - partition_table::write($hd); - - #- restore from partimage - foreach (@$from_partimage) { - run_or_die(@partimage_cmd, 'restore', '-b', devices::make($_->{device}), "$dir/$_->{device}"); - - if ($_->{ratio}) { - my $resize = diskdrake::resize_ext2->new($_->{device}, devices::make($_->{device})); - $resize->resize($_->{size}); - } - } - - foreach (@$created) { - fs::format::part_raw($_, undef); - } - - run_program::run('guessmounts'); - - if (my @missing = grep { $_->{missing} } @$part_list) { - my $missing = join('|', map { quotemeta($_->{device}) } @missing); - log::l("drop missing devices from fstab and lilo.conf: $missing"); - $::prefix = '/mnt'; - substInFile { $_ = '' if m!^/dev/($missing)\s! } "$::prefix/etc/fstab"; - - my $match; - substInFile { - /^\S/ and $match = m!^other=/dev/($missing)$!; - $_ = '' if $match; - } "$::prefix/etc/lilo.conf"; - } - - run_or_die('install_bootloader', '--auto'); - - print "\n", "Your system is ready, press enter to reboot (Y/n) "; - if ( !~ /n/i) { - run_program::run('reboot'); - } -} - -sub lst_fields() { qw(device size fs_type saved) } -sub save_part_list { - my ($dir, $geom, $part_list) = @_; - my @l = map { join(' ', @$_{lst_fields()}) } @$part_list; - log::l("save_part_list $dir: $_") foreach @l; - my $partimage = join(' ', @partimage_cmd); - open(my $F, "| $partimage -z0 -Bfoo=bar -o save_file $dir/lst"); - print $F join("/", $geom->{heads}, $geom->{sectors}), "\n"; - print $F "$_\n" foreach @l; -} -sub read_part_list { - my ($dir) = @_; - my $partimage = join(' ', @partimage_cmd); - open(my $F, "$partimage -z0 -Bfoo=bar rest_file $dir/lst |"); - my $geom_string = <$F> or return; - my %geom; @geom{'heads', 'sectors'} = split('/', chomp_($geom_string)); - my @l = chomp_(cat__($F)); - log::l("read_part_list $dir: $_") foreach @l; - \%geom, [ map { my %l; @l{lst_fields()} = split; \%l } @l ]; -} - -sub run_or_die { - my (@l) = @_; - run_program::raw({ timeout => 4 * 60 * 60 }, @l) or die join(' ', @l) . " failed\n"; -} - -sub error { - my ($msg) = @_; - log::l($msg); - die "$msg\n"; -} - -sub is_network_configured() { - my (undef, @l) = cat_('/proc/net/route'); - find { /^(\S+)/ && $1 ne 'lo' } @l; -} diff --git a/rescue/rescue-doc b/rescue/rescue-doc deleted file mode 100755 index e6514b462..000000000 --- a/rescue/rescue-doc +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/perl - -# From MDK::Common: -sub output { my $f = shift; open(my $F, ">$f") or die "output in file $f failed: $!\n"; print $F $_ foreach @_ } - -output('/tmp/rescue-doc-contents', q( - Information regarding problems not directly addressed - by this rescue. - - -Are you certain "rescue mode" is the best tool for your specific -problem? - -The rescue system on this CD is a very basic text-based -environment for rescuing systems that no longer boot. You will -not find an easy-to-use graphical environment in this rescue -system, nor the detection/configuration libraries. - - -The vast majority of problems that can affect a Linux system are -much easier to repair on a running system than by booting into -"rescue mode". In fact, there are very few problems which aren't -easier to resolve in the comfortable environment of a fully -installed system than in this spartan "rescue system" shell. -Some of the most common problems include: - -- bad or missing X (video display) configuration -- adding/removing/reconfiguring hardware -- repairing problems caused by installing third-party software - with the "--force" and "--nodeps" options - -The general rule of thumb is: "If you can boot into the Linux -system without using rescue mode or this CD, there is no real -reason to use the rescue CD". - - -However, if you can no longer boot into the system, the rescue -system is the right tool. Some common examples include: - -- If you previously changed some parameters in the /etc/fstab and - the system will no longer boot, fix the offending line while in - rescue mode, then try to boot normally into your system. - -- If the problem cannot be completely resolved in rescue mode - (for example, if you need to reconfigure the video display), - just modify what's necessary to boot into a running system, - then complete the fix from there. - -For more information on troubleshooting your system, -please consult the official manuals, the documentation on -wiki.mageia.org or support forum at forum.mageia.org. - - -)); - -exec 'less /tmp/rescue-doc-contents'; - diff --git a/rescue/restore-image-lib.sh b/rescue/restore-image-lib.sh deleted file mode 100755 index 3451f7be5..000000000 --- a/rescue/restore-image-lib.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -TITLE="%s Installer" -BACKTITLE="%s" -MIN_DISKSIZE=5000000 - -debug="/dev/null" - -function _msgbox() -{ - dialog --timeout 60 --backtitle "$BACKTITLE" --title "$TITLE" --msgbox \ - "$1" 0 0 - - return $? -} - -function _infobox() -{ - dialog --backtitle "$BACKTITLE" --title "$TITLE" --sleep 2 \ - --infobox "$1" 0 0 - - return $? -} - -function _yesno() -{ - dialog --backtitle "$BACKTITLE" --title "$TITLE" \ - --yes-label "Yes" --no-label "No" --yesno "$1" 0 0 - - return $? -} - -function _mount() -{ - mount $1 $2 > $debug 2>&1 - - return $? -} - -function _umount() -{ - umount $1 > $debug 2>&1 - - return $? -} - -function _bind() -{ - mount --bind $1 $2 > $debug 2>&1 - - return $? -} - -function _eject() -{ - eject $1 > $debug 2>&1 - - return $? -} - -function _shutdown() -{ - [ -e /tmp/no-shutdown ] && exit - clear - sync - echo s > /proc/sysrq-trigger - echo o > /proc/sysrq-trigger - exit -} - -function _reboot() -{ - [ -e /tmp/no-shutdown ] && exit - clear - sync - echo s > /proc/sysrq-trigger - echo b > /proc/sysrq-trigger - exit -} - diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh deleted file mode 100755 index f4f904f3f..000000000 --- a/rescue/restore-image.sh +++ /dev/null @@ -1,412 +0,0 @@ -#!/bin/bash - -setterm -powersave off -setterm -blank 0 - -if [ -r ./restore-image-lib.sh ]; then - . ./restore-image-lib.sh -elif [ -r /usr/lib/restore-image-lib.sh ]; then - . /usr/lib/restore-image-lib.sh -fi - -export PATH="/sbin:/bin:/usr/sbin:/usr/bin" - -mnt_dir="/tmp/mnt" -restore_media="/tmp/media" -images_dir="$restore_media/images" -images="$images_dir/list" -images_config="$images_dir/config" -image="" -win32_part_dev= -win32_part_type= -win32_part_new_size= - -function read_config() -{ - if [ -r "$images_config" ]; then - . $images_config - fi -} - -function image_list() -{ - list=$(cat $images | awk -F',' \ - '{ print $1 " " $2 " " $4 }') - - echo $list -} - -function image_file() -{ - country="$1" - - file=$(grep ^$country $images | awk -F',' '{ print $3 }') - - echo $file -} - -function welcome() -{ - while true; do - clear - msg="\n Welcome to $TITLE\n\ -\nThe following images were found, select one:\n " - opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" \ - --stdout --radiolist "$msg" 0 0 0 \ - $(image_list)) - - if [ "$?" != "0" ]; then - _yesno "\nInterrupt installation?\n " - if [ "$?" = "0" ]; then - _shutdown - fi - else - if [ -z "$opcao" ]; then - continue - else - image=$(image_file $opcao) - break - fi - fi - done - - # disable kernel messages in the console - echo "1 4 1 7" > /proc/sys/kernel/printk -} - -function install_warning() -{ - if [ -n "${win32_part_dev}" ]; then - warn_msg="Windows installation detected.\nWe will set it up as dual boot. \ -You may lose some data.\nPlease backup before proceeding." - else - warn_msg="WARNING: This process will erase all data in this machine, \ -do you want to continue?" - fi - - clear - _yesno "\n$warn_msg\n" - if [ "$?" != "0" ]; then - _shutdown - fi -} - -function detect_root() -{ - inst_source_dev=$(awk "\$2 == \"$restore_media\" { print \$1 }" /proc/mounts | sed -e 's/[0-9]$//') - inst_source_dev=${inst_source_dev#/dev/} - devices=$(grep "^ .*[^0-9]$" < /proc/partitions | grep -v ${inst_source_dev} | awk '$3 > '$MIN_DISKSIZE' { print $4,$3 }') - - if [ -z "${devices}" ]; then - exit 1 - fi - - devs_found=$(($(echo $devices | wc -w)/2)) - - root_data=$(detect_win32 ${inst_source_dev}) - - if [ -z "${root_data}" ]; then - if [ "$devs_found" -gt "1" ]; then - if [ -n "${inst_source_dev}" ]; then - opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" --stdout --menu 'Choose one of the detected devices to restore to (check the blocks size column first):' 8 50 0 $devices ) - if [ "$?" != "0" ]; then - _yesno "\nInterrupt installation?\n " - if [ "$?" = "0" ]; then - _shutdown - fi - else - root_data=${opcao} - fi - fi - else - root_data=$(echo ${devices} | cut -d ' ' -f 1) - fi - fi - - echo ${root_data} -} - -function detect_win32() -{ - # from detect_root() - skip_dev=${1} - - # win32 detection won't handle complex layouts - if [ $(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | wc -l) -gt 1 ]; then - exit - fi - - # get the last created windows partition information - set -f - device=$(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | grep -e "FAT\|NTFS\|HPFS" | tail -1 | sed 's/ .*$//') - set +f - - if [ -z "${device}" ]; then - exit - fi - - # it might be needed, for safety - device_type=$(blkid -o value -s TYPE ${device}) - modprobe ${device_type} - - # df for that partition - mount ${device} /mnt - size=$(df ${device} | tail -1) - umount /mnt - - # its diskspace - used=$(echo ${size} | awk '{ print $3 }') - left=$(echo ${size} | awk '{ print $4 }') - avail=$((${left}/2)) - - if [ ! ${avail} -lt ${MIN_DISKSIZE} ]; then - win32_part_dev=${device} - win32_part_type=${device_type} - # our install takes half of 'left' - win32_part_new_size=$((${used}+${avail})) - - dev=${win32_part_dev#/dev/} - disk=${dev%[0-9]} - number=${dev#[a-w][a-w][a-w]} - let number++ - echo ${disk}${number} ${win32_part_dev} ${win32_part_type} ${win32_part_new_size} - fi -} - -function resize_win32() -{ - device=${1} - device_type=${2} - new_win32_size=${3} - - dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "\nResizing Windows partition...\n" 4 55 - - dev=${device#/dev/} - disk=${dev%[0-9]} - win32_number=${dev#[a-w][a-w][a-w]} - - case ${device_type} in - vfat) device_id=b ;; - ntfs) device_id=7 ;; - hpfs) device_id=87 ;; - esac - - # wrapper around libdrakx by blino - diskdrake-resize ${device} ${device_type} $((${new_win32_size}*2)) &>/dev/null - - # we need some free sector here, rebuilding layout - fdisk /dev/${disk} &>/dev/null </dev/null </dev/null; dd bs=4M of=/dev/${root} >/tmp/backup.out 2>&1>>/tmp/log) & - - sleep 3 - pid=$(ps ax | grep 'dd bs=4M of' | grep -v grep | awk '{ print $1 }') - - while [ true ]; do - ps | grep -q $pid - if [ $? -eq 0 ]; then - /bin/kill -SIGUSR1 $pid - complete=$(tail -n 1 /tmp/backup.out | awk '{ print $1 }') - echo $((complete*100/total)) - sleep 1 - else - break - fi - done | dialog --backtitle "$BACKTITLE" --title "$TITLE" --gauge "\nWriting image..." 8 45 - - in=$(tail -n 3 /tmp/backup.out | grep 'in$' | cut -d' ' -f1) - out=$(tail -n 3 /tmp/backup.out | grep 'out$' | cut -d' ' -f1) - - if [ x"$in" != x"$out" ]; then - _msgbox "\nError writing image!\n" - sleep 24h - fi - - # Now re-read the partition table because 'dd' might have changed it - sfdisk -R /dev/${root} -} - -function grub_setup() -{ - root=${1} - grub_dir=${2} - - # install the bootloader - grub <> ${grub_dir}/menu.lst </dev/null| grep "Filesystem OS type" | awk '{ print $4 }') - if [ "${filesystem_type}" = "Linux" ]; then - dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "Finishing Install... Expanding ${root}" 3 40 - disk=/dev/${root%[0-9]} - main_part=/dev/${root} - - # FIXME: absurdly dirty hack - main_part_num=${root:3} - swap_part_num=$((main_part_num+1)) - swap_part=${disk}${swap_part_num} - - main_part_sectors= - if [ -n "$SWAP_BLOCKS" ]; then - if [ -n "$EXPAND_FS" ]; then - total_blocks=$(sfdisk -s $disk) - main_part_blocks=$((total_blocks-SWAP_BLOCKS)) - main_part_sectors=$((main_part_blocks*2)) - else - main_part_sectors=$(sfdisk -d $disk | perl -lne 'm|^'$main_part'\b.*,\s*size\s*=\s*(\d+)\b| and print($1), exit') - fi - fi - if [ -n "$SWAP_BLOCKS" ]; then - parted $disk -- mkpartfs primary linux-swap ${main_part_sectors}s -1s yes - mkswap -L swap $swap_part - fi - if [ -n "$EXPAND_FS" ]; then - e2fsck -fy $main_part - fdisk $disk << EOF -d -$main_part_num -n -p -$main_part_num - - -a -$main_part_num -w -EOF - sfdisk -R $disk - e2fsck -fy $main_part - resize2fs $main_part - fi - mkdir -p $mnt_dir - mount $main_part $mnt_dir - grub_dir="$mnt_dir/boot/grub" - if [ -d "$grub_dir" ]; then - echo "(hd0) $disk" > "$grub_dir/device.map" - if [ -n "$win32_part_dev" ]; then - grub_setup ${root} ${grub_dir} - fi - fi - if [ -n "$MKINITRD" ]; then - mount -t sysfs none "$mnt_dir/sys" - mount -t proc none "$mnt_dir/proc" - chroot $mnt_dir bootloader-config --action rebuild-initrds - umount "$mnt_dir/sys" - umount "$mnt_dir/proc" - fi - umount $mnt_dir - fi -} - -# installation steps -welcome -read_config -detect_device -install_warning -write_image -expand_fs - -# all done! -_msgbox "\nInstallation process finished.\nPress ENTER to shutdown.\n " - -_shutdown - diff --git a/rescue/restore_ms_boot b/rescue/restore_ms_boot deleted file mode 100755 index 1f8cc2907..000000000 --- a/rescue/restore_ms_boot +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/perl -# -# Guillaume Cottenceau, Pixel -# -# Copyright 2002-2005 Mandriva -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -use lib qw(/usr/lib/libDrakX); -use common; -use bootloader; -use fs; -use fs::proc_partitions; -use partition_table::raw; - - -my @choices = map { - my $type = partition_table::raw::typeOfMBR($_->{dev}); - if_($type && member($type, bootloader::main_method_choices()) , [ $_->{dev}, $type ]); -} fs::proc_partitions::read_raw(); - -my $choice; - -if (!@choices) { - print "No known Linux bootloader has been found, nothing to do.\n"; -} elsif (@choices == 1) { - print "I've found a Linux bootloader only on <$choices[0][0]>.\n\n"; - $choice = $choices[0]; -} else { - print "I've found the following Linux bootloaders:\n", - (map_index { "\t" . $::i . ": <$_->[1]> \ton <$_->[0]>\n" } @choices), - "\n", - "Which disk/partition do you want to overwrite with the Windows bootloader?\n", - "\t "; - if ( =~ /^(\d+)$/i && $1 >= 1) { - $choice = $choices[$1 - 1]; - } -} - -if ($choice) { - print "I'm going to overwrite bootloader on <$choice->[0]> with -Windows bootloader. - -Ok? "; - =~ /^n/i and exit 0; - - system('dd', 'if=/usr/lib/extipl/aldebaran.bin', "of=/dev/$choice->[0]") == 0 - or print "\tFailed!\n"; -} - -#------------------------------------------------- -#- $Log$ -#- Revision 1.5 2005/06/13 04:33:50 prigaux -#- move functions using /proc/partitions out of fsedit to fs::proc_partitions -#- -#- Revision 1.4 2005/05/19 08:59:54 prigaux -#- rewrite using DrakX modules -#- -#- Revision 1.3 2005/04/19 12:49:39 prigaux -#- update copyright -#- -#- Revision 1.2 2004/07/20 02:42:12 prigaux -#- MandrakeSoft -> Mandrakesoft -#- -#- Revision 1.1 2002/02/27 13:31:30 gc -#- add "restore Windows Boot Loader" to rescue -#- -#- diff --git a/rescue/sbin/partimage_whole_disk b/rescue/sbin/partimage_whole_disk new file mode 100755 index 000000000..ed0653a95 --- /dev/null +++ b/rescue/sbin/partimage_whole_disk @@ -0,0 +1,264 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); +use standalone; +use fsedit; +use fs::format; +use fs::type; +use resize_fat::main; +use diskdrake::resize_ntfs; +use diskdrake::resize_ext2; +use common; +use partition_table::empty; +use Carp::Heavy; + +my %options = ( + save_home_directory => 1, + empty_space_at_end_of_disk => 0, # 300 * 1024 * 2, # 300MB + ask_before_modifying_home => 1, + bzip2 => 1, +); + +my ($server); +if ($ARGV[0] eq '-s') { + (undef, $server, @ARGV) = @ARGV; +} +my $action = shift @ARGV; + +sub usage() { die "partimage_whole_disk [-s ] (save_all | rest_all )\n" } + +$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; +$ENV{HOME} = '/'; +log::openLog("/var/log/partimage_whole_disk.log"); +my @partimage_cmd = ('partimage', if_($server, '-s', $server, '-n', '-L')); + +@ARGV == 1 or usage(); + +if ($server && !is_network_configured()) { + run_program::run('drvinst', 'NETWORK'); + run_program::run('dhcp-client'); +} + +run_program::run('drvinst', 'STORAGE_SCSI', 'STORAGE_IDE'); + +my $all_hds = fsedit::get_hds({}); + +if ($action eq 'save_all') { + save_all($ARGV[0]); +} elsif ($action eq 'rest_all') { + rest_all($ARGV[0]); +} + +sub save_all { + my ($dir) = @_; + + my $base_dir = $dir; + for (my $i = 0; read_part_list($dir); $i++) { + #- find a free dir + $dir = sprintf("$base_dir.%03d", $i); + } + + my $hd = $all_hds->{hds}[0] or die "no main hard drive\n"; + log::l("save_all on $hd->{device}"); + my $part_list = [ partition_table::get_normal_parts($hd) ]; + + foreach (@$part_list) { + $_->{saved} = !member($_->{fs_type}, 'ntfs', 'ntfs-3g', 'vfat', 'swap'); + } + + if (!$options{save_home_directory}) { + #- shrink and don't save the last ext3 partition (which is the /home partition) + if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { + $part->{size} = min($part->{size}, 1024 * 1024 * 2); # not greater than 1GB + $part->{saved} = 0; + } + } + + foreach (grep { $_->{saved} } @$part_list) { + run_or_die(@partimage_cmd, + if_($options{bzip2}, '-z', 2), + '-V', 0, '--nombr', '--nodesc', '--nocheck', '-b', '-o', + 'save', devices::make($_->{device}), "$dir/$_->{device}"); + } + save_part_list($dir, $hd->{geom}, $part_list); +} +sub rest_all { + my ($dir) = @_; + + my ($forced_geom, $part_list) = read_part_list($dir) or error("read_part_list $dir failed"); + + (my $hd) = my @used_hds = uniq(map { + my $part = $_; + find { $part->{device} =~ /^\Q$_->{device}\E./ } fs::get::hds($all_hds) + or error("can't find hard drive for partition $part->{device}"); + } @$part_list); + + @used_hds >= 1 or error("no matching hd"); + @used_hds <= 1 or error("multiple hds: " . join(' ', map { $_->{device} } @used_hds)); + + fs::type::set_fs_type($_, $_->{fs_type}) foreach @$part_list; + put_in_hash($_, partition_table::hd2minimal_part($hd)) foreach @$part_list; + + my ($from_partimage, $other) = partition { $_->{saved} } @$part_list; + my ($from_resize, $created) = partition { member($_->{fs_type}, 'vfat', 'ntfs', 'ntfs-3g') } @$other; + + my $total = sum(map { $_->{size} } @$part_list); + if ($total > $hd->{totalsectors}) { + error("$dir doesn't fit: $total > $hd->{totalsectors}"); + } + + + foreach (@$from_resize) { + #- resize first + my $part = fs::get::device2part($_->{device}, [ fs::get::fstab($all_hds) ]); + if (!$part) { + log::l("partition to resize is missing ($_->{device})"); + $_->{missing} = 1; + next; + } + if ($part->{fs_type} ne $_->{fs_type}) { + log::l("partition $_->{device} doesn't have the right filesystem ($part->{fs_type} != $_->{fs_type})"); + $_->{missing} = 1; + next; + } + + if (@$from_resize == 1) { + my $half_size = int($hd->{totalsectors} / 2) - 2 * $hd->cylinder_size; + my $suggested_total = $total - $_->{size} + $half_size; + log::l("resizing bigger? (size $_->{size}, half_size $half_size, total $total, suggested_total $suggested_total)"); + if ($half_size > $_->{size} && $suggested_total < $hd->{totalsectors}) { + log::l("prefering to resize $_->{device} to size $half_size instead of $_->{size}"); + $_->{size} = $half_size; + } + } + + $_->{start} = $part->{start}; + if ($_->{size} < $part->{size}) { + log::l("resizing $_->{device} to $_->{size} (it is $part->{size})"); + my $resize_pkg = $_->{fs_type} eq 'vfat' ? 'resize_fat::main' : 'diskdrake::resize_ntfs'; + my $resize = $resize_pkg->new($_->{device}, devices::make($_->{device})); + $resize->resize($_->{size}); + } else { + log::l("no need to resize, instead setting $_->{device}'s size to $part->{size} instead of $_->{size}"); + $_->{size} = $part->{size}; + } + } + + put_in_hash($hd->{geom}, $forced_geom); + log::l("totalsectors $hd->{totalsectors} heads $hd->{geom}{heads} sectors $hd->{geom}{sectors}"); + partition_table::raw::compute_nb_cylinders($hd->{geom}, $hd->{totalsectors}); + + #- grow the last ext3 partition + if (my $part = find { isTrueLocalFS($_) } reverse @$part_list) { + $part->{ratio} = 1; + + if ($options{ask_before_modifying_home}) { + print "\nkeep existing /home? (Y/n) "; + if ( !~ /n/i) { + my $l = @$from_partimage > 1 ? $from_partimage : $created; + #- it was meant to be restored or formatted + my $p = pop @$l; + log::l("keeping existing /home: removing $p->{device}"); + } + } + } + + #- write the partition table + partition_table::raw::zero_MBR($hd); + foreach my $part (grep { $_->{rootDevice} eq $hd->{device} } @$part_list) { + next if $part->{missing}; + + my $hole = find { isEmpty($_) && $_->{size} >= $part->{size} } partition_table::get_normal_parts_and_holes($hd) or die "not enough room for $part->{device}"; + $part->{start} = $hole->{start}; + + log::l("handling $part->{device}"); + my $extended = $part->{device} =~ /(\d+)$/ && $1 > 4 && $hd->hasExtended; + + my %wanted_part = %$part; + if ($part->{ratio}) { + $part->{size} = $hole->{size} - ($options{empty_space_at_end_of_disk} || 0); + } else { + $part->{size} += $hd->{geom}{sectors} if $extended; + $part->{size} += $hd->cylinder_size if $part->{start} == 1; + } + log::l("adding $part->{device} with size $part->{size}"); + partition_table::add($hd, $part, $extended ? 'Extended' : 'Primary'); + foreach ('device', if_(!$part->{ratio}, 'size')) { + $part->{$_} eq $wanted_part{$_} or log::l("bad $_ for $part->{device}: $part->{$_} != $wanted_part{$_}"); + } + } + partition_table::write($hd); + + #- restore from partimage + foreach (@$from_partimage) { + run_or_die(@partimage_cmd, 'restore', '-b', devices::make($_->{device}), "$dir/$_->{device}"); + + if ($_->{ratio}) { + my $resize = diskdrake::resize_ext2->new($_->{device}, devices::make($_->{device})); + $resize->resize($_->{size}); + } + } + + foreach (@$created) { + fs::format::part_raw($_, undef); + } + + run_program::run('guessmounts'); + + if (my @missing = grep { $_->{missing} } @$part_list) { + my $missing = join('|', map { quotemeta($_->{device}) } @missing); + log::l("drop missing devices from fstab and lilo.conf: $missing"); + $::prefix = '/mnt'; + substInFile { $_ = '' if m!^/dev/($missing)\s! } "$::prefix/etc/fstab"; + + my $match; + substInFile { + /^\S/ and $match = m!^other=/dev/($missing)$!; + $_ = '' if $match; + } "$::prefix/etc/lilo.conf"; + } + + run_or_die('install_bootloader', '--auto'); + + print "\n", "Your system is ready, press enter to reboot (Y/n) "; + if ( !~ /n/i) { + run_program::run('reboot'); + } +} + +sub lst_fields() { qw(device size fs_type saved) } +sub save_part_list { + my ($dir, $geom, $part_list) = @_; + my @l = map { join(' ', @$_{lst_fields()}) } @$part_list; + log::l("save_part_list $dir: $_") foreach @l; + my $partimage = join(' ', @partimage_cmd); + open(my $F, "| $partimage -z0 -Bfoo=bar -o save_file $dir/lst"); + print $F join("/", $geom->{heads}, $geom->{sectors}), "\n"; + print $F "$_\n" foreach @l; +} +sub read_part_list { + my ($dir) = @_; + my $partimage = join(' ', @partimage_cmd); + open(my $F, "$partimage -z0 -Bfoo=bar rest_file $dir/lst |"); + my $geom_string = <$F> or return; + my %geom; @geom{'heads', 'sectors'} = split('/', chomp_($geom_string)); + my @l = chomp_(cat__($F)); + log::l("read_part_list $dir: $_") foreach @l; + \%geom, [ map { my %l; @l{lst_fields()} = split; \%l } @l ]; +} + +sub run_or_die { + my (@l) = @_; + run_program::raw({ timeout => 4 * 60 * 60 }, @l) or die join(' ', @l) . " failed\n"; +} + +sub error { + my ($msg) = @_; + log::l($msg); + die "$msg\n"; +} + +sub is_network_configured() { + my (undef, @l) = cat_('/proc/net/route'); + find { /^(\S+)/ && $1 ne 'lo' } @l; +} diff --git a/rescue/startssh b/rescue/startssh deleted file mode 100755 index e14bb10e8..000000000 --- a/rescue/startssh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# test for an up interface != lo -if test "x"`ifconfig | cut -d ' ' -f 1 | grep -v '^$' | grep -v lo` = "x"; then - echo "There is no up interface, you can try to execute 'drvinst' to find drivers and 'dhcp-client' to configure your interface for DHCP." >&2 - exit 5 -fi - -# generate host keys -mkdir -p /etc/dropbear -[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null || { echo "Can't generate dsa host key" >&2 ; exit 4; } -[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null || { echo "Can't generate rsa host key" >&2 ; exit 3; } - -# set a password -passwd=`genpasswd` -if (( $? != 0 )); then - reset - exit $? -fi -sed -E -i -e 's/^root:[^:]*:/root:'"${passwd//\//\\/}"':/' /etc/passwd || { echo "Can't set password" >&2 ; exit 2; } - -# test for /dev/pts -grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts - -echo "" -echo -n "Starting ssh daemon... " -dropbear -E 2>/var/log/dropbear.log && echo "OK" || { echo "Failed" ; exit 1; } diff --git a/rescue/tree/usr/lib/restore-image-lib.sh b/rescue/tree/usr/lib/restore-image-lib.sh new file mode 100755 index 000000000..3451f7be5 --- /dev/null +++ b/rescue/tree/usr/lib/restore-image-lib.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +TITLE="%s Installer" +BACKTITLE="%s" +MIN_DISKSIZE=5000000 + +debug="/dev/null" + +function _msgbox() +{ + dialog --timeout 60 --backtitle "$BACKTITLE" --title "$TITLE" --msgbox \ + "$1" 0 0 + + return $? +} + +function _infobox() +{ + dialog --backtitle "$BACKTITLE" --title "$TITLE" --sleep 2 \ + --infobox "$1" 0 0 + + return $? +} + +function _yesno() +{ + dialog --backtitle "$BACKTITLE" --title "$TITLE" \ + --yes-label "Yes" --no-label "No" --yesno "$1" 0 0 + + return $? +} + +function _mount() +{ + mount $1 $2 > $debug 2>&1 + + return $? +} + +function _umount() +{ + umount $1 > $debug 2>&1 + + return $? +} + +function _bind() +{ + mount --bind $1 $2 > $debug 2>&1 + + return $? +} + +function _eject() +{ + eject $1 > $debug 2>&1 + + return $? +} + +function _shutdown() +{ + [ -e /tmp/no-shutdown ] && exit + clear + sync + echo s > /proc/sysrq-trigger + echo o > /proc/sysrq-trigger + exit +} + +function _reboot() +{ + [ -e /tmp/no-shutdown ] && exit + clear + sync + echo s > /proc/sysrq-trigger + echo b > /proc/sysrq-trigger + exit +} + diff --git a/rescue/tree/usr/sbin/diskdrake-resize b/rescue/tree/usr/sbin/diskdrake-resize new file mode 100755 index 000000000..88372aac7 --- /dev/null +++ b/rescue/tree/usr/sbin/diskdrake-resize @@ -0,0 +1,29 @@ +#!/usr/bin/perl + +use lib qw(/usr/lib/libDrakX); + +use devices; +use log; +use resize_fat::main; +use diskdrake::resize_ntfs; +use diskdrake::resize_ext2; + +my ($device, $fs_type, $size) = @ARGV + or die "usage: $0 \n"; + +my %fs_pkgs = ( + vfat => 'resize_fat::main', + ntfs => 'diskdrake::resize_ntfs', + ext2 => 'diskdrake::resize_ext2', + ext3 => 'diskdrake::resize_ext2', + ext4 => 'diskdrake::resize_ext2', +); + +my $resize_pkg = $fs_pkgs{$fs_type} + or die "no support for $fs_type type\n"; + +log::l("resizing $device to $size"); + +my $resize = $resize_pkg->new($device, devices::make($device)) + or die "unable to initialize resize\n"; +$resize->resize($size); diff --git a/rescue/tree/usr/sbin/genpasswd b/rescue/tree/usr/sbin/genpasswd new file mode 100755 index 000000000..2f129673d --- /dev/null +++ b/rescue/tree/usr/sbin/genpasswd @@ -0,0 +1,13 @@ +#!/usr/bin/perl + +use strict; + +system "stty -echo"; +print STDERR "Give a password for ssh access: "; +chomp(my $word = ); +print STDERR "\n"; +system "stty echo"; + +my @salt = ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]; +print crypt($word, join('', @salt)); +print "\n"; diff --git a/rescue/tree/usr/sbin/grabjournallogs b/rescue/tree/usr/sbin/grabjournallogs new file mode 100755 index 000000000..ef2ea4a1d --- /dev/null +++ b/rescue/tree/usr/sbin/grabjournallogs @@ -0,0 +1,51 @@ +#!/bin/bash + +if ! mountpoint -q /mnt ; then + echo "I do not seem to see a Mageia install mounted on /mnt. You need to mount it first!" >&2 + exit 1 +fi + +if [ ! -f /mnt/etc/machine-id ]; then + echo "Cannot find machine-id file (/mnt/etc/machine-id)" >&2 + exit 1 +fi + +MID=$(cat /mnt/etc/machine-id) +echo +echo "Found machine-id: $MID" +if [ ! -d /mnt/var/log/journal/$MID ]; then + echo "Cannot find journal log directory (/mnt/var/log/journal/)" >&2 + exit 1 +fi + +TIMEFRAME=24 +if [ -n "$1" ]; then + NEWTIMEFRAME=$(( 0 + $1 )) + if [ $NEWTIMEFRAME -gt 0 ]; then + TIMEFRAME=$NEWTIMEFRAME + fi +fi +SINCE="$(LC_ALL=c date --date=$TIMEFRAME' hours ago' +'%F %T')" +echo "Will collect logs from the last $TIMEFRAME hour(s)" +echo " NB give numeric argument to override capture period" + +TEMPFILE=$(mktemp /tmp/grabjournallogs.XXXXXX) +echo -n "Extracting logs... " +journalctl -D /mnt/var/log/journal/$MID --since "$SINCE" -o short >$TEMPFILE +echo "done" + +if [ $(cat $TEMPFILE | wc -l) -lt 2 ]; then + rm -f $TEMPFILE + echo >&2 + echo "Cannot find any logs. Consider increasing the capture period by passing a" >&2 + echo "numeric argument larger than $TIMEFRAME." >&2 + exit 1 +fi + +echo -n "Compressing logs... " +cat $TEMPFILE | xz >/journallogs.xz +rm -f $TEMPFILE +echo "done" + +echo +echo "Your logs have been extracted to the file 'journallogs.xz'" diff --git a/rescue/tree/usr/sbin/restore-image.sh b/rescue/tree/usr/sbin/restore-image.sh new file mode 100755 index 000000000..f4f904f3f --- /dev/null +++ b/rescue/tree/usr/sbin/restore-image.sh @@ -0,0 +1,412 @@ +#!/bin/bash + +setterm -powersave off +setterm -blank 0 + +if [ -r ./restore-image-lib.sh ]; then + . ./restore-image-lib.sh +elif [ -r /usr/lib/restore-image-lib.sh ]; then + . /usr/lib/restore-image-lib.sh +fi + +export PATH="/sbin:/bin:/usr/sbin:/usr/bin" + +mnt_dir="/tmp/mnt" +restore_media="/tmp/media" +images_dir="$restore_media/images" +images="$images_dir/list" +images_config="$images_dir/config" +image="" +win32_part_dev= +win32_part_type= +win32_part_new_size= + +function read_config() +{ + if [ -r "$images_config" ]; then + . $images_config + fi +} + +function image_list() +{ + list=$(cat $images | awk -F',' \ + '{ print $1 " " $2 " " $4 }') + + echo $list +} + +function image_file() +{ + country="$1" + + file=$(grep ^$country $images | awk -F',' '{ print $3 }') + + echo $file +} + +function welcome() +{ + while true; do + clear + msg="\n Welcome to $TITLE\n\ +\nThe following images were found, select one:\n " + opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" \ + --stdout --radiolist "$msg" 0 0 0 \ + $(image_list)) + + if [ "$?" != "0" ]; then + _yesno "\nInterrupt installation?\n " + if [ "$?" = "0" ]; then + _shutdown + fi + else + if [ -z "$opcao" ]; then + continue + else + image=$(image_file $opcao) + break + fi + fi + done + + # disable kernel messages in the console + echo "1 4 1 7" > /proc/sys/kernel/printk +} + +function install_warning() +{ + if [ -n "${win32_part_dev}" ]; then + warn_msg="Windows installation detected.\nWe will set it up as dual boot. \ +You may lose some data.\nPlease backup before proceeding." + else + warn_msg="WARNING: This process will erase all data in this machine, \ +do you want to continue?" + fi + + clear + _yesno "\n$warn_msg\n" + if [ "$?" != "0" ]; then + _shutdown + fi +} + +function detect_root() +{ + inst_source_dev=$(awk "\$2 == \"$restore_media\" { print \$1 }" /proc/mounts | sed -e 's/[0-9]$//') + inst_source_dev=${inst_source_dev#/dev/} + devices=$(grep "^ .*[^0-9]$" < /proc/partitions | grep -v ${inst_source_dev} | awk '$3 > '$MIN_DISKSIZE' { print $4,$3 }') + + if [ -z "${devices}" ]; then + exit 1 + fi + + devs_found=$(($(echo $devices | wc -w)/2)) + + root_data=$(detect_win32 ${inst_source_dev}) + + if [ -z "${root_data}" ]; then + if [ "$devs_found" -gt "1" ]; then + if [ -n "${inst_source_dev}" ]; then + opcao=$(dialog --backtitle "$BACKTITLE" --title "$TITLE" --stdout --menu 'Choose one of the detected devices to restore to (check the blocks size column first):' 8 50 0 $devices ) + if [ "$?" != "0" ]; then + _yesno "\nInterrupt installation?\n " + if [ "$?" = "0" ]; then + _shutdown + fi + else + root_data=${opcao} + fi + fi + else + root_data=$(echo ${devices} | cut -d ' ' -f 1) + fi + fi + + echo ${root_data} +} + +function detect_win32() +{ + # from detect_root() + skip_dev=${1} + + # win32 detection won't handle complex layouts + if [ $(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | wc -l) -gt 1 ]; then + exit + fi + + # get the last created windows partition information + set -f + device=$(fdisk -l | grep "^/dev/" | grep -v ${skip_dev} | grep -e "FAT\|NTFS\|HPFS" | tail -1 | sed 's/ .*$//') + set +f + + if [ -z "${device}" ]; then + exit + fi + + # it might be needed, for safety + device_type=$(blkid -o value -s TYPE ${device}) + modprobe ${device_type} + + # df for that partition + mount ${device} /mnt + size=$(df ${device} | tail -1) + umount /mnt + + # its diskspace + used=$(echo ${size} | awk '{ print $3 }') + left=$(echo ${size} | awk '{ print $4 }') + avail=$((${left}/2)) + + if [ ! ${avail} -lt ${MIN_DISKSIZE} ]; then + win32_part_dev=${device} + win32_part_type=${device_type} + # our install takes half of 'left' + win32_part_new_size=$((${used}+${avail})) + + dev=${win32_part_dev#/dev/} + disk=${dev%[0-9]} + number=${dev#[a-w][a-w][a-w]} + let number++ + echo ${disk}${number} ${win32_part_dev} ${win32_part_type} ${win32_part_new_size} + fi +} + +function resize_win32() +{ + device=${1} + device_type=${2} + new_win32_size=${3} + + dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "\nResizing Windows partition...\n" 4 55 + + dev=${device#/dev/} + disk=${dev%[0-9]} + win32_number=${dev#[a-w][a-w][a-w]} + + case ${device_type} in + vfat) device_id=b ;; + ntfs) device_id=7 ;; + hpfs) device_id=87 ;; + esac + + # wrapper around libdrakx by blino + diskdrake-resize ${device} ${device_type} $((${new_win32_size}*2)) &>/dev/null + + # we need some free sector here, rebuilding layout + fdisk /dev/${disk} &>/dev/null </dev/null </dev/null; dd bs=4M of=/dev/${root} >/tmp/backup.out 2>&1>>/tmp/log) & + + sleep 3 + pid=$(ps ax | grep 'dd bs=4M of' | grep -v grep | awk '{ print $1 }') + + while [ true ]; do + ps | grep -q $pid + if [ $? -eq 0 ]; then + /bin/kill -SIGUSR1 $pid + complete=$(tail -n 1 /tmp/backup.out | awk '{ print $1 }') + echo $((complete*100/total)) + sleep 1 + else + break + fi + done | dialog --backtitle "$BACKTITLE" --title "$TITLE" --gauge "\nWriting image..." 8 45 + + in=$(tail -n 3 /tmp/backup.out | grep 'in$' | cut -d' ' -f1) + out=$(tail -n 3 /tmp/backup.out | grep 'out$' | cut -d' ' -f1) + + if [ x"$in" != x"$out" ]; then + _msgbox "\nError writing image!\n" + sleep 24h + fi + + # Now re-read the partition table because 'dd' might have changed it + sfdisk -R /dev/${root} +} + +function grub_setup() +{ + root=${1} + grub_dir=${2} + + # install the bootloader + grub <> ${grub_dir}/menu.lst </dev/null| grep "Filesystem OS type" | awk '{ print $4 }') + if [ "${filesystem_type}" = "Linux" ]; then + dialog --backtitle "$BACKTITLE" --title "$TITLE" --infobox "Finishing Install... Expanding ${root}" 3 40 + disk=/dev/${root%[0-9]} + main_part=/dev/${root} + + # FIXME: absurdly dirty hack + main_part_num=${root:3} + swap_part_num=$((main_part_num+1)) + swap_part=${disk}${swap_part_num} + + main_part_sectors= + if [ -n "$SWAP_BLOCKS" ]; then + if [ -n "$EXPAND_FS" ]; then + total_blocks=$(sfdisk -s $disk) + main_part_blocks=$((total_blocks-SWAP_BLOCKS)) + main_part_sectors=$((main_part_blocks*2)) + else + main_part_sectors=$(sfdisk -d $disk | perl -lne 'm|^'$main_part'\b.*,\s*size\s*=\s*(\d+)\b| and print($1), exit') + fi + fi + if [ -n "$SWAP_BLOCKS" ]; then + parted $disk -- mkpartfs primary linux-swap ${main_part_sectors}s -1s yes + mkswap -L swap $swap_part + fi + if [ -n "$EXPAND_FS" ]; then + e2fsck -fy $main_part + fdisk $disk << EOF +d +$main_part_num +n +p +$main_part_num + + +a +$main_part_num +w +EOF + sfdisk -R $disk + e2fsck -fy $main_part + resize2fs $main_part + fi + mkdir -p $mnt_dir + mount $main_part $mnt_dir + grub_dir="$mnt_dir/boot/grub" + if [ -d "$grub_dir" ]; then + echo "(hd0) $disk" > "$grub_dir/device.map" + if [ -n "$win32_part_dev" ]; then + grub_setup ${root} ${grub_dir} + fi + fi + if [ -n "$MKINITRD" ]; then + mount -t sysfs none "$mnt_dir/sys" + mount -t proc none "$mnt_dir/proc" + chroot $mnt_dir bootloader-config --action rebuild-initrds + umount "$mnt_dir/sys" + umount "$mnt_dir/proc" + fi + umount $mnt_dir + fi +} + +# installation steps +welcome +read_config +detect_device +install_warning +write_image +expand_fs + +# all done! +_msgbox "\nInstallation process finished.\nPress ENTER to shutdown.\n " + +_shutdown + diff --git a/rescue/tree/usr/sbin/startssh b/rescue/tree/usr/sbin/startssh new file mode 100755 index 000000000..e14bb10e8 --- /dev/null +++ b/rescue/tree/usr/sbin/startssh @@ -0,0 +1,27 @@ +#!/bin/bash + +# test for an up interface != lo +if test "x"`ifconfig | cut -d ' ' -f 1 | grep -v '^$' | grep -v lo` = "x"; then + echo "There is no up interface, you can try to execute 'drvinst' to find drivers and 'dhcp-client' to configure your interface for DHCP." >&2 + exit 5 +fi + +# generate host keys +mkdir -p /etc/dropbear +[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null || { echo "Can't generate dsa host key" >&2 ; exit 4; } +[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null || { echo "Can't generate rsa host key" >&2 ; exit 3; } + +# set a password +passwd=`genpasswd` +if (( $? != 0 )); then + reset + exit $? +fi +sed -E -i -e 's/^root:[^:]*:/root:'"${passwd//\//\\/}"':/' /etc/passwd || { echo "Can't set password" >&2 ; exit 2; } + +# test for /dev/pts +grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts + +echo "" +echo -n "Starting ssh daemon... " +dropbear -E 2>/var/log/dropbear.log && echo "OK" || { echo "Failed" ; exit 1; } -- cgit v1.2.1 From 2137cf19edadc5e039ab9af523b1d5bc6e4ee136 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 3 Dec 2013 00:01:09 +0000 Subject: rescue: Tidy up dirs and aliases Technically, because we don't actually switchroot into this filesystem we don't need some of the directories and symlinks (as they are already present in the initrd). But with a long term view to making this a "real" filesystem that we DO switchroot into, it makes sense to try and keep things vaguely valid. --- rescue/aliases | 9 ++++++--- rescue/dirs | 4 ++-- rescue/make_rescue_img | 20 +++++++------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/rescue/aliases b/rescue/aliases index d92ea8ccf..ae924a86e 100644 --- a/rescue/aliases +++ b/rescue/aliases @@ -1,6 +1,9 @@ -/bin/vi vim-minimal -/lib/modules /modules -/usr/sbin/init /usr/lib/systemd/systemd +/bin usr/bin +/sbin usr/sbin +/lib usr/lib +/usr/bin/vi vim-minimal +/usr/sbin/init ../lib/systemd/systemd +/usr/lib/modules ../../modules /usr/lib/systemd/system/default.target rescue.target /usr/lib/systemd/system/rescue.target.wants/sockets.target ../sockets.target /usr/lib/systemd/system/dbus-org.freedesktop.machine1.service systemd-machined.service diff --git a/rescue/dirs b/rescue/dirs index 256a7f0f7..1b1153926 100644 --- a/rescue/dirs +++ b/rescue/dirs @@ -2,8 +2,8 @@ /proc /run /sys +/tmp /usr/bin /usr/sbin -/usr/lib -/tmp +/usr/lib/systemd/system/rescue.target.wants /modules diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 4b4301c55..49dc1a8d1 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -18,23 +18,23 @@ sub _ { __ @_; $? and die } my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch(); _ "rm -rf $tmp" if -e $tmp; _ "mkdir -p $tmp"; -_ "ln -s usr/bin $tmp/bin"; -_ "ln -s usr/sbin $tmp/sbin"; -_ "ln -s usr/lib $tmp/lib"; +_ "cp -a tree/* $tmp"; +_ "find $tmp -name '*~' -delete"; +mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); +foreach (cat_("aliases")) { + chomp; my ($f, $dest) = split; + symlink $dest, "$tmp$f"; +} if ($arch eq "x86_64") { _ "mkdir $tmp/usr/lib64"; _ "ln -s usr/lib64 $tmp/lib64"; } -_ "cp -a tree/* $tmp"; -_ "find $tmp -name '*~' -delete"; -mkdir_p($tmp . chomp_($_)) foreach cat_("dirs"); substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue"; _ "../tools/install-xml-file-list list.xml $tmp"; _ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release"; _ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks"; -_ "mkdir -p $tmp/usr/lib/systemd/system/rescue.target.wants"; my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); @@ -51,12 +51,6 @@ foreach (keyboard::loadkeys_files(sub { warn @_ })) { } } -foreach (cat_("aliases")) { - chomp; my ($f, $dest) = split; - symlink $dest, "$tmp$f"; -} - - if (my ($LANGUAGE) = map { if_(/LANGUAGE_(.*)/, $1) } keys %ENV) { substInFile { $_ = "export LANGUAGE=$LANGUAGE\n" . "export LC_ALL=$LANGUAGE\n" if /^#LANGUAGE/; -- cgit v1.2.1 From cad4721a454d9fcda1a505fdd9825113ac034893 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 7 Dec 2013 17:56:33 +0000 Subject: rescue: Mask an unimportant error when loading kernel modules. Particularly the floppy module fails quite regularly. That said, do we even need floppy support these days? --- rescue/make_rescue_img | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 49dc1a8d1..8e3f64334 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -35,6 +35,9 @@ _ "../tools/install-xml-file-list list.xml $tmp"; _ "sed 's/Mageia \\([0-9]*\\)/Mageia Rescue \\1/' /etc/os-release >$tmp/etc/os-release"; _ "ls -1 $tmp/etc | sed 's,\\(.*\\),/etc/\\1,' >>$tmp/usr/share/symlinks"; +# Loading the floppy module causes this service to fail so lets mask this to +# prevent a red "FAILED" briefly showing on the screen +_ "sed -i s/ExecStart=/ExecStart=-/ $tmp/usr/lib/systemd/system/systemd-modules-load.service"; my %keytable_conflicts; my @less_important_keytables = qw(am_old am_phonetic no-dvorak de-latin1); -- cgit v1.2.1 From 8a1f22d9941f1e52d0fb46612ae181537aa29185 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 7 Dec 2013 18:10:29 +0000 Subject: images: Pass audit=0 to the rescue system. Now that systemd is used there, we can use systemd-nspawn to 'boot' systems as containers. Unfortunately the kernel's audit subsystem needs to be fixed otherwise logging in doesn't work... so lets turn it off. --- images/NEWS | 2 ++ images/make_boot_img | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/NEWS b/images/NEWS index 7329388f3..f6f1f4039 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- use audit=0 in rescue isolinux config to allow systemd-nspawn to work smoothly + Version 2.3 - 2 December 2013 by Thierry Vignaud - include "sdhci-acpi" for eMMC (mga#11812) diff --git a/images/make_boot_img b/images/make_boot_img index 48f106e85..1cf144a39 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -180,7 +180,7 @@ sub entries_append { vgahi => "vga=791", text => "text", # patch => "patch $default_vga", - rescue => "rescue", + rescue => "audit=0 rescue", ); my @entries = ( (map { $_->[0] => "$automatic$default_acpi $_->[1]" } group_by2(@simple_entries)), -- cgit v1.2.1 From 218b7daece5df6dd17c3edef963132507eb9c819 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 8 Dec 2013 22:31:39 +0100 Subject: fix spacing --- rescue/NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/rescue/NEWS b/rescue/NEWS index cf8d6e3cf..80a09a316 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -2,6 +2,7 @@ - allowing systemd-nspawn "booting" of a mounted /mnt (after umount /mnt/proc) Version 1.46 - 20 October 2013 by Colin Guthrie + - adapt to a dracut based stage1 Version 1.45.1 - 14 October 2013 by Colin Guthrie -- cgit v1.2.1 From 034d58457f287d312a06b10a3496a25befbf15d5 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 8 Dec 2013 22:32:21 +0100 Subject: 1.47 --- rescue/Makefile | 2 +- rescue/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rescue/Makefile b/rescue/Makefile index 64e9119e3..a53703d0f 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.46 +VERSION=1.47 PRODUCT=drakx-installer-rescue RESCUE = rescue.sqfs diff --git a/rescue/NEWS b/rescue/NEWS index 80a09a316..c2a820493 100644 --- a/rescue/NEWS +++ b/rescue/NEWS @@ -1,3 +1,5 @@ +Version 1.47 - 8 December 2013 by Colin Guthrie + - use systemd as init in the rescue system - allowing systemd-nspawn "booting" of a mounted /mnt (after umount /mnt/proc) -- cgit v1.2.1 From 67cfbb987c02f8725cfaf2cf4bc5f623ff10c07e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 8 Dec 2013 23:58:10 +0100 Subject: log partitioning wizard failures (mga#11924) --- perl-install/NEWS | 3 +++ perl-install/fs/partitioning_wizard.pm | 1 + 2 files changed, 4 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index 0f137de52..1c9c60aa3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- partitioning wizard: + o log failures (mga#11924) + Version 16.11 - 6 December 2013 - fix a crash in rpmdrake when package list is empty (mga#11901) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index 4749deec1..fbe72f8bc 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -595,6 +595,7 @@ sub main { if ($err =~ /wizcancel/) { $_->destroy foreach $::WizardTable->get_children; } else { + log::l("Partitioning failed: $err"); $o->ask_warn('', N("Partitioning failed: %s", formatError($err))); } } -- cgit v1.2.1 From 144915f4b74abb5686e6f4d03c1c1dc170377199 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Dec 2013 00:06:09 +0100 Subject: perl_checker cleanup: tag an optional variable as such --- perl-install/fs/partitioning_wizard.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index fbe72f8bc..ddd54c9ec 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -73,13 +73,13 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return; } sub partitionWizardSolutions { - my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $target) = @_; + my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $o_target) = @_; my $hds = $all_hds->{hds}; my $fstab; my $full_fstab = [ fs::get::fstab($all_hds) ]; - if ($target) { - $hds = [ $target ]; - $fstab = [ grep { $_->{rootDevice} eq $target->{device} } fs::get::fstab($all_hds) ]; + if ($o_target) { + $hds = [ $o_target ]; + $fstab = [ grep { $_->{rootDevice} eq $o_target->{device} } fs::get::fstab($all_hds) ]; } else { $fstab = $full_fstab; } @@ -244,7 +244,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $ }, \&partition_table::description, \@hds_rw) or return; } else { - $hd = $target; + $hd = $o_target; } $in->ask_okcancel_({ messages => N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd)), title => N("Partitioning"), -- cgit v1.2.1 From 2faff543a970d4a3a836310dc333780efb5eb48a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Dec 2013 01:37:11 +0100 Subject: typo fix in comment --- perl-install/diskdrake/hd_gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index c8e9215c8..ed32cb225 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -112,7 +112,7 @@ sub main { $current_entry = ''; $update_all->(); }); - # ensure partitions bar is properlyz size on first display: + # ensure partitions bar is properly sized on first display: $notebook_widget->signal_connect(realize => $update_all); $w->sync; $done_button->grab_focus; -- cgit v1.2.1 From 3adb60aff810f3493789cfb4db21ca5bcd4bf9c8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Dec 2013 04:25:07 +0100 Subject: workaround a crash (mga#11924) sometimes (when there's more than one disk), the notebook is realized too early and our callbacks aren't called, resulting in $done_button not being initialized --- perl-install/NEWS | 1 + perl-install/diskdrake/hd_gtk.pm | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index 1c9c60aa3..431e892b3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - partitioning wizard: o log failures (mga#11924) + o workaround a crash (mga#11924) Version 16.11 - 6 December 2013 diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index ed32cb225..7ad48ab82 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -115,6 +115,12 @@ sub main { # ensure partitions bar is properly sized on first display: $notebook_widget->signal_connect(realize => $update_all); $w->sync; + # workaround for $notebook_widget being realized too early: + if (!$done_button) { + $notebook_widget->set_current_page(-1); + $notebook_widget->set_current_page(0); + $update_all->(2); + } $done_button->grab_focus; if (!$::testing) { $in->ask_from_list_(N("Read carefully"), N("Please make a backup of your data first"), -- cgit v1.2.1 From b1b1496154963dc770a1f7ca59ed120ad90ac54a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Dec 2013 04:26:16 +0100 Subject: 16.12 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index ea49e2bda..a4fc99a8e 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.11 +VERSION:=16.12 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 431e892b3..d9f478ab5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.12 - 9 December 2013 + - partitioning wizard: o log failures (mga#11924) o workaround a crash (mga#11924) -- cgit v1.2.1 From 98401bd9afc0bcdc7a84136c540dea23ce8e1dfc Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 9 Dec 2013 07:02:43 +0200 Subject: Update Dutch translation Fix bug #11825 --- perl-install/share/po/nl.po | 68 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po index b48432b9c..0c99714fd 100644 --- a/perl-install/share/po/nl.po +++ b/perl-install/share/po/nl.po @@ -6,7 +6,7 @@ # # Niels Gras , 2000. # Jeroen ten Berge , 2002. -# Reinout van Schouwen , 2002-2009. +# Reinout van Schouwen , 2002-2009, 2013. # Peter Bosch , 2002. # Rob Teng , 2005, 2008, 2009. # Arno Fleming, 2006. @@ -15,15 +15,14 @@ msgid "" msgstr "" "Project-Id-Version: libDrakX\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-03-10 09:06+0100\n" -"Last-Translator: Remco Rijnders \n" +"PO-Revision-Date: 2013-05-08 23:54+0100\n" +"Last-Translator: Reinout van Schouwen \n" "Language-Team: Nederlands\n" -"Language: \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" -"X-Generator: KBabel 1.11.4\n" #: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 @@ -3406,6 +3405,61 @@ msgid "" "currently using the sound card directly (normally this should only show " "PulseAudio)\n" msgstr "" +"Hieronder volgen enkele basistips om audio-problemen te helpen oplossen, maar " +"voor accurate en actuele tips en trucs, bezoekt u:\n" +"\n" +"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" +"\n" +"\n" +"\n" +"- Algemene aanbeveling: Schakel PulseAudio in. Als u ervoor gekozen heeft om " +"PulseAudio niet te gebruiken, adviseren wij u nadrukkelijk om het in te " +"schakelen. Voor de overgrote meerderheid van de gevallen bij huis-, tuin- en " +"keukengebruik, is PulseAudio de aanbevolen en best ondersteunde optie.\n" +"\n" +"\n" +"\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol" +"\" (generiek) starten grafische toepassingen die u in staat stellen uw " +"audio-apparaten te bekijken en de geluidsniveaus af te regelen\n" +"\n" +"\n" +"- \"ps aux | grep pulseaudio\" controleert of PulseAudio draait.\n" +"\n" +"\n" +"- \"pactl stat\" controleert of u correct kunt verbinden met de PulseAudio-" +"voorziening.\n" +"\n" +"\n" +"- \"pactl list sink-inputs\" vertelt u welke programma's op dit moment " +"geluid afspelen via PulseAudio.\n" +"\n" +"\n" +"- \"systemctl status osspd.service\" vertelt u de huidige staat van de " +"OSS-proxy-voorziening. Deze dient om geluid van ouderwetse toepassingen " +"mogelijk te maken die de OSS-sound API gebruiken. U dient het pakket ‘ossp’ " +"te installeren als u deze functionaliteit nodig heeft.\n" +"\n" +"\n" +"- \"pacmd ls\" geeft u VEEL debuginformatie over de huidige status van uw " +"audio.\n" +"\n" +"\n" +"- \"lspcidrake -v | grep -i audio\" vertelt u welk low-level stuurprogramma " +"uw geluidskaart standaard gebruikt.\n" +"\n" +"\n" +"- \"/usr/sbin/lsmod | grep snd\" stelt u in staat te controleren welke " +"geluidsgerelateerde kernelmodules geladen zijn.\n" +"\n" +"\n" +"- \"alsamixer -c 0\" geeft u een tekstgebaseerde mixer die de low-level " +"ALSA-mixerschuiven bedient voor de eerste geluidskaart\n" +"\n" +"\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" vertelt u welke programma's " +"momenteel de geluidskaart direct gebruiken (normaal gesproken zou dit slechts " +"PulseAudio mogen tonen)\n" #: harddrake/sound.pm:476 #, c-format @@ -6225,9 +6279,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi is een ZeroConf daemon welke een mDNS stack implementeert" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "NTP-server" +msgstr "Een NTP-client/-server" #: services.pm:27 #, c-format -- cgit v1.2.1 From 10c375c60410839d7fe07954d3ec9d32955ee03e Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 9 Dec 2013 07:12:53 +0200 Subject: Update Brazilian Portuguese translation --- perl-install/share/po/pt_BR.po | 481 +++++++---------------------------------- 1 file changed, 84 insertions(+), 397 deletions(-) diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po index 2f7002741..5b8f5f296 100644 --- a/perl-install/share/po/pt_BR.po +++ b/perl-install/share/po/pt_BR.po @@ -1,34 +1,34 @@ -# 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 -# Andrei Bosco Bezerra Torres , 2000, 2003. -# Bruno Dorfman Buys , 2002. -# Tiago da Cruz Bezerra ,2002 2003, 2004. -# Ricardo de Castilho , 2003. -# Carlinhos Cecconi , 2003, 2004. -# Deivi Lopes Kuhn , 2003, 2004. -# Cristiano Otto Von Trompczynski , 2005. -# Arthur Renato Mello , 2005. -# Wanderlei Antonio Cavassin , 2006. -# Felipe Arruda , 2006, 2007, 2008. -# Sergio Rafael Lemke (bedi) , 2009, 2010. -# Marcio Padula Padula , 2013. -msgid "" -msgstr "" -"Project-Id-Version: pt_BR\n" +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# +# Translators: +# Andrei Bosco Bezerra Torres , 2000,2003 +# Arthur Renato Mello , 2005 +# Bruno Dorfman Buys , 2002 +# Carlinhos Cecconi , 2003-2004 +# Cristiano Otto Von Trompczynski , 2005 +# Deivi Lopes Kuhn , 2003-2004 +# Felipe Arruda , 2006-2008 +# Padula , 2013 +# Padula , 2013 +# Padula , 2013 +# Ricardo de Castilho , 2003 +# Sergio Rafael Lemke (bedi) , 2009-2010 +# Tiago da Cruz Bezerra ,2002 2003, 2004 +# Wanderlei Antonio Cavassin , 2006 +msgid "" +msgstr "" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-02-17 15:33-0300\n" -"Last-Translator: padula \n" -"Language-Team: Brazilian Portuguese \n" +"PO-Revision-Date: 2013-12-08 20:13+0000\n" +"Last-Translator: Padula \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" +"Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" #: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 @@ -1097,11 +1097,6 @@ msgstr "Nome de usuário administrador do domínio" msgid "Domain Admin Password" msgstr "Senha de administrador do domínio" -# NOTE: this message will be displayed at boot time; that is -# only the ascii charset will be available on most machines -# so use only 7bit for this message (and do transliteration or -# leave it in English, as it is the best for your language) -# #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #: bootloader.pm:1019 #, c-format @@ -3407,6 +3402,62 @@ msgid "" "currently using the sound card directly (normally this should only show " "PulseAudio)\n" msgstr "" +"Abaixo estão algumas dicas básicas para ajudar a depurar problemas de " +"áudio , mas para dicas e truques precisas e up-to-date , consulte:\n" +"\n" +"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" +"\n" +"\n" +"\n" +"- Recomendação Geral: Habilitar PulseAudio . Se você optou por não usar o " +"PulseAudio , aconselhamos fortemente que você ativá-la. Para a grande " +"maioria dos casos de uso de desktop , PulseAudio é a opção recomendada e " +"melhor suportada.\n" +"\n" +"\n" +"\n" +"- \"Kmix\" (KDE) , \"gnome-control-center sound\" (GNOME) e \"pauvucontrol" +"\" (genérico) vai lançar aplicações gráficas para que você possa ver os seus " +"dispositivos de som e ajustar os níveis de volume\n" +"\n" +"\n" +"- \"ps aux | grep pulseaudio\" irá verificar que PulseAudio está " +"funcionando.\n" +"\n" +"\n" +"- \"Pactl stat\" irá verificar se você pode conectar-se ao daemon PulseAudio " +"corretamente.\n" +"\n" +"\n" +"- \"pactl list sink-inputs\" irá dizer-lhe quais os programas que estão " +"atualmente jogando som via PulseAudio.\n" +"\n" +"\n" +"- \"systemctl status osspd.service\" irá dizer-lhe o estado atual do Daemon " +"Proxy OSS . Isto é usado para ativar o som de aplicações legadas que usam a " +"API de som OSS . Você deve instalar o pacote \"ossp\" se você precisar dessa " +"funcionalidade.\n" +"\n" +"\n" +"- \"pacmd ls\" irá dar- lhe um monte de informações de depuração sobre o " +"estado atual do seu áudio.\n" +"\n" +"\n" +"- \"lspcidrake -v | grep -i audio\" vai lhe dizer qual driver de baixo nível " +"de sua placa usa por padrão.\n" +"\n" +"\n" +"- \"/usr/sbin/lsmod | grep snd\" irá permitir que você verifique qual o som " +"módulos do kernel relacionados (drivers) são carregados.\n" +"\n" +"\n" +"- \"alsamixer -c 0\" vai lhe dar um mixer baseado em texto para o nível ALSA " +"controles baixos misturador para a primeira placa de som\n" +"\n" +"\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" irá dizer quais os programas " +"que estão usando a placa de som diretamente (normalmente isso só deve " +"mostrar PulseAudio)\n" #: harddrake/sound.pm:476 #, c-format @@ -6205,9 +6256,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi é um daemon ZeroConf que implementa uma camada mDNS" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "Servidor NTP" +msgstr "Um Cliente/Servidor NTP" #: services.pm:27 #, c-format @@ -7135,367 +7186,3 @@ msgstr "" #, c-format msgid "Installation failed" msgstr "Falha na instalação" - -#~ msgid "Clean /tmp at each boot" -#~ msgstr "Limpar /tmp a cada inicialização" - -#~ msgid "" -#~ "The old \"%s\" driver is blacklisted.\n" -#~ "\n" -#~ "It has been reported to oops the kernel on unloading.\n" -#~ "\n" -#~ "The new \"%s\" driver will only be used on next bootstrap." -#~ msgstr "" -#~ "O driver antigo \"%s\" está na lista negra.\n" -#~ "\n" -#~ "Foi relatado que ele provoca erros no kernel ao descarregar.\n" -#~ "\n" -#~ "O novo driver \"%s\" só será utilizado na próxima inicialização." - -#~ msgid "No open source driver" -#~ msgstr "Nenhum driver de código aberto" - -#~ msgid "" -#~ "There's no free driver for your sound card (%s), but there's a " -#~ "proprietary driver at \"%s\"." -#~ msgstr "" -#~ "Não há nenhum driver livre para sua placa de som (%s), mas existe um " -#~ "driver proprietário em \"%s\"." - -#~ msgid "command %s missing" -#~ msgstr "comando %s não encontrado" - -#~ msgid "" -#~ "The classic bug sound tester is to run the following commands:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card " -#~ "uses\n" -#~ "by default\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n" -#~ "currently uses\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n" -#~ "loaded or not\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" " -#~ "will\n" -#~ "tell you if sound and alsa services are configured to be run on\n" -#~ "initlevel 3\n" -#~ "\n" -#~ "- \"aumix -q\" will tell you if the sound volume is muted or not\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound " -#~ "card.\n" -#~ msgstr "" -#~ "O teste clássico de som é executar os seguintes comandos:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" mostrará qual driver sua placa \n" -#~ "usa por padrão\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" mostrará qual driver está sendo\n" -#~ "usado no momento\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" permitirá verificar se o seu módulo (driver) \n" -#~ "esta carregado ou não\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" e \"/sbin/chkconfig --list alsa\"\n" -#~ "mostrará se seu som e os serviços alsa estão configurados para\n" -#~ "executar no nível de execução 3\n" -#~ "\n" -#~ "- \"aumix -q\" mostrará se o volume dom som está mudo ou não\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" mostrará qual programa usa a placa de som.\n" - -#~ msgid "" -#~ "Launch packet filtering for Linux kernel 2.2 series, to set\n" -#~ "up a firewall to protect your machine from network attacks." -#~ msgstr "" -#~ "Inicie a filtragem de de pacote para o kernel Linux série 2.2, para " -#~ "configurar\n" -#~ "um firewall e proteger sua máquina de ataques de rede." - -#~ msgid "File sharing" -#~ msgstr "Compartilhamento de arquivos" - -#~ msgid "Enable 5.1 sound with Pulse Audio" -#~ msgstr "Habilitar som 5.1 com o Pulse Audio" - -#~ msgid "Enable user switching for audio applications" -#~ msgstr "Habilitar a troca de usuários para aplicações de áudio" - -#~ msgid "" -#~ "You agree not to (i) sell, export, re-export, transfer, divert, disclose " -#~ "technical data, or \n" -#~ "dispose of, any Software to any person, entity, or destination prohibited " -#~ "by US export laws \n" -#~ "or regulations including, without limitation, Cuba, Iran, North Korea, " -#~ "Sudan and Syria; or \n" -#~ "(ii) use any Software for any use prohibited by the laws or regulations " -#~ "of the United States.\n" -#~ "\n" -#~ "U.S. GOVERNMENT RESTRICTED RIGHTS. \n" -#~ "\n" -#~ "The Software Products and any accompanying documentation are and shall be " -#~ "deemed to be \n" -#~ "\"commercial computer software\" and \"commercial computer software " -#~ "documentation,\" respectively, \n" -#~ "as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, " -#~ "modification, reproduction, \n" -#~ "release, performance, display or disclosure of the Software and any " -#~ "accompanying documentation \n" -#~ "by the United States Government shall be governed solely by the terms of " -#~ "this Agreement and any \n" -#~ "other applicable licence agreements and shall be prohibited except to the " -#~ "extent expressly permitted \n" -#~ "by the terms of this Agreement." -#~ msgstr "" -#~ "Você concorda não (i) vender, exportar, transferir, desviar, revelar " -#~ "dados técnicos, ou\n" -#~ "dipor qualquer Software para qualquer pessoa, entidade ou destinatário " -#~ "proibido pelas leis de exportação dos EUA\n" -#~ "ou regulamentos que incluem, sem limitação, Cuba, Irã, Coreia do Norte, " -#~ "Sudão e Síria; ou \n" -#~ "(ii) usar qualquer software para objetivos proibidos por lei ou " -#~ "regulamentações dos EUA.\n" -#~ "\n" -#~ "DIREITOS RESTRITOS DO GOVERNO DOS EUA. \n" -#~ "\n" -#~ "Os Produtos de Software e qualquer documentação que os acompanhe são e " -#~ "devem ser considerados como \n" -#~ "\"software computacional comercial\" e \"documentação de software " -#~ "computacional comercial,\" respectivamente, \n" -#~ "como definido na DFAR 252.227-7013 e como descrito na FAR 12.212. " -#~ "Qualquer uso, modificação, reprodução,\n" -#~ "lançamento, performance, exibição ou descoberta do Software e da " -#~ "documentação que o acompanha\n" -#~ "pelo governo dos Estados Unidos deve ser administrado apenas pelos termos " -#~ "deste acordo e qualquer \n" -#~ "outro acordo de licença aplicável e deve ser proibido exceto para o " -#~ "permitir\n" -#~ "explicitamente a extensão através dos termos deste acordo." - -#~ msgid "" -#~ "Most of these components, but excluding the applications and software " -#~ "provided by Google Inc. or \n" -#~ "its subsidiaries (\"Google Software\"), are governed under the terms and " -#~ "conditions of the GNU \n" -#~ "General Public Licence, hereafter called \"GPL\", or of similar licenses." -#~ msgstr "" -#~ "A maior parte destes componentes, com exceção das aplicações e softewares " -#~ "fornecidos pela Google Inc. ou \n" -#~ "suas subsidiárias (\"Google Software\"), estão sob os termos e condições " -#~ "da GNU \n" -#~ "General Public Licence, chamada de agora em diante neste documento por " -#~ "\"GPL\", ou licenças similares." - -#~ msgid "" -#~ "Most of these components are governed under the terms and conditions of " -#~ "the GNU \n" -#~ "General Public Licence, hereafter called \"GPL\", or of similar licenses." -#~ msgstr "" -#~ "A maior parte destes componentes estão sob os termos e condições da GNU \n" -#~ "General Public Licence, chamada de agora em diante neste documento por " -#~ "\"GPL\", ou licenças similares." - -#~ msgid "" -#~ "6. Additional provisions applicable to those Software Products provided " -#~ "by Google Inc. (\"Google Software\")\n" -#~ "\n" -#~ "(a) You acknowledge that Google or third parties own all rights, title " -#~ "and interest in and to the Google \n" -#~ "Software, portions thereof, or software provided through or in " -#~ "conjunction with the Google Software, including\n" -#~ "without limitation all Intellectual Property Rights. \"Intellectual " -#~ "Property Rights\" means any and all rights \n" -#~ "existing from time to time under patent law, copyright law, trade secret " -#~ "law, trademark law, unfair competition \n" -#~ "law, database rights and any and all other proprietary rights, and any " -#~ "and all applications, renewals, extensions \n" -#~ "and restorations thereof, now or hereafter in force and effect worldwide. " -#~ "You agree not to modify, adapt, \n" -#~ "translate, prepare derivative works from, decompile, reverse engineer, " -#~ "disassemble or otherwise attempt to derive \n" -#~ "source code from Google Software. You also agree to not remove, obscure, " -#~ "or alter Google's or any third party's \n" -#~ "copyright notice, trademarks, or other proprietary rights notices affixed " -#~ "to or contained within or accessed in \n" -#~ "conjunction with or through the Google Software. \n" -#~ "\n" -#~ "(b) The Google Software is made available to you for your personal, non-" -#~ "commercial use only.\n" -#~ "You may not use the Google Software in any manner that could damage, " -#~ "disable, overburden, or impair Google's \n" -#~ "search services (e.g., you may not use the Google Software in an " -#~ "automated manner), nor may you use Google \n" -#~ "Software in any manner that could interfere with any other party's use " -#~ "and enjoyment of Google's search services\n" -#~ "or the services and products of the third party licensors of the Google " -#~ "Software.\n" -#~ "\n" -#~ "(c) Some of the Google Software is designed to be used in conjunction " -#~ "with Google's search and other services.\n" -#~ "Accordingly, your use of such Google Software is also defined by Google's " -#~ "Terms of Service located at \n" -#~ "http://www.google.com/terms_of_service.html and Google's Toolbar Privacy " -#~ "Policy located at \n" -#~ "http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n" -#~ "\n" -#~ "(d) Google Inc. and each of its subsidiaries and affiliates are third " -#~ "party beneficiaries of this contract \n" -#~ "and may enforce its terms." -#~ msgstr "" -#~ "6. Additional provisions applicable to those Software Products provided " -#~ "by Google Inc. (\"Google Software\")\n" -#~ "\n" -#~ "(a) You acknowledge that Google or third parties own all rights, title " -#~ "and interest in and to the Google \n" -#~ "Software, portions thereof, or software provided through or in " -#~ "conjunction with the Google Software, including\n" -#~ "without limitation all Intellectual Property Rights. \"Intellectual " -#~ "Property Rights\" means any and all rights \n" -#~ "existing from time to time under patent law, copyright law, trade secret " -#~ "law, trademark law, unfair competition \n" -#~ "law, database rights and any and all other proprietary rights, and any " -#~ "and all applications, renewals, extensions \n" -#~ "and restorations thereof, now or hereafter in force and effect worldwide. " -#~ "You agree not to modify, adapt, \n" -#~ "translate, prepare derivative works from, decompile, reverse engineer, " -#~ "disassemble or otherwise attempt to derive \n" -#~ "source code from Google Software. You also agree to not remove, obscure, " -#~ "or alter Google's or any third party's \n" -#~ "copyright notice, trademarks, or other proprietary rights notices affixed " -#~ "to or contained within or accessed in \n" -#~ "conjunction with or through the Google Software. \n" -#~ "\n" -#~ "(b) The Google Software is made available to you for your personal, non-" -#~ "commercial use only.\n" -#~ "You may not use the Google Software in any manner that could damage, " -#~ "disable, overburden, or impair Google's \n" -#~ "search services (e.g., you may not use the Google Software in an " -#~ "automated manner), nor may you use Google \n" -#~ "Software in any manner that could interfere with any other party's use " -#~ "and enjoyment of Google's search services\n" -#~ "or the services and products of the third party licensors of the Google " -#~ "Software.\n" -#~ "\n" -#~ "(c) Some of the Google Software is designed to be used in conjunction " -#~ "with Google's search and other services.\n" -#~ "Accordingly, your use of such Google Software is also defined by Google's " -#~ "Terms of Service located at \n" -#~ "http://www.google.com/terms_of_service.html and Google's Toolbar Privacy " -#~ "Policy located at \n" -#~ "http://www.google.com/support/toolbar/bin/static.py?page=privacy.html.\n" -#~ "\n" -#~ "(d) Google Inc. and each of its subsidiaries and affiliates are third " -#~ "party beneficiaries of this contract \n" -#~ "and may enforce its terms." - -#~ msgid "Restrict command line options" -#~ msgstr "Restringir opções da linha de comando" - -#~ msgid "restrict" -#~ msgstr "restrito" - -#~ msgid "" -#~ "Option ``Restrict command line options'' is of no use without a password" -#~ msgstr "" -#~ "A opção \"Restringi opções da linha de comando\" não tem uso sem uma senha" - -#~ msgid "Use an encrypted filesystem" -#~ msgstr "Usar um sistema de arquivos encriptado" - -#~ msgid "" -#~ "To ensure data integrity after resizing the partition(s), \n" -#~ "filesystem checks will be run on your next boot into Microsoft Windows®" -#~ msgstr "" -#~ "Para assegurar a integridade dos dados depois de redimensionar, \n" -#~ "verificações no sistema de arquivos serão executadas quando o " -#~ "computadoriniciar na próximo vez com o Windows®" - -#~ msgid "Use the Microsoft Windows® partition for loopback" -#~ msgstr "Usar a partição Microsoft Windows® para loopback" - -#~ msgid "Which partition do you want to use for Linux4Win?" -#~ msgstr "Qual partição você quer usar para o Linux4Win ?" - -#~ msgid "Choose the sizes" -#~ msgstr "Escolha os tamanhos" - -#~ msgid "Root partition size in MB: " -#~ msgstr "Tamanho da partição raiz em MB: " - -#~ msgid "Swap partition size in MB: " -#~ msgstr "Tamanho da partição swap em MB: " - -#~ msgid "" -#~ "There is no FAT partition to use as loopback (or not enough space left)" -#~ msgstr "" -#~ "Não existem partições FAT para usar como loopback (ou não existe " -#~ "espaçosuficiente)" - -#~ msgid "" -#~ "The FAT resizer is unable to handle your partition, \n" -#~ "the following error occurred: %s" -#~ msgstr "" -#~ "O redimensionador FAT não foi capaz de manipular sua partição; \n" -#~ "o seguinte erro ocorreu: %s" - -#~ msgid "Automatic routing from ALSA to PulseAudio" -#~ msgstr "Roteamento automático do ALSA para o PulseAudio" - -#~ msgid "Please log out and then use Ctrl-Alt-BackSpace" -#~ msgstr "" -#~ "Por favor, saia do ambiente (logout) e e então use as teclas Ctrl-Alt-" -#~ "BackSpace" - -#~ msgid "Welcome To Crackers" -#~ msgstr "Bem-vindo ao Crackers" - -#~ msgid "Poor" -#~ msgstr "Baixo" - -#~ msgid "High" -#~ msgstr "Alto" - -#~ msgid "Higher" -#~ msgstr "Superior" - -#~ msgid "Paranoid" -#~ msgstr "Paranoico" - -#~ msgid "" -#~ "This level is to be used with care. It makes your system more easy to " -#~ "use,\n" -#~ "but very sensitive. It must not be used for a machine connected to " -#~ "others\n" -#~ "or to the Internet. There is no password access." -#~ msgstr "" -#~ "Este nível deve ser usado com cuidado. Ele deixa o seu sistema mais " -#~ "fácil\n" -#~ "de usar, mas muito sensível: ele não deve ser usado em uma máquina " -#~ "conectada\n" -#~ "a outras ou à internet. Não existe acesso por senha." - -#~ msgid "" -#~ "Passwords are now enabled, but use as a networked computer is still not " -#~ "recommended." -#~ msgstr "" -#~ "As senhas agora estão ativadas, mas o uso como computador de rede ainda " -#~ "não é recomendado." - -#~ msgid "" -#~ "There are already some restrictions, and more automatic checks are run " -#~ "every night." -#~ msgstr "" -#~ "Já existem algumas restrições, e mais algumas verificações automáticas " -#~ "serão executadas todas as noites." - -#~ msgid "" -#~ "This is similar to the previous level, but the system is entirely closed " -#~ "and security features are at their maximum." -#~ msgstr "" -#~ "Baseado no nível anterior, mas agora o sistema está totalmente fechado.\n" -#~ "As características de segurança estão no máximo." -- cgit v1.2.1 From 1050e32ef179b9a5dd8f0d16ca86ffdc415e8a72 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 9 Dec 2013 07:16:50 +0200 Subject: Update Brazilian Portuguese translation --- perl-install/standalone/po/pt_BR.po | 462 +++++------------------------------- 1 file changed, 53 insertions(+), 409 deletions(-) diff --git a/perl-install/standalone/po/pt_BR.po b/perl-install/standalone/po/pt_BR.po index b55cd5ce4..7154b0c58 100644 --- a/perl-install/standalone/po/pt_BR.po +++ b/perl-install/standalone/po/pt_BR.po @@ -1,34 +1,31 @@ -# 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 -# Andrei Bosco Bezerra Torres , 2000, 2003. -# Bruno Dorfman Buys , 2002. -# Tiago da Cruz Bezerra ,2002 2003, 2004. -# Ricardo de Castilho , 2003. -# Carlinhos Cecconi , 2003, 2004. -# Deivi Lopes Kuhn , 2003, 2004. -# Cristiano Otto Von Trompczynski , 2005. -# Arthur R. Mello , 2005. -# Arthur Renato Mello , 2005. -# Felipe Arruda , 2006, 2007, 2008. -# Sergio Rafael Lemke , 2009, 2010. -msgid "" -msgstr "" -"Project-Id-Version: drakx standalone pt_BR\n" -"Report-Msgid-Bugs-To: \n" +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# +# Translators: +# Andrei Bosco Bezerra Torres , 2000,2003 +# Arthur Renato Mello , 2005 +# Arthur R. Mello , 2005 +# Bruno Dorfman Buys , 2002 +# Carlinhos Cecconi , 2003-2004 +# Cristiano Otto Von Trompczynski , 2005 +# Deivi Lopes Kuhn , 2003-2004 +# Felipe Arruda , 2006-2008 +# Ricardo de Castilho , 2003 +# Sergio Rafael Lemke , 2009-2010 +# Tiago da Cruz Bezerra ,2002 2003, 2004 +msgid "" +msgstr "" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2013-02-24 14:32-0300\n" -"Last-Translator: padula \n" -"Language-Team: Brazilian Portuguese \n" +"PO-Revision-Date: 2013-12-08 21:22+0000\n" +"Last-Translator: Padula \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" +"Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" #: display_help:54 display_help:59 drakbug:173 drakperm:136 #, c-format @@ -3412,475 +3409,122 @@ msgid "Language & country configuration" msgstr "Configuração de Idioma e País" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Configuração de alerta por e-mail" +msgstr "Executar Configuração de Autenticação Mageia" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" msgstr "" +"A autenticação é necessária para executar a Configuração de autenticação " +"Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Configuração da Inicialização" +msgstr "Executar Boot de Configuração Mageia" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" msgstr "" +"A autenticação é necessária para executar o Boot de Configuração Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Configuração de alerta por e-mail" +msgstr "Execultar Configuração Data e Hora Mageia" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" msgstr "" +"A autenticação é necessária para executar a configuração Data e Hora Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Execultar o leiaute do Disco Editor Mageia" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" msgstr "" +"A autenticação é necessária para executar o leiaute do Disco Editor Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Configuração de Idioma e País" +msgstr "Execultar Configuração do Gerenciador de Login Mageia" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" msgstr "" +"A autenticação é necessária para executar a Configuração do Gerenciador de " +"Login Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Configuração de Idioma e País" +msgstr "Execultar Configuração de Fonte Mageia" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" msgstr "" +"A autenticação é necessária para executar a Configuração de Fonte Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Configuração do Servidor Gráfico" +msgstr "Execultar Configuração de Hardware Mageia" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" msgstr "" +"A autenticação é necessária para executar a Configuração de hardware Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Execultar Leitor de Log Mageia" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "A autenticação é necessária para executar o leitor de Log Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Configuração do Servidor Gráfico" +msgstr "Execultar a Configuração de Permissões de Segurança Mageia" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" msgstr "" +"A autenticação é necessária para executar a Configuração de Permissões de " +"Segurança Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Configuração do Servidor Gráfico" +msgstr "execultar Configuração de Scanner Mageia" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" msgstr "" +"A Autenticação é necessaria para executar a Configuração de Scanner Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Configuração de alerta por e-mail" +msgstr "Execultar Aplicativo de Configuração de Seguraça Mageia" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" msgstr "" +"A autenticação é necessária para execução do Aplicativo de Configuração de " +"Segurança Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Configuração do no-break" +msgstr "Execultar Configuração UPS Mageia" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "A autenticação é necessária para executar a Configuração UPS Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Configuração do Servidor Gráfico" +msgstr "Execultar Configuração de Serviço Mageia" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" msgstr "" - -#~ msgid "Verbose" -#~ msgstr "Detalhado" - -#~ msgid "Autodetect _printers" -#~ msgstr "Detectar _impressoras automaticamente" - -#~ msgid "Its GDB trace is:" -#~ msgstr "O rastreamento GDB é:" - -#~ msgid "OpenOffice.org" -#~ msgstr "BrOffice.org" - -#~ msgid "" -#~ "The proprietary driver for your graphic card cannot be found, the system " -#~ "is now using the free software driver (%s)." -#~ msgstr "" -#~ "O driver proprietário para a sua placa de vídeo não foi encontrado, o " -#~ "sistema vai usar um driver free software (%s)." - -#, fuzzy -#~ msgid "Copyright (C) %s by Mageia" -#~ msgstr "Copyright (C) %s por Mandriva" - -#~ msgid "" -#~ "No Sound Card has been detected on your machine. Please verify that a " -#~ "Linux-supported Sound Card is correctly plugged in.\n" -#~ "\n" -#~ "\n" -#~ "You can visit our hardware database at:\n" -#~ "\n" -#~ "\n" -#~ "http://www.mandrivalinux.com/en/hardware.php3" -#~ msgstr "" -#~ "Nenhuma Placa de Som foi detectada em sua máquina. Favor verificar se uma " -#~ "Placa de Som suportada pelo Linux está conectada corretamente.\n" -#~ "\n" -#~ "\n" -#~ "Você pode visitar o banco de dados de hardware em:\n" -#~ "\n" -#~ "\n" -#~ "http://www.mandrivalinux.com/en/hardware.php3" - -#~ msgid "" -#~ "Display theme\n" -#~ "under console" -#~ msgstr "" -#~ "Mostrar tema\n" -#~ "sob o console" - -#~ msgid "Create new theme" -#~ msgstr "Criar um novo tema" - -#~ msgid "X coordinate of text box" -#~ msgstr "Coordenada x da caixa de texto" - -#~ msgid "Y coordinate of text box" -#~ msgstr "Coordenada y da caixa de texto" - -#~ msgid "Text box width" -#~ msgstr "Largura da caixa de texto" - -#~ msgid "Text box height" -#~ msgstr "Altura da caixa de texto" - -#~ msgid "" -#~ "The progress bar X coordinate\n" -#~ "of its upper left corner" -#~ msgstr "" -#~ "Coordenadas x da barra de progresso\n" -#~ "no canto superior esquerdo" - -#~ msgid "" -#~ "The progress bar Y coordinate\n" -#~ "of its upper left corner" -#~ msgstr "" -#~ "Coordenadas y da barra de progresso\n" -#~ "no canto superior esquerdo" - -#~ msgid "The width of the progress bar" -#~ msgstr "O comprimento da barra de progresso" - -#~ msgid "The height of the progress bar" -#~ msgstr "A altura da barra de progresso" - -#~ msgid "X coordinate of the text" -#~ msgstr "Coordenada x do texto" - -#~ msgid "Y coordinate of the text" -#~ msgstr "Coordenada y do texto" - -#~ msgid "Text box transparency" -#~ msgstr "Transparência da caixa de texto" - -#~ msgid "Progress box transparency" -#~ msgstr "Transparência da caixa de progresso" - -#~ msgid "Text size" -#~ msgstr "Tamanho do texto" - -#~ msgid "Progress Bar" -#~ msgstr "Barra de Progresso" - -#~ msgid "Choose progress bar color 1" -#~ msgstr "Escolha a cor 1 da barra de progresso" - -#~ msgid "Choose progress bar color 2" -#~ msgstr "Escolha a cor 2 da barra de progresso" - -#~ msgid "Choose progress bar background" -#~ msgstr "Escolha a cor de fundo para a barra de progresso" - -#~ msgid "Gradient type" -#~ msgstr "Tipo gradiente" - -#~ msgid "Text" -#~ msgstr "Texto" - -#~ msgid "Choose text color" -#~ msgstr "Escolha a cor do texto" - -#~ msgid "Choose picture" -#~ msgstr "Escolha a figura" - -#~ msgid "Silent bootsplash" -#~ msgstr "Tela de apresentação silenciosa" - -#~ msgid "Choose text zone color" -#~ msgstr "Escolha a cor da zona de texto" - -#~ msgid "Text color" -#~ msgstr "Cor do texto" - -#~ msgid "Background color" -#~ msgstr "Cor de fundo" - -#~ msgid "Verbose bootsplash" -#~ msgstr "Tela de apresentação detalhada" - -#~ msgid "Theme name" -#~ msgstr "Nome do Tema" - -#~ msgid "Final resolution" -#~ msgstr "Resolução final" - -#~ msgid "Display logo on Console" -#~ msgstr "Exibir o logo no Console" - -#~ msgid "Save theme" -#~ msgstr "Salvar tema" - -#~ msgid "Please enter a theme name" -#~ msgstr "Entre um nome de tema" - -#~ msgid "Please select a splash image" -#~ msgstr "Selecione uma imagem splash" - -#~ msgid "saving Bootsplash theme..." -#~ msgstr "Salvando o tema da tela de apresentação..." - -#~ msgid "Unable to load image file %s" -#~ msgstr "Impossível carregar arquivo de imagem %s" - -#~ msgid "choose image" -#~ msgstr "escolher imagem" - -#~ msgid "Color selection" -#~ msgstr "Seleção de cor" - -#~ msgid "Coma bug" -#~ msgstr "bug Coma" - -#~ msgid "whether this cpu has the Cyrix 6x86 Coma bug" -#~ msgstr "se este processador central tem o erro(bug) 'coma' do Cyrix 6x86" - -#~ msgid "Fdiv bug" -#~ msgstr "Bug do Fdiv" - -#~ msgid "" -#~ "Early Intel Pentium chips manufactured have a bug in their floating point " -#~ "processor which did not achieve the required precision when performing a " -#~ "Floating point DIVision (FDIV)" -#~ msgstr "" -#~ "Os primeiros processadores Intel Pentium fabricados têm um erro na " -#~ "unidade de cálculos por vírgula que não permite a precisão esperada " -#~ "quando é feita uma divisão com vírgulas (FDIV)" - -#~ msgid "Is FPU present" -#~ msgstr "O FPU está presente" - -#~ msgid "yes means the processor has an arithmetic coprocessor" -#~ msgstr "" -#~ "\"sim\" significa que o processador possui um co-processador matemático" - -#~ msgid "Whether the FPU has an irq vector" -#~ msgstr "Se o FPU possui um vetor de IRQs" - -#~ msgid "" -#~ "yes means the arithmetic coprocessor has an exception vector attached" -#~ msgstr "" -#~ "\"sim\" significa que o co-processador aritmético possui uma falha no " -#~ "vetor" - -#~ msgid "F00f bug" -#~ msgstr "Bug do F00f" - -#~ msgid "" -#~ "early pentiums were buggy and freezed when decoding the F00F bytecode" -#~ msgstr "" -#~ "os primeiros pentiums possuíam falhas e travavam ao decodificar o " -#~ "bytecode F00F" - -#~ msgid "Halt bug" -#~ msgstr "Erro de desligamento" - -#~ msgid "" -#~ "Some of the early i486DX-100 chips cannot reliably return to operating " -#~ "mode after the \"halt\" instruction is used" -#~ msgstr "" -#~ "Alguns dos primeiros chips i486DX-100 não podem retornar confiavelmente " -#~ "ao modo operacional após a instrução \"halt\" ser utilizada" - -#~ msgid "Bugs" -#~ msgstr "Erros" - -#~ msgid "FPU" -#~ msgstr "FPU" - -#~ msgid "Unknown/Others" -#~ msgstr "Desconhecido/Outros" - -#~ msgid "" -#~ "Here, you can setup the security level and administrator of your " -#~ "machine.\n" -#~ "\n" -#~ "\n" -#~ "The 'Security Administrator' is the one who " -#~ "will receive security alerts if the\n" -#~ "'Security Alerts' option is set. It can be a " -#~ "username or an email.\n" -#~ "\n" -#~ "\n" -#~ "The 'Security Level' menu allows you to " -#~ "select one of the six preconfigured security levels\n" -#~ "provided with msec. These levels range from 'poor' security and ease of use, to\n" -#~ "'paranoid' config, suitable for very " -#~ "sensitive server applications:\n" -#~ "\n" -#~ "\n" -#~ "Poor: This is a totally unsafe but " -#~ "very\n" -#~ "easy to use security level. It should only be used for machines not " -#~ "connected to\n" -#~ "any network and that are not accessible to everybody.\n" -#~ "\n" -#~ "\n" -#~ "Standard: This is the standard " -#~ "security\n" -#~ "recommended for a computer that will be used to connect to the Internet " -#~ "as a\n" -#~ "client.\n" -#~ "\n" -#~ "\n" -#~ "High: There are already some\n" -#~ "restrictions, and more automatic checks are run every night.\n" -#~ "\n" -#~ "\n" -#~ "Higher: The security is now high " -#~ "enough\n" -#~ "to use the system as a server which can accept connections from many " -#~ "clients. If\n" -#~ "your machine is only a client on the Internet, you should choose a lower " -#~ "level.\n" -#~ "\n" -#~ "\n" -#~ "Paranoid: This is similar to the " -#~ "previous\n" -#~ "level, but the system is entirely closed and security features are at " -#~ "their\n" -#~ "maximum" -#~ msgstr "" -#~ "Aqui você pode configurar o nível de segurança e o administrador da sua " -#~ "máquina.\n" -#~ "\n" -#~ "\n" -#~ "O 'Administrador de Segurança é quem recebe " -#~ "os alertas de segurança\n" -#~ "se a opção 'Alertas de Segurança' estiver " -#~ "configurada. Ele pode ser um nome de usuário ou um endereço de e-mail.\n" -#~ "\n" -#~ "\n" -#~ "O menu Nível de Segurança permite que você " -#~ "escolha um dos 6 níveis pré-configurados de\n" -#~ "segurança, fornecidos com o msec. Eles vão de um nível de segurança baixo e fácil de\n" -#~ "utilizar, a uma configuração 'paranoica, " -#~ "indicada para servidores muito sensíveis:\n" -#~ "\n" -#~ "\n" -#~ "Baixa: Este é um nível de " -#~ "segurança completamente\n" -#~ "inseguro, porém fácil de utilizar. Só deve ser escolhido para máquinas\n" -#~ "que não estão ligadas a uma rede e que não estão acessíveis a todas as\n" -#~ "pessoas.\n" -#~ "\n" -#~ "\n" -#~ "Padrão : Este é o nível de " -#~ "segurança padrão\n" -#~ "aconselhado para um computador que vai ser utilizado para se conectar \n" -#~ "como cliente da Internet.\n" -#~ "\n" -#~ "\n" -#~ "Alto : Já há mais restrições, e\n" -#~ "mais verificações automáticas são feitas todas as noites.\n" -#~ "\n" -#~ "\n" -#~ "Superior : A segurança é agora\n" -#~ "suficiente para utilizar o sistema como um servidor que pode\n" -#~ "aceitar conexões de muitos clientes. Se a sua máquina só é cliente na\n" -#~ "Internet, é melhor escolher um nível mais baixo.\n" -#~ "\n" -#~ "\n" -#~ "Paranoico : Este é similar ao " -#~ "anterior,\n" -#~ "mas o sistema é completamente fechado e as opções de\n" -#~ "segurança estão ao máximo." - -#~ msgid "(default value: %s)" -#~ msgstr "(valor padrão: %s)" - -#~ msgid "Security Level:" -#~ msgstr "Nível de segurança:" - -#~ msgid "Security Alerts:" -#~ msgstr "Alertas de Segurança:" - -#~ msgid "Security Administrator:" -#~ msgstr "Administrador de Segurança:" - -#~ msgid "Basic options" -#~ msgstr "Opções básicas" - -#~ msgid "Network Options" -#~ msgstr "Opções da rede" - -#~ msgid "System Options" -#~ msgstr "Opções do sistema" - -#~ msgid "Periodic Checks" -#~ msgstr "Verificações Periódicas" - -#~ msgid "Please wait, setting security level..." -#~ msgstr "Por favor aguarde, configurando nível de segurança..." - -#~ msgid "Please wait, setting security options..." -#~ msgstr "Por favor aguarde, configurando opções de segurança..." +"A autenticação é necessária para executar o Configuração de Serviço Mageia" -- cgit v1.2.1 From 315dfd63a85bd85d5840fc035af2bbc281cfd08f Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 9 Dec 2013 07:19:35 +0200 Subject: Update Brazilian Portuguese translation --- perl-install/install/share/po/pt_BR.po | 252 ++++++++++----------------------- 1 file changed, 78 insertions(+), 174 deletions(-) diff --git a/perl-install/install/share/po/pt_BR.po b/perl-install/install/share/po/pt_BR.po index 365e441c8..7667b2a6b 100644 --- a/perl-install/install/share/po/pt_BR.po +++ b/perl-install/install/share/po/pt_BR.po @@ -1,85 +1,83 @@ -# 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 +# 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 , 2000, 2003. -# Bruno Dorfman Buys , 2002. -# Tiago da Cruz Bezerra ,2002 2003, 2004. -# Ricardo de Castilho , 2003. -# Carlinhos Cecconi , 2003, 2004. -# Deivi Lopes Kuhn , 2003, 2004. -# Cristiano Otto Von Trompczynski , 2005. -# Arthur R. Mello , 2005. -# Arthur Renato Mello , 2005. -# Felipe Arruda , 2006, 2007, 2008. -# Sergio Rafael Lemke , 2009, 2010. +# Translators: +# Andrei Bosco Bezerra Torres , 2000,2003 +# Arthur Renato Mello , 2005 +# Arthur R. Mello , 2005 +# Bruno Dorfman Buys , 2002 +# Carlinhos Cecconi , 2003-2004 +# Cristiano Otto Von Trompczynski , 2005 +# Deivi Lopes Kuhn , 2003-2004 +# Felipe Arruda , 2006-2008 +# Ricardo de Castilho , 2003 +# Sergio Rafael Lemke , 2009-2010 +# Tiago da Cruz Bezerra ,2002 2003, 2004 msgid "" msgstr "" -"Project-Id-Version: pt_BR\n" +"Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2010-05-11 17:34-0300\n" -"Last-Translator: Sergio Rafael Lemke \n" -"Language-Team: Brazilian Portuguese \n" +"PO-Revision-Date: 2013-12-08 21:58+0000\n" +"Last-Translator: Padula \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/01_IM_mageia.pl:1 #, c-format msgid "Join Us!" -msgstr "" +msgstr "Cadastre-se!" #: ../../advertising/02_IM_mageia.pl:1 #, c-format msgid "Make it yours!" -msgstr "" +msgstr "Faça-lhe seu!" #: ../../advertising/03_IM_mageia.pl:1 #, c-format msgid "Your choice!" -msgstr "" +msgstr "Sua escolha!" #: ../../advertising/04_IM_mageia.pl:1 -#, fuzzy, c-format +#, c-format msgid "Office tools" -msgstr "Ambiente de Escritório" +msgstr "ferramentas do Office" #: ../../advertising/05_IM_mageia.pl:1 #, c-format msgid "Home entertainment" -msgstr "" +msgstr "entretenimento de casa" #: ../../advertising/06_IM_mageia.pl:1 #, c-format msgid "For kids" -msgstr "" +msgstr "Para Crianças" #: ../../advertising/07_IM_mageia.pl:1 #, c-format msgid "For family!" -msgstr "" +msgstr "Para Familia!" #: ../../advertising/08_IM_mageia.pl:1 #, c-format msgid "For developers!" -msgstr "" +msgstr "Para os desenvolvedores!" #: ../../advertising/09_IM_mageia.pl:1 #, c-format msgid "Thank you!" -msgstr "" +msgstr "Obrigado!" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "" +msgstr "Seja livre!" #: any.pm:111 #, c-format @@ -194,17 +192,17 @@ msgstr "" #: any.pm:319 #, c-format msgid "Core Release" -msgstr "" +msgstr "Núcleo de Lançamento" #: any.pm:321 #, c-format msgid "Tainted Release" -msgstr "" +msgstr "Lançamento Tainted" #: any.pm:323 #, c-format msgid "Nonfree Release" -msgstr "" +msgstr "Lançamento nonfree" #: any.pm:351 #, c-format @@ -212,21 +210,23 @@ 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:352 #, c-format msgid "You should enable \"%s\"" -msgstr "" +msgstr "Você deve habilitar o \"%s\"" #: any.pm:377 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" -msgstr "" +msgstr "\"%s\" contém várias partes do sistema e suas aplicações" #: any.pm:378 #, c-format msgid "\"%s\" contains non free software.\n" -msgstr "" +msgstr "\"%s\" contém software non-free. \n" #: any.pm:379 #, c-format @@ -234,6 +234,9 @@ 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:380 #, c-format @@ -241,22 +244,24 @@ 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:381 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." -msgstr "" +msgstr "Também contém software \"%s\" reconstruir com recursos adicionais." #: any.pm:387 #, c-format msgid "Here you can enable more media if you want." -msgstr "" +msgstr "Aqui você pode ativar mais mídia, se quiser." #: any.pm:404 -#, fuzzy, c-format +#, c-format msgid "This medium provides package updates for medium \"%s\"" -msgstr "Pular todos os pacotes da mídia \"%s\"" +msgstr "Este meio fornece atualizações de pacotes para o meio \"%s\"" #: any.pm:480 #, c-format @@ -439,7 +444,7 @@ msgstr "talvez" #: pkgs.pm:102 #, c-format msgid "Getting package information from XML meta-data..." -msgstr "" +msgstr "Obtendo informações sobre o pacote de meta-dados XML ..." #: pkgs.pm:111 #, c-format @@ -749,32 +754,33 @@ msgstr "" "Um ambiente gráfico com um conjunto de aplicativos e ferramentas amigáveis" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Ambiente KDE" +msgstr "Estação de trabalho XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Um ambiente gráfico com um conjunto de aplicativos e ferramentas amigáveis" +"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:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Ambiente GNOME" +msgstr "Estação de Trabalho MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Estação de Trabalho" +msgstr "Estação de Trabalho Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Ambiente Gráfico" +msgstr "Um ambiente gráfico baseado em GNOME" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -791,26 +797,24 @@ msgstr "" "ferramentas de desktop" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Desktop personalizado" +msgstr "Ára de Trabalho RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Um ambiente gráfico rápido leve menos desenvolvido" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Área de Trabalho Enlightenment e17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" -"Um ambiente gráfico leve & rápido com uma coleção amigável de programas e " -"ferramentas de desktop" +msgstr "Um ambiente gráfico rápido leve, com uma sequência específica" #: share/meta-task/compssUsers.pl:193 #, c-format @@ -818,9 +822,9 @@ msgid "Other Graphical Desktops" msgstr "Outros ambientes de Área de trabalho" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, etc" +msgstr "Window Maker, Fvwm, etc" #: share/meta-task/compssUsers.pl:217 #, c-format @@ -1222,7 +1226,7 @@ msgid "Upgrade previous installation (not recommended)" msgstr "Atualizar instalação anterior (não recomendado)" #: steps_interactive.pm:223 -#, fuzzy, c-format +#, c-format msgid "" "Installer has detected that your installed Linux system could not\n" "safely be upgraded to %s.\n" @@ -1232,13 +1236,13 @@ msgid "" "Warning : you should backup all your personal data before choosing \"New\n" "Installation\"." msgstr "" -"O instalador detectou que o seu sistema Mageia 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:264 @@ -1385,9 +1389,9 @@ msgid "Truly minimal install (especially no urpmi)" msgstr "Instalação mínima (sem o uprmi)" #: steps_interactive.pm:661 -#, fuzzy, c-format +#, c-format msgid "Preparing upgrade..." -msgstr "Preparando gerenciador de inicialização" +msgstr "Preparando atualização..." #: steps_interactive.pm:671 #, c-format @@ -1558,9 +1562,9 @@ msgstr "Preparando gerenciador de inicialização" #. -PO: This is NOT the boot loader!!!! #: steps_interactive.pm:1065 -#, fuzzy, c-format +#, c-format msgid "Preparing initial startup program..." -msgstr "Preparando a instalação" +msgstr "Preparando para iniciar programa..." #: steps_interactive.pm:1066 #, c-format @@ -1751,103 +1755,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Sair" - -#~ msgid "Welcome" -#~ msgstr "Bem-vindo" - -#~ msgid "Select All" -#~ msgstr "Selecionar Tudo" - -#~ msgid "Bad package" -#~ msgstr "Pacote defeituoso" - -#, fuzzy -#~ msgid "Preparing boot images..." -#~ msgstr "Preparando gerenciador de inicialização" - -#~ msgid "" -#~ "_: Keep these entry short\n" -#~ "Networking" -#~ msgstr "Rede" - -#~ msgid "Your desktop on a USB key" -#~ msgstr "Seu desktop em um pendrive USB" - -#~ msgid "The 100%% open source Mageia distribution" -#~ msgstr "A distribuição Mageia 100%% open source" - -#~ msgid "Explore Linux easily with Mageia One" -#~ msgstr "Explore facilmente o Linux com o Mageia One" - -#~ msgid "A full Mageia desktop, with support" -#~ msgstr "Um Desktop Mageia completo, com suporte" - -#~ msgid "Mageia: distributions for everybody's needs" -#~ msgstr "Mageia: distribuições para todas as necessidades" - -#~ 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" -- cgit v1.2.1 From 35931b6bbe8c68d2de33bb3bfa52e7aae9936d72 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 10 Dec 2013 07:37:41 +0100 Subject: fix crash when selecting an input method (mga#11939) Gtk3 API has changed --- perl-install/NEWS | 3 +++ perl-install/install/NEWS | 2 ++ perl-install/interactive/gtk.pm | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index d9f478ab5..64c6f0ce6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- localedrake: + o fix crash when selecting an input method (mga#11939) + Version 16.12 - 9 December 2013 - partitioning wizard: diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 145ddb876..a070f7761 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix crash when selecting an input method (mga#11939) + Version 16.10 - 6 December 2013 - package group selection: diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 94739b356..ca6834f21 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -541,7 +541,8 @@ sub create_widget { my $get = sub { my $i = $model ? do { - my $s = $model->get_string_from_iter($w->get_active_iter); + my (undef, $iter) = $w->get_active_iter; + my $s = $model->get_string_from_iter($iter); eval { find_index { $s eq $_ } @{$model->{path_str_list}} }; } : do { my $s = $w->get_text; -- cgit v1.2.1 From dff10b2fa93b4a1ed06f5831dee3a85af75aab1b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 10 Dec 2013 07:38:28 +0100 Subject: 16.13 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index a4fc99a8e..8bf77fca9 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.12 +VERSION:=16.13 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 64c6f0ce6..d48f6df77 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.13 - 10 December 2013 + - localedrake: o fix crash when selecting an input method (mga#11939) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a070f7761..1e89818b9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.13 - 10 December 2013 + - fix crash when selecting an input method (mga#11939) Version 16.10 - 6 December 2013 -- cgit v1.2.1 From 71052af6ac40821247b57eb36acca41a4bcef794 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 10 Dec 2013 17:41:58 +0100 Subject: Mageia 4 beta 2 left background --- perl-install/install/pixmaps/left-background.png | Bin 220862 -> 220814 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/perl-install/install/pixmaps/left-background.png b/perl-install/install/pixmaps/left-background.png index c301c2b26..63ee79f4c 100644 Binary files a/perl-install/install/pixmaps/left-background.png and b/perl-install/install/pixmaps/left-background.png differ -- cgit v1.2.1 From e549f6a8e281d1dba6646eee6245c0835de9e878 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Tue, 10 Dec 2013 17:42:29 +0100 Subject: 16.14 --- perl-install/Makefile.config | 2 +- perl-install/install/NEWS | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 8bf77fca9..7c478bedf 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.13 +VERSION:=16.14 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1e89818b9..9443e0a4c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +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) -- cgit v1.2.1 From 373599b2d83b95532b138f3b960e7783628e2a5c Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Tue, 10 Dec 2013 19:09:30 +0200 Subject: Add Transifex config file --- perl-install/install/share/po/.tx/config | 8 ++++++++ perl-install/share/po/.tx/config | 8 ++++++++ perl-install/standalone/po/.tx/config | 8 ++++++++ 3 files changed, 24 insertions(+) create mode 100644 perl-install/install/share/po/.tx/config create mode 100644 perl-install/share/po/.tx/config create mode 100644 perl-install/standalone/po/.tx/config 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 = .po +source_file = DrakX.pot +source_lang = en +type = PO diff --git a/perl-install/share/po/.tx/config b/perl-install/share/po/.tx/config new file mode 100644 index 000000000..6dd4e1e98 --- /dev/null +++ b/perl-install/share/po/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[mageia.drakx_share] +file_filter = .po +source_file = libDrakX.pot +source_lang = en +type = PO diff --git a/perl-install/standalone/po/.tx/config b/perl-install/standalone/po/.tx/config new file mode 100644 index 000000000..ae7b5fac5 --- /dev/null +++ b/perl-install/standalone/po/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[mageia.drakx_standalone] +file_filter = .po +source_file = libDrakX-standalone.pot +source_lang = en +type = PO -- cgit v1.2.1 From 8ba23f58082ceb7f10c754ccb15b93736fb61f74 Mon Sep 17 00:00:00 2001 From: dglent Date: Tue, 10 Dec 2013 21:31:43 +0100 Subject: Update Greek translation --- perl-install/share/po/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po index 77032c8e4..1591942d3 100644 --- a/perl-install/share/po/el.po +++ b/perl-install/share/po/el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-12-01 09:41+0100\n" +"PO-Revision-Date: 2013-12-10 21:30+0100\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" @@ -3483,7 +3483,7 @@ msgstr "" "\n" "\n" "- Η εντολή «lspcidrake -v | grep -i audio» θα σας ενημερώσει για τον οδηγό " -"χαμηλού επιπέδου που χρησιμοποιεί εξ' ορισμού η κάρτα σας.\n" +"χαμηλού επιπέδου που χρησιμοποιεί εξ ορισμού η κάρτα σας.\n" "\n" "\n" "- Η εντολή «/usr/sbin/lsmod | grep snd» θα σας ενημερώσει για τα φορτωμένα " -- cgit v1.2.1 From d3262506eceb2de4a1ba88c0115b5f7f8114c1f0 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Thu, 12 Dec 2013 09:06:49 +0200 Subject: Update Chinese Traditional translation --- perl-install/share/po/zh_TW.po | 1097 +++++++++------------------------------- 1 file changed, 250 insertions(+), 847 deletions(-) diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po index 89e670093..39c8d3266 100644 --- a/perl-install/share/po/zh_TW.po +++ b/perl-install/share/po/zh_TW.po @@ -1,20 +1,20 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# +# +# Translators: +# You-Cheng Hsieh , 2013 msgid "" msgstr "" -"Project-Id-Version: drakx_share\n" +"Project-Id-Version: Mageia\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-04-08 15:16+0800\n" +"PO-Revision-Date: 2013-12-09 01:36+0000\n" "Last-Translator: You-Cheng Hsieh \n" -"Language-Team: Traditional Chinese \n" -"Language: zh_TW\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" +"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" #: any.pm:255 any.pm:966 diskdrake/interactive.pm:645 #: diskdrake/interactive.pm:869 diskdrake/interactive.pm:931 @@ -34,17 +34,11 @@ msgstr "開機載入程式安裝中" #, c-format msgid "" "LILO wants to assign a new Volume ID to drive %s. However, changing\n" -"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows " -"error.\n" +"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n" "This caution does not apply to Windows 95 or 98, or to NT data disks.\n" "\n" "Assign a new Volume ID?" -msgstr "" -"LILO 想要分配新的磁區標籤給分割區 %s。但是,改變 Windows NT、2000,\n" -"或 XP 開機磁區的磁區標籤會造成致命的 Windows 錯誤。\n" -"這個警告並不適用於 Windows 95、98,或 NT 的資料磁區。\n" -"\n" -"要分配一個新的磁區標籤?" +msgstr "LILO 想要分配新的磁區標籤給分割區 %s。但是,改變 Windows NT、2000,\n或 XP 開機磁區的磁區標籤會造成致命的 Windows 錯誤。\n這個警告並不適用於 Windows 95、98,或 NT 的資料磁區。\n\n要分配一個新的磁區標籤?" #: any.pm:277 #, c-format @@ -60,28 +54,16 @@ msgid "" " setenv boot-device %s,\\\\:tbxi\n" " Then type: shut-down\n" "At your next boot you should see the bootloader prompt." -msgstr "" -"您也許需要改變您的 Open Firmware 上面的開機裝置設定,\n" -"以便於開啟開機啟動程式的功能。如果您開機時並沒有看到\n" -"開機程式的任何訊息,請於重新開機時按住 Command-Option-O-F,\n" -"然後輸入:setenv boot-device %s,\\\\:tbxi\n" -"然後再輸入:shut-down\n" -"然後您下一次開機時應該就可以看到開機啟動程式的訊息了。" +msgstr "您也許需要改變您的 Open Firmware 上面的開機裝置設定,\n以便於開啟開機啟動程式的功能。如果您開機時並沒有看到\n開機程式的任何訊息,請於重新開機時按住 Command-Option-O-F,\n然後輸入:setenv boot-device %s,\\\\:tbxi\n然後再輸入:shut-down\n然後您下一次開機時應該就可以看到開機啟動程式的訊息了。" #: any.pm:323 #, c-format msgid "" "You decided to install the bootloader on a partition.\n" -"This implies you already have a bootloader on the hard disk drive you boot " -"(eg: System Commander).\n" +"This implies you already have a bootloader on the hard disk drive you boot (eg: System Commander).\n" "\n" "On which drive are you booting?" -msgstr "" -"您決定將開機載入器安裝在某個分割區中。\n" -"這表示您已經在此硬碟的開機磁區裡另外有一個開機載入器(如 System " -"Commander)。\n" -"\n" -"您打算用哪個磁碟開機?" +msgstr "您決定將開機載入器安裝在某個分割區中。\n這表示您已經在此硬碟的開機磁區裡另外有一個開機載入器(如 System Commander)。\n\n您打算用哪個磁碟開機?" #: any.pm:334 #, c-format @@ -344,9 +326,7 @@ msgstr "開機載入程式組態設定" msgid "" "Here are the entries on your boot menu so far.\n" "You can create additional entries or change the existing ones." -msgstr "" -"目前有這些選項在您的開機選單中。\n" -"您可以建立更多的選項或修改既有的選項。" +msgstr "目前有這些選項在您的開機選單中。\n您可以建立更多的選項或修改既有的選項。" #: any.pm:860 #, c-format @@ -541,9 +521,7 @@ msgid "" "%s can support multiple languages. Select\n" "the languages you would like to install. They will be available\n" "when your installation is complete and you restart your system." -msgstr "" -"%s 可以支援多重語言。請選擇您要安裝的語言。這些語言在安裝完成並重新啟動系統後" -"即可使用。" +msgstr "%s 可以支援多重語言。請選擇您要安裝的語言。這些語言在安裝完成並重新啟動系統後即可使用。" #: any.pm:1160 fs/partitioning_wizard.pm:180 #, c-format @@ -629,16 +607,10 @@ msgstr "自訂" #, c-format msgid "" "Would you like to allow users to share some of their directories?\n" -"Allowing this will permit users to simply click on \"Share\" in konqueror " -"and nautilus.\n" +"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n" "\n" "\"Custom\" permit a per-user granularity.\n" -msgstr "" -"您要允許使用者能夠分享他們自己的目錄嗎?\n" -"若是要開放將允許使用者能在 konqueror 或者是 nautilus 內\n" -"點選 \"分享\"\n" -"\n" -"\"自訂\" 允許每一個使用者自行設定。\n" +msgstr "您要允許使用者能夠分享他們自己的目錄嗎?\n若是要開放將允許使用者能在 konqueror 或者是 nautilus 內\n點選 \"分享\"\n\n\"自訂\" 允許每一個使用者自行設定。\n" #: any.pm:1358 #, c-format @@ -670,15 +642,13 @@ msgstr "啟動 userdrake" msgid "" "The per-user sharing uses the group \"fileshare\". \n" "You can use userdrake to add a user to this group." -msgstr "" -"每個使用者的分享都是使用 \"fileshare\" 群組。\n" -"您可以執行 userdrake 在該群組內加入使用者。" +msgstr "每個使用者的分享都是使用 \"fileshare\" 群組。\n您可以執行 userdrake 在該群組內加入使用者。" #: any.pm:1506 #, c-format msgid "" -"You need to logout and back in again for changes to take effect. Press OK to " -"logout now." +"You need to logout and back in again for changes to take effect. Press OK to" +" logout now." msgstr "您必須登出之後重新登入才能讓變動生效。馬上登出請按下確定。" #: any.pm:1510 @@ -777,9 +747,7 @@ msgstr "LDAP:" msgid "" "Tells your computer to use LDAP for some or all authentication. LDAP " "consolidates certain types of information within your organization." -msgstr "" -"告訴您的電腦使用 LDAP 處理一部份或所有的認證。LDAP 將特定型態的資訊結合到您的" -"組織中。" +msgstr "告訴您的電腦使用 LDAP 處理一部份或所有的認證。LDAP 將特定型態的資訊結合到您的組織中。" #: authentication.pm:67 #, c-format @@ -909,8 +877,8 @@ msgstr "Shadow 基礎" #: authentication.pm:143 #, c-format msgid "" -"You have selected Kerberos 5 authentication. Please review the configuration " -"options below " +"You have selected Kerberos 5 authentication. Please review the configuration" +" options below " msgstr "您選擇了 Kerberos 5 認證。請檢視以下設定選項" #: authentication.pm:145 @@ -1045,7 +1013,8 @@ msgstr "網域管理者名稱" msgid "Domain Admin Password" msgstr "網域管理者密碼" -#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) +#. -PO: these messages will be displayed at boot time in the BIOS, use only +#. ASCII (7bit) #: bootloader.pm:1019 #, c-format msgid "" @@ -1054,12 +1023,7 @@ msgid "" "Choose an operating system from the list above or\n" "wait for default boot.\n" "\n" -msgstr "" -"歡迎使用作業系統選擇器!\n" -"\n" -"請從上方的清單選擇一個作業系統。\n" -"或是稍候使用預設作業系統開機。\n" -"\n" +msgstr "歡迎使用作業系統選擇器!\n\n請從上方的清單選擇一個作業系統。\n或是稍候使用預設作業系統開機。\n\n" #: bootloader.pm:1211 #, c-format @@ -1167,10 +1131,7 @@ msgid "" "locally, and treat it like a local filesystem (provided the web server is\n" "configured as a WebDAV server). If you would like to add WebDAV mount\n" "points, select \"New\"." -msgstr "" -"WebDAV 是一個讓您從本地端掛載網路伺服器的目錄的通訊協定,並像本地端檔案\n" -"系統一樣處理它 (需要該網路伺服器設定為 WebDAV 伺服器)。如果您想要增加\n" -" WebDAV 掛載點,請選擇 \"新增\"。" +msgstr "WebDAV 是一個讓您從本地端掛載網路伺服器的目錄的通訊協定,並像本地端檔案\n系統一樣處理它 (需要該網路伺服器設定為 WebDAV 伺服器)。如果您想要增加\n WebDAV 掛載點,請選擇 \"新增\"。" #: diskdrake/dav.pm:25 #, c-format @@ -1307,7 +1268,7 @@ msgstr "請您先備份您的資料" msgid "Exit" msgstr "離開" -#: diskdrake/hd_gtk.pm:117 +#: diskdrake/hd_gtk.pm:117 diskdrake/hd_gtk.pm:117 diskdrake/hd_gtk.pm:117 #, c-format msgid "Continue" msgstr "繼續" @@ -1325,10 +1286,7 @@ msgid "" "You have one big Microsoft Windows partition.\n" "I suggest you first resize that partition\n" "(click on it, then click on \"Resize\")" -msgstr "" -"您有一個很大的 Microsoft Windows 分割區。\n" -"建議您先重新改變這個分割區的大小\n" -"(點選它,然後按 \"重新改變大小\")" +msgstr "您有一個很大的 Microsoft Windows 分割區。\n建議您先重新改變這個分割區的大小\n(點選它,然後按 \"重新改變大小\")" #: diskdrake/hd_gtk.pm:246 #, c-format @@ -1462,7 +1420,8 @@ msgstr "您確定要儲存 /etc/fstab 的變更嗎?" #: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:291 #, c-format -msgid "You need to reboot for the partition table modifications to take effect" +msgid "" +"You need to reboot for the partition table modifications to take effect" msgstr "您需要重新開機,對分割表所做的變更才會生效" #: diskdrake/interactive.pm:306 @@ -1471,10 +1430,7 @@ msgid "" "You should format partition %s.\n" "Otherwise no entry for mount point %s will be written in fstab.\n" "Quit anyway?" -msgstr "" -"您應該格式化分割區 %s。\n" -"否則掛載點 %s 的資訊將不會寫入 fstab 中。\n" -"仍然要離開嗎?" +msgstr "您應該格式化分割區 %s。\n否則掛載點 %s 的資訊將不會寫入 fstab 中。\n仍然要離開嗎?" #: diskdrake/interactive.pm:319 #, c-format @@ -1659,10 +1615,7 @@ msgid "" "You cannot create a new partition\n" "(since you reached the maximal number of primary partitions).\n" "First remove a primary partition and create an extended partition." -msgstr "" -"您無法新增分割區\n" -"(因為已經達到主要分割區的上限數)\n" -"請先移除一個主要分割區,並建立延伸分割區。" +msgstr "您無法新增分割區\n(因為已經達到主要分割區的上限數)\n請先移除一個主要分割區,並建立延伸分割區。" #: diskdrake/interactive.pm:597 #, c-format @@ -1730,9 +1683,7 @@ msgstr "您要把這個裝置 %s 掛載在那裡?" msgid "" "Cannot unset mount point as this partition is used for loop back.\n" "Remove the loopback first" -msgstr "" -"無法取消設定此分割區的掛載點,因為此分割區是用於回送(loopback)。請先移除回" -"送。" +msgstr "無法取消設定此分割區的掛載點,因為此分割區是用於回送(loopback)。請先移除回送。" #: diskdrake/interactive.pm:743 #, c-format @@ -1790,9 +1741,7 @@ msgstr "最大容量:%s MB" msgid "" "To ensure data integrity after resizing the partition(s),\n" "filesystem checks will be run on your next boot into Microsoft Windows®" -msgstr "" -"為確保重新調整分割區大小後的資料正確性,\n" -" 您下次從 Microsoft Windows® 開機時會執行檔案系統檢查。 " +msgstr "為確保重新調整分割區大小後的資料正確性,\n 您下次從 Microsoft Windows® 開機時會執行檔案系統檢查。 " #: diskdrake/interactive.pm:946 diskdrake/interactive.pm:1507 #, c-format @@ -1849,9 +1798,7 @@ msgstr "\"%s\" 已經存在了" msgid "" "Physical volume %s is still in use.\n" "Do you want to move used physical extents on this volume to other volumes?" -msgstr "" -"實體磁區 %s 仍然在使用中。\n" -"您要把位於這個磁區的實體延伸移到另一個磁區嗎?" +msgstr "實體磁區 %s 仍然在使用中。\n您要把位於這個磁區的實體延伸移到另一個磁區嗎?" #: diskdrake/interactive.pm:1049 #, c-format @@ -1873,7 +1820,7 @@ msgstr "Loopback" msgid "Loopback file name: " msgstr "Loopback 檔案名稱:" -#: diskdrake/interactive.pm:1086 +#: diskdrake/interactive.pm:1086 diskdrake/interactive.pm:1086 #, c-format msgid "Give a file name" msgstr "輸入一個檔案名稱" @@ -1969,15 +1916,8 @@ msgid "" "Directory %s already contains data\n" "(%s)\n" "\n" -"You can either choose to move the files into the partition that will be " -"mounted there or leave them where they are (which results in hiding them by " -"the contents of the mounted partition)" -msgstr "" -"目錄 %s 裡面已經含有資料了\n" -"(%s)\n" -"\n" -"您可以選擇把檔案移入要掛載到此的磁區中,或者把它們留在原地 (這會讓它們隱藏起" -"來,而目錄中顯示出來的會是掛載上的磁區內容)" +"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)" +msgstr "目錄 %s 裡面已經含有資料了\n(%s)\n\n您可以選擇把檔案移入要掛載到此的磁區中,或者把它們留在原地 (這會讓它們隱藏起來,而目錄中顯示出來的會是掛載上的磁區內容)" #: diskdrake/interactive.pm:1337 #, c-format @@ -2105,18 +2045,14 @@ msgstr "(未啟動)" msgid "" "Loopback file(s):\n" " %s\n" -msgstr "" -"loopback 檔案:\n" -" %s\n" +msgstr "loopback 檔案:\n %s\n" #: diskdrake/interactive.pm:1427 #, c-format msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" -msgstr "" -"預設開機的分割區\n" -" (給 MS-DOS 開機程式用的,跟 lilo 無關)\n" +msgstr "預設開機的分割區\n (給 MS-DOS 開機程式用的,跟 lilo 無關)\n" #: diskdrake/interactive.pm:1429 #, c-format @@ -2145,11 +2081,7 @@ msgid "" "Chances are, this partition is\n" "a Driver partition. You should\n" "probably leave it alone.\n" -msgstr "" -"\n" -"可能是這樣的,這個分割區\n" -"是透過驅動程式產生出來的\n" -"您應該不要去異動這個分割區資料。\n" +msgstr "\n可能是這樣的,這個分割區\n是透過驅動程式產生出來的\n您應該不要去異動這個分割區資料。\n" #: diskdrake/interactive.pm:1439 #, c-format @@ -2158,10 +2090,7 @@ msgid "" "This special Bootstrap\n" "partition is for\n" "dual-booting your system.\n" -msgstr "" -"\n" -"這個特殊分割區是用來作為\n" -"雙重開機使用的。\n" +msgstr "\n這個特殊分割區是用來作為\n雙重開機使用的。\n" #: diskdrake/interactive.pm:1448 #, c-format @@ -2210,7 +2139,8 @@ msgstr "選擇您檔案系統所使用的加密金鑰" #: diskdrake/interactive.pm:1511 #, c-format -msgid "This encryption key is too simple (must be at least %d characters long)" +msgid "" +"This encryption key is too simple (must be at least %d characters long)" msgstr "這個加密金鑰太簡單了 (至少要有 %d 個字元才行)" #: diskdrake/interactive.pm:1518 @@ -2312,9 +2242,7 @@ msgstr "正在移除套件..." msgid "" "An error occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem" -msgstr "" -"發生了一個錯誤 - 找不到任何有效的裝置可以用來建立新的檔案系統,請檢查您的硬體" -"以找出問題的原因所在" +msgstr "發生了一個錯誤 - 找不到任何有效的裝置可以用來建立新的檔案系統,請檢查您的硬體以找出問題的原因所在" #: fs/any.pm:75 fs/partitioning_wizard.pm:70 #, c-format @@ -2396,18 +2324,14 @@ msgstr "啟用群組磁碟配額計算與選擇性的執行限制" msgid "" "Do not update inode access times on this filesystem\n" "(e.g, for faster access on the news spool to speed up news servers)." -msgstr "" -"不要在此檔案系統內更新 inode 的存取時間\n" -"(這樣可以加速新聞伺服器的存取)。" +msgstr "不要在此檔案系統內更新 inode 的存取時間\n(這樣可以加速新聞伺服器的存取)。" #: fs/mount_options.pm:123 #, c-format msgid "" "Update inode access times on this filesystem in a more efficient way\n" "(e.g, for faster access on the news spool to speed up news servers)." -msgstr "" -"以更有效率的方式更新此檔案系統中的 inode 存取時間 (例如,快速存取新聞內容以便" -"加速新聞伺服器)。" +msgstr "以更有效率的方式更新此檔案系統中的 inode 存取時間 (例如,快速存取新聞內容以便加速新聞伺服器)。" #: fs/mount_options.pm:126 #, c-format @@ -2427,9 +2351,7 @@ msgid "" "Do not allow execution of any binaries on the mounted\n" "filesystem. This option might be useful for a server that has filesystems\n" "containing binaries for architectures other than its own." -msgstr "" -"不允許在此已掛載的檔案系統中執行任何檔案。這個選項適用於伺服器中有個檔案系統" -"裡面的執行檔架構與伺服器不同時。" +msgstr "不允許在此已掛載的檔案系統中執行任何檔案。這個選項適用於伺服器中有個檔案系統裡面的執行檔架構與伺服器不同時。" #: fs/mount_options.pm:135 #, c-format @@ -2437,9 +2359,7 @@ msgid "" "Do not allow set-user-identifier or set-group-identifier\n" "bits to take effect. (This seems safe, but is in fact rather unsafe if you\n" "have suidperl(1) installed.)" -msgstr "" -"不允許 set-user-identifier 或 set-group-identifier 作用。\n" -"(這樣似乎是安全的,但當您有安裝 suidperl(1) 時則不然。)" +msgstr "不允許 set-user-identifier 或 set-group-identifier 作用。\n(這樣似乎是安全的,但當您有安裝 suidperl(1) 時則不然。)" #: fs/mount_options.pm:139 #, c-format @@ -2524,10 +2444,7 @@ msgid "" "You must have a root partition.\n" "To accomplish this, create a partition (or click on an existing one).\n" "Then choose action ``Mount point'' and set it to `/'" -msgstr "" -"您必須要有一個根分割區。\n" -"您可以建立一個分割區(或是點擊選取現有的分割區),然後將它的掛載點設定為 " -"”/”。" +msgstr "您必須要有一個根分割區。\n您可以建立一個分割區(或是點擊選取現有的分割區),然後將它的掛載點設定為 ”/”。" #: fs/partitioning_wizard.pm:67 #, c-format @@ -2535,10 +2452,7 @@ msgid "" "You do not have a swap partition.\n" "\n" "Continue anyway?" -msgstr "" -"您沒有設定置換分割區 (swap)。\n" -"\n" -"不管如何都要繼續?" +msgstr "您沒有設定置換分割區 (swap)。\n\n不管如何都要繼續?" #: fs/partitioning_wizard.pm:101 #, c-format @@ -2581,9 +2495,7 @@ msgid "" "Your Microsoft Windows® partition is too fragmented. Please reboot your " "computer under Microsoft Windows®, run the ``defrag'' utility, then restart " "the %s installation." -msgstr "" -"您的 Microsoft Windows® 分割區太過零散,需要重整。請先將您的系統開到 " -"Microsoft Windows® 下執行 ``defrag'',執行完畢後再重新啟動 %s 安裝。" +msgstr "您的 Microsoft Windows® 分割區太過零散,需要重整。請先將您的系統開到 Microsoft Windows® 下執行 ``defrag'',執行完畢後再重新啟動 %s 安裝。" #: fs/partitioning_wizard.pm:188 #, c-format @@ -2594,31 +2506,14 @@ msgid "" "Your Microsoft Windows® partition will be now resized.\n" "\n" "\n" -"Be careful: this operation is dangerous. If you have not already done so, " -"you first need to exit the installation, run \"chkdsk c:\" from a Command " -"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk" -"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " -"optionally run defrag, then restart the installation. You should also backup " -"your data.\n" +"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n" "\n" "\n" "When sure, press %s." -msgstr "" -"警告!\n" -"\n" -"\n" -"DrakX 現在將要重新調整您 Windows 分割區的大小。\n" -"\n" -"\n" -"請注意:這個動作是很危險的。如果您不曾做過,您必須先離開安裝程式,在 Windows " -"命令提示字元下執行 \"chkdsk c:\" (請注意,執行圖形介面的程式\"scandisk\" 並不" -"夠,請確定是在命令提示下使用 \"chkdsk\"!),您還可以額外執行 defrag,然後重新" -"開始安裝。您也應該備份您的資料。\n" -"\n" -"\n" -"當您確定之後,請按下%s。" +msgstr "警告!\n\n\nDrakX 現在將要重新調整您 Windows 分割區的大小。\n\n\n請注意:這個動作是很危險的。如果您不曾做過,您必須先離開安裝程式,在 Windows 命令提示字元下執行 \"chkdsk c:\" (請注意,執行圖形介面的程式\"scandisk\" 並不夠,請確定是在命令提示下使用 \"chkdsk\"!),您還可以額外執行 defrag,然後重新開始安裝。您也應該備份您的資料。\n\n\n當您確定之後,請按下%s。" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: fs/partitioning_wizard.pm:197 fs/partitioning_wizard.pm:565 #: interactive.pm:550 interactive/curses.pm:270 ugtk2.pm:519 #, c-format @@ -2692,9 +2587,7 @@ msgstr "使用 fdisk" msgid "" "You can now partition %s.\n" "When you are done, do not forget to save using `w'" -msgstr "" -"您現在可以對 %s 分割區進行劃分動作.\n" -"當您完成時, 別忘了使用 'w' 儲存" +msgstr "您現在可以對 %s 分割區進行劃分動作.\n當您完成時, 別忘了使用 'w' 儲存" #: fs/partitioning_wizard.pm:409 #, c-format @@ -2754,20 +2647,13 @@ msgstr "在磁碟機 %s 偵測到 BIOS 軟體 RAID。要啟用嗎?" #: fsedit.pm:247 #, c-format msgid "" -"I cannot read the partition table of device %s, it's too corrupted for me :" -"(\n" +"I cannot read the partition table of device %s, it's too corrupted for me :(\n" "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n" "The other solution is to not allow DrakX to modify the partition table.\n" "(the error is %s)\n" "\n" "Do you agree to lose all the partitions?\n" -msgstr "" -"無法讀取裝置 %s 的磁碟分割區,因為分割表似乎已損毀。\n" -"您可以繼續,它會自動清除壞掉的分割區,所有資料都會消失。\n" -"其它的解決方式是不要允許 DrakX 變更磁碟分割表。\n" -"(錯誤為 %s)\n" -"\n" -"您同意清除所有的分割區嗎?\n" +msgstr "無法讀取裝置 %s 的磁碟分割區,因為分割表似乎已損毀。\n您可以繼續,它會自動清除壞掉的分割區,所有資料都會消失。\n其它的解決方式是不要允許 DrakX 變更磁碟分割表。\n(錯誤為 %s)\n\n您同意清除所有的分割區嗎?\n" #: fsedit.pm:427 #, c-format @@ -2790,10 +2676,7 @@ msgid "" "You've selected a software RAID partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "Please be sure to add a separate /boot partition" -msgstr "" -"您選擇了一個軟體 RAID 分割區做為根分割區。\n" -"若是沒有單獨的 /boot 分割區,開機載入器無法處理這種狀況。\n" -"請新增一個 /boot 分割區" +msgstr "您選擇了一個軟體 RAID 分割區做為根分割區。\n若是沒有單獨的 /boot 分割區,開機載入器無法處理這種狀況。\n請新增一個 /boot 分割區" #: fsedit.pm:440 #, c-format @@ -2820,9 +2703,7 @@ msgid "" "You've selected an encrypted partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "Please be sure to add a separate /boot partition" -msgstr "" -"您將根分割區(/)做加密。開機載入器無法在沒有單獨的 /boot 分割區的狀況下這麼" -"做。請新增一個 /boot 分割區" +msgstr "您將根分割區(/)做加密。開機載入器無法在沒有單獨的 /boot 分割區的狀況下這麼做。請新增一個 /boot 分割區" #: fsedit.pm:465 fsedit.pm:485 #, c-format @@ -2840,13 +2721,9 @@ msgstr "您不能使用 LVM 邏輯磁碟區來掛載 %s,因為它跨越了實 #, c-format msgid "" "You've selected the LVM Logical Volume as root (/).\n" -"The bootloader is not able to handle this when the volume spans physical " -"volumes.\n" +"The bootloader is not able to handle this when the volume spans physical volumes.\n" "You should create a separate /boot partition first" -msgstr "" -"您選擇了 LVM 邏輯磁碟區做為根分割區(/)。\n" -"而磁碟區跨越了實體磁碟區時,開機載入器無法處理這種狀況。\n" -"您應該先建立一個 /boot 分割區" +msgstr "您選擇了 LVM 邏輯磁碟區做為根分割區(/)。\n而磁碟區跨越了實體磁碟區時,開機載入器無法處理這種狀況。\n您應該先建立一個 /boot 分割區" #: fsedit.pm:475 fsedit.pm:477 #, c-format @@ -2858,8 +2735,7 @@ msgstr "這個目錄應該放在根檔案系統 (/) 才對" msgid "" "You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount " "point\n" -msgstr "" -"您需要一個真正的檔案系統 (ext2/ext3、reiserfs、xfs 或是 jfs) 來放這個掛載點\n" +msgstr "您需要一個真正的檔案系統 (ext2/ext3、reiserfs、xfs 或是 jfs) 來放這個掛載點\n" #: fsedit.pm:550 #, c-format @@ -3157,9 +3033,7 @@ msgstr "沒有其他可供選擇的驅動程式" msgid "" "There's no known OSS/ALSA alternative driver for your sound card (%s) which " "currently uses \"%s\"" -msgstr "" -"您的音效卡 (%s) 正在使用 \"%s\" 驅動程式,目前沒有其他可供選擇的 OSS/ALSA 驅" -"動程式支援它" +msgstr "您的音效卡 (%s) 正在使用 \"%s\" 驅動程式,目前沒有其他可供選擇的 OSS/ALSA 驅動程式支援它" #: harddrake/sound.pm:362 #, c-format @@ -3173,7 +3047,7 @@ msgid "" "sound card (%s)." msgstr "您可以選擇使用其他的 (OSS 或者 ALSA) 的驅動程式給您的音效卡 (%s)" -#. -PO: here the first %s is either "OSS" or "ALSA", +#. -PO: here the first %s is either "OSS" or "ALSA", #. -PO: the second %s is the name of the current driver #. -PO: and the third %s is the name of the default driver #: harddrake/sound.pm:369 @@ -3181,44 +3055,24 @@ msgstr "您可以選擇使用其他的 (OSS 或者 ALSA) 的驅動程式給您 msgid "" "\n" "\n" -"Your card currently uses the %s\"%s\" driver (the default driver for your " -"card is \"%s\")" -msgstr "" -"\n" -"您的卡目前使用 %s\"%s\" 驅動程式(您的卡的預設驅動程式為 \"%s\")" +"Your card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")" +msgstr "\n您的卡目前使用 %s\"%s\" 驅動程式(您的卡的預設驅動程式為 \"%s\")" #: harddrake/sound.pm:371 #, c-format msgid "" -"OSS (Open Sound System) was the first sound API. It's an OS independent " -"sound API (it's available on most UNIX(tm) systems) but it's a very basic " -"and limited API.\n" +"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n" "What's more, OSS drivers all reinvent the wheel.\n" "\n" -"ALSA (Advanced Linux Sound Architecture) is a modularized architecture " -"which\n" +"ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n" "supports quite a large range of ISA, USB and PCI cards.\n" "\n" "It also provides a much higher API than OSS.\n" "\n" "To use alsa, one can either use:\n" "- the old compatibility OSS API\n" -"- the new ALSA API that provides many enhanced features but requires using " -"the ALSA library.\n" -msgstr "" -"開放音效系統(Open Sound System,OSS)是第一套音效的 API。它是一套獨立於作業" -"系統的音效 API,可在大部份的 UNIX(tm) 系統上找到。不過它是一套非常基本的 " -"API。\n" -"此外,OSS 的驅動程式大部份都是從頭發展。\n" -"\n" -"進階 Linux 音效架構(Advanced Linux Sound Architecture,ALSA)是一套模組化的" -"音效架構,支援相當多的 ISA,USB 與 PCI 音效卡。\n" -"\n" -"它也提供了比 OSS 更高階的 API。\n" -"\n" -"要使用 alsa,您可以使用以下其中一項:\n" -"- 與舊的 OSS 相容的 API\n" -"- 新的 ALSA API,提供更多進階的功能,但是需要使用 ALSA 函式庫。\n" +"- the new ALSA API that provides many enhanced features but requires using the ALSA library.\n" +msgstr "開放音效系統(Open Sound System,OSS)是第一套音效的 API。它是一套獨立於作業系統的音效 API,可在大部份的 UNIX(tm) 系統上找到。不過它是一套非常基本的 API。\n此外,OSS 的驅動程式大部份都是從頭發展。\n\n進階 Linux 音效架構(Advanced Linux Sound Architecture,ALSA)是一套模組化的音效架構,支援相當多的 ISA,USB 與 PCI 音效卡。\n\n它也提供了比 OSS 更高階的 API。\n\n要使用 alsa,您可以使用以下其中一項:\n- 與舊的 OSS 相容的 API\n- 新的 ALSA API,提供更多進階的功能,但是需要使用 ALSA 函式庫。\n" #: harddrake/sound.pm:385 harddrake/sound.pm:487 #, c-format @@ -3230,111 +3084,50 @@ msgstr "驅動程式:" msgid "Sound troubleshooting" msgstr "解決音效問題" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: harddrake/sound.pm:430 #, c-format msgid "" -"Below are some basic tips to help debug audio problems, but for accurate and " -"up-to-date tips and tricks, please see:\n" +"Below are some basic tips to help debug audio problems, but for accurate and up-to-date tips and tricks, please see:\n" "\n" "https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" "\n" "\n" "\n" -"- General Recommendation: Enable PulseAudio. If you have opted to not to use " -"PulseAudio, we would strongly advise you enable it. For the vast majority of " -"desktop use cases, PulseAudio is the recommended and best supported option.\n" +"- General Recommendation: Enable PulseAudio. If you have opted to not to use PulseAudio, we would strongly advise you enable it. For the vast majority of desktop use cases, PulseAudio is the recommended and best supported option.\n" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol" -"\" (generic) will launch graphical applications to allow you to view your " -"sound devices and adjust volume levels\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pauvucontrol\" (generic) will launch graphical applications to allow you to view your sound devices and adjust volume levels\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n" "\n" "\n" -"- \"pactl stat\" will check that you can connect to the PulseAudio daemon " -"correctly.\n" -"\n" -"\n" -"- \"pactl list sink-inputs\" will tell you which programs are currently " -"playing sound via PulseAudio.\n" -"\n" +"- \"pactl stat\" will check that you can connect to the PulseAudio daemon correctly.\n" "\n" -"- \"systemctl status osspd.service\" will tell you the current state of the " -"OSS Proxy Daemon. This is used to enable sound from legacy applications " -"which use the OSS sound API. You should install the \"ossp\" package if you " -"need this functionality.\n" "\n" +"- \"pactl list sink-inputs\" will tell you which programs are currently playing sound via PulseAudio.\n" "\n" -"- \"pacmd ls\" will give you a LOT of debug information about the current " -"state of your audio.\n" "\n" +"- \"systemctl status osspd.service\" will tell you the current state of the OSS Proxy Daemon. This is used to enable sound from legacy applications which use the OSS sound API. You should install the \"ossp\" package if you need this functionality.\n" "\n" -"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver " -"your card uses by default.\n" "\n" +"- \"pacmd ls\" will give you a LOT of debug information about the current state of your audio.\n" "\n" -"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound " -"related kernel modules (drivers) are loaded.\n" "\n" -"\n" -"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA " -"mixer controls for first sound card\n" -"\n" -"\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are " -"currently using the sound card directly (normally this should only show " -"PulseAudio)\n" -msgstr "" -"以下是一些有助於排除音效問題的基本技巧,若需要最新且正確的小技巧,請參閱:\n" -"\n" -"https://wiki.mageia.org/en/Support:DebuggingSoundProblems\n" +"- \"lspcidrake -v | grep -i audio\" will tell you which low-level driver your card uses by default.\n" "\n" "\n" +"- \"/usr/sbin/lsmod | grep snd\" will enable you to check which sound related kernel modules (drivers) are loaded.\n" "\n" -"- 一般建議:啟用 PulseAudio。如果您選擇不要使用 PulseAudio,我們會強烈建議您" -"啟用它。 在大多數桌面使用情境下, PulseAudio 是建議且支援最好的選項。\n" "\n" +"- \"alsamixer -c 0\" will give you a text-based mixer to the low level ALSA mixer controls for first sound card\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) 和 \"pauvucontrol" -"\" (通用) 會開啟圖形應用程式讓您檢視您的音效裝置並調整音量。\n" -"\n" -"\n" -"- \"ps aux | grep pulseaudio\" 可以檢查 PulseAudio 是否運作。\n" -"\n" -"\n" -"- \"pactl stat\" 可以檢查您是否正確地連接到 PulseAudio 服務程式。\n" -"\n" -"\n" -"- \"pactl list sink-inputs\" 會告訴您哪個程式正在透過 PulseAudio 播放聲音。\n" -"\n" -"\n" -"- \"systemctl status osspd.service\" 會告訴您 OSS Proxy 服務程式的狀態。這是" -"讓使用 OSS 音效 API 的舊式應用程式能啟用音效。如果您需要這項功能,您應該安裝 " -"\"ossp\" 套件。\n" -"\n" -"\n" -"- \"pacmd ls\" 會提供關於您的目前音效狀態的大量除錯資訊。\n" -"\n" -"\n" -"- \"lspcidrake -v | grep -i audio\" 會告訴您在預設時您的音效卡使用什麼低階驅" -"動程式。\n" -"\n" -"\n" -"- \"/usr/sbin/lsmod | grep snd\" 讓您檢查哪些音效相關的核心模組 (驅動程式) 已" -"經載入了。\n" -"\n" -"\n" -"- \"alsamixer -c 0\" 提供一個以文字為主的混音器來控制第1張音效卡的低階的 " -"ALSA 混音。\n" -"\n" -"\n" -"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" 會告訴您哪個程式正在直接使用" -"音效卡 (通常這應該只會顯示 PulseAudio)。\n" +"- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" will tell which programs are currently using the sound card directly (normally this should only show PulseAudio)\n" +msgstr "以下是一些有助於排除音效問題的基本技巧,若需要最新且正確的小技巧,請參閱:\n\nhttps://wiki.mageia.org/en/Support:DebuggingSoundProblems\n\n\n\n- 一般建議:啟用 PulseAudio。如果您選擇不要使用 PulseAudio,我們會強烈建議您啟用它。 在大多數桌面使用情境下, PulseAudio 是建議且支援最好的選項。\n\n\n\n- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) 和 \"pauvucontrol\" (通用) 會開啟圖形應用程式讓您檢視您的音效裝置並調整音量。\n\n\n- \"ps aux | grep pulseaudio\" 可以檢查 PulseAudio 是否運作。\n\n\n- \"pactl stat\" 可以檢查您是否正確地連接到 PulseAudio 服務程式。\n\n\n- \"pactl list sink-inputs\" 會告訴您哪個程式正在透過 PulseAudio 播放聲音。\n\n\n- \"systemctl status osspd.service\" 會告訴您 OSS Proxy 服務程式的狀態。這是讓使用 OSS 音效 API 的舊式應用程式能啟用音效。如果您需要這項功能,您應該安裝 \"ossp\" 套件。\n\n\n- \"pacmd ls\" 會提供關於您的目前音效狀態的大量除錯資訊。\n\n\n- \"lspcidrake -v | grep -i audio\" 會告訴您在預設時您的音效卡使用什麼低階驅動程式。\n\n\n- \"/usr/sbin/lsmod | grep snd\" 讓您檢查哪些音效相關的核心模組 (驅動程式) 已經載入了。\n\n\n- \"alsamixer -c 0\" 提供一個以文字為主的混音器來控制第1張音效卡的低階的 ALSA 混音。\n\n\n- \"/usr/sbin/fuser -v /dev/snd/pcm* /dev/dsp\" 會告訴您哪個程式正在直接使用音效卡 (通常這應該只會顯示 PulseAudio)。\n" #: harddrake/sound.pm:476 #, c-format @@ -3346,20 +3139,16 @@ msgstr "讓我選擇任何驅動程式" msgid "Choosing an arbitrary driver" msgstr "正在選擇任意的驅動程式" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: harddrake/sound.pm:482 #, c-format msgid "" -"If you really think that you know which driver is the right one for your " -"card\n" +"If you really think that you know which driver is the right one for your card\n" "you can pick one from the above list.\n" "\n" "The current driver for your \"%s\" sound card is \"%s\" " -msgstr "" -"若是您真的知道您的音效卡應該使用哪個驅動程式,\n" -"您可以在上方清單中選取正確的驅動程式。\n" -"\n" -"目前您的音效卡 %s 的驅動程式為 %s" +msgstr "若是您真的知道您的音效卡應該使用哪個驅動程式,\n您可以在上方清單中選取正確的驅動程式。\n\n目前您的音效卡 %s 的驅動程式為 %s" #: harddrake/v4l.pm:12 #, c-format @@ -3384,14 +3173,9 @@ msgstr "未知|CPH06X (bt878) [許多廠商]" #: harddrake/v4l.pm:475 #, c-format msgid "" -"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-" -"detect the rights parameters.\n" -"If your card is misdetected, you can force the right tuner and card types " -"here. Just select your TV card parameters if needed." -msgstr "" -"對大部份現在的電視卡,GNU/Linux 核心中的 bttv 模組會自動偵測正確的參數。\n" -"若是您的卡沒有被正確地偵測,您可以強制指定正確的電視卡型態與調整器。只有在必" -"要的時候才指定您的電視卡參數。" +"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n" +"If your card is misdetected, you can force the right tuner and card types here. Just select your TV card parameters if needed." +msgstr "對大部份現在的電視卡,GNU/Linux 核心中的 bttv 模組會自動偵測正確的參數。\n若是您的卡沒有被正確地偵測,您可以強制指定正確的電視卡型態與調整器。只有在必要的時候才指定您的電視卡參數。" #: harddrake/v4l.pm:478 #, c-format @@ -3486,9 +3270,7 @@ msgstr "您的選擇為?(預設為 %s) " msgid "" "Entries you'll have to fill:\n" "%s" -msgstr "" -"您需要輸入的欄位:\n" -"%s" +msgstr "您需要輸入的欄位:\n%s" #: interactive/stdio.pm:70 #, c-format @@ -3526,18 +3308,14 @@ msgid "" "Please choose the first number of the 10-range you wish to edit,\n" "or just hit Enter to proceed.\n" "Your choice? " -msgstr "" -"請選取前 10 個項目中您要編輯的第一個數字,或者直接按下 Enter 繼續。\n" -"您選擇是?" +msgstr "請選取前 10 個項目中您要編輯的第一個數字,或者直接按下 Enter 繼續。\n您選擇是?" #: interactive/stdio.pm:144 #, c-format msgid "" "=> Notice, a label changed:\n" "%s" -msgstr "" -"=> 請注意,一個標籤已經變更了:\n" -"%s" +msgstr "=> 請注意,一個標籤已經變更了:\n%s" #: interactive/stdio.pm:151 #, c-format @@ -4781,14 +4559,10 @@ msgstr "" #: messages.pm:20 #, c-format msgid "" -"The operating system and the different components available in the Mageia " -"distribution \n" -"shall be called the \"Software Products\" hereafter. The Software Products " -"include, but are not \n" -"restricted to, the set of programs, methods, rules and documentation related " -"to the operating \n" -"system and the different components of the Mageia distribution, and any " -"applications \n" +"The operating system and the different components available in the Mageia distribution \n" +"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n" +"restricted to, the set of programs, methods, rules and documentation related to the operating \n" +"system and the different components of the Mageia distribution, and any applications \n" "distributed with these products provided by Mageia's licensors or suppliers." msgstr "" @@ -4800,22 +4574,15 @@ msgstr "" #: messages.pm:29 #, c-format msgid "" -"Please read this document carefully. This document is a license agreement " -"between you and \n" +"Please read this document carefully. This document is a license agreement between you and \n" "Mageia which applies to the Software Products.\n" -"By installing, duplicating or using any of the Software Products in any " -"manner, you explicitly \n" -"accept and fully agree to conform to the terms and conditions of this " -"License. \n" -"If you disagree with any portion of the License, you are not allowed to " -"install, duplicate or use \n" +"By installing, duplicating or using any of the Software Products in any manner, you explicitly \n" +"accept and fully agree to conform to the terms and conditions of this License. \n" +"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n" "the Software Products. \n" -"Any attempt to install, duplicate or use the Software Products in a manner " -"which does not comply \n" -"with the terms and conditions of this License is void and will terminate " -"your rights under this \n" -"License. Upon termination of the License, you must immediately destroy all " -"copies of the \n" +"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n" +"with the terms and conditions of this License is void and will terminate your rights under this \n" +"License. Upon termination of the License, you must immediately destroy all copies of the \n" "Software Products." msgstr "" @@ -4824,49 +4591,33 @@ msgstr "" msgid "2. Limited Warranty" msgstr "" -#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX +#. -PO: keep the double empty lines between sections, this is formatted a la +#. LaTeX #: messages.pm:44 #, c-format msgid "" -"The Software Products and attached documentation are provided \"as is\", " -"with no warranty, to the \n" +"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n" "extent permitted by law.\n" -"Neither Mageia nor its licensors or suppliers will, in any circumstances and " -"to the extent \n" -"permitted by law, be liable for any special, incidental, direct or indirect " -"damages whatsoever \n" -"(including without limitation damages for loss of business, interruption of " -"business, financial \n" -"loss, legal fees and penalties resulting from a court judgment, or any other " -"consequential loss) \n" -"arising out of the use or inability to use the Software Products, even if " -"Mageia or its \n" -"licensors or suppliers have been advised of the possibility or occurrence of " -"such damages.\n" -"\n" -"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME " -"COUNTRIES\n" -"\n" -"To the extent permitted by law, neither Mageia nor its licensors, suppliers " -"or\n" -"distributors will, in any circumstances, be liable for any special, " -"incidental, direct or indirect \n" -"damages whatsoever (including without limitation damages for loss of " -"business, interruption of \n" -"business, financial loss, legal fees and penalties resulting from a court " -"judgment, or any \n" -"other consequential loss) arising out of the possession and use of software " -"components or \n" -"arising out of downloading software components from one of Mageia sites " -"which are \n" +"Neither Mageia nor its licensors or suppliers will, in any circumstances and to the extent \n" +"permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever \n" +"(including without limitation damages for loss of business, interruption of business, financial \n" +"loss, legal fees and penalties resulting from a court judgment, or any other consequential loss) \n" +"arising out of the use or inability to use the Software Products, even if Mageia or its \n" +"licensors or suppliers have been advised of the possibility or occurrence of such damages.\n" +"\n" +"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n" +"\n" +"To the extent permitted by law, neither Mageia nor its licensors, suppliers or\n" +"distributors will, in any circumstances, be liable for any special, incidental, direct or indirect \n" +"damages whatsoever (including without limitation damages for loss of business, interruption of \n" +"business, financial loss, legal fees and penalties resulting from a court judgment, or any \n" +"other consequential loss) arising out of the possession and use of software components or \n" +"arising out of downloading software components from one of Mageia sites which are \n" "prohibited or restricted in some countries by local laws.\n" -"This limited liability applies to, but is not restricted to, the strong " -"cryptography components \n" +"This limited liability applies to, but is not restricted to, the strong cryptography components \n" "included in the Software Products.\n" -"However, because some jurisdictions do not allow the exclusion or limitation " -"of liability for \n" -"consequential or incidental damages, the above limitation may not apply to " -"you." +"However, because some jurisdictions do not allow the exclusion or limitation of liability for \n" +"consequential or incidental damages, the above limitation may not apply to you." msgstr "" #: messages.pm:68 @@ -4877,17 +4628,12 @@ msgstr "" #: messages.pm:70 #, c-format msgid "" -"The Software Products consist of components created by different persons or " -"entities.\n" -"Most of these licenses allow you to use, duplicate, adapt or redistribute " -"the components which \n" -"they cover. Please read carefully the terms and conditions of the license " -"agreement for each component \n" -"before using any component. Any question on a component license should be " -"addressed to the component \n" +"The Software Products consist of components created by different persons or entities.\n" +"Most of these licenses allow you to use, duplicate, adapt or redistribute the components which \n" +"they cover. Please read carefully the terms and conditions of the license agreement for each component \n" +"before using any component. Any question on a component license should be addressed to the component \n" "licensor or supplier and not to Mageia.\n" -"The programs developed by Mageia are governed by the GPL License. " -"Documentation written \n" +"The programs developed by Mageia are governed by the GPL License. Documentation written \n" "by Mageia is governed by \"%s\" License." msgstr "" @@ -4899,12 +4645,9 @@ msgstr "" #: messages.pm:81 #, c-format msgid "" -"All rights to the components of the Software Products belong to their " -"respective authors and are \n" -"protected by intellectual property and copyright laws applicable to software " -"programs.\n" -"Mageia and its suppliers and licensors reserves their rights to modify or " -"adapt the Software \n" +"All rights to the components of the Software Products belong to their respective authors and are \n" +"protected by intellectual property and copyright laws applicable to software programs.\n" +"Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software \n" "Products, as a whole or in parts, by all means and for all purposes.\n" "\"Mageia\" and associated logos are trademarks of %s" msgstr "" @@ -4917,17 +4660,12 @@ msgstr "" #: messages.pm:90 #, c-format msgid "" -"If any portion of this agreement is held void, illegal or inapplicable by a " -"court judgment, this \n" -"portion is excluded from this contract. You remain bound by the other " -"applicable sections of the \n" +"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n" +"portion is excluded from this contract. You remain bound by the other applicable sections of the \n" "agreement.\n" -"The terms and conditions of this License are governed by the Laws of " -"France.\n" -"All disputes on the terms of this license will preferably be settled out of " -"court. As a last \n" -"resort, the dispute will be referred to the appropriate Courts of Law of " -"Paris - France.\n" +"The terms and conditions of this License are governed by the Laws of France.\n" +"All disputes on the terms of this license will preferably be settled out of court. As a last \n" +"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n" "For any question on this document, please contact Mageia." msgstr "" @@ -4935,26 +4673,18 @@ msgstr "" #, c-format msgid "" "Warning: Free Software may not necessarily be patent free, and some Free\n" -"Software included may be covered by patents in your country. For example, " -"the\n" +"Software included may be covered by patents in your country. For example, the\n" "MP3 decoders included may require a license for further usage (see\n" -"http://www.mp3licensing.com for more details). If you are unsure if a " -"patent\n" +"http://www.mp3licensing.com for more details). If you are unsure if a patent\n" "may be applicable to you, check your local laws." -msgstr "" -"警告:自由軟體不見得代表沒有專利,有些包含在內的自由軟體可能包含有在您的國家" -"已註冊的專利。例如,包含在內的 MP3 解碼器可能需要在使用前先取得授權(詳情請參" -"考 http://www.mp3licensing.com)。若您不確定某個專利是否適用於您,請諮詢您當" -"地的法律顧問。" +msgstr "警告:自由軟體不見得代表沒有專利,有些包含在內的自由軟體可能包含有在您的國家已註冊的專利。例如,包含在內的 MP3 解碼器可能需要在使用前先取得授權(詳情請參考 http://www.mp3licensing.com)。若您不確定某個專利是否適用於您,請諮詢您當地的法律顧問。" #: messages.pm:111 #, c-format msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press Enter to reboot." -msgstr "" -"恭喜!安裝已完成。\n" -"請將開機媒體移除後,按下 Enter 重新開機。" +msgstr "恭喜!安裝已完成。\n請將開機媒體移除後,按下 Enter 重新開機。" #: messages.pm:113 #, c-format @@ -4962,18 +4692,14 @@ msgid "" "For information on fixes which are available for this release of Mageia,\n" "consult the Errata available from:\n" "%s" -msgstr "" -"要瞭解此版本的 Mageia 裡有哪些修正,請參考:\n" -"%s" +msgstr "要瞭解此版本的 Mageia 裡有哪些修正,請參考:\n%s" #: messages.pm:115 #, c-format msgid "" "Information on configuring your system is available in the post\n" "install chapter of the Official Mageia User's Guide." -msgstr "" -"要瞭解設定您的系統的資訊,請參考 Mageia Linux 使用者手冊中的「安裝之後」" -"(post install)的章節。" +msgstr "要瞭解設定您的系統的資訊,請參考 Mageia Linux 使用者手冊中的「安裝之後」(post install)的章節。" #: modules/interactive.pm:19 #, c-format @@ -5047,9 +4773,7 @@ msgstr "正在設定硬體" msgid "" "You may now provide options to module %s.\n" "Note that any address should be entered with the prefix 0x like '0x123'" -msgstr "" -"您現在可以為模組 %s 提供選項。\n" -"請注意,您輸入的記憶體位置以 0x 開頭,例如 '0x123'" +msgstr "您現在可以為模組 %s 提供選項。\n請注意,您輸入的記憶體位置以 0x 開頭,例如 '0x123'" #: modules/interactive.pm:117 #, c-format @@ -5057,10 +4781,7 @@ msgid "" "You may now provide options to module %s.\n" "Options are in format ``name=value name2=value2 ...''.\n" "For instance, ``io=0x300 irq=7''" -msgstr "" -"您現在可以為模組 %s 提供選項。\n" -"選項的格式為 ``name=value name2=value2 ...''\n" -"例如 ``io=0x300 irq=7''" +msgstr "您現在可以為模組 %s 提供選項。\n選項的格式為 ``name=value name2=value2 ...''\n例如 ``io=0x300 irq=7''" #: modules/interactive.pm:119 #, c-format @@ -5077,17 +4798,11 @@ msgstr "我應該試那個 %s 驅動程式呢?" #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" -"properly, although it normally works fine without them. Would you like to " -"specify\n" +"properly, although it normally works fine without them. Would you like to specify\n" "extra options for it or allow the driver to probe your machine for the\n" -"information it needs? Occasionally, probing will hang a computer, but it " -"should\n" +"information it needs? Occasionally, probing will hang a computer, but it should\n" "not cause any damage." -msgstr "" -"某些時候, %s 驅動程式需要有附加的資訊以便適當工作,\n" -"雖然它正常來說可以沒有他們而好好的工作. 您想要指定附加的選項給它嗎\n" -"或是允許驅動程式偵測您的機器需要取得驅動程式需要的資訊?有時候偵測會讓電腦當" -"機, 不過應該不至於造成任何傷害才對." +msgstr "某些時候, %s 驅動程式需要有附加的資訊以便適當工作,\n雖然它正常來說可以沒有他們而好好的工作. 您想要指定附加的選項給它嗎\n或是允許驅動程式偵測您的機器需要取得驅動程式需要的資訊?有時候偵測會讓電腦當機, 不過應該不至於造成任何傷害才對." #: modules/interactive.pm:145 #, c-format @@ -5104,9 +4819,7 @@ msgstr "指定選項" msgid "" "Loading module %s failed.\n" "Do you want to try again with other parameters?" -msgstr "" -"載入 %s 模組失敗.\n" -"您要用其他參數再試一次嗎?" +msgstr "載入 %s 模組失敗.\n您要用其他參數再試一次嗎?" #: mygtk2.pm:1229 #, c-format @@ -5142,23 +4855,16 @@ msgstr "這個平台並不支援延伸分割區" #, c-format msgid "" "You have a hole in your partition table but I cannot use it.\n" -"The only solution is to move your primary partitions to have the hole next " -"to the extended partitions." -msgstr "" -"您的磁碟分割表中有一塊空間沒用到,但我無法使用它。\n" -"唯一的解決方式是將您的主要分割區移動,將這塊空間與延伸分割區相鄰。" +"The only solution is to move your primary partitions to have the hole next to the extended partitions." +msgstr "您的磁碟分割表中有一塊空間沒用到,但我無法使用它。\n唯一的解決方式是將您的主要分割區移動,將這塊空間與延伸分割區相鄰。" #: partition_table/raw.pm:296 #, c-format msgid "" "Something bad is happening on your hard disk drive. \n" "A test to check the integrity of data has failed. \n" -"It means writing anything on the disk will end up with random, corrupted " -"data." -msgstr "" -"您的硬碟機發生了問題。\n" -"資料完整性的檢查失敗。\n" -"這表示寫入此硬碟的資料可能都會損毀。" +"It means writing anything on the disk will end up with random, corrupted data." +msgstr "您的硬碟機發生了問題。\n資料完整性的檢查失敗。\n這表示寫入此硬碟的資料可能都會損毀。" #: pkgs.pm:254 pkgs.pm:257 pkgs.pm:270 #, c-format @@ -5262,7 +4968,8 @@ msgstr "接收 icmp 回應。" msgid "Allow autologin." msgstr "允許自動登入。" -#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is +#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as +#. "ALL" is #: security/help.pm:21 #, c-format msgid "" @@ -5271,12 +4978,7 @@ msgid "" "If set to \"None\", no issues are allowed.\n" "\n" "Else only /etc/issue is allowed." -msgstr "" -"若是設定為「全部」,則 /etc/issue 與 /etc/issue.net 都可以存在。\n" -"\n" -"若是設定為「無」,則兩者都不允許存在。\n" -"\n" -"否則只有 /etc/issue 可以存在。" +msgstr "若是設定為「全部」,則 /etc/issue 與 /etc/issue.net 都可以存在。\n\n若是設定為「無」,則兩者都不允許存在。\n\n否則只有 /etc/issue 可以存在。" #: security/help.pm:27 #, c-format @@ -5306,10 +5008,7 @@ msgid "" "passing from the root account to the other users.\n" "\n" "See pam_xauth(8) for more details.'" -msgstr "" -"當從 root 帳號傳給其他使用者時允許匯出顯示。\n" -"\n" -"詳情請參考 pam_xauth(8)。" +msgstr "當從 root 帳號傳給其他使用者時允許匯出顯示。\n\n詳情請參考 pam_xauth(8)。" #: security/help.pm:40 #, c-format @@ -5321,51 +5020,30 @@ msgid "" "- \"Local\" (only connection from local machine),\n" "\n" "- \"None\" (no connection)." -msgstr "" -"允許 X 連線:\n" -"\n" -"「全部」(所有連線都允許),\n" -"\n" -"「本地端」(只允許本地端的主機連線),\n" -"\n" -"「無」(不允許連線)。" +msgstr "允許 X 連線:\n\n「全部」(所有連線都允許),\n\n「本地端」(只允許本地端的主機連線),\n\n「無」(不允許連線)。" #: security/help.pm:48 #, c-format msgid "" "The argument specifies if clients are authorized to connect\n" "to the X server from the network on the tcp port 6000 or not." -msgstr "" -"這個參數指定了客戶端是否受到授權可以由網路上透過 TCP 埠 6000\n" -"連到這個 X 伺服器上。" +msgstr "這個參數指定了客戶端是否受到授權可以由網路上透過 TCP 埠 6000\n連到這個 X 伺服器上。" -#. -PO: here "ALL", "Local" and "None" are values in a pull-down menu; translate them the same as they're +#. -PO: here "ALL", "Local" and "None" are values in a pull-down menu; +#. translate them the same as they're #: security/help.pm:53 #, c-format msgid "" "Authorize:\n" "\n" -"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if " -"set to \"ALL\",\n" +"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n" "\n" "- only local ones if set to \"Local\"\n" "\n" "- none if set to \"None\".\n" "\n" -"To authorize the services you need, use /etc/hosts.allow (see hosts." -"allow(5))." -msgstr "" -"授權:\n" -"\n" -"「全部」表示所有由 tcp_wrappers 控制的服務(請參考 hosts.deny(5) man " -"page),\n" -"\n" -"「本地端」表示只授權本地端服務,\n" -"\n" -"「無」表示不授權任何服務。\n" -"\n" -"要授權您所需要的服務,請用 /etc/hosts.allow(詳情請參考 hosts.allow(5) man " -"page)。" +"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))." +msgstr "授權:\n\n「全部」表示所有由 tcp_wrappers 控制的服務(請參考 hosts.deny(5) man page),\n\n「本地端」表示只授權本地端服務,\n\n「無」表示不授權任何服務。\n\n要授權您所需要的服務,請用 /etc/hosts.allow(詳情請參考 hosts.allow(5) man page)。" #: security/help.pm:63 #, c-format @@ -5378,13 +5056,7 @@ msgid "" "The /etc/security/msec/server is used by chkconfig --add to decide to\n" "add a service if it is present in the file during the installation of\n" "packages." -msgstr "" -"如果在 /etc/security/msec/security.conf 中的 SERVER_LEVEL (若沒有 " -"SERVER_LEVEL 則看 SECURE_LEVEL) 大於 3 的時候,建立一個符號連結 /etc/" -"security/msec/server 指向 /etc/security/msec/server.。\n" -"\n" -"這個 /etc/security/msec/server 檔是給 chkconfig -add 用的,它會查看在安裝套件" -"的過程中是否該服務存在於此檔案中,來決定是否新增此服務。" +msgstr "如果在 /etc/security/msec/security.conf 中的 SERVER_LEVEL (若沒有 SERVER_LEVEL 則看 SECURE_LEVEL) 大於 3 的時候,建立一個符號連結 /etc/security/msec/server 指向 /etc/security/msec/server.。\n\n這個 /etc/security/msec/server 檔是給 chkconfig -add 用的,它會查看在安裝套件的過程中是否該服務存在於此檔案中,來決定是否新增此服務。" #: security/help.pm:72 #, c-format @@ -5393,11 +5065,7 @@ msgid "" "\n" "Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1)\n" "and crontab(1))." -msgstr "" -"開放使用者使用 crontab 與 at。\n" -"\n" -"將允許使用的使用者放入 /etc/cron.allow 與 /etc/at.allow(詳情請參考 at(1) 與 " -"crontab(1) man page)。" +msgstr "開放使用者使用 crontab 與 at。\n\n將允許使用的使用者放入 /etc/cron.allow 與 /etc/at.allow(詳情請參考 at(1) 與 crontab(1) man page)。" #: security/help.pm:77 #, c-format @@ -5439,10 +5107,9 @@ msgstr "啟用 msec 定時安全檢查。" #: security/help.pm:90 #, c-format msgid "" -"Enable su only from members of the wheel group. If set to no, allows su from " -"any user." -msgstr "" -"啟用 su 只能讓 wheel 群組成員使用。如果設定為 no,則允許任何使用者使用 su。" +"Enable su only from members of the wheel group. If set to no, allows su from" +" any user." +msgstr "啟用 su 只能讓 wheel 群組成員使用。如果設定為 no,則允許任何使用者使用 su。" #: security/help.pm:92 #, c-format @@ -5466,7 +5133,8 @@ msgstr "在單一使用者模式啟用 sulogin(8)。" #: security/help.pm:100 #, c-format -msgid "Add the name as an exception to the handling of password aging by msec." +msgid "" +"Add the name as an exception to the handling of password aging by msec." msgstr "將此使用者標記為 msec 處理密碼有效期限時的例外帳號。" #: security/help.pm:102 @@ -5506,14 +5174,7 @@ msgid "" "- no password in /etc/shadow\n" "\n" "- for users with the 0 id other than root." -msgstr "" -"如果設定為 yes,檢查:\n" -"\n" -"- 空白密碼、\n" -"\n" -"- 在 /etc/shadow 中沒有密碼、\n" -"\n" -"- 並非 root 但使用者 ID 卻為 0。" +msgstr "如果設定為 yes,檢查:\n\n- 空白密碼、\n\n- 在 /etc/shadow 中沒有密碼、\n\n- 並非 root 但使用者 ID 卻為 0。" #: security/help.pm:117 #, c-format @@ -5848,7 +5509,8 @@ msgstr "不要傳送空白的郵件報告" #: security/l10n.pm:58 #, c-format -msgid "If set, send the mail report to this email address else send it to root" +msgid "" +"If set, send the mail report to this email address else send it to root" msgstr "如果有設定就傳送郵件報告給這個電子郵件地址,否則就傳送給 root。" #: security/l10n.pm:59 @@ -5890,12 +5552,9 @@ msgstr " 安全性" #, c-format msgid "" "This level is to be used with care, as it disables all additional security\n" -"provided by msec. Use it only when you want to take care of all aspects of " -"system security\n" +"provided by msec. Use it only when you want to take care of all aspects of system security\n" "on your own." -msgstr "" -"這個等級必須小心使用,因為它會關閉所有 msec 所提供的額外安全性檢查。只有在您" -"打算自己處理系統安全性問題的時候再使用這個選項。" +msgstr "這個等級必須小心使用,因為它會關閉所有 msec 所提供的額外安全性檢查。只有在您打算自己處理系統安全性問題的時候再使用這個選項。" #: security/level.pm:55 #, c-format @@ -5907,17 +5566,10 @@ msgstr "標準的系統安全性設定,建議用在作為網際網路客戶端 #: security/level.pm:56 #, c-format msgid "" -"With this security level, the use of this system as a server becomes " -"possible.\n" -"The security is now high enough to use the system as a server which can " -"accept\n" -"connections from many clients. Note: if your machine is only a client on the " -"Internet, you should choose a lower level." -msgstr "" -"在這個安全層級之下,這個系統可以作為一個伺服器來使用。\n" -"它的安全性已經高到足以作為一個可以接受許多客戶端連線的伺服器。\n" -"請注意:如果您的機器只是用來作為一個網際網路的客戶端,您應該選擇一個較低的安" -"全層級。" +"With this security level, the use of this system as a server becomes possible.\n" +"The security is now high enough to use the system as a server which can accept\n" +"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level." +msgstr "在這個安全層級之下,這個系統可以作為一個伺服器來使用。\n它的安全性已經高到足以作為一個可以接受許多客戶端連線的伺服器。\n請注意:如果您的機器只是用來作為一個網際網路的客戶端,您應該選擇一個較低的安全層級。" #: security/level.pm:63 #, c-format @@ -5929,7 +5581,8 @@ msgstr "DrakSec 基本參數選項" msgid "Please choose the desired security level" msgstr "請選擇您希望的安全層級" -#. -PO: this string is used to properly format ": " +#. -PO: this string is used to properly format ": " #: security/level.pm:70 #, c-format msgid "%s: %s" @@ -5965,9 +5618,7 @@ msgstr "提供週期性的命令排程程式" msgid "" "apmd is used for monitoring battery status and logging it via syslog.\n" "It can also be used for shutting down the machine when the battery is low." -msgstr "" -"apmd 被用來監督電池狀態, 以及呼叫 syslog 紀錄相關狀態.\n" -"它也被用來自動呼叫關機程式進行關機動作, 當電池電源不夠時." +msgstr "apmd 被用來監督電池狀態, 以及呼叫 syslog 紀錄相關狀態.\n它也被用來自動呼叫關機程式進行關機動作, 當電池電源不夠時." #: services.pm:23 #, c-format @@ -5982,9 +5633,9 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack" msgstr "Avahi 是一個實作 mDNS 堆疊的 ZeroConf 伺服程式" #: services.pm:26 -#, fuzzy, c-format +#, c-format msgid "An NTP client/server" -msgstr "NTP 伺服器" +msgstr "一個 NTP 用戶端/伺服器" #: services.pm:27 #, c-format @@ -5995,13 +5646,9 @@ msgstr "設定 CPU 頻率選項" #, c-format msgid "" "cron is a standard UNIX program that runs user-specified programs\n" -"at periodic scheduled times. vixie cron adds a number of features to the " -"basic\n" +"at periodic scheduled times. vixie cron adds a number of features to the basic\n" "UNIX cron, including better security and more powerful configuration options." -msgstr "" -"cron 是個標準 unix 系統程式, 能夠提供使用者定期執行特定程式。\n" -"vixie 版本的 cron 增加了許多功能, \n" -"在安全性與設定方面能夠更彈性好用。" +msgstr "cron 是個標準 unix 系統程式, 能夠提供使用者定期執行特定程式。\nvixie 版本的 cron 增加了許多功能, \n在安全性與設定方面能夠更彈性好用。" #: services.pm:30 #, c-format @@ -6017,40 +5664,27 @@ msgstr "啟動圖形顯示管理員" #: services.pm:32 #, c-format msgid "" -"FAM is a file monitoring daemon. It is used to get reports when files " -"change.\n" +"FAM is a file monitoring daemon. It is used to get reports when files change.\n" "It is used by GNOME and KDE" -msgstr "" -"FAM 是一個檔案監控系統程式。它是用來在檔案變動時提供回報。\n" -"GNOME 及 KDE 都有用到它" +msgstr "FAM 是一個檔案監控系統程式。它是用來在檔案變動時提供回報。\nGNOME 及 KDE 都有用到它" #: services.pm:34 #, c-format msgid "" "G15Daemon allows users access to all extra keys by decoding them and \n" -"pushing them back into the kernel via the linux UINPUT driver. This driver " -"must be loaded \n" -"before g15daemon can be used for keyboard access. The G15 LCD is also " -"supported. By default, \n" -"with no other clients active, g15daemon will display a clock. Client " -"applications and \n" +"pushing them back into the kernel via the linux UINPUT driver. This driver must be loaded \n" +"before g15daemon can be used for keyboard access. The G15 LCD is also supported. By default, \n" +"with no other clients active, g15daemon will display a clock. Client applications and \n" "scripts can access the LCD via a simple API." -msgstr "" -"G15Daemon 允許使用者透過 linux UNINPUT 驅動程式,存取所有額外金鑰,將它解碼或" -"是放回核心。此驅動程式必須在 g15daemon 可以用於鍵盤存取之前載入。亦支援 G15 " -"LCD。預設在沒有其它客戶端程式作用時,g15daemon 會顯示一個時鐘。客戶端應用程式" -"與文稿可以透過簡單的 API 存取此 LCD。" +msgstr "G15Daemon 允許使用者透過 linux UNINPUT 驅動程式,存取所有額外金鑰,將它解碼或是放回核心。此驅動程式必須在 g15daemon 可以用於鍵盤存取之前載入。亦支援 G15 LCD。預設在沒有其它客戶端程式作用時,g15daemon 會顯示一個時鐘。客戶端應用程式與文稿可以透過簡單的 API 存取此 LCD。" #: services.pm:39 #, c-format msgid "" "GPM adds mouse support to text-based Linux applications such the\n" -"Midnight Commander. It also allows mouse-based console cut-and-paste " -"operations,\n" +"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n" "and includes support for pop-up menus on the console." -msgstr "" -"GPM 能夠讓系統在文字模式下驅動顯示出滑鼠游標, 能夠在 Midnight Commander\n" -"這類程式中所使用。另外還能夠支援在文字模式下螢幕文字的剪貼複製功能。" +msgstr "GPM 能夠讓系統在文字模式下驅動顯示出滑鼠游標, 能夠在 Midnight Commander\n這類程式中所使用。另外還能夠支援在文字模式下螢幕文字的剪貼複製功能。" #: services.pm:42 #, c-format @@ -6062,9 +5696,7 @@ msgstr "HAL 是一種收集與維護硬體資訊的常駐服務" msgid "" "HardDrake runs a hardware probe, and optionally configures\n" "new/changed hardware." -msgstr "" -"HardDrake 程式會進行硬體偵測動作, 以便於設定新加入或者是有變更過\n" -"的週邊裝置。" +msgstr "HardDrake 程式會進行硬體偵測動作, 以便於設定新加入或者是有變更過\n的週邊裝置。" #: services.pm:45 #, c-format @@ -6076,16 +5708,10 @@ msgstr "Apache 是一個提供 Web 服務的程式, 提供架設 Web Server 讓 #, c-format msgid "" "The internet superserver daemon (commonly called inetd) starts a\n" -"variety of other internet services as needed. It is responsible for " -"starting\n" -"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd " -"disables\n" +"variety of other internet services as needed. It is responsible for starting\n" +"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n" "all of the services it is responsible for." -msgstr "" -"internet superserver daemon (一般稱呼為 inetd), 它代為像是 telnet、ftp,\n" -"rsh、rlogin 等等這類服務的監聽, 然後有連線請求時, 在實際呼叫提供服務的\n" -"程式進行後續交談溝通的動作。關閉這個項目, 仰賴於這個服務代為監聽啟動的\n" -"項目將會無法使用" +msgstr "internet superserver daemon (一般稱呼為 inetd), 它代為像是 telnet、ftp,\nrsh、rlogin 等等這類服務的監聽, 然後有連線請求時, 在實際呼叫提供服務的\n程式進行後續交談溝通的動作。關閉這個項目, 仰賴於這個服務代為監聽啟動的\n項目將會無法使用" #: services.pm:50 #, c-format @@ -6109,21 +5735,14 @@ msgid "" "This package loads the selected keyboard map as set in\n" "/etc/sysconfig/keyboard. This can be selected using the kbdconfig utility.\n" "You should leave this enabled for most machines." -msgstr "" -"這個服務項目將會載入\n" -"/etc/sysconfig/keyboard\n" -"檔案的鍵盤對應設定組態。\n" -"您可以事後使用 kdbconfig 程式來設定。\n" -"在大部分電腦上建議您保留此項目為啟用。" +msgstr "這個服務項目將會載入\n/etc/sysconfig/keyboard\n檔案的鍵盤對應設定組態。\n您可以事後使用 kdbconfig 程式來設定。\n在大部分電腦上建議您保留此項目為啟用。" #: services.pm:56 #, c-format msgid "" "Automatic regeneration of kernel header in /boot for\n" "/usr/include/linux/{autoconf,version}.h" -msgstr "" -"自動重新產生 kernel header 於 /boot 給\n" -"/usr/include/linux/{autoconf,version}.h" +msgstr "自動重新產生 kernel header 於 /boot 給\n/usr/include/linux/{autoconf,version}.h" #: services.pm:58 #, c-format @@ -6147,9 +5766,7 @@ msgstr "Linuxconf 程式會在開機時偵測一些項目, 調整維護系統一 msgid "" "lpd is the print daemon required for lpr to work properly. It is\n" "basically a server that arbitrates print jobs to printer(s)." -msgstr "" -"lpd 服務程式是 lpr 程式運作上不可缺的程式。若是要架設列印服務伺服器\n" -"的話, lpd 是很常見的選擇。" +msgstr "lpd 服務程式是 lpr 程式運作上不可缺的程式。若是要架設列印服務伺服器\n的話, lpd 是很常見的選擇。" #: services.pm:64 #, c-format @@ -6185,9 +5802,7 @@ msgstr "系統啟動時啟用 MSEC 安全性原則" msgid "" "named (BIND) is a Domain Name Server (DNS) that is used to resolve host " "names to IP addresses." -msgstr "" -"named (BIND) 適用來提供 Domain Name Server (DNS) 服務的程式, \n" -"用來解析主機名稱與 IP 對應的關係。" +msgstr "named (BIND) 適用來提供 Domain Name Server (DNS) 服務的程式, \n用來解析主機名稱與 IP 對應的關係。" #: services.pm:71 #, c-format @@ -6199,9 +5814,7 @@ msgstr "初始化網路主控台紀錄" msgid "" "Mounts and unmounts all Network File System (NFS), SMB (Lan\n" "Manager/Windows), and NCP (NetWare) mount points." -msgstr "" -"掛載與卸下所有網路檔案系統, 比方像是 網路檔案系統(NFS), SMB, \n" -"NCP (NetWare) 這類。" +msgstr "掛載與卸下所有網路檔案系統, 比方像是 網路檔案系統(NFS), SMB, \nNCP (NetWare) 這類。" #: services.pm:74 #, c-format @@ -6226,18 +5839,14 @@ msgid "" "NFS is a popular protocol for file sharing across TCP/IP networks.\n" "This service provides NFS server functionality, which is configured via the\n" "/etc/exports file." -msgstr "" -"NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n" -"這個服務項目會依照系統的 /etc/exports 檔案設定來啟動 NFS 分享功能。" +msgstr "NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n這個服務項目會依照系統的 /etc/exports 檔案設定來啟動 NFS 分享功能。" #: services.pm:81 #, c-format msgid "" "NFS is a popular protocol for file sharing across TCP/IP\n" "networks. This service provides NFS file locking functionality." -msgstr "" -"NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n" -"這個服務提供 NFS 檔案分享時的鎖定機制。" +msgstr "NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n這個服務提供 NFS 檔案分享時的鎖定機制。" #: services.pm:83 #, c-format @@ -6249,9 +5858,7 @@ msgstr "使用網路時間協定 (NTP) 同步系統時間" msgid "" "Automatically switch on numlock key locker under console\n" "and Xorg at boot." -msgstr "" -"自動開關 numlock key 鎖在開機時於 console\n" -"與 Xorg." +msgstr "自動開關 numlock key 鎖在開機時於 console\n與 Xorg." #: services.pm:86 #, c-format @@ -6267,24 +5874,17 @@ msgstr "檢查磁區空間是否即將用完" #, c-format msgid "" "PCMCIA support is usually to support things like ethernet and\n" -"modems in laptops. It will not get started unless configured so it is safe " -"to have\n" +"modems in laptops. It will not get started unless configured so it is safe to have\n" "it installed on machines that do not need it." -msgstr "" -"PCMCIA 支援, 一般是用來讓筆記型電腦的網路卡、Modem 驅動所設計。\n" -"一般來說, 要額外設定好 PCMCIA 後才會真正啟動 PCMCIA 服務, 因此\n" -"就算是系統不需要這個功能, 預先啟動他也不會有任何影響。" +msgstr "PCMCIA 支援, 一般是用來讓筆記型電腦的網路卡、Modem 驅動所設計。\n一般來說, 要額外設定好 PCMCIA 後才會真正啟動 PCMCIA 服務, 因此\n就算是系統不需要這個功能, 預先啟動他也不會有任何影響。" #: services.pm:91 #, c-format msgid "" "The portmapper manages RPC connections, which are used by\n" -"protocols such as NFS and NIS. The portmap server must be running on " -"machines\n" +"protocols such as NFS and NIS. The portmap server must be running on machines\n" "which act as servers for protocols which make use of the RPC mechanism." -msgstr "" -"portmapper 程式管理了 RPC 連線, 一般用於 NFS 與 NIS 通訊協定內。\n" -"若是您系統要使用到 RPC 相關服務, 您就必須啟動它。" +msgstr "portmapper 程式管理了 RPC 連線, 一般用於 NFS 與 NIS 通訊協定內。\n若是您系統要使用到 RPC 相關服務, 您就必須啟動它。" #: services.pm:94 #, c-format @@ -6294,8 +5894,8 @@ msgstr "保留一些 TCP Port" #: services.pm:95 #, c-format msgid "" -"Postfix is a Mail Transport Agent, which is the program that moves mail from " -"one machine to another." +"Postfix is a Mail Transport Agent, which is the program that moves mail from" +" one machine to another." msgstr "Postfix 是一個郵件傳送代理程式, 用來投遞信件提供 SMTP 服務。" #: services.pm:96 @@ -6310,9 +5910,7 @@ msgstr "儲存與回存高品質系統亂數產生器" msgid "" "Assign raw devices to block devices (such as hard disk drive\n" "partitions), for the use of applications such as Oracle or DVD players" -msgstr "" -"將原始裝置指定為區塊裝置(如硬碟分割區),以便讓 Oracle 或 DVD 播放器等應用程" -"式使用" +msgstr "將原始裝置指定為區塊裝置(如硬碟分割區),以便讓 Oracle 或 DVD 播放器等應用程式使用" #: services.pm:100 #, c-format @@ -6325,50 +5923,41 @@ msgid "" "The routed daemon allows for automatic IP router table updated via\n" "the RIP protocol. While RIP is widely used on small networks, more complex\n" "routing protocols are needed for complex networks." -msgstr "" -"routed 服務程式允許透過 RIP 通訊協定來更新路由表的資訊。\n" -"一般來說, RIP 是給小型網路用途使用。" +msgstr "routed 服務程式允許透過 RIP 通訊協定來更新路由表的資訊。\n一般來說, RIP 是給小型網路用途使用。" #: services.pm:104 #, c-format msgid "" "The rstat protocol allows users on a network to retrieve\n" "performance metrics for any machine on that network." -msgstr "" -"rstat 通訊協定, 能夠讓位於網路上的使用者接收到網路上任何一台\n" -"主機的運作效能資訊。" +msgstr "rstat 通訊協定, 能夠讓位於網路上的使用者接收到網路上任何一台\n主機的運作效能資訊。" #: services.pm:106 #, c-format msgid "" "Syslog is the facility by which many daemons use to log messages to various " "system log files. It is a good idea to always run rsyslog." -msgstr "" -"syslog 是許多服務程式用來將系統訊息記錄到系統紀錄檔的輔助程式。建議您一定要啟" -"動 syslog 服務程式。" +msgstr "syslog 是許多服務程式用來將系統訊息記錄到系統紀錄檔的輔助程式。建議您一定要啟動 syslog 服務程式。" #: services.pm:107 #, c-format msgid "" "The rusers protocol allows users on a network to identify who is\n" "logged in on other responding machines." -msgstr "" -"rusers 通訊協定, 能夠讓位於網路上的使用者得知那些使用者登入在那些\n" -"機器上" +msgstr "rusers 通訊協定, 能夠讓位於網路上的使用者得知那些使用者登入在那些\n機器上" #: services.pm:109 #, c-format msgid "" "The rwho protocol lets remote users get a list of all of the users\n" "logged into a machine running the rwho daemon (similar to finger)." -msgstr "" -"rwho 通訊協定, 能夠讓遠端的使用者獲得該機器上所有登入在主機上的\n" -"使用找 (類似於 finger)。" +msgstr "rwho 通訊協定, 能夠讓遠端的使用者獲得該機器上所有登入在主機上的\n使用找 (類似於 finger)。" #: services.pm:111 #, c-format msgid "" -"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..." +"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, " +"..." msgstr "SANE (Scanner Access Now Easy) 能夠存取掃描器、攝影機、等等" #: services.pm:112 @@ -6398,17 +5987,14 @@ msgstr "語音分析層" msgid "" "Secure Shell is a network protocol that allows data to be exchanged over a " "secure channel between two computers" -msgstr "" -"Secure Shell 是一個網路協定,用來讓兩台電腦間可以透過一個安全的通道交換資料" +msgstr "Secure Shell 是一個網路協定,用來讓兩台電腦間可以透過一個安全的通道交換資料" #: services.pm:117 #, c-format msgid "" "Syslog is the facility by which many daemons use to log messages\n" "to various system log files. It is a good idea to always run syslog." -msgstr "" -"syslog 服務程式能夠讓系統許多服務程式用紀錄檔案來回應系統\n" -"所發生一些事情。建議您一定要啟動 syslog 服務程式" +msgstr "syslog 服務程式能夠讓系統許多服務程式用紀錄檔案來回應系統\n所發生一些事情。建議您一定要啟動 syslog 服務程式" #: services.pm:119 #, c-format @@ -6502,9 +6088,7 @@ msgstr "服務程式" msgid "" "No additional information\n" "about this service, sorry." -msgstr "" -"抱歉 ! 這個服務項目並沒有\n" -"額外的相關資訊。" +msgstr "抱歉 ! 這個服務項目並沒有\n額外的相關資訊。" #: services.pm:257 ugtk2.pm:924 #, c-format @@ -6546,22 +6130,8 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -"USA.\n" -msgstr "" -"本程式是自由軟體,您可以遵照自由軟體基金會 (Free Software Foundation) 出版" -"的\n" -"GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈\n" -"這一程式,或者自由選擇使用任何更新的版本。\n" -"\n" -"發佈這一程式的目的是希望它有用,但沒有任何擔保。甚至沒有適合特定目的而隱含的" -"擔保。\n" -"更詳細的情況請參閱 GNU 通用公共許可證。\n" -"\n" -"您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有,寫信給:\n" -" Free Software Foundation,\n" -" 51 Franklin Street, Fifth Floor,\n" -" Boston, MA 02110-1301, USA.\n" +"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" +msgstr "本程式是自由軟體,您可以遵照自由軟體基金會 (Free Software Foundation) 出版的\nGNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈\n這一程式,或者自由選擇使用任何更新的版本。\n\n發佈這一程式的目的是希望它有用,但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。\n更詳細的情況請參閱 GNU 通用公共許可證。\n\n您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有,寫信給:\n Free Software Foundation,\n 51 Franklin Street, Fifth Floor,\n Boston, MA 02110-1301, USA.\n" #: standalone.pm:45 #, c-format @@ -6572,22 +6142,11 @@ msgid "" "--default : save default directories.\n" "--debug : show all debug messages.\n" "--show-conf : list of files or directories to backup.\n" -"--config-info : explain configuration file options (for non-X " -"users).\n" +"--config-info : explain configuration file options (for non-X users).\n" "--daemon : use daemon configuration. \n" "--help : show this message.\n" "--version : show version number.\n" -msgstr "" -"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n" -"備份與還原應用程式\n" -"\n" -"--default : 儲存預設目錄。\n" -"--debug : 顯示所有除錯訊息。\n" -"--show-conf : 列出要備份的檔案或目錄。\n" -"--config-info : 說明設定檔裡的選項(給非圖形介面使用者)。\n" -"--daemon : 使用伺服程式設定。\n" -"--help : 顯示此說明訊息。\n" -"--version : 顯示版號。\n" +msgstr "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n備份與還原應用程式\n\n--default : 儲存預設目錄。\n--debug : 顯示所有除錯訊息。\n--show-conf : 列出要備份的檔案或目錄。\n--config-info : 說明設定檔裡的選項(給非圖形介面使用者)。\n--daemon : 使用伺服程式設定。\n--help : 顯示此說明訊息。\n--version : 顯示版號。\n" #: standalone.pm:57 #, c-format @@ -6596,11 +6155,7 @@ msgid "" "OPTIONS:\n" " --boot - enable to configure boot loader\n" "default mode: offer to configure autologin feature" -msgstr "" -"[--boot]\n" -"選項:\n" -" --boot - 開啟以設定開機載入器。\n" -"預設模式:指定以設定自動登入功能。" +msgstr "[--boot]\n選項:\n --boot - 開啟以設定開機載入器。\n預設模式:指定以設定自動登入功能。" #: standalone.pm:61 #, c-format @@ -6611,13 +6166,7 @@ msgid "" " --help - print this help message.\n" " --report - program should be one of %s tools\n" " --incident - program should be one of %s tools" -msgstr "" -"[選項] [程式名稱]\n" -"\n" -"選項:\n" -" --help - 印出此說明訊息\n" -" --report - 程式應該為 %s 工具之一\n" -" --incident - 程式應該為 %s 工具之一" +msgstr "[選項] [程式名稱]\n\n選項:\n --help - 印出此說明訊息\n --report - 程式應該為 %s 工具之一\n --incident - 程式應該為 %s 工具之一" #: standalone.pm:67 #, c-format @@ -6628,13 +6177,7 @@ msgid "" " --skip-wizard - manage connections\n" " --internet - configure internet\n" " --wizard - like --add" -msgstr "" -"[--add]\n" -" --add - 「新增網路介面」精靈\n" -" --del - 「刪除網路介面」精靈\n" -" --skip-wizard - 管理連線\n" -" --internet - 設定網際網路\n" -" --wizard - 與 --add 相似" +msgstr "[--add]\n --add - 「新增網路介面」精靈\n --del - 「刪除網路介面」精靈\n --skip-wizard - 管理連線\n --internet - 設定網際網路\n --wizard - 與 --add 相似" #: standalone.pm:73 #, c-format @@ -6652,20 +6195,7 @@ msgid "" " : 1 all application available supported.\n" " : name_of_application like so for staroffice \n" " : and gs for ghostscript for only this one." -msgstr "" -"\n" -"字型匯入與管理應用程式\n" -"\n" -"選項:\n" -"--windows_import : 從所有可使用的 Windows 分割區中匯入。\n" -"--xls_fonts : 顯示所有已經在 xls 中存在的字型。\n" -"--install : 安裝字型檔與字型目錄。\n" -"--uninstall : 解除安裝字型或字型目錄。\n" -"--replace : 若字型已存在則取代之。\n" -"--application : 0 表示沒有支援應用程式。\n" -" : 1 表示支援所有可用的應用程式。\n" -" : 輸入應用程式名稱,如 staroffice\n" -" : 或 ghostscript 表示只適用於此程式。" +msgstr "\n字型匯入與管理應用程式\n\n選項:\n--windows_import : 從所有可使用的 Windows 分割區中匯入。\n--xls_fonts : 顯示所有已經在 xls 中存在的字型。\n--install : 安裝字型檔與字型目錄。\n--uninstall : 解除安裝字型或字型目錄。\n--replace : 若字型已存在則取代之。\n--application : 0 表示沒有支援應用程式。\n : 1 表示支援所有可用的應用程式。\n : 輸入應用程式名稱,如 staroffice\n : 或 ghostscript 表示只適用於此程式。" #: standalone.pm:88 #, c-format @@ -6677,25 +6207,10 @@ msgid "" "--start : start MTS\n" "--stop : stop MTS\n" "--adduser : add an existing system user to MTS (requires username)\n" -"--deluser : delete an existing system user from MTS (requires " -"username)\n" -"--addclient : add a client machine to MTS (requires MAC address, IP, " -"nbi image name)\n" -"--delclient : delete a client machine from MTS (requires MAC address, " -"IP, nbi image name)" -msgstr "" -"[選項]...⏎\n" -"%s 終端伺服器設定器\n" -"--enable : 開啟 MTS\n" -"--disable : 關閉 MTS\n" -"--start : 啟動 MTS\n" -"--stop : 停止 MTS\n" -"--adduser : 將現有的系統使用者新增到 MTS (需要指定使用者名稱)\n" -"--deluser : 將現有的系統使用者從 MTS 中刪除 (需要指定使用者名稱)\n" -"--addclient : 新增客戶端機器到 MTS (需要指定 MAC 位址,IP 位址,nbi 映像" -"名稱等)\n" -"--delclient : 從 MTS 中刪除客戶端機器 (需要指定 MAC 位址,IP 位址,nbi " -"映像名稱等)" +"--deluser : delete an existing system user from MTS (requires username)\n" +"--addclient : add a client machine to MTS (requires MAC address, IP, nbi image name)\n" +"--delclient : delete a client machine from MTS (requires MAC address, IP, nbi image name)" +msgstr "[選項]...⏎\n%s 終端伺服器設定器\n--enable : 開啟 MTS\n--disable : 關閉 MTS\n--start : 啟動 MTS\n--stop : 停止 MTS\n--adduser : 將現有的系統使用者新增到 MTS (需要指定使用者名稱)\n--deluser : 將現有的系統使用者從 MTS 中刪除 (需要指定使用者名稱)\n--addclient : 新增客戶端機器到 MTS (需要指定 MAC 位址,IP 位址,nbi 映像名稱等)\n--delclient : 從 MTS 中刪除客戶端機器 (需要指定 MAC 位址,IP 位址,nbi 映像名稱等)" #: standalone.pm:100 #, c-format @@ -6719,43 +6234,24 @@ msgid "" "--force : used with (dis)connect : force (dis)connection.\n" "--status : returns 1 if connected 0 otherwise, then exit.\n" "--quiet : do not be interactive. To be used with (dis)connect." -msgstr "" -"[選項]\n" -"網路與網際網路連線與監控應用程式\n" -"\n" -"--defaultintf <介面> : 預設顯示此介面\n" -"--connect : 如果尚未連線,則連線到網際網路\n" -"--disconnect : 如果已連線,則斷線\n" -"--force : 與 connect 或 disconnect 一起使用,強制連線或斷線\n" -"--status : 若已連線則傳回 1,未連線則傳回 0,然後離開\n" -"--quiet : 無互動模式。與 connect 或 disconnect 一起使用。" +msgstr "[選項]\n網路與網際網路連線與監控應用程式\n\n--defaultintf <介面> : 預設顯示此介面\n--connect : 如果尚未連線,則連線到網際網路\n--disconnect : 如果已連線,則斷線\n--force : 與 connect 或 disconnect 一起使用,強制連線或斷線\n--status : 若已連線則傳回 1,未連線則傳回 0,然後離開\n--quiet : 無互動模式。與 connect 或 disconnect 一起使用。" #: standalone.pm:112 #, c-format msgid "" "[OPTION]...\n" -" --no-confirmation do not ask first confirmation question in %s Update " -"mode\n" +" --no-confirmation do not ask first confirmation question in %s Update mode\n" " --no-verify-rpm do not verify packages signatures\n" -" --changelog-first display changelog before filelist in the " -"description window\n" +" --changelog-first display changelog before filelist in the description window\n" " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" -msgstr "" -"[選項]...⏎\n" -" --no-confirmation 在 %s 更新模式中不要詢問確認的問題\n" -" --no-verify-rpm 不要檢查套件的簽章\n" -" --changelog-first 在說明視窗中將變更紀錄顯示在檔案清單之前\n" -" --merge-all-rpmnew 設法將所有 .rpmnew 新設定檔與所有找到的 .rpmsave 舊" -"設定檔合併" +msgstr "[選項]...⏎\n --no-confirmation 在 %s 更新模式中不要詢問確認的問題\n --no-verify-rpm 不要檢查套件的簽章\n --changelog-first 在說明視窗中將變更紀錄顯示在檔案清單之前\n --merge-all-rpmnew 設法將所有 .rpmnew 新設定檔與所有找到的 .rpmsave 舊設定檔合併" #: standalone.pm:117 #, c-format msgid "" "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-" "usbtable] [--dynamic=dev]" -msgstr "" -"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-" -"usbtable] [--dynamic=dev]" +msgstr "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]" #: standalone.pm:118 #, c-format @@ -6763,21 +6259,14 @@ msgid "" " [everything]\n" " XFdrake [--noauto] monitor\n" " XFdrake resolution" -msgstr "" -" [everything]⏎\n" -" XFdrake [--noauto] <螢幕>⏎\n" -" XFdrake <解析度>" +msgstr " [everything]⏎\n XFdrake [--noauto] <螢幕>⏎\n XFdrake <解析度>" #: standalone.pm:154 #, c-format msgid "" "\n" -"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--" -"testing] [-v|--version] " -msgstr "" -"\n" -"用法:%s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--" -"testing] [-v|--version] " +"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " +msgstr "\n用法:%s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] " #: timezone.pm:161 timezone.pm:162 #, c-format @@ -6849,95 +6338,9 @@ msgstr "您選擇了檔案而非目錄" msgid "" "%s is not installed\n" "Click \"Next\" to install or \"Cancel\" to quit" -msgstr "" -"%s 沒有安裝\n" -"要安裝點選 \"Next 下一步\" 或 \"Cancel 取消\" 離開" +msgstr "%s 沒有安裝\n要安裝點選 \"Next 下一步\" 或 \"Cancel 取消\" 離開" #: wizards.pm:100 #, c-format msgid "Installation failed" msgstr "安裝失敗" - -#~ msgid "Clean /tmp at each boot" -#~ msgstr "每次開機時清理 /tmp" - -#~ msgid "" -#~ "The old \"%s\" driver is blacklisted.\n" -#~ "\n" -#~ "It has been reported to oops the kernel on unloading.\n" -#~ "\n" -#~ "The new \"%s\" driver will only be used on next bootstrap." -#~ msgstr "" -#~ "舊的 \"%s\" 驅動程式已被列入黑名單。\n" -#~ "\n" -#~ "它曾被回報會導致核心在解除模組時產生 Oops 錯誤。\n" -#~ "\n" -#~ "於下一次開機時將只會使用新的 \"%s\" 驅動程式。" - -#~ msgid "No open source driver" -#~ msgstr "無開放原始碼的驅動程式可用" - -#~ msgid "" -#~ "There's no free driver for your sound card (%s), but there's a " -#~ "proprietary driver at \"%s\"." -#~ msgstr "您的音效卡 (%s) 沒有自由的驅動程式,但是有私有的驅動程式於 \"%s\"." - -#~ msgid "command %s missing" -#~ msgstr "指令 %s 遺失" - -#~ msgid "" -#~ "The classic bug sound tester is to run the following commands:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" will tell you which driver your card " -#~ "uses\n" -#~ "by default\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" will tell you what driver it\n" -#~ "currently uses\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n" -#~ "loaded or not\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" " -#~ "will\n" -#~ "tell you if sound and alsa services are configured to be run on\n" -#~ "initlevel 3\n" -#~ "\n" -#~ "- \"aumix -q\" will tell you if the sound volume is muted or not\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound " -#~ "card.\n" -#~ msgstr "" -#~ "傳統的音效除錯與測試是執行以下指令:\n" -#~ "\n" -#~ "\n" -#~ "- \"lspcidrake -v | fgrep -i AUDIO\" 會告訴您您的音效卡預設使用何種驅動程" -#~ "式。\n" -#~ "\n" -#~ "- \"grep sound-slot /etc/modprobe.conf\" 將告訴您正在使用何種驅動程式。\n" -#~ "\n" -#~ "- \"/sbin/lsmod\" 讓您可以檢查音效模組 (驅動程式) 是否已經載入。\n" -#~ "\n" -#~ "- \"/sbin/chkconfig --list sound\" 與 \"/sbin/chkconfig --list alsa\" 將\n" -#~ "告訴您音效與 ALSA 服務是否被設定為在 initlevel 3 執行。\n" -#~ "\n" -#~ "- \"aumix -q\" 會告訴您音量是否設為靜音\n" -#~ "\n" -#~ "- \"/sbin/fuser -v /dev/dsp\" 將指出哪個程式在使用音效卡。\n" - -#~ msgid "" -#~ "Launch packet filtering for Linux kernel 2.2 series, to set\n" -#~ "up a firewall to protect your machine from network attacks." -#~ msgstr "" -#~ "啟動 Linux Kernel 2.2 系列的防火牆機制, 用來保護您的機器不會遭受\n" -#~ "外來的網路攻擊。" - -#~ msgid "File sharing" -#~ msgstr "檔案分享" - -#~ msgid "Enable 5.1 sound with Pulse Audio" -#~ msgstr "以 PulseAudio 啟用 5.1 音效" - -#~ msgid "Enable user switching for audio applications" -#~ msgstr "啟用使用者切換音效應用程式" -- cgit v1.2.1 From 7d4103e8cad88235483ae4c988c97afe707f7f74 Mon Sep 17 00:00:00 2001 From: Marek Laane Date: Thu, 12 Dec 2013 15:25:44 +0200 Subject: Translated license in Estonian --- perl-install/share/po/et.po | 184 +++++++++++++++++++------------------------- 1 file changed, 78 insertions(+), 106 deletions(-) diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po index c16b60091..fa0747e69 100644 --- a/perl-install/share/po/et.po +++ b/perl-install/share/po/et.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-12-06 15:37+0000\n" +"PO-Revision-Date: 2013-12-12 15:21+0000\n" "Last-Translator: Marek Laane \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4852,12 +4852,14 @@ msgstr "" #, c-format msgid "_: You can warn about unofficial translation here" msgstr "" -"Järgnev lõppkasutaja litsents on eksimuste vältimiseks originaalkeeles!" +"Järgnev lõppkasutaja litsentsi tõlge on mõeldud ainult tutvumiseks;\n " +"igasuguste õiguslike probleemide puhul on juriidilise jõuga ainult\n " +"litsentsi ingliskeelne originaal, mis on distributsiooniga kaasas." #: messages.pm:18 #, c-format msgid "Introduction" -msgstr "Introduction" +msgstr "Sissejuhatus" #: messages.pm:20 #, c-format @@ -4872,20 +4874,17 @@ msgid "" "applications \n" "distributed with these products provided by Mageia's licensors or suppliers." msgstr "" -"The operating system and the different components available in the Mageia " -"distribution \n" -"shall be called the \"Software Products\" hereafter. The Software Products " -"include, but are not \n" -"restricted to, the set of programs, methods, rules and documentation related " -"to the operating \n" -"system and the different components of the Mageia distribution, and any " -"applications \n" -"distributed with these products provided by Mageia's licensors or suppliers." +"Operatsioonisüsteemi ja erinevaid komponente, mida Mageia distributsioon pakub,\n " +"nimetatakse edaspidi \"tarkvaratoodeteks\". Tarkvaratooted sisaldavad muu hulgas\n " +"valikut programme, meetodeid, reegleid ja dokumentatsiooni, mis on seotud\n " +"operatsioonisüsteemi ja Mageia distributsiooni erinevate komponentidega,\n " +"samuti rakendusi, mida levitavad koos nende toodetega Mageia litsentsiandjad\n " +"või tarnijad." #: messages.pm:27 #, c-format msgid "1. License Agreement" -msgstr "1. License Agreement" +msgstr "1. Litsentsileping" #: messages.pm:29 #, c-format @@ -4908,28 +4907,22 @@ msgid "" "copies of the \n" "Software Products." msgstr "" -"Please read this document carefully. This document is a license agreement " -"between you and \n" -"Mageia which applies to the Software Products.\n" -"By installing, duplicating or using any of the Software Products in any " -"manner, you explicitly \n" -"accept and fully agree to conform to the terms and conditions of this " -"License. \n" -"If you disagree with any portion of the License, you are not allowed to " -"install, duplicate or use \n" -"the Software Products. \n" -"Any attempt to install, duplicate or use the Software Products in a manner " -"which does not comply \n" -"with the terms and conditions of this License is void and will terminate " -"your rights under this \n" -"License. Upon termination of the License, you must immediately destroy all " -"copies of the \n" -"Software Products." +"Palun lugege järgnev dokument hoolikalt läbi. See kujutab endast\n " +"tarkvaratoodete suhtes kehtivat litsentsilepingut Teie ja Mageia vahel.\n " +"Mis tahes tarkvaratoote paigaldamise, kopeerimise või kasutamisega mis\n " +"tahes viisil olete sõnaselgelt ja täielikult nõustunud täitma käesoleva\n " +"litsentsilepingu tingimusi.\n " +"Kui Te ei ole nõus litsentsi mis tahes osaga, ei ole Teil õigust\n " +"tarkvaratooteid paigaldada, kopeerida ega kasutada.\n " +"Kõik katsed tarkvaratooteid paigaldada, kopeerida või kasutada viisil,\n " +"mis ei vasta käesoleva litsentsilepingu tingimustele, on õigustühised\n " +"ning tühistavad õigused, mida litsents Teile muidu annaks. Litsentsi\n " +"tühistumisel peate viivitamata hävitama kõik tarkvaratoodete koopiad." #: messages.pm:41 #, c-format msgid "2. Limited Warranty" -msgstr "2. Limited Warranty" +msgstr "2. Piiratud garantii" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: messages.pm:44 @@ -4975,50 +4968,36 @@ msgid "" "consequential or incidental damages, the above limitation may not apply to " "you." msgstr "" -"The Software Products and attached documentation are provided \"as is\", " -"with no warranty, to the \n" -"extent permitted by law.\n" -"Neither Mageia nor its licensors or suppliers will, in any circumstances and " -"to the extent \n" -"permitted by law, be liable for any special, incidental, direct or indirect " -"damages whatsoever \n" -"(including without limitation damages for loss of business, interruption of " -"business, financial \n" -"loss, legal fees and penalties resulting from a court judgment, or any other " -"consequential loss) \n" -"arising out of the use or inability to use the Software Products, even if " -"Mageia or its \n" -"licensors or suppliers have been advised of the possibility or occurrence of " -"such damages.\n" -"\n" -"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME " -"COUNTRIES\n" -"\n" -"To the extent permitted by law, neither Mageia nor its licensors, suppliers " -"or\n" -"distributors will, in any circumstances, be liable for any special, " -"incidental, direct or indirect \n" -"damages whatsoever (including without limitation damages for loss of " -"business, interruption of \n" -"business, financial loss, legal fees and penalties resulting from a court " -"judgment, or any \n" -"other consequential loss) arising out of the possession and use of software " -"components or \n" -"arising out of downloading software components from one of Mageia sites " -"which are \n" -"prohibited or restricted in some countries by local laws.\n" -"This limited liability applies to, but is not restricted to, the strong " -"cryptography components \n" -"included in the Software Products.\n" -"However, because some jurisdictions do not allow the exclusion or limitation " -"of liability for \n" -"consequential or incidental damages, the above limitation may not apply to " -"you." +"Tarkvaratooteid ja nendega kaasnevat dokumentatsiooni pakutakse\n " +"\"nii, nagu ta on\", seadusega lubatud ulatuses ilma garantiita.\n " +"Ei Mageia ega tema litsentsiandjad ega tarnijad ei ole mingil juhul,\n " +"nii palju kui seadused lubavad, vastutavad mitte mingisuguse erilise,\n " +"juhusliku, otsese või kaudse kahju eest (sealhulgas, aga mitte ainult,\n " +"kahju eest, mis kaasneb äritegevuse lakkamise või katkemise, rahalise kahju,\n " +"õigusabitasude ja kohtuotsusest tulenevate trahvide või muu tegevusest\n " +"tuleneva kahju eest), mis tuleneb tarkvaratoodete kasutamisest või\n " +"võimetusest neid kasutada, isegi kui Mageia või tema litsentsiandjad või\n " +"tarnijad on teadlikud niisuguse kahju võimalikkusest või esinemisest.\n " +"\n" +"PIIRATUD VASTUTUS SEOSES MÕNES RIIGIS KEELATUD TARKVARA OMAMISE VÕI KASUTAMISEGA\n" +"\n" +"Seadusega lubatud määral ei ole Mageia ega tema litsentsiandjad ega tarnijad\n " +"mingil juhul vastutavad mitte mingisuguse erilise, juhusliku, otsese\n " +"või kaudse kahju eest (sealhulgas, aga mitte ainult, kahju eest,\n " +"mis kaasneb äritegevuse lakkamise või katkemise, rahalise kahju,\n " +"õigusabitasude ja kohtuotsusest tulenevate trahvide või muu tegevusest\n " +"tuleneva kahju eest), mis tuleneb selliste tarkvarakomponentide omamisest\n " +"või kasutamisest või selliste tarkvarakomponentide allalaadimisest mõnelt\n " +"Mageia saidilt, mis on keelatud mõne riigi kohaliku seadusega.\n " +"See piiratud vastutus kehtib muu hulgas tarkvaratoodetes leiduvatele tugevatele\n " +"krüptograafilistele komponentidele.\n " +"Et mõnes õigusruumis ei ole lubatud välistada või piirata vastutust tuleneva\n " +"või juhusliku kahju eest, ei pruugi käesolev piirang Teie suhtes kehtida." #: messages.pm:68 #, c-format msgid "3. The GPL License and Related Licenses" -msgstr "3. The GPL License and Related Licenses" +msgstr "3. GPL-litsents ja sellega seotud litsentsid" #: messages.pm:70 #, c-format @@ -5036,23 +5015,20 @@ msgid "" "Documentation written \n" "by Mageia is governed by \"%s\" License." msgstr "" -"The Software Products consist of components created by different persons or " -"entities.\n" -"Most of these licenses allow you to use, duplicate, adapt or redistribute " -"the components which \n" -"they cover. Please read carefully the terms and conditions of the license " -"agreement for each component \n" -"before using any component. Any question on a component license should be " -"addressed to the component \n" -"licensor or supplier and not to Mageia.\n" -"The programs developed by Mageia are governed by the GPL License. " -"Documentation written \n" -"by Mageia is governed by \"%s\" License." +"Tarkvaratooted koosnevad komponentidest, mille on loonud eri isikud või\n " +"organisatsioonid.\n" +"Enamik litsentse lubab Teil kasutada, kopeerida, kohandada või edasi\n " +"levitada komponente, mille kohta need käivad. Palun tutvuge põhjalikult\n " +"kõigi komponentide litsentsilepingu tingimustega enne nende komponentide\n " +"kasutamist. Kõik küsimused komponendi litsentsi kohta tuleb esitada\n " +"komponendi litsentsiandjale või tarnijale, mitte aga Mageiale.\n " +"Mageia arendatud programmid on litsentsitud GPL-litsentsiga. Mageia\n " +"kirjutatud dokumentatsioon on litsentsitud \"%s\" litsentsiga." #: messages.pm:79 #, c-format msgid "4. Intellectual Property Rights" -msgstr "4. Intellectual Property Rights" +msgstr "4. Intellektuaalomandi õigused" #: messages.pm:81 #, c-format @@ -5066,19 +5042,18 @@ msgid "" "Products, as a whole or in parts, by all means and for all purposes.\n" "\"Mageia\" and associated logos are trademarks of %s" msgstr "" -"All rights to the components of the Software Products belong to their " -"respective authors and are \n" -"protected by intellectual property and copyright laws applicable to software " -"programs.\n" -"Mageia and its suppliers and licensors reserves their rights to modify or " -"adapt the Software \n" -"Products, as a whole or in parts, by all means and for all purposes.\n" -"\"Mageia\" and associated logos are trademarks of %s" +"Kõik tarkvaratoodete komponentide õigused kuuluvad nende autoritele ning\n " +"on kaitstud tarkvaraprogrammide kohta käivate intellektuaalomandi ja\n " +"autoriõiguse seadustega.\n" +"Mageia ja tema litsentsiandjad ja tarnijad jätavad endale õiguse muuta\n " +"või kohandada tarkvaratooteid tervikuna või osaliselt mis tahes viisil\n " +"ja mis tahes eesmärgil.\n" +"\"Mageia\" ja temaga seotud logod on %s-i kaubamärgid." #: messages.pm:88 #, c-format msgid "5. Governing Laws" -msgstr "5. Governing Laws" +msgstr "5. Kehtivad seadused" #: messages.pm:90 #, c-format @@ -5096,18 +5071,15 @@ msgid "" "Paris - France.\n" "For any question on this document, please contact Mageia." msgstr "" -"If any portion of this agreement is held void, illegal or inapplicable by a " -"court judgment, this \n" -"portion is excluded from this contract. You remain bound by the other " -"applicable sections of the \n" -"agreement.\n" -"The terms and conditions of this License are governed by the Laws of " -"France.\n" -"All disputes on the terms of this license will preferably be settled out of " -"court. As a last \n" -"resort, the dispute will be referred to the appropriate Courts of Law of " -"Paris - France.\n" -"For any question on this document, please contact Mageia." +"Kui mõni käesoleva lepingu osa peaks kohtuotsusega tunnistatama tühiseks,\n " +"ebaseaduslikuks või mitterakendatavaks, kaotab see osa lepingust kehtivuse.\n " +"Teised lepingu osad kehtivad Teie suhtes edasi.\n" +"Käesoleva litsentsilepingu tingimused on kooskõlas Prantsusmaa seadustega.\n " +"Kõik vaidlused käesoleva litsentsi tingimuste üle tuleks võimaluse korral\n " +"lahendada kohtuväliselt. Kui see ei õnnestu, tuleb pöörduda sobiva\n " +"kohtuasutuse poole Prantsusmaal Pariisis.\n " +"Kõigi käesoleva dokumendiga seotud küsimuste korral\n " +"pöörduge palun Mageia poole." #: messages.pm:102 #, c-format -- cgit v1.2.1 From b097c128b037750e3f3afa3b7d14e6dfb44b317f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 13 Dec 2013 17:55:37 +0100 Subject: workaround a gtk+3 issue resulting in blacked embbeded tools (mga#11969) it only happens with some locales (eg: pl/uk) --- perl-install/NEWS | 3 +++ perl-install/mygtk3.pm | 1 + 2 files changed, 4 insertions(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index d48f6df77..b05535bdf 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- workaround a gtk+3 issue resulting in blacked embbeded tools with some + locales (eg: pl/uk) (mga#11969) + Version 16.13 - 10 December 2013 - localedrake: diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm index a4f790d89..97e64290a 100644 --- a/perl-install/mygtk3.pm +++ b/perl-install/mygtk3.pm @@ -896,6 +896,7 @@ sub _gtk_any_Window { if ($class eq 'Window') { $w = "Gtk3::$class"->new(delete $opts->{type} || 'toplevel'); } elsif ($class eq 'Plug') { + delete $opts->{title}; $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id"); $w = "Gtk3::$class"->new(delete $opts->{socket_id}); } elsif ($class eq 'FileChooserDialog') { -- cgit v1.2.1 From f3866238716cf61d918c66a3db3fc6089227ce08 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 13 Dec 2013 17:56:26 +0100 Subject: 16.15 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 7c478bedf..3277176a1 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.14 +VERSION:=16.15 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index b05535bdf..f9634dc4c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.15 - 12 December 2013 + - workaround a gtk+3 issue resulting in blacked embbeded tools with some locales (eg: pl/uk) (mga#11969) -- cgit v1.2.1 From e9aa96df822ee3bbf09db266430a1a39d7534b94 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 14 Dec 2013 11:02:08 +0100 Subject: fix spacing --- perl-install/NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-install/NEWS b/perl-install/NEWS index f9634dc4c..f56361bb2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -100,6 +100,7 @@ Version 16.0 - 23 November 2013 o support polkit rules editing for permissions overrides Version 15.73.1 - 19 November 2013 + - add chrony support to drakclock mga#11092 Version 15.73 - 12 November 2013 -- cgit v1.2.1 From bc8cf46f070ef8244e0018c91e41170a40528242 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Sun, 15 Dec 2013 21:46:30 +0100 Subject: remove buggy control caracters (#11602) --- images/make_boot_img | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/make_boot_img b/images/make_boot_img index 1cf144a39..613affd9a 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -106,7 +106,7 @@ sub syslinux_msg { $tree->[0] eq 'document' or die "bad file $msg_xml_file\n"; my $text = xml_tree2syslinux('default', $tree->[1]); - pack("C*", 0x0E, 0x80, 0x03, 0x00) . " " + " " . $text . join('', @more_text) . "\n" . syslinux_color('red') . "[F1-Help] [F2-Advanced Help]" . syslinux_color('default') . "\n"; } -- cgit v1.2.1 From 4ff405c965bf8d1c7ee6eabfd2d2a6a96a4346b3 Mon Sep 17 00:00:00 2001 From: Anne Nicolas Date: Sun, 15 Dec 2013 21:50:01 +0100 Subject: 2.4 --- images/Makefile | 2 +- images/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/images/Makefile b/images/Makefile index f80c4f732..142cfd577 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.3 +VERSION=2.4 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index f6f1f4039..1ec90f9b7 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,6 @@ +Version 2.4 - 15 December 2013 by Anne Nicolas + +- remove buggy control caracters (#11602) - use audit=0 in rescue isolinux config to allow systemd-nspawn to work smoothly Version 2.3 - 2 December 2013 by Thierry Vignaud -- cgit v1.2.1 From 6cc2bcd4cf9910461409a57f1429aabeddf51676 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 16 Dec 2013 13:21:11 +0100 Subject: fix a drakx crash (mga#6031) --- perl-install/NEWS | 2 ++ perl-install/interactive/gtk.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index f56361bb2..92b4d360f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix a drakx crash (mga#6031) + Version 16.15 - 12 December 2013 - workaround a gtk+3 issue resulting in blacked embbeded tools with some diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index ca6834f21..6b76b7d40 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -397,7 +397,7 @@ sub create_widget { } $w->signal_connect(clicked => $onchange->(sub { $w->get_active })); ${$e->{val}} ||= 0; - $set = sub { $w->set_active($_[0]) }; + $set = sub { $w->set_active($_[0] || 0) }; $real_w = add_padding($w); } elsif ($e->{type} eq 'only_label') { my @common = ( -- cgit v1.2.1 From efa16b5397f22c43dd3a1cb4111cdf76c0e744cd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 16 Dec 2013 13:36:08 +0100 Subject: 16.16 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 3277176a1..f579cf0e1 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.15 +VERSION:=16.16 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 92b4d360f..e1e9150eb 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.16 - 16 December 2013 + - fix a drakx crash (mga#6031) Version 16.15 - 12 December 2013 -- cgit v1.2.1 From 57b3de16e987ce7f5746f61764583b64022a647b Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 19 Dec 2013 13:39:20 +0100 Subject: Polish translation updated --- perl-install/install/share/po/pl.po | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/perl-install/install/share/po/pl.po b/perl-install/install/share/po/pl.po index 5cbe442d8..eecfd4e47 100644 --- a/perl-install/install/share/po/pl.po +++ b/perl-install/install/share/po/pl.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: DrakX\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-03 12:08+0200\n" -"PO-Revision-Date: 2013-04-06 13:21+0200\n" +"PO-Revision-Date: 2013-12-19 13:38+0100\n" "Last-Translator: Daniel Napora \n" "Language-Team: Polish \n" "Language: pl\n" @@ -34,52 +34,52 @@ msgstr "" #: ../../advertising/01_IM_mageia.pl:1 #, c-format msgid "Join Us!" -msgstr "" +msgstr "Dołącz do nas!" #: ../../advertising/02_IM_mageia.pl:1 #, c-format msgid "Make it yours!" -msgstr "" +msgstr "Uczyń ją swoją!" #: ../../advertising/03_IM_mageia.pl:1 #, c-format msgid "Your choice!" -msgstr "" +msgstr "Twój wybór!" #: ../../advertising/04_IM_mageia.pl:1 -#, fuzzy, c-format +#, c-format msgid "Office tools" -msgstr "Stacja biurowa" +msgstr "Narzędzia biurowe" #: ../../advertising/05_IM_mageia.pl:1 #, c-format msgid "Home entertainment" -msgstr "" +msgstr "Domowe centrum rozrywki" #: ../../advertising/06_IM_mageia.pl:1 #, c-format msgid "For kids" -msgstr "" +msgstr "Dla dzieci" #: ../../advertising/07_IM_mageia.pl:1 #, c-format msgid "For family!" -msgstr "" +msgstr "Dla rodziny!" #: ../../advertising/08_IM_mageia.pl:1 #, c-format msgid "For developers!" -msgstr "" +msgstr "Dla developerów!" #: ../../advertising/09_IM_mageia.pl:1 #, c-format msgid "Thank you!" -msgstr "" +msgstr "Dziękujemy!" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "" +msgstr "Bądź wolny!" #: any.pm:111 #, c-format @@ -193,17 +193,17 @@ msgstr "" #: any.pm:319 #, c-format msgid "Core Release" -msgstr "" +msgstr "Core Release" #: any.pm:321 #, c-format msgid "Tainted Release" -msgstr "" +msgstr "Tainted Release" #: any.pm:323 #, c-format msgid "Nonfree Release" -msgstr "" +msgstr "Nonfree Release" #: any.pm:351 #, c-format @@ -259,9 +259,9 @@ 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:404 -#, fuzzy, c-format +#, c-format msgid "This medium provides package updates for medium \"%s\"" -msgstr "Pomiń wszystkie pakiety z nośnika \"%s\"" +msgstr "Ten nośnik zawiera aktualizacje pakietów dla nośnika \"%s\"" #: any.pm:480 #, c-format @@ -755,33 +755,33 @@ msgstr "" "narzędzi graficznych" #: share/meta-task/compssUsers.pl:162 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "Stacja KDE" +msgstr "Pulpit XFCE" #: share/meta-task/compssUsers.pl:163 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i " +"Lekkie środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i " "narzędzi graficznych" #: share/meta-task/compssUsers.pl:167 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "Stacja GNOME" +msgstr "Pulpit MATE" #: share/meta-task/compssUsers.pl:172 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Stacja robocza" +msgstr "Pulpit Cinnamon" #: share/meta-task/compssUsers.pl:173 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Środowisko graficzne" +msgstr "Środowisko graficzne bazujące na Gnome" #: share/meta-task/compssUsers.pl:177 #, c-format @@ -798,22 +798,22 @@ msgstr "" "aplikacji i narzędzi graficznych" #: share/meta-task/compssUsers.pl:183 -#, fuzzy, c-format +#, c-format msgid "RazorQT Desktop" -msgstr "Dowolny pulpit" +msgstr "Pulpit RazorQT" #: share/meta-task/compssUsers.pl:185 #, c-format msgid "A less developed lightweight fast graphical environment" -msgstr "" +msgstr "Lekkie i szybkie środowisko graficzne" #: share/meta-task/compssUsers.pl:188 #, c-format msgid "Enlightenment e17 Desktop" -msgstr "" +msgstr "Pulpit Enlightenment E17" #: share/meta-task/compssUsers.pl:190 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" "Lekkie i szybkie środowisko graficzne z przyjaznym dla użytkownika zbiorem " @@ -825,9 +825,9 @@ msgid "Other Graphical Desktops" msgstr "Inne środowiska graficzne" #: share/meta-task/compssUsers.pl:194 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, Fvwm, itd." +msgstr "Window Maker, Fvwm, itd." #: share/meta-task/compssUsers.pl:217 #, c-format @@ -1227,7 +1227,7 @@ msgid "Upgrade previous installation (not recommended)" msgstr "Zaktualizuj istniejącą instalację (nie zalecane)" #: steps_interactive.pm:223 -#, fuzzy, c-format +#, c-format msgid "" "Installer has detected that your installed Linux system could not\n" "safely be upgraded to %s.\n" @@ -1388,9 +1388,9 @@ msgid "Truly minimal install (especially no urpmi)" msgstr "Naprawdę minimalna instalacja (w szczególności bez urpmi)" #: steps_interactive.pm:661 -#, fuzzy, c-format +#, c-format msgid "Preparing upgrade..." -msgstr "Przygotowywanie programu rozruchowego..." +msgstr "Przygotowywanie aktualizacji..." #: steps_interactive.pm:671 #, c-format -- cgit v1.2.1 From 52119329d1211f31c58b81401a559de962972e5b Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 19 Dec 2013 14:44:43 +0100 Subject: Polish translation updated --- perl-install/standalone/po/pl.po | 170 ++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 92 deletions(-) diff --git a/perl-install/standalone/po/pl.po b/perl-install/standalone/po/pl.po index 16badb292..861b6386c 100644 --- a/perl-install/standalone/po/pl.po +++ b/perl-install/standalone/po/pl.po @@ -12,19 +12,20 @@ # Tomasz Bednarski - Amazis.net , 2008. # Amazis.net sp. z o.o. - Tomasz Bednarski , 2008. # Amazis.net sp. z o.o. - Tomasz Bednarski , 2009. +# Daniel Napora , 2013. msgid "" msgstr "" "Project-Id-Version: libDrakX-standalone\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-11 11:11+0100\n" -"PO-Revision-Date: 2010-05-05 09:10+0100\n" -"Last-Translator: Marek Walczak \n" -"Language-Team: \n" -"Language: \n" +"PO-Revision-Date: 2013-12-19 14:43+0100\n" +"Last-Translator: Daniel Napora \n" +"Language-Team: Polish \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" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -182,9 +183,9 @@ msgstr "" "Program \"%s\" niespodziewanie zakończył działanie z następującym błędem:" #: drakbug:62 -#, fuzzy, c-format +#, c-format msgid "%s Bug Report Tool" -msgstr "Narzędzie raportowania błędów Mageia" +msgstr "Narzędzie raportowania błędów %s" #: drakbug:62 drakbug:67 drakbug:72 drakbug:73 drakbug:99 drakfont:523 #: drakfont:527 drakhelp:53 draksec:110 draksec:146 harddrake2:234 @@ -214,9 +215,9 @@ msgid "Standalone Tools" msgstr "Samodzielne urządzenia" #: drakbug:72 drakbug:73 -#, fuzzy, c-format +#, c-format msgid "%s Online" -msgstr "Mageia Online" +msgstr "%s Online" #: drakbug:74 #, c-format @@ -239,9 +240,9 @@ msgid "Configuration Wizards" msgstr "Druidy konfiguracji" #: drakbug:99 -#, fuzzy, c-format +#, c-format msgid "Select %s Tool:" -msgstr "Wybierz narzędzie Mageia:" +msgstr "Wybierz narzędzie %s:" #: drakbug:100 #, c-format @@ -278,9 +279,9 @@ msgid "The \"%s\" program has segfaulted with the following error:" msgstr "Program \"%s\" spowodował naruszenie ochrony pamięci i zwrócił błąd:" #: drakbug:144 -#, fuzzy, c-format +#, c-format msgid "Used theme: %s" -msgstr "Użytkownik: %s" +msgstr "Użyty temat: %s" #: drakbug:146 #, c-format @@ -715,7 +716,7 @@ msgstr "Ghostscript" #: drakfont:555 #, c-format msgid "LibreOffice" -msgstr "" +msgstr "LibreOffice" #: drakfont:556 #, c-format @@ -833,7 +834,7 @@ msgid "Post Uninstall" msgstr "Odinstalowywanie wykańczające" #: drakhelp:17 -#, fuzzy, c-format +#, c-format msgid "" " drakhelp 0.1\n" "Copyright (C) %s Mandriva.\n" @@ -845,13 +846,14 @@ msgid "" msgstr "" " drakhelp 0.1\n" "Copyright (C) %s Mandriva.\n" +"Copyright (C) %s Mageia.\n" "To jest wolnodostępne oprogramowanie i może być rozpowszechniane zgodnie\n" "z zasadami licencji GNU GPL.\n" "\n" "Użycie: \n" #: drakhelp:23 -#, fuzzy, c-format +#, c-format msgid " --help - display this help \n" msgstr " --help - wyświetla tą pomoc \n" @@ -869,13 +871,13 @@ msgid "" " --doc - link to another web page ( for WM welcome " "frontend)\n" msgstr "" -" --doc - odnośnik do innej strony web ( dla strony\n" +" --doc - odnośnik do innej strony www ( dla strony\n" " powitalnej WM)\n" #: drakhelp:53 -#, fuzzy, c-format +#, c-format msgid "%s Help Center" -msgstr "Centrum Pomocy Mageia" +msgstr "Centrum Pomocy %s" #: drakhelp:53 #, c-format @@ -1180,10 +1182,9 @@ msgid "Security Level and Checks" msgstr "Poziom bezpieczeństwa i kontrola" #: draksec:110 -#, fuzzy, c-format +#, c-format msgid "Configure authentication required to access %s tools" -msgstr "" -"Skonfiguruj dane niezbędne do uwierzytelniania dostępu do narzędzi Mandrivy" +msgstr "Skonfiguruj dane niezbędne do uwierzytelniania dostępu do narzędzi %s" #: draksec:113 #, c-format @@ -1206,9 +1207,9 @@ msgid "Software Management" msgstr "Zarządzanie oprogramowaniem" #: draksec:146 -#, fuzzy, c-format +#, c-format msgid "%s Update" -msgstr "Mageia Update" +msgstr "%s Update" #: draksec:147 #, c-format @@ -1327,19 +1328,13 @@ msgstr "Nie wykryto karty dźwiękowej!" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: draksound:51 -#, fuzzy, c-format +#, c-format msgid "" "No Sound Card has been detected on your machine. Please verify that a Linux-" "supported Sound Card is correctly plugged in" msgstr "" "W komputerze nie wykryto karty telewizyjnej. Sprawdź czy obsługiwana karta " -"jest poprawnie włożona.\n" -"\n" -"\n" -"Możesz odwiedzić bazę danych sprzętu pod adresem:\n" -"\n" -"\n" -"http://www.mandrivalinux.com/en/hardware.php3" +"jest poprawnie podłączona" #: draksound:54 #, c-format @@ -1567,19 +1562,13 @@ msgstr "Nie wykryto karty telewizyjnej!" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: drakxtv:69 -#, fuzzy, c-format +#, c-format msgid "" "No TV Card has been detected on your machine. Please verify that a Linux-" "supported Video/TV Card is correctly plugged in." msgstr "" "W komputerze nie wykryto karty telewizyjnej. Sprawdź czy obsługiwana karta " -"jest poprawnie włożona.\n" -"\n" -"\n" -"Możesz odwiedzić bazę danych sprzętu pod adresem:\n" -"\n" -"\n" -"http://www.mandrivalinux.com/en/hardware.php3" +"jest poprawnie podłączona." #: finish-install:60 #, c-format @@ -2432,9 +2421,9 @@ msgid ", " msgstr ", " #: logdrake:54 -#, fuzzy, c-format +#, c-format msgid "%s Tools Logs" -msgstr "Dzienniki narzędzi Mageia" +msgstr "Logi narzędzi %s" #: logdrake:68 #, c-format @@ -2716,14 +2705,14 @@ msgid "and enter the name (or the IP) of the SMTP server you wish to use" msgstr "i podaj nazwę (lub IP) serwera SMTP, którego chcesz używać" #: logdrake:443 -#, fuzzy, c-format +#, c-format msgid "Email address" -msgstr "Adres IP" +msgstr "Adres email" #: logdrake:444 -#, fuzzy, c-format +#, c-format msgid "Email server" -msgstr "Serwer Samba" +msgstr "Serwer pocztowy" #: logdrake:448 #, c-format @@ -2759,12 +2748,12 @@ msgstr "Zapisz jako.." #: notify-x11-free-driver-switch:18 service_harddrake:452 #, c-format msgid "Display driver setup" -msgstr "" +msgstr "Ustawienia sterownika grafiki" #: notify-x11-free-driver-switch:20 #, c-format msgid "The display driver has been automatically switched to '%s'." -msgstr "" +msgstr "Sterownik graficzny został automatycznie ustawiony na '%s'." #: notify-x11-free-driver-switch:21 #, c-format @@ -3062,13 +3051,13 @@ msgstr "" "Uruchom polecenie \"man sane-%s\", aby je przeczytać." #: scannerdrake:407 scannerdrake:416 -#, fuzzy, c-format +#, c-format msgid "" "After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/" "Graphics in the applications menu." msgstr "" "Można skanować dokumenty przy użyciu programu \"XSane\" lub \"%s\"' z menu " -"Multimedia/Grafika menu programów." +"Multimedia/Grafika." #: scannerdrake:411 #, c-format @@ -3099,7 +3088,7 @@ msgid "Congratulations!" msgstr "Gratulacje!" #: scannerdrake:419 -#, fuzzy, c-format +#, c-format msgid "" "Your %s has been configured.\n" "You may now scan documents using \"XSane\" or \"%s\" from Multimedia/" @@ -3107,7 +3096,7 @@ msgid "" msgstr "" "Urządzenie %s zostało skonfigurowane.\n" "Można skanować dokumenty przy użyciu programu \"XSane\" lub \"%s\"' z menu " -"Multimedia/Grafika menu programów." +"Multimedia/Grafika." #: scannerdrake:444 #, c-format @@ -3318,7 +3307,7 @@ msgstr "Karta graficzna '%s' nie jest już wspierana przez '%s' sterownik" #: service_harddrake:167 #, c-format msgid "New release, reconfiguring X for %s" -msgstr "" +msgstr "Nowe wydanie, rekonfiguracja X dla %s" #: service_harddrake:258 #, c-format @@ -3363,7 +3352,7 @@ msgstr "Wykrywanie sprzętu w toku" #: service_harddrake:431 service_harddrake:436 #, c-format msgid "Display driver issue" -msgstr "" +msgstr "Problem ze sterownikiem graficznym" #: service_harddrake:432 #, c-format @@ -3373,6 +3362,10 @@ msgid "" "boot process. Startup of the X server may now fail as that option was not " "specified." msgstr "" +"Obecnie używany sterownik graficzny wymaga użycia opcji bootowania " +"'nokmsboot', aby nie dopuścic do załadowania modułu jądra KMS podczas " +"bootowania. Uruchomienie serwera X może się nie udać, poniewaz ta opcja nie " +"została wprowadzona." #: service_harddrake:437 #, c-format @@ -3381,16 +3374,20 @@ msgid "" "driver the X server is configured to use. Startup of the X server may now " "fail." msgstr "" +"Wykryto załadowany sterownik graficzny - moduł jądra - który jest w " +"konflikcie ze sterownikiem, który jest aktualnie skonfigurowany dla X " +"serwera. Uruchomienie X serwera może być niemozliwe." #: service_harddrake:452 #, c-format msgid "The system has to be rebooted due to a display driver change." msgstr "" +"System musi zostać zrebootowany z powodu zmiany sterownika graficznego." #: service_harddrake:453 #, c-format msgid "Press Cancel within %d seconds to abort." -msgstr "" +msgstr "Wciśnij Anuluj w czasie %d sekund aby przerwać." #: ../menu/harddrake.desktop.in.h:1 msgid "HardDrake" @@ -3421,121 +3418,110 @@ msgid "Language & country configuration" msgstr "Konfiguracja języka i kraju" #: ../polkit/org.mageia.drakauth.policy.in.h:1 -#, fuzzy msgid "Run Mageia Authentication Configuration" -msgstr "Konfiguracja powiadamiania Mail" +msgstr "Uruchom Konfigurację Uwierzytelniania" #: ../polkit/org.mageia.drakauth.policy.in.h:2 msgid "Authentication is required to run Mageia Authentication Configuration" -msgstr "" +msgstr "Konfiguracja Uwierzytelniania - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakboot.policy.in.h:1 -#, fuzzy msgid "Run Mageia Boot Configuration" -msgstr "Konfiguracja uruchamiania" +msgstr "Konfiguracja sposobu uruchamiania" #: ../polkit/org.mageia.drakboot.policy.in.h:2 msgid "Authentication is required to run Mageia Boot Configuration" -msgstr "" +msgstr "Konfiguracja sposobu uruchamiania - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakclock.policy.in.h:1 -#, fuzzy msgid "Run Mageia Date and Time Configuration" -msgstr "Konfiguracja powiadamiania Mail" +msgstr "Zarządzanie datą i czasem" #: ../polkit/org.mageia.drakclock.policy.in.h:2 msgid "Authentication is required to run Mageia Date and Time Configuration" -msgstr "" +msgstr "Zarządzanie datą i czasem - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakdisk.policy.in.h:1 msgid "Run Mageia Disk Layout Editor" -msgstr "" +msgstr "Zarządzanie partycjami dysku" #: ../polkit/org.mageia.drakdisk.policy.in.h:2 msgid "Authentication is required to run Mageia Disk Layout Editor" -msgstr "" +msgstr "Zarządzanie partycjami dysku - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakdm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Login Manager Configuration" -msgstr "Konfiguracja języka i kraju" +msgstr "Menadżer Logowania" #: ../polkit/org.mageia.drakdm.policy.in.h:2 msgid "Authentication is required to run Mageia Login Manager Configuration" -msgstr "" +msgstr "Menadżer Logowania - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakfont.policy.in.h:1 -#, fuzzy msgid "Run Mageia Font Configuration" -msgstr "Konfiguracja języka i kraju" +msgstr "Zarządzanie czcionkami" #: ../polkit/org.mageia.drakfont.policy.in.h:2 msgid "Authentication is required to run Mageia Font Configuration" -msgstr "" +msgstr "Zarządzanie czcionkami - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakhardware.policy.in.h:1 -#, fuzzy msgid "Run Mageia Hardware Configuration" -msgstr "Konfiguracja serwera graficznego" +msgstr "Konfiguracja Sprzętu" #: ../polkit/org.mageia.drakhardware.policy.in.h:2 msgid "Authentication is required to run Mageia Hardware Configuration" -msgstr "" +msgstr "Konfiguracja Sprzętu - wymagane uwierzytelnianie" #: ../polkit/org.mageia.draklog.policy.in.h:1 msgid "Run Mageia Log Viewer" -msgstr "" +msgstr "Przeglądanie Logów" #: ../polkit/org.mageia.draklog.policy.in.h:2 msgid "Authentication is required to run Mageia Log Viewer" -msgstr "" +msgstr "Przeglądanie Logów - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakperm.policy.in.h:1 -#, fuzzy msgid "Run Mageia Security Permissions Configuration" -msgstr "Konfiguracja serwera graficznego" +msgstr "Konfiguracja zabezpieczeń" #: ../polkit/org.mageia.drakperm.policy.in.h:2 msgid "" "Authentication is required to run Mageia Security Permissions Configuration" -msgstr "" +msgstr "Konfiguracja zabezpieczeń - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakscanner.policy.in.h:1 -#, fuzzy msgid "Run Mageia Scanner Configuration" -msgstr "Konfiguracja serwera graficznego" +msgstr "Uruchom Konfigurację Skanera" #: ../polkit/org.mageia.drakscanner.policy.in.h:2 msgid "Authentication is required to run Mageia Scanner Configuration" -msgstr "" +msgstr "Konfiguracja Skanera - wymagane uwierzytelnianie" #: ../polkit/org.mageia.draksec.policy.in.h:1 -#, fuzzy msgid "Run Mageia Application Security Configuration" -msgstr "Konfiguracja powiadamiania Mail" +msgstr "Konfiguracja Zabezpieczeń" #: ../polkit/org.mageia.draksec.policy.in.h:2 msgid "" "Authentication is required to run Mageia Application Security Configuration" -msgstr "" +msgstr "Konfiguracja Zabezpieczeń - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakups.policy.in.h:1 -#, fuzzy msgid "Run Mageia UPS Configuration" -msgstr "Konfiguracja UPS" +msgstr "Uruchom Konfigurację UPS" #: ../polkit/org.mageia.drakups.policy.in.h:2 msgid "Authentication is required to run Mageia UPS Configuration" -msgstr "" +msgstr "Konfiguracja UPS - wymagane uwierzytelnianie" #: ../polkit/org.mageia.drakxservices.policy.in.h:1 -#, fuzzy msgid "Run Mageia Service Configuration" -msgstr "Konfiguracja serwera graficznego" +msgstr "Konfiguracja Usług" #: ../polkit/org.mageia.drakxservices.policy.in.h:2 msgid "Authentication is required to run Mageia Service Configuration" -msgstr "" +msgstr "Konfiguracja Usług - wymagane uwierzytelnianie" #~ msgid "Verbose" #~ msgstr "Tryb opisowy" -- cgit v1.2.1 From 6653fa04aa03a6676eeed719b27a7a21aaa031c9 Mon Sep 17 00:00:00 2001 From: filip Date: Thu, 19 Dec 2013 19:49:35 +0100 Subject: Slovenian translation updated --- perl-install/install/help/po/sl.po | 43 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/perl-install/install/help/po/sl.po b/perl-install/install/help/po/sl.po index 7398b7329..ed41d7c41 100644 --- a/perl-install/install/help/po/sl.po +++ b/perl-install/install/help/po/sl.po @@ -15,6 +15,7 @@ msgstr "" "PO-Revision-Date: 2009-10-03 17:02+0200\n" "Last-Translator: Jure Repinc \n" "Language-Team: Slovenian \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,7 +24,7 @@ msgstr "" "n%100==4 ? 2 : 3);\n" #: ../help.pm:14 -#, fuzzy, c-format +#, c-format msgid "" "Before continuing, you should carefully read the terms of the license. It\n" "covers the entire Mageia distribution. If you agree with all the\n" @@ -198,7 +199,7 @@ msgstr "" "»drugi najnižji SCSI ID« itd." #: ../help.pm:88 -#, fuzzy, c-format +#, c-format msgid "" "The Mageia installation is distributed on several CD-ROMs. If a\n" "selected package is located on another CD-ROM, DrakX will eject the current\n" @@ -206,7 +207,7 @@ msgid "" "CD at hand, just click on \"%s\", the corresponding packages will not be\n" "installed." msgstr "" -"Namestitev za Mageia je shranjena na več nosilcih.\n" +"Namestitev za distribucijo Mageia je shranjena na več nosilcih.\n" "Če je izbrani paket shranjen na drugem nosilcu, bo DrakX izvrgel\n" "trenutnega in vas pozval, da v pogon vstavite pravi nosilec.\n" "Če pravega nosilca nimate, kliknite »%s« in paketi z njega ne\n" @@ -271,7 +272,7 @@ msgid "" "megabytes." msgstr "" "Sedaj je čas za izbiro programov, ki jih želite namestiti na sistem.\n" -"Za Mageia je dostopnih na tisoče različnih programskih paketov.\n" +"Za distribucijo Mageia je dostopnih na tisoče različnih programskih paketov.\n" "Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n" "vsebinsko povezanih paketov.\n" "\n" @@ -345,7 +346,7 @@ msgid "Truly minimal install" msgstr "Zares minimalna namestitev" #: ../help.pm:152 -#, fuzzy, c-format +#, c-format msgid "" "If you choose to install packages individually, the installer will present\n" "a tree containing all packages classified by groups and subgroups. While\n" @@ -394,7 +395,7 @@ msgstr "" "boste morali namestitev takšnega paketa na izrecno vprašanje\n" "potrditi. Mageia namreč kot privzeto vključi vse\n" " nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n" -"te različice Mageiaa ni bilo znanih težav v zvezi z varnostjo,\n" +"te različice Mageia ni bilo znanih težav v zvezi z varnostjo,\n" "je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n" "določeno storitev ne veste, kaj je njena naloga, kliknite »%s« S klikom\n" "na »%s«bodo nameščene naštete storitve, sistem pa jih bo samodejno\n" @@ -525,7 +526,7 @@ msgstr "" "vašim potrebam." #: ../help.pm:234 -#, fuzzy, c-format +#, c-format msgid "" "X (for X Window System) is the heart of the GNU/Linux graphical interface\n" "on which all the graphical environments (KDE, GNOME, AfterStep,\n" @@ -584,7 +585,7 @@ msgid "" "not successful in getting the display configured." msgstr "" "X (okenski sistem X) je srce grafičnega vmesnika za GNU/Linux\n" -"na katerega se zanašajo vsa v Mageia vključena grafična\n" +"na katerega se zanašajo vsa v distribucijo Mageia vključena grafična\n" "okolja. (KDE, GNOME, AfterStep, WindowMaker ...)\n" "\n" "Prikazal se vam bo seznam različnih vrednosti, ki jih lahko spreminjate,\n" @@ -696,7 +697,7 @@ msgstr "" "ali če vam ni uspelo nastaviti zaslona, označite »%s«." #: ../help.pm:319 -#, fuzzy, c-format +#, c-format msgid "" "You now need to decide where you want to install the Mageia\n" "operating system on your hard disk drive. If your hard disk drive is empty or if an\n" @@ -928,7 +929,7 @@ msgid "Save packages selection" msgstr "Shrani izbor paketov" #: ../help.pm:408 -#, fuzzy, c-format +#, c-format msgid "" "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n" "reformat some of them and erase any data they contain. To do so, please\n" @@ -972,7 +973,7 @@ msgstr "" "preveri poškodovane bloke." #: ../help.pm:437 -#, fuzzy, c-format +#, c-format msgid "" "By the time you install Mageia, it's likely that some packages will\n" "have been updated since the initial release. Bugs may have been fixed,\n" @@ -987,7 +988,7 @@ msgid "" "the selected package(s), or \"%s\" to abort." msgstr "" "Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n" -"Mageia na svoj računalnik, nekateri paketi popravljeni\n" +"distribucijo Mageia na svoj računalnik, nekateri paketi popravljeni\n" "ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n" "Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n" "internetno povezavo, označite »%s«, če pa želite namestiti\n" @@ -999,7 +1000,7 @@ msgstr "" "Če tega ne želite, pritisnite »%s«." #: ../help.pm:450 -#, fuzzy, c-format +#, c-format msgid "" "At this point, DrakX will allow you to choose the security level you desire\n" "for your machine. As a rule of thumb, the security level should be set\n" @@ -1033,7 +1034,7 @@ msgid "Security Administrator" msgstr "Upravitelj varnostnih nastavitev" #: ../help.pm:464 -#, fuzzy, c-format +#, c-format msgid "" "At this point, you need to choose which partition(s) will be used for the\n" "installation of your Mageia system. If partitions have already been\n" @@ -1170,7 +1171,7 @@ msgstr "" "Vse nadaljnje informacije o datotečnih sistemih boste našli v\n" "dokumentaciji.\n" "\n" -"Če Mageia nameščate na PPC računalnik, morate ustvariti\n" +"Če distribucijo Mageia nameščate na PPC računalnik, morate ustvariti\n" "zagonski »bootstrap« razdelek z velikostjo najmanj 1MB, ki ga\n" "uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n" "povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n" @@ -1212,7 +1213,7 @@ msgid "Toggle between normal/expert mode" msgstr "Preklopi med normalnim in izvedenskim načinom" #: ../help.pm:536 -#, fuzzy, c-format +#, c-format msgid "" "More than one Microsoft partition has been detected on your hard disk drive.\n" "Please choose the one which you want to resize in order to install your new\n" @@ -1287,7 +1288,7 @@ msgstr "" "kliknite »%s« za prikaz celotnega seznama držav." #: ../help.pm:572 -#, fuzzy, c-format +#, c-format msgid "" "This step is activated only if an existing GNU/Linux partition has been\n" "found on your machine.\n" @@ -1367,7 +1368,7 @@ msgstr "" "preklapljanje med latiničnim in ne-latiničnim razporedom tipkovnice." #: ../help.pm:612 -#, fuzzy, c-format +#, c-format msgid "" "The first step is to choose your preferred language.\n" "\n" @@ -1584,7 +1585,7 @@ msgstr "" "To možnost izberite samo, če zares veste, kaj delate. " #: ../help.pm:745 -#, fuzzy, c-format +#, c-format msgid "" "Now, it's time to select a printing system for your computer. Other\n" "operating systems may offer you one, but Mageia offers two. Each of\n" @@ -1841,7 +1842,7 @@ msgid "Graphical Interface" msgstr "Grafična kartica" #: ../help.pm:861 -#, fuzzy, c-format +#, c-format msgid "" "Choose the hard disk drive you want to erase in order to install your new\n" "Mageia partition. Be careful, all data on this drive will be lost\n" @@ -1849,7 +1850,7 @@ msgid "" msgstr "" "Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za " "razdelek\n" -"za Mageia.\n" +"za distribucijo Mageia.\n" "Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n" "obnoviti!" -- cgit v1.2.1 From 088e353e011a9b1f30e5d78aeafba3ec1e51854d Mon Sep 17 00:00:00 2001 From: filip Date: Thu, 19 Dec 2013 21:28:11 +0100 Subject: Slovenian translation updated --- perl-install/share/po/sl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po index d2ef5dd71..dfed6fe01 100644 --- a/perl-install/share/po/sl.po +++ b/perl-install/share/po/sl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: drakx_share\n" "POT-Creation-Date: 2013-11-30 19:21+0100\n" -"PO-Revision-Date: 2013-11-30 20:23+0100\n" +"PO-Revision-Date: 2013-12-19 20:23+0100\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian , Translation list \n" @@ -1198,7 +1198,7 @@ msgid "" "points, select \"New\"." msgstr "" "S pomočjo protokola WebDAV lahko mapo z omrežnega strežnika priklopite\n" -"lokalno in jo obravnavate kot lokalno mapo (mrežni strežnik mora biti\n" +"krajevno in jo obravnavate kot krajevno mapo (mrežni strežnik mora biti\n" "nastavljen kot WebDAV strežnik). Za dodajanje WebDAV priklopnih točk, " "izberite »Dodaj«." @@ -5009,7 +5009,7 @@ msgstr "" "posledično izgubo), ki izhaja iz posesti in uporabe Programske opreme,\n" "ali izhajajo iz prenašanja Programske opreme iz ene od spletnih strani \n" "Mageia za prenos, ki so prepovedana ali omejena v nekaterih državah z\n" -"njihovo lokalno zakonodajo.\n" +"njihovo krajevno zakonodajo.\n" "To omejena odgovornost se nanaša, vendar ni omejena na, močne\n" "kriptografske komponente, ki so vključene v Programsko opremo.\n" "Nekatere zakonodaje ne dovoljujejo izključitve ali omejitve obveznosti\n" @@ -6602,7 +6602,7 @@ msgid "" "The rusers protocol allows users on a network to identify who is\n" "logged in on other responding machines." msgstr "" -"Protokol rusers omogoča uporabnikom v lokalni mreži\n" +"Protokol rusers omogoča uporabnikom v krajevni mreži\n" "identifikacijo prijavljenih uporabnikov na drugih računalnikih." #: services.pm:109 -- cgit v1.2.1 From 5c5fd3fcb1c2ca689f62f7b29f376bc56feb6d64 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 11:42:07 +0100 Subject: fix a crash (mga#12057) --- perl-install/NEWS | 3 +++ perl-install/standalone/drakfont | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index e1e9150eb..2c18a2f66 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakfont: + o fix a crash (mga#12057) + Version 16.16 - 16 December 2013 - fix a drakx crash (mga#6031) diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index c67041263..68e4c67eb 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -633,7 +633,7 @@ sub advanced_install() { $list->get_selection->set_mode('browse'); $list->set_rules_hint(1); $model->signal_connect("row-inserted" => sub { $button and $button->set_sensitive(1) }); - $model->signal_connect("row-deleted" => sub { $button and $button->set_sensitive($model->get_iter_first) }); + $model->signal_connect("row-deleted" => sub { $button and $button->set_sensitive($model->get_iter_first || 0) }); dialog(N("Import fonts"), [ -- cgit v1.2.1 From 5a773fbf89098e38bd0f6c86b93e72d1000808c9 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 14:45:29 +0100 Subject: drakx-in-chroot changes concerns stage2 not drakxtools --- perl-install/NEWS | 2 -- perl-install/install/NEWS | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 2c18a2f66..f4dda4b00 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -98,8 +98,6 @@ Version 16.0 - 23 November 2013 fix ids to be numeric - drakxservices: o simplify: just use tooltips for service descriptions" -- drakx-in-chroot: - o add --depth in order to force 16bit colors mode - drakclock: o assume chrony rather than ntp when neither is installed - draksec: diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9443e0a4c..a1a40446d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -57,6 +57,8 @@ Version 16.0 - 23 November 2013 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 -- cgit v1.2.1 From 64d1f0f2e257e7fbf701de7de40ea6240c43d290 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 14:46:08 +0100 Subject: advise to install xephyr if missing --- perl-install/install/NEWS | 3 +++ tools/drakx-in-chroot | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a1a40446d..8744fb7df 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- drakx-in-chroot: + o advise to install xephyr if missing + Version 16.14 - 10 December 2013 - Mageia 4 beta 2 left background diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 0992b49c2..af1e51c1c 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -131,7 +131,7 @@ eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/etc/resolv.conf") }; } my $Xnest_pid; -my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest'; +my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not find! Please install x11-server-xephyr!\n"; if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && $Xnest_bin && join('', @ARGV) !~ /--text/) { my $DISPLAY = ':8'; $Xnest_pid = fork(); -- cgit v1.2.1 From 4538fce2c82a8d500f907709cbd68669ba446be6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 16:12:51 +0100 Subject: kill unused function --- perl-install/install/media.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index ef2ade7fe..5857710a8 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -42,11 +42,6 @@ use urpm::media; our $postinstall_rpms = ''; my %mounted_media; -sub _free_medium_id { - my ($media) = @_; - int(@$media); -} - sub allMediums { my ($packages) = @_; -- cgit v1.2.1 From b4ce4dc30caf0106ba74025e4fccc1902d73860b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 16:14:56 +0100 Subject: hint that nonfree is needed if a CPU needs a microcode --- perl-install/install/NEWS | 2 ++ perl-install/install/any.pm | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8744fb7df..88532bfbd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- media step: + o hint that nonfree is needed if a CPU needs a microcode - drakx-in-chroot: o advise to install xephyr if missing diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 217080202..9bad240c2 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -333,7 +333,11 @@ sub is_firmware_needed_ { require pkgs; my @xpkgs = pkgs::detect_graphical_drivers($o->do_pkgs); log::l("the following nonfree firmware(s) are needed for X.org: " . join(', ', @xpkgs)) if @xpkgs; - @need || @xpkgs; + + my $need_microcode = detect_devices::hasCPUMicrocode(); + log::l("nonfree firmware is needed for the CPU (microcode)") if $need_microcode; + + @need || @xpkgs || $need_microcode; } sub is_firmware_needed { -- cgit v1.2.1 From 2034e092be5c8baa072bc34ee7d34c8df7de989b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 17:00:44 +0100 Subject: fix pausing installing while displaying release notes (reverting commit 3d93ee6ae8a7715327ba89f3250f49c81ca47c7d) --- perl-install/any.pm | 2 +- perl-install/install/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 27b505f82..3e90bc32f 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1066,7 +1066,7 @@ sub get_release_notes { sub run_display_release_notes { my ($release_notes) = @_; output('/tmp/release_notes.html', $release_notes); - system('/usr/bin/display_release_notes.pl'); + run_program::raw({ detach => 1 }, '/usr/bin/display_release_notes.pl'); } sub acceptLicense { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 88532bfbd..a24ab411a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,7 @@ - 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 -- cgit v1.2.1 From 19a11905a998a1e62fb8f32aeb749f1b5a9bafd6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 17:47:45 +0100 Subject: use mutter instead of matchbox in order to try to workaround diskdrake issues (mga#11790, mga#11989, ...) as a side effect, stage2 shrinks by 3Mb... --- perl-install/install/NEWS | 3 +++ perl-install/install/share/list.xml | 7 +------ perl-install/install/steps_gtk.pm | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a24ab411a..a0aea90d9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -4,6 +4,9 @@ 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#11989, ...) + as a side effect, stage2 shrinks by 3Mb... Version 16.14 - 10 December 2013 diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 094f59ce7..1ca4f80cf 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -240,8 +240,7 @@ /sbin/mount.ntfs-3g /sbin/blkid - /usr/bin/drakx-matchbox-window-manager - /usr/share/matchbox/mbnoapp.xpm + /usr/bin/mutter /usr/share/icons/gnome/scalable/status/dialog-warning-symbolic.svg @@ -298,10 +297,6 @@ - - - /usr/share/themes/Ia Ora*/matchbox/* - /usr/share/themes/oxygen-gtk* /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 166bb7770..caeaf997c 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -46,7 +46,7 @@ sub new($$) { run_program::run('xset', 'm', '1/8', '1'); } any::disable_x_screensaver(); - run_program::raw({ detach => 1 }, 'drakx-matchbox-window-manager'); + run_program::raw({ detach => 1 }, 'mutter'); install::gtk::init_gtk($o); install::gtk::init_sizes($o); install::gtk::install_theme($o); -- cgit v1.2.1 From 9540227d98c68c32ad4b1816f95a8e8628f8e692 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 17:48:53 +0100 Subject: 16.17 --- perl-install/Makefile.config | 2 +- perl-install/NEWS | 2 ++ perl-install/install/NEWS | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index f579cf0e1..308d6ad27 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=16.16 +VERSION:=16.17 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index f4dda4b00..57c20609d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +Version 16.17 - 20 December 2013 + - drakfont: o fix a crash (mga#12057) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a0aea90d9..0bd7619ae 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +Version 16.17 - 20 December 2013 + - media step: o hint that nonfree is needed if a CPU needs a microcode - install: -- cgit v1.2.1 From 2058d0ddaa491d1601c61c1a2829cf70e4aa7f5f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 18:04:38 +0100 Subject: fix bug ID --- perl-install/install/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 0bd7619ae..9896ad422 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -7,7 +7,7 @@ Version 16.17 - 20 December 2013 - 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#11989, ...) + diskdrake issues (mga#11790, mga#11988, ...) as a side effect, stage2 shrinks by 3Mb... Version 16.14 - 10 December 2013 -- cgit v1.2.1 From 9a6f9d11dec579bd605f5f167dbb6b2722c5ccf6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 23:14:42 +0100 Subject: use expanders for clarity --- perl-install/NEWS | 3 +++ perl-install/standalone/draksec | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 57c20609d..fee6909ff 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- draksec: + o use expanders for clarity + Version 16.17 - 20 December 2013 - drakfont: diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index cda3a8705..1626e7d74 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -202,11 +202,10 @@ gtkpack_($vbox, ])), 1, gtkshow(create_scrolled_window( gtknew('VBox', children => [ - 1, create_packtable( - $common_opts, map { my ($title, $progs) = @$_; - ([ gtknew('Title2', label => $title), '' ], + (0, gtknew('Expander', use_markup => 1, text => mygtk3::title1_to_markup($title), child => create_packtable( + $common_opts, map { [ gtkshow(gtknew('Label_Left', line_wrap => 1, text => $descr{$_} || $_)), @@ -218,7 +217,7 @@ gtkpack_($vbox, ) ]; } split(' ', $progs) - ); + ))); } ( [ N("Software Management"), 'drakrpm drakrpm-update drakrpm-editmedia' ], [ N("Hardware"), 'drak3d drakx11 drakmouse drakkeyboard drakups' ], @@ -226,7 +225,6 @@ gtkpack_($vbox, [ N("System"), 'drakauth drakfont draklog drakxservices drakuser drakclock' ], [ N("Boot"), 'drakboot' ], ) - ) ]))), 0, create_okcancel(my $oc = -- cgit v1.2.1 From f76dc0931e47338aa9c7db257d28e5015d8a2f47 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 20 Dec 2013 23:15:56 +0100 Subject: perl_checker cleanups --- perl-install/standalone/draksec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 1626e7d74..7a265194a 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -117,7 +117,7 @@ my %auth = ( ); my $polkit_rules_file = "/etc/polkit-1/rules.d/51-draksec.rules"; -my %overrides = map { if ( /case '([^']+)': return polkit\.Result\.(YES|AUTH_ADMIN_KEEP|AUTH_SELF_KEEP)/ ) { ($1, $2) } } cat_($polkit_rules_file); +my %overrides = map { if (/case '([^']+)': return polkit\.Result\.(YES|AUTH_ADMIN_KEEP|AUTH_SELF_KEEP)/) { ($1, $2) } } cat_($polkit_rules_file); sub default_auth_value { @@ -145,8 +145,8 @@ sub set_auth_value { sub write_rules() { my $contents = ''; keys %overrides; - while(my($k, $v) = each %overrides) { - $contents .= "case '$k': return polkit.Result.$v;\n" if ($k && $v); + while (my ($k, $v) = each %overrides) { + $contents .= "case '$k': return polkit.Result.$v;\n" if $k && $v; } if ($contents) { -- cgit v1.2.1