diff -Nru file-roller-2.32.1/aclocal.m4 file-roller-2.32.2/aclocal.m4 --- file-roller-2.32.1/aclocal.m4 2010-11-15 14:45:35.000000000 -0500 +++ file-roller-2.32.2/aclocal.m4 2011-04-26 10:38:44.000000000 -0400 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -[m4_warning([this file was generated for autoconf 2.67. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -346,7 +346,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. + dnl in configure.in. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -475,7 +475,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_ac,[],[ +ifdef(glib_configure_in,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -756,7 +756,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be executed at the very end +dnl The following CONFIG_COMMANDS should be exetuted at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -8765,9 +8765,8 @@ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8785,21 +8784,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ(2.50) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE([nls], + AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -8827,10 +8825,7 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -8843,6 +8838,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -8851,31 +8847,34 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) + m4_ifval([$2], [$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8917,17 +8916,16 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + ifelse([$4], , [AC_MSG_ERROR(dnl [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -8935,24 +8933,25 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])dnl - ]) +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])dnl - ]) +To get pkg-config, see .])], + [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + ifelse([$3], , :, [$3]) fi[]dnl ])# PKG_CHECK_MODULES diff -Nru file-roller-2.32.1/ChangeLog file-roller-2.32.2/ChangeLog --- file-roller-2.32.1/ChangeLog 2010-11-15 14:55:08.000000000 -0500 +++ file-roller-2.32.2/ChangeLog 2011-04-26 10:43:07.000000000 -0400 @@ -1,13 +1,85 @@ -commit 35f359738c14d235f0a9442a23787ca0625c4b14 +commit 49f7302c1e9031fe6fd955a2bcbcf82e3bad5f72 Author: Paolo Bacchilega -Date: 2010-11-15 +Date: 2011-04-26 + + updated for version 2.32.2 + +M NEWS +M configure.ac + +commit 9364410cfcda68d4850a2fee504091da31dcc7a2 +Author: Paolo Bacchilega +Date: 2011-04-26 + + can't open rar files with password protected file data and headers + + [bug #646562] + +M src/fr-command-rar.c + +commit 76279aa55946cb5ed73db6149f83590e53add488 +Author: Lucian Adrian Grijincu +Date: 2011-03-14 + + Updated Romanian translation + +M po/ro.po + +commit 4b83cb95841b6922b79eca117192bc3621b68141 +Author: Rudolfs Mazurs +Date: 2011-03-08 + + Updated Latvian translation. + +M po/lv.po + +commit dd2801568befd96240d47d5f0abb49cc46e9c8d0 +Author: Paolo Bacchilega +Date: 2011-03-01 + + Fixed error when a filename contains the % sign + + No need to convert the file list in fr_archive_add + + [bug #638868] + +M src/fr-archive.c + +commit 6f973c39b604080d2dbc296baab4a1a1fb4384a7 +Author: Paolo Bacchilega +Date: 2011-03-01 + + removed unused variables + +M src/fr-command-lrzip.c +M src/gtk-utils.c + +commit 1191d70711189db3b521cc7c53c8e9eb39577893 +Author: Xandru Armesto +Date: 2011-02-15 + + Updated Asturia translation + +M po/ast.po + +commit 27c413da270bcc099071978a163408cf9f5002a3 +Author: Christian Kirbach +Date: 2010-12-29 + + [l10n] Updated German translation + +M po/de.po + +commit 9e7e6d102490b927d958701e30b4d8e92fe882c9 +Author: Paolo Bacchilega +Date: 2010-11-15 updated for version 2.32.1 M NEWS M configure.ac -commit fa807cc2ae120f81fff68c22c51f25ccb9fcf7b4 +commit b2e1d8d500ce8eb8412b738b0f9221b83690ec99 Author: Paolo Bacchilega Date: 2010-11-15 diff -Nru file-roller-2.32.1/config.guess file-roller-2.32.2/config.guess --- file-roller-2.32.1/config.guess 2010-09-27 16:04:52.000000000 -0400 +++ file-roller-2.32.2/config.guess 2011-04-26 06:25:30.000000000 -0400 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,9 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -334,9 +333,6 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build SUN_ARCH="i386" @@ -811,12 +807,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:*) + *:Interix*:[3456]*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - authenticamd | genuineintel | EM64T) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -858,20 +854,6 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -894,17 +876,6 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -930,18 +901,39 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,11 +942,8 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -977,6 +966,58 @@ xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1206,16 +1247,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} diff -Nru file-roller-2.32.1/config.sub file-roller-2.32.2/config.sub --- file-roller-2.32.1/config.sub 2010-09-27 16:04:52.000000000 -0400 +++ file-roller-2.32.2/config.sub 2011-04-26 06:25:30.000000000 -0400 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,16 +32,13 @@ # Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -75,9 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -153,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -288,7 +284,6 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -296,14 +291,13 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ - | ubicom32 \ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -346,7 +340,7 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -374,17 +368,15 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ - | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ @@ -734,9 +726,6 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) - basic_machine=microblaze-xilinx - ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1087,11 +1076,6 @@ basic_machine=tic6x-unknown os=-coff ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) basic_machine=tile-unknown os=-linux-gnu @@ -1263,9 +1247,6 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1287,8 +1268,8 @@ # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1309,7 +1290,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1442,8 +1423,6 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; -none) ;; *) diff -Nru file-roller-2.32.1/configure file-roller-2.32.2/configure --- file-roller-2.32.1/configure 2010-11-15 14:45:38.000000000 -0500 +++ file-roller-2.32.2/configure 2011-04-26 10:38:46.000000000 -0400 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for file-roller 2.32.1. +# Generated by GNU Autoconf 2.65 for file-roller 2.32.2. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -320,7 +320,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -360,19 +360,19 @@ fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -683,7 +683,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='file-roller' PACKAGE_TARNAME='file-roller' -PACKAGE_VERSION='2.32.1' -PACKAGE_STRING='file-roller 2.32.1' +PACKAGE_VERSION='2.32.2' +PACKAGE_STRING='file-roller 2.32.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller' PACKAGE_URL='' @@ -817,8 +817,6 @@ RUN_IN_PLACE_TRUE GTK_LIBS GTK_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PKG_CONFIG NAUTILUS_REQUIRED GTK_REQUIRED @@ -969,8 +967,6 @@ CPPFLAGS CPP PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR GTK_CFLAGS GTK_LIBS FR_CFLAGS @@ -1037,9 +1033,8 @@ fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1084,7 +1079,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1110,7 +1105,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1314,7 +1309,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1330,7 +1325,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1360,8 +1355,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) @@ -1369,7 +1364,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1387,13 +1382,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1416,7 +1411,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1430,8 +1425,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1446,9 +1441,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1487,11 +1482,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1517,7 +1512,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file-roller 2.32.1 to adapt to many kinds of systems. +\`configure' configures file-roller 2.32.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1526,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1587,7 +1582,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file-roller 2.32.1:";; + short | recursive ) echo "Configuration of file-roller 2.32.2:";; esac cat <<\_ACEOF @@ -1640,10 +1635,6 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config FR_CFLAGS C compiler flags for FR, overriding pkg-config @@ -1715,10 +1706,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file-roller configure 2.32.1 -generated by GNU Autoconf 2.67 +file-roller configure 2.32.2 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1822,7 +1813,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1865,7 +1856,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1931,7 +1922,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1998,10 +1989,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2037,7 +2028,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2060,15 +2051,17 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------------------------------------- ## +( cat <<\_ASBOX +## -------------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller ## -## -------------------------------------------------------------------------- ##" +## -------------------------------------------------------------------------- ## +_ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2084,8 +2077,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file-roller $as_me 2.32.1, which was -generated by GNU Autoconf 2.67. Invocation command line was +It was created by file-roller $as_me 2.32.2, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2195,9 +2188,11 @@ { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2231,9 +2226,11 @@ ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2246,9 +2243,11 @@ echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2262,9 +2261,11 @@ fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2319,12 +2320,7 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2339,11 +2335,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } + . "$ac_site_file" fi done @@ -2419,7 +2411,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2436,22 +2428,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2567,11 +2553,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2593,7 +2579,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + as_fn_error "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2603,7 +2589,7 @@ # Ok. : else - as_fn_error $? "newly created file is older than distributed files! + as_fn_error "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2841,7 +2827,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2849,7 +2835,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2883,7 +2869,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2899,7 +2885,7 @@ # Define the identity of the package. PACKAGE='file-roller' - VERSION='2.32.1' + VERSION='2.32.2' cat >>confdefs.h <<_ACEOF @@ -3267,8 +3253,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3382,8 +3368,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3425,8 +3412,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3483,9 +3470,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -3536,8 +3523,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4004,7 +3991,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -4015,16 +4002,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4049,7 +4036,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -4057,7 +4044,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4130,7 +4117,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -4206,7 +4193,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4272,7 +4259,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4339,7 +4326,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -4455,7 +4442,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -4657,13 +4644,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4660: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4647: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4663: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4650: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4666: output\"" >&5) + (eval echo "\"\$as_me:4653: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5869,7 +5856,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5872 "configure"' > conftest.$ac_ext + echo '#line 5859 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6658,7 +6645,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6674,11 +6661,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -6717,7 +6704,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -6733,18 +6720,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6873,7 +6860,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7364,11 +7352,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7367: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7355: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7371: \$? = $ac_status" >&5 + echo "$as_me:7359: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7703,11 +7691,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7706: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7694: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7710: \$? = $ac_status" >&5 + echo "$as_me:7698: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7808,11 +7796,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7811: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7799: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7815: \$? = $ac_status" >&5 + echo "$as_me:7803: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7863,11 +7851,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7866: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7854: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7870: \$? = $ac_status" >&5 + echo "$as_me:7858: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10247,7 +10235,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10250 "configure" +#line 10238 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10343,7 +10331,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10346 "configure" +#line 10334 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10665,7 +10653,7 @@ if test "${with_gtk+set}" = set; then : withval=$with_gtk; case "$with_gtk" in 2.0|3.0) ;; - *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;; + *) as_fn_error "invalid gtk version specified" "$LINENO" 5 ;; esac else with_gtk=2.0 @@ -10691,10 +10679,6 @@ - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -10807,16 +10791,18 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi + fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 ac_status=$? @@ -10826,13 +10812,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 ac_status=$? @@ -10842,15 +10830,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -10858,14 +10845,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met: + as_fn_error "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met: $GTK_PKG_ERRORS @@ -10874,13 +10861,12 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -10889,13 +10875,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details." "$LINENO" 5; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -10906,7 +10892,7 @@ enableval=$enable_run_in_place; case "${enableval}" in yes) enable_run_in_place=yes ;; no) enable_run_in_place=no ;; - *) as_fn_error $? "bad value ${enableval} for --enable-run-in-place" "$LINENO" 5 ;; + *) as_fn_error "bad value ${enableval} for --enable-run-in-place" "$LINENO" 5 ;; esac else enable_run_in_place=no @@ -10927,10 +10913,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FR" >&5 $as_echo_n "checking for FR... " >&6; } -if test -n "$FR_CFLAGS"; then - pkg_cv_FR_CFLAGS="$FR_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$FR_CFLAGS"; then + pkg_cv_FR_CFLAGS="$FR_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ glib-2.0 >= \$GLIB_REQUIRED \\ gthread-2.0 \\ @@ -10955,13 +10942,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$FR_LIBS"; then - pkg_cv_FR_LIBS="$FR_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$FR_LIBS"; then + pkg_cv_FR_LIBS="$FR_LIBS" + else + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ glib-2.0 >= \$GLIB_REQUIRED \\ gthread-2.0 \\ @@ -10986,15 +10975,14 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11002,24 +10990,24 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + FR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ glib-2.0 >= $GLIB_REQUIRED \ gthread-2.0 \ gio-unix-2.0 >= $GIO_REQUIRED \ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED" 2>&1` + gconf-2.0 >= $GCONF_REQUIRED"` else - FR_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + FR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ glib-2.0 >= $GLIB_REQUIRED \ gthread-2.0 \ gio-unix-2.0 >= $GIO_REQUIRED \ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED" 2>&1` + gconf-2.0 >= $GCONF_REQUIRED"` fi # Put the nasty error message in config.log where it belongs echo "$FR_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (\ + as_fn_error "Package requirements (\ glib-2.0 >= $GLIB_REQUIRED \ gthread-2.0 \ gio-unix-2.0 >= $GIO_REQUIRED \ @@ -11033,13 +11021,12 @@ Alternatively, you may set the environment variables FR_CFLAGS and FR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 +See the pkg-config man page for more details. +" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -11048,13 +11035,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details." "$LINENO" 5; } else FR_CFLAGS=$pkg_cv_FR_CFLAGS FR_LIBS=$pkg_cv_FR_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + : fi @@ -11899,7 +11886,7 @@ case "$am__api_version" in 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -11916,7 +11903,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -12040,7 +12027,7 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -12322,13 +12309,13 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -12372,13 +12359,13 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 + as_fn_error "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -12391,7 +12378,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -12457,10 +12444,6 @@ - - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -12573,6 +12556,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi + fi gdu_cv_version_required=0.3.2 @@ -12597,7 +12581,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 + as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 fi @@ -12718,7 +12702,7 @@ if test x"$GCONFTOOL" = xno; then - as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 + as_fn_error "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 fi if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then @@ -12757,7 +12741,7 @@ if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -12861,7 +12845,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -12885,23 +12868,23 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. + as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${RUN_IN_PLACE_TRUE}" && test -z "${RUN_IN_PLACE_FALSE}"; then - as_fn_error $? "conditional \"RUN_IN_PLACE\" was never defined. + as_fn_error "conditional \"RUN_IN_PLACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_NAUTILUS_ACTIONS_TRUE}" && test -z "${ENABLE_NAUTILUS_ACTIONS_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_NAUTILUS_ACTIONS\" was never defined. + as_fn_error "conditional \"ENABLE_NAUTILUS_ACTIONS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MKDTEMP_MISSING_TRUE}" && test -z "${MKDTEMP_MISSING_FALSE}"; then - as_fn_error $? "conditional \"MKDTEMP_MISSING\" was never defined. + as_fn_error "conditional \"MKDTEMP_MISSING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -12909,15 +12892,15 @@ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SK\" was never defined. + as_fn_error "conditional \"ENABLE_SK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -13067,19 +13050,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -13275,7 +13258,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -13328,8 +13311,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file-roller $as_me 2.32.1, which was -generated by GNU Autoconf 2.67. Invocation command line was +This file was extended by file-roller $as_me 2.32.2, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13394,11 +13377,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -file-roller config.status 2.32.1 -configured by $0, generated by GNU Autoconf 2.67, +file-roller config.status 2.32.2 +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13416,16 +13399,11 @@ while test $# != 0 do case $1 in - --*=?*) + --*=*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; *) ac_option=$1 ac_optarg=$2 @@ -13447,7 +13425,6 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -13460,7 +13437,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' + as_fn_error "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -13469,7 +13446,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' + -*) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -13810,7 +13787,7 @@ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -13848,7 +13825,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -13865,7 +13842,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -13879,18 +13856,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -13979,28 +13956,20 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -14028,7 +13997,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -14113,7 +14082,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -14126,7 +14095,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -14154,7 +14123,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -14181,7 +14150,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -14318,22 +14287,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -14344,19 +14313,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + || as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -15136,7 +15105,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -15164,7 +15133,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -15185,7 +15154,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru file-roller-2.32.1/configure.ac file-roller-2.32.2/configure.ac --- file-roller-2.32.1/configure.ac 2010-11-15 14:45:26.000000000 -0500 +++ file-roller-2.32.2/configure.ac 2011-04-26 10:35:49.000000000 -0400 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) -AC_INIT(file-roller, 2.32.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller]) +AC_INIT(file-roller, 2.32.2, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller]) AM_INIT_AUTOMAKE([1.9 foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -Nru file-roller-2.32.1/copy-n-paste/Makefile.in file-roller-2.32.2/copy-n-paste/Makefile.in --- file-roller-2.32.1/copy-n-paste/Makefile.in 2010-11-15 14:47:54.000000000 -0500 +++ file-roller-2.32.2/copy-n-paste/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -183,8 +183,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/file-roller.desktop file-roller-2.32.2/data/file-roller.desktop --- file-roller-2.32.1/data/file-roller.desktop 2010-11-15 14:46:06.000000000 -0500 +++ file-roller-2.32.2/data/file-roller.desktop 2011-04-26 10:38:59.000000000 -0400 @@ -99,7 +99,7 @@ Comment[af]=Skep en wysig 'n argief Comment[ar]=أنشئ و عدّل أرشيفا Comment[as]=আৰ্কাইভ নিৰ্মাণ ও পৰিবৰ্তন কৰক -Comment[ast]=Crie y modifique un archivador +Comment[ast]=Crea y modifica un archivador Comment[az]=Arxiv yaradın və açın Comment[be]=Стварыць ці зьмяніць архіў Comment[be@latin]=Stvaraj i madyfikuj archivy @@ -200,4 +200,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.32.1 +X-GNOME-Bugzilla-Version=2.32.2 diff -Nru file-roller-2.32.1/data/file-roller.desktop.in file-roller-2.32.2/data/file-roller.desktop.in --- file-roller-2.32.1/data/file-roller.desktop.in 2010-11-15 14:45:56.000000000 -0500 +++ file-roller-2.32.2/data/file-roller.desktop.in 2011-04-26 10:38:56.000000000 -0400 @@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.32.1 +X-GNOME-Bugzilla-Version=2.32.2 diff -Nru file-roller-2.32.1/data/icons/16x16/actions/Makefile.in file-roller-2.32.2/data/icons/16x16/actions/Makefile.in --- file-roller-2.32.1/data/icons/16x16/actions/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/16x16/actions/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/16x16/apps/Makefile.in file-roller-2.32.2/data/icons/16x16/apps/Makefile.in --- file-roller-2.32.1/data/icons/16x16/apps/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/16x16/apps/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/16x16/Makefile.in file-roller-2.32.2/data/icons/16x16/Makefile.in --- file-roller-2.32.1/data/icons/16x16/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/16x16/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/22x22/apps/Makefile.in file-roller-2.32.2/data/icons/22x22/apps/Makefile.in --- file-roller-2.32.1/data/icons/22x22/apps/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/22x22/apps/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/22x22/Makefile.in file-roller-2.32.2/data/icons/22x22/Makefile.in --- file-roller-2.32.1/data/icons/22x22/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/22x22/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/24x24/actions/Makefile.in file-roller-2.32.2/data/icons/24x24/actions/Makefile.in --- file-roller-2.32.1/data/icons/24x24/actions/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/24x24/actions/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/24x24/apps/Makefile.in file-roller-2.32.2/data/icons/24x24/apps/Makefile.in --- file-roller-2.32.1/data/icons/24x24/apps/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/24x24/apps/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/24x24/Makefile.in file-roller-2.32.2/data/icons/24x24/Makefile.in --- file-roller-2.32.1/data/icons/24x24/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/24x24/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/32x32/apps/Makefile.in file-roller-2.32.2/data/icons/32x32/apps/Makefile.in --- file-roller-2.32.1/data/icons/32x32/apps/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/32x32/apps/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/32x32/Makefile.in file-roller-2.32.2/data/icons/32x32/Makefile.in --- file-roller-2.32.1/data/icons/32x32/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/32x32/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/Makefile.in file-roller-2.32.2/data/icons/Makefile.in --- file-roller-2.32.1/data/icons/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/scalable/apps/Makefile.in file-roller-2.32.2/data/icons/scalable/apps/Makefile.in --- file-roller-2.32.1/data/icons/scalable/apps/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/scalable/apps/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/icons/scalable/Makefile.in file-roller-2.32.2/data/icons/scalable/Makefile.in --- file-roller-2.32.1/data/icons/scalable/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/icons/scalable/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -186,8 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/Makefile.in file-roller-2.32.2/data/Makefile.in --- file-roller-2.32.1/data/Makefile.in 2010-11-15 14:45:40.000000000 -0500 +++ file-roller-2.32.2/data/Makefile.in 2011-04-26 10:38:47.000000000 -0400 @@ -212,8 +212,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/data/ui/Makefile.in file-roller-2.32.2/data/ui/Makefile.in --- file-roller-2.32.1/data/ui/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/data/ui/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/debian/changelog file-roller-2.32.2/debian/changelog --- file-roller-2.32.1/debian/changelog 2011-03-31 09:39:36.000000000 -0400 +++ file-roller-2.32.2/debian/changelog 2011-04-27 09:46:43.000000000 -0400 @@ -1,3 +1,12 @@ +file-roller (2.32.2-0ubuntu0.1) natty-proposed; urgency=low + + * New upstream bugfix version + - Fixes "File-Roller fails to extract password-protected rar-files" + (LP: #732600) + - Fixes error when a filename contains the % sign + + -- Michael Terry Wed, 27 Apr 2011 09:43:47 -0400 + file-roller (2.32.1-0ubuntu4) natty; urgency=low * debian/patches/92_git_special_chars.patch: git commit to and fix and issue diff -Nru file-roller-2.32.1/debian/control file-roller-2.32.2/debian/control --- file-roller-2.32.1/debian/control 2011-03-31 09:39:37.000000000 -0400 +++ file-roller-2.32.2/debian/control 2011-04-27 09:51:35.000000000 -0400 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Clément Stenac -Uploaders: Debian GNOME Maintainers , Josselin Mouette +Uploaders: Debian GNOME Maintainers Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), gnome-pkg-tools (>= 0.12), diff -Nru file-roller-2.32.1/debian/patches/92_git_special_chars.patch file-roller-2.32.2/debian/patches/92_git_special_chars.patch --- file-roller-2.32.1/debian/patches/92_git_special_chars.patch 2011-03-31 09:39:36.000000000 -0400 +++ file-roller-2.32.2/debian/patches/92_git_special_chars.patch 1969-12-31 19:00:00.000000000 -0500 @@ -1,59 +0,0 @@ -From dd2801568befd96240d47d5f0abb49cc46e9c8d0 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Tue, 01 Mar 2011 18:33:18 +0000 -Subject: Fixed error when a filename contains the % sign - -No need to convert the file list in fr_archive_add - -[bug #638868] ---- -diff --git a/src/fr-archive.c b/src/fr-archive.c -index 9ea784a..1006de6 100644 ---- a/src/fr-archive.c -+++ b/src/fr-archive.c -@@ -1448,25 +1448,6 @@ fr_archive_set_add_is_stoppable_func (FrArchive *archive, - } - - --static GList * --convert_to_local_file_list (GList *file_list) --{ -- GList *local_file_list = NULL; -- GList *scan; -- -- for (scan = file_list; scan; scan = scan->next) { -- char *uri = scan->data; -- char *local_filename; -- -- local_filename = g_uri_unescape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH); -- if (local_filename != NULL) -- local_file_list = g_list_prepend (local_file_list, local_filename); -- } -- -- return local_file_list; --} -- -- - static gboolean - save_list_to_temp_file (GList *file_list, - char **list_dir, -@@ -1591,7 +1572,6 @@ fr_archive_add (FrArchive *archive, - - fr_archive_stoppable (archive, fr_archive_add_is_stoppable (archive)); - -- file_list = convert_to_local_file_list (file_list); - tmp_base_dir = g_strdup (base_dir); - - if ((dest_dir != NULL) && (*dest_dir != '\0') && (strcmp (dest_dir, "/") != 0)) { -@@ -1608,10 +1588,9 @@ fr_archive_add (FrArchive *archive, - char *filename = scan->data; - new_file_list = g_list_prepend (new_file_list, g_build_filename (rel_dest_dir, filename, NULL)); - } -- path_list_free (file_list); - } - else -- new_file_list = file_list; -+ new_file_list = path_list_dup (file_list); - - /* if the command cannot update, get the list of files that are - * newer than the ones in the archive. */ diff -Nru file-roller-2.32.1/debian/patches/series file-roller-2.32.2/debian/patches/series --- file-roller-2.32.1/debian/patches/series 2011-03-31 09:39:36.000000000 -0400 +++ file-roller-2.32.2/debian/patches/series 2011-04-27 09:48:17.000000000 -0400 @@ -3,6 +3,5 @@ 20_am-maintainer-mode.patch 90_hyphen_archive_creation.patch 91_zip_command_order.patch -92_git_special_chars.patch 99_ltmain_as-needed.patch diff -Nru file-roller-2.32.1/file-roller.spec file-roller-2.32.2/file-roller.spec --- file-roller-2.32.1/file-roller.spec 2010-11-15 14:45:56.000000000 -0500 +++ file-roller-2.32.2/file-roller.spec 2011-04-26 10:38:56.000000000 -0400 @@ -1,7 +1,7 @@ %define release 6 %define prefix /usr %define name file-roller -%define version 2.32.1 +%define version 2.32.2 Summary: An archive manager for GNOME. Name: %{name} diff -Nru file-roller-2.32.1/help/Makefile.in file-roller-2.32.2/help/Makefile.in --- file-roller-2.32.1/help/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/help/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -171,8 +171,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/Makefile.in file-roller-2.32.2/Makefile.in --- file-roller-2.32.1/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -200,8 +200,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/nautilus/Makefile.in file-roller-2.32.2/nautilus/Makefile.in --- file-roller-2.32.1/nautilus/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/nautilus/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -205,8 +205,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/NEWS file-roller-2.32.2/NEWS --- file-roller-2.32.1/NEWS 2010-11-15 14:51:52.000000000 -0500 +++ file-roller-2.32.2/NEWS 2011-04-26 10:38:31.000000000 -0400 @@ -1,3 +1,19 @@ +version 2.32.2 +-------------- + + Bugs fixed: + + * Can't open rar files with password protected file data and headers. + (#646562) + * Fixed error when a filename contains the % sign. (#638868) + + New or updated application translations: + + * Deutsch (Christian Kirbach) + * Latvian (Rudolfs) + * Romanian (Lucian Adrian Grijincu) + * Asturia (Xandru Armesto) + version 2.32.1 -------------- diff -Nru file-roller-2.32.1/po/ast.po file-roller-2.32.2/po/ast.po --- file-roller-2.32.1/po/ast.po 2010-09-14 07:03:00.000000000 -0400 +++ file-roller-2.32.2/po/ast.po 2011-04-26 10:29:35.000000000 -0400 @@ -2,130 +2,142 @@ # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 # This file is distributed under the same license as the file-roller package. # FIRST AUTHOR , 2008. -# +# Xandru Armesto , 2011. msgid "" msgstr "" "Project-Id-Version: file-roller\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-09 09:05+0100\n" -"PO-Revision-Date: 2009-01-19 22:01+0000\n" -"Last-Translator: Astur \n" -"Language-Team: Asturian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" +"roller&component=general\n" +"POT-Creation-Date: 2010-12-29 21:25+0000\n" +"PO-Revision-Date: 2011-02-15 17:18+0200\n" +"Last-Translator: Xandru Armesto \n" +"Language-Team: Softastur alministradores@softastur.org\n" +"Language: ast\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: Virtaal 0.5.2\n" "X-Launchpad-Export-Date: 2009-02-04 01:52+0000\n" -"X-Generator: Launchpad (build Unknown)\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "El ficheru nun ye un ficheru .desktop válidu" -#: ../copy-n-paste/eggdesktopfile.c:188 +#: ../copy-n-paste/eggdesktopfile.c:190 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Versión '%s' del ficheru desktop non reconocida" -#: ../copy-n-paste/eggdesktopfile.c:958 +#: ../copy-n-paste/eggdesktopfile.c:960 #, c-format msgid "Starting %s" msgstr "Entamando %s" -#: ../copy-n-paste/eggdesktopfile.c:1100 +#: ../copy-n-paste/eggdesktopfile.c:1102 #, c-format msgid "Application does not accept documents on command line" msgstr "L'aplicación nun aceuta documentos na llinia de comandos" -#: ../copy-n-paste/eggdesktopfile.c:1168 +#: ../copy-n-paste/eggdesktopfile.c:1170 #, c-format msgid "Unrecognized launch option: %d" msgstr "Opción de llanzamientu non reconocida: %d" -#: ../copy-n-paste/eggdesktopfile.c:1373 +#: ../copy-n-paste/eggdesktopfile.c:1375 #, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Nun se puen pasar los URIs de documentos a entraes d'escritoriu 'Type=Link'" +msgid "Can't pass documents to this desktop element" +msgstr "Nun pueden pasase documentos a esti elementu del escritoriu" -#: ../copy-n-paste/eggdesktopfile.c:1392 +#: ../copy-n-paste/eggdesktopfile.c:1394 #, c-format msgid "Not a launchable item" msgstr "Nun ye un elementu llanzable" -#: ../copy-n-paste/eggsmclient.c:224 +#: ../copy-n-paste/eggsmclient.c:225 msgid "Disable connection to session manager" msgstr "Desactivar la conexón al xestor de sesiones" -#: ../copy-n-paste/eggsmclient.c:227 +#: ../copy-n-paste/eggsmclient.c:228 msgid "Specify file containing saved configuration" msgstr "Especificar el ficheru que contién la configuración guardada" -#: ../copy-n-paste/eggsmclient.c:227 +#: ../copy-n-paste/eggsmclient.c:228 msgid "FILE" msgstr "FICHERU" -#: ../copy-n-paste/eggsmclient.c:230 +#: ../copy-n-paste/eggsmclient.c:231 msgid "Specify session management ID" msgstr "Especificar ID xestor de sesión" -#: ../copy-n-paste/eggsmclient.c:230 +#: ../copy-n-paste/eggsmclient.c:231 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:244 +#: ../copy-n-paste/eggsmclient.c:252 msgid "Session management options:" msgstr "Opciones de remanamientu de la sesión:" -#: ../copy-n-paste/eggsmclient.c:245 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Show session management options" msgstr "Ver les opciones de remanamientu de la sesión:" +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1974 +#: ../src/fr-window.c:5393 +msgid "Archive Manager" +msgstr "Xestor d'archivadores" + +#: ../data/file-roller.desktop.in.in.h:2 +msgid "Create and modify an archive" +msgstr "Crea y modifica un archivador" + #: ../data/ui/add-options.ui.h:1 msgid "Load Options" msgstr "Cargar opciones" #: ../data/ui/batch-add-files.ui.h:1 ../src/fr-stock.c:42 msgid "C_reate" -msgstr "C_riar" +msgstr "C_rear" #: ../data/ui/batch-add-files.ui.h:2 -msgid "Create Archive" -msgstr "Criar archivador" +msgid "Compress" +msgstr "Comprimir" -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:4617 +#: ../data/ui/batch-add-files.ui.h:3 msgid "Location" msgstr "Llocalización" #. MB means megabytes -#: ../data/ui/batch-add-files.ui.h:5 ../data/ui/new.ui.h:3 +#: ../data/ui/batch-add-files.ui.h:5 ../data/ui/new.ui.h:2 msgid "MB" msgstr "MB" -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:4 -msgid "Split in _volumes of" +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:3 +msgid "Split into _volumes of" msgstr "Partir en _volúmenes de" -#: ../data/ui/batch-add-files.ui.h:7 -msgid "_Archive:" -msgstr "_Archivador:" - -#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:5 +#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:4 #: ../data/ui/password.ui.h:3 msgid "_Encrypt the file list too" msgstr "_Cifrar tamién la llista de ficheros" -#: ../data/ui/batch-add-files.ui.h:9 ../src/fr-window.c:5749 +#: ../data/ui/batch-add-files.ui.h:9 +msgid "_Filename:" +msgstr "_Nome de ficheru:" + +#. Translators: after the colon there is a folder name. +#: ../data/ui/batch-add-files.ui.h:10 ../src/fr-window.c:5815 msgid "_Location:" msgstr "_Llugar:" -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:6 +#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/new.ui.h:5 msgid "_Other Options" msgstr "_Otres opciones" -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/batch-password.ui.h:2 -#: ../data/ui/new.ui.h:7 ../data/ui/password.ui.h:4 +#: ../data/ui/batch-add-files.ui.h:12 ../data/ui/batch-password.ui.h:2 +#: ../data/ui/new.ui.h:6 ../data/ui/password.ui.h:4 msgid "_Password:" msgstr "_Contraseña:" @@ -137,26 +149,22 @@ msgid "Delete" msgstr "Desaniciar" -#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:365 +#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:362 msgid "_All files" msgstr "_Tolos ficheros" -#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:351 +#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:348 msgid "_Files:" msgstr "F_icheros:" -#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:372 +#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:369 msgid "_Selected files" msgstr "Ficheros _seleicionaos" -#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:362 +#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:359 msgid "example: *.txt; *.doc" msgstr "exemplu: *.txt; *.doc" -#: ../data/ui/new.ui.h:1 -msgid "Archive _type:" -msgstr "_Tipu d'archivador:" - #: ../data/ui/open-with.ui.h:1 msgid "A_vailable application:" msgstr "Aplicación _disponible:" @@ -179,9 +187,9 @@ "current archive, and to decrypt files you extract from the current archive. " "When the archive is closed the password will be deleted." msgstr "" -"Nota: la contraseña usaráse pa cifrar los ficheros qu'ameste al " -"archivador autual, y pa descifrar los ficheros qu'estraiga del archivador " -"autual. Cuando se pieslle l'archivador desaniciaráse contraseña." +"Nota: la contraseña va usase pa cifrar los ficheros qu'amiestes al " +"archivador actual, y pa descifrar los ficheros qu'estraigas del archivador " +"actual. Cuando se pieslle l'archivador desaniciaráse contraseña." #: ../data/ui/password.ui.h:2 msgid "Password" @@ -189,102 +197,95 @@ #: ../data/ui/update.ui.h:1 msgid "S_elect the files you want to update:" -msgstr "S_eleicione los ficheros que quier anovar:" +msgstr "S_eleiciona los ficheros que quies anovar:" #. secondary text -#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:182 +#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:177 ../src/dlg-update.c:205 #, c-format msgid "" "The file has been modified with an external application. If you don't update " -"the version in the archive, all of your changes will be lost." +"the file in the archive, all of your changes will be lost." msgid_plural "" -"There are %d files that have been modified with an external application. If " -"you don't update the files in the archive, all of your changes will be lost." +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." msgstr[0] "" -"Hai ún ficheru camudáu con una aplicación esterna. Perderánse tolos cambeos " -"si nun anova la versión nel archivador." +"El ficheru modificóse con una aplicación esterna. Van perdese tolos cambeos " +"si nun anoves la versión nel archivador." msgstr[1] "" -"Hai %d ficheros camudaos con una aplicación esterna. Perderánse tolos " -"cambeos si nun anova la versión nel archivador." +"Modificáronse %d ficheros con una aplicación esterna. Van perdese tolos " +"cambeos si nun anoves la versión nel archivador." #: ../data/ui/update.ui.h:3 msgid "_Update" msgstr "_Anovar" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1958 -#: ../src/fr-window.c:5327 -msgid "Archive Manager" -msgstr "Xestor d'archivadores" - -#: ../data/file-roller.desktop.in.in.h:2 -msgid "Create and modify an archive" -msgstr "Crie y modifique un archivador" - -#: ../nautilus/nautilus-fileroller.c:309 +#: ../nautilus/nautilus-fileroller.c:313 msgid "Extract Here" msgstr "Estrayer Equí" -#: ../nautilus/nautilus-fileroller.c:310 -msgid "Extract the selected archive in the current position" -msgstr "Estrayer l'archivador seleicionáu na posición autual" +#. Translators: the current position is the current folder +#: ../nautilus/nautilus-fileroller.c:315 +msgid "Extract the selected archive to the current position" +msgstr "Estrayer l'archivador esbilláu na posición actual" -#: ../nautilus/nautilus-fileroller.c:327 +#: ../nautilus/nautilus-fileroller.c:332 msgid "Extract To..." msgstr "Estrayer en..." -#: ../nautilus/nautilus-fileroller.c:328 +#: ../nautilus/nautilus-fileroller.c:333 msgid "Extract the selected archive" msgstr "Estrái l'archivador seleicionáu" -#: ../nautilus/nautilus-fileroller.c:347 -msgid "Create Archive..." -msgstr "Criar Archivador..." - -#: ../nautilus/nautilus-fileroller.c:348 -msgid "Create an archive with the selected objects" -msgstr "Criar un archivador colos oxetos seleicionaos" - -#: ../src/actions.c:158 ../src/actions.c:196 ../src/actions.c:231 -#: ../src/dlg-batch-add.c:169 ../src/dlg-batch-add.c:184 -#: ../src/dlg-batch-add.c:213 ../src/dlg-batch-add.c:257 -#: ../src/dlg-batch-add.c:303 ../src/fr-window.c:2897 +#: ../nautilus/nautilus-fileroller.c:352 +msgid "Compress..." +msgstr "Comprimir…" + +#: ../nautilus/nautilus-fileroller.c:353 +msgid "Create a compressed archive with the selected objects" +msgstr "Crear un archivador comprimíu colos oxetos esbillaos" + +#: ../src/actions.c:158 ../src/actions.c:197 ../src/actions.c:233 +#: ../src/dlg-batch-add.c:168 ../src/dlg-batch-add.c:184 +#: ../src/dlg-batch-add.c:213 ../src/dlg-batch-add.c:258 +#: ../src/dlg-batch-add.c:304 ../src/fr-window.c:2925 msgid "Could not create the archive" -msgstr "Nun pudo criase l'archivador" +msgstr "Nun pudo crease l'archivador" -#: ../src/actions.c:159 ../src/dlg-batch-add.c:170 ../src/dlg-batch-add.c:304 +#: ../src/actions.c:160 ../src/dlg-batch-add.c:170 ../src/dlg-batch-add.c:306 msgid "You have to specify an archive name." -msgstr "Tien d'especificar un nome del archivador." +msgstr "Tienes d'especificar un nome del archivador." -#: ../src/actions.c:197 +#: ../src/actions.c:199 msgid "You don't have permission to create an archive in this folder" -msgstr "Nun tien permisos pa criar un archivador nesta carpeta" +msgstr "Nun tienes permisos pa crear un archivador nesta carpeta" -#: ../src/actions.c:232 ../src/fr-archive.c:1142 ../src/fr-window.c:5961 -#: ../src/fr-window.c:6139 +#: ../src/actions.c:235 ../src/dlg-package-installer.c:254 +#: ../src/dlg-package-installer.c:263 ../src/dlg-package-installer.c:291 +#: ../src/fr-archive.c:1146 ../src/fr-window.c:6034 ../src/fr-window.c:6210 msgid "Archive type not supported." msgstr "Triba d'archivador non soportáu." -#: ../src/actions.c:246 +#: ../src/actions.c:249 msgid "Could not delete the old archive." msgstr "Nun pudo desaniciase l'archivador anterior." -#: ../src/actions.c:377 ../src/fr-window.c:5807 +#: ../src/actions.c:383 ../src/fr-window.c:5873 msgid "Open" msgstr "Abrir" -#: ../src/actions.c:388 ../src/dlg-new.c:248 ../src/fr-window.c:5158 +#: ../src/actions.c:394 ../src/dlg-new.c:321 ../src/fr-window.c:5224 msgid "All archives" msgstr "Tolos archivadores" -#: ../src/actions.c:395 ../src/dlg-new.c:255 +#: ../src/actions.c:401 ../src/dlg-new.c:328 msgid "All files" msgstr "Tolos ficheros" -#: ../src/actions.c:774 ../src/fr-window.c:6916 +#: ../src/actions.c:780 ../src/fr-window.c:7056 msgid "Last Output" msgstr "Caberu resultáu" -#: ../src/actions.c:838 +#: ../src/actions.c:844 msgid "" "File Roller 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 " @@ -296,7 +297,7 @@ "Software Foundation; ya seya la versión 2 de la Llicencia, o (a la so " "eleición) cualesquier versión postrera." -#: ../src/actions.c:842 +#: ../src/actions.c:848 msgid "" "File Roller is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -307,7 +308,7 @@ "GARANTÍA; ensin inclusu la garantía implícita de MERCANTILIDÁ o IDONEIDÁ PA " "UN ENVÍS PARTICULAR. Llea la Llicencia Pública Xeneral GNU pa más detáis." -#: ../src/actions.c:846 +#: ../src/actions.c:852 msgid "" "You should have received a copy of the GNU General Public License along with " "File Roller; if not, write to the Free Software Foundation, Inc., 51 " @@ -318,93 +319,95 @@ "Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE. " "UU." -#: ../src/actions.c:856 -msgid "Copyright © 2001-2007 Free Software Foundation, Inc." -msgstr "Copyright © 2001-2007 Free Software Foundation, Inc." +#: ../src/actions.c:862 +msgid "Copyright © 2001–2010 Free Software Foundation, Inc." +msgstr "Copyright © 2001–2010 Free Software Foundation, Inc." -#: ../src/actions.c:857 +#: ../src/actions.c:863 msgid "An archive manager for GNOME." msgstr "Un xestor d'archivadores pa Gnome." -#: ../src/actions.c:860 +#: ../src/actions.c:866 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Astur https://launchpad.net/~malditoastur\n" -" Marcos https://launchpad.net/~marcos.alvarez.costales" +" Iñigo Varela https://launchpad.net/~ivarela" -#: ../src/dlg-add-files.c:94 ../src/dlg-add-folder.c:128 +#: ../src/dlg-add-files.c:96 ../src/dlg-add-folder.c:129 msgid "Could not add the files to the archive" msgstr "Nun pudieron amestase los ficheros al archivador" -#: ../src/dlg-add-files.c:95 ../src/dlg-add-folder.c:129 +#: ../src/dlg-add-files.c:97 ../src/dlg-add-folder.c:130 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "Nun tien los permisos afayaízos pa lleer ficheros de la carpeta «%s»" -#: ../src/dlg-add-files.c:142 ../src/ui.h:48 +#: ../src/dlg-add-files.c:144 ../src/ui.h:49 msgid "Add Files" msgstr "Amestar ficheros" -#: ../src/dlg-add-files.c:156 ../src/dlg-add-folder.c:228 +#. Translators: add a file to the archive only if the disk version is +#. * newer than the archive version. +#: ../src/dlg-add-files.c:160 ../src/dlg-add-folder.c:231 msgid "Add only if _newer" msgstr "Amestar namái si ye más _nuevu" -#: ../src/dlg-add-folder.c:214 +#: ../src/dlg-add-folder.c:217 msgid "Add a Folder" msgstr "Amestar una carpeta" -#: ../src/dlg-add-folder.c:229 +#: ../src/dlg-add-folder.c:232 msgid "_Include subfolders" msgstr "_Incluyir subcarpetes" -#: ../src/dlg-add-folder.c:230 +#: ../src/dlg-add-folder.c:233 msgid "Exclude folders that are symbolic lin_ks" msgstr "Escluyir les carpetes que seyan en_llaces simbólicos" -#: ../src/dlg-add-folder.c:233 ../src/dlg-add-folder.c:239 -#: ../src/dlg-add-folder.c:245 +#: ../src/dlg-add-folder.c:236 ../src/dlg-add-folder.c:242 +#: ../src/dlg-add-folder.c:248 msgid "example: *.o; *.bak" msgstr "exemplu: *.o; *.bak" -#: ../src/dlg-add-folder.c:234 +#: ../src/dlg-add-folder.c:237 msgid "Include _files:" msgstr "Incluyir _ficheros:" -#: ../src/dlg-add-folder.c:240 +#: ../src/dlg-add-folder.c:243 msgid "E_xclude files:" msgstr "E_scluyir ficheros:" -#: ../src/dlg-add-folder.c:246 +#: ../src/dlg-add-folder.c:249 msgid "_Exclude folders:" msgstr "_Escluyir carpetes:" -#: ../src/dlg-add-folder.c:250 +#: ../src/dlg-add-folder.c:253 msgid "_Load Options" msgstr "_Cargar opciones" -#: ../src/dlg-add-folder.c:251 +#: ../src/dlg-add-folder.c:254 msgid "Sa_ve Options" msgstr "Guardar _opciones" -#: ../src/dlg-add-folder.c:252 +#: ../src/dlg-add-folder.c:255 msgid "_Reset Options" msgstr "_Reafitar opciones" -#: ../src/dlg-add-folder.c:880 +#: ../src/dlg-add-folder.c:883 msgid "Save Options" msgstr "Guarda les opciones" -#: ../src/dlg-add-folder.c:881 +#: ../src/dlg-add-folder.c:884 msgid "Options Name:" msgstr "Nome d'opciones:" #: ../src/dlg-ask-password.c:123 #, c-format msgid "Enter the password for the archive '%s'." -msgstr "Especifique una contraseña pa l'archivador «%s»." +msgstr "Especifica una contraseña pal archivador «%s»." -#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7196 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7377 #, c-format msgid "" "The name \"%s\" is not valid because it cannot contain the characters: %s\n" @@ -415,18 +418,18 @@ "\n" "%s" -#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7188 ../src/fr-window.c:7192 -#: ../src/fr-window.c:7196 ../src/fr-window.c:7232 ../src/fr-window.c:7234 +#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7367 ../src/fr-window.c:7372 +#: ../src/fr-window.c:7377 ../src/fr-window.c:7413 ../src/fr-window.c:7415 msgid "Please use a different name." msgstr "Use un nome distintu" -#: ../src/dlg-batch-add.c:214 +#: ../src/dlg-batch-add.c:215 msgid "" "You don't have the right permissions to create an archive in the destination " "folder." -msgstr "Nun tien permisos pa criar un archivador na carpeta de destín." +msgstr "Nun tienes permisos pa crear un archivador na carpeta de destín." -#: ../src/dlg-batch-add.c:230 ../src/dlg-extract.c:102 ../src/fr-window.c:6491 +#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6631 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -435,160 +438,228 @@ msgstr "" "La carpeta de destín «%s» nun esiste.\n" "\n" -" ¿Quier criala?" +" ¿Quier creala?" -#: ../src/dlg-batch-add.c:239 ../src/dlg-extract.c:111 ../src/fr-window.c:6500 +#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6640 msgid "Create _Folder" -msgstr "Criar Car_peta" +msgstr "Crear Car_peta" -#: ../src/dlg-batch-add.c:258 ../src/dlg-extract.c:128 ../src/fr-window.c:6520 +#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6660 #, c-format msgid "Could not create the destination folder: %s." -msgstr "Nun pudo criase la carpeta de destínº %s." +msgstr "Nun pudo crease la carpeta de destín: %s." -#: ../src/dlg-batch-add.c:275 +#: ../src/dlg-batch-add.c:276 msgid "Archive not created" -msgstr "Archivador non criáu" +msgstr "Archivador non creáu" -#: ../src/dlg-batch-add.c:322 +#: ../src/dlg-batch-add.c:324 msgid "The archive is already present. Do you want to overwrite it?" -msgstr "L'archivador yá esiste. ¿Deseya sobroscribilu?" +msgstr "L'archivador yá esiste. ¿Quies sobrescribilu?" -#: ../src/dlg-batch-add.c:325 +#: ../src/dlg-batch-add.c:327 msgid "_Overwrite" msgstr "_Sobroscribir" -#: ../src/dlg-extract.c:133 ../src/dlg-extract.c:151 ../src/dlg-extract.c:178 -#: ../src/fr-window.c:4085 ../src/fr-window.c:6519 ../src/fr-window.c:6536 +#: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 +#: ../src/fr-window.c:4150 ../src/fr-window.c:6659 ../src/fr-window.c:6676 msgid "Extraction not performed" msgstr "Estraición non fecha" -#: ../src/dlg-extract.c:179 ../src/fr-window.c:4247 ../src/fr-window.c:4327 +#: ../src/dlg-extract.c:176 ../src/fr-window.c:4313 ../src/fr-window.c:4393 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" -msgstr "Nun tien permisos pa estrayer archivadores na carpeta «%s»" +msgstr "Nun tienes permisos pa estrayer archivadores na carpeta «%s»" -#: ../src/dlg-extract.c:334 ../src/dlg-extract.c:432 ../src/ui.h:123 +#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:124 msgid "Extract" msgstr "Estrayer" -#: ../src/dlg-extract.c:383 +#: ../src/dlg-extract.c:380 msgid "Actions" msgstr "Aiciones" -#: ../src/dlg-extract.c:399 +#: ../src/dlg-extract.c:396 msgid "Re-crea_te folders" -msgstr "R_ecriar les carpetes" +msgstr "R_e-crear les carpetes" -#: ../src/dlg-extract.c:403 +#: ../src/dlg-extract.c:400 msgid "Over_write existing files" -msgstr "Sobro_scribir ficheros esistentes" +msgstr "Sobre_scribir ficheros esistentes" -#: ../src/dlg-extract.c:407 +#: ../src/dlg-extract.c:404 msgid "Do not e_xtract older files" -msgstr "None_strayer ficheros más antiguos" - -#: ../src/dlg-new.c:274 -msgid "Automatic" -msgstr "Automáticu" +msgstr "Nun e_strayer ficheros más antiguos" -#: ../src/dlg-new.c:341 +#: ../src/dlg-new.c:445 +msgctxt "File" msgid "New" msgstr "Nuevu" -#: ../src/dlg-new.c:354 +#: ../src/dlg-new.c:458 +msgctxt "File" msgid "Save" msgstr "Guardar" -#: ../src/dlg-prop.c:106 +#: ../src/dlg-package-installer.c:96 ../src/dlg-package-installer.c:205 +msgid "There was an internal error trying to search for applications:" +msgstr "Hebo un fallu internu intentando guetar les aplicaciones:" + +#: ../src/dlg-package-installer.c:273 +#, c-format +msgid "" +"There is no command installed for %s files.\n" +"Do you want to search for a command to open this file?" +msgstr "" +"Nun esiste dengún comandu instaláu pa los ficheros %s.\n" +"¿Quies restolar por un comandu p'abrir esti ficheru?" + +#: ../src/dlg-package-installer.c:278 +msgid "Could not open this file type" +msgstr "Nun pudo abrise esta triba de ficheru" + +#: ../src/dlg-package-installer.c:281 +msgid "_Search Command" +msgstr "Comandu de _gueta" + +#. Translators: after the colon there is a folder name. +#: ../src/dlg-prop.c:107 msgid "Location:" msgstr "Llocalización:" -#: ../src/dlg-prop.c:118 +#: ../src/dlg-prop.c:119 +msgctxt "File" msgid "Name:" msgstr "Nome:" -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:125 #, c-format msgid "%s Properties" msgstr "Propiedaes de %s" -#: ../src/dlg-prop.c:133 +#: ../src/dlg-prop.c:134 msgid "Modified on:" msgstr "Modificáu el:" -#: ../src/dlg-prop.c:143 +#: ../src/dlg-prop.c:144 msgid "Archive size:" msgstr "Tamañu del archivador:" -#: ../src/dlg-prop.c:154 +#: ../src/dlg-prop.c:155 msgid "Content size:" msgstr "Tamaño del conteníu:" -#: ../src/dlg-prop.c:174 +#: ../src/dlg-prop.c:175 msgid "Compression ratio:" msgstr "Tasa de compresión:" -#: ../src/dlg-prop.c:189 +#: ../src/dlg-prop.c:190 msgid "Number of files:" msgstr "Númberu de ficheros:" -#: ../src/dlg-update.c:159 +#: ../src/dlg-update.c:165 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" -msgstr "¿Actualizar el ficheru «%s» nel archivador «%s»?" +msgstr "¿Anovar el ficheru «%s» nel archivador «%s»?" -#: ../src/dlg-update.c:173 +#: ../src/dlg-update.c:194 #, c-format msgid "Update the files in the archive \"%s\"?" -msgstr "¿Actualizar los ficheros nel archivador «%s»?" +msgstr "¿Anovar los ficheros nel archivador «%s»?" + +#: ../src/eggfileformatchooser.c:236 +#, c-format +msgid "File _Format: %s" +msgstr "_Formatu de ficheru: %s" + +#: ../src/eggfileformatchooser.c:397 +msgid "All Files" +msgstr "Tolos Ficheros" + +#: ../src/eggfileformatchooser.c:398 +msgid "All Supported Files" +msgstr "Tolos ficheros soportaos" + +#: ../src/eggfileformatchooser.c:407 +msgid "By Extension" +msgstr "Por estensión" + +#: ../src/eggfileformatchooser.c:422 +msgid "File Format" +msgstr "Formatu del Ficheru" + +#: ../src/eggfileformatchooser.c:440 +msgid "Extension(s)" +msgstr "Estensiones" + +#: ../src/eggfileformatchooser.c:675 +#, c-format +msgid "" +"The program was not able to find out the file format you want to use for `%" +"s'. Please make sure to use a known extension for that file or manually " +"choose a file format from the list below." +msgstr "" +"El programa nun pudo alcontrar el formatu de ficheru que quies usar «%s». " +"Asegúrate de qu'uses una estensión conocida pa esi ficheru o escueye " +"manualmente un formatu de ficheru de la llista inferior." + +#: ../src/eggfileformatchooser.c:682 +msgid "File format not recognized" +msgstr "Nun se reconoz el formatu del ficheru" + +#: ../src/fr-archive.c:1126 +msgid "File not found." +msgstr "Nun s'alcontró'l ficheru." -#: ../src/fr-archive.c:1225 +#: ../src/fr-archive.c:1229 #, c-format msgid "The file doesn't exist" msgstr "El ficheru nun esiste" -#: ../src/fr-archive.c:2403 +#: ../src/fr-archive.c:2416 msgid "You don't have the right permissions." msgstr "Nun tien los permisos necesarios" -#: ../src/fr-archive.c:2403 +#: ../src/fr-archive.c:2416 msgid "This archive type cannot be modified" msgstr "Esta triba d'archivador nun pue modificase" -#: ../src/fr-archive.c:2415 +#: ../src/fr-archive.c:2428 msgid "You can't add an archive to itself." -msgstr "Nun pue amestar un archivador a sí mesmu." +msgstr "Nun se pue amestar un archivador a sí mesmu." -#: ../src/fr-command-rar.c:422 ../src/fr-command-tar.c:295 -#: ../src/fr-command-7z.c:289 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:296 ../src/fr-command-rar.c:434 +#: ../src/fr-command-tar.c:308 msgid "Adding file: " msgstr "Amestando ficheru: " -#: ../src/fr-command-rar.c:500 ../src/fr-command-tar.c:359 -msgid "Removing file: " -msgstr "Desaniciando ficheru: " - -#: ../src/fr-command-rar.c:549 ../src/fr-command-tar.c:412 -#: ../src/fr-command-7z.c:396 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:412 ../src/fr-command-rar.c:561 +#: ../src/fr-command-tar.c:427 msgid "Extracting file: " msgstr "Estrayendo ficheru: " -#: ../src/fr-command-rar.c:669 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-rar.c:512 ../src/fr-command-tar.c:373 +msgid "Removing file: " +msgstr "Desaniciando ficheru: " + +#: ../src/fr-command-rar.c:689 #, c-format msgid "Could not find the volume: %s" msgstr "Nun s'alcontró'l volume: %s" -#: ../src/fr-command-tar.c:368 ../src/fr-window.c:2290 +#: ../src/fr-command-tar.c:382 ../src/fr-window.c:2310 msgid "Deleting files from archive" msgstr "Desaniciando ficheros del archivador" -#: ../src/fr-command-tar.c:471 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "Recomprimiendo archivador" -#: ../src/fr-command-tar.c:644 +#: ../src/fr-command-tar.c:737 msgid "Decompressing archive" msgstr "Descomprimiendo archivador" @@ -600,209 +671,221 @@ msgid "_Extract" msgstr "_Estrayer" -#: ../src/fr-window.c:1495 +#: ../src/fr-window.c:1509 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" msgstr[0] "%d oxetu (%s)" msgstr[1] "%d oxetos (%s)" -#: ../src/fr-window.c:1500 +#: ../src/fr-window.c:1514 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" msgstr[0] "%d oxetu seleicionáu (%s)" msgstr[1] "%d oxetos seleicionaos (%s)" -#: ../src/fr-window.c:1568 +#: ../src/fr-window.c:1584 msgid "Folder" msgstr "Carpeta" -#: ../src/fr-window.c:1966 +#: ../src/fr-window.c:1982 msgid "[read only]" msgstr "[namái llectura]" -#: ../src/fr-window.c:2217 +#: ../src/fr-window.c:2233 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Nun pudo amosase la carpeta: «%s»" -#: ../src/fr-window.c:2281 ../src/fr-window.c:2311 +#: ../src/fr-window.c:2301 ../src/fr-window.c:2331 msgid "Creating archive" -msgstr "Criando archivador" +msgstr "Creando archivador" -#: ../src/fr-window.c:2284 +#: ../src/fr-window.c:2304 msgid "Loading archive" msgstr "Cargando archivador" -#: ../src/fr-window.c:2287 +#: ../src/fr-window.c:2307 msgid "Reading archive" msgstr "Lleendo archivador" -#: ../src/fr-window.c:2293 +#: ../src/fr-window.c:2313 msgid "Testing archive" -msgstr "Comprebando archivador" +msgstr "Comprobando archivador" -#: ../src/fr-window.c:2296 +#: ../src/fr-window.c:2316 msgid "Getting the file list" msgstr "Obteniendo la llista de ficheros" -#: ../src/fr-window.c:2299 ../src/fr-window.c:2308 +#: ../src/fr-window.c:2319 ../src/fr-window.c:2328 msgid "Copying the file list" msgstr "Copiando la llista de ficheros" -#: ../src/fr-window.c:2302 +#: ../src/fr-window.c:2322 msgid "Adding files to archive" msgstr "Amestando ficheros al archivador" -#: ../src/fr-window.c:2305 +#: ../src/fr-window.c:2325 msgid "Extracting files from archive" msgstr "Estrayendo ficheros del archivador" -#: ../src/fr-window.c:2314 +#: ../src/fr-window.c:2334 msgid "Saving archive" msgstr "Guardando archivador" -#: ../src/fr-window.c:2470 +#: ../src/fr-window.c:2491 msgid "_Open the Archive" msgstr "_Abrir l'archivador" -#: ../src/fr-window.c:2471 -msgid "_Open the Destination" -msgstr "_Abrir el destín" +#: ../src/fr-window.c:2492 +msgid "_Show the Files" +msgstr "_Amosar los ficheros" -#: ../src/fr-window.c:2517 +#: ../src/fr-window.c:2538 msgid "Archive:" msgstr "Archivador:" -#: ../src/fr-window.c:2677 +#: ../src/fr-window.c:2700 msgid "Extraction completed successfully" msgstr "La estraición féxose de mou satisfactoriu" -#: ../src/fr-window.c:2700 +#: ../src/fr-window.c:2723 msgid "Archive created successfully" -msgstr "L'archivador crióse de mou satisfactoriu" +msgstr "L'archivador creóse de mou satisfactoriu" -#: ../src/fr-window.c:2748 -msgid "wait please..." -msgstr "por favor espere…" +#: ../src/fr-window.c:2771 +msgid "please wait..." +msgstr "espere…" -#: ../src/fr-window.c:2902 +#: ../src/fr-window.c:2930 msgid "An error occurred while extracting files." msgstr "Hebo un fallu mentantu s'estrayíen los ficheros." -#: ../src/fr-window.c:2908 +#: ../src/fr-window.c:2936 #, c-format msgid "Could not open \"%s\"" msgstr "Nun pudo abrise «%s»" -#: ../src/fr-window.c:2913 +#: ../src/fr-window.c:2941 msgid "An error occurred while loading the archive." msgstr "Hebo un fallu cargando l'archivador." -#: ../src/fr-window.c:2917 +#: ../src/fr-window.c:2945 msgid "An error occurred while deleting files from the archive." msgstr "Hebo un fallu desaniciando ficheros del archivador." -#: ../src/fr-window.c:2923 +#: ../src/fr-window.c:2951 msgid "An error occurred while adding files to the archive." msgstr "Hebo un fallu amestando ficheros al archivador." -#: ../src/fr-window.c:2927 +#: ../src/fr-window.c:2955 msgid "An error occurred while testing archive." -msgstr "Hebo un fallu comprebando l'archivador." +msgstr "Hebo un fallu comprobando l'archivador." -#: ../src/fr-window.c:2931 +#: ../src/fr-window.c:2959 msgid "An error occurred while saving the archive." msgstr "Hebo un fallu mentantu se guardaba l'archivador." -#: ../src/fr-window.c:2935 +#: ../src/fr-window.c:2963 msgid "An error occurred." msgstr "Hebo un fallu." -#: ../src/fr-window.c:2941 +#: ../src/fr-window.c:2969 msgid "Command not found." msgstr "Comandu non alcontráu." -#: ../src/fr-window.c:2944 +#: ../src/fr-window.c:2972 msgid "Command exited abnormally." msgstr "El comandu finó con error." -#: ../src/fr-window.c:3140 +#: ../src/fr-window.c:3171 msgid "Test Result" msgstr "Resultáu de la comprebación" -#: ../src/fr-window.c:3944 ../src/fr-window.c:7772 ../src/fr-window.c:7799 +#: ../src/fr-window.c:3993 ../src/fr-window.c:7964 ../src/fr-window.c:7991 +#: ../src/fr-window.c:8246 msgid "Could not perform the operation" msgstr "Nun pudo facese la operación" -#: ../src/fr-window.c:3970 +#: ../src/fr-window.c:4019 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" msgstr "" -"¿Quier amestar esti ficheru al archivador autual o prefier abrilu como un " +"¿Quies amestar esti ficheru al archivador actual o prefieres abrilu como un " "archivador nuevu ?" -#: ../src/fr-window.c:4000 +#: ../src/fr-window.c:4049 msgid "Do you want to create a new archive with these files?" -msgstr "¿Quier criar un nuevu archivador con estos ficheros?" +msgstr "¿Quies crear un nuevu archivador con estos ficheros?" -#: ../src/fr-window.c:4003 +#: ../src/fr-window.c:4052 msgid "Create _Archive" -msgstr "Criar _archivador" +msgstr "Crear _archivador" -#: ../src/fr-window.c:4576 ../src/fr-window.c:5656 +#: ../src/fr-window.c:4642 ../src/fr-window.c:5721 msgid "Folders" msgstr "Carpetes" -#: ../src/fr-window.c:4614 +#: ../src/fr-window.c:4680 +msgctxt "File" msgid "Size" msgstr "Tamañu" -#: ../src/fr-window.c:4615 +#: ../src/fr-window.c:4681 +msgctxt "File" msgid "Type" -msgstr "Tipu" +msgstr "Triba" -#: ../src/fr-window.c:4616 +#: ../src/fr-window.c:4682 +msgctxt "File" msgid "Date Modified" msgstr "Data de Modificación" -#: ../src/fr-window.c:4626 +#: ../src/fr-window.c:4683 +msgctxt "File" +msgid "Location" +msgstr "Allugamientu" + +#: ../src/fr-window.c:4692 +msgctxt "File" msgid "Name" msgstr "Nome" -#: ../src/fr-window.c:5576 +#: ../src/fr-window.c:5642 msgid "Find:" msgstr "Guetar:" -#: ../src/fr-window.c:5664 +#: ../src/fr-window.c:5729 msgid "Close the folders pane" msgstr "Zarrar el panel de carpetes" -#: ../src/fr-window.c:5804 ../src/fr-window.c:5807 ../src/ui.h:141 -#: ../src/ui.h:145 +#: ../src/fr-window.c:5870 ../src/fr-window.c:5873 ../src/ui.h:142 +#: ../src/ui.h:146 msgid "Open archive" msgstr "Abrir un archivador" -#: ../src/fr-window.c:5805 +#: ../src/fr-window.c:5871 msgid "Open a recently used archive" msgstr "Abrir un archivador usáu recientemente" -#: ../src/fr-window.c:6132 +#: ../src/fr-window.c:6202 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Nun pudo guardase l'archivador «%s»" -#: ../src/fr-window.c:7188 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7367 msgid "The new name is void." msgstr "El nome nuevo ta ermu." -#: ../src/fr-window.c:7192 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7372 msgid "The new name is equal to the old one." msgstr "El nome nuevo ye igual que'l antiguu" -#: ../src/fr-window.c:7232 +#: ../src/fr-window.c:7413 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -813,54 +896,54 @@ "\n" "%s" -#: ../src/fr-window.c:7234 +#: ../src/fr-window.c:7415 #, c-format msgid "" "A file named \"%s\" already exists.\n" "\n" "%s" msgstr "" -"Ya existe un ficheru nomáu «%s».\n" +"Yá esiste un ficheru nomáu «%s».\n" "\n" "%s" -#: ../src/fr-window.c:7301 +#: ../src/fr-window.c:7485 msgid "Rename" msgstr "Renomar" -#: ../src/fr-window.c:7302 +#: ../src/fr-window.c:7486 msgid "New folder name" msgstr "Nome de carpeta nuevu" -#: ../src/fr-window.c:7302 +#: ../src/fr-window.c:7486 msgid "New file name" msgstr "Nome de ficheru nuevu" -#: ../src/fr-window.c:7306 +#: ../src/fr-window.c:7490 msgid "_Rename" msgstr "_Renomar" -#: ../src/fr-window.c:7323 ../src/fr-window.c:7342 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the folder" msgstr "Nun pudo renomase la carpeta" -#: ../src/fr-window.c:7323 ../src/fr-window.c:7342 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the file" msgstr "Nun pudo renomase'l ficheru" -#: ../src/fr-window.c:7733 +#: ../src/fr-window.c:7925 msgid "Paste Selection" msgstr "Pegar seleición" -#: ../src/fr-window.c:7734 +#: ../src/fr-window.c:7926 msgid "Destination folder" msgstr "Carpeta de destín" -#: ../src/fr-window.c:8321 +#: ../src/fr-window.c:8516 msgid "Add files to an archive" msgstr "Amestar ficheros a un archivador" -#: ../src/fr-window.c:8365 +#: ../src/fr-window.c:8560 msgid "Extract archive" msgstr "Estrayer archivador" @@ -872,152 +955,172 @@ msgstr "%d %B %Y, %H:%M" #. Expander -#: ../src/gtk-utils.c:439 +#: ../src/gtk-utils.c:442 msgid "Command _Line Output" msgstr "Salida de llinia de _comandos" -#: ../src/gtk-utils.c:784 +#: ../src/gtk-utils.c:779 msgid "Could not display help" -msgstr "Nun pudo amosase l'aida" +msgstr "Nun pue amosase l'ayuda" -#: ../src/main.c:81 +#: ../src/main.c:83 msgid "7-Zip (.7z)" msgstr "7-Zip (.7z)" -#: ../src/main.c:82 +#: ../src/main.c:84 msgid "Tar compressed with 7z (.tar.7z)" msgstr "Tar comprimíu con 7z (.tar.7z)" -#: ../src/main.c:83 +#: ../src/main.c:85 msgid "Ace (.ace)" msgstr "Ace (.ace)" -#: ../src/main.c:85 +#: ../src/main.c:87 msgid "Ar (.ar)" msgstr "Ar (.ar)" -#: ../src/main.c:86 +#: ../src/main.c:88 msgid "Arj (.arj)" msgstr "Arj (.arj)" -#: ../src/main.c:88 +#: ../src/main.c:90 msgid "Tar compressed with bzip2 (.tar.bz2)" msgstr "Tar comprimíu con bzip2 (.tar.bz2)" -#: ../src/main.c:90 +#: ../src/main.c:92 msgid "Tar compressed with bzip (.tar.bz)" msgstr "Tar comprimíu con bzip (.tar.bz)" -#: ../src/main.c:91 +#: ../src/main.c:93 msgid "Cabinet (.cab)" msgstr "Cabinet (.cab)" -#: ../src/main.c:92 +#: ../src/main.c:94 msgid "Rar Archived Comic Book (.cbr)" msgstr "Llibru de cómic archiváu en rar (.cbr)" -#: ../src/main.c:93 +#: ../src/main.c:95 msgid "Zip Archived Comic Book (.cbz)" msgstr "Llibru de cómic archiváu en zip (.cbz)" -#: ../src/main.c:96 +#: ../src/main.c:98 msgid "Tar compressed with gzip (.tar.gz)" msgstr "Tar comprimíu con gzip (.tar.gz)" -#: ../src/main.c:99 +#: ../src/main.c:101 msgid "Ear (.ear)" msgstr "Ear (.ear)" -#: ../src/main.c:100 +#: ../src/main.c:102 msgid "Self-extracting zip (.exe)" msgstr "Zip autoestrayíble (.exe)" -#: ../src/main.c:102 +#: ../src/main.c:104 msgid "Jar (.jar)" msgstr "Jar (.jar)" -#: ../src/main.c:103 +#: ../src/main.c:105 msgid "Lha (.lzh)" msgstr "Lha (.lzh)" -#: ../src/main.c:105 +#: ../src/main.c:106 +msgid "Lrzip (.lrz)" +msgstr "Lrzip (.lrz)" + +#: ../src/main.c:107 +msgid "Tar compressed with lrzip (.tar.lrz)" +msgstr "Tar comprimíu con lrzip (.tar.lrz)" + +#: ../src/main.c:109 +msgid "Tar compressed with lzip (.tar.lz)" +msgstr "Tar comprimíu con lzip (.tar.lz)" + +#: ../src/main.c:111 msgid "Tar compressed with lzma (.tar.lzma)" msgstr "Tar comprimíu con lzma (.tar.lzma)" -#: ../src/main.c:107 +#: ../src/main.c:113 msgid "Tar compressed with lzop (.tar.lzo)" msgstr "Tar comprimíu con lzop (.tar.lzo)" -#: ../src/main.c:108 +#: ../src/main.c:114 msgid "Rar (.rar)" msgstr "Rar (.rar)" -#: ../src/main.c:111 +#: ../src/main.c:117 msgid "Tar uncompressed (.tar)" msgstr "Tar ensin compresión (.tar)" -#: ../src/main.c:112 +#: ../src/main.c:118 msgid "Tar compressed with compress (.tar.Z)" msgstr "Tar comprimíu con compress (.tar.Z)" -#: ../src/main.c:114 +#: ../src/main.c:120 msgid "War (.war)" msgstr "War (.war)" -#: ../src/main.c:115 +#: ../src/main.c:121 +msgid "Xz (.xz)" +msgstr "Xz (.xz)" + +#: ../src/main.c:122 +msgid "Tar compressed with xz (.tar.xz)" +msgstr "Tar comprimíu con xz (.tar.xz)" + +#: ../src/main.c:123 msgid "Zoo (.zoo)" msgstr "Zoo (.zoo)" -#: ../src/main.c:116 +#: ../src/main.c:124 msgid "Zip (.zip)" msgstr "Zip (.zip)" -#: ../src/main.c:175 +#: ../src/main.c:192 msgid "Add files to the specified archive and quit the program" -msgstr "Amesta ficheros al archivador especificáu y sal del programa" +msgstr "Amiesta ficheros al archivador especificáu y sal del programa" -#: ../src/main.c:176 +#: ../src/main.c:193 msgid "ARCHIVE" msgstr "ARCHIVADOR" -#: ../src/main.c:179 +#: ../src/main.c:196 msgid "Add files asking the name of the archive and quit the program" msgstr "" -"Amesta ficheros entrugando'l nome del archivador y llueu sal del programa" +"Amiesta ficheros entrugando'l nome del archivador y llueu sal del programa" -#: ../src/main.c:183 +#: ../src/main.c:200 msgid "Extract archives to the specified folder and quit the program" msgstr "Estrái archivadores a la carpeta especificada y sal del programa" -#: ../src/main.c:184 ../src/main.c:196 +#: ../src/main.c:201 ../src/main.c:213 msgid "FOLDER" msgstr "CARPETA" -#: ../src/main.c:187 +#: ../src/main.c:204 msgid "Extract archives asking the destination folder and quit the program" msgstr "Estrái archivadores entrugando la carpeta de destín y sal del programa" -#: ../src/main.c:191 +#: ../src/main.c:208 msgid "" -"Extract archives using the archive name as destination folder and quit the " +"Extract the contents of the archives in the archive folder and quit the " "program" msgstr "" -"Estrái archivadores usando'l nome del archivador como carpeta de destín y " -"sal del programa" +"Estrái'l conteníu de los archivadores na carpeta del archivador y cuela del " +"programa" -#: ../src/main.c:195 +#: ../src/main.c:212 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Carpeta predeterminada pa los comandos «--add» y «--extract»" -#: ../src/main.c:199 +#: ../src/main.c:216 msgid "Create destination folder without asking confirmation" -msgstr "Cria una carpeta de destén ensin pidir confirmación" +msgstr "Crea una carpeta de destín ensin pidir confirmación" -#: ../src/main.c:281 +#: ../src/main.c:298 msgid "- Create and modify an archive" -msgstr "- Criar y modificar un archivador" +msgstr "- Crear y modificar un archivador" -#: ../src/main.c:297 +#: ../src/main.c:314 msgid "File Roller" msgstr "File Roller" @@ -1035,248 +1138,382 @@ #: ../src/ui.h:35 msgid "_Help" -msgstr "A_ida" +msgstr "_Ayuda" #: ../src/ui.h:36 msgid "_Arrange Files" msgstr "_Axeitar ficheros" -#: ../src/ui.h:37 +#. Translators: this is the label for the "open recent file" sub-menu. +#: ../src/ui.h:38 msgid "Open _Recent" msgstr "Abrir _reciente" -#: ../src/ui.h:41 +#: ../src/ui.h:42 msgid "Information about the program" msgstr "Información sobro' programa" -#: ../src/ui.h:44 +#: ../src/ui.h:45 msgid "_Add Files..." msgstr "_Amestar ficheros…" -#: ../src/ui.h:45 ../src/ui.h:49 +#: ../src/ui.h:46 ../src/ui.h:50 msgid "Add files to the archive" -msgstr "Amesta ficheros al archivador" +msgstr "Amestar ficheros al archivador" -#: ../src/ui.h:52 +#: ../src/ui.h:53 msgid "Add a _Folder..." msgstr "Amestar una _carpeta…" -#: ../src/ui.h:53 ../src/ui.h:57 +#: ../src/ui.h:54 ../src/ui.h:58 msgid "Add a folder to the archive" msgstr "Amestar una carpeta al archivador" -#: ../src/ui.h:56 +#: ../src/ui.h:57 msgid "Add Folder" msgstr "Amestar carpeta" -#: ../src/ui.h:61 +#: ../src/ui.h:62 msgid "Close the current archive" -msgstr "Zarra l'archivador autual" +msgstr "Zarra l'archivador actual" -#: ../src/ui.h:64 +#: ../src/ui.h:65 msgid "Contents" msgstr "Índiz" -#: ../src/ui.h:65 +#: ../src/ui.h:66 msgid "Display the File Roller Manual" msgstr "Amuesa'l manual de File Roller" -#: ../src/ui.h:70 ../src/ui.h:91 +#: ../src/ui.h:71 ../src/ui.h:92 msgid "Copy the selection" msgstr "Copiar la seleición" -#: ../src/ui.h:74 ../src/ui.h:95 +#: ../src/ui.h:75 ../src/ui.h:96 msgid "Cut the selection" msgstr "Corta la seleición" -#: ../src/ui.h:78 ../src/ui.h:99 +#: ../src/ui.h:79 ../src/ui.h:100 msgid "Paste the clipboard" msgstr "Pegar el conteníu del cartafueyos" -#: ../src/ui.h:81 ../src/ui.h:102 +#: ../src/ui.h:82 ../src/ui.h:103 msgid "_Rename..." msgstr "_Renomar..." -#: ../src/ui.h:82 ../src/ui.h:103 +#: ../src/ui.h:83 ../src/ui.h:104 msgid "Rename the selection" msgstr "Renoma la seleición" -#: ../src/ui.h:86 ../src/ui.h:107 +#: ../src/ui.h:87 ../src/ui.h:108 msgid "Delete the selection from the archive" -msgstr "Desanicia la selección del archivador" +msgstr "Desanicia la seleición del archivador" -#: ../src/ui.h:111 +#: ../src/ui.h:112 msgid "Dese_lect All" msgstr "_Deseleicionar too" -#: ../src/ui.h:112 +#: ../src/ui.h:113 msgid "Deselect all files" msgstr "Deseleiciona tolos ficheros" -#: ../src/ui.h:115 ../src/ui.h:119 +#: ../src/ui.h:116 ../src/ui.h:120 msgid "_Extract..." msgstr "E_strayer…" -#: ../src/ui.h:116 ../src/ui.h:120 ../src/ui.h:124 +#: ../src/ui.h:117 ../src/ui.h:121 ../src/ui.h:125 msgid "Extract files from the archive" msgstr "Estrayer ficheros del archivador" -#: ../src/ui.h:132 +#: ../src/ui.h:128 +msgid "Find..." +msgstr "Guetar..." + +#: ../src/ui.h:133 msgid "_Last Output" msgstr "C_aberu resultáu" -#: ../src/ui.h:133 +#: ../src/ui.h:134 msgid "View the output produced by the last executed command" msgstr "Ver la salida fecha pol caberu comandu executáu" #: ../src/ui.h:137 +msgctxt "File" +msgid "New..." +msgstr "Nuevu..." + +#: ../src/ui.h:138 msgid "Create a new archive" -msgstr "Cria un archivador nuevu" +msgstr "Crea un archivador nuevu" + +#: ../src/ui.h:141 +msgctxt "File" +msgid "Open..." +msgstr "Abrir..." -#: ../src/ui.h:148 +#: ../src/ui.h:149 msgid "_Open With..." msgstr "Abrir _con..." -#: ../src/ui.h:149 +#: ../src/ui.h:150 msgid "Open selected files with an application" msgstr "Abrir los ficheros seleicionaos con una aplicación" -#: ../src/ui.h:152 +#: ../src/ui.h:153 msgid "Pass_word..." msgstr "Co_ntraseña…" -#: ../src/ui.h:153 +#: ../src/ui.h:154 msgid "Specify a password for this archive" -msgstr "Especifique una contraseña pa esti archivador" +msgstr "Especifica una contraseña pa esti archivador" -#: ../src/ui.h:157 +#: ../src/ui.h:158 msgid "Show archive properties" msgstr "Amosar les propiedaes del archivador" -#: ../src/ui.h:161 +#: ../src/ui.h:162 msgid "Reload current archive" -msgstr "Recarga l'archivador autual" +msgstr "Recarga l'archivador actual" #: ../src/ui.h:165 +msgctxt "File" +msgid "Save As..." +msgstr "Guardar como..." + +#: ../src/ui.h:166 msgid "Save the current archive with a different name" -msgstr "Guarda l'archivador autual con un nome diferente" +msgstr "Guarda l'archivador actual con un nome diferente" -#: ../src/ui.h:169 +#: ../src/ui.h:170 msgid "Select all files" msgstr "Seleiciona tolos ficheros" -#: ../src/ui.h:173 +#: ../src/ui.h:174 msgid "Stop current operation" msgstr "Parar la operación en cursu" -#: ../src/ui.h:176 +#: ../src/ui.h:177 msgid "_Test Integrity" -msgstr "_Comprebar integridá" +msgstr "_Comprobar integridá" -#: ../src/ui.h:177 +#: ../src/ui.h:178 msgid "Test whether the archive contains errors" -msgstr "Compreba si l'archivador contién fallos" +msgstr "Comprueba si l'archivador contién fallos" -#: ../src/ui.h:181 ../src/ui.h:185 +#: ../src/ui.h:182 ../src/ui.h:186 msgid "Open the selected file" msgstr "Abrir el ficheru selecionáu" -#: ../src/ui.h:189 ../src/ui.h:193 +#: ../src/ui.h:190 ../src/ui.h:194 msgid "Open the selected folder" msgstr "Abrir la carpeta seleicionada" -#: ../src/ui.h:198 +#: ../src/ui.h:199 msgid "Go to the previous visited location" msgstr "Dir a la llocalización visitada anteriormente" -#: ../src/ui.h:202 +#: ../src/ui.h:203 msgid "Go to the next visited location" msgstr "Dir a la siguiente llocalización visitada" -#: ../src/ui.h:206 +#: ../src/ui.h:207 msgid "Go up one level" msgstr "Xubir un nivel" -#: ../src/ui.h:210 +#. Translators: the home location is the home folder. +#: ../src/ui.h:212 msgid "Go to the home location" msgstr "Dir al llugar inicial" -#: ../src/ui.h:218 +#: ../src/ui.h:220 msgid "_Toolbar" msgstr "_Barra Ferramientes" -#: ../src/ui.h:219 +#: ../src/ui.h:221 msgid "View the main toolbar" msgstr "Ver la barra de ferramientes principal" -#: ../src/ui.h:223 +#: ../src/ui.h:225 msgid "Stat_usbar" msgstr "Barra d'_estáu" -#: ../src/ui.h:224 +#: ../src/ui.h:226 msgid "View the statusbar" msgstr "Ver la barra d'estáu" -#: ../src/ui.h:228 +#: ../src/ui.h:230 msgid "_Reversed Order" msgstr "Orde _inversu" -#: ../src/ui.h:229 +#: ../src/ui.h:231 msgid "Reverse the list order" msgstr "Invierte la ordenación del llistáu" -#: ../src/ui.h:233 +#: ../src/ui.h:235 msgid "_Folders" msgstr "_Carpetes" -#: ../src/ui.h:234 +#: ../src/ui.h:236 msgid "View the folders pane" msgstr "Ver el panel de carpetes" -#: ../src/ui.h:243 +#: ../src/ui.h:245 msgid "View All _Files" msgstr "Ver _tolos ficheros" -#: ../src/ui.h:246 +#: ../src/ui.h:248 msgid "View as a F_older" msgstr "Ver como una _carpeta" -#: ../src/ui.h:254 +#: ../src/ui.h:256 msgid "by _Name" msgstr "por _Nome" -#: ../src/ui.h:255 +#: ../src/ui.h:257 msgid "Sort file list by name" msgstr "Ordena los ficheros pol so nome" -#: ../src/ui.h:257 +#: ../src/ui.h:259 msgid "by _Size" msgstr "por _Tamañu" -#: ../src/ui.h:258 +#: ../src/ui.h:260 msgid "Sort file list by file size" msgstr "Ordena los ficheros pol so tamañu" -#: ../src/ui.h:260 +#: ../src/ui.h:262 msgid "by T_ype" msgstr "por ti_pu" -#: ../src/ui.h:261 +#: ../src/ui.h:263 msgid "Sort file list by type" msgstr "Ordena los ficheros por tipu" -#: ../src/ui.h:263 -msgid "by _Date modified" +#: ../src/ui.h:265 +msgid "by _Date Modified" msgstr "por _data de modificación" -#: ../src/ui.h:264 +#: ../src/ui.h:266 msgid "Sort file list by modification time" msgstr "Ordena los ficheros pola so data de modificación" -#: ../src/ui.h:266 +#. Translators: this is the "sort by file location" menu item +#: ../src/ui.h:269 msgid "by _Location" msgstr "por _Llocalización" -#: ../src/ui.h:267 +#. Translators: location is the file location +#: ../src/ui.h:271 msgid "Sort file list by location" msgstr "Ordena los ficheros pela so ruta" + +#~ msgid "Compression level" +#~ msgstr "Tasa de compresión" + +#~ msgid "Compression level used when adding files to an archive. Possible values: very-fast, fast, normal, maximum." +#~ msgstr "El nivel de compresión usáu al amestar ficheros a un archivador. Los valores posibles son «very-fast» (muy rápidu), «fast» (rápidu, «normal» y «maximum» (máximu)." + +#~ msgid "Default volume size" +#~ msgstr "Tamañu predetermináu del volume" + +#~ msgid "Display path" +#~ msgstr "Amosar camín" + +#~ msgid "Display size" +#~ msgstr "Amosar tamañu" + +#~ msgid "Display the path column in the main window." +#~ msgstr "Amosar la columna «camín» na ventana principal." + +#~ msgid "Display the size column in the main window." +#~ msgstr "Amosar la columna «tamañu» na ventana principal." + +#~ msgid "Display the time column in the main window." +#~ msgstr "Amosar la columna «hora» na ventana principal." + +#~ msgid "Display the type column in the main window." +#~ msgstr "Amosar la columna «triba» na ventana principal." + +#~ msgid "Display time" +#~ msgstr "Amosar hora" + +#~ msgid "Display type" +#~ msgstr "Amosar triba" + +#~ msgid "Do not overwrite newer files" +#~ msgstr "Nun sobrescribir ficheros más nuevos" + +#~ msgid "Editors" +#~ msgstr "Editores" + +#~ msgid "Encrypt the archive header" +#~ msgstr "Cifrar la testera del archivu" + +#~ msgid "How to sort files" +#~ msgstr "Cómo ordenar ficheros" + +#~ msgid "If true will display icons depending on the file type (slower), otherwise will use always the same icon for all files (faster)." +#~ msgstr "Si ye braero amosará iconos en función del tipu de ficheru (más sele), d'otru mou usará siempre'l mesmu iconu pa tolos ficheros (más rápidu)." + +#~ msgid "List Mode" +#~ msgstr "Mou llista" + +#~ msgid "List of applications entered in the 'Open File' dialog and not associated with the file type." +#~ msgstr "Llista d'aplicaciones introducida nel diálogu «Abrir ficheru» y non asociaes col tipu de ficheru." + +#~ msgid "Max history length" +#~ msgstr "Tamañu máximu del historial" + +#~ msgid "Max number of items in the 'Open Recents' submenu." +#~ msgstr "El númberu máximu d'elementos nel submenú «Abrir recientes»." + +#~ msgid "Name column width" +#~ msgstr "Anchor de la columna «nome»" + +#~ msgid "Overwrite existing files" +#~ msgstr "Sobrescribir ficheros esistentes" + +#~ msgid "Recreate the folders stored in the archive" +#~ msgstr "Recrear les carpetes almacenaes nel archivu" + +#~ msgid "Sort type" +#~ msgstr "Tipu d'ordenación" + +#~ msgid "The default size for volumes." +#~ msgstr "El tamañu predetermináu de los volúmenes." + +#~ msgid "The default width of the name column the file list." +#~ msgstr "El tamañu predetermináu del anchor de la columna «nome» na llista de ficheros." + +#~ msgid "Use 'all-files' to view all the files in the archive in a single list, use 'as-folder' to navigate the archive as a folder." +#~ msgstr "Usar «tolos ficheros» pa ver tolos ficheros del archivador nuna llista simple, use «como carpeta» pa restolar pente l'archivador como nuna carpeta." + +#~ msgid "Use mime icons" +#~ msgstr "Usar iconos MIME" + +#~ msgid "View statusbar" +#~ msgstr "Ver la barra d'estáu" + +#~ msgid "View toolbar" +#~ msgstr "Ver la barra de ferramientes" + +#~ msgid "What criteria must be used to arrange files. Possible values: name, size, type, time, path." +#~ msgstr "Qué criteriu usar pa ordenar ficheros. Los valores posibles son: «nome», «tamañu», «tipu», «hora», «camín»." + +#~ msgid "Whether to display the folders pane." +#~ msgstr "Si amosar el panel de carpetes" + +#~ msgid "Whether to display the statusbar." +#~ msgstr "Indica si hai d'amosar el panel de carpetes." + +#~ msgid "Whether to display the toolbar." +#~ msgstr "Indica si hai d'amosar la barra d'estáu." + +#~ msgid "Whether to encrypt the archive header. If the header is encrypted the password will be required to list the archive content as well." +#~ msgstr "Indica si encriptar la testera del archivu. Si la testera ta encriptada va solicitase la contraseña pa llistar tamién el conteníu del archivu." + +#~ msgid "Whether to sort in ascending or descending direction. Possible values: ascending, descending." +#~ msgstr "Indica si ordenar en sen ascendente o descendente. Los valores posibles son: «ascendente», «descendente»." + +#~ msgid "Windows Imaging Format (.wim)" +#~ msgstr "Windows Imaging Format (.wim)" diff -Nru file-roller-2.32.1/po/de.po file-roller-2.32.2/po/de.po --- file-roller-2.32.1/po/de.po 2010-09-14 07:03:00.000000000 -0400 +++ file-roller-2.32.2/po/de.po 2011-04-26 10:29:35.000000000 -0400 @@ -5,23 +5,22 @@ # Christian Neumair , 2002-2004. # Hendrik Richter , 2004, 2005, 2006, 2007, 2008. # Andre Klapper , 2008. -# Christian Kirbach , 2009, 2010. # Mario Blättermann , 2009, 2010. # Nathan-J. Hirschauer , 2010. +# Christian Kirbach , 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: file-roller master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" -"roller&component=general\n" -"POT-Creation-Date: 2010-07-11 15:23+0000\n" -"PO-Revision-Date: 2010-07-18 19:46+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: German \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-12-29 22:23+0100\n" +"PO-Revision-Date: 2010-12-29 22:24+0100\n" +"Last-Translator: Christian Kirbach \n" +"Language-Team: Deutsch \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" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -86,8 +85,8 @@ msgid "Show session management options" msgstr "Optionen der Sitzungsverwaltung anzeigen" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1969 -#: ../src/fr-window.c:5398 +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1974 +#: ../src/fr-window.c:5393 msgid "Archive Manager" msgstr "Archivmanager" @@ -131,7 +130,7 @@ msgstr "_Dateiname:" #. Translators: after the colon there is a folder name. -#: ../data/ui/batch-add-files.ui.h:10 ../src/fr-window.c:5820 +#: ../data/ui/batch-add-files.ui.h:10 ../src/fr-window.c:5815 msgid "_Location:" msgstr "_Ort:" @@ -152,19 +151,19 @@ msgid "Delete" msgstr "Löschen" -#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:363 +#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:362 msgid "_All files" msgstr "A_lle Dateien" -#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:349 +#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:348 msgid "_Files:" msgstr "_Dateien:" -#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:370 +#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:369 msgid "_Selected files" msgstr "_Gewählte Dateien" -#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:360 +#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:359 msgid "example: *.txt; *.doc" msgstr "Beispiel: *.txt; *.doc" @@ -204,14 +203,14 @@ msgstr "_Wählen Sie die Dateien aus, die aktualisiert werden sollen:" #. secondary text -#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:181 +#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:177 ../src/dlg-update.c:205 #, c-format msgid "" "The file has been modified with an external application. If you don't update " "the file in the archive, all of your changes will be lost." msgid_plural "" -"%d files have been modified with an external application. If you don't update " -"the files in the archive, all of your changes will be lost." +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." msgstr[0] "" "Die Datei wurde durch eine externe Anwendung verändert. Wenn Sie die Version " "im Archiv nicht aktualisieren, werden all Ihre Änderungen verloren gehen." @@ -249,92 +248,92 @@ msgid "Create a compressed archive with the selected objects" msgstr "Ein komprimiertes Archiv mit den ausgewählten Objekten erstellen" -#: ../src/actions.c:157 ../src/actions.c:196 ../src/actions.c:232 -#: ../src/dlg-batch-add.c:170 ../src/dlg-batch-add.c:186 -#: ../src/dlg-batch-add.c:215 ../src/dlg-batch-add.c:260 -#: ../src/dlg-batch-add.c:306 ../src/fr-window.c:2920 +#: ../src/actions.c:158 ../src/actions.c:197 ../src/actions.c:233 +#: ../src/dlg-batch-add.c:168 ../src/dlg-batch-add.c:184 +#: ../src/dlg-batch-add.c:213 ../src/dlg-batch-add.c:258 +#: ../src/dlg-batch-add.c:304 ../src/fr-window.c:2925 msgid "Could not create the archive" msgstr "Das Archiv konnte nicht angelegt werden" -#: ../src/actions.c:159 ../src/dlg-batch-add.c:172 ../src/dlg-batch-add.c:308 +#: ../src/actions.c:160 ../src/dlg-batch-add.c:170 ../src/dlg-batch-add.c:306 msgid "You have to specify an archive name." msgstr "Sie müssen einen Namen für das Archiv angeben" -#: ../src/actions.c:198 +#: ../src/actions.c:199 msgid "You don't have permission to create an archive in this folder" msgstr "" "Sie haben nicht die erforderlichen Zugriffsrechte, um in diesem Ordner " "Archive anzulegen" -#: ../src/actions.c:234 ../src/dlg-package-installer.c:254 +#: ../src/actions.c:235 ../src/dlg-package-installer.c:254 #: ../src/dlg-package-installer.c:263 ../src/dlg-package-installer.c:291 -#: ../src/fr-archive.c:1146 ../src/fr-window.c:6038 ../src/fr-window.c:6214 +#: ../src/fr-archive.c:1146 ../src/fr-window.c:6034 ../src/fr-window.c:6210 msgid "Archive type not supported." msgstr "Archivtyp wird nicht unterstützt" -#: ../src/actions.c:248 +#: ../src/actions.c:249 msgid "Could not delete the old archive." msgstr "Das alte Archiv konnte nicht gelöscht werden." -#: ../src/actions.c:382 ../src/fr-window.c:5878 +#: ../src/actions.c:383 ../src/fr-window.c:5873 msgid "Open" msgstr "Öffnen" -#: ../src/actions.c:393 ../src/dlg-new.c:313 ../src/fr-window.c:5218 +#: ../src/actions.c:394 ../src/dlg-new.c:321 ../src/fr-window.c:5224 msgid "All archives" msgstr "Alle Archive" -#: ../src/actions.c:400 ../src/dlg-new.c:320 +#: ../src/actions.c:401 ../src/dlg-new.c:328 msgid "All files" msgstr "Alle Dateien" -#: ../src/actions.c:794 ../src/fr-window.c:7060 +#: ../src/actions.c:780 ../src/fr-window.c:7056 msgid "Last Output" msgstr "Letzte Ausgabe" -#: ../src/actions.c:858 +#: ../src/actions.c:844 msgid "" "File Roller 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 of the License, or (at your option) any later " -"version." +"the terms of the GNU General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." msgstr "" "File Roller ist freie Software. Sie können es unter den Bedingungen der GNU " "General Public License, wie von der Free Software Foundation veröffentlicht, " "weitergeben und/oder verändern, entweder gemäß Version 2 der Lizenz oder " "(nach Ihrer Option) jeder späteren Version." -#: ../src/actions.c:862 +#: ../src/actions.c:848 msgid "" "File Roller 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." +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +"more details." msgstr "" "Die Veröffentlichung von File Roller erfolgt in der Hoffnung, dass es Ihnen " -"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite " -"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. " -"Details finden Sie in der GNU General Public License." +"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die " +"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN " +"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License." -#: ../src/actions.c:866 +#: ../src/actions.c:852 msgid "" "You should have received a copy of the GNU General Public License along with " -"File Roller; if not, write to the Free Software Foundation, Inc., 51 Franklin " -"St, Fifth Floor, Boston, MA 02110-1301 USA" +"File Roller; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" msgstr "" "Sie sollten ein Exemplar der GNU General Public License zusammen mit File " "Roller erhalten haben. Falls nicht, schreiben Sie an die Free Software " "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA." -#: ../src/actions.c:876 +#: ../src/actions.c:862 msgid "Copyright © 2001–2010 Free Software Foundation, Inc." msgstr "Copyright © 2001-2010 Free Software Foundation, Inc." -#: ../src/actions.c:877 +#: ../src/actions.c:863 msgid "An archive manager for GNOME." msgstr "Ein Archiv-Verwalter für GNOME" -#: ../src/actions.c:880 +#: ../src/actions.c:866 msgid "translator-credits" msgstr "" "Stefan Furtmayr \n" @@ -343,24 +342,24 @@ "Christian Kirbach \n" "Mario Blättermann " -#: ../src/dlg-add-files.c:97 ../src/dlg-add-folder.c:130 +#: ../src/dlg-add-files.c:96 ../src/dlg-add-folder.c:129 msgid "Could not add the files to the archive" msgstr "Die Dateien konnten nicht zum Archiv hinzugefügt werden" -#: ../src/dlg-add-files.c:98 ../src/dlg-add-folder.c:131 +#: ../src/dlg-add-files.c:97 ../src/dlg-add-folder.c:130 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "" "Sie haben nicht die erforderlichen Zugriffsrechte, um Dateien im Ordner »%s« " "zu lesen" -#: ../src/dlg-add-files.c:146 ../src/ui.h:49 +#: ../src/dlg-add-files.c:144 ../src/ui.h:49 msgid "Add Files" msgstr "Dateien hinzufügen" #. Translators: add a file to the archive only if the disk version is #. * newer than the archive version. -#: ../src/dlg-add-files.c:162 ../src/dlg-add-folder.c:231 +#: ../src/dlg-add-files.c:160 ../src/dlg-add-folder.c:231 msgid "Add only if _newer" msgstr "Nur _hinzufügen, falls neuer" @@ -419,7 +418,7 @@ msgstr "Geben Sie das Passwort für das Archiv »%s« ein." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/dlg-batch-add.c:187 ../src/fr-window.c:7381 +#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7377 #, c-format msgid "" "The name \"%s\" is not valid because it cannot contain the characters: %s\n" @@ -430,12 +429,12 @@ "\n" "%s" -#: ../src/dlg-batch-add.c:190 ../src/fr-window.c:7371 ../src/fr-window.c:7376 -#: ../src/fr-window.c:7381 ../src/fr-window.c:7417 ../src/fr-window.c:7419 +#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7367 ../src/fr-window.c:7372 +#: ../src/fr-window.c:7377 ../src/fr-window.c:7413 ../src/fr-window.c:7415 msgid "Please use a different name." msgstr "Bitte geben Sie einen anderen Namen an." -#: ../src/dlg-batch-add.c:217 +#: ../src/dlg-batch-add.c:215 msgid "" "You don't have the right permissions to create an archive in the destination " "folder." @@ -443,7 +442,7 @@ "Sie haben nicht die erforderlichen Zugriffsrechte, um im Zielordner Archive " "anzulegen." -#: ../src/dlg-batch-add.c:233 ../src/dlg-extract.c:103 ../src/fr-window.c:6635 +#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6631 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -454,33 +453,33 @@ "\n" "Soll er angelegt werden?" -#: ../src/dlg-batch-add.c:242 ../src/dlg-extract.c:112 ../src/fr-window.c:6644 +#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6640 msgid "Create _Folder" msgstr "_Ordner anlegen" -#: ../src/dlg-batch-add.c:261 ../src/dlg-extract.c:132 ../src/fr-window.c:6664 +#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6660 #, c-format msgid "Could not create the destination folder: %s." msgstr "Der Zielordner konnte nicht angelegt werden: %s." -#: ../src/dlg-batch-add.c:278 +#: ../src/dlg-batch-add.c:276 msgid "Archive not created" msgstr "Archiv wurde nicht angelegt" -#: ../src/dlg-batch-add.c:326 +#: ../src/dlg-batch-add.c:324 msgid "The archive is already present. Do you want to overwrite it?" msgstr "Das Archiv existiert bereits. Soll es überschrieben werden?" -#: ../src/dlg-batch-add.c:329 +#: ../src/dlg-batch-add.c:327 msgid "_Overwrite" msgstr "_Überschreiben" -#: ../src/dlg-extract.c:131 ../src/dlg-extract.c:149 ../src/dlg-extract.c:176 -#: ../src/fr-window.c:4145 ../src/fr-window.c:6663 ../src/fr-window.c:6680 +#: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 +#: ../src/fr-window.c:4150 ../src/fr-window.c:6659 ../src/fr-window.c:6676 msgid "Extraction not performed" msgstr "Es wurden keine Dateien entpackt" -#: ../src/dlg-extract.c:177 ../src/fr-window.c:4308 ../src/fr-window.c:4388 +#: ../src/dlg-extract.c:176 ../src/fr-window.c:4313 ../src/fr-window.c:4393 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -488,32 +487,32 @@ "Sie haben nicht die erforderlichen Zugriffsrechte, um Archive im Ordner »%s« " "zu entpacken" -#: ../src/dlg-extract.c:332 ../src/dlg-extract.c:430 ../src/ui.h:124 +#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:124 msgid "Extract" msgstr "Entpacken" -#: ../src/dlg-extract.c:381 +#: ../src/dlg-extract.c:380 msgid "Actions" msgstr "Aktionen" -#: ../src/dlg-extract.c:397 +#: ../src/dlg-extract.c:396 msgid "Re-crea_te folders" msgstr "Ordner _neu anlegen" -#: ../src/dlg-extract.c:401 +#: ../src/dlg-extract.c:400 msgid "Over_write existing files" msgstr "_Vorhandene Dateien ersetzen" -#: ../src/dlg-extract.c:405 +#: ../src/dlg-extract.c:404 msgid "Do not e_xtract older files" msgstr "_Keine älteren Dateien entpacken" -#: ../src/dlg-new.c:439 +#: ../src/dlg-new.c:445 msgctxt "File" msgid "New" msgstr "Neu" -#: ../src/dlg-new.c:452 +#: ../src/dlg-new.c:458 msgctxt "File" msgid "Save" msgstr "Speichern" @@ -537,7 +536,7 @@ #: ../src/dlg-package-installer.c:281 msgid "_Search Command" -msgstr "_Suchbefehl" +msgstr "Befehl _suchen" #. Translators: after the colon there is a folder name. #: ../src/dlg-prop.c:107 @@ -574,12 +573,12 @@ msgid "Number of files:" msgstr "Anzahl der Dateien:" -#: ../src/dlg-update.c:158 +#: ../src/dlg-update.c:165 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Soll die Datei »%s« im Archiv »%s« aktualisiert werden?" -#: ../src/dlg-update.c:172 +#: ../src/dlg-update.c:194 #, c-format msgid "Update the files in the archive \"%s\"?" msgstr "Sollen die Dateien im Archiv »%s« aktualisiert werden?" @@ -633,15 +632,15 @@ msgid "The file doesn't exist" msgstr "Die Datei existiert nicht" -#: ../src/fr-archive.c:2415 +#: ../src/fr-archive.c:2416 msgid "You don't have the right permissions." msgstr "Sie haben nicht die erforderlichen Zugriffsrechte." -#: ../src/fr-archive.c:2415 +#: ../src/fr-archive.c:2416 msgid "This archive type cannot be modified" msgstr "Archive dieses Typs können nicht verändert werden" -#: ../src/fr-archive.c:2427 +#: ../src/fr-archive.c:2428 msgid "You can't add an archive to itself." msgstr "Ein Archiv kann nicht zu sich selbst hinzugefügt werden" @@ -668,7 +667,7 @@ msgid "Could not find the volume: %s" msgstr "Der Teil »%s« konnte nicht gefunden werden" -#: ../src/fr-command-tar.c:382 ../src/fr-window.c:2305 +#: ../src/fr-command-tar.c:382 ../src/fr-window.c:2310 msgid "Deleting files from archive" msgstr "Dateien werden aus dem Archiv gelöscht" @@ -688,144 +687,144 @@ msgid "_Extract" msgstr "_Entpacken" -#: ../src/fr-window.c:1504 +#: ../src/fr-window.c:1509 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" msgstr[0] "%d Objekt (%s)" msgstr[1] "%d Objekte (%s)" -#: ../src/fr-window.c:1509 +#: ../src/fr-window.c:1514 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" msgstr[0] "%d Objekt gewählt (%s)" msgstr[1] "%d Objekte gewählt (%s)" -#: ../src/fr-window.c:1579 +#: ../src/fr-window.c:1584 msgid "Folder" msgstr "Ordner" -#: ../src/fr-window.c:1977 +#: ../src/fr-window.c:1982 msgid "[read only]" msgstr "[schreibgeschützt]" -#: ../src/fr-window.c:2228 +#: ../src/fr-window.c:2233 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Der Ordner »%s« konnte nicht angezeigt werden" -#: ../src/fr-window.c:2296 ../src/fr-window.c:2326 +#: ../src/fr-window.c:2301 ../src/fr-window.c:2331 msgid "Creating archive" msgstr "Archiv wird erstellt" -#: ../src/fr-window.c:2299 +#: ../src/fr-window.c:2304 msgid "Loading archive" msgstr "Archiv wird geladen" -#: ../src/fr-window.c:2302 +#: ../src/fr-window.c:2307 msgid "Reading archive" msgstr "Archivinhalt wird eingelesen" -#: ../src/fr-window.c:2308 +#: ../src/fr-window.c:2313 msgid "Testing archive" msgstr "Das Archiv wird überprüft" -#: ../src/fr-window.c:2311 +#: ../src/fr-window.c:2316 msgid "Getting the file list" msgstr "Die Dateiliste wird abgerufen" -#: ../src/fr-window.c:2314 ../src/fr-window.c:2323 +#: ../src/fr-window.c:2319 ../src/fr-window.c:2328 msgid "Copying the file list" msgstr "Die Dateiliste wird kopiert" -#: ../src/fr-window.c:2317 +#: ../src/fr-window.c:2322 msgid "Adding files to archive" msgstr "Dateien werden zum Archiv hinzugefügt" -#: ../src/fr-window.c:2320 +#: ../src/fr-window.c:2325 msgid "Extracting files from archive" msgstr "Dateien werden aus dem Archiv entpackt" -#: ../src/fr-window.c:2329 +#: ../src/fr-window.c:2334 msgid "Saving archive" msgstr "Archiv wird gespeichert" -#: ../src/fr-window.c:2486 +#: ../src/fr-window.c:2491 msgid "_Open the Archive" msgstr "Archiv ö_ffnen" -#: ../src/fr-window.c:2487 +#: ../src/fr-window.c:2492 msgid "_Show the Files" msgstr "Dateien _anzeigen" -#: ../src/fr-window.c:2533 +#: ../src/fr-window.c:2538 msgid "Archive:" msgstr "Archiv:" -#: ../src/fr-window.c:2695 +#: ../src/fr-window.c:2700 msgid "Extraction completed successfully" msgstr "Archiv wurde erfolgreich entpackt" -#: ../src/fr-window.c:2718 +#: ../src/fr-window.c:2723 msgid "Archive created successfully" msgstr "Archiv wurde erfolgreich erstellt" -#: ../src/fr-window.c:2766 +#: ../src/fr-window.c:2771 msgid "please wait..." msgstr "Bitte warten …" -#: ../src/fr-window.c:2925 +#: ../src/fr-window.c:2930 msgid "An error occurred while extracting files." msgstr "Beim Entpacken der Dateien ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2931 +#: ../src/fr-window.c:2936 #, c-format msgid "Could not open \"%s\"" msgstr "»%s« konnte nicht geöffnet werden" -#: ../src/fr-window.c:2936 +#: ../src/fr-window.c:2941 msgid "An error occurred while loading the archive." msgstr "Beim Laden des Archivs ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2940 +#: ../src/fr-window.c:2945 msgid "An error occurred while deleting files from the archive." msgstr "Beim Löschen von Dateien aus dem Archiv ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2946 +#: ../src/fr-window.c:2951 msgid "An error occurred while adding files to the archive." msgstr "Beim Hinzufügen von Dateien zum Archiv ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2950 +#: ../src/fr-window.c:2955 msgid "An error occurred while testing archive." msgstr "Beim Testen des Archivs ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2954 +#: ../src/fr-window.c:2959 msgid "An error occurred while saving the archive." msgstr "Beim Speichern des Archivs ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2958 +#: ../src/fr-window.c:2963 msgid "An error occurred." msgstr "Es ist ein Fehler aufgetreten." -#: ../src/fr-window.c:2964 +#: ../src/fr-window.c:2969 msgid "Command not found." msgstr "Befehl wurde nicht gefunden." -#: ../src/fr-window.c:2967 +#: ../src/fr-window.c:2972 msgid "Command exited abnormally." msgstr "Befehl wurde abgebrochen." -#: ../src/fr-window.c:3166 +#: ../src/fr-window.c:3171 msgid "Test Result" msgstr "Ergebnis der Überprüfung" -#: ../src/fr-window.c:3988 ../src/fr-window.c:7968 ../src/fr-window.c:7995 -#: ../src/fr-window.c:8250 +#: ../src/fr-window.c:3993 ../src/fr-window.c:7964 ../src/fr-window.c:7991 +#: ../src/fr-window.c:8246 msgid "Could not perform the operation" msgstr "Die Aktion konnte nicht ausgeführt werden" -#: ../src/fr-window.c:4014 +#: ../src/fr-window.c:4019 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -833,76 +832,76 @@ "Soll diese Datei zum momentan geöffneten Archiv hinzugefügt oder als neues " "Archiv geöffnet werden?" -#: ../src/fr-window.c:4044 +#: ../src/fr-window.c:4049 msgid "Do you want to create a new archive with these files?" msgstr "Soll ein neues Archiv mit diesen Dateien erstellt werden?" -#: ../src/fr-window.c:4047 +#: ../src/fr-window.c:4052 msgid "Create _Archive" msgstr "_Archiv anlegen" -#: ../src/fr-window.c:4641 ../src/fr-window.c:5726 +#: ../src/fr-window.c:4642 ../src/fr-window.c:5721 msgid "Folders" msgstr "Ordner" -#: ../src/fr-window.c:4679 +#: ../src/fr-window.c:4680 msgctxt "File" msgid "Size" msgstr "Größe" -#: ../src/fr-window.c:4680 +#: ../src/fr-window.c:4681 msgctxt "File" msgid "Type" msgstr "Typ" -#: ../src/fr-window.c:4681 +#: ../src/fr-window.c:4682 msgctxt "File" msgid "Date Modified" msgstr "Änderungsdatum" -#: ../src/fr-window.c:4682 +#: ../src/fr-window.c:4683 msgctxt "File" msgid "Location" msgstr "Ort" -#: ../src/fr-window.c:4691 +#: ../src/fr-window.c:4692 msgctxt "File" msgid "Name" msgstr "Name" -#: ../src/fr-window.c:5647 +#: ../src/fr-window.c:5642 msgid "Find:" msgstr "Suchen:" -#: ../src/fr-window.c:5734 +#: ../src/fr-window.c:5729 msgid "Close the folders pane" msgstr "Ordnerleiste verbergen" -#: ../src/fr-window.c:5875 ../src/fr-window.c:5878 ../src/ui.h:142 +#: ../src/fr-window.c:5870 ../src/fr-window.c:5873 ../src/ui.h:142 #: ../src/ui.h:146 msgid "Open archive" msgstr "Archiv öffnen" -#: ../src/fr-window.c:5876 +#: ../src/fr-window.c:5871 msgid "Open a recently used archive" msgstr "Ein zuletzt geöffnetes Archiv öffnen" -#: ../src/fr-window.c:6206 +#: ../src/fr-window.c:6202 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Das Archiv »%s« konnte nicht gespeichert werden" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7371 +#: ../src/fr-window.c:7367 msgid "The new name is void." msgstr "Der neue Name ist leer." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7376 +#: ../src/fr-window.c:7372 msgid "The new name is equal to the old one." msgstr "Der neue Name entspricht dem alten Namen." -#: ../src/fr-window.c:7417 +#: ../src/fr-window.c:7413 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -913,7 +912,7 @@ "\n" "%s" -#: ../src/fr-window.c:7419 +#: ../src/fr-window.c:7415 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -924,50 +923,50 @@ "\n" "%s" -#: ../src/fr-window.c:7489 +#: ../src/fr-window.c:7485 msgid "Rename" msgstr "Umbenennen" -#: ../src/fr-window.c:7490 +#: ../src/fr-window.c:7486 msgid "New folder name" msgstr "Neuer Ordnername" -#: ../src/fr-window.c:7490 +#: ../src/fr-window.c:7486 msgid "New file name" msgstr "Neuer Dateiname" -#: ../src/fr-window.c:7494 +#: ../src/fr-window.c:7490 msgid "_Rename" msgstr "_Umbenennen" -#: ../src/fr-window.c:7511 ../src/fr-window.c:7531 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the folder" msgstr "Der Ordner konnte nicht umbenannt werden" -#: ../src/fr-window.c:7511 ../src/fr-window.c:7531 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the file" msgstr "Die Datei konnte nicht umbenannt werden" -#: ../src/fr-window.c:7929 +#: ../src/fr-window.c:7925 msgid "Paste Selection" msgstr "Auswahl einfügen" -#: ../src/fr-window.c:7930 +#: ../src/fr-window.c:7926 msgid "Destination folder" msgstr "Zielordner" -#: ../src/fr-window.c:8520 +#: ../src/fr-window.c:8516 msgid "Add files to an archive" msgstr "Dateien zu einem Archiv hinzufügen" -#: ../src/fr-window.c:8564 +#: ../src/fr-window.c:8560 msgid "Extract archive" msgstr "Archiv entpacken" #. This is the time format used in the "Date Modified" column and #. * in the Properties dialog. See the man page of strftime for an #. * explanation of the values. -#: ../src/glib-utils.c:561 +#: ../src/glib-utils.c:536 msgid "%d %B %Y, %H:%M" msgstr "%d. %B %Y, %H:%M" @@ -980,163 +979,163 @@ msgid "Could not display help" msgstr "Hilfe konnte nicht angezeigt werden" -#: ../src/main.c:82 +#: ../src/main.c:83 msgid "7-Zip (.7z)" msgstr "7-Zip (.7z)" -#: ../src/main.c:83 +#: ../src/main.c:84 msgid "Tar compressed with 7z (.tar.7z)" msgstr "Tar, 7z-komprimiert (.tar.7z)" -#: ../src/main.c:84 +#: ../src/main.c:85 msgid "Ace (.ace)" msgstr "Ace (.ace)" -#: ../src/main.c:86 +#: ../src/main.c:87 msgid "Ar (.ar)" msgstr "Ar (.ar)" -#: ../src/main.c:87 +#: ../src/main.c:88 msgid "Arj (.arj)" msgstr "Arj (.arj)" -#: ../src/main.c:89 +#: ../src/main.c:90 msgid "Tar compressed with bzip2 (.tar.bz2)" msgstr "Tar, bzip2-komprimiert (.tar.bz2)" -#: ../src/main.c:91 +#: ../src/main.c:92 msgid "Tar compressed with bzip (.tar.bz)" msgstr "Tar, bzip-komprimiert (.tar.bz)" -#: ../src/main.c:92 +#: ../src/main.c:93 msgid "Cabinet (.cab)" msgstr "Cabinet (.cab)" -#: ../src/main.c:93 +#: ../src/main.c:94 msgid "Rar Archived Comic Book (.cbr)" msgstr "Rar-archiviertes Comic-Buch (.cbr)" -#: ../src/main.c:94 +#: ../src/main.c:95 msgid "Zip Archived Comic Book (.cbz)" msgstr "Zip-archiviertes Comic-Buch (.cbz)" -#: ../src/main.c:97 +#: ../src/main.c:98 msgid "Tar compressed with gzip (.tar.gz)" msgstr "Tar, gzip-komprimiert (.tar.gz)" -#: ../src/main.c:100 +#: ../src/main.c:101 msgid "Ear (.ear)" msgstr "Ear (.ear)" -#: ../src/main.c:101 +#: ../src/main.c:102 msgid "Self-extracting zip (.exe)" msgstr "Selbst-entpackendes ZIP (.exe)" -#: ../src/main.c:103 +#: ../src/main.c:104 msgid "Jar (.jar)" msgstr "Jar (.jar)" -#: ../src/main.c:104 +#: ../src/main.c:105 msgid "Lha (.lzh)" msgstr "Lha (.lzh)" -#: ../src/main.c:105 +#: ../src/main.c:106 msgid "Lrzip (.lrz)" msgstr "Lrzip (.lrz)" -#: ../src/main.c:106 +#: ../src/main.c:107 msgid "Tar compressed with lrzip (.tar.lrz)" msgstr "Tar, lrzip-komprimiert (.tar.lrz)" -#: ../src/main.c:108 +#: ../src/main.c:109 msgid "Tar compressed with lzip (.tar.lz)" msgstr "Tar, lzip-komprimiert (.tar.lz)" -#: ../src/main.c:110 +#: ../src/main.c:111 msgid "Tar compressed with lzma (.tar.lzma)" msgstr "Tar, lzma-komprimiert (.tar.lzma)" -#: ../src/main.c:112 +#: ../src/main.c:113 msgid "Tar compressed with lzop (.tar.lzo)" msgstr "Tar, lzop-komprimiert (.tar.lzo)" -#: ../src/main.c:113 +#: ../src/main.c:114 msgid "Rar (.rar)" msgstr "Rar (.rar)" -#: ../src/main.c:116 +#: ../src/main.c:117 msgid "Tar uncompressed (.tar)" msgstr "Tar, unkomprimiert (.tar)" -#: ../src/main.c:117 +#: ../src/main.c:118 msgid "Tar compressed with compress (.tar.Z)" msgstr "Tar, compress-komprimiert (.tar.Z)" -#: ../src/main.c:119 +#: ../src/main.c:120 msgid "War (.war)" msgstr "War (.war)" -#: ../src/main.c:120 +#: ../src/main.c:121 msgid "Xz (.xz)" msgstr "Xz (.xz)" -#: ../src/main.c:121 +#: ../src/main.c:122 msgid "Tar compressed with xz (.tar.xz)" msgstr "Tar, xz-komprimiert (.tar.xz)" -#: ../src/main.c:122 +#: ../src/main.c:123 msgid "Zoo (.zoo)" msgstr "Zoo (.zip)" -#: ../src/main.c:123 +#: ../src/main.c:124 msgid "Zip (.zip)" msgstr "Zip (.zip)" -#: ../src/main.c:191 +#: ../src/main.c:192 msgid "Add files to the specified archive and quit the program" msgstr "Dateien zum angegebenen Archiv hinzufügen und das Programm beenden" -#: ../src/main.c:192 +#: ../src/main.c:193 msgid "ARCHIVE" msgstr "ARCHIV" -#: ../src/main.c:195 +#: ../src/main.c:196 msgid "Add files asking the name of the archive and quit the program" msgstr "" "Dateien zu einem anzugebenden Archiv hinzufügen und das Programm beenden" -#: ../src/main.c:199 +#: ../src/main.c:200 msgid "Extract archives to the specified folder and quit the program" msgstr "Archive im angegebenen Ordner entpacken und das Programm beenden" -#: ../src/main.c:200 ../src/main.c:212 +#: ../src/main.c:201 ../src/main.c:213 msgid "FOLDER" msgstr "ORDNER" -#: ../src/main.c:203 +#: ../src/main.c:204 msgid "Extract archives asking the destination folder and quit the program" msgstr "" "Archive in einem anzugebenden Zielordner entpacken und das Programm beenden" -#: ../src/main.c:207 +#: ../src/main.c:208 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" msgstr "Inhalt der Archive im Archivordner entpacken und das Programm beenden" -#: ../src/main.c:211 +#: ../src/main.c:212 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Der Vorgabeordner für die »--add« und »--extract«-Befehle" -#: ../src/main.c:215 +#: ../src/main.c:216 msgid "Create destination folder without asking confirmation" msgstr "Den Zielordner ohne Nachfrage anlegen" -#: ../src/main.c:297 +#: ../src/main.c:298 msgid "- Create and modify an archive" msgstr "- ein Archiv anlegen und verändern" -#: ../src/main.c:313 +#: ../src/main.c:314 msgid "File Roller" msgstr "File Roller" @@ -1445,11 +1444,11 @@ #~ msgstr "_Ziel öffnen" #~ msgid "" -#~ "Extract archives using the archive name as destination folder and quit the " -#~ "program" +#~ "Extract archives using the archive name as destination folder and quit " +#~ "the program" #~ msgstr "" -#~ "Archive in einem Zielordner mit dem jeweiligen Namen des Archivs entpacken " -#~ "und das Programm beenden" +#~ "Archive in einem Zielordner mit dem jeweiligen Namen des Archivs " +#~ "entpacken und das Programm beenden" #~ msgid "The archive already exists. Do you want to overwrite it?" #~ msgstr "Das Archiv existiert bereits. Soll es überschrieben werden?" diff -Nru file-roller-2.32.1/po/lv.po file-roller-2.32.2/po/lv.po --- file-roller-2.32.1/po/lv.po 2010-09-14 07:03:01.000000000 -0400 +++ file-roller-2.32.2/po/lv.po 2011-04-26 10:30:28.000000000 -0400 @@ -6,53 +6,55 @@ # Edgars Jēkabsons , 2004. # Raivis Dejus , 2006. # Peteris Krisjanis , 2010. +# Rudolfs , 2011. msgid "" msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=file-roller&component=general\n" -"POT-Creation-Date: 2010-04-25 15:18+0000\n" -"PO-Revision-Date: 2010-04-25 18:20+0300\n" -"Last-Translator: Peteris Krisjanis \n" -"Language-Team: Latviešu \n" +"POT-Creation-Date: 2010-10-04 14:20+0000\n" +"PO-Revision-Date: 2011-03-07 14:25+0200\n" +"Last-Translator: Rudolfs \n" +"Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.1\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Fails nav derīgs .desktop fails" -#: ../copy-n-paste/eggdesktopfile.c:188 +#: ../copy-n-paste/eggdesktopfile.c:190 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Neatpazīta darbvirsmas faila versija '%s'" -#: ../copy-n-paste/eggdesktopfile.c:958 +#: ../copy-n-paste/eggdesktopfile.c:960 #, c-format msgid "Starting %s" msgstr "Startē %s" -#: ../copy-n-paste/eggdesktopfile.c:1100 +#: ../copy-n-paste/eggdesktopfile.c:1102 #, c-format msgid "Application does not accept documents on command line" msgstr "Lietotne nepieņem norādes uz dokumentiem no komandrindas" -#: ../copy-n-paste/eggdesktopfile.c:1168 +#: ../copy-n-paste/eggdesktopfile.c:1170 #, c-format msgid "Unrecognized launch option: %d" msgstr "Neatpazīta palaišanas opcija: %d" -#: ../copy-n-paste/eggdesktopfile.c:1373 +#: ../copy-n-paste/eggdesktopfile.c:1375 #, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Nevar padot dokumentu URI uz 'Type=Link' darbvirsmas ierakstu" +#| msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgid "Can't pass documents to this desktop element" +msgstr "Nevar padot dokumentus uz šo darbvirsmas elementu" -#: ../copy-n-paste/eggdesktopfile.c:1392 +#: ../copy-n-paste/eggdesktopfile.c:1394 #, c-format msgid "Not a launchable item" msgstr "Nepalaižama vienība" @@ -86,7 +88,7 @@ msgstr "Rādīt sesijas pārvaldības opcijas" #: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1974 -#: ../src/fr-window.c:5377 +#: ../src/fr-window.c:5393 msgid "Archive Manager" msgstr "Arhīvu pārvaldnieks" @@ -106,7 +108,7 @@ msgid "Compress" msgstr "Saspiest" -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:4667 +#: ../data/ui/batch-add-files.ui.h:3 msgid "Location" msgstr "Vieta" @@ -115,28 +117,30 @@ msgid "MB" msgstr "MB" -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:3 +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:3 msgid "Split into _volumes of" msgstr "Sadalīt arhīvu daļās ar _izmēru" -#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:4 +#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:4 #: ../data/ui/password.ui.h:3 msgid "_Encrypt the file list too" msgstr "Šifrēt arī _failu sarakstu" -#: ../data/ui/batch-add-files.ui.h:8 +#: ../data/ui/batch-add-files.ui.h:9 msgid "_Filename:" msgstr "_Faila nosaukums:" -#: ../data/ui/batch-add-files.ui.h:9 ../src/fr-window.c:5798 +#. Translators: after the colon there is a folder name. +#: ../data/ui/batch-add-files.ui.h:10 ../src/fr-window.c:5815 msgid "_Location:" msgstr "_Vieta:" -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:5 +#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/new.ui.h:5 msgid "_Other Options" msgstr "_Citas opcijas" -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/batch-password.ui.h:2 +#: ../data/ui/batch-add-files.ui.h:12 ../data/ui/batch-password.ui.h:2 #: ../data/ui/new.ui.h:6 ../data/ui/password.ui.h:4 msgid "_Password:" msgstr "_Parole:" @@ -201,17 +205,24 @@ msgstr "Iz_vēlieties failus, kurus jūs vēlaties atjaunināt:" #. secondary text -#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:182 +#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:177 ../src/dlg-update.c:205 #, c-format +#| msgid "" +#| "The file has been modified with an external application. If you don't " +#| "update the version in the archive, all of your changes will be lost." +#| msgid_plural "" +#| "There are %d files that have been modified with an external application. " +#| "If you don't update the files in the archive, all of your changes will be " +#| "lost." msgid "" "The file has been modified with an external application. If you don't update " -"the version in the archive, all of your changes will be lost." +"the file in the archive, all of your changes will be lost." msgid_plural "" -"There are %d files that have been modified with an external application. If " -"you don't update the files in the archive, all of your changes will be lost." +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." msgstr[0] "" -"%d failu ir izmainījusi ārēja lietotne. Ja jūs neatjaunināsiet arhīva " -"versiju, visas jūsu izmaiņas tiks zaudētas." +"%d failu ir izmainījusi ārēja lietotne. Ja jūs neatjaunināsiet failu arhīvā, " +"visas jūsu izmaiņas tiks zaudētas." msgstr[1] "" "%d failus ir izmainījusi ārēja lietotne. Ja jūs neatjaunināsiet arhīva " "versiju, visas jūsu izmaiņas tiks zaudētas." @@ -227,23 +238,25 @@ msgid "Extract Here" msgstr "Atspiest šeit" -#: ../nautilus/nautilus-fileroller.c:314 -msgid "Extract the selected archive in the current position" +#. Translators: the current position is the current folder +#: ../nautilus/nautilus-fileroller.c:315 +#| msgid "Extract the selected archive in the current position" +msgid "Extract the selected archive to the current position" msgstr "Atspiest izvēlēto arhīvu šajā vietā" -#: ../nautilus/nautilus-fileroller.c:331 +#: ../nautilus/nautilus-fileroller.c:332 msgid "Extract To..." msgstr "Atspiest..." -#: ../nautilus/nautilus-fileroller.c:332 +#: ../nautilus/nautilus-fileroller.c:333 msgid "Extract the selected archive" msgstr "Atspiest izvēlēto arhīvu" -#: ../nautilus/nautilus-fileroller.c:351 +#: ../nautilus/nautilus-fileroller.c:352 msgid "Compress..." msgstr "Saspiest..." -#: ../nautilus/nautilus-fileroller.c:352 +#: ../nautilus/nautilus-fileroller.c:353 msgid "Create a compressed archive with the selected objects" msgstr "Izveidot saspiestu arhīvu no izvēlētajiem objektiem" @@ -262,10 +275,9 @@ msgid "You don't have permission to create an archive in this folder" msgstr "Jums nav atļaujas, lai izveidotu arhīvu šajā mapē" -#: ../src/actions.c:235 ../src/dlg-package-installer.c:203 -#: ../src/dlg-package-installer.c:245 ../src/dlg-package-installer.c:254 -#: ../src/dlg-package-installer.c:282 ../src/fr-archive.c:891 -#: ../src/fr-window.c:6017 ../src/fr-window.c:6193 +#: ../src/actions.c:235 ../src/dlg-package-installer.c:254 +#: ../src/dlg-package-installer.c:263 ../src/dlg-package-installer.c:291 +#: ../src/fr-archive.c:1146 ../src/fr-window.c:6034 ../src/fr-window.c:6210 msgid "Archive type not supported." msgstr "Arhīva veids nav atbalstīts." @@ -273,19 +285,19 @@ msgid "Could not delete the old archive." msgstr "Neizdevās izdzēst veco arhīvu." -#: ../src/actions.c:383 ../src/fr-window.c:5856 +#: ../src/actions.c:383 ../src/fr-window.c:5873 msgid "Open" msgstr "Atvērt" -#: ../src/actions.c:394 ../src/dlg-new.c:325 ../src/fr-window.c:5208 +#: ../src/actions.c:394 ../src/dlg-new.c:321 ../src/fr-window.c:5224 msgid "All archives" msgstr "Visi arhīvi" -#: ../src/actions.c:401 ../src/dlg-new.c:332 +#: ../src/actions.c:401 ../src/dlg-new.c:328 msgid "All files" msgstr "_Visi faili" -#: ../src/actions.c:780 ../src/fr-window.c:7036 +#: ../src/actions.c:780 ../src/fr-window.c:7056 msgid "Last Output" msgstr "Pēdējā izvade" @@ -297,10 +309,9 @@ "any later version." msgstr "" "File roller ir brīva programmatūra; jūs varat to izplatīt tālāk un/vai " -"modificēt " -"saskaņā ar GNU Vispārējās publiskās licences noteikumiem, ko publicējis " -"Brīvas programmatūras fonds; izmantojiet Licences versiju 2 vai (pēc jūsu " -"izvēles) jebkuru vēlāku versiju." +"modificēt saskaņā ar GNU Vispārējās publiskās licences noteikumiem, ko " +"publicējis Brīvas programmatūras fonds; izmantojiet Licences versiju 2 vai " +"(pēc jūsu izvēles) jebkuru vēlāku versiju." #: ../src/actions.c:848 msgid "" @@ -349,11 +360,13 @@ msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "Jums nav nepieciešamās atļaujas, lai nolasītu failus no mapes \"%s\"" -#: ../src/dlg-add-files.c:142 ../src/ui.h:48 +#: ../src/dlg-add-files.c:142 ../src/ui.h:49 msgid "Add Files" msgstr "Pievienot failus" -#: ../src/dlg-add-files.c:156 ../src/dlg-add-folder.c:231 +#. Translators: add a file to the archive only if the disk version is +#. * newer than the archive version. +#: ../src/dlg-add-files.c:158 ../src/dlg-add-folder.c:231 msgid "Add only if _newer" msgstr "_Pievienot tikai, ja jaunāks" @@ -411,7 +424,8 @@ msgid "Enter the password for the archive '%s'." msgstr "Ievadiet paroli arhīvam '%s'." -#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7354 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7377 #, c-format msgid "" "The name \"%s\" is not valid because it cannot contain the characters: %s\n" @@ -422,8 +436,8 @@ "\n" "%s" -#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7346 ../src/fr-window.c:7350 -#: ../src/fr-window.c:7354 ../src/fr-window.c:7390 ../src/fr-window.c:7392 +#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7367 ../src/fr-window.c:7372 +#: ../src/fr-window.c:7377 ../src/fr-window.c:7413 ../src/fr-window.c:7415 msgid "Please use a different name." msgstr "Lūdzu, lietojiet citu nosaukumu." @@ -433,7 +447,7 @@ "folder." msgstr "Jums nav pietiekamas atļaujas, lai izveidotu arhīvu mērķa mapē." -#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6611 +#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6631 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -444,11 +458,11 @@ "\n" "Vai vēlaties to izveidot?" -#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6620 +#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6640 msgid "Create _Folder" msgstr "Izveidot _mapi" -#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6640 +#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6660 #, c-format msgid "Could not create the destination folder: %s." msgstr "Neizdevās izveidot mērķa mapi: %s." @@ -466,17 +480,17 @@ msgstr "_Pārrakstīt" #: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 -#: ../src/fr-window.c:4134 ../src/fr-window.c:6639 ../src/fr-window.c:6656 +#: ../src/fr-window.c:4150 ../src/fr-window.c:6659 ../src/fr-window.c:6676 msgid "Extraction not performed" msgstr "Atspiešana nav veikta" -#: ../src/dlg-extract.c:176 ../src/fr-window.c:4297 ../src/fr-window.c:4377 +#: ../src/dlg-extract.c:176 ../src/fr-window.c:4313 ../src/fr-window.c:4393 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" msgstr "Jums nav nepieciešamās atļaujas, lai atspiestu arhīvus mapē \"%s\"" -#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:123 +#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:124 msgid "Extract" msgstr "Atspiest" @@ -496,19 +510,23 @@ msgid "Do not e_xtract older files" msgstr "Neatpiest _vecākus failus" -#: ../src/dlg-new.c:449 +#: ../src/dlg-new.c:445 +#| msgid "New" +msgctxt "File" msgid "New" msgstr "Jauns" -#: ../src/dlg-new.c:462 +#: ../src/dlg-new.c:458 +#| msgid "Save" +msgctxt "File" msgid "Save" msgstr "Saglabāt" -#: ../src/dlg-package-installer.c:102 +#: ../src/dlg-package-installer.c:96 ../src/dlg-package-installer.c:205 msgid "There was an internal error trying to search for applications:" msgstr "Gadījās iekšēja kļūda mēģinot meklēt lietotnes:" -#: ../src/dlg-package-installer.c:264 +#: ../src/dlg-package-installer.c:273 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -517,53 +535,56 @@ "Nav norādīta komanda %s failiem.\n" "Vai jūs vēlaties meklēt komandu, ar ko atvērt šo failu?" -#: ../src/dlg-package-installer.c:269 +#: ../src/dlg-package-installer.c:278 msgid "Could not open this file type" msgstr "Neizdevās atvērt šo failu tipu" -#: ../src/dlg-package-installer.c:272 +#: ../src/dlg-package-installer.c:281 msgid "_Search Command" msgstr "_Meklēt komandu" -#: ../src/dlg-prop.c:106 +#. Translators: after the colon there is a folder name. +#: ../src/dlg-prop.c:107 msgid "Location:" msgstr "Vieta:" -#: ../src/dlg-prop.c:118 +#: ../src/dlg-prop.c:119 +#| msgid "Name:" +msgctxt "File" msgid "Name:" msgstr "Nosaukums:" -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:125 #, c-format msgid "%s Properties" msgstr "%s īpašības" -#: ../src/dlg-prop.c:133 +#: ../src/dlg-prop.c:134 msgid "Modified on:" msgstr "Izmainīts:" -#: ../src/dlg-prop.c:143 +#: ../src/dlg-prop.c:144 msgid "Archive size:" msgstr "Arhīva izmērs:" -#: ../src/dlg-prop.c:154 +#: ../src/dlg-prop.c:155 msgid "Content size:" msgstr "Satura izmērs:" -#: ../src/dlg-prop.c:174 +#: ../src/dlg-prop.c:175 msgid "Compression ratio:" msgstr "Saspiedes _attieciba:" -#: ../src/dlg-prop.c:189 +#: ../src/dlg-prop.c:190 msgid "Number of files:" msgstr "Failu skaits:" -#: ../src/dlg-update.c:159 +#: ../src/dlg-update.c:165 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Atjaunināt failu \"%s\" arhīvā \"%s\"?" -#: ../src/dlg-update.c:173 +#: ../src/dlg-update.c:194 #, c-format msgid "Update the files in the archive \"%s\"?" msgstr "Atjaunināt failus arhīvā \"%s\"?" @@ -608,50 +629,59 @@ msgid "File format not recognized" msgstr "Faila formāts nav atpazīts" -#: ../src/fr-archive.c:871 +#: ../src/fr-archive.c:1126 msgid "File not found." msgstr "Fails nav atrasts." -#: ../src/fr-archive.c:1934 +#: ../src/fr-archive.c:1229 +#, c-format +#| msgid "The file does not exist." +msgid "The file doesn't exist" +msgstr "Fails neeksistē" + +#: ../src/fr-archive.c:2415 msgid "You don't have the right permissions." msgstr "Jums nav nepieciešamo atļauju." -#: ../src/fr-archive.c:1934 +#: ../src/fr-archive.c:2415 msgid "This archive type cannot be modified" msgstr "Šāda veida arhīvs nevar tikt mainīts" -#: ../src/fr-archive.c:1946 +#: ../src/fr-archive.c:2427 msgid "You can't add an archive to itself." msgstr "Jūs nevarat pievienot arhīvu sev pašam." -#: ../src/fr-command-7z.c:296 ../src/fr-command-rar.c:422 -#: ../src/fr-command-tar.c:301 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:296 ../src/fr-command-rar.c:434 +#: ../src/fr-command-tar.c:308 msgid "Adding file: " msgstr "Pievienojot failu: " -#: ../src/fr-command-7z.c:412 ../src/fr-command-rar.c:549 -#: ../src/fr-command-tar.c:418 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:412 ../src/fr-command-rar.c:561 +#: ../src/fr-command-tar.c:427 msgid "Extracting file: " msgstr "Atspiežot failu: " -#: ../src/fr-command-rar.c:500 ../src/fr-command-tar.c:365 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-rar.c:512 ../src/fr-command-tar.c:373 msgid "Removing file: " msgstr "Dzēšot failu: " -#: ../src/fr-command-rar.c:677 +#: ../src/fr-command-rar.c:689 #, c-format msgid "Could not find the volume: %s" msgstr "Neizdevās atrast arhīva daļu: %s" -#: ../src/fr-command-tar.c:374 ../src/fr-window.c:2310 +#: ../src/fr-command-tar.c:382 ../src/fr-window.c:2310 msgid "Deleting files from archive" msgstr "Dzēš failus no arhīva" -#: ../src/fr-command-tar.c:477 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "Vēlreiz saspiež arhīvu" -#: ../src/fr-command-tar.c:708 +#: ../src/fr-command-tar.c:737 msgid "Decompressing archive" msgstr "Atspiež arhīvu" @@ -797,8 +827,8 @@ msgid "Test Result" msgstr "Testa rezultāts" -#: ../src/fr-window.c:3993 ../src/fr-window.c:7941 ../src/fr-window.c:7968 -#: ../src/fr-window.c:8223 +#: ../src/fr-window.c:3993 ../src/fr-window.c:7964 ../src/fr-window.c:7991 +#: ../src/fr-window.c:8246 msgid "Could not perform the operation" msgstr "Neizdevās veikt darbību" @@ -818,57 +848,73 @@ msgid "Create _Archive" msgstr "Izveidot _arhīvu" -#: ../src/fr-window.c:4626 ../src/fr-window.c:5705 +#: ../src/fr-window.c:4642 ../src/fr-window.c:5721 msgid "Folders" msgstr "Mapes" -#: ../src/fr-window.c:4664 +#: ../src/fr-window.c:4680 +#| msgid "Size" +msgctxt "File" msgid "Size" msgstr "Izmērs" -#: ../src/fr-window.c:4665 +#: ../src/fr-window.c:4681 +#| msgid "Type" +msgctxt "File" msgid "Type" msgstr "Tips" -#: ../src/fr-window.c:4666 +#: ../src/fr-window.c:4682 +#| msgid "Date Modified" +msgctxt "File" msgid "Date Modified" msgstr "Izmaiņu datums" -#: ../src/fr-window.c:4676 +#: ../src/fr-window.c:4683 +#| msgid "Location" +msgctxt "File" +msgid "Location" +msgstr "Vieta" + +#: ../src/fr-window.c:4692 +#| msgid "Name" +msgctxt "File" msgid "Name" msgstr "Nosaukums" -#: ../src/fr-window.c:5626 +#: ../src/fr-window.c:5642 msgid "Find:" msgstr "Meklēt:" -#: ../src/fr-window.c:5713 +#: ../src/fr-window.c:5729 msgid "Close the folders pane" msgstr "Aizvērt mapju rūti" -#: ../src/fr-window.c:5853 ../src/fr-window.c:5856 ../src/ui.h:141 -#: ../src/ui.h:145 +#: ../src/fr-window.c:5870 ../src/fr-window.c:5873 ../src/ui.h:142 +#: ../src/ui.h:146 msgid "Open archive" msgstr "Atvērt arhīvu" -#: ../src/fr-window.c:5854 +#: ../src/fr-window.c:5871 msgid "Open a recently used archive" msgstr "Atvērt nesen izmantotu arhīvu" -#: ../src/fr-window.c:6185 +#: ../src/fr-window.c:6202 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Neizdodas saglabāt arhīvu \"%s\"" -#: ../src/fr-window.c:7346 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7367 msgid "The new name is void." msgstr "Jaunais nosaukums ir tukšs." -#: ../src/fr-window.c:7350 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7372 msgid "The new name is equal to the old one." msgstr "Jaunais nosaukums ir vienāds ar veco." -#: ../src/fr-window.c:7390 +#: ../src/fr-window.c:7413 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -879,7 +925,7 @@ "\n" "%s" -#: ../src/fr-window.c:7392 +#: ../src/fr-window.c:7415 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -890,43 +936,43 @@ "\n" "%s" -#: ../src/fr-window.c:7462 +#: ../src/fr-window.c:7485 msgid "Rename" msgstr "Pārsaukt" -#: ../src/fr-window.c:7463 +#: ../src/fr-window.c:7486 msgid "New folder name" msgstr "Jauns mapes nosaukums" -#: ../src/fr-window.c:7463 +#: ../src/fr-window.c:7486 msgid "New file name" msgstr "Jauns faila nosaukums" -#: ../src/fr-window.c:7467 +#: ../src/fr-window.c:7490 msgid "_Rename" msgstr "_Pārsaukt" -#: ../src/fr-window.c:7484 ../src/fr-window.c:7504 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the folder" msgstr "Neizdevās pārsaukt mapi" -#: ../src/fr-window.c:7484 ../src/fr-window.c:7504 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the file" msgstr "Neizdevās pārsaukt failu" -#: ../src/fr-window.c:7902 +#: ../src/fr-window.c:7925 msgid "Paste Selection" msgstr "Ielīmēt izvēlēto" -#: ../src/fr-window.c:7903 +#: ../src/fr-window.c:7926 msgid "Destination folder" msgstr "Mērķa mape" -#: ../src/fr-window.c:8493 +#: ../src/fr-window.c:8516 msgid "Add files to an archive" msgstr "Pievienot failus arhīvam" -#: ../src/fr-window.c:8537 +#: ../src/fr-window.c:8560 msgid "Extract archive" msgstr "Atspiest arhīvu" @@ -938,168 +984,178 @@ msgstr "%Y. gada %d. %B %H:%M" #. Expander -#: ../src/gtk-utils.c:430 +#: ../src/gtk-utils.c:442 msgid "Command _Line Output" msgstr "Komandrindas _izvade" -#: ../src/gtk-utils.c:767 +#: ../src/gtk-utils.c:779 msgid "Could not display help" msgstr "Neizdevās parādīt palīdzību" -#: ../src/main.c:81 +#: ../src/main.c:83 msgid "7-Zip (.7z)" msgstr "7-Zip (.7z)" -#: ../src/main.c:82 +#: ../src/main.c:84 msgid "Tar compressed with 7z (.tar.7z)" msgstr "Tar saspiests ar 7z (.tar.7z)" -#: ../src/main.c:83 +#: ../src/main.c:85 msgid "Ace (.ace)" msgstr "Ace (.ace)" -#: ../src/main.c:85 +#: ../src/main.c:87 msgid "Ar (.ar)" msgstr "Ar (.arj)" -#: ../src/main.c:86 +#: ../src/main.c:88 msgid "Arj (.arj)" msgstr "Arj (.arj)" -#: ../src/main.c:88 +#: ../src/main.c:90 msgid "Tar compressed with bzip2 (.tar.bz2)" msgstr "Tar saspiests ar bzip2 (.tar.bz2)" -#: ../src/main.c:90 +#: ../src/main.c:92 msgid "Tar compressed with bzip (.tar.bz)" msgstr "Tar saspiests ar bzip (.tar.bz)" -#: ../src/main.c:91 +#: ../src/main.c:93 msgid "Cabinet (.cab)" msgstr "Cabinet (.cab)" -#: ../src/main.c:92 +#: ../src/main.c:94 msgid "Rar Archived Comic Book (.cbr)" msgstr "Ar Rar saspiesta komiksu grāmata (.cbr)" -#: ../src/main.c:93 +#: ../src/main.c:95 msgid "Zip Archived Comic Book (.cbz)" msgstr "Ar Zip saspiesta komiksu grāmata (.cbz)" -#: ../src/main.c:96 +#: ../src/main.c:98 msgid "Tar compressed with gzip (.tar.gz)" msgstr "Tar saspiests ar gzip (.tar.gz)" -#: ../src/main.c:99 +#: ../src/main.c:101 msgid "Ear (.ear)" msgstr "Ear (.ear)" -#: ../src/main.c:100 +#: ../src/main.c:102 msgid "Self-extracting zip (.exe)" msgstr "Pašatspiedošs zip (.exe)" -#: ../src/main.c:102 +#: ../src/main.c:104 msgid "Jar (.jar)" msgstr "Jar (.jar)" -#: ../src/main.c:103 +#: ../src/main.c:105 msgid "Lha (.lzh)" msgstr "Lha (.lzh)" -#: ../src/main.c:105 +#: ../src/main.c:106 +#| msgid "Lha (.lzh)" +msgid "Lrzip (.lrz)" +msgstr "Lrzip (.lrz)" + +#: ../src/main.c:107 +#| msgid "Tar compressed with lzip (.tar.lz)" +msgid "Tar compressed with lrzip (.tar.lrz)" +msgstr "Tar saspiests ar lrzip (.tar.lrz)" + +#: ../src/main.c:109 msgid "Tar compressed with lzip (.tar.lz)" msgstr "Tar saspiests ar lzip (.tar.lz)" -#: ../src/main.c:107 +#: ../src/main.c:111 msgid "Tar compressed with lzma (.tar.lzma)" msgstr "Tar saspiests ar lzma (.tar.lzma)" -#: ../src/main.c:109 +#: ../src/main.c:113 msgid "Tar compressed with lzop (.tar.lzo)" msgstr "Tar saspiests ar lzop (.tar.lzo)" -#: ../src/main.c:110 +#: ../src/main.c:114 msgid "Rar (.rar)" msgstr "Rar (.rar)" -#: ../src/main.c:113 +#: ../src/main.c:117 msgid "Tar uncompressed (.tar)" msgstr "Tar nesaspiests (.tar)" -#: ../src/main.c:114 +#: ../src/main.c:118 msgid "Tar compressed with compress (.tar.Z)" msgstr "Tar saspiests ar compress (.tar.Z)" -#: ../src/main.c:116 +#: ../src/main.c:120 msgid "War (.war)" msgstr "War (.war)" -#: ../src/main.c:117 +#: ../src/main.c:121 msgid "Xz (.xz)" msgstr "Xz (.xz)" -#: ../src/main.c:118 +#: ../src/main.c:122 msgid "Tar compressed with xz (.tar.xz)" msgstr "Tar saspiests ar xz (.tar.xz)" -#: ../src/main.c:119 +#: ../src/main.c:123 msgid "Zoo (.zoo)" msgstr "Zoo (.zoo)" -#: ../src/main.c:120 +#: ../src/main.c:124 msgid "Zip (.zip)" msgstr "Zip (.zip)" -#: ../src/main.c:186 +#: ../src/main.c:192 msgid "Add files to the specified archive and quit the program" msgstr "Pievienot failus norādītajam arhīvam un iziet no programmas" -#: ../src/main.c:187 +#: ../src/main.c:193 msgid "ARCHIVE" msgstr "ARCHIVE" -#: ../src/main.c:190 +#: ../src/main.c:196 msgid "Add files asking the name of the archive and quit the program" msgstr "" "Pievienot failus, vaicājot pēc arhīva nosaukuma, un iziet no programmas" -#: ../src/main.c:194 +#: ../src/main.c:200 msgid "Extract archives to the specified folder and quit the program" msgstr "Atspiest arhīvus norādītajā mērķa mapē un iziet no programmas" -#: ../src/main.c:195 ../src/main.c:207 +#: ../src/main.c:201 ../src/main.c:213 msgid "FOLDER" msgstr "FOLDER" -#: ../src/main.c:198 +#: ../src/main.c:204 msgid "Extract archives asking the destination folder and quit the program" msgstr "Atspiest arhīvus, vaicājot pēc mērķa mapes, un iziet no programmas" -#: ../src/main.c:202 +#: ../src/main.c:208 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" msgstr "Atspiest arhīvu saturu arhīvu mapē un iziet no programmas" -#: ../src/main.c:206 +#: ../src/main.c:212 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Noklusētā mape, kuru lietot kopā ar '--add' un '--extract' komandām" -#: ../src/main.c:210 +#: ../src/main.c:216 msgid "Create destination folder without asking confirmation" msgstr "Izveidot mērķa mapi bez apstiprinājuma prasīšanas" -#: ../src/main.c:292 +#: ../src/main.c:298 msgid "- Create and modify an archive" msgstr "- Izveidot arhīvu un mainīt tā saturu" -#: ../src/main.c:308 +#: ../src/main.c:314 msgid "File Roller" msgstr "File Roller" #: ../src/ui.h:32 -msgid "_File" -msgstr "_Fails" +msgid "_Archive" +msgstr "_Arhīvs" #: ../src/ui.h:33 msgid "_Edit" @@ -1117,246 +1173,275 @@ msgid "_Arrange Files" msgstr "_Sakārtot failus" -#: ../src/ui.h:37 +#. Translators: this is the label for the "open recent file" sub-menu. +#: ../src/ui.h:38 msgid "Open _Recent" msgstr "Atvērt n_esenos" -#: ../src/ui.h:41 +#: ../src/ui.h:42 msgid "Information about the program" msgstr "Informācija par programmu" -#: ../src/ui.h:44 +#: ../src/ui.h:45 msgid "_Add Files..." msgstr "_Pievienot Failus..." -#: ../src/ui.h:45 ../src/ui.h:49 +#: ../src/ui.h:46 ../src/ui.h:50 msgid "Add files to the archive" msgstr "Pievienot failus arhīvam" -#: ../src/ui.h:52 +#: ../src/ui.h:53 msgid "Add a _Folder..." msgstr "Pievienot _mapi..." -#: ../src/ui.h:53 ../src/ui.h:57 +#: ../src/ui.h:54 ../src/ui.h:58 msgid "Add a folder to the archive" msgstr "Pievienot mapi arhīvam" -#: ../src/ui.h:56 +#: ../src/ui.h:57 msgid "Add Folder" msgstr "Pievienot mapi" -#: ../src/ui.h:61 +#: ../src/ui.h:62 msgid "Close the current archive" msgstr "Aizvērt pašreizējo arhīvu" -#: ../src/ui.h:64 +#: ../src/ui.h:65 msgid "Contents" msgstr "Saturs" -#: ../src/ui.h:65 +#: ../src/ui.h:66 msgid "Display the File Roller Manual" msgstr "Parādīt File Roller rokasgrāmatu" -#: ../src/ui.h:70 ../src/ui.h:91 +#: ../src/ui.h:71 ../src/ui.h:92 msgid "Copy the selection" msgstr "Kopēt izvēlēto" -#: ../src/ui.h:74 ../src/ui.h:95 +#: ../src/ui.h:75 ../src/ui.h:96 msgid "Cut the selection" msgstr "Izgriezt izvēlēto" -#: ../src/ui.h:78 ../src/ui.h:99 +#: ../src/ui.h:79 ../src/ui.h:100 msgid "Paste the clipboard" msgstr "Ielīmēt starpliktuves saturu" -#: ../src/ui.h:81 ../src/ui.h:102 +#: ../src/ui.h:82 ../src/ui.h:103 msgid "_Rename..." msgstr "_Pārsaukt..." -#: ../src/ui.h:82 ../src/ui.h:103 +#: ../src/ui.h:83 ../src/ui.h:104 msgid "Rename the selection" msgstr "Pārsaukt iezīmēto" -#: ../src/ui.h:86 ../src/ui.h:107 +#: ../src/ui.h:87 ../src/ui.h:108 msgid "Delete the selection from the archive" msgstr "Dzēst izvēlēto no arhīva" -#: ../src/ui.h:111 +#: ../src/ui.h:112 msgid "Dese_lect All" msgstr "_Neizvēlēties neko" -#: ../src/ui.h:112 +#: ../src/ui.h:113 msgid "Deselect all files" msgstr "Neizvēlēties nevienu failu" -#: ../src/ui.h:115 ../src/ui.h:119 +#: ../src/ui.h:116 ../src/ui.h:120 msgid "_Extract..." msgstr "_Atspiest..." -#: ../src/ui.h:116 ../src/ui.h:120 ../src/ui.h:124 +#: ../src/ui.h:117 ../src/ui.h:121 ../src/ui.h:125 msgid "Extract files from the archive" msgstr "Atspiest failus no arhīva" -#: ../src/ui.h:132 +#: ../src/ui.h:128 +#| msgid "Find:" +msgid "Find..." +msgstr "Meklēt..." + +#: ../src/ui.h:133 msgid "_Last Output" msgstr "_Pēdējā izvade" -#: ../src/ui.h:133 +#: ../src/ui.h:134 msgid "View the output produced by the last executed command" msgstr "Skatīt pēdējās izpildītās komandas izvadi" #: ../src/ui.h:137 +#| msgid "New" +msgctxt "File" +msgid "New..." +msgstr "Jauns..." + +#: ../src/ui.h:138 msgid "Create a new archive" msgstr "Izveidot jaunu arhīvu" -#: ../src/ui.h:148 +#: ../src/ui.h:141 +#| msgid "Open" +msgctxt "File" +msgid "Open..." +msgstr "Atvērt..." + +#: ../src/ui.h:149 msgid "_Open With..." msgstr "At_vērt ar..." -#: ../src/ui.h:149 +#: ../src/ui.h:150 msgid "Open selected files with an application" msgstr "Atvērt izvēlētos failus ar lietotni" -#: ../src/ui.h:152 +#: ../src/ui.h:153 msgid "Pass_word..." msgstr "Pa_role..." -#: ../src/ui.h:153 +#: ../src/ui.h:154 msgid "Specify a password for this archive" msgstr "Norādiet paroli šim arhīvam" -#: ../src/ui.h:157 +#: ../src/ui.h:158 msgid "Show archive properties" msgstr "Rādīt arhīva īpašības" -#: ../src/ui.h:161 +#: ../src/ui.h:162 msgid "Reload current archive" msgstr "Pārlādēt pašreizējo arhīvu" #: ../src/ui.h:165 +msgctxt "File" +msgid "Save As..." +msgstr "Saglabāt kā..." + +#: ../src/ui.h:166 msgid "Save the current archive with a different name" msgstr "Saglabāt pašreizējo arhīvu ar citu nosaukumu" -#: ../src/ui.h:169 +#: ../src/ui.h:170 msgid "Select all files" msgstr "Izvēlēties visus failus" -#: ../src/ui.h:173 +#: ../src/ui.h:174 msgid "Stop current operation" msgstr "Apturēt pašreizējo darbību" -#: ../src/ui.h:176 +#: ../src/ui.h:177 msgid "_Test Integrity" msgstr "_Testēt integritāti" -#: ../src/ui.h:177 +#: ../src/ui.h:178 msgid "Test whether the archive contains errors" msgstr "Pārbaudīt, vai arhīvs nav kļūdains" -#: ../src/ui.h:181 ../src/ui.h:185 +#: ../src/ui.h:182 ../src/ui.h:186 msgid "Open the selected file" msgstr "Atvērt izvēlēto failu" -#: ../src/ui.h:189 ../src/ui.h:193 +#: ../src/ui.h:190 ../src/ui.h:194 msgid "Open the selected folder" msgstr "Atvērt izvēlēto mapi" -#: ../src/ui.h:198 +#: ../src/ui.h:199 msgid "Go to the previous visited location" msgstr "Doties uz iepriekš apmeklēto vietu" -#: ../src/ui.h:202 +#: ../src/ui.h:203 msgid "Go to the next visited location" msgstr "Doties uz nākamo apmeklēto vietu" -#: ../src/ui.h:206 +#: ../src/ui.h:207 msgid "Go up one level" msgstr "Doties vienu līmeni uz augšu" -#: ../src/ui.h:210 +#. Translators: the home location is the home folder. +#: ../src/ui.h:212 msgid "Go to the home location" msgstr "Doties uz mājas vietu" -#: ../src/ui.h:218 +#: ../src/ui.h:220 msgid "_Toolbar" msgstr "_Rīkjosla" -#: ../src/ui.h:219 +#: ../src/ui.h:221 msgid "View the main toolbar" msgstr "Skatīt galveno rīkjoslu" -#: ../src/ui.h:223 +#: ../src/ui.h:225 msgid "Stat_usbar" msgstr "Statusa _josla" -#: ../src/ui.h:224 +#: ../src/ui.h:226 msgid "View the statusbar" msgstr "Skatīt statusjoslu" -#: ../src/ui.h:228 +#: ../src/ui.h:230 msgid "_Reversed Order" msgstr "_Apgriezta secība" -#: ../src/ui.h:229 +#: ../src/ui.h:231 msgid "Reverse the list order" msgstr "Apgriezt saraksta secību" -#: ../src/ui.h:233 +#: ../src/ui.h:235 msgid "_Folders" msgstr "_Mapes" -#: ../src/ui.h:234 +#: ../src/ui.h:236 msgid "View the folders pane" msgstr "Skatīt mapju rūti" -#: ../src/ui.h:243 +#: ../src/ui.h:245 msgid "View All _Files" msgstr "Skatīt visus _failus" -#: ../src/ui.h:246 +#: ../src/ui.h:248 msgid "View as a F_older" msgstr "Skatīt kā _mapi" -#: ../src/ui.h:254 +#: ../src/ui.h:256 msgid "by _Name" msgstr "pēc _nosaukuma" -#: ../src/ui.h:255 +#: ../src/ui.h:257 msgid "Sort file list by name" msgstr "Kārtot failu sarakstu pēc nosaukuma" -#: ../src/ui.h:257 +#: ../src/ui.h:259 msgid "by _Size" msgstr "pēc _izmēra" -#: ../src/ui.h:258 +#: ../src/ui.h:260 msgid "Sort file list by file size" msgstr "Kārtot failu sarakstu pēc izmēra" -#: ../src/ui.h:260 +#: ../src/ui.h:262 msgid "by T_ype" msgstr "pēc _tipa" -#: ../src/ui.h:261 +#: ../src/ui.h:263 msgid "Sort file list by type" msgstr "Kārtot failu sarakstu pēc tipa" -#: ../src/ui.h:263 +#: ../src/ui.h:265 msgid "by _Date Modified" msgstr "pēc _izmaiņu datuma" -#: ../src/ui.h:264 +#: ../src/ui.h:266 msgid "Sort file list by modification time" msgstr "Kārtot failu sarakstu pēc izmaiņu datuma" -#: ../src/ui.h:266 +#. Translators: this is the "sort by file location" menu item +#: ../src/ui.h:269 msgid "by _Location" msgstr "pēc _vietas" -#: ../src/ui.h:267 +#. Translators: location is the file location +#: ../src/ui.h:271 msgid "Sort file list by location" msgstr "Kārtot failu sarakstu pēc vietas" +#~ msgid "_File" +#~ msgstr "_Fails" + #~ msgid "Create Archive" #~ msgstr "Izveidot arhīvu" @@ -1393,9 +1478,6 @@ #~ msgid "Symbolic link" #~ msgstr "Simbolsaite" -#~ msgid "The file does not exist." -#~ msgstr "Fails neeksistē." - #~ msgid "_View File" #~ msgstr "Skatīt _Failu" @@ -1406,9 +1488,6 @@ #~ "Atspiest arhīvus, izmantojot arhīva nosaukumu par mērķa mapes nosaukumu, " #~ "un iziet no programmas" -#~ msgid "_Archive" -#~ msgstr "_Arhīvs" - #~ msgid "Select _All" #~ msgstr "Izvēlēties _Visus" diff -Nru file-roller-2.32.1/po/ro.po file-roller-2.32.2/po/ro.po --- file-roller-2.32.1/po/ro.po 2010-09-14 07:03:01.000000000 -0400 +++ file-roller-2.32.2/po/ro.po 2011-04-26 10:30:28.000000000 -0400 @@ -3,56 +3,56 @@ # Mugurel Tudor , 2003, 2004. # Mișu Moldovan , 2003-2009. # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009 -# Lucian Adrian Grijincu , 2009, 2010. +# Lucian Adrian Grijincu , 2009, 2010, 2011. +# Damian Petrișor Alin , 2011. msgid "" msgstr "" "Project-Id-Version: file-roller\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" "roller&component=general\n" -"POT-Creation-Date: 2010-02-12 12:14+0000\n" -"PO-Revision-Date: 2010-02-12 15:16+0300\n" +"POT-Creation-Date: 2011-03-08 20:52+0000\n" +"PO-Revision-Date: 2011-03-14 01:43+0200\n" "Last-Translator: Lucian Adrian Grijincu \n" -"Language-Team: Romanian GNOME Team \n" +"Language-Team: Romanian Gnome Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.5.2\n" +"X-Generator: Virtaal 0.6.1\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Fișierul nu este un fișier .desktop valid" -#: ../copy-n-paste/eggdesktopfile.c:188 +#: ../copy-n-paste/eggdesktopfile.c:190 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Versiune fișier desktop nerecunoscută „%s”" -#: ../copy-n-paste/eggdesktopfile.c:958 +#: ../copy-n-paste/eggdesktopfile.c:960 #, c-format msgid "Starting %s" msgstr "Se pornește %s" -#: ../copy-n-paste/eggdesktopfile.c:1100 +#: ../copy-n-paste/eggdesktopfile.c:1102 #, c-format msgid "Application does not accept documents on command line" msgstr "Aplicația nu acceptă documente în linia de comandă" -#: ../copy-n-paste/eggdesktopfile.c:1168 +#: ../copy-n-paste/eggdesktopfile.c:1170 #, c-format msgid "Unrecognized launch option: %d" msgstr "Opțiune de lansare nerecunoscută: %d" -#: ../copy-n-paste/eggdesktopfile.c:1373 +#: ../copy-n-paste/eggdesktopfile.c:1375 #, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Nu se pot trimite URI-uri de documente unei intrări desktop „Type=Link”" +msgid "Can't pass documents to this desktop element" +msgstr "Nu se pot trimite documente către acest element desktop" -#: ../copy-n-paste/eggdesktopfile.c:1392 +#: ../copy-n-paste/eggdesktopfile.c:1394 #, c-format msgid "Not a launchable item" msgstr "Nu este un element lansabil" @@ -86,7 +86,7 @@ msgstr "Afișează opțiunile administratorului de sesiune" #: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1974 -#: ../src/fr-window.c:5377 +#: ../src/fr-window.c:5393 msgid "Archive Manager" msgstr "Administrator de arhive" @@ -106,7 +106,7 @@ msgid "Compress" msgstr "Comprimă" -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:4667 +#: ../data/ui/batch-add-files.ui.h:3 msgid "Location" msgstr "Locație" @@ -115,28 +115,30 @@ msgid "MB" msgstr "MB" -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:3 +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:3 msgid "Split into _volumes of" msgstr "Împarte în _volume de" -#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:4 +#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:4 #: ../data/ui/password.ui.h:3 msgid "_Encrypt the file list too" msgstr "Cript_ează și lista de fișiere" -#: ../data/ui/batch-add-files.ui.h:8 +#: ../data/ui/batch-add-files.ui.h:9 msgid "_Filename:" msgstr "Nume _fișier:" -#: ../data/ui/batch-add-files.ui.h:9 ../src/fr-window.c:5798 +#. Translators: after the colon there is a folder name. +#: ../data/ui/batch-add-files.ui.h:10 ../src/fr-window.c:5815 msgid "_Location:" msgstr "_Locație:" -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:5 +#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/new.ui.h:5 msgid "_Other Options" msgstr "Alte _opțiuni" -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/batch-password.ui.h:2 +#: ../data/ui/batch-add-files.ui.h:12 ../data/ui/batch-password.ui.h:2 #: ../data/ui/new.ui.h:6 ../data/ui/password.ui.h:4 msgid "_Password:" msgstr "_Parolă:" @@ -200,23 +202,23 @@ msgstr "Al_egeți fișierele pe care doriți să le actualizați:" #. secondary text -#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:182 +#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:177 ../src/dlg-update.c:205 #, c-format msgid "" "The file has been modified with an external application. If you don't update " -"the version in the archive, all of your changes will be lost." +"the file in the archive, all of your changes will be lost." msgid_plural "" -"There are %d files that have been modified with an external application. If " -"you don't update the files in the archive, all of your changes will be lost." +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." msgstr[0] "" "Fișierul a fost modificat de către o aplicație externă. Dacă nu actualizați " -"versiunea din arhivă, toate modificările vor fi pierdute" +"fișierul din arhivă, toate modificările vor fi pierdute." msgstr[1] "" -"Există %d fișiere ce au fost modificate de către o aplicație externă. Dacă " -"nu actualizați versiunea din arhivă, toate modificările vor fi pierdute" +"%d fișiere au fost modificate de către o aplicație externă. Dacă nu " +"actualizați fișierele din arhivă, toate modificările vor fi pierdute." msgstr[2] "" -"Există %d de fișiere ce au fost modificate de către o aplicație externă. " -"Dacă nu actualizați versiunea din arhivă, toate modificările vor fi pierdute" +"%d de fișiere au fost modificate de către o aplicație externă. Dacă nu " +"actualizați fișierele din arhivă, toate modificările vor fi pierdute." #: ../data/ui/update.ui.h:3 msgid "_Update" @@ -226,23 +228,24 @@ msgid "Extract Here" msgstr "Dezarhivează aici" -#: ../nautilus/nautilus-fileroller.c:314 -msgid "Extract the selected archive in the current position" -msgstr "Extrage arhiva selectată în locația curentă" +#. Translators: the current position is the current folder +#: ../nautilus/nautilus-fileroller.c:315 +msgid "Extract the selected archive to the current position" +msgstr "Extrage arhiva selectată în poziția curentă" -#: ../nautilus/nautilus-fileroller.c:331 +#: ../nautilus/nautilus-fileroller.c:332 msgid "Extract To..." msgstr "Dezarhivează în..." -#: ../nautilus/nautilus-fileroller.c:332 +#: ../nautilus/nautilus-fileroller.c:333 msgid "Extract the selected archive" msgstr "Dezarhivează arhiva selectată" -#: ../nautilus/nautilus-fileroller.c:351 +#: ../nautilus/nautilus-fileroller.c:352 msgid "Compress..." msgstr "Comprimă..." -#: ../nautilus/nautilus-fileroller.c:352 +#: ../nautilus/nautilus-fileroller.c:353 msgid "Create a compressed archive with the selected objects" msgstr "Creează o arhivă comprimată din obiectele selectate" @@ -261,10 +264,9 @@ msgid "You don't have permission to create an archive in this folder" msgstr "Nu aveți drepturile necesare creării unei arhive în acest dosar" -#: ../src/actions.c:235 ../src/dlg-package-installer.c:184 -#: ../src/dlg-package-installer.c:227 ../src/dlg-package-installer.c:268 -#: ../src/dlg-package-installer.c:277 ../src/dlg-package-installer.c:306 -#: ../src/fr-archive.c:891 ../src/fr-window.c:6010 ../src/fr-window.c:6186 +#: ../src/actions.c:235 ../src/dlg-package-installer.c:254 +#: ../src/dlg-package-installer.c:263 ../src/dlg-package-installer.c:291 +#: ../src/fr-archive.c:1146 ../src/fr-window.c:6034 ../src/fr-window.c:6210 msgid "Archive type not supported." msgstr "Tip nesuportat de arhivă." @@ -272,19 +274,19 @@ msgid "Could not delete the old archive." msgstr "Nu s-a putut șterge vechea arhivă." -#: ../src/actions.c:383 ../src/fr-window.c:5856 +#: ../src/actions.c:383 ../src/fr-window.c:5873 msgid "Open" msgstr "Deschide" -#: ../src/actions.c:394 ../src/dlg-new.c:325 ../src/fr-window.c:5208 +#: ../src/actions.c:394 ../src/dlg-new.c:321 ../src/fr-window.c:5224 msgid "All archives" msgstr "Toate arhivele" -#: ../src/actions.c:401 ../src/dlg-new.c:332 +#: ../src/actions.c:401 ../src/dlg-new.c:328 msgid "All files" msgstr "Toate fișierele" -#: ../src/actions.c:780 ../src/fr-window.c:7029 +#: ../src/actions.c:780 ../src/fr-window.c:7056 msgid "Last Output" msgstr "Ultima ieșire" @@ -342,20 +344,22 @@ " Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n" " Mircea MITU https://launchpad.net/~mache" -#: ../src/dlg-add-files.c:94 ../src/dlg-add-folder.c:129 +#: ../src/dlg-add-files.c:96 ../src/dlg-add-folder.c:129 msgid "Could not add the files to the archive" msgstr "Nu s-au putut adăuga fișierele la arhivă" -#: ../src/dlg-add-files.c:95 ../src/dlg-add-folder.c:130 +#: ../src/dlg-add-files.c:97 ../src/dlg-add-folder.c:130 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "Nu aveți drepturile necesare pentru a citi din dosarul „%s”" -#: ../src/dlg-add-files.c:142 ../src/ui.h:48 +#: ../src/dlg-add-files.c:144 ../src/ui.h:49 msgid "Add Files" msgstr "Adaugă fișiere" -#: ../src/dlg-add-files.c:156 ../src/dlg-add-folder.c:231 +#. Translators: add a file to the archive only if the disk version is +#. * newer than the archive version. +#: ../src/dlg-add-files.c:160 ../src/dlg-add-folder.c:231 msgid "Add only if _newer" msgstr "Adaugă doar dacă sunt mai _noi" @@ -413,7 +417,8 @@ msgid "Enter the password for the archive '%s'." msgstr "Introduceți parola pentru arhiva „%s”." -#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7347 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/dlg-batch-add.c:185 ../src/fr-window.c:7377 #, c-format msgid "" "The name \"%s\" is not valid because it cannot contain the characters: %s\n" @@ -424,8 +429,8 @@ "\n" "%s" -#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7339 ../src/fr-window.c:7343 -#: ../src/fr-window.c:7347 ../src/fr-window.c:7383 ../src/fr-window.c:7385 +#: ../src/dlg-batch-add.c:188 ../src/fr-window.c:7367 ../src/fr-window.c:7372 +#: ../src/fr-window.c:7377 ../src/fr-window.c:7413 ../src/fr-window.c:7415 msgid "Please use a different name." msgstr "E nevoie să folosiți un alt nume." @@ -436,7 +441,7 @@ msgstr "" "Nu aveți drepturile necesare creării unei arhive în dosarul de destinație." -#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6604 +#: ../src/dlg-batch-add.c:231 ../src/dlg-extract.c:102 ../src/fr-window.c:6631 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -447,11 +452,11 @@ "\n" "Doriți să-l creați?" -#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6613 +#: ../src/dlg-batch-add.c:240 ../src/dlg-extract.c:111 ../src/fr-window.c:6640 msgid "Create _Folder" msgstr "Creează _dosar" -#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6633 +#: ../src/dlg-batch-add.c:259 ../src/dlg-extract.c:131 ../src/fr-window.c:6660 #, c-format msgid "Could not create the destination folder: %s." msgstr "Nu s-a putut crea dosarul de destinație: %s." @@ -469,17 +474,17 @@ msgstr "_Suprascrie" #: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 -#: ../src/fr-window.c:4134 ../src/fr-window.c:6632 ../src/fr-window.c:6649 +#: ../src/fr-window.c:4150 ../src/fr-window.c:6659 ../src/fr-window.c:6676 msgid "Extraction not performed" msgstr "Dezarhivarea nu a avut loc" -#: ../src/dlg-extract.c:176 ../src/fr-window.c:4297 ../src/fr-window.c:4377 +#: ../src/dlg-extract.c:176 ../src/fr-window.c:4313 ../src/fr-window.c:4393 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" msgstr "Nu aveți drepturile necesare pentru a extrage arhivele în dosarul „%s”" -#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:123 +#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:124 msgid "Extract" msgstr "Dezarhivează" @@ -499,19 +504,21 @@ msgid "Do not e_xtract older files" msgstr "_Nu dezarhiva fișierele mai vechi" -#: ../src/dlg-new.c:449 +#: ../src/dlg-new.c:445 +msgctxt "File" msgid "New" msgstr "Nou" -#: ../src/dlg-new.c:462 +#: ../src/dlg-new.c:458 +msgctxt "File" msgid "Save" msgstr "Salvează" -#: ../src/dlg-package-installer.c:91 +#: ../src/dlg-package-installer.c:96 ../src/dlg-package-installer.c:205 msgid "There was an internal error trying to search for applications:" msgstr "S-a produs o eroare internă în timpul căutarii după aplicații:" -#: ../src/dlg-package-installer.c:231 +#: ../src/dlg-package-installer.c:273 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -520,53 +527,55 @@ "Nu există nici o comandă instalată pentru fișiere %s.\n" "Doriți să căutați după o comandă pentru a deschide acest fișier?" -#: ../src/dlg-package-installer.c:236 +#: ../src/dlg-package-installer.c:278 msgid "Could not open this file type" msgstr "Nu s-a putut deschide acest tip de fișier" -#: ../src/dlg-package-installer.c:239 +#: ../src/dlg-package-installer.c:281 msgid "_Search Command" msgstr "_Comandă căutare" -#: ../src/dlg-prop.c:106 +#. Translators: after the colon there is a folder name. +#: ../src/dlg-prop.c:107 msgid "Location:" msgstr "Locație:" -#: ../src/dlg-prop.c:118 +#: ../src/dlg-prop.c:119 +msgctxt "File" msgid "Name:" msgstr "Nume:" -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:125 #, c-format msgid "%s Properties" msgstr "Proprietăți %s" -#: ../src/dlg-prop.c:133 +#: ../src/dlg-prop.c:134 msgid "Modified on:" msgstr "Modificat în:" -#: ../src/dlg-prop.c:143 +#: ../src/dlg-prop.c:144 msgid "Archive size:" msgstr "Mărime arhivă:" -#: ../src/dlg-prop.c:154 +#: ../src/dlg-prop.c:155 msgid "Content size:" msgstr "Mărime conținut:" -#: ../src/dlg-prop.c:174 +#: ../src/dlg-prop.c:175 msgid "Compression ratio:" msgstr "Rată de compresie:" -#: ../src/dlg-prop.c:189 +#: ../src/dlg-prop.c:190 msgid "Number of files:" msgstr "Număr fișiere:" -#: ../src/dlg-update.c:159 +#: ../src/dlg-update.c:165 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Actualizați fișierul „%s” din arhiva „%s”?" -#: ../src/dlg-update.c:173 +#: ../src/dlg-update.c:194 #, c-format msgid "Update the files in the archive \"%s\"?" msgstr "Actualizați fișierele din arhiva „%s”?" @@ -611,50 +620,58 @@ msgid "File format not recognized" msgstr "Format fișier nerecunoscut" -#: ../src/fr-archive.c:871 +#: ../src/fr-archive.c:1126 msgid "File not found." msgstr "Fișierul nu a fost găsit." -#: ../src/fr-archive.c:1934 +#: ../src/fr-archive.c:1229 +#, c-format +msgid "The file doesn't exist" +msgstr "Fișierul nu există" + +#: ../src/fr-archive.c:2395 msgid "You don't have the right permissions." msgstr "Nu aveți drepturile necesare." -#: ../src/fr-archive.c:1934 +#: ../src/fr-archive.c:2395 msgid "This archive type cannot be modified" msgstr "Tipul arhivei nu poate fi modificat" -#: ../src/fr-archive.c:1946 +#: ../src/fr-archive.c:2407 msgid "You can't add an archive to itself." msgstr "Nu puteți adăuga o arhivă la ea însăși." -#: ../src/fr-command-7z.c:296 ../src/fr-command-rar.c:422 -#: ../src/fr-command-tar.c:301 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:296 ../src/fr-command-rar.c:434 +#: ../src/fr-command-tar.c:308 msgid "Adding file: " msgstr "Se adaugă fișierul: " -#: ../src/fr-command-7z.c:412 ../src/fr-command-rar.c:549 -#: ../src/fr-command-tar.c:418 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-7z.c:412 ../src/fr-command-rar.c:561 +#: ../src/fr-command-tar.c:427 msgid "Extracting file: " msgstr "Se dezarhivează fișierul: " -#: ../src/fr-command-rar.c:500 ../src/fr-command-tar.c:365 +#. Translators: after the colon there is a filename. +#: ../src/fr-command-rar.c:512 ../src/fr-command-tar.c:373 msgid "Removing file: " msgstr "Se șterge fișierul: " -#: ../src/fr-command-rar.c:677 +#: ../src/fr-command-rar.c:689 #, c-format msgid "Could not find the volume: %s" msgstr "Nu s-a putut găsi volumul: %s" -#: ../src/fr-command-tar.c:374 ../src/fr-window.c:2310 +#: ../src/fr-command-tar.c:382 ../src/fr-window.c:2310 msgid "Deleting files from archive" msgstr "Se șterg fișierele din arhivă" -#: ../src/fr-command-tar.c:477 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "Se reface arhiva" -#: ../src/fr-command-tar.c:708 +#: ../src/fr-command-tar.c:737 msgid "Decompressing archive" msgstr "Se desface arhiva" @@ -800,8 +817,8 @@ msgid "Test Result" msgstr "Rezultatul testului" -#: ../src/fr-window.c:3993 ../src/fr-window.c:7934 ../src/fr-window.c:7961 -#: ../src/fr-window.c:8216 +#: ../src/fr-window.c:3993 ../src/fr-window.c:7964 ../src/fr-window.c:7991 +#: ../src/fr-window.c:8246 msgid "Could not perform the operation" msgstr "Nu s-a putut efectua operațiunea" @@ -821,57 +838,68 @@ msgid "Create _Archive" msgstr "Creează _arhivă" -#: ../src/fr-window.c:4626 ../src/fr-window.c:5705 +#: ../src/fr-window.c:4642 ../src/fr-window.c:5721 msgid "Folders" msgstr "Dosare" -#: ../src/fr-window.c:4664 +#: ../src/fr-window.c:4680 +msgctxt "File" msgid "Size" -msgstr "Mărime" +msgstr "Dimensiune" -#: ../src/fr-window.c:4665 +#: ../src/fr-window.c:4681 +msgctxt "File" msgid "Type" msgstr "Tip" -#: ../src/fr-window.c:4666 +#: ../src/fr-window.c:4682 +msgctxt "File" msgid "Date Modified" msgstr "Data modificării" -#: ../src/fr-window.c:4676 +#: ../src/fr-window.c:4683 +msgctxt "File" +msgid "Location" +msgstr "Locație" + +#: ../src/fr-window.c:4692 +msgctxt "File" msgid "Name" msgstr "Nume" -#: ../src/fr-window.c:5626 +#: ../src/fr-window.c:5642 msgid "Find:" msgstr "Caută:" -#: ../src/fr-window.c:5713 +#: ../src/fr-window.c:5729 msgid "Close the folders pane" msgstr "Închide panoul de dosare" -#: ../src/fr-window.c:5853 ../src/fr-window.c:5856 ../src/ui.h:141 -#: ../src/ui.h:145 +#: ../src/fr-window.c:5870 ../src/fr-window.c:5873 ../src/ui.h:142 +#: ../src/ui.h:146 msgid "Open archive" msgstr "Deschide o arhivă" -#: ../src/fr-window.c:5854 +#: ../src/fr-window.c:5871 msgid "Open a recently used archive" msgstr "Deschide o arhivă recent accesată" -#: ../src/fr-window.c:6178 +#: ../src/fr-window.c:6202 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Nu s-a putut salva arhiva „%s”" -#: ../src/fr-window.c:7339 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7367 msgid "The new name is void." msgstr "Noul nume este gol." -#: ../src/fr-window.c:7343 +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7372 msgid "The new name is equal to the old one." msgstr "Noul nume este identic cu cel vechi." -#: ../src/fr-window.c:7383 +#: ../src/fr-window.c:7413 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -882,7 +910,7 @@ "\n" "%s" -#: ../src/fr-window.c:7385 +#: ../src/fr-window.c:7415 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -893,43 +921,43 @@ "\n" "%s" -#: ../src/fr-window.c:7455 +#: ../src/fr-window.c:7485 msgid "Rename" msgstr "Redenumește" -#: ../src/fr-window.c:7456 +#: ../src/fr-window.c:7486 msgid "New folder name" msgstr "Nume dosar nou" -#: ../src/fr-window.c:7456 +#: ../src/fr-window.c:7486 msgid "New file name" msgstr "Nume fișier nou" -#: ../src/fr-window.c:7460 +#: ../src/fr-window.c:7490 msgid "_Rename" msgstr "_Redenumește" -#: ../src/fr-window.c:7477 ../src/fr-window.c:7497 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the folder" msgstr "Nu s-a putut redenumi dosarul" -#: ../src/fr-window.c:7477 ../src/fr-window.c:7497 +#: ../src/fr-window.c:7507 ../src/fr-window.c:7527 msgid "Could not rename the file" msgstr "Nu s-a putut redenumi fișierul" -#: ../src/fr-window.c:7895 +#: ../src/fr-window.c:7925 msgid "Paste Selection" msgstr "Lipește selecția" -#: ../src/fr-window.c:7896 +#: ../src/fr-window.c:7926 msgid "Destination folder" msgstr "Dosar de destinație" -#: ../src/fr-window.c:8486 +#: ../src/fr-window.c:8516 msgid "Add files to an archive" msgstr "Adaugă fișiere la o arhivă" -#: ../src/fr-window.c:8530 +#: ../src/fr-window.c:8560 msgid "Extract archive" msgstr "Dezarhivează arhiva" @@ -941,143 +969,151 @@ msgstr "%d %B %Y, %H:%M" #. Expander -#: ../src/gtk-utils.c:430 +#: ../src/gtk-utils.c:439 msgid "Command _Line Output" msgstr "Ieșire în _linie de comandă" -#: ../src/gtk-utils.c:767 +#: ../src/gtk-utils.c:776 msgid "Could not display help" msgstr "Nu s-a putut afișa ajutorul" -#: ../src/main.c:81 +#: ../src/main.c:83 msgid "7-Zip (.7z)" msgstr "7-Zip (.7z)" -#: ../src/main.c:82 +#: ../src/main.c:84 msgid "Tar compressed with 7z (.tar.7z)" msgstr "Tar comprimat cu 7z (.tar.7z)" -#: ../src/main.c:83 +#: ../src/main.c:85 msgid "Ace (.ace)" msgstr "Ace (.ace)" -#: ../src/main.c:85 +#: ../src/main.c:87 msgid "Ar (.ar)" msgstr "Ar (.ar)" -#: ../src/main.c:86 +#: ../src/main.c:88 msgid "Arj (.arj)" msgstr "Arj (.arj)" -#: ../src/main.c:88 +#: ../src/main.c:90 msgid "Tar compressed with bzip2 (.tar.bz2)" msgstr "Tar comprimat cu bzip2 (.tar.bz2)" -#: ../src/main.c:90 +#: ../src/main.c:92 msgid "Tar compressed with bzip (.tar.bz)" msgstr "Tar comprimat cu bzip (.tar.bz)" -#: ../src/main.c:91 +#: ../src/main.c:93 msgid "Cabinet (.cab)" msgstr "Cabinet (.cab)" -#: ../src/main.c:92 +#: ../src/main.c:94 msgid "Rar Archived Comic Book (.cbr)" msgstr "Benzi desenate comprimate Rar (.cbr)" -#: ../src/main.c:93 +#: ../src/main.c:95 msgid "Zip Archived Comic Book (.cbz)" msgstr "Benzi desenate comprimate Zip (.cbz)" -#: ../src/main.c:96 +#: ../src/main.c:98 msgid "Tar compressed with gzip (.tar.gz)" msgstr "Tar comprimat cu gzip (.tar.gz)" -#: ../src/main.c:99 +#: ../src/main.c:101 msgid "Ear (.ear)" msgstr "Ear (.ear)" -#: ../src/main.c:100 +#: ../src/main.c:102 msgid "Self-extracting zip (.exe)" msgstr "Zip executabil (.exe)" -#: ../src/main.c:102 +#: ../src/main.c:104 msgid "Jar (.jar)" msgstr "Jar (.jar)" -#: ../src/main.c:103 +#: ../src/main.c:105 msgid "Lha (.lzh)" msgstr "Lha (.lzh)" -#: ../src/main.c:105 +#: ../src/main.c:106 +msgid "Lrzip (.lrz)" +msgstr "Lrzip (.lrz)" + +#: ../src/main.c:107 +msgid "Tar compressed with lrzip (.tar.lrz)" +msgstr "Arhivă tar comprimată cu lrzip (.tar.lrz)" + +#: ../src/main.c:109 msgid "Tar compressed with lzip (.tar.lz)" msgstr "Arhivă TAR comprimată cu lzip (.tar.lz)" -#: ../src/main.c:107 +#: ../src/main.c:111 msgid "Tar compressed with lzma (.tar.lzma)" msgstr "Fișier tar compresat cu lzma (.tar.lzma)" -#: ../src/main.c:109 +#: ../src/main.c:113 msgid "Tar compressed with lzop (.tar.lzo)" msgstr "Tar comprimat cu lzop (.tar.lzo)" -#: ../src/main.c:110 +#: ../src/main.c:114 msgid "Rar (.rar)" msgstr "Rar (.rar)" -#: ../src/main.c:113 +#: ../src/main.c:117 msgid "Tar uncompressed (.tar)" msgstr "Tar necomprimat (.tar)" -#: ../src/main.c:114 +#: ../src/main.c:118 msgid "Tar compressed with compress (.tar.Z)" msgstr "Tar comprimat cu compress (.tar.Z)" -#: ../src/main.c:116 +#: ../src/main.c:120 msgid "War (.war)" msgstr "War (.war)" -#: ../src/main.c:117 +#: ../src/main.c:121 msgid "Xz (.xz)" msgstr "Xz (.xz)" -#: ../src/main.c:118 +#: ../src/main.c:122 msgid "Tar compressed with xz (.tar.xz)" msgstr "Arhivă TAR comprimată cu xz (.tar.xz)" -#: ../src/main.c:119 +#: ../src/main.c:123 msgid "Zoo (.zoo)" msgstr "Zoo (.zoo)" -#: ../src/main.c:120 +#: ../src/main.c:124 msgid "Zip (.zip)" msgstr "Zip (.zip)" -#: ../src/main.c:186 +#: ../src/main.c:192 msgid "Add files to the specified archive and quit the program" msgstr "Adaugă fișiere la arhiva specificată și părăsește programul" -#: ../src/main.c:187 +#: ../src/main.c:193 msgid "ARCHIVE" msgstr "ARHIVĂ" -#: ../src/main.c:190 +#: ../src/main.c:196 msgid "Add files asking the name of the archive and quit the program" msgstr "Adaugă fișierele cerând numele arhivei și ieși" -#: ../src/main.c:194 +#: ../src/main.c:200 msgid "Extract archives to the specified folder and quit the program" msgstr "Extrage arhivele în dosarul specificat și ieși" -#: ../src/main.c:195 ../src/main.c:207 +#: ../src/main.c:201 ../src/main.c:213 msgid "FOLDER" msgstr "DOSAR" -#: ../src/main.c:198 +#: ../src/main.c:204 msgid "Extract archives asking the destination folder and quit the program" msgstr "Extrage arhivele cerând un dosar de destinație și ieși" -#: ../src/main.c:202 +#: ../src/main.c:208 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" @@ -1085,25 +1121,25 @@ "Extrage conținutul arhivelor în dosarul de arhive și termină execuția " "programului" -#: ../src/main.c:206 +#: ../src/main.c:212 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Dosarul implicit folosit pentru comenzile „--add” și „--extract”" -#: ../src/main.c:210 +#: ../src/main.c:216 msgid "Create destination folder without asking confirmation" msgstr "Creează dosarul destinație fără a cere confirmarea" -#: ../src/main.c:292 +#: ../src/main.c:298 msgid "- Create and modify an archive" msgstr "- Creați ori modificați o arhivă" -#: ../src/main.c:308 +#: ../src/main.c:314 msgid "File Roller" msgstr "File Roller" #: ../src/ui.h:32 -msgid "_File" -msgstr "_Fișier" +msgid "_Archive" +msgstr "_Arhivă" #: ../src/ui.h:33 msgid "_Edit" @@ -1121,246 +1157,414 @@ msgid "_Arrange Files" msgstr "_Aranjează fișierele" -#: ../src/ui.h:37 +#. Translators: this is the label for the "open recent file" sub-menu. +#: ../src/ui.h:38 msgid "Open _Recent" msgstr "Deschise _recent" -#: ../src/ui.h:41 +#: ../src/ui.h:42 msgid "Information about the program" msgstr "Informații despre program" -#: ../src/ui.h:44 +#: ../src/ui.h:45 msgid "_Add Files..." msgstr "_Adaugă fișiere..." -#: ../src/ui.h:45 ../src/ui.h:49 +#: ../src/ui.h:46 ../src/ui.h:50 msgid "Add files to the archive" msgstr "Adaugă fișiere la arhivă" -#: ../src/ui.h:52 +#: ../src/ui.h:53 msgid "Add a _Folder..." msgstr "Adaugă _un dosar..." -#: ../src/ui.h:53 ../src/ui.h:57 +#: ../src/ui.h:54 ../src/ui.h:58 msgid "Add a folder to the archive" msgstr "Adaugă un dosar în arhivă" -#: ../src/ui.h:56 +#: ../src/ui.h:57 msgid "Add Folder" msgstr "Adaugă dosar" -#: ../src/ui.h:61 +#: ../src/ui.h:62 msgid "Close the current archive" msgstr "Închide arhiva curentă" -#: ../src/ui.h:64 +#: ../src/ui.h:65 msgid "Contents" msgstr "Conținut" -#: ../src/ui.h:65 +#: ../src/ui.h:66 msgid "Display the File Roller Manual" msgstr "Arată manualul aplicației File Roller" -#: ../src/ui.h:70 ../src/ui.h:91 +#: ../src/ui.h:71 ../src/ui.h:92 msgid "Copy the selection" msgstr "Copiază selecția" -#: ../src/ui.h:74 ../src/ui.h:95 +#: ../src/ui.h:75 ../src/ui.h:96 msgid "Cut the selection" msgstr "Taie selecția" -#: ../src/ui.h:78 ../src/ui.h:99 +#: ../src/ui.h:79 ../src/ui.h:100 msgid "Paste the clipboard" msgstr "Lipește din clipboard" -#: ../src/ui.h:81 ../src/ui.h:102 +#: ../src/ui.h:82 ../src/ui.h:103 msgid "_Rename..." msgstr "_Redenumește..." -#: ../src/ui.h:82 ../src/ui.h:103 +#: ../src/ui.h:83 ../src/ui.h:104 msgid "Rename the selection" msgstr "Redenumește selecția" -#: ../src/ui.h:86 ../src/ui.h:107 +#: ../src/ui.h:87 ../src/ui.h:108 msgid "Delete the selection from the archive" msgstr "Șterge selecția din arhivă" -#: ../src/ui.h:111 +#: ../src/ui.h:112 msgid "Dese_lect All" msgstr "_Deselectează tot" -#: ../src/ui.h:112 +#: ../src/ui.h:113 msgid "Deselect all files" msgstr "Deselectează toate fișierele" -#: ../src/ui.h:115 ../src/ui.h:119 +#: ../src/ui.h:116 ../src/ui.h:120 msgid "_Extract..." msgstr "De_zarhivează..." -#: ../src/ui.h:116 ../src/ui.h:120 ../src/ui.h:124 +#: ../src/ui.h:117 ../src/ui.h:121 ../src/ui.h:125 msgid "Extract files from the archive" msgstr "Dezarhivează fișiere din arhivă" -#: ../src/ui.h:132 +#: ../src/ui.h:128 +msgid "Find..." +msgstr "Caută..." + +#: ../src/ui.h:133 msgid "_Last Output" msgstr "_Ultima ieșire" -#: ../src/ui.h:133 +#: ../src/ui.h:134 msgid "View the output produced by the last executed command" msgstr "Arată ieșirea ultimei comenzi executate" #: ../src/ui.h:137 +msgctxt "File" +msgid "New..." +msgstr "Nou..." + +#: ../src/ui.h:138 msgid "Create a new archive" msgstr "Creează o nouă arhivă" -#: ../src/ui.h:148 +#: ../src/ui.h:141 +msgctxt "File" +msgid "Open..." +msgstr "Deschide..." + +#: ../src/ui.h:149 msgid "_Open With..." msgstr "De_schide cu..." -#: ../src/ui.h:149 +#: ../src/ui.h:150 msgid "Open selected files with an application" msgstr "Deschide fișierele selectate cu o aplicație" -#: ../src/ui.h:152 +#: ../src/ui.h:153 msgid "Pass_word..." msgstr "_Parolă..." -#: ../src/ui.h:153 +#: ../src/ui.h:154 msgid "Specify a password for this archive" msgstr "Alegeți o parolă pentru această arhivă" -#: ../src/ui.h:157 +#: ../src/ui.h:158 msgid "Show archive properties" msgstr "Arată proprietățile arhivei" -#: ../src/ui.h:161 +#: ../src/ui.h:162 msgid "Reload current archive" msgstr "Reîncarcă arhiva curentă" #: ../src/ui.h:165 +msgctxt "File" +msgid "Save As..." +msgstr "Salvează ca..." + +#: ../src/ui.h:166 msgid "Save the current archive with a different name" msgstr "Salvează arhiva curentă cu un alt nume" -#: ../src/ui.h:169 +#: ../src/ui.h:170 msgid "Select all files" msgstr "Selectează toate fișierele" -#: ../src/ui.h:173 +#: ../src/ui.h:174 msgid "Stop current operation" msgstr "Oprește operația curentă" -#: ../src/ui.h:176 +#: ../src/ui.h:177 msgid "_Test Integrity" msgstr "_Test integritate" -#: ../src/ui.h:177 +#: ../src/ui.h:178 msgid "Test whether the archive contains errors" msgstr "Testează arhiva pentru erori" -#: ../src/ui.h:181 ../src/ui.h:185 +#: ../src/ui.h:182 ../src/ui.h:186 msgid "Open the selected file" msgstr "Deschide fișierul ales" -#: ../src/ui.h:189 ../src/ui.h:193 +#: ../src/ui.h:190 ../src/ui.h:194 msgid "Open the selected folder" msgstr "Deschide dosarul ales" -#: ../src/ui.h:198 +#: ../src/ui.h:199 msgid "Go to the previous visited location" msgstr "Du-te la locația precedentă" -#: ../src/ui.h:202 +#: ../src/ui.h:203 msgid "Go to the next visited location" msgstr "Du-te la locația următoare" -#: ../src/ui.h:206 +#: ../src/ui.h:207 msgid "Go up one level" msgstr "Du-te un nivel mai sus" -#: ../src/ui.h:210 +#. Translators: the home location is the home folder. +#: ../src/ui.h:212 msgid "Go to the home location" msgstr "Du-te la locația „Acasă”" -#: ../src/ui.h:218 +#: ../src/ui.h:220 msgid "_Toolbar" -msgstr "Bară cu unel_te" +msgstr "Bară de unel_te" -#: ../src/ui.h:219 +#: ../src/ui.h:221 msgid "View the main toolbar" -msgstr "Arată bara cu unelte principală" +msgstr "Arată bara principală de unelte" -#: ../src/ui.h:223 +#: ../src/ui.h:225 msgid "Stat_usbar" msgstr "Bară de s_tare" -#: ../src/ui.h:224 +#: ../src/ui.h:226 msgid "View the statusbar" msgstr "Arată bara de stare" -#: ../src/ui.h:228 +#: ../src/ui.h:230 msgid "_Reversed Order" msgstr "Ordine _inversă" -#: ../src/ui.h:229 +#: ../src/ui.h:231 msgid "Reverse the list order" msgstr "Inversează ordinea listei" -#: ../src/ui.h:233 +#: ../src/ui.h:235 msgid "_Folders" msgstr "_Dosare" -#: ../src/ui.h:234 +#: ../src/ui.h:236 msgid "View the folders pane" msgstr "Arată panoul dosarelor" -#: ../src/ui.h:243 +#: ../src/ui.h:245 msgid "View All _Files" msgstr "Arată toate _fișierele" -#: ../src/ui.h:246 +#: ../src/ui.h:248 msgid "View as a F_older" msgstr "Arată ca un d_osar" -#: ../src/ui.h:254 +#: ../src/ui.h:256 msgid "by _Name" msgstr "după _nume" -#: ../src/ui.h:255 +#: ../src/ui.h:257 msgid "Sort file list by name" msgstr "Sortează lista de fișiere după nume" -#: ../src/ui.h:257 +#: ../src/ui.h:259 msgid "by _Size" msgstr "după _mărime" -#: ../src/ui.h:258 +#: ../src/ui.h:260 msgid "Sort file list by file size" msgstr "Sortează lista de fișiere după mărime" -#: ../src/ui.h:260 +#: ../src/ui.h:262 msgid "by T_ype" msgstr "după _tip" -#: ../src/ui.h:261 +#: ../src/ui.h:263 msgid "Sort file list by type" msgstr "Sortează lista de fișiere după tip" -#: ../src/ui.h:263 +#: ../src/ui.h:265 msgid "by _Date Modified" msgstr "după _data modificării" -#: ../src/ui.h:264 +#: ../src/ui.h:266 msgid "Sort file list by modification time" msgstr "Sortează lista de fișiere după data modificării" -#: ../src/ui.h:266 +#. Translators: this is the "sort by file location" menu item +#: ../src/ui.h:269 msgid "by _Location" msgstr "după _locație" -#: ../src/ui.h:267 +#. Translators: location is the file location +#: ../src/ui.h:271 msgid "Sort file list by location" msgstr "Sortează lista de fișiere după locație" +#~ msgid "Compression level" +#~ msgstr "Nivel de compresie" + +#~ msgid "" +#~ "Compression level used when adding files to an archive. Possible values: " +#~ "very-fast, fast, normal, maximum." +#~ msgstr "" +#~ "Nivelul de compresie folosit atunci când se adaugă fișiere la o arhivă. " +#~ "Valori posibile: foarte-rapid, rapid, normal, maxim." + +#~ msgid "Default volume size" +#~ msgstr "Mărimea volumului implicită" + +#~ msgid "Display path" +#~ msgstr "Afișează calea" + +#~ msgid "Display size" +#~ msgstr "Dimensiunea afișajului" + +#~ msgid "Display the path column in the main window." +#~ msgstr "Afișează coloana de cale în fereastra principală." + +#~ msgid "Display the size column in the main window." +#~ msgstr "Afișează coloana de dimensiune în fereastra principală." + +#~ msgid "Display the time column in the main window." +#~ msgstr "Afișează coloana de timp în fereastra principală." + +#~ msgid "Display the type column in the main window." +#~ msgstr "Afișează coloana de tip în fereastra principală." + +#~ msgid "Display time" +#~ msgstr "Afișează timpul" + +#~ msgid "Display type" +#~ msgstr "Afișează tipul" + +#~ msgid "Do not overwrite newer files" +#~ msgstr "Nu suprascrie fișierele mai noi" + +#~ msgid "Editors" +#~ msgstr "Editoare" + +#~ msgid "Encrypt the archive header" +#~ msgstr "Criptează antetul arhivei" + +#~ msgid "How to sort files" +#~ msgstr "Cum se sortează fișierele" + +#~ msgid "" +#~ "If true will display icons depending on the file type (slower), otherwise " +#~ "will use always the same icon for all files (faster)." +#~ msgstr "" +#~ "Dacă este adevărat se vor afișa iconițe în funcție de tipul de fișier " +#~ "(mai lent), altfel se va utiliza întotdeauna aceeași iconiță pentru toate " +#~ "fișierele (mai rapid)." + +#~ msgid "List Mode" +#~ msgstr "Modul de listare" + +#~ msgid "" +#~ "List of applications entered in the 'Open File' dialog and not associated " +#~ "with the file type." +#~ msgstr "" +#~ "Listă de aplicații introduse în dialogul „Deschide fișier” și neasociate " +#~ "cu tipul de fișier." + +#~ msgid "Max history length" +#~ msgstr "Lungimea maximă a istoricului" + +#~ msgid "Max number of items in the 'Open Recents' submenu." +#~ msgstr "Numărul maxim de elemente din submeniul „Deschide recente”." + +#~ msgid "Name column width" +#~ msgstr "Lățimea coloanei nume" + +#~ msgid "Overwrite existing files" +#~ msgstr "Suprascrie fișierele existente" + +#~ msgid "Recreate the folders stored in the archive" +#~ msgstr "Recreează dosarele stocate în arhivă" + +#~ msgid "Sort type" +#~ msgstr "Tipul de sortare" + +#~ msgid "The default size for volumes." +#~ msgstr "Dimensiunea implicită pentru volume." + +# LG: trimis bug pentru exprimare: https://bugzilla.gnome.org/show_bug.cgi?id=644683 +#, fuzzy +#~ msgid "The default width of the name column the file list." +#~ msgstr "Lățimea implicită a coloanei nume pe în lista de fișiere." + +#~ msgid "" +#~ "Use 'all-files' to view all the files in the archive in a single list, " +#~ "use 'as-folder' to navigate the archive as a folder." +#~ msgstr "" +#~ "Folosiți „all-files” pentru a vizualiza toate fișierele din arhivă într-o " +#~ "singură listă, folosiți „as-folder” pentru a naviga arhiva ca un dosar." + +#~ msgid "Use mime icons" +#~ msgstr "Folosește iconițe pentru tipurile mime" + +#~ msgid "View statusbar" +#~ msgstr "Arată bara de stare" + +#~ msgid "View toolbar" +#~ msgstr "Arată bara de unelte" + +#~ msgid "" +#~ "What criteria must be used to arrange files. Possible values: name, size, " +#~ "type, time, path." +#~ msgstr "" +#~ "Ce criterii trebuie folosite pentru a aranja fișierele. Valori posibile: " +#~ "„name”, „size”, „type”, „time”, „path”." + +#~ msgid "Whether to display the folders pane." +#~ msgstr "Dacă se afișează panoul de dosare." + +#~ msgid "Whether to display the statusbar." +#~ msgstr "Dacă se afișează bara de stare." + +#~ msgid "Whether to display the toolbar." +#~ msgstr "Dacă se afișează bara de unelte." + +#~ msgid "" +#~ "Whether to encrypt the archive header. If the header is encrypted the " +#~ "password will be required to list the archive content as well." +#~ msgstr "" +#~ "Dacă să se cripteze antetul arhivei. Dacă antetul este criptat va fi " +#~ "necesară și parola pentru a lista conținutul arhivei." + +#~ msgid "" +#~ "Whether to sort in ascending or descending direction. Possible values: " +#~ "ascending, descending." +#~ msgstr "" +#~ "Dacă se sortează în ordine crescătoare sau descrescătoare. Valori " +#~ "posibile: „ascending”, „descending”." + +#~ msgid "Windows Imaging Format (.wim)" +#~ msgstr "Windows Imaging Format (.wim)" + +#~ msgid "_File" +#~ msgstr "_Fișier" + #~ msgid "Archive _type:" #~ msgstr "_Tip arhivă:" diff -Nru file-roller-2.32.1/src/commands/Makefile.in file-roller-2.32.2/src/commands/Makefile.in --- file-roller-2.32.1/src/commands/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/src/commands/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -179,8 +179,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/src/fr-archive.c file-roller-2.32.2/src/fr-archive.c --- file-roller-2.32.1/src/fr-archive.c 2010-11-15 14:47:39.000000000 -0500 +++ file-roller-2.32.2/src/fr-archive.c 2011-04-26 10:29:35.000000000 -0400 @@ -1448,25 +1448,6 @@ } -static GList * -convert_to_local_file_list (GList *file_list) -{ - GList *local_file_list = NULL; - GList *scan; - - for (scan = file_list; scan; scan = scan->next) { - char *uri = scan->data; - char *local_filename; - - local_filename = g_uri_unescape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH); - if (local_filename != NULL) - local_file_list = g_list_prepend (local_file_list, local_filename); - } - - return local_file_list; -} - - static gboolean save_list_to_temp_file (GList *file_list, char **list_dir, @@ -1591,7 +1572,6 @@ fr_archive_stoppable (archive, fr_archive_add_is_stoppable (archive)); - file_list = convert_to_local_file_list (file_list); tmp_base_dir = g_strdup (base_dir); if ((dest_dir != NULL) && (*dest_dir != '\0') && (strcmp (dest_dir, "/") != 0)) { @@ -1608,10 +1588,9 @@ char *filename = scan->data; new_file_list = g_list_prepend (new_file_list, g_build_filename (rel_dest_dir, filename, NULL)); } - path_list_free (file_list); } else - new_file_list = file_list; + new_file_list = path_list_dup (file_list); /* if the command cannot update, get the list of files that are * newer than the ones in the archive. */ diff -Nru file-roller-2.32.1/src/fr-command-lrzip.c file-roller-2.32.2/src/fr-command-lrzip.c --- file-roller-2.32.1/src/fr-command-lrzip.c 2010-06-28 04:55:11.000000000 -0400 +++ file-roller-2.32.2/src/fr-command-lrzip.c 2011-04-26 10:29:35.000000000 -0400 @@ -51,12 +51,10 @@ fdata->size = g_ascii_strtoull (get_last_field (line, 4), NULL, 10); struct stat st; - time_t tt; if (stat (comm->filename, &st) == 0) fdata->modified = st.st_mtim.tv_sec; else time(&(fdata->modified)); - fdata->modified; fdata->encrypted = FALSE; char *new_fname = g_strdup (file_name_from_path (comm->filename)); diff -Nru file-roller-2.32.1/src/fr-command-rar.c file-roller-2.32.2/src/fr-command-rar.c --- file-roller-2.32.1/src/fr-command-rar.c 2010-06-28 04:55:11.000000000 -0400 +++ file-roller-2.32.2/src/fr-command-rar.c 2011-04-26 10:30:28.000000000 -0400 @@ -675,6 +675,11 @@ break; } + if (strstr (line, "wrong password") != NULL) { + error->type = FR_PROC_ERROR_ASK_PASSWORD; + break; + } + if (strncmp (line, "Unexpected end of archive", 25) == 0) { /* FIXME: handle this type of errors at a higher level when the freeze is over. */ } diff -Nru file-roller-2.32.1/src/gtk-utils.c file-roller-2.32.2/src/gtk-utils.c --- file-roller-2.32.1/src/gtk-utils.c 2010-11-01 09:29:57.000000000 -0400 +++ file-roller-2.32.2/src/gtk-utils.c 2011-04-26 10:29:35.000000000 -0400 @@ -159,10 +159,7 @@ const char *text) { GtkWidget *button; - GtkWidget *hbox; GtkWidget *image; - GtkWidget *label; - GtkWidget *align; const char *label_text; gboolean text_is_stock; GtkStockItem stock_item; diff -Nru file-roller-2.32.1/src/Makefile.in file-roller-2.32.2/src/Makefile.in --- file-roller-2.32.1/src/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/src/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -274,8 +274,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru file-roller-2.32.1/src/sh/Makefile.in file-roller-2.32.2/src/sh/Makefile.in --- file-roller-2.32.1/src/sh/Makefile.in 2010-11-15 14:45:41.000000000 -0500 +++ file-roller-2.32.2/src/sh/Makefile.in 2011-04-26 10:38:48.000000000 -0400 @@ -170,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@