[Xfce4-commits] r24783 - in squeeze/trunk: . libsqueeze po
Stephan Arts
stephan at xfce.org
Mon Jan 29 12:14:24 CET 2007
Author: stephan
Date: 2007-01-29 11:14:24 +0000 (Mon, 29 Jan 2007)
New Revision: 24783
Modified:
squeeze/trunk/INSTALL
squeeze/trunk/depcomp
squeeze/trunk/install-sh
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/missing
squeeze/trunk/po/be.po
squeeze/trunk/po/cs.po
squeeze/trunk/po/fi.po
squeeze/trunk/po/fr.po
squeeze/trunk/po/nl.po
squeeze/trunk/po/squeeze.pot
Log:
updated a string
Modified: squeeze/trunk/INSTALL
===================================================================
--- squeeze/trunk/INSTALL 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/INSTALL 2007-01-29 11:14:24 UTC (rev 24783)
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,31 +87,29 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +157,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -190,12 +188,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
Modified: squeeze/trunk/depcomp
===================================================================
--- squeeze/trunk/depcomp 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/depcomp 2007-01-29 11:14:24 UTC (rev 24783)
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-02-09.22
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,8 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -91,7 +92,20 @@
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -276,6 +290,46 @@
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +342,13 @@
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
@@ -467,7 +521,8 @@
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
Modified: squeeze/trunk/install-sh
===================================================================
--- squeeze/trunk/install-sh 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/install-sh 2007-01-29 11:14:24 UTC (rev 24783)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-02-02.21
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,15 +39,24 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=" "" $nl"
+
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -58,7 +67,13 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
@@ -95,7 +110,7 @@
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
-c) shift
continue;;
@@ -111,9 +126,15 @@
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
+ -m) mode=$2
shift
shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -136,25 +157,33 @@
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
+ --) shift
break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
esac
done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
+fi
+
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,6 +193,33 @@
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
@@ -173,15 +229,11 @@
if test -n "$dir_arg"; then
dst=$src
- src=
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
- else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -208,53 +260,188 @@
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ obsolete_mkdir_used=false
- # Make sure that the destination directory exists.
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
- pathcomp=
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
+
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ $posix_glob && set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
- pathcomp=$pathcomp/
- done
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +449,9 @@
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -276,10 +462,10 @@
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -291,11 +477,12 @@
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
@@ -304,17 +491,14 @@
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ $doit $mvcmd "$dsttmp" "$dst"
}
- }
- fi || { (exit 1); exit 1; }
+ } || exit 1
+
+ trap '' 0
+ fi
done
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
-
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/libsqueeze/archive.c 2007-01-29 11:14:24 UTC (rev 24783)
@@ -480,7 +480,7 @@
switch(i)
{
case LSQ_ARCHIVE_PROP_FILENAME:
- retval = _("Filename");
+ retval = _("Name");
break;
case LSQ_ARCHIVE_PROP_MIME_TYPE:
retval = _("Mime type");
Modified: squeeze/trunk/missing
===================================================================
--- squeeze/trunk/missing 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/missing 2007-01-29 11:14:24 UTC (rev 24783)
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-02-08.22
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,14 +290,23 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
@@ -314,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
Modified: squeeze/trunk/po/be.po
===================================================================
--- squeeze/trunk/po/be.po 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/be.po 2007-01-29 11:14:24 UTC (rev 24783)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: squeeze trunk\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-26 19:44+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: 2007-01-20 04:24+0300\n"
"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -16,52 +16,53 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
-msgstr "Назва файла"
+#: ../libsqueeze/archive.c:483
+#, fuzzy
+msgid "Name"
+msgstr "Назва:"
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr "Тып MIME"
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr "Ініцыялізацыя архіва"
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr "Абнаўленьне зьместу архіва"
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr "Дадаваньне файлаў да архіва"
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr "Распакоўка файлаў з архіва"
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr "Выдаленьне файлаў з архіва"
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr "Зроблена"
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
#, fuzzy
msgid "Extracting file(s) to temporary directory"
msgstr "Распакоўка файлаў з архіва"
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr "Выкананьне пашыранага дзеяньня"
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr "Скасаванае"
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr "Памылка"
@@ -263,23 +264,23 @@
"%s: %s\n"
"Паспрабуйце %s --help, каб убачыць сьпіс наяўных опцыяў.\n"
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr "Унутраны стыль"
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr "Стыль панэлі сродкаў"
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr "Стыль панэлі шляху"
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr "Стыль навігацыі"
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -288,131 +289,131 @@
"Стыль навігацыі праз архіў"
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr "_Файл"
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr "_Дзеяньне"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr "_Дадаць"
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr "Рас_пакаваць"
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr "_Выгляд"
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr "_Даведка"
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr "Дадаць"
-#: ../src/main_window.c:396 ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Распакаваць"
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr "Адкрыць архіў у новым акне"
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr "Адкрыць архіў"
-#: ../src/main_window.c:749 ../src/main_window.c:1085 ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:787 ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
#, fuzzy
msgid "Are you sure you want to remove the selected files?"
msgstr "Якое дзеяньне вы жадаеце выканаць над вылучанымі файламі?"
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
msgstr ""
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr "Асноўны распрацоўнік:"
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr "Укладальнікі:"
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr ""
-#: ../src/main_window.c:947
+#: ../src/main_window.c:966
msgid ""
"The add and extract icons are based on the extract icon created by Andreas "
"Nilsson"
msgstr ""
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr "У натхненьні ад Xarchiver, напісана Giuseppe Torelli"
-#: ../src/main_window.c:954
+#: ../src/main_window.c:973
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr "Squeeze - гэта лёгкі і гнуткі кіраўнік архіваў для асяродзьдзя Xfce"
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr "Аляксандар Няхайчык"
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Якое дзеяньне вы жадаеце выканаць над вылучанымі файламі?"
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr "Выгляд"
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr "Немагчыма адкрыць файл"
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -556,12 +557,12 @@
msgid "Make the row background colors alternate"
msgstr "Задаць альтэрнатыўныя колеры тла радка"
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Немагчыма адкрыць архіў \"%s\"."
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Немагчыма распакаваць зьмест архіва \"%s\"."
@@ -582,6 +583,9 @@
msgid "Xfce archive manager"
msgstr "Кіраўнік архіваў Xfce"
+#~ msgid "Filename"
+#~ msgstr "Назва файла"
+
#~ msgid "Test"
#~ msgstr "Праверка"
Modified: squeeze/trunk/po/cs.po
===================================================================
--- squeeze/trunk/po/cs.po 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/cs.po 2007-01-29 11:14:24 UTC (rev 24783)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24156\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-26 19:44+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: 2007-01-20 11:55+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,52 +16,53 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
-msgstr "Název souboru"
+#: ../libsqueeze/archive.c:483
+#, fuzzy
+msgid "Name"
+msgstr "Název:"
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr "Typ MIME"
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr "Inicializuji archiv"
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr "Znovu načítám obsah archivu"
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr "Přidávám soubor(y) z archivu"
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr "Rozbaluji soubor(y) z archivu"
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr "Odebírám soubor(y) z archivu"
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr "Hotovo"
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
#, fuzzy
msgid "Extracting file(s) to temporary directory"
msgstr "Rozbaluji soubor(y) z archivu"
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr "Provádí se rozšířená funkce"
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr "Zrušeno"
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr "Chyba"
@@ -264,23 +265,23 @@
"Příkazem %s --help zobrazíte kompletní seznam dostupných voleb z příkazové "
"řádky.\n"
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr "Vnitřní styl"
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr "Styl panelu nástrojů"
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr "Styl panelu cesty"
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr "Styl navigace"
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -289,74 +290,74 @@
"Styl navigace archivem"
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr "_Soubor"
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr "_Akce"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr "_Přidat"
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr "_Rozbalit"
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr "_Zobrazit"
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr "_Nápověda"
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr "Přidat"
-#: ../src/main_window.c:396 ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Rozbalit"
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr "Otevřít archiv v novém okně"
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr "Otevřít archiv"
-#: ../src/main_window.c:749 ../src/main_window.c:1085 ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:787 ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
msgid "Are you sure you want to remove the selected files?"
msgstr "Jste si jisti, že chcete odebrat vybrané soubory?"
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
@@ -364,57 +365,57 @@
"Jste si jisti, že chcete zrušit tuto operaci?\n"
"Tímto můžete poškodit archiv."
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr "Vedoucí vývojář:"
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr "Přispěvatelé:"
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr ""
-#: ../src/main_window.c:947
+#: ../src/main_window.c:966
msgid ""
"The add and extract icons are based on the extract icon created by Andreas "
"Nilsson"
msgstr ""
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr "Inspirováno aplikací Xarchiver od Giuseppe Torelliho"
-#: ../src/main_window.c:954
+#: ../src/main_window.c:973
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr "Squeeze je odlehčený a pružný správce archivů pro prostředí Xfce."
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr "translator-credits"
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Jakou akci si přejete provést na vybraných souborech?"
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr "Zobrazit"
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr "Nepodařilo se otevřít soubor"
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -557,12 +558,12 @@
msgid "Make the row background colors alternate"
msgstr "Změní barvu pozadí řádku"
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Nepodařilo se otevřít archiv '%s'"
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Nepodařilo se rozbalit obsah archivu '%s'."
@@ -583,6 +584,9 @@
msgid "Xfce archive manager"
msgstr "Správce archivů Xfce"
+#~ msgid "Filename"
+#~ msgstr "Název souboru"
+
#~ msgid "Test"
#~ msgstr "Test"
Modified: squeeze/trunk/po/fi.po
===================================================================
--- squeeze/trunk/po/fi.po 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/fi.po 2007-01-29 11:14:24 UTC (rev 24783)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.4.2rc2\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-26 19:44+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: 2007-01-18 17:17+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -15,52 +15,53 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
-msgstr "Tiedostonimi"
+#: ../libsqueeze/archive.c:483
+#, fuzzy
+msgid "Name"
+msgstr "Nimi:"
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr "MIME-tyyppi"
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr "Alustetaan arkisto"
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr "Virkistetään arkiston sisältö"
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr "Lisätään tiedosto(ja) arkistoon"
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr "Puretaan tiedosto(ja) arkistosta"
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr "Poistetaan tiedosto(ja) arkistosta"
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr "Valmis"
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
#, fuzzy
msgid "Extracting file(s) to temporary directory"
msgstr "Puretaan tiedosto(ja) arkistosta"
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr "Suoritetaan lisätoiminto"
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr "Peruutettu"
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr "Virhe"
@@ -262,23 +263,23 @@
"%s: %s\n"
"Kirjoittamalla %s --help saat täyden listan komentorivivalitsimista.\n"
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr "Sisäinen tyyli"
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr "Työkalupalkkityyli"
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr "Polkupalkkityyli"
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr "Navigointitapa"
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -287,103 +288,103 @@
"Tapa, jolla navigoit arkistossa"
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr "_Tiedosto"
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr "Toi_minto"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr "_Lisää"
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr "P_ura"
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr "_Näytä"
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr "_Ohje"
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr "Lisää"
-#: ../src/main_window.c:396 ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Pura"
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr "Avaa arkisto uuteen ikkunaan"
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr "Avaa arkisto"
-#: ../src/main_window.c:749 ../src/main_window.c:1085 ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:787 ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
#, fuzzy
msgid "Are you sure you want to remove the selected files?"
msgstr "Mitä haluat tehdä valitu(i)lle tiedosto(i)lle?"
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
msgstr ""
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr "Pääkehittäjä:"
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr "Avustavat kehittäjät:"
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr ""
-#: ../src/main_window.c:947
+#: ../src/main_window.c:966
msgid ""
"The add and extract icons are based on the extract icon created by Andreas "
"Nilsson"
msgstr ""
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr "Inspiraatio Giuseppe Torellin sovelluksesta Xarchiver"
-#: ../src/main_window.c:954
+#: ../src/main_window.c:973
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
@@ -391,29 +392,29 @@
"Squeeze on kevyt ja joustava arkistonhallintasovellus Xfce-"
"työpöytäympäristöön"
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Mitä haluat tehdä valitu(i)lle tiedosto(i)lle?"
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr "Näytä"
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr "Linkin avaaminen epäonnistui"
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -557,12 +558,12 @@
msgid "Make the row background colors alternate"
msgstr "Vuorottele rivien taustavärejä"
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Arkiston \"%s\" sisällön purkaminen epäonnistui."
@@ -583,6 +584,9 @@
msgid "Xfce archive manager"
msgstr "Xfce:n arkistonhallinta"
+#~ msgid "Filename"
+#~ msgstr "Tiedostonimi"
+
#~ msgid "Test"
#~ msgstr "Tarkista"
Modified: squeeze/trunk/po/fr.po
===================================================================
--- squeeze/trunk/po/fr.po 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/fr.po 2007-01-29 11:14:24 UTC (rev 24783)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-25 01:23+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: 2007-01-26 20:22+0100\n"
"Last-Translator: Maximilian Schleiss <maxschleiss at bluewin.ch>\n"
"Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -15,51 +15,52 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
-msgstr "Nom de fichier"
+#: ../libsqueeze/archive.c:483
+#, fuzzy
+msgid "Name"
+msgstr "Nom :"
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr "Type MIME"
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr "Initialisation de l'archive"
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr "Rafraîchir le contenu de l'archive"
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr "Ajout de fichier(s) à l'archive"
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr "Extraction de fichier(s) de l'archive"
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr "Suppression de fichier(s) de l'archive"
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr "Terminé"
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
msgid "Extracting file(s) to temporary directory"
msgstr "Extraction de fichier(s) vers un dossier temporaire"
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr "Action étendue en cours"
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr "Annulé"
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr "Erreur"
@@ -260,23 +261,23 @@
"%s : %s\n"
"Essayez %s --help pour avoir une liste complète d'options.\n"
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr "Style interne"
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr "Style de la barre d'outils"
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr "Style de la barre de chemin"
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr "Style de navigation"
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -285,54 +286,51 @@
"La manière de naviguer dans l'archive"
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr "_Fichier"
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr "_Action"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr "_Ajouter"
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr "_Extraire"
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr "Afficha_ge"
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr "_Aide"
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr "Ajouter"
-#: ../src/main_window.c:396
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Extraire"
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr "Ouvrir l'archive dans une nouvelle fenêtre"
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr "Ouvrir l'archive"
-#: ../src/main_window.c:749
-#: ../src/main_window.c:1085
-#: ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
@@ -341,8 +339,7 @@
"Squeeze ne peut pas extraire de fichier de ce type d'archive,\n"
"l'application nécessaire n'est pas présente."
-#: ../src/main_window.c:787
-#: ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
@@ -350,11 +347,11 @@
"Squeeze ne peut pas ajouter de fichier dans ce type d'archive,\n"
"l'application nécessaire n'est pas présente."
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
msgid "Are you sure you want to remove the selected files?"
msgstr "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
@@ -362,7 +359,7 @@
"Squeeze ne peut pas supprimer de fichier dans ce type d'archive,\n"
"l'application nécessaire n'est pas présente."
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
@@ -370,43 +367,52 @@
"Êtes-vous sûr de vouloir annuler cette opération ?\n"
"Ceci pourrait endommager l'archive."
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr "Développeur principal :"
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr "Contributeurs :"
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr "Images :"
-#: ../src/main_window.c:947
-msgid "The add and extract icons are based on the extract icon created by Andreas Nilsson"
-msgstr "Les icônes \"ajouter\" et \"extraire\" sont basés sur les icônes d'extraction de Andreas Nilsson"
+#: ../src/main_window.c:966
+msgid ""
+"The add and extract icons are based on the extract icon created by Andreas "
+"Nilsson"
+msgstr ""
+"Les icônes \"ajouter\" et \"extraire\" sont basés sur les icônes "
+"d'extraction de Andreas Nilsson"
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr "Inspiré de Xarchiver, écrit par Giuseppe Torelli"
-#: ../src/main_window.c:954
-msgid "Squeeze is a lightweight and flexible archive manager for the Xfce Desktop Environment"
-msgstr "Squeeze est un gestionnaire d'archives léger et flexible pour l'environnement de bureau xfce"
+#: ../src/main_window.c:973
+msgid ""
+"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
+"Environment"
+msgstr ""
+"Squeeze est un gestionnaire d'archives léger et flexible pour "
+"l'environnement de bureau xfce"
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr "Maximilian Schleiss <maxschleiss at bluewin.ch>"
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
-msgstr "Quelle action voulez-vous effectuer sur le(s) fichier(s) sélectionné(s) ?"
+msgstr ""
+"Quelle action voulez-vous effectuer sur le(s) fichier(s) sélectionné(s) ?"
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr "Affichage"
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
@@ -414,11 +420,11 @@
"Squeeze ne peut pas visionner ce fichier,\n"
"l'application nécessaire n'est pas présente."
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr "Échec à l'ouverture du fichier"
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -440,7 +446,9 @@
#.
#: ../src/application.c:271
msgid "Could not open archive, MIME-type unsupported or file did not exist"
-msgstr "Échec à l'ouverture de l'archive, type MIME non supporté ou fichier inexistant"
+msgstr ""
+"Échec à l'ouverture de l'archive, type MIME non supporté ou fichier "
+"inexistant"
#: ../src/new_dialog.c:69
msgid "Archive type:"
@@ -532,29 +540,23 @@
msgid "The amount of space between the path buttons"
msgstr "L'espacement entre les boutons du chemin"
-#: ../src/notebook.c:177
-#: ../src/archive_store.c:246
+#: ../src/notebook.c:177 ../src/archive_store.c:246
msgid "Show mime icons"
msgstr "Afficher les icônes MIME"
-#: ../src/notebook.c:178
-#: ../src/archive_store.c:247
+#: ../src/notebook.c:178 ../src/archive_store.c:247
msgid "Show the mime type icons for each entry"
msgstr "Afficher l'icône du type MIME pour chaque position"
-#: ../src/notebook.c:184
-#: ../src/archive_store.c:260
+#: ../src/notebook.c:184 ../src/archive_store.c:260
msgid "Sort folders before files"
msgstr "Trier les dossiers avant les fichiers"
-#: ../src/notebook.c:185
-#: ../src/archive_store.c:261
+#: ../src/notebook.c:185 ../src/archive_store.c:261
msgid "The folders will be put at the top of the list"
msgstr "Les dossiers s'afficheront en haut de la liste"
-#: ../src/notebook.c:191
-#: ../src/notebook.c:192
-#: ../src/archive_store.c:267
+#: ../src/notebook.c:191 ../src/notebook.c:192 ../src/archive_store.c:267
#: ../src/archive_store.c:268
msgid "Sort text case sensitive"
msgstr "Classer le texte en fonction de la casse"
@@ -567,12 +569,12 @@
msgid "Make the row background colors alternate"
msgstr "Afficher les lignes d'arrière plan en alternant les couleurs"
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Échec à l'ouverture de l'archive '%s'."
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Échec à l'extraction du contenu de l'archive '%s'."
@@ -593,3 +595,5 @@
msgid "Xfce archive manager"
msgstr "Gestionnaire d'archives pour Xfce"
+#~ msgid "Filename"
+#~ msgstr "Nom de fichier"
Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/nl.po 2007-01-29 11:14:24 UTC (rev 24783)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-26 19:44+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: 2006-11-28 22:52+0100\n"
"Last-Translator: Stephan Arts <stephan at xfce.org>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -16,51 +16,51 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
-msgstr "Bestandsnaam"
+#: ../libsqueeze/archive.c:483
+msgid "Name"
+msgstr "Naam:"
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr "Mime type"
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr "Archief initialiseren"
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr "Inhoud van archief vernieuwen"
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr "Bestand(en) aan het toevoegen aan archief"
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr "Bestand(en) uitpakken uit archief"
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr "Bestand(en) verwijderen uit archief"
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr "Klaar"
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
msgid "Extracting file(s) to temporary directory"
msgstr "Bestand(en) uitpakken naar tijdelijke map"
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr "Uitgebreide actie uitvoeren"
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr "Geannulleerd"
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr "Fout"
@@ -261,23 +261,23 @@
"%s: %s\n"
"Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr "Interne Stijl"
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr "Werkbalk Stijl"
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr "Padbalk Stijl"
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr "Navigatie Stijl"
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -286,51 +286,51 @@
"De stijl om te navigeren door het archief"
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr "_Bestand"
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr "_Actie"
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr "_Toevoegen"
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr "_Uitpakken"
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr "B_eeld"
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr "_Help"
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:396 ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr "Archief openen in een niew venster"
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr "Archief openen"
-#: ../src/main_window.c:749 ../src/main_window.c:1085 ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
@@ -339,7 +339,7 @@
"Squeeze kan dit archief type niet uitpakken,\n"
"het programma om dit te ondersteunen ontbreekt."
-#: ../src/main_window.c:787 ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
@@ -347,11 +347,11 @@
"Squeeze kan aan dit archief type geen bestanden toevoegen,\n"
"het programma om dit te ondersteunen ontbreekt."
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
msgid "Are you sure you want to remove the selected files?"
msgstr "Weet je zeker dat je de geselecteerde bestanden wilt verwijderen?"
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
@@ -359,7 +359,7 @@
"Squeeze kan van dit archief type geen bestanden verwijderen,\n"
"het programma om dit te ondersteunen ontbreekt."
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
@@ -367,19 +367,19 @@
"Weet je zeker dat je deze actie wilt annuleren?\n"
"Dit zou het archief kunnen beschadigen."
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr "Hoofd ontwikkelaar:"
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr "Medewerkers:"
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr "Graphisch:"
-#: ../src/main_window.c:947
+#: ../src/main_window.c:966
msgid ""
"The add and extract icons are based on the extract icon created by Andreas "
"Nilsson"
@@ -387,11 +387,11 @@
"De pictogrammen voor het toevoegen en uitpakken zijn gebaseerd op een "
"'uitpakken' pictogram dat gemaakt is door Andreas Nilsson"
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr "Geinspireerd door Xarchiver, dat is geschreven door Giuseppe Torelli"
-#: ../src/main_window.c:954
+#: ../src/main_window.c:973
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
@@ -399,19 +399,19 @@
"Squeeze is een lightgewicht en flexibele archief beheerder voor de Xfce "
"Bureaublad omgeving"
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr "Stephan Arts <stephan at xfce.org>"
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Welke actie wil je uitvoeren op de geselecteerde bestand(en)?"
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr "Weergeven"
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
@@ -419,11 +419,11 @@
"Squeeze kan dit bestand niet weergeven.\n"
"het programma om dit te ondersteunen ontbreekt."
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr "Kan bestand niet openen"
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -567,12 +567,12 @@
msgid "Make the row background colors alternate"
msgstr "Laat de achtergrond kleur van de rijen verspringen"
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Kan archief '%s' niet openen."
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr "Het uitpakken van de inhoud van archief '%s' is mislukt."
@@ -593,6 +593,9 @@
msgid "Xfce archive manager"
msgstr "Xfce archief beheerder"
+#~ msgid "Filename"
+#~ msgstr "Bestandsnaam"
+
#~ msgid "Test"
#~ msgstr "Testen"
Modified: squeeze/trunk/po/squeeze.pot
===================================================================
--- squeeze/trunk/po/squeeze.pot 2007-01-28 22:12:48 UTC (rev 24782)
+++ squeeze/trunk/po/squeeze.pot 2007-01-29 11:14:24 UTC (rev 24783)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-01-26 19:44+0100\n"
+"POT-Creation-Date: 2007-01-29 12:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,51 +16,51 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:485
-msgid "Filename"
+#: ../libsqueeze/archive.c:483
+msgid "Name"
msgstr ""
-#: ../libsqueeze/archive.c:488
+#: ../libsqueeze/archive.c:486
msgid "Mime type"
msgstr ""
-#: ../libsqueeze/archive.c:1576
+#: ../libsqueeze/archive.c:1574
msgid "Initializing archive"
msgstr ""
-#: ../libsqueeze/archive.c:1579
+#: ../libsqueeze/archive.c:1577
msgid "Refreshing archive contents"
msgstr ""
-#: ../libsqueeze/archive.c:1582
+#: ../libsqueeze/archive.c:1580
msgid "Adding file(s) to archive"
msgstr ""
-#: ../libsqueeze/archive.c:1585
+#: ../libsqueeze/archive.c:1583
msgid "Extracting file(s) from archive"
msgstr ""
-#: ../libsqueeze/archive.c:1588
+#: ../libsqueeze/archive.c:1586
msgid "Removing file(s) from archive"
msgstr ""
-#: ../libsqueeze/archive.c:1591
+#: ../libsqueeze/archive.c:1589
msgid "Done"
msgstr ""
-#: ../libsqueeze/archive.c:1594
+#: ../libsqueeze/archive.c:1592
msgid "Extracting file(s) to temporary directory"
msgstr ""
-#: ../libsqueeze/archive.c:1596
+#: ../libsqueeze/archive.c:1594
msgid "Performing an extended action"
msgstr ""
-#: ../libsqueeze/archive.c:1599
+#: ../libsqueeze/archive.c:1597
msgid "Cancelled"
msgstr ""
-#: ../libsqueeze/archive.c:1602
+#: ../libsqueeze/archive.c:1600
msgid "Error"
msgstr ""
@@ -259,153 +259,153 @@
"Try %s --help to see a full list of available command line options.\n"
msgstr ""
-#: ../src/main_window.c:130
+#: ../src/main_window.c:132
msgid "Internal Style"
msgstr ""
-#: ../src/main_window.c:131
+#: ../src/main_window.c:133
msgid "Tool Bar Style"
msgstr ""
-#: ../src/main_window.c:132
+#: ../src/main_window.c:134
msgid "Path Bar Style"
msgstr ""
-#: ../src/main_window.c:179
+#: ../src/main_window.c:181
msgid "Navigation Style"
msgstr ""
-#: ../src/main_window.c:180
+#: ../src/main_window.c:182
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
msgstr ""
#. File menu
-#: ../src/main_window.c:279
+#: ../src/main_window.c:285
msgid "_File"
msgstr ""
#. Action menu: ref all the childs
-#: ../src/main_window.c:312
+#: ../src/main_window.c:318
msgid "_Action"
msgstr ""
-#: ../src/main_window.c:317
+#: ../src/main_window.c:323
msgid "_Add"
msgstr ""
-#: ../src/main_window.c:323
+#: ../src/main_window.c:329
msgid "_Extract"
msgstr ""
#. View menu
-#: ../src/main_window.c:337
+#: ../src/main_window.c:343
msgid "_View"
msgstr ""
#. Help menu
-#: ../src/main_window.c:361
+#: ../src/main_window.c:367
msgid "_Help"
msgstr ""
-#: ../src/main_window.c:392
+#: ../src/main_window.c:402
msgid "Add"
msgstr ""
-#: ../src/main_window.c:396 ../src/main_window.c:1044
+#: ../src/main_window.c:406 ../src/main_window.c:1081
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr ""
-#: ../src/main_window.c:673
+#: ../src/main_window.c:692
msgid "Open archive in new window"
msgstr ""
-#: ../src/main_window.c:679
+#: ../src/main_window.c:698
msgid "Open archive"
msgstr ""
-#: ../src/main_window.c:749 ../src/main_window.c:1085 ../src/application.c:197
+#: ../src/main_window.c:768 ../src/main_window.c:1122 ../src/application.c:197
#: ../src/application.c:213
msgid ""
"Squeeze cannot extract this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:787 ../src/application.c:287
+#: ../src/main_window.c:806 ../src/application.c:287
msgid ""
"Squeeze cannot add files to this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:808
+#: ../src/main_window.c:827
msgid "Are you sure you want to remove the selected files?"
msgstr ""
-#: ../src/main_window.c:821
+#: ../src/main_window.c:840
msgid ""
"Squeeze cannot remove files from this archive type,\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:860
+#: ../src/main_window.c:879
msgid ""
"Are you sure you want to cancel this operation?\n"
"This could damage the archive."
msgstr ""
-#: ../src/main_window.c:940
+#: ../src/main_window.c:959
msgid "Lead developer:"
msgstr ""
-#: ../src/main_window.c:943
+#: ../src/main_window.c:962
msgid "Contributors:"
msgstr ""
-#: ../src/main_window.c:946
+#: ../src/main_window.c:965
msgid "Artwork:"
msgstr ""
-#: ../src/main_window.c:947
+#: ../src/main_window.c:966
msgid ""
"The add and extract icons are based on the extract icon created by Andreas "
"Nilsson"
msgstr ""
-#: ../src/main_window.c:949
+#: ../src/main_window.c:968
msgid "Inspired by Xarchiver, written by Giuseppe Torelli"
msgstr ""
-#: ../src/main_window.c:954
+#: ../src/main_window.c:973
msgid ""
"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
"Environment"
msgstr ""
-#: ../src/main_window.c:960
+#: ../src/main_window.c:979
msgid "translator-credits"
msgstr ""
-#: ../src/main_window.c:1043
+#: ../src/main_window.c:1080
msgid "Which action do you want to perform on the selected file(s)?"
msgstr ""
-#: ../src/main_window.c:1044
+#: ../src/main_window.c:1081
msgid "View"
msgstr ""
-#: ../src/main_window.c:1058
+#: ../src/main_window.c:1095
msgid ""
"Squeeze cannot view this file.\n"
"the application to support this is missing."
msgstr ""
-#: ../src/main_window.c:1126
+#: ../src/main_window.c:1163
msgid "Failed to open file"
msgstr ""
-#: ../src/main_window.c:1127
+#: ../src/main_window.c:1164
#, c-format
msgid ""
"'%s'\n"
@@ -546,12 +546,12 @@
msgid "Make the row background colors alternate"
msgstr ""
-#: ../src/notebook.c:555
+#: ../src/notebook.c:556
#, c-format
msgid "Failed to open archive '%s'."
msgstr ""
-#: ../src/notebook.c:563
+#: ../src/notebook.c:564
#, c-format
msgid "Failed to extract contents of archive '%s'."
msgstr ""
More information about the Xfce4-commits
mailing list