Skip to content

Instantly share code, notes, and snippets.

@garbas

garbas/1.8.10-revert.patch

Created June 16, 2015 13:32
Show Gist options
  • Save garbas/aa4ad424c6505eab03d5 to your computer and use it in GitHub Desktop.
Save garbas/aa4ad424c6505eab03d5 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
1.8.10-revert.patch
This file has been truncated, but you can view the full file.
diff --unified -rupN 1.8.11/autogen.sh 1.8.10/autogen.sh
--- 1.8.11/autogen.sh 2015-06-16 14:59:46.629498463 +0200
+++ 1.8.10/autogen.sh 2015-06-16 14:59:04.207378616 +0200
@@ -23,10 +23,6 @@
### Run this to produce everything needed for configuration. ###
-# Some shells can produce output when running 'cd' which interferes
-# with the construct 'abs=`cd dir && pwd`'.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
# Run tests to ensure that our build requirements are met
RELEASE_MODE=""
RELEASE_ARGS=""
@@ -75,80 +71,48 @@ rm -f build/config.guess build/config.su
$libtoolize --copy --automake --force
ltpath="`dirname $libtoolize`"
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-if [ "x$LIBTOOL_M4" = "x" ]; then
- ltm4_error='(try setting the LIBTOOL_M4 environment variable)'
- if [ -d "$ltpath/../share/aclocal/." ]; then
- ltm4=`cd "$ltpath/../share/aclocal" && pwd`
- else
- echo "Libtool helper path not found $ltm4_error"
- echo " expected at: '$ltpath/../share/aclocal'"
- exit 1
- fi
-else
- ltm4_error="(the LIBTOOL_M4 environment variable is: $LIBTOOL_M4)"
- ltm4="$LIBTOOL_M4"
-fi
-
-ltfile="$ltm4/libtool.m4"
-if [ ! -f "$ltfile" ]; then
- echo "$ltfile not found $ltm4_error"
+if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
exit 1
fi
-echo "Copying libtool helper: $ltfile"
+echo "Copying libtool helper: $ltfile"
# An ancient helper might already be present from previous builds,
# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
# This would cause cp to fail and print an error message, but leave
# behind a potentially outdated libtool helper. So, remove before
# copying:
rm -f build/libtool.m4
-cp "$ltfile" build/libtool.m4
+cp $ltfile build/libtool.m4
for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
rm -f build/$file
if [ $lt_major_version -ge 2 ]; then
- ltfile="$ltm4/$file"
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
- if [ ! -f "$ltfile" ]; then
- echo "$ltfile not found $ltm4_error"
+ if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
exit 1
fi
- echo "Copying libtool helper: $ltfile"
- cp "$ltfile" "build/$file"
+ echo "Copying libtool helper: $ltfile"
+ cp $ltfile build/$file
fi
done
if [ $lt_major_version -ge 2 ]; then
- if [ "x$LIBTOOL_CONFIG" = "x" ]; then
- ltconfig_error='(try setting the LIBTOOL_CONFIG environment variable)'
- if [ -d "$ltpath/../share/libtool/config/." ]; then
- ltconfig=`cd "$ltpath/../share/libtool/config" && pwd`
- elif [ -d "$ltpath/../share/libtool/build-aux/." ]; then
- ltconfig=`cd "$ltpath/../share/libtool/build-aux" && pwd`
- else
- echo "Autoconf helper path not found $ltconfig_error"
- echo " expected at: '$ltpath/../share/libtool/config'"
- echo " or: '$ltpath/../share/libtool/build-aux'"
- exit 1
- fi
- else
- ltconfig_error="(the LIBTOOL_CONFIG environment variable is: $LIBTOOL_CONFIG)"
- ltconfig="$LIBTOOL_CONFIG"
- fi
-
for file in config.guess config.sub; do
- configfile="$ltconfig/$file"
+ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file}
- if [ ! -f "$configfile" ]; then
- echo "$configfile not found $ltconfig_error"
+ if [ ! -f $configfile ]; then
+ echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)"
exit 1
fi
- echo "Copying autoconf helper: $configfile"
- cp "$configfile" build/$file
+ cp $configfile build/$file
done
fi
diff --unified -rupN 1.8.11/build.conf 1.8.10/build.conf
--- 1.8.11/build.conf 2015-06-16 14:59:39.531478285 +0200
+++ 1.8.10/build.conf 2015-06-16 14:58:56.408356779 +0200
@@ -1357,7 +1357,6 @@ install = tools
libs = libsvn_repos libsvn_fs libsvn_subr apr
[svn-populate-node-origins-index]
-description = Tool to populate the node origins index of a repository
type = exe
path = tools/server-side
sources = svn-populate-node-origins-index.c
diff --unified -rupN 1.8.11/CHANGES 1.8.10/CHANGES
--- 1.8.11/CHANGES 2015-06-16 14:59:46.704498676 +0200
+++ 1.8.10/CHANGES 2015-06-16 14:59:04.265378778 +0200
@@ -1,48 +1,3 @@
-Version 1.8.11
-(15 Dec 2014, from /branches/1.8.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.8.10
-
- User-visible changes:
- - Client-side bugfixes:
- * checkout/update: fix file externals failing to follow history and
- subsequently silently failing (issue #4185)
- * patch: don't skip targets in valid --git difs (r1592014, r1592034)
- * diff: make property output in diffs stable (r1589360)
- * diff: fix diff of local copied directory with props (r1619380, r1619393)
- * diff: fix changelist filter for repos-WC and WC-WC (r1621978, r1621981)
- * remove broken conflict resolver menu options that always error out
- (r1620332)
- * improve gpg-agent support (r1600331, r1600348, 1600368, r1600563,
- r1600781)
- * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
- * fix externals shadowing a versioned directory (issue #4085)
- * fix problems working on unix file systems that don't support
- permissions (r1612225)
- * upgrade: keep external registrations (issue #4519)
- * cleanup: iprove performance of recorded timestamp fixups (r1633126)
- * translation updates for German
-
- - Server-side bugfixes:
- * disable revprop caching feature due to cache invalidation problems
- (r1543594, r1619774, r1619105, r1619118, r1619153, r1619802)
- * skip generating uniquifiers if rep-sharing is not supported (r1561426)
- * mod_dav_svn: reject requests with missing repository paths (r1643409)
- * mod_dav_svn: reject requests with invalid virtual transaction names
- (r1643437)
- * mod_dav_svn: avoid unneeded memory growth in resource walking
- (issue #4531)
-
- Developer-visible changes:
- - General:
- * make sure all members of the repos layer notify struct are valid,
- fixes crashes in API users using all members (r1616131)
- * properly generate a version resource when building on Windows (r1542610,
- r1564576, r1568180)
- * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
- during a unix build (r1637826)
- * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
-
-
Version 1.8.10
(11 Aug 2014, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.10
@@ -774,39 +729,6 @@ http://svn.apache.org/repos/asf/subversi
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
-Version 1.7.19
-(15 Dec 2014, from /branches/1.7.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.7.19
-
- User-visible changes:
- - Client-side bugfixes:
- * rm: display the proper URL in commit log editor (r1591123)
- * diff: fix invalid read during suffix scanning (issue #4339)
- * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
- * checkout/update: fix file externals failing to follow history and
- subsequently silently failing (issue #4185)
-
- - Server-side bugfixes:
- * svnadmin dump: don't let invalid mergeinfo prevent a dump (issue #4476)
- * mod_dav_svn: reject requests with missing repository paths (r1643409)
- * mod_dav_svn: reject requests with invalid virtual transaction names
- (r1643437)
- * mod_dav_svn: avoid unneeded memory growth in resource walking
- (issue #4531)
-
- Developer-visible changes:
- - General:
- * properly generate a version resource when building on Windows (r1542610,
- r1564576, r1568180)
- * fix a problem with the unix build that could result in linking to the
- wrong Subversion libraries at build or at run time (r1594157)
- * use a proper intermediate directory when building with Visual Studio
- 2003-2008 (r1595431)
- * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
- during a unix build (r1637826)
- * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
-
-
Version 1.7.18
(11 Aug 2014, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.18
diff --unified -rupN 1.8.11/contrib/cgi/mirror_dir_through_svn.cgi 1.8.10/contrib/cgi/mirror_dir_through_svn.cgi
--- 1.8.11/contrib/cgi/mirror_dir_through_svn.cgi 2015-06-16 14:59:46.305497540 +0200
+++ 1.8.10/contrib/cgi/mirror_dir_through_svn.cgi 2015-06-16 14:59:04.205378610 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl -wT
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/cgi/mirror_dir_through_svn.cgi $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/cgi/mirror_dir_through_svn.cgi $
# $LastChangedDate: 2008-03-25 15:42:32 +0100 (Tue, 25 Mar 2008) $
# $LastChangedBy: arfrever $
# $LastChangedRevision: 870115 $
diff --unified -rupN 1.8.11/contrib/client-side/asvn 1.8.10/contrib/client-side/asvn
--- 1.8.11/contrib/client-side/asvn 2015-06-16 14:59:46.139497068 +0200
+++ 1.8.10/contrib/client-side/asvn 2015-06-16 14:59:04.136378417 +0200
@@ -37,7 +37,7 @@
#
#-------------------------------------------------------------------------
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/asvn $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/asvn $
# $LastChangedDate: 2010-05-06 15:48:52 +0200 (Thu, 06 May 2010) $
# $LastChangedBy: peters $
# $LastChangedRevision: 941728 $
diff --unified -rupN 1.8.11/contrib/client-side/diff-wrap.sh 1.8.10/contrib/client-side/diff-wrap.sh
--- 1.8.11/contrib/client-side/diff-wrap.sh 2015-06-16 14:59:46.203497250 +0200
+++ 1.8.10/contrib/client-side/diff-wrap.sh 2015-06-16 14:59:04.126378389 +0200
@@ -17,7 +17,7 @@
# history and logs, available at http://subversion.tigris.org/.
# ====================================================================
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/diff-wrap.sh $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/diff-wrap.sh $
# $LastChangedDate: 2008-03-10 19:07:08 +0100 (Mon, 10 Mar 2008) $
# $LastChangedBy: dlr $
# $LastChangedRevision: 869902 $
diff --unified -rupN 1.8.11/contrib/client-side/svn_all_diffs.pl 1.8.10/contrib/client-side/svn_all_diffs.pl
--- 1.8.11/contrib/client-side/svn_all_diffs.pl 2015-06-16 14:59:46.201497245 +0200
+++ 1.8.10/contrib/client-side/svn_all_diffs.pl 2015-06-16 14:59:04.218378647 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svn_all_diffs.pl $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svn_all_diffs.pl $
# $LastChangedDate: 2008-03-25 15:42:32 +0100 (Tue, 25 Mar 2008) $
# $LastChangedBy: arfrever $
# $LastChangedRevision: 870115 $
diff --unified -rupN 1.8.11/contrib/client-side/svn_apply_autoprops.py 1.8.10/contrib/client-side/svn_apply_autoprops.py
--- 1.8.11/contrib/client-side/svn_apply_autoprops.py 2015-06-16 14:59:46.201497245 +0200
+++ 1.8.10/contrib/client-side/svn_apply_autoprops.py 2015-06-16 14:59:04.218378647 +0200
@@ -3,7 +3,7 @@
# To do:
# 1) Switch to using the Subversion Python bindings.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svn_apply_autoprops.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svn_apply_autoprops.py $
# $LastChangedRevision: 1073340 $
# $LastChangedDate: 2011-02-22 15:25:21 +0100 (Tue, 22 Feb 2011) $
# $LastChangedBy: stsp $
diff --unified -rupN 1.8.11/contrib/client-side/svn_export_empty_files.py 1.8.10/contrib/client-side/svn_export_empty_files.py
--- 1.8.11/contrib/client-side/svn_export_empty_files.py 2015-06-16 14:59:46.131497045 +0200
+++ 1.8.10/contrib/client-side/svn_export_empty_files.py 2015-06-16 14:59:04.126378389 +0200
@@ -30,7 +30,7 @@ find what you are looking for. This scr
smaller non-working working copy that can be crawled with find or
find's locate utility to make it easier to find files.
-$HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svn_export_empty_files.py $
+$HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svn_export_empty_files.py $
$LastChangedRevision: 868596 $
$LastChangedDate: 2007-12-17 23:48:44 +0100 (Mon, 17 Dec 2007) $
$LastChangedBy: epg $
diff --unified -rupN 1.8.11/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in 1.8.10/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
--- 1.8.11/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in 2015-06-16 14:59:46.203497250 +0200
+++ 1.8.10/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in 2015-06-16 14:59:04.205378610 +0200
@@ -6,7 +6,7 @@
# or http://www.opensource.org/licenses/academic.php for a copy of the license
# text.
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in $
# $LastChangedDate: 2011-05-26 14:20:58 +0200 (Thu, 26 May 2011) $
# $LastChangedBy: stsp $
# $LastChangedRevision: 1127885 $
diff --unified -rupN 1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history.py 1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history.py
--- 1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history.py 2015-06-16 14:59:46.202497247 +0200
+++ 1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history.py 2015-06-16 14:59:04.204378607 +0200
@@ -17,7 +17,7 @@
# history and logs, available at http://subversion.tigris.org/.
# ====================================================================
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history.py $
# $LastChangedDate: 2009-06-12 02:19:03 +0200 (Fri, 12 Jun 2009) $
# $LastChangedBy: blair $
# $LastChangedRevision: 878081 $
diff --unified -rupN 1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py 1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
--- 1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py 2015-06-16 14:59:46.199497239 +0200
+++ 1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py 2015-06-16 14:59:04.202378602 +0200
@@ -17,7 +17,7 @@
# history and logs, available at http://subversion.tigris.org/.
# ====================================================================
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py $
# $Date: 2009-01-20 23:25:54 +0100 (Tue, 20 Jan 2009) $
# $Author: cmpilato $
# $Rev: 875432 $
diff --unified -rupN 1.8.11/contrib/client-side/svnmerge/svnmerge.py 1.8.10/contrib/client-side/svnmerge/svnmerge.py
--- 1.8.11/contrib/client-side/svnmerge/svnmerge.py 2015-06-16 14:59:46.201497245 +0200
+++ 1.8.10/contrib/client-side/svnmerge/svnmerge.py 2015-06-16 14:59:04.218378647 +0200
@@ -30,7 +30,7 @@
# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple
# location identifier formats
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svnmerge/svnmerge.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svnmerge/svnmerge.py $
# $LastChangedDate: 2012-08-03 17:19:31 +0200 (Fri, 03 Aug 2012) $
# $LastChangedBy: mattiase $
# $LastChangedRevision: 1369021 $
diff --unified -rupN 1.8.11/contrib/client-side/svnmerge/svnmerge.sh 1.8.10/contrib/client-side/svnmerge/svnmerge.sh
--- 1.8.11/contrib/client-side/svnmerge/svnmerge.sh 2015-06-16 14:59:46.200497242 +0200
+++ 1.8.10/contrib/client-side/svnmerge/svnmerge.sh 2015-06-16 14:59:04.204378607 +0200
@@ -40,7 +40,7 @@
# Acknowledgements:
# John Belmonte <[email protected]> - metadata and usability improvements
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svnmerge/svnmerge.sh $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svnmerge/svnmerge.sh $
# $LastChangedDate: 2007-03-16 08:03:39 +0100 (Fri, 16 Mar 2007) $
# $LastChangedBy: kfogel $
# $LastChangedRevision: 863939 $
diff --unified -rupN 1.8.11/contrib/client-side/svn-merge-vendor.py 1.8.10/contrib/client-side/svn-merge-vendor.py
--- 1.8.11/contrib/client-side/svn-merge-vendor.py 2015-06-16 14:59:46.174497168 +0200
+++ 1.8.10/contrib/client-side/svn-merge-vendor.py 2015-06-16 14:59:04.131378403 +0200
@@ -33,7 +33,7 @@
# This tool is provided under GPL license. Please read
# http://www.gnu.org/licenses/gpl.html for the original text.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/client-side/svn-merge-vendor.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/client-side/svn-merge-vendor.py $
# $LastChangedRevision: 867363 $
# $LastChangedDate: 2007-10-19 10:17:06 +0200 (Fri, 19 Oct 2007) $
# $LastChangedBy: aogier $
diff --unified -rupN 1.8.11/contrib/hook-scripts/case-insensitive.py 1.8.10/contrib/hook-scripts/case-insensitive.py
--- 1.8.11/contrib/hook-scripts/case-insensitive.py 2015-06-16 14:59:46.052496820 +0200
+++ 1.8.10/contrib/hook-scripts/case-insensitive.py 2015-06-16 14:59:04.000378036 +0200
@@ -54,7 +54,7 @@
# on dll's shipped as part of the Subversion binaries, if the script cannot
# load the _fs dll it is because it cannot find the other Subversion dll's.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/hook-scripts/case-insensitive.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/hook-scripts/case-insensitive.py $
# $LastChangedRevision: 867334 $
# $LastChangedDate: 2007-10-18 00:04:06 +0200 (Thu, 18 Oct 2007) $
# $LastChangedBy: philip $
diff --unified -rupN 1.8.11/contrib/hook-scripts/commit-email.pl.in 1.8.10/contrib/hook-scripts/commit-email.pl.in
--- 1.8.11/contrib/hook-scripts/commit-email.pl.in 2015-06-16 14:59:46.038496781 +0200
+++ 1.8.10/contrib/hook-scripts/commit-email.pl.in 2015-06-16 14:59:03.997378027 +0200
@@ -17,7 +17,7 @@
#
# This script requires Subversion 1.2.0 or later.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/hook-scripts/commit-email.pl.in $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/hook-scripts/commit-email.pl.in $
# $LastChangedDate: 2010-01-29 00:24:20 +0100 (Fri, 29 Jan 2010) $
# $LastChangedBy: neels $
# $LastChangedRevision: 904301 $
diff --unified -rupN 1.8.11/contrib/hook-scripts/detect-merge-conflicts.sh 1.8.10/contrib/hook-scripts/detect-merge-conflicts.sh
--- 1.8.11/contrib/hook-scripts/detect-merge-conflicts.sh 2015-06-16 14:59:46.038496781 +0200
+++ 1.8.10/contrib/hook-scripts/detect-merge-conflicts.sh 2015-06-16 14:59:03.998378030 +0200
@@ -5,7 +5,7 @@
# or '>>>>>>> .' is found, the commit is aborted with a nice
# error message.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/hook-scripts/detect-merge-conflicts.sh $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/hook-scripts/detect-merge-conflicts.sh $
# $LastChangedDate: 2013-04-11 04:38:26 +0200 (Thu, 11 Apr 2013) $
# $LastChangedBy: julianfoad $
# $LastChangedRevision: 1466758 $
diff --unified -rupN 1.8.11/contrib/hook-scripts/svn-keyword-check.pl 1.8.10/contrib/hook-scripts/svn-keyword-check.pl
--- 1.8.11/contrib/hook-scripts/svn-keyword-check.pl 2015-06-16 14:59:46.051496818 +0200
+++ 1.8.10/contrib/hook-scripts/svn-keyword-check.pl 2015-06-16 14:59:03.999378033 +0200
@@ -51,7 +51,7 @@
# TXN="$2"
# svn-keyword-check.pl --repos $REPOS --transaction $TXT --text .java --text .txt
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/hook-scripts/svn-keyword-check.pl $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/hook-scripts/svn-keyword-check.pl $
# $LastChangedRevision: 1485487 $
# $LastChangedDate: 2013-05-23 01:10:27 +0200 (Thu, 23 May 2013) $
# $LastChangedBy: danielsh $
diff --unified -rupN 1.8.11/contrib/server-side/add-needs-lock.py 1.8.10/contrib/server-side/add-needs-lock.py
--- 1.8.11/contrib/server-side/add-needs-lock.py 2015-06-16 14:59:46.050496815 +0200
+++ 1.8.10/contrib/server-side/add-needs-lock.py 2015-06-16 14:59:04.020378091 +0200
@@ -28,7 +28,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/server-side/add-needs-lock.py $
+# $HeadURL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/server-side/add-needs-lock.py $
# $LastChangedDate: 2008-07-30 17:08:35 +0200 (Wed, 30 Jul 2008) $
# $LastChangedBy: blair $
# $LastChangedRevision: 872408 $
diff --unified -rupN 1.8.11/contrib/server-side/fsfsfixer/fixer/fix-rev.py 1.8.10/contrib/server-side/fsfsfixer/fixer/fix-rev.py
--- 1.8.11/contrib/server-side/fsfsfixer/fixer/fix-rev.py 2015-06-16 14:59:46.060496843 +0200
+++ 1.8.10/contrib/server-side/fsfsfixer/fixer/fix-rev.py 2015-06-16 14:59:04.024378103 +0200
@@ -20,7 +20,7 @@ from fixer_config import *
# Globals
# URL = dirname(dirname(URL))
-URL = "$URL: http://svn.apache.org/repos/asf/subversion/tags/1.8.11/contrib/server-side/fsfsfixer/fixer/fix-rev.py $"[6:-2]
+URL = "$URL: http://svn.apache.org/repos/asf/subversion/tags/1.8.10/contrib/server-side/fsfsfixer/fixer/fix-rev.py $"[6:-2]
URL = URL[:URL.rindex('/', 0, URL.rindex('/'))]
# Global dictionaries recording the fixes made
diff --unified -rupN 1.8.11/get-deps.sh 1.8.10/get-deps.sh
--- 1.8.11/get-deps.sh 2015-06-16 14:59:39.530478282 +0200
+++ 1.8.10/get-deps.sh 2015-06-16 14:58:56.407356777 +0200
@@ -33,7 +33,7 @@
APR_VERSION=${APR_VERSION:-"1.4.6"}
APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.3.8"}
+SERF_VERSION=${SERF_VERSION:-"1.3.4"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
diff --unified -rupN 1.8.11/STATUS 1.8.10/STATUS
--- 1.8.11/STATUS 2015-06-16 14:59:39.531478285 +0200
+++ 1.8.10/STATUS 2015-06-16 14:58:56.409356782 +0200
@@ -10,11 +10,20 @@ See http://subversion.apache.org/docs/co
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.8.11:
+Status of 1.8.10:
Candidate changes:
==================
+ * r1469519, r1469520, r1481848, r1481870
+ Silence compiler warnings, tighten scopes and improve code.
+ Justification:
+ Clean builds make it more likely to notice real compiler warnings.
+ Branch: ^/subversion/branches/1.8.x-r1469519-and-friends
+ Votes:
+ +1: blair, brane
+ -0: philip (see dev thread: false alarm, trades one warning for another)
+
* r1501293, r1501338, r1501360, r1501533
Fix issue #4390, "parallel nested checkout not possible with wc-ng"
Justification:
@@ -43,8 +52,54 @@ Candidate changes:
should guarantee loadable dump files.
Branch: ^/subversion/branches/1.8.x-r1536854
Votes:
+ +1: stefan2
+ +0: breser (I'd be +1 if not for the unused function in svnadmin_tests.py)
+
+ * r1542610, r1564576, r1568180
+ Add missing description to build.conf, to properly generate a version
+ resource (including icon) for this executable on Windows.
+ Notes:
+ r1564576 breaks compilation on Visual Studio 2010, 2012 and 2013 of
+ this project. r1568180 fixes this problem.
+ Votes:
+ +1: rhuijben, breser
+ +1: (without r1564567, r1568180): stsp
+ -0: brane (horrible grammar; suggest translation to English)
+
+ * r1555491
+ Fix svn_fs_close_root for FSFS transaction roots.
+ Justification:
+ Without this patch, cache-related pool cleanups may be run after the
+ svn_fs_t object has been destroyed. I.e. even with explicit calls to
+ svn_fs_close_root, the user may see a segfault.
+ Branch:
+ ^/subversion/branches/1.8.x-r1555491
+ Votes:
+ +1: stefan2
+ -0: philip, rhuijben (Seems to be a different name for the same pool?)
+
+ * r1561426
+ In FSFS, skip the generation of uniquifiers if rep-shared is no supported.
+ Branch: ^/subversion/branches/1.8.x-r1561426
+ Justification:
+ This is not known to be a bug, atm, as we omit these when we write the
+ final revisions. But we rely on those uniquifiers to be NULL in old
+ repo formats when we compare reps. Them being non-NULL in a txn might
+ cause problems with future changes.
+ Votes:
+1: stefan2, breser
+ * r1589360
+ Make property output in 'svn diff' stable
+ Justification:
+ Local change that makes it easier to compare patch files.
+ Branch:
+ ^/subversion/branches/1.8.x-r1589360
+ Votes:
+ +1: rhuijben
+ -0: stefan2 (compiler misses "private/svn_sorts_private.h",
+ before branch)
+
* r1590751
Use empty, rather than NULL, config if default is unreadable.
Justification:
@@ -54,53 +109,39 @@ Candidate changes:
-0: julianfoad (prefer to fix all the programs at the same time;
other queries -- see email thread)
- * r1561419, r1561427, 1547489, r1560643, r1573744
- Fix the hotcopy and recovery for pre-1.4 FSFS repositories.
- Branch: ^/subversion/branches/1.8.x-r1573744-and-friends
+ * r1592014, r1592034
+ Fix 'svn patch' skipping targets in valid --git diffs.
Justification:
- Without this, old SVN versions won't be able to e.g. hotcopy those
- repos once 1.8.x made a commit in them. Also, fix our hotcopy code
- and make it cope with repositories broken by previous 1.8.x releases.
- Notes:
- The best way to review this is to review the backporting result in
- r1640603 instead of inspecting the original patches.
- "r1573744" is a bit of a misnomer as only the test case got backported
- because the workflow problem fixed by it does not exist in 1.8.x.
+ 'svn patch' should parse --git diffs correctly. User complained.
+ See http://svn.haxx.se/users/archive-2014-05/0003.shtml and replies.
Votes:
- +1: stefan2
+ +1: stsp, breser
- * r1643074
- Don't let invalid mergeinfo stop 'svnadmin load' from working.
- Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
- dump fail".
- Justification:
- The presence of 'bad' metadata in a repository should not prevent
- backing up and restoring from a backup, given that this data does not
- make the repository totally unusable.
+ * r1600331, r1600348, 1600368, r1600563, r1600781
+ Improve gpg-agent support.
+ Justification: Avoids spurious error logs, supports standard socket
+ locations and removes double prompts from pinentry. Without these
+ changes it's far less desireable to use.
Notes:
- The 'svnadmin dump' part of this issue was already backported in v1.8.9.
- The 'svnsync' part of this issue is not yet fixed.
+ Branch is needed since SVN_VA_NULL is not available in 1.8.x.
+ This does change the behavior of gpg-agent from prompting twice
+ for the password with pinentry to confirm the user hasn't entered
+ an incorrect password to instead clearing bad cached passwords and
+ reprompting. See my email on the subject: https://mail-archives.apache.org/mod_mbox/subversion-dev/201406.mbox/%3C538D2BE5.3070706%40reser.org%3E
Branch:
- ^/subversion/branches/1.8.x-r1643074
+ ^/subversion/branches/1.8.x-gpg-agent
Votes:
- +1: julianfoad
+ +1: breser, philip
- * r1619380, r1619393
- Fix diff of a locally copied directory with props: it showed all props
- as added instead of a diff against the copy-from props.
+ * r1612225
+ Ignore ENOTIMPL and EINCOMPLETE errors when tweaking temporary file
+ permission bits on non-windows systems.
Justification:
- Behaviour regression introduced in 1.8.0.
- Notes:
- r1619380 is the fix; r1619393 a test for it.
- The test on trunk@1619393 is tweaked to account for a trunk bug in the
- display of diff headers; the backport branch provides the correct
- version for 1.8.x.
- Branch:
- ^/subversion/branches/1.8.x-r1619380
+ These errors imply the underlying filesystem doesn't support
+ permissions. svn_io_copy_perms handles these errors in the
+ same way.
Votes:
- +0: julianfoad (previously said +1 with the wrong branch mentioned)
- +0: rhuijben (previously said +1 with the wrong branch mentioned)
- +0: stefan2 (previously said +1 with the wrong branch mentioned)
+ +1: stsp, breser
Veto-blocked changes:
=====================
@@ -115,5 +156,35 @@ Veto-blocked changes:
+1: stsp
-1: breser (see my email to dev@, <[email protected]>)
+ * r1560723, r1561419, r1561427, r1561428
+ Fix the handling of pre-1.4 FSFS repositories.
+ Branch: ^/subversion/branches/1.8.x-r1560723-and-friends
+ Justification:
+ Without this, old SVN versions won't be able to e.g. hotcopy those
+ repos once 1.8.x made a commit in them. Also, fix our hotcopy code
+ and make it cope with repositories broken by previous 1.8.x releases.
+ Votes:
+ +1: stefan2
+ -1: ivan (Significant performance degradation for svnadmin hotcopy,
+ the root cause is not fixed. Discussion:
+ http://svn.haxx.se/dev/archive-2014-01/0158.shtml)
+
+ * r1611379, r1612405
+ Fix revprop caching initialization delays for ra_serf on Windows.
+ Justification:
+ Without this patch, even small checkouts may take 20 to 40
+ seconds longer. This patch switches the named atomics SHM
+ initialization guard to the same "never delete the lock file"
+ pattern that we use for FSFS-internal locks.
+ Notes:
+ Branch is needed since SVN_VA_NULL is not available in 1.8.x.
+ Same goes for svn_io_file_create_empty.
+ Branch:
+ ^/subversion/branches/1.8.x-r1611379
+ Votes:
+ +1: stefan2, brane, breser
+ -1: ivan (Race condition and undefined behavior. See:
+ http://svn.haxx.se/dev/archive-2014-08/0007.shtml)
+
Approved changes:
=================
diff --unified -rupN 1.8.11/subversion/include/private/svn_diff_private.h 1.8.10/subversion/include/private/svn_diff_private.h
--- 1.8.11/subversion/include/private/svn_diff_private.h 2015-06-16 14:59:43.287488956 +0200
+++ 1.8.10/subversion/include/private/svn_diff_private.h 2015-06-16 14:59:00.939369458 +0200
@@ -97,7 +97,7 @@ svn_diff__unidiff_write_header(svn_strea
* merged or reverse merged; otherwise (or if the mergeinfo property values
* don't parse correctly) display them just like any other property.
*
- * Use @a scratch_pool for temporary allocations.
+ * Use @a pool for temporary allocations.
*/
svn_error_t *
svn_diff__display_prop_diffs(svn_stream_t *outstream,
@@ -105,7 +105,7 @@ svn_diff__display_prop_diffs(svn_stream_
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
svn_boolean_t pretty_print_mergeinfo,
- apr_pool_t *scratch_pool);
+ apr_pool_t *pool);
#ifdef __cplusplus
diff --unified -rupN 1.8.11/subversion/include/svn_io.h 1.8.10/subversion/include/svn_io.h
--- 1.8.11/subversion/include/svn_io.h 2015-06-16 14:59:43.295488978 +0200
+++ 1.8.10/subversion/include/svn_io.h 2015-06-16 14:59:00.698368783 +0200
@@ -1148,8 +1148,6 @@ svn_stream_read(svn_stream_t *stream,
* of reads or a simple seek operation. If the stream implementation has
* not provided a skip function, this will read from the stream and
* discard the data.
- *
- * @since New in 1.7.
*/
svn_error_t *
svn_stream_skip(svn_stream_t *stream,
diff --unified -rupN 1.8.11/subversion/include/svn_version.h 1.8.10/subversion/include/svn_version.h
--- 1.8.11/subversion/include/svn_version.h 2015-06-16 14:59:43.297488984 +0200
+++ 1.8.10/subversion/include/svn_version.h 2015-06-16 14:59:00.540368341 +0200
@@ -72,7 +72,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 11
+#define SVN_VER_PATCH 10
/** @deprecated Provided for backward compatibility with the 1.0 API. */
@@ -95,7 +95,7 @@ extern "C" {
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG " (r1643975)"
+#define SVN_VER_TAG " (r1615264)"
/** Number tag: a string describing the version.
@@ -121,7 +121,7 @@ extern "C" {
* When rolling a tarball, we automatically replace it with what we
* guess to be the correct revision number.
*/
-#define SVN_VER_REVISION 1643975
+#define SVN_VER_REVISION 1615264
x12
/* Version strings composed from the above definitions. */
diff --unified -rupN 1.8.11/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c 1.8.10/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
--- 1.8.11/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c 2015-06-16 14:59:45.298494675 +0200
+++ 1.8.10/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c 2015-06-16 14:59:01.932372240 +0200
@@ -49,19 +49,120 @@
/*-----------------------------------------------------------------------*/
+struct gnome_keyring_baton
+{
+ const char *keyring_name;
+ GnomeKeyringInfo *info;
+ GMainLoop *loop;
+};
+
+
+/* Callback function to destroy gnome_keyring_baton. */
+static void
+callback_destroy_data_keyring(void *data)
+{
+ struct gnome_keyring_baton *key_info = data;
+
+ if (data == NULL)
+ return;
+
+ free((void*)key_info->keyring_name);
+ key_info->keyring_name = NULL;
+
+ if (key_info->info)
+ {
+ gnome_keyring_info_free(key_info->info);
+ key_info->info = NULL;
+ }
+
+ return;
+}
+
+
+/* Callback function to complete the keyring operation. */
+static void
+callback_done(GnomeKeyringResult result,
+ gpointer data)
+{
+ struct gnome_keyring_baton *key_info = data;
+
+ g_main_loop_quit(key_info->loop);
+ return;
+}
+
+
+/* Callback function to get the keyring info. */
+static void
+callback_get_info_keyring(GnomeKeyringResult result,
+ GnomeKeyringInfo *info,
+ void *data)
+{
+ struct gnome_keyring_baton *key_info = data;
+
+ if (result == GNOME_KEYRING_RESULT_OK && info != NULL)
+ {
+ key_info->info = gnome_keyring_info_copy(info);
+ }
+ else
+ {
+ if (key_info->info != NULL)
+ gnome_keyring_info_free(key_info->info);
+
+ key_info->info = NULL;
+ }
+
+ g_main_loop_quit(key_info->loop);
+
+ return;
+}
+
+
+/* Callback function to get the default keyring string name. */
+static void
+callback_default_keyring(GnomeKeyringResult result,
+ const char *string,
+ void *data)
+{
+ struct gnome_keyring_baton *key_info = data;
+
+ if (result == GNOME_KEYRING_RESULT_OK && string != NULL)
+ {
+ key_info->keyring_name = strdup(string);
+ }
+ else
+ {
+ free((void*)key_info->keyring_name);
+ key_info->keyring_name = NULL;
+ }
+
+ g_main_loop_quit(key_info->loop);
+
+ return;
+}
+
/* Returns the default keyring name, allocated in RESULT_POOL. */
static char*
get_default_keyring_name(apr_pool_t *result_pool)
{
- char *name, *def;
- GnomeKeyringResult gkr;
+ char *def = NULL;
+ struct gnome_keyring_baton key_info;
+
+ key_info.info = NULL;
+ key_info.keyring_name = NULL;
- gkr = gnome_keyring_get_default_keyring_sync(&name);
- if (gkr != GNOME_KEYRING_RESULT_OK)
- return NULL;
+ /* Finds default keyring. */
+ key_info.loop = g_main_loop_new(NULL, FALSE);
+ gnome_keyring_get_default_keyring(callback_default_keyring, &key_info, NULL);
+ g_main_loop_run(key_info.loop);
+
+ if (key_info.keyring_name == NULL)
+ {
+ callback_destroy_data_keyring(&key_info);
+ return NULL;
+ }
- def = apr_pstrdup(result_pool, name);
- g_free(name);
+ def = apr_pstrdup(result_pool, key_info.keyring_name);
+ callback_destroy_data_keyring(&key_info);
return def;
}
@@ -70,22 +171,28 @@ get_default_keyring_name(apr_pool_t *res
static svn_boolean_t
check_keyring_is_locked(const char *keyring_name)
{
- GnomeKeyringInfo *info;
- svn_boolean_t locked;
- GnomeKeyringResult gkr;
+ struct gnome_keyring_baton key_info;
- gkr = gnome_keyring_get_info_sync(keyring_name, &info);
- if (gkr != GNOME_KEYRING_RESULT_OK)
- return FALSE;
+ key_info.info = NULL;
+ key_info.keyring_name = NULL;
- if (gnome_keyring_info_get_is_locked(info))
- locked = TRUE;
+ /* Get details about the default keyring. */
+ key_info.loop = g_main_loop_new(NULL, FALSE);
+ gnome_keyring_get_info(keyring_name, callback_get_info_keyring, &key_info,
+ NULL);
+ g_main_loop_run(key_info.loop);
+
+ if (key_info.info == NULL)
+ {
+ callback_destroy_data_keyring(&key_info);
+ return FALSE;
+ }
+
+ /* Check if keyring is locked. */
+ if (gnome_keyring_info_get_is_locked(key_info.info))
+ return TRUE;
else
- locked = FALSE;
-
- gnome_keyring_info_free(info);
-
- return locked;
+ return FALSE;
}
/* Unlock the KEYRING_NAME with the KEYRING_PASSWORD. If KEYRING was
@@ -95,19 +202,34 @@ unlock_gnome_keyring(const char *keyring
const char *keyring_password,
apr_pool_t *pool)
{
- GnomeKeyringInfo *info;
- GnomeKeyringResult gkr;
+ struct gnome_keyring_baton key_info;
- gkr = gnome_keyring_get_info_sync(keyring_name, &info);
- if (gkr != GNOME_KEYRING_RESULT_OK)
- return FALSE;
+ key_info.info = NULL;
+ key_info.keyring_name = NULL;
- gkr = gnome_keyring_unlock_sync(keyring_name, keyring_password);
- gnome_keyring_info_free(info);
- if (gkr != GNOME_KEYRING_RESULT_OK)
+ /* Get details about the default keyring. */
+ key_info.loop = g_main_loop_new(NULL, FALSE);
+ gnome_keyring_get_info(keyring_name, callback_get_info_keyring,
+ &key_info, NULL);
+ g_main_loop_run(key_info.loop);
+
+ if (key_info.info == NULL)
+ {
+ callback_destroy_data_keyring(&key_info);
+ return FALSE;
+ }
+ else
+ {
+ key_info.loop = g_main_loop_new(NULL, FALSE);
+ gnome_keyring_unlock(keyring_name, keyring_password,
+ callback_done, &key_info, NULL);
+ g_main_loop_run(key_info.loop);
+ }
+ callback_destroy_data_keyring(&key_info);
+ if (check_keyring_is_locked(keyring_name))
return FALSE;
- return check_keyring_is_locked(keyring_name);
+ return TRUE;
}
diff --unified -rupN 1.8.11/subversion/libsvn_client/externals.c 1.8.10/subversion/libsvn_client/externals.c
--- 1.8.11/subversion/libsvn_client/externals.c 2015-06-16 14:59:43.667490036 +0200
+++ 1.8.10/subversion/libsvn_client/externals.c 2015-06-16 14:59:01.226370262 +0200
@@ -169,37 +169,6 @@ switch_dir_external(const char *local_ab
if (revision->kind == svn_opt_revision_number)
external_rev = revision->value.number;
- /*
- * The code below assumes existing versioned paths are *not* part of
- * the external's defining working copy.
- * The working copy library does not support registering externals
- * on top of existing BASE nodes and will error out if we try.
- * So if the external target is part of the defining working copy's
- * BASE tree, don't attempt to create the external. Doing so would
- * leave behind a switched path instead of an external (since the
- * switch succeeds but registration of the external in the DB fails).
- * The working copy then cannot be updated until the path is switched back.
- * See issue #4085.
- */
- SVN_ERR(svn_wc__node_get_base(&kind, NULL, NULL,
- &repos_root_url, &repos_uuid,
- NULL, ctx->wc_ctx, local_abspath,
- TRUE, /* ignore_enoent */
- TRUE, /* show hidden */
- pool, pool));
- if (kind != svn_node_unknown)
- {
- const char *wcroot_abspath;
- const char *defining_wcroot_abspath;
-
- SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
- local_abspath, pool, pool));
- SVN_ERR(svn_wc__get_wcroot(&defining_wcroot_abspath, ctx->wc_ctx,
- defining_abspath, pool, pool));
- if (strcmp(wcroot_abspath, defining_wcroot_abspath) == 0)
- return svn_error_create(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL, NULL);
- }
-
/* If path is a directory, try to update/switch to the correct URL
and revision. */
SVN_ERR(svn_io_check_path(local_abspath, &kind, pool));
@@ -491,10 +460,7 @@ switch_file_external(const char *local_a
svn_dirent_split(&dir_abspath, &target, local_abspath, scratch_pool);
- /* ### Why do we open a new session? RA_SESSION is a valid
- ### session -- the caller used it to call svn_ra_check_path on
- ### this very URL, the caller also did the resolving and
- ### reparenting that is repeated here. */
+ /* Open an RA session to 'source' URL */
SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &switch_loc,
url, dir_abspath,
peg_revision, revision,
@@ -531,7 +497,7 @@ switch_file_external(const char *local_a
invalid revnum, that means RA will use the latest revision. */
SVN_ERR(svn_ra_do_switch3(ra_session, &reporter, &report_baton,
switch_loc->rev,
- target, svn_depth_unknown, switch_loc->url,
+ target, svn_depth_unknown, url,
FALSE /* send_copyfrom */,
TRUE /* ignore_ancestry */,
switch_editor, switch_baton,
diff --unified -rupN 1.8.11/subversion/libsvn_client/upgrade.c 1.8.10/subversion/libsvn_client/upgrade.c
--- 1.8.11/subversion/libsvn_client/upgrade.c 2015-06-16 14:59:43.667490036 +0200
+++ 1.8.10/subversion/libsvn_client/upgrade.c 2015-06-16 14:59:01.234370284 +0200
@@ -82,14 +82,6 @@ fetch_repos_info(const char **repos_root
return SVN_NO_ERROR;
}
-/* Forward definition. Upgrades svn:externals properties in the working copy
- LOCAL_ABSPATH to the WC-NG storage.
- */
-static svn_error_t *
-upgrade_externals_from_properties(svn_client_ctx_t *ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
svn_error_t *
svn_client_upgrade(const char *path,
svn_client_ctx_t *ctx,
@@ -97,6 +89,10 @@ svn_client_upgrade(const char *path,
{
const char *local_abspath;
apr_hash_t *externals;
+ apr_hash_index_t *hi;
+ apr_pool_t *iterpool;
+ apr_pool_t *iterpool2;
+ svn_opt_revision_t rev = {svn_opt_revision_unspecified, {0}};
struct repos_info_baton info_baton;
info_baton.state_pool = scratch_pool;
@@ -115,80 +111,6 @@ svn_client_upgrade(const char *path,
ctx->notify_func2, ctx->notify_baton2,
scratch_pool));
- SVN_ERR(svn_wc__externals_defined_below(&externals,
- ctx->wc_ctx, local_abspath,
- scratch_pool, scratch_pool));
-
- if (apr_hash_count(externals) > 0)
- {
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- apr_hash_index_t *hi;
-
- /* We are upgrading from >= 1.7. No need to upgrade from
- svn:externals properties. And by that avoiding the removal
- of recorded externals information (issue #4519)
-
- Only directory externals need an explicit upgrade */
- for (hi = apr_hash_first(scratch_pool, externals);
- hi;
- hi = apr_hash_next(hi))
- {
- const char *ext_abspath;
- svn_node_kind_t kind;
-
- svn_pool_clear(iterpool);
-
- ext_abspath = svn__apr_hash_index_key(hi);
-
- SVN_ERR(svn_wc__read_external_info(&kind, NULL, NULL, NULL, NULL,
- ctx->wc_ctx, local_abspath,
- ext_abspath, FALSE,
- iterpool, iterpool));
-
- if (kind == svn_node_dir)
- {
- svn_error_t *err = svn_client_upgrade(ext_abspath, ctx, iterpool);
-
- if (err)
- {
- svn_wc_notify_t *notify =
- svn_wc_create_notify(ext_abspath,
- svn_wc_notify_failed_external,
- iterpool);
- notify->err = err;
- ctx->notify_func2(ctx->notify_baton2,
- notify, iterpool);
- svn_error_clear(err);
- /* Next external node, please... */
- }
- }
- }
-
- svn_pool_destroy(iterpool);
- }
- else
- {
- /* Upgrading from <= 1.6, or no svn:properties defined.
- (There is no way to detect the difference from libsvn_client :( ) */
-
- SVN_ERR(upgrade_externals_from_properties(ctx, local_abspath,
- scratch_pool));
- }
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-upgrade_externals_from_properties(svn_client_ctx_t *ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- apr_hash_index_t *hi;
- apr_pool_t *iterpool;
- apr_pool_t *iterpool2;
- apr_hash_t *externals;
- svn_opt_revision_t rev = {svn_opt_revision_unspecified, {0}};
- struct repos_info_baton info_baton;
-
/* Now it's time to upgrade the externals too. We do it after the wc
upgrade to avoid that errors in the externals causes the wc upgrade to
fail. Thanks to caching the performance penalty of walking the wc a
@@ -241,7 +163,7 @@ upgrade_externals_from_properties(svn_cl
iterpool);
if (!err)
err = svn_wc_parse_externals_description3(
- &externals_p, svn_dirent_dirname(local_abspath, iterpool),
+ &externals_p, svn_dirent_dirname(path, iterpool),
external_desc->data, FALSE, iterpool);
if (err)
{
diff --unified -rupN 1.8.11/subversion/libsvn_diff/parse-diff.c 1.8.10/subversion/libsvn_diff/parse-diff.c
--- 1.8.11/subversion/libsvn_diff/parse-diff.c 2015-06-16 14:59:45.110494140 +0200
+++ 1.8.10/subversion/libsvn_diff/parse-diff.c 2015-06-16 14:59:01.902372156 +0200
@@ -1313,7 +1313,6 @@ svn_diff_parse_next_patch(svn_patch_t **
line_after_tree_header_read = TRUE;
}
else if (! valid_header_line && state != state_start
- && state != state_git_diff_seen
&& !starts_with(line->data, "index "))
{
/* We've encountered an invalid diff header.
diff --unified -rupN 1.8.11/subversion/libsvn_diff/util.c 1.8.10/subversion/libsvn_diff/util.c
--- 1.8.11/subversion/libsvn_diff/util.c 2015-06-16 14:59:45.083494063 +0200
+++ 1.8.10/subversion/libsvn_diff/util.c 2015-06-16 14:59:01.587371273 +0200
@@ -34,7 +34,6 @@
#include "svn_diff.h"
#include "svn_types.h"
#include "svn_ctype.h"
-#include "svn_sorts.h"
#include "svn_utf.h"
#include "svn_version.h"
@@ -487,37 +486,23 @@ display_mergeinfo_diff(const char *old_m
return SVN_NO_ERROR;
}
-/* qsort callback handling svn_prop_t by name */
-static int
-propchange_sort(const void *k1, const void *k2)
-{
- const svn_prop_t *propchange1 = k1;
- const svn_prop_t *propchange2 = k2;
-
- return strcmp(propchange1->name, propchange2->name);
-}
-
svn_error_t *
svn_diff__display_prop_diffs(svn_stream_t *outstream,
const char *encoding,
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
svn_boolean_t pretty_print_mergeinfo,
- apr_pool_t *scratch_pool)
+ apr_pool_t *pool)
{
- apr_pool_t *pool = scratch_pool;
apr_pool_t *iterpool = svn_pool_create(pool);
- apr_array_header_t *changes = apr_array_copy(scratch_pool, propchanges);
int i;
- qsort(changes->elts, changes->nelts, changes->elt_size, propchange_sort);
-
- for (i = 0; i < changes->nelts; i++)
+ for (i = 0; i < propchanges->nelts; i++)
{
const char *action;
const svn_string_t *original_value;
const svn_prop_t *propchange
- = &APR_ARRAY_IDX(changes, i, svn_prop_t);
+ = &APR_ARRAY_IDX(propchanges, i, svn_prop_t);
if (original_props)
original_value = svn_hash_gets(original_props, propchange->name);
diff --unified -rupN 1.8.11/subversion/libsvn_fs_fs/caching.c 1.8.10/subversion/libsvn_fs_fs/caching.c
--- 1.8.11/subversion/libsvn_fs_fs/caching.c 2015-06-16 14:59:43.093488404 +0200
+++ 1.8.10/subversion/libsvn_fs_fs/caching.c 2015-06-16 14:59:01.863372047 +0200
@@ -89,7 +89,7 @@ read_config(svn_memcache_t **memcache_p,
fs_fs_data_t *ffd = fs->fsap_data;
SVN_ERR(svn_cache__make_memcache_from_config(memcache_p, ffd->config,
- fs->pool));
+ fs->pool));
/* No cache namespace by default. I.e. all FS instances share the
* cached data. If you specify different namespaces, the data will
@@ -129,9 +129,23 @@ read_config(svn_memcache_t **memcache_p,
SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS,
TRUE);
- /* For now, always disable revprop caching.
+ /* don't cache revprops by default.
+ * Revprop caching significantly speeds up operations like
+ * svn ls -v. However, it requires synchronization that may
+ * not be available or efficient in the current server setup.
+ *
+ * If the caller chose option "2", enable revprop caching if
+ * the required API support is there to make it efficient.
*/
- *cache_revprops = FALSE;
+ if (strcmp(svn_hash__get_cstring(fs->config,
+ SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
+ ""), "2"))
+ *cache_revprops
+ = svn_hash__get_bool(fs->config,
+ SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
+ FALSE);
+ else
+ *cache_revprops = svn_named_atomic__is_efficient();
return svn_config_get_bool(ffd->config, fail_stop,
CONFIG_SECTION_CACHES, CONFIG_OPTION_FAIL_STOP,
diff --unified -rupN 1.8.11/subversion/libsvn_fs_fs/fs_fs.c 1.8.10/subversion/libsvn_fs_fs/fs_fs.c
--- 1.8.11/subversion/libsvn_fs_fs/fs_fs.c 2015-06-16 14:59:43.299488990 +0200
+++ 1.8.10/subversion/libsvn_fs_fs/fs_fs.c 2015-06-16 14:59:01.884372105 +0200
@@ -6966,13 +6966,8 @@ svn_fs_fs__set_entry(svn_fs_t *fs,
rep = apr_pcalloc(pool, sizeof(*rep));
rep->revision = SVN_INVALID_REVNUM;
rep->txn_id = txn_id;
-
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
- {
- SVN_ERR(get_new_txn_node_id(&unique_suffix, fs, txn_id, pool));
- rep->uniquifier = apr_psprintf(pool, "%s/%s", txn_id, unique_suffix);
- }
-
+ SVN_ERR(get_new_txn_node_id(&unique_suffix, fs, txn_id, pool));
+ rep->uniquifier = apr_psprintf(pool, "%s/%s", txn_id, unique_suffix);
parent_noderev->data_rep = rep;
SVN_ERR(svn_fs_fs__put_node_revision(fs, parent_noderev->id,
parent_noderev, FALSE, pool));
@@ -7556,7 +7551,6 @@ rep_write_contents_close(void *baton)
representation_t *rep;
representation_t *old_rep;
apr_off_t offset;
- fs_fs_data_t *ffd = b->fs->fsap_data;
rep = apr_pcalloc(b->parent_pool, sizeof(*rep));
rep->offset = b->rep_offset;
@@ -7573,13 +7567,9 @@ rep_write_contents_close(void *baton)
/* Fill in the rest of the representation field. */
rep->expanded_size = b->rep_size;
rep->txn_id = svn_fs_fs__id_txn_id(b->noderev->id);
-
- if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
- {
- SVN_ERR(get_new_txn_node_id(&unique_suffix, b->fs, rep->txn_id, b->pool));
- rep->uniquifier = apr_psprintf(b->parent_pool, "%s/%s", rep->txn_id,
- unique_suffix);
- }
+ SVN_ERR(get_new_txn_node_id(&unique_suffix, b->fs, rep->txn_id, b->pool));
+ rep->uniquifier = apr_psprintf(b->parent_pool, "%s/%s", rep->txn_id,
+ unique_suffix);
rep->revision = SVN_INVALID_REVNUM;
/* Finalize the checksum. */
diff --unified -rupN 1.8.11/subversion/libsvn_repos/load-fs-vtable.c 1.8.10/subversion/libsvn_repos/load-fs-vtable.c
--- 1.8.11/subversion/libsvn_repos/load-fs-vtable.c 2015-06-16 14:59:42.906487873 +0200
+++ 1.8.10/subversion/libsvn_repos/load-fs-vtable.c 2015-06-16 14:59:01.647371441 +0200
@@ -61,7 +61,7 @@ struct parse_baton
const char *parent_dir; /* repository relpath, or NULL */
svn_repos_notify_func_t notify_func;
void *notify_baton;
- apr_pool_t *notify_pool; /* scratch pool for notifications */
+ svn_repos_notify_t *notify;
apr_pool_t *pool;
/* Start and end (inclusive) of revision range we'll pay attention
@@ -502,14 +502,9 @@ new_revision_record(void **revision_bato
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_txn_start,
- pb->notify_pool);
-
- notify->old_revision = rb->rev;
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_txn_start;
+ pb->notify->old_revision = rb->rev;
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
/* Stash the oldest "old" revision committed from the load stream. */
@@ -520,14 +515,9 @@ new_revision_record(void **revision_bato
/* If we're skipping this revision, try to notify someone. */
if (rb->skipped && pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_skipped_rev,
- pb->notify_pool);
-
- notify->old_revision = rb->rev;
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_skipped_rev;
+ pb->notify->old_revision = rb->rev;
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
/* If we're parsing revision 0, only the revision are (possibly)
@@ -596,13 +586,8 @@ maybe_add_with_history(struct node_baton
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_copied_node,
- pb->notify_pool);
-
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_copied_node;
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
}
@@ -671,14 +656,10 @@ new_node_record(void **node_baton,
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_node_start,
- pb->notify_pool);
-
- notify->path = nb->path;
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_node_start;
+ pb->notify->node_action = nb->action;
+ pb->notify->path = nb->path;
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
switch (nb->action)
@@ -786,14 +767,8 @@ set_node_property(void *baton,
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify
- = svn_repos_notify_create(
- svn_repos_notify_load_normalized_mergeinfo,
- pb->notify_pool);
-
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_normalized_mergeinfo;
+ pb->notify_func(pb->notify_baton, pb->notify, nb->pool);
}
}
@@ -921,13 +896,8 @@ close_node(void *baton)
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_node_done,
- pb->notify_pool);
-
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify->action = svn_repos_notify_load_node_done;
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
return SVN_NO_ERROR;
@@ -1046,17 +1016,12 @@ close_revision(void *baton)
if (pb->notify_func)
{
- /* ### TODO: Use proper scratch pool instead of pb->notify_pool */
- svn_repos_notify_t *notify = svn_repos_notify_create(
- svn_repos_notify_load_txn_committed,
- pb->notify_pool);
-
- notify->new_revision = committed_rev;
- notify->old_revision = ((committed_rev == rb->rev)
+ pb->notify->action = svn_repos_notify_load_txn_committed;
+ pb->notify->new_revision = committed_rev;
+ pb->notify->old_revision = ((committed_rev == rb->rev)
? SVN_INVALID_REVNUM
: rb->rev);
- pb->notify_func(pb->notify_baton, notify, pb->notify_pool);
- svn_pool_clear(pb->notify_pool);
+ pb->notify_func(pb->notify_baton, pb->notify, rb->pool);
}
return SVN_NO_ERROR;
@@ -1114,10 +1079,10 @@ svn_repos_get_fs_build_parser4(const svn
pb->validate_props = validate_props;
pb->notify_func = notify_func;
pb->notify_baton = notify_baton;
+ pb->notify = svn_repos_notify_create(svn_repos_notify_load_txn_start, pool);
pb->uuid_action = uuid_action;
pb->parent_dir = parent_dir;
pb->pool = pool;
- pb->notify_pool = svn_pool_create(pool);
pb->rev_map = apr_hash_make(pool);
pb->oldest_old_rev = SVN_INVALID_REVNUM;
pb->last_rev_mapped = SVN_INVALID_REVNUM;
diff --unified -rupN 1.8.11/subversion/libsvn_subr/gpg_agent.c 1.8.10/subversion/libsvn_subr/gpg_agent.c
--- 1.8.11/subversion/libsvn_subr/gpg_agent.c 2015-06-16 14:59:45.283494632 +0200
+++ 1.8.10/subversion/libsvn_subr/gpg_agent.c 2015-06-16 14:59:01.647371441 +0200
@@ -72,9 +72,6 @@
#include "svn_cmdline.h"
#include "svn_checksum.h"
#include "svn_string.h"
-#include "svn_hash.h"
-#include "svn_user.h"
-#include "svn_dirent_uri.h"
#include "private/svn_auth_private.h"
@@ -83,7 +80,6 @@
#ifdef SVN_HAVE_GPG_AGENT
#define BUFFER_SIZE 1024
-#define ATTEMPT_PARAMETER "svn.simple.gpg_agent.attempt"
/* Modify STR in-place such that blanks are escaped as required by the
* gpg-agent protocol. Return a pointer to STR. */
@@ -102,24 +98,6 @@ escape_blanks(char *str)
return str;
}
-/* Generate the string CACHE_ID_P based on the REALMSTRING allocated in
- * RESULT_POOL using SCRATCH_POOL for temporary allocations. This is similar
- * to other password caching mechanisms. */
-static svn_error_t *
-get_cache_id(const char **cache_id_p, const char *realmstring,
- apr_pool_t *scratch_pool, apr_pool_t *result_pool)
-{
- const char *cache_id = NULL;
- svn_checksum_t *digest = NULL;
-
- SVN_ERR(svn_checksum(&digest, svn_checksum_md5, realmstring,
- strlen(realmstring), scratch_pool));
- cache_id = svn_checksum_to_cstring(digest, result_pool);
- *cache_id_p = cache_id;
-
- return SVN_NO_ERROR;
-}
-
/* Attempt to read a gpg-agent response message from the socket SD into
* buffer BUF. Buf is assumed to be N bytes large. Return TRUE if a response
* message could be read that fits into the buffer. Else return FALSE.
@@ -178,17 +156,6 @@ send_option(int sd, char *buf, size_t n,
return (strncmp(buf, "OK", 2) == 0);
}
-/* Send the BYE command and disconnect from the gpg-agent. Doing this avoids
- * gpg-agent emitting a "Connection reset by peer" log message with some
- * versions of gpg-agent. */
-static void
-bye_gpg_agent(int sd)
-{
- /* don't bother to check the result of the write, it either worked or it
- * didn't, but either way we're closing. */
- write(sd, "BYE\n", 4);
- close(sd);
-}
/* Locate a running GPG Agent, and return an open file descriptor
* for communication with the agent in *NEW_SD. If no running agent
@@ -206,34 +173,17 @@ find_running_gpg_agent(int *new_sd, apr_
*new_sd = -1;
- /* This implements the method of finding the socket as described in
- * the gpg-agent man page under the --use-standard-socket option.
- * The manage page misleadingly says the standard socket is
- * "named 'S.gpg-agent' located in the home directory." The standard
- * socket path is actually in the .gnupg directory in the home directory,
- * i.e. ~/.gnupg/S.gpg-agent */
gpg_agent_info = getenv("GPG_AGENT_INFO");
if (gpg_agent_info != NULL)
{
apr_array_header_t *socket_details;
- /* For reference GPG_AGENT_INFO consists of 3 : separated fields.
- * The path to the socket, the pid of the gpg-agent process and
- * finally the version of the protocol the agent talks. */
socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
pool);
socket_name = APR_ARRAY_IDX(socket_details, 0, const char *);
}
else
- {
- const char *homedir = svn_user_get_homedir(pool);
-
- if (!homedir)
- return SVN_NO_ERROR;
-
- socket_name = svn_dirent_join_many(pool, homedir, ".gnupg",
- "S.gpg-agent", NULL);
- }
+ return SVN_NO_ERROR;
if (socket_name != NULL)
{
@@ -260,13 +210,13 @@ find_running_gpg_agent(int *new_sd, apr_
buffer = apr_palloc(pool, BUFFER_SIZE);
if (!receive_from_gpg_agent(sd, buffer, BUFFER_SIZE))
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
if (strncmp(buffer, "OK", 2) != 0)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
@@ -276,19 +226,19 @@ find_running_gpg_agent(int *new_sd, apr_
request = "GETINFO socket_name\n";
if (write(sd, request, strlen(request)) == -1)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
if (!receive_from_gpg_agent(sd, buffer, BUFFER_SIZE))
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
if (strncmp(buffer, "D", 1) == 0)
p = &buffer[2];
if (!p)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
ep = strchr(p, '\n');
@@ -296,18 +246,18 @@ find_running_gpg_agent(int *new_sd, apr_
*ep = '\0';
if (strcmp(socket_name, p) != 0)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
/* The agent will terminate its response with "OK". */
if (!receive_from_gpg_agent(sd, buffer, BUFFER_SIZE))
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
if (strncmp(buffer, "OK", 2) != 0)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
@@ -315,28 +265,60 @@ find_running_gpg_agent(int *new_sd, apr_
return SVN_NO_ERROR;
}
-static svn_boolean_t
-send_options(int sd, char *buf, size_t n, apr_pool_t *scratch_pool)
+/* Implementation of svn_auth__password_get_t that retrieves the password
+ from gpg-agent */
+static svn_error_t *
+password_get_gpg_agent(svn_boolean_t *done,
+ const char **password,
+ apr_hash_t *creds,
+ const char *realmstring,
+ const char *username,
+ apr_hash_t *parameters,
+ svn_boolean_t non_interactive,
+ apr_pool_t *pool)
{
+ int sd;
+ const char *p = NULL;
+ char *ep = NULL;
+ char *buffer;
+ const char *request = NULL;
+ const char *cache_id = NULL;
const char *tty_name;
const char *tty_type;
const char *lc_ctype;
const char *display;
+ svn_checksum_t *digest = NULL;
+ char *password_prompt;
+ char *realm_prompt;
+
+ *done = FALSE;
+
+ SVN_ERR(find_running_gpg_agent(&sd, pool));
+ if (sd == -1)
+ return SVN_NO_ERROR;
+
+ buffer = apr_palloc(pool, BUFFER_SIZE);
/* Send TTY_NAME to the gpg-agent daemon. */
tty_name = getenv("GPG_TTY");
if (tty_name != NULL)
{
- if (!send_option(sd, buf, n, "ttyname", tty_name, scratch_pool))
- return FALSE;
+ if (!send_option(sd, buffer, BUFFER_SIZE, "ttyname", tty_name, pool))
+ {
+ close(sd);
+ return SVN_NO_ERROR;
+ }
}
/* Send TTY_TYPE to the gpg-agent daemon. */
tty_type = getenv("TERM");
if (tty_type != NULL)
{
- if (!send_option(sd, buf, n, "ttytype", tty_type, scratch_pool))
- return FALSE;
+ if (!send_option(sd, buffer, BUFFER_SIZE, "ttytype", tty_type, pool))
+ {
+ close(sd);
+ return SVN_NO_ERROR;
+ }
}
/* Compute LC_CTYPE. */
@@ -349,92 +331,53 @@ send_options(int sd, char *buf, size_t n
/* Send LC_CTYPE to the gpg-agent daemon. */
if (lc_ctype != NULL)
{
- if (!send_option(sd, buf, n, "lc-ctype", lc_ctype, scratch_pool))
- return FALSE;
+ if (!send_option(sd, buffer, BUFFER_SIZE, "lc-ctype", lc_ctype, pool))
+ {
+ close(sd);
+ return SVN_NO_ERROR;
+ }
}
/* Send DISPLAY to the gpg-agent daemon. */
display = getenv("DISPLAY");
if (display != NULL)
{
- if (!send_option(sd, buf, n, "display", display, scratch_pool))
- return FALSE;
- }
-
- return TRUE;
-}
-
-/* Implementation of svn_auth__password_get_t that retrieves the password
- from gpg-agent */
-static svn_error_t *
-password_get_gpg_agent(svn_boolean_t *done,
- const char **password,
- apr_hash_t *creds,
- const char *realmstring,
- const char *username,
- apr_hash_t *parameters,
- svn_boolean_t non_interactive,
- apr_pool_t *pool)
-{
- int sd;
- const char *p = NULL;
- char *ep = NULL;
- char *buffer;
- const char *request = NULL;
- const char *cache_id = NULL;
- char *password_prompt;
- char *realm_prompt;
- char *error_prompt;
- int *attempt;
-
- *done = FALSE;
-
- attempt = svn_hash_gets(parameters, ATTEMPT_PARAMETER);
-
- SVN_ERR(find_running_gpg_agent(&sd, pool));
- if (sd == -1)
- return SVN_NO_ERROR;
-
- buffer = apr_palloc(pool, BUFFER_SIZE);
-
- if (!send_options(sd, buffer, BUFFER_SIZE, pool))
- {
- bye_gpg_agent(sd);
- return SVN_NO_ERROR;
+ if (!send_option(sd, buffer, BUFFER_SIZE, "display", display, pool))
+ {
+ close(sd);
+ return SVN_NO_ERROR;
+ }
}
- SVN_ERR(get_cache_id(&cache_id, realmstring, pool, pool));
+ /* Create the CACHE_ID which will be generated based on REALMSTRING similar
+ to other password caching mechanisms. */
+ SVN_ERR(svn_checksum(&digest, svn_checksum_md5, realmstring,
+ strlen(realmstring), pool));
+ cache_id = svn_checksum_to_cstring(digest, pool);
password_prompt = apr_psprintf(pool, _("Password for '%s': "), username);
realm_prompt = apr_psprintf(pool, _("Enter your Subversion password for %s"),
realmstring);
- if (*attempt == 1)
- /* X means no error to the gpg-agent protocol */
- error_prompt = apr_pstrdup(pool, "X");
- else
- error_prompt = apr_pstrdup(pool, _("Authentication failed"));
-
request = apr_psprintf(pool,
- "GET_PASSPHRASE --data %s"
- "%s %s %s %s\n",
+ "GET_PASSPHRASE --data %s--repeat=1 "
+ "%s X %s %s\n",
non_interactive ? "--no-ask " : "",
cache_id,
- escape_blanks(error_prompt),
escape_blanks(password_prompt),
escape_blanks(realm_prompt));
if (write(sd, request, strlen(request)) == -1)
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
if (!receive_from_gpg_agent(sd, buffer, BUFFER_SIZE))
{
- bye_gpg_agent(sd);
+ close(sd);
return SVN_NO_ERROR;
}
- bye_gpg_agent(sd);
+ close(sd);
if (strncmp(buffer, "ERR", 3) == 0)
return SVN_NO_ERROR;
@@ -481,7 +424,7 @@ password_set_gpg_agent(svn_boolean_t *do
if (sd == -1)
return SVN_NO_ERROR;
- bye_gpg_agent(sd);
+ close(sd);
*done = TRUE;
return SVN_NO_ERROR;
@@ -497,108 +440,11 @@ simple_gpg_agent_first_creds(void **cred
const char *realmstring,
apr_pool_t *pool)
{
- svn_error_t *err;
- int *attempt = apr_palloc(pool, sizeof(*attempt));
-
- *attempt = 1;
- svn_hash_sets(parameters, ATTEMPT_PARAMETER, attempt);
- err = svn_auth__simple_creds_cache_get(credentials, iter_baton,
- provider_baton, parameters,
- realmstring, password_get_gpg_agent,
- SVN_AUTH__GPG_AGENT_PASSWORD_TYPE,
- pool);
- *iter_baton = attempt;
-
- return err;
-}
-
-/* An implementation of svn_auth_provider_t::next_credentials() */
-static svn_error_t *
-simple_gpg_agent_next_creds(void **credentials,
- void *iter_baton,
- void *provider_baton,
- apr_hash_t *parameters,
- const char *realmstring,
- apr_pool_t *pool)
-{
- int *attempt = (int *)iter_baton;
- int sd;
- char *buffer;
- const char *cache_id = NULL;
- const char *request = NULL;
-
- *credentials = NULL;
-
- /* The users previous credentials failed so first remove the cached entry,
- * before trying to retrieve them again. Because gpg-agent stores cached
- * credentials immediately upon retrieving them, this gives us the
- * opportunity to remove the invalid credentials and prompt the
- * user again. While it's possible that server side issues could trigger
- * this, this cache is ephemeral so at worst we're just speeding up
- * when the user would need to re-enter their password. */
-
- if (svn_hash_gets(parameters, SVN_AUTH_PARAM_NON_INTERACTIVE))
- {
- /* In this case since we're running non-interactively we do not
- * want to clear the cache since the user was never prompted by
- * gpg-agent to set a password. */
- return SVN_NO_ERROR;
- }
-
- *attempt = *attempt + 1;
-
- SVN_ERR(find_running_gpg_agent(&sd, pool));
- if (sd == -1)
- return SVN_NO_ERROR;
-
- buffer = apr_palloc(pool, BUFFER_SIZE);
-
- if (!send_options(sd, buffer, BUFFER_SIZE, pool))
- {
- bye_gpg_agent(sd);
- return SVN_NO_ERROR;
- }
-
- SVN_ERR(get_cache_id(&cache_id, realmstring, pool, pool));
-
- request = apr_psprintf(pool, "CLEAR_PASSPHRASE %s\n", cache_id);
-
- if (write(sd, request, strlen(request)) == -1)
- {
- bye_gpg_agent(sd);
- return SVN_NO_ERROR;
- }
-
- if (!receive_from_gpg_agent(sd, buffer, BUFFER_SIZE))
- {
- bye_gpg_agent(sd);
- return SVN_NO_ERROR;
- }
-
- if (strncmp(buffer, "OK\n", 3) != 0)
- {
- bye_gpg_agent(sd);
- return SVN_NO_ERROR;
- }
-
- /* TODO: This attempt limit hard codes it at 3 attempts (or 2 retries)
- * which matches svn command line client's retry_limit as set in
- * svn_cmdline_create_auth_baton(). It would be nice to have that
- * limit reflected here but that violates the boundry between the
- * prompt provider and the cache provider. gpg-agent is acting as
- * both here due to the peculiarties of their design so we'll have to
- * live with this for now. Note that when these failures get exceeded
- * it'll eventually fall back on the retry limits of whatever prompt
- * provider is in effect, so this effectively doubles the limit. */
- if (*attempt < 4)
- return svn_auth__simple_creds_cache_get(credentials, &iter_baton,
- provider_baton, parameters,
- realmstring,
- password_get_gpg_agent,
- SVN_AUTH__GPG_AGENT_PASSWORD_TYPE,
- pool);
-
- return SVN_NO_ERROR;
+ return svn_auth__simple_creds_cache_get(credentials, iter_baton,
+ provider_baton, parameters,
+ realmstring, password_get_gpg_agent,
+ SVN_AUTH__GPG_AGENT_PASSWORD_TYPE,
+ pool);
}
@@ -622,7 +468,7 @@ simple_gpg_agent_save_creds(svn_boolean_
static const svn_auth_provider_t gpg_agent_simple_provider = {
SVN_AUTH_CRED_SIMPLE,
simple_gpg_agent_first_creds,
- simple_gpg_agent_next_creds,
+ NULL,
simple_gpg_agent_save_creds
};
diff --unified -rupN 1.8.11/subversion/libsvn_subr/io.c 1.8.10/subversion/libsvn_subr/io.c
--- 1.8.11/subversion/libsvn_subr/io.c 2015-06-16 14:59:45.288494646 +0200
+++ 1.8.10/subversion/libsvn_subr/io.c 2015-06-16 14:59:02.116372755 +0200
@@ -4675,25 +4675,8 @@ svn_io_open_unique_file3(apr_file_t **fi
* case, but only if the umask allows it. */
if (!using_system_temp_dir)
{
- svn_error_t *err;
-
SVN_ERR(merge_default_file_perms(tempfile, &perms, scratch_pool));
- err = file_perms_set2(tempfile, perms, scratch_pool);
- if (err)
- {
- if (APR_STATUS_IS_INCOMPLETE(err->apr_err) ||
- APR_STATUS_IS_ENOTIMPL(err->apr_err))
- svn_error_clear(err);
- else
- {
- const char *message;
- message = apr_psprintf(scratch_pool,
- _("Can't set permissions on '%s'"),
- svn_dirent_local_style(tempname,
- scratch_pool));
- return svn_error_quick_wrap(err, message);
- }
- }
+ SVN_ERR(file_perms_set2(tempfile, perms, scratch_pool));
}
#endif
diff --unified -rupN 1.8.11/subversion/libsvn_wc/cleanup.c 1.8.10/subversion/libsvn_wc/cleanup.c
--- 1.8.11/subversion/libsvn_wc/cleanup.c 2015-06-16 14:59:43.662490022 +0200
+++ 1.8.10/subversion/libsvn_wc/cleanup.c 2015-06-16 14:59:01.225370259 +0200
@@ -67,13 +67,69 @@ can_be_cleaned(int *wc_format,
return SVN_NO_ERROR;
}
-/* Dummy svn_wc_status_func4_t implementation */
+/* Do a modifed check for LOCAL_ABSPATH, and all working children, to force
+ timestamp repair. */
static svn_error_t *
-status_dummy_callback(void *baton,
- const char *local_abspath,
- const svn_wc_status3_t *status,
- apr_pool_t *scratch_pool)
+repair_timestamps(svn_wc__db_t *db,
+ const char *local_abspath,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool)
{
+ svn_node_kind_t kind;
+ svn_wc__db_status_t status;
+
+ if (cancel_func)
+ SVN_ERR(cancel_func(cancel_baton));
+
+ SVN_ERR(svn_wc__db_read_info(&status, &kind,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL,
+ db, local_abspath, scratch_pool, scratch_pool));
+
+ if (status == svn_wc__db_status_server_excluded
+ || status == svn_wc__db_status_deleted
+ || status == svn_wc__db_status_excluded
+ || status == svn_wc__db_status_not_present)
+ return SVN_NO_ERROR;
+
+ if (kind == svn_node_file
+ || kind == svn_node_symlink)
+ {
+ svn_boolean_t modified;
+ SVN_ERR(svn_wc__internal_file_modified_p(&modified,
+ db, local_abspath, FALSE,
+ scratch_pool));
+ }
+ else if (kind == svn_node_dir)
+ {
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+ const apr_array_header_t *children;
+ int i;
+
+ SVN_ERR(svn_wc__db_read_children_of_working_node(&children, db,
+ local_abspath,
+ scratch_pool,
+ iterpool));
+ for (i = 0; i < children->nelts; ++i)
+ {
+ const char *child_abspath;
+
+ svn_pool_clear(iterpool);
+
+ child_abspath = svn_dirent_join(local_abspath,
+ APR_ARRAY_IDX(children, i,
+ const char *),
+ iterpool);
+
+ SVN_ERR(repair_timestamps(db, child_abspath,
+ cancel_func, cancel_baton, iterpool));
+ }
+ svn_pool_destroy(iterpool);
+ }
+
return SVN_NO_ERROR;
}
@@ -128,17 +184,8 @@ cleanup_internal(svn_wc__db_t *db,
SVN_ERR(svn_wc__db_pristine_cleanup(db, dir_abspath, scratch_pool));
}
- /* Instead of implementing a separate repair step here, use the standard
- status walker's optimized implementation, which performs repairs when
- there is a lock. */
- SVN_ERR(svn_wc__internal_walk_status(db, dir_abspath, svn_depth_infinity,
- FALSE /* get_all */,
- FALSE /* no_ignore */,
- FALSE /* ignore_text_mods */,
- NULL /* ignore patterns */,
- status_dummy_callback, NULL,
- cancel_func, cancel_baton,
- scratch_pool));
+ SVN_ERR(repair_timestamps(db, dir_abspath, cancel_func, cancel_baton,
+ scratch_pool));
/* All done, toss the lock */
SVN_ERR(svn_wc__db_wclock_release(db, dir_abspath, scratch_pool));
diff --unified -rupN 1.8.11/subversion/libsvn_wc/diff_editor.c 1.8.10/subversion/libsvn_wc/diff_editor.c
--- 1.8.11/subversion/libsvn_wc/diff_editor.c 2015-06-16 14:59:43.673490053 +0200
+++ 1.8.10/subversion/libsvn_wc/diff_editor.c 2015-06-16 14:59:00.942369467 +0200
@@ -114,6 +114,9 @@ struct edit_baton_t
/* Possibly diff repos against text-bases instead of working files. */
svn_boolean_t diff_pristine;
+ /* Hash whose keys are const char * changelist names. */
+ apr_hash_t *changelist_hash;
+
/* Cancel function/baton */
svn_cancel_func_t cancel_func;
void *cancel_baton;
@@ -235,26 +238,43 @@ struct file_baton_t
* calculating diffs. USE_TEXT_BASE defines whether to compare
* against working files or text-bases. REVERSE_ORDER defines which
* direction to perform the diff.
+ *
+ * CHANGELIST_FILTER is a list of const char * changelist names, used to
+ * filter diff output responses to only those items in one of the
+ * specified changelists, empty (or NULL altogether) if no changelist
+ * filtering is requested.
*/
static svn_error_t *
make_edit_baton(struct edit_baton_t **edit_baton,
svn_wc__db_t *db,
const char *anchor_abspath,
const char *target,
- const svn_diff_tree_processor_t *processor,
+ const svn_wc_diff_callbacks4_t *callbacks,
+ void *callback_baton,
svn_depth_t depth,
svn_boolean_t ignore_ancestry,
svn_boolean_t show_copies_as_adds,
svn_boolean_t use_text_base,
svn_boolean_t reverse_order,
+ const apr_array_header_t *changelist_filter,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)
{
+ apr_hash_t *changelist_hash = NULL;
struct edit_baton_t *eb;
+ const svn_diff_tree_processor_t *processor;
SVN_ERR_ASSERT(svn_dirent_is_absolute(anchor_abspath));
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
+ pool));
+
+ SVN_ERR(svn_wc__wrap_diff_callbacks(&processor,
+ callbacks, callback_baton, TRUE,
+ pool, pool));
+
if (reverse_order)
processor = svn_diff__tree_processor_reverse_create(processor, NULL, pool);
@@ -275,6 +295,7 @@ make_edit_baton(struct edit_baton_t **ed
eb->ignore_ancestry = ignore_ancestry;
eb->local_before_remote = reverse_order;
eb->diff_pristine = use_text_base;
+ eb->changelist_hash = changelist_hash;
eb->cancel_func = cancel_func;
eb->cancel_baton = cancel_baton;
eb->pool = pool;
@@ -388,6 +409,7 @@ svn_wc__diff_base_working_diff(svn_wc__d
const char *local_abspath,
const char *relpath,
svn_revnum_t revision,
+ apr_hash_t *changelist_hash,
const svn_diff_tree_processor_t *processor,
void *processor_dir_baton,
svn_boolean_t diff_pristine,
@@ -414,11 +436,12 @@ svn_wc__diff_base_working_diff(svn_wc__d
apr_hash_t *base_props;
apr_hash_t *local_props;
apr_array_header_t *prop_changes;
+ const char *changelist;
SVN_ERR(svn_wc__db_read_info(&status, NULL, &db_revision, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, &working_checksum, NULL,
NULL, NULL, NULL, NULL, NULL, &recorded_size,
- &recorded_time, NULL, NULL, NULL,
+ &recorded_time, &changelist, NULL, NULL,
&had_props, &props_mod, NULL, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool));
checksum = working_checksum;
@@ -427,6 +450,12 @@ svn_wc__diff_base_working_diff(svn_wc__d
|| status == svn_wc__db_status_added
|| (status == svn_wc__db_status_deleted && diff_pristine));
+ /* If the item is not a member of a specified changelist (and there are
+ some specified changelists), skip it. */
+ if (changelist_hash && !svn_hash_gets(changelist_hash, changelist))
+ return SVN_NO_ERROR;
+
+
if (status != svn_wc__db_status_normal)
{
SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &db_revision,
@@ -751,6 +780,7 @@ walk_local_nodes_diff(struct edit_baton_
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
eb->processor, dir_baton,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func,
eb->cancel_baton,
@@ -760,6 +790,7 @@ walk_local_nodes_diff(struct edit_baton_
child_relpath,
depth_below_here,
eb->processor, dir_baton,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func,
eb->cancel_baton,
@@ -795,6 +826,7 @@ walk_local_nodes_diff(struct edit_baton_
db, child_abspath,
child_relpath,
eb->revnum,
+ eb->changelist_hash,
eb->processor, dir_baton,
eb->diff_pristine,
eb->cancel_func,
@@ -817,6 +849,7 @@ walk_local_nodes_diff(struct edit_baton_
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
eb->processor, dir_baton,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func,
eb->cancel_baton,
@@ -825,6 +858,7 @@ walk_local_nodes_diff(struct edit_baton_
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
child_relpath, depth_below_here,
eb->processor, dir_baton,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func,
eb->cancel_baton,
@@ -836,9 +870,13 @@ walk_local_nodes_diff(struct edit_baton_
if (compared)
return SVN_NO_ERROR;
- /* Check for local property mods on this directory, if we haven't
- already reported them. */
+ /* Check for local property mods on this directory, if we haven't
+ already reported them and we aren't changelist-filted.
+ ### it should be noted that we do not currently allow directories
+ ### to be part of changelists, so if a changelist is provided, the
+ ### changelist check will always fail. */
if (! skip
+ && ! eb->changelist_hash
&& ! in_anchor_not_target
&& props_mod)
{
@@ -881,6 +919,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
const char *relpath,
const svn_diff_tree_processor_t *processor,
void *processor_parent_baton,
+ apr_hash_t *changelist_hash,
svn_boolean_t diff_pristine,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -893,6 +932,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
const svn_checksum_t *checksum;
const char *original_repos_relpath;
svn_revnum_t original_revision;
+ const char *changelist;
svn_boolean_t had_props;
svn_boolean_t props_mod;
apr_hash_t *pristine_props;
@@ -908,7 +948,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
NULL, NULL, NULL, NULL, &checksum, NULL,
&original_repos_relpath, NULL, NULL,
&original_revision, NULL, NULL, NULL,
- NULL, NULL, NULL, &had_props,
+ &changelist, NULL, NULL, &had_props,
&props_mod, NULL, NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -919,6 +959,10 @@ svn_wc__diff_local_only_file(svn_wc__db_
|| (status == svn_wc__db_status_deleted && diff_pristine)));
+ if (changelist && changelist_hash
+ && !svn_hash_gets(changelist_hash, changelist))
+ return SVN_NO_ERROR;
+
if (status == svn_wc__db_status_deleted)
{
assert(diff_pristine);
@@ -1021,6 +1065,7 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
svn_depth_t depth,
const svn_diff_tree_processor_t *processor,
void *processor_parent_baton,
+ apr_hash_t *changelist_hash,
svn_boolean_t diff_pristine,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -1049,7 +1094,6 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
processor_parent_baton,
processor,
scratch_pool, iterpool));
- /* ### skip_children is not used */
SVN_ERR(svn_wc__db_read_children_info(&nodes, &conflicts, db, local_abspath,
scratch_pool, iterpool));
@@ -1094,6 +1138,7 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
processor, pdb,
+ changelist_hash,
diff_pristine,
cancel_func, cancel_baton,
scratch_pool));
@@ -1105,6 +1150,7 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
child_relpath, depth_below_here,
processor, pdb,
+ changelist_hash,
diff_pristine,
cancel_func, cancel_baton,
iterpool));
@@ -1200,6 +1246,7 @@ handle_local_only(struct dir_baton_t *pb
svn_relpath_join(pb->relpath, name, scratch_pool),
repos_delete ? svn_depth_infinity : depth,
eb->processor, pb->pdb,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func, eb->cancel_baton,
scratch_pool));
@@ -1210,6 +1257,7 @@ handle_local_only(struct dir_baton_t *pb
svn_dirent_join(pb->local_abspath, name, scratch_pool),
svn_relpath_join(pb->relpath, name, scratch_pool),
eb->processor, pb->pdb,
+ eb->changelist_hash,
eb->diff_pristine,
eb->cancel_func, eb->cancel_baton,
scratch_pool));
@@ -1984,14 +2032,7 @@ close_file(void *file_baton,
const char *repos_file;
apr_hash_t *repos_props;
- if (fb->skip)
- {
- svn_pool_destroy(fb->pool); /* destroys scratch_pool and fb */
- SVN_ERR(maybe_done(pb));
- return SVN_NO_ERROR;
- }
-
- if (expected_md5_digest != NULL)
+ if (!fb->skip && expected_md5_digest != NULL)
{
svn_checksum_t *expected_checksum;
const svn_checksum_t *result_checksum;
@@ -2046,7 +2087,11 @@ close_file(void *file_baton,
}
}
- if (fb->repos_only)
+ if (fb->skip)
+ {
+ /* Diff processor requested skipping information */
+ }
+ else if (fb->repos_only)
{
SVN_ERR(eb->processor->file_deleted(fb->relpath,
fb->left_src,
@@ -2226,7 +2271,6 @@ svn_wc__get_diff_editor(const svn_delta_
struct svn_wc__shim_fetch_baton_t *sfb;
svn_delta_shim_callbacks_t *shim_callbacks =
svn_delta_shim_callbacks_default(result_pool);
- const svn_diff_tree_processor_t *diff_processor;
SVN_ERR_ASSERT(svn_dirent_is_absolute(anchor_abspath));
@@ -2234,28 +2278,12 @@ svn_wc__get_diff_editor(const svn_delta_
if (use_git_diff_format)
show_copies_as_adds = TRUE;
- SVN_ERR(svn_wc__wrap_diff_callbacks(&diff_processor,
- callbacks, callback_baton, TRUE,
- result_pool, scratch_pool));
-
- /* Apply changelist filtering to the output */
- if (changelist_filter && changelist_filter->nelts)
- {
- apr_hash_t *changelist_hash;
-
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
- result_pool));
- diff_processor = svn_wc__changelist_filter_tree_processor_create(
- diff_processor, wc_ctx, anchor_abspath,
- changelist_hash, result_pool);
- }
-
SVN_ERR(make_edit_baton(&eb,
wc_ctx->db,
anchor_abspath, target,
- diff_processor,
+ callbacks, callback_baton,
depth, ignore_ancestry, show_copies_as_adds,
- use_text_base, reverse_order,
+ use_text_base, reverse_order, changelist_filter,
cancel_func, cancel_baton,
result_pool));
@@ -2721,329 +2749,3 @@ svn_wc__wrap_diff_callbacks(const svn_di
*diff_processor = processor;
return SVN_NO_ERROR;
}
-
-/* =====================================================================
- * A tree processor filter that filters by changelist membership
- * =====================================================================
- *
- * The current implementation queries the WC for the changelist of each
- * file as it comes through, and sets the 'skip' flag for a non-matching
- * file.
- *
- * (It doesn't set the 'skip' flag for a directory, as we need to receive
- * the changed/added/deleted/closed call to know when it is closed, in
- * order to preserve the strict open-close semantics for the wrapped tree
- * processor.)
- *
- * It passes on the opening and closing of every directory, even if there
- * are no file changes to be passed on inside that directory.
- */
-
-typedef struct filter_tree_baton_t
-{
- const svn_diff_tree_processor_t *processor;
- svn_wc_context_t *wc_ctx;
- /* WC path of the root of the diff (where relpath = "") */
- const char *root_local_abspath;
- /* Hash whose keys are const char * changelist names. */
- apr_hash_t *changelist_hash;
-} filter_tree_baton_t;
-
-static svn_error_t *
-filter_dir_opened(void **new_dir_baton,
- svn_boolean_t *skip,
- svn_boolean_t *skip_children,
- const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- const svn_diff_source_t *copyfrom_source,
- void *parent_dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->dir_opened(new_dir_baton, skip, skip_children,
- relpath,
- left_source, right_source,
- copyfrom_source,
- parent_dir_baton,
- fb->processor,
- result_pool, scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_dir_added(const char *relpath,
- const svn_diff_source_t *copyfrom_source,
- const svn_diff_source_t *right_source,
- /*const*/ apr_hash_t *copyfrom_props,
- /*const*/ apr_hash_t *right_props,
- void *dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->dir_closed(relpath,
- NULL,
- right_source,
- dir_baton,
- fb->processor,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_dir_deleted(const char *relpath,
- const svn_diff_source_t *left_source,
- /*const*/ apr_hash_t *left_props,
- void *dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->dir_closed(relpath,
- left_source,
- NULL,
- dir_baton,
- fb->processor,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_dir_changed(const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- /*const*/ apr_hash_t *left_props,
- /*const*/ apr_hash_t *right_props,
- const apr_array_header_t *prop_changes,
- void *dir_baton,
- const struct svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->dir_closed(relpath,
- left_source,
- right_source,
- dir_baton,
- fb->processor,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_dir_closed(const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- void *dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->dir_closed(relpath,
- left_source,
- right_source,
- dir_baton,
- fb->processor,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_file_opened(void **new_file_baton,
- svn_boolean_t *skip,
- const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- const svn_diff_source_t *copyfrom_source,
- void *dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
- const char *local_abspath
- = svn_dirent_join(fb->root_local_abspath, relpath, scratch_pool);
-
- /* Skip if not a member of a given changelist */
- if (! svn_wc__changelist_match(fb->wc_ctx, local_abspath,
- fb->changelist_hash, scratch_pool))
- {
- *skip = TRUE;
- return SVN_NO_ERROR;
- }
-
- SVN_ERR(fb->processor->file_opened(new_file_baton,
- skip,
- relpath,
- left_source,
- right_source,
- copyfrom_source,
- dir_baton,
- fb->processor,
- result_pool,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_file_added(const char *relpath,
- const svn_diff_source_t *copyfrom_source,
- const svn_diff_source_t *right_source,
- const char *copyfrom_file,
- const char *right_file,
- /*const*/ apr_hash_t *copyfrom_props,
- /*const*/ apr_hash_t *right_props,
- void *file_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->file_added(relpath,
- copyfrom_source,
- right_source,
- copyfrom_file,
- right_file,
- copyfrom_props,
- right_props,
- file_baton,
- fb->processor,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_file_deleted(const char *relpath,
- const svn_diff_source_t *left_source,
- const char *left_file,
- /*const*/ apr_hash_t *left_props,
- void *file_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->file_deleted(relpath,
- left_source,
- left_file,
- left_props,
- file_baton,
- fb->processor,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_file_changed(const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- const char *left_file,
- const char *right_file,
- /*const*/ apr_hash_t *left_props,
- /*const*/ apr_hash_t *right_props,
- svn_boolean_t file_modified,
- const apr_array_header_t *prop_changes,
- void *file_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->file_changed(relpath,
- left_source,
- right_source,
- left_file,
- right_file,
- left_props,
- right_props,
- file_modified,
- prop_changes,
- file_baton,
- fb->processor,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_file_closed(const char *relpath,
- const svn_diff_source_t *left_source,
- const svn_diff_source_t *right_source,
- void *file_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->file_closed(relpath,
- left_source,
- right_source,
- file_baton,
- fb->processor,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-filter_node_absent(const char *relpath,
- void *dir_baton,
- const svn_diff_tree_processor_t *processor,
- apr_pool_t *scratch_pool)
-{
- struct filter_tree_baton_t *fb = processor->baton;
-
- SVN_ERR(fb->processor->node_absent(relpath,
- dir_baton,
- fb->processor,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-const svn_diff_tree_processor_t *
-svn_wc__changelist_filter_tree_processor_create(
- const svn_diff_tree_processor_t *processor,
- svn_wc_context_t *wc_ctx,
- const char *root_local_abspath,
- apr_hash_t *changelist_hash,
- apr_pool_t *result_pool)
-{
- struct filter_tree_baton_t *fb;
- svn_diff_tree_processor_t *filter;
-
- if (! changelist_hash)
- return processor;
-
- fb = apr_pcalloc(result_pool, sizeof(*fb));
- fb->processor = processor;
- fb->wc_ctx = wc_ctx;
- fb->root_local_abspath = root_local_abspath;
- fb->changelist_hash = changelist_hash;
-
- filter = svn_diff__tree_processor_create(fb, result_pool);
- filter->dir_opened = filter_dir_opened;
- filter->dir_added = filter_dir_added;
- filter->dir_deleted = filter_dir_deleted;
- filter->dir_changed = filter_dir_changed;
- filter->dir_closed = filter_dir_closed;
-
- filter->file_opened = filter_file_opened;
- filter->file_added = filter_file_added;
- filter->file_deleted = filter_file_deleted;
- filter->file_changed = filter_file_changed;
- filter->file_closed = filter_file_closed;
-
- filter->node_absent = filter_node_absent;
-
- return filter;
-}
-
diff --unified -rupN 1.8.11/subversion/libsvn_wc/diff.h 1.8.10/subversion/libsvn_wc/diff.h
--- 1.8.11/subversion/libsvn_wc/diff.h 2015-06-16 14:59:43.484489516 +0200
+++ 1.8.10/subversion/libsvn_wc/diff.h 2015-06-16 14:59:00.940369461 +0200
@@ -47,6 +47,9 @@ extern "C" {
svn_wc__db_status_added. When DIFF_PRISTINE is TRUE, report the pristine
version of LOCAL_ABSPATH as ADDED. In this case an
svn_wc__db_status_deleted may shadow an added or deleted node.
+
+ If CHANGELIST_HASH is not NULL and LOCAL_ABSPATH's changelist is not
+ in the changelist, don't report the node.
*/
svn_error_t *
svn_wc__diff_local_only_file(svn_wc__db_t *db,
@@ -54,6 +57,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
const char *relpath,
const svn_diff_tree_processor_t *processor,
void *processor_parent_baton,
+ apr_hash_t *changelist_hash,
svn_boolean_t diff_pristine,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -69,6 +73,9 @@ svn_wc__diff_local_only_file(svn_wc__db_
svn_wc__db_status_added. When DIFF_PRISTINE is TRUE, report the pristine
version of LOCAL_ABSPATH as ADDED. In this case an
svn_wc__db_status_deleted may shadow an added or deleted node.
+
+ If CHANGELIST_HASH is not NULL and LOCAL_ABSPATH's changelist is not
+ in the changelist, don't report the node.
*/
svn_error_t *
svn_wc__diff_local_only_dir(svn_wc__db_t *db,
@@ -77,6 +84,7 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
svn_depth_t depth,
const svn_diff_tree_processor_t *processor,
void *processor_parent_baton,
+ apr_hash_t *changelist_hash,
svn_boolean_t diff_pristine,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -124,6 +132,7 @@ svn_wc__diff_base_working_diff(svn_wc__d
const char *local_abspath,
const char *relpath,
svn_revnum_t revision,
+ apr_hash_t *changelist_hash,
const svn_diff_tree_processor_t *processor,
void *processor_dir_baton,
svn_boolean_t diff_pristine,
@@ -131,32 +140,6 @@ svn_wc__diff_base_working_diff(svn_wc__d
void *cancel_baton,
apr_pool_t *scratch_pool);
-/* Return a tree processor filter that filters by changelist membership.
- *
- * This filter only passes on the changes for a file if the file's path
- * (in the WC) is assigned to one of the changelists in @a changelist_hash.
- * It also passes on the opening and closing of each directory that contains
- * such a change, and possibly also of other directories, but not addition
- * or deletion or changes to a directory.
- *
- * If @a changelist_hash is null then no filtering is performed and the
- * returned diff processor is driven exactly like the input @a processor.
- *
- * @a wc_ctx is the WC context and @a root_local_abspath is the WC path of
- * the root of the diff (for which relpath = "" in the diff processor).
- *
- * Allocate the returned diff processor in @a result_pool, or if no
- * filtering is required then the input pointer @a processor itself may be
- * returned.
- */
-const svn_diff_tree_processor_t *
-svn_wc__changelist_filter_tree_processor_create(
- const svn_diff_tree_processor_t *processor,
- svn_wc_context_t *wc_ctx,
- const char *root_local_abspath,
- apr_hash_t *changelist_hash,
- apr_pool_t *result_pool);
-
#ifdef __cplusplus
}
diff --unified -rupN 1.8.11/subversion/libsvn_wc/diff_local.c 1.8.10/subversion/libsvn_wc/diff_local.c
--- 1.8.11/subversion/libsvn_wc/diff_local.c 2015-06-16 14:59:43.483489513 +0200
+++ 1.8.10/subversion/libsvn_wc/diff_local.c 2015-06-16 14:59:00.940369461 +0200
@@ -92,6 +92,9 @@ struct diff_baton
/* Should this diff not compare copied files with their source? */
svn_boolean_t show_copies_as_adds;
+ /* Hash whose keys are const char * changelist names. */
+ apr_hash_t *changelist_hash;
+
/* Cancel function/baton */
svn_cancel_func_t cancel_func;
void *cancel_baton;
@@ -249,6 +252,11 @@ diff_status_callback(void *baton,
if (eb->cur && eb->cur->skip_children)
return SVN_NO_ERROR;
+ if (eb->changelist_hash != NULL
+ && (!status->changelist
+ || ! svn_hash_gets(eb->changelist_hash, status->changelist)))
+ return SVN_NO_ERROR; /* Filtered via changelist */
+
/* This code does about the same thing as the inner body of
walk_local_nodes_diff() in diff_editor.c, except that
it is already filtered by the status walker, doesn't have to
@@ -353,6 +361,7 @@ diff_status_callback(void *baton,
SVN_ERR(svn_wc__diff_base_working_diff(db, child_abspath,
child_relpath,
SVN_INVALID_REVNUM,
+ eb->changelist_hash,
eb->processor,
eb->cur
? eb->cur->baton
@@ -396,6 +405,7 @@ diff_status_callback(void *baton,
child_relpath,
eb->processor,
eb->cur ? eb->cur->baton : NULL,
+ eb->changelist_hash,
FALSE,
eb->cancel_func,
eb->cancel_baton,
@@ -405,6 +415,7 @@ diff_status_callback(void *baton,
child_relpath, depth_below_here,
eb->processor,
eb->cur ? eb->cur->baton : NULL,
+ eb->changelist_hash,
FALSE,
eb->cancel_func,
eb->cancel_baton,
@@ -471,24 +482,16 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
processor = svn_diff__tree_processor_copy_as_changed_create(processor,
scratch_pool);
- /* Apply changelist filtering to the output */
- if (changelist_filter && changelist_filter->nelts)
- {
- apr_hash_t *changelist_hash;
-
- SVN_ERR(svn_hash_from_cstring_keys(&changelist_hash, changelist_filter,
- scratch_pool));
- processor = svn_wc__changelist_filter_tree_processor_create(
- processor, wc_ctx, local_abspath,
- changelist_hash, scratch_pool);
- }
-
eb.db = wc_ctx->db;
eb.processor = processor;
eb.ignore_ancestry = ignore_ancestry;
eb.show_copies_as_adds = show_copies_as_adds;
eb.pool = scratch_pool;
+ if (changelist_filter && changelist_filter->nelts)
+ SVN_ERR(svn_hash_from_cstring_keys(&eb.changelist_hash, changelist_filter,
+ scratch_pool));
+
if (show_copies_as_adds || use_git_diff_format || !ignore_ancestry)
get_all = TRUE; /* We need unmodified descendants of copies */
else
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/deleted-rev.c 1.8.10/subversion/mod_dav_svn/reports/deleted-rev.c
--- 1.8.11/subversion/mod_dav_svn/reports/deleted-rev.c 2015-06-16 14:59:45.399494962 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/deleted-rev.c 2015-06-16 14:59:02.748374526 +0200
@@ -56,9 +56,6 @@ dav_svn__get_deleted_rev_report(const da
dav_error *derr = NULL;
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
return dav_svn__new_error_tag(resource->pool, HTTP_BAD_REQUEST, 0,
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/file-revs.c 1.8.10/subversion/mod_dav_svn/reports/file-revs.c
--- 1.8.11/subversion/mod_dav_svn/reports/file-revs.c 2015-06-16 14:59:45.393494945 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/file-revs.c 2015-06-16 14:59:02.749374529 +0200
@@ -254,9 +254,6 @@ dav_svn__file_revs_report(const dav_reso
arb.repos = resource->info->repos;
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
/* ### This is done on other places, but the document element is
in this namespace, so is this necessary at all? */
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/get-locations.c 1.8.10/subversion/mod_dav_svn/reports/get-locations.c
--- 1.8.11/subversion/mod_dav_svn/reports/get-locations.c 2015-06-16 14:59:45.393494945 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/get-locations.c 2015-06-16 14:59:02.748374526 +0200
@@ -106,9 +106,6 @@ dav_svn__get_locations_report(const dav_
sizeof(svn_revnum_t));
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/get-location-segments.c 1.8.10/subversion/mod_dav_svn/reports/get-location-segments.c
--- 1.8.11/subversion/mod_dav_svn/reports/get-location-segments.c 2015-06-16 14:59:45.398494959 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/get-location-segments.c 2015-06-16 14:59:02.747374523 +0200
@@ -123,9 +123,6 @@ dav_svn__get_location_segments_report(co
struct location_segment_baton location_segment_baton;
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/inherited-props.c 1.8.10/subversion/mod_dav_svn/reports/inherited-props.c
--- 1.8.11/subversion/mod_dav_svn/reports/inherited-props.c 2015-06-16 14:59:45.392494942 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/inherited-props.c 2015-06-16 14:59:02.733374484 +0200
@@ -63,9 +63,6 @@ dav_svn__get_inherited_props_report(cons
apr_pool_t *iterpool;
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/log.c 1.8.10/subversion/mod_dav_svn/reports/log.c
--- 1.8.11/subversion/mod_dav_svn/reports/log.c 2015-06-16 14:59:45.394494948 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/log.c 2015-06-16 14:59:02.723374456 +0200
@@ -307,9 +307,6 @@ dav_svn__log_report(const dav_resource *
= apr_array_make(resource->pool, 1, sizeof(const char *));
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/reports/mergeinfo.c 1.8.10/subversion/mod_dav_svn/reports/mergeinfo.c
--- 1.8.11/subversion/mod_dav_svn/reports/mergeinfo.c 2015-06-16 14:59:45.398494959 +0200
+++ 1.8.10/subversion/mod_dav_svn/reports/mergeinfo.c 2015-06-16 14:59:02.749374529 +0200
@@ -67,9 +67,6 @@ dav_svn__get_mergeinfo_report(const dav_
= apr_array_make(resource->pool, 0, sizeof(const char *));
/* Sanity check. */
- if (!resource->info->repos_path)
- return dav_svn__new_error(resource->pool, HTTP_BAD_REQUEST, 0,
- "The request does not specify a repository path");
ns = dav_svn__find_ns(doc->namespaces, SVN_XML_NAMESPACE);
if (ns == -1)
{
diff --unified -rupN 1.8.11/subversion/mod_dav_svn/repos.c 1.8.10/subversion/mod_dav_svn/repos.c
--- 1.8.11/subversion/mod_dav_svn/repos.c 2015-06-16 14:59:45.398494959 +0200
+++ 1.8.10/subversion/mod_dav_svn/repos.c 2015-06-16 14:59:02.748374526 +0200
@@ -508,9 +508,6 @@ parse_vtxnstub_uri(dav_resource_combined
if (parse_txnstub_uri(comb, path, label, use_checked_in))
return TRUE;
- if (!comb->priv.root.txn_name)
- return TRUE;
-
comb->priv.root.vtxn_name = comb->priv.root.txn_name;
comb->priv.root.txn_name = dav_svn__get_txn(comb->priv.repos,
comb->priv.root.vtxn_name);
@@ -579,9 +576,6 @@ parse_vtxnroot_uri(dav_resource_combined
if (parse_txnroot_uri(comb, path, label, use_checked_in))
return TRUE;
- if (!comb->priv.root.txn_name)
- return TRUE;
-
comb->priv.root.vtxn_name = comb->priv.root.txn_name;
comb->priv.root.txn_name = dav_svn__get_txn(comb->priv.repos,
comb->priv.root.vtxn_name);
@@ -927,10 +921,6 @@ prep_working(dav_resource_combined *comb
point. */
if (txn_name == NULL)
{
- if (!comb->priv.root.activity_id)
- return dav_svn__new_error(comb->res.pool, HTTP_BAD_REQUEST, 0,
- "The request did not specify an activity ID");
-
txn_name = dav_svn__get_txn(comb->priv.repos,
comb->priv.root.activity_id);
if (txn_name == NULL)
@@ -1041,13 +1031,8 @@ prep_working(dav_resource_combined *comb
static dav_error *
prep_activity(dav_resource_combined *comb)
{
- const char *txn_name;
-
- if (!comb->priv.root.activity_id)
- return dav_svn__new_error(comb->res.pool, HTTP_BAD_REQUEST, 0,
- "The request did not specify an activity ID");
-
- txn_name = dav_svn__get_txn(comb->priv.repos, comb->priv.root.activity_id);
+ const char *txn_name = dav_svn__get_txn(comb->priv.repos,
+ comb->priv.root.activity_id);
comb->priv.root.txn_name = txn_name;
comb->res.exists = txn_name != NULL;
@@ -4159,9 +4144,7 @@ typedef struct walker_ctx_t {
static dav_error *
-do_walk(walker_ctx_t *ctx,
- int depth,
- apr_pool_t *scratch_pool)
+do_walk(walker_ctx_t *ctx, int depth)
{
const dav_walk_params *params = ctx->params;
int isdir = ctx->res.collection;
@@ -4234,19 +4217,19 @@ do_walk(walker_ctx_t *ctx,
svn_log__get_dir(ctx->info.repos_path,
ctx->info.root.rev,
TRUE, FALSE, SVN_DIRENT_ALL,
- scratch_pool));
+ params->pool));
/* fetch this collection's children */
serr = svn_fs_dir_entries(&children, ctx->info.root.root,
- ctx->info.repos_path, scratch_pool);
+ ctx->info.repos_path, params->pool);
if (serr != NULL)
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
"could not fetch collection members",
params->pool);
/* iterate over the children in this collection */
- iterpool = svn_pool_create(scratch_pool);
- for (hi = apr_hash_first(scratch_pool, children); hi; hi = apr_hash_next(hi))
+ iterpool = svn_pool_create(params->pool);
+ for (hi = apr_hash_first(params->pool, children); hi; hi = apr_hash_next(hi))
{
const void *key;
apr_ssize_t klen;
@@ -4299,7 +4282,7 @@ do_walk(walker_ctx_t *ctx,
ctx->res.uri = ctx->uri->data;
/* recurse on this collection */
- err = do_walk(ctx, depth - 1, iterpool);
+ err = do_walk(ctx, depth - 1);
if (err != NULL)
return err;
@@ -4381,7 +4364,7 @@ walk(const dav_walk_params *params, int
/* ### is the root already/always open? need to verify */
/* always return the error, and any/all multistatus responses */
- err = do_walk(&ctx, depth, params->pool);
+ err = do_walk(&ctx, depth);
*response = ctx.wres.response;
return err;
diff --unified -rupN 1.8.11/subversion/po/de.po 1.8.10/subversion/po/de.po
--- 1.8.11/subversion/po/de.po 2015-06-16 14:59:44.962493719 +0200
+++ 1.8.10/subversion/po/de.po 2015-06-16 14:59:00.535368327 +0200
@@ -96,7 +96,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2014-11-08 21:44+0000\n"
+"POT-Creation-Date: 2013-07-11 20:25+0100\n"
"PO-Revision-Date: 2013-07-11 20:22+0100\n"
"Last-Translator: Subversion Developers <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -296,7 +296,7 @@ msgid "Read error in pipe"
msgstr "Lesefehler in »Pipe«"
#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362
-#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2009
+#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2008
#, c-format
msgid "Write error"
msgstr "Schreibfehler"
@@ -817,7 +817,7 @@ msgstr "Die URL der Projektarchivwurzel
msgid "Session URL does not match expected session URL"
msgstr "Die Sitzungs-URL entspricht nicht der erwarteten Sitzungs-URL"
-#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:492
+#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:491
#, c-format
msgid "Can't create tunnel"
msgstr "Kann Tunnel nicht erzeugen"
@@ -868,8 +868,8 @@ msgstr "Kann keine Daten aus dem Antwort
msgid "Repository has been moved"
msgstr "Projektarchiv wurde verschoben"
-#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2863
-#: ../libsvn_ra_serf/util.c:944
+#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2881
+#: ../libsvn_ra_serf/util.c:767
msgid "Connection timed out"
msgstr "Die Wartezeit für die Verbindung ist abgelaufen"
@@ -1326,7 +1326,7 @@ msgid "GNOME Keyring is locked and we ar
msgstr "GNOME-Schlüsselring ist gesperrt und wir sind nicht-interaktiv"
#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356
-#: ../libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:930
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "»%s« endet mit einem reservierten Namen"
@@ -1355,7 +1355,7 @@ msgstr "Nicht unterstützter Knotentyp f
#: ../libsvn_client/add.c:960 ../libsvn_client/changelist.c:65
#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:55
-#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:815
+#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:815
#: ../libsvn_client/patch.c:3009 ../libsvn_client/relocate.c:232
#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136
#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:473
@@ -1387,7 +1387,7 @@ msgstr "Kann Binärdatei »%s« nicht an
#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610
#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833
-#: ../libsvn_client/prop_commands.c:1423 ../libsvn_client/revisions.c:104
+#: ../libsvn_client/prop_commands.c:1388 ../libsvn_client/revisions.c:104
#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247
#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301
#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
@@ -1406,7 +1406,7 @@ msgstr "»%s« verweist auf ein Verzeich
msgid "'%s' has no pristine version until it is committed"
msgstr "»%s« hat keinen ursprünglichen Dateiinhalt, bis es übertragen wurde"
-#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:388
msgid "(local)"
msgstr "(lokal)"
@@ -1419,7 +1419,7 @@ msgstr "URL »%s« verweist auf auf ein
msgid "Target changelist name must not be empty"
msgstr "Name der Ziel-Änderungsliste darf nicht leer sein"
-#: ../libsvn_client/checkout.c:109 ../libsvn_client/export.c:1447
+#: ../libsvn_client/checkout.c:109 ../libsvn_client/export.c:1445
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "Die URL »%s« existiert nicht"
@@ -1446,9 +1446,9 @@ msgstr "Alle nicht-relativen Ziele müss
#: ../libsvn_client/cmdline.c:312
msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
-msgstr "Auflösen von »^/«: Keine Wurzel eines Projektarchivs in den Zielparametern oder im Arbeitsverzeichnis gefunden"
+msgstr "Auflösen von »%s«: Keine Wurzel einer Arbeitskopie in den Zielparametern oder im Arbeitsverzeichnis gefunden"
-#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1522
+#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1510
msgid "Commit failed (details follow):"
msgstr "Übertragen schlug fehl (Details folgen):"
@@ -1542,128 +1542,128 @@ msgstr "Knoten »%s« hat unerwartet sei
msgid "'%s' is scheduled for addition, but is missing"
msgstr "»%s« ist zum Hinzufügen vorgesehen, fehlt aber"
-#: ../libsvn_client/commit_util.c:1257
+#: ../libsvn_client/commit_util.c:1212
#, c-format
msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit"
msgstr "»%s« ist weder im Projektarchiv bekannt noch Teil einer Übertragung, dennoch ist sein Kind »%s« Teil der Übertragung"
-#: ../libsvn_client/commit_util.c:1397
+#: ../libsvn_client/commit_util.c:1351
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "Kann »%s« und »%s« nicht übertragen, da beide auf dieselbe URL verweisen"
-#: ../libsvn_client/commit_util.c:1548
+#: ../libsvn_client/commit_util.c:1502
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "Übertragenes Objekt »%s« ist als Kopie markiert, besitzt aber keine Quell-URL"
-#: ../libsvn_client/commit_util.c:1553
+#: ../libsvn_client/commit_util.c:1507
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Übertragenes Objekt »%s« ist als Kopie markiert, hat aber eine ungültige Revision"
-#: ../libsvn_client/commit_util.c:2015
+#: ../libsvn_client/commit_util.c:1969
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Standardeigenschaften können nicht explizit als Revisionseigenschaften gesetzt werden"
-#: ../libsvn_client/copy.c:439
+#: ../libsvn_client/copy.c:427
#, c-format
msgid "Path '%s' exists, but is excluded"
msgstr "Pfad »%s« existiert, ist aber ausgeschlossen"
-#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062
-#: ../libsvn_client/copy.c:1321 ../libsvn_client/copy.c:1896
+#: ../libsvn_client/copy.c:433 ../libsvn_client/copy.c:1050
+#: ../libsvn_client/copy.c:1309 ../libsvn_client/copy.c:1884
#: ../libsvn_client/import.c:862
#, c-format
msgid "Path '%s' already exists"
msgstr "Pfad »%s« existiert bereits"
-#: ../libsvn_client/copy.c:500
+#: ../libsvn_client/copy.c:488
#, c-format
msgid "Path '%s' already exists as unversioned node"
msgstr "Pfad »%s« existiert als nicht versionierter Knoten"
-#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532
-#: ../libsvn_client/copy.c:1912
+#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:520
+#: ../libsvn_client/copy.c:1900
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Pfad »%s« ist kein Verzeichnis"
-#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10154
-#: ../svnlook/svnlook.c:1425
+#: ../libsvn_client/copy.c:559 ../libsvn_client/merge.c:10118
+#: ../svnlook/svnlook.c:1424
#, c-format
msgid "Path '%s' does not exist"
msgstr "Pfad »%s« existiert nicht"
-#: ../libsvn_client/copy.c:741 ../libsvn_client/copy.c:782
+#: ../libsvn_client/copy.c:729 ../libsvn_client/copy.c:770
#, c-format
msgid "Path '%s' already exists, but is not a directory"
msgstr "Pfad »%s« existiert bereits, ist aber kein Verzeichnis"
-#: ../libsvn_client/copy.c:843
+#: ../libsvn_client/copy.c:831
msgid "Source and destination URLs appear not to point to the same repository."
msgstr "Quellen- und Ziel-URL scheinen nicht auf das selbe Projektarchiv zu zeigen."
-#: ../libsvn_client/copy.c:1052 ../libsvn_client/prop_commands.c:167
+#: ../libsvn_client/copy.c:1040 ../libsvn_client/prop_commands.c:167
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Pfad »%s« existiert nicht in Revision %ld"
-#: ../libsvn_client/copy.c:1880
+#: ../libsvn_client/copy.c:1868
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Pfad »%s« wurde in Revision %ld nicht gefunden"
-#: ../libsvn_client/copy.c:1885
+#: ../libsvn_client/copy.c:1873
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Pfad »%s« wurde in der HEAD-Revision nicht gefunden"
-#: ../libsvn_client/copy.c:2013
+#: ../libsvn_client/copy.c:2001
msgid "Cannot mix repository and working copy sources"
msgstr "Quellen aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden"
-#: ../libsvn_client/copy.c:2065
+#: ../libsvn_client/copy.c:2053
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Kann Pfad »%s« nicht in sein eigenes Kind »%s« kopieren"
-#: ../libsvn_client/copy.c:2101
+#: ../libsvn_client/copy.c:2089
#, c-format
msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'."
msgstr "Externer Verweis »%s« kann nicht verschoben werden; bitte bearbeiten Sie die Eigenschaft »svn:externals« von »%s«"
-#: ../libsvn_client/copy.c:2116
+#: ../libsvn_client/copy.c:2104
msgid "Moves between the working copy and the repository are not supported"
msgstr "Verschiebungen zwischen der Arbeitskopie und dem Projektarchiv sind nicht unterstützt"
-#: ../libsvn_client/copy.c:2131
+#: ../libsvn_client/copy.c:2119
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kann URL »%s« nicht auf sich selbst verschieben"
-#: ../libsvn_client/copy.c:2132
+#: ../libsvn_client/copy.c:2120
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kann »%s« nicht auf sich selbst verschieben"
-#: ../libsvn_client/copy.c:2199
+#: ../libsvn_client/copy.c:2187
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "»%s« hat keine zugehörige URL"
#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282
-#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1114
-#: ../libsvn_wc/update_editor.c:1124
+#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103
+#: ../libsvn_wc/update_editor.c:1120
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
-#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:814
+#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:812
#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051
-#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1981
-#: ../libsvn_wc/diff_editor.c:2060 ../libsvn_wc/externals.c:651
-#: ../libsvn_wc/update_editor.c:4279
+#: ../libsvn_ra_svn/client.c:1207 ../libsvn_wc/diff_editor.c:1977
+#: ../libsvn_wc/diff_editor.c:2056 ../libsvn_wc/externals.c:651
+#: ../libsvn_wc/update_editor.c:4238
#, c-format
msgid "Checksum mismatch for '%s'"
msgstr "Prüfsummenfehler für »%s«"
@@ -1721,7 +1721,7 @@ msgstr "%s\t(Revision %ld)"
msgid "%s\t(working copy)"
msgstr "%s\t(Arbeitskopie)"
-#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:795
+#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:794
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sEigenschaftsänderungen: %s%s"
@@ -1731,8 +1731,8 @@ msgstr "%sEigenschaftsänderungen: %s%s"
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kann nicht anzeigen: Dateityp ist als binär angegeben.%s"
-#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7203
-#: ../libsvn_client/merge.c:10556
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7178
+#: ../libsvn_client/merge.c:10525
msgid "Not all required revisions are specified"
msgstr "Es sind nicht alle erforderlichen Revisionen angegeben"
@@ -1795,47 +1795,46 @@ msgstr "»%s« ist kein gültiger EOL We
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "Zielverzeichnis existiert und kann nur mittels »--force« überschrieben werden"
-#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527
+#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1525
#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293
#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227
-#: ../libsvn_wc/status.c:2679 ../libsvn_wc/wc_db.c:2576
-#: ../libsvn_wc/wc_db.c:2770 ../libsvn_wc/wc_db.c:2794
-#: ../libsvn_wc/wc_db.c:2952 ../libsvn_wc/wc_db.c:3950
-#: ../libsvn_wc/wc_db.c:6001 ../libsvn_wc/wc_db.c:6321
-#: ../libsvn_wc/wc_db.c:6482 ../libsvn_wc/wc_db.c:6637
-#: ../libsvn_wc/wc_db.c:7672 ../libsvn_wc/wc_db.c:8631
-#: ../libsvn_wc/wc_db.c:9294 ../libsvn_wc/wc_db.c:9923
-#: ../libsvn_wc/wc_db.c:10070 ../libsvn_wc/wc_db.c:10210
-#: ../libsvn_wc/wc_db.c:10560 ../libsvn_wc/wc_db.c:12047
-#: ../libsvn_wc/wc_db.c:12123 ../libsvn_wc/wc_db.c:13657
-#: ../libsvn_wc/wc_db.c:13717 ../libsvn_wc/wc_db.c:13855
-#: ../libsvn_wc/wc_db.c:14013 ../libsvn_wc/wc_db.c:14450
-#: ../libsvn_wc/wc_db.c:15231
+#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2509
+#: ../libsvn_wc/wc_db.c:2703 ../libsvn_wc/wc_db.c:2727
+#: ../libsvn_wc/wc_db.c:2885 ../libsvn_wc/wc_db.c:3876
+#: ../libsvn_wc/wc_db.c:5895 ../libsvn_wc/wc_db.c:6215
+#: ../libsvn_wc/wc_db.c:6376 ../libsvn_wc/wc_db.c:6530
+#: ../libsvn_wc/wc_db.c:8355 ../libsvn_wc/wc_db.c:8812
+#: ../libsvn_wc/wc_db.c:9441 ../libsvn_wc/wc_db.c:9588
+#: ../libsvn_wc/wc_db.c:9728 ../libsvn_wc/wc_db.c:10078
+#: ../libsvn_wc/wc_db.c:11565 ../libsvn_wc/wc_db.c:11641
+#: ../libsvn_wc/wc_db.c:13175 ../libsvn_wc/wc_db.c:13235
+#: ../libsvn_wc/wc_db.c:13373 ../libsvn_wc/wc_db.c:13531
+#: ../libsvn_wc/wc_db.c:13968 ../libsvn_wc/wc_db.c:14749
#, c-format
msgid "The node '%s' was not found."
msgstr "Der Knoten »%s« wurde nicht gefunden."
-#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1184
-#: ../libsvn_client/export.c:1241
+#: ../libsvn_client/export.c:283 ../libsvn_client/export.c:1182
+#: ../libsvn_client/export.c:1239
#, c-format
msgid "Destination file '%s' exists, and will not be overwritten unless forced"
msgstr "Zieldatei »%s« existiert und kann nur mittels »--force« überschrieben werden"
-#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1189
-#: ../libsvn_client/export.c:1246
+#: ../libsvn_client/export.c:289 ../libsvn_client/export.c:1187
+#: ../libsvn_client/export.c:1244
#, c-format
msgid "Destination '%s' exists. Cannot overwrite directory with non-directory"
msgstr "Ziel »%s« existiert. Kann Verzeichnis nicht mit etwas überschreiben, was kein Verzeichnis ist"
-#: ../libsvn_client/export.c:473 ../libsvn_client/export.c:622
-#: ../libsvn_client/export.c:1078
+#: ../libsvn_client/export.c:471 ../libsvn_client/export.c:620
+#: ../libsvn_client/export.c:1076
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "»%s« existiert und ist kein Verzeichnis"
-#: ../libsvn_client/export.c:477 ../libsvn_client/export.c:626
-#: ../libsvn_client/export.c:1082
+#: ../libsvn_client/export.c:475 ../libsvn_client/export.c:624
+#: ../libsvn_client/export.c:1080
#, c-format
msgid "'%s' already exists"
msgstr "»%s« existiert bereits"
@@ -1930,7 +1929,7 @@ msgstr "»%s« ist in dieser Arbeitskopi
msgid "'%s' is not locked"
msgstr "»%s« ist nicht gesperrt"
-#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1413
+#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1411
#: ../libsvn_ra/ra_loader.c:1074
msgid "Lock comment contains illegal characters"
msgstr "Sperrkommentar enthält illegale Zeichen"
@@ -1956,12 +1955,12 @@ msgstr "PREV, BASE oder COMMITTED Revisi
msgid "Missing required revision specification"
msgstr "Es wurde keine Revision angegeben"
-#: ../libsvn_client/merge.c:443
+#: ../libsvn_client/merge.c:439
#, c-format
msgid "URL '%s' of '%s' is not in repository '%s'"
msgstr "URL »%s« von »%s« ist nicht im Projektarchiv »%s«"
-#: ../libsvn_client/merge.c:480
+#: ../libsvn_client/merge.c:476
#, c-format
msgid "'%s' must be from the same repository as '%s'"
msgstr "»%s« muss aus dem selben Projektarchiv wie »%s« stammen"
@@ -1971,26 +1970,25 @@ msgstr "»%s« muss aus dem selben Proje
#. xgettext: the '.working', '.merge-left.r%ld' and
#. '.merge-right.r%ld' strings are used to tag onto a file
#. name in case of a merge conflict
-#: ../libsvn_client/merge.c:2050
-#, c-format
-msgid ".working%s%s"
-msgstr ".working%s%s"
+#: ../libsvn_client/merge.c:2030
+msgid ".working"
+msgstr ".working"
-#: ../libsvn_client/merge.c:2053
+#: ../libsvn_client/merge.c:2032
#, c-format
-msgid ".merge-left.r%ld%s%s"
-msgstr ".merge-left.r%ld%s%s"
+msgid ".merge-left.r%ld"
+msgstr ".merge-links.r%ld"
-#: ../libsvn_client/merge.c:2057
+#: ../libsvn_client/merge.c:2035
#, c-format
-msgid ".merge-right.r%ld%s%s"
-msgstr ".merge-right.r%ld%s%s"
+msgid ".merge-right.r%ld"
+msgstr ".merge-rechts.r%ld"
-#: ../libsvn_client/merge.c:4708
+#: ../libsvn_client/merge.c:4683
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "Kann keinen Bereich aus der zukünftigen Geschichte des Pfades rückwärts zusammenführen; versuchen Sie zuerst zu aktualisieren"
-#: ../libsvn_client/merge.c:5443
+#: ../libsvn_client/merge.c:5418
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -2003,75 +2001,75 @@ msgstr ""
"Lösen Sie alle Konflikte auf und starten Sie die Zusammenführung\n"
"erneut, um die fehlenden Revisionen zusammenzuführen"
-#: ../libsvn_client/merge.c:6258
+#: ../libsvn_client/merge.c:6233
#, c-format
msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
msgstr "Ungültige Zusammenführungsinformationen in »%s« entdeckt, Zusammenführungsverfolgung nicht möglich"
-#: ../libsvn_client/merge.c:6407
+#: ../libsvn_client/merge.c:6382
msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "Zusammenführungsverfolgung nicht erlaubt bei fehlenden Unterbäumen; versuchen Sie diese Elemente erst wiederherzustellen:\n"
-#: ../libsvn_client/merge.c:7407
+#: ../libsvn_client/merge.c:7382
#, c-format
msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
msgstr "Ungültige Zusammenführungsinformationen im Zusammenführungsziel »%s« entdeckt, Zusammenführungsverfolgung nicht möglich"
-#: ../libsvn_client/merge.c:9726
+#: ../libsvn_client/merge.c:9700
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "Die Verwendung zweier URLs ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen"
-#: ../libsvn_client/merge.c:9733 ../libsvn_client/merge.c:10068
+#: ../libsvn_client/merge.c:9707 ../libsvn_client/merge.c:10032
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "Die Zusammenführung aus fremdem Projektarchiv ist nicht kompatibel mit Änderungen der Zusammenführungsinformationen"
-#: ../libsvn_client/merge.c:10161 ../libsvn_client/merge.c:10304
+#: ../libsvn_client/merge.c:10125 ../libsvn_client/merge.c:10268
#, c-format
msgid "Merge target '%s' does not exist in the working copy"
msgstr "Zusammenführungsziel »%s« ist nicht in der Arbeitskopie enthalten"
-#: ../libsvn_client/merge.c:10184
+#: ../libsvn_client/merge.c:10148
msgid "Cannot determine revision of working copy"
msgstr "Die Revision der Arbeitskopie kann nicht bestimmt werden"
-#: ../libsvn_client/merge.c:10190
+#: ../libsvn_client/merge.c:10154
#, c-format
msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
msgstr "Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen zusammenführen [%ld:%ld], versuchen Sie erst zu aktualisieren"
-#: ../libsvn_client/merge.c:10205
+#: ../libsvn_client/merge.c:10169
msgid "Cannot merge into a working copy with a switched subtree"
msgstr "Kann nicht in eine Arbeitskopie mit umgestelltem Unterbaum zusammenführen"
-#: ../libsvn_client/merge.c:10221
+#: ../libsvn_client/merge.c:10185
msgid "Cannot merge into a working copy that has local modifications"
msgstr "Kann nicht in eine Arbeitskopie mit lokalen Änderungen zusammenführen"
-#: ../libsvn_client/merge.c:10241 ../svn/merge-cmd.c:60
+#: ../libsvn_client/merge.c:10205 ../svn/merge-cmd.c:60
#, c-format
msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
msgstr "Ungültige Quelle für Zusammenführung »%s«; ein Arbeitskopiepfad kann nur mit einer Revision im Projektarchiv verwendet werden (eine Zahl, ein Datum oder »HEAD«)"
-#: ../libsvn_client/merge.c:10559 ../svn/merge-cmd.c:127
+#: ../libsvn_client/merge.c:10528 ../svn/merge-cmd.c:127
msgid "Merge sources must both be either paths or URLs"
msgstr "Zusammenführungsquellen müssen beide Pfade oder URLs sein"
-#: ../libsvn_client/merge.c:11320 ../libsvn_client/merge.c:11482
-#: ../libsvn_client/merge.c:12369
+#: ../libsvn_client/merge.c:11289 ../libsvn_client/merge.c:11451
+#: ../libsvn_client/merge.c:12323
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "»%s@%ld« muss eine Vorgängerbeziehung zu »%s@%ld« haben"
-#: ../libsvn_client/merge.c:11432
+#: ../libsvn_client/merge.c:11401
#, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "Weder die Quelle noch das Ziel der Reintegration darf Wurzel des Projektarchivs sein"
-#: ../libsvn_client/merge.c:11442
+#: ../libsvn_client/merge.c:11411
msgid "Reintegrate merge not possible"
msgstr "Zusammenführung zur Reintegration nicht möglich"
-#: ../libsvn_client/merge.c:11515
+#: ../libsvn_client/merge.c:11484
#, c-format
msgid ""
"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
@@ -2080,28 +2078,28 @@ msgstr ""
"Reintegration kann nur genutzt werden, falls die Revisionen %ld bis %ld vorher von %s in die zu reintegrierende Quelle zusammengeführt wurden, aber dies ist nicht der Fall:\n"
"%s"
-#: ../libsvn_client/merge.c:11577
+#: ../libsvn_client/merge.c:11546
#, c-format
msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source"
msgstr "Kann nicht nach »%s« reintegrieren, da es lokal hinzugefügt wurde und daher keine Herkunftsbeziehung zur Quelle der Zusammenführung hat"
-#: ../libsvn_client/merge.c:11845
+#: ../libsvn_client/merge.c:11814
msgid "Cannot merge automatically while ignoring mergeinfo"
msgstr "Kann nicht automatisch zusammenführen und dabei Zusammenführungsinformationen ignorieren"
-#: ../libsvn_client/merge.c:12585
+#: ../libsvn_client/merge.c:12539
msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge"
msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »record-only« kann aber mit dieser Art der Zusammenführung nicht verwendet werden"
-#: ../libsvn_client/merge.c:12591
+#: ../libsvn_client/merge.c:12545
msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge"
msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option zur Angabe der Tiefe kann aber mit dieser Art der Zusammenführung nicht verwendet werden"
-#: ../libsvn_client/merge.c:12597
+#: ../libsvn_client/merge.c:12551
msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge"
msgstr "Die benötigte Zusammenführung ist eine Reintegration, die Option »force_delete« kann aber mit dieser Art der Zusammenführung nicht verwendet werden"
-#: ../libsvn_client/mergeinfo.c:1718
+#: ../libsvn_client/mergeinfo.c:1700
msgid "Only depths 'infinity' and 'empty' are currently supported"
msgstr "Nur Tiefenangaben von »infinity« und »empty« werden momentan unterstützt"
@@ -2121,7 +2119,7 @@ msgstr "Anzahl der zu entfernenden Kompo
#: ../libsvn_client/patch.c:3021 ../libsvn_fs_base/tree.c:3978
#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3066
#: ../libsvn_fs_fs/tree.c:3071 ../libsvn_ra/compat.c:675
-#: ../libsvn_ra_local/ra_plugin.c:1145
+#: ../libsvn_ra_local/ra_plugin.c:1144
#, c-format
msgid "'%s' is not a file"
msgstr "»%s« ist keine Datei"
@@ -2192,7 +2190,7 @@ msgstr "Der Autorenname sollte keinen Ze
msgid "'%s' does not exist in revision %ld"
msgstr "»%s« existiert nicht in Revision %ld"
-#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1102
+#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1096
#: ../libsvn_wc/crop.c:168
#, c-format
msgid "Unknown node kind for '%s'"
@@ -2250,7 +2248,7 @@ msgstr "Unbekannter Revisionstyp für »
#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586
#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
-#: ../libsvn_wc/wc_db.c:13269 ../libsvn_wc/wc_db_wcroot.c:630
+#: ../libsvn_wc/wc_db.c:12787 ../libsvn_wc/wc_db_wcroot.c:627
#, c-format
msgid "'%s' is not a working copy"
msgstr "»%s« ist keine Arbeitskopie"
@@ -2275,8 +2273,8 @@ msgstr "Kann »%s« nicht umplatzieren d
msgid "Directory '%s' has no URL"
msgstr "Verzeichnis »%s« hat keine URL"
-#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236
-#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4870
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:235
+#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4829
#, c-format
msgid ""
"'%s'\n"
@@ -2292,7 +2290,7 @@ msgstr ""
msgid "'%s' shares no common ancestry with '%s'"
msgstr "»%s« hat keinen Vorgänger gemeinsam mit »%s«"
-#: ../libsvn_client/util.c:336
+#: ../libsvn_client/util.c:329
#, c-format
msgid "Cannot mix repository and working copy targets"
msgstr "Ziele aus dem Projektarchiv und einer Arbeitskopie können nicht gemischt werden"
@@ -2355,57 +2353,52 @@ msgstr "Delta füllt das Zielfenster nic
msgid "Delta does not contain enough new data"
msgstr "Delta enthält nicht genügend neue Daten"
-#: ../libsvn_delta/svndiff.c:801
+#: ../libsvn_delta/svndiff.c:797
msgid "Svndiff has invalid header"
msgstr "Svndiff-Daten enthalten ungültigen Kopf"
-#: ../libsvn_delta/svndiff.c:857 ../libsvn_delta/svndiff.c:1039
+#: ../libsvn_delta/svndiff.c:853 ../libsvn_delta/svndiff.c:1035
msgid "Svndiff contains a too-large window"
msgstr "Svndiff-Daten enthalten ein zu großes Fenster"
-#: ../libsvn_delta/svndiff.c:864 ../libsvn_delta/svndiff.c:1046
+#: ../libsvn_delta/svndiff.c:860 ../libsvn_delta/svndiff.c:1042
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff-Daten enthalten defekte Fenster-Kopfdaten"
-#: ../libsvn_delta/svndiff.c:873
+#: ../libsvn_delta/svndiff.c:869
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen"
-#: ../libsvn_delta/svndiff.c:930 ../libsvn_delta/svndiff.c:987
-#: ../libsvn_delta/svndiff.c:1068
+#: ../libsvn_delta/svndiff.c:926 ../libsvn_delta/svndiff.c:983
+#: ../libsvn_delta/svndiff.c:1064
msgid "Unexpected end of svndiff input"
msgstr "Unerwartetes Ende der Svndiff-Eingangsdaten"
-#: ../libsvn_diff/diff_file.c:184
-#, c-format
-msgid "File '%s' is too large to be read in to memory"
-msgstr "Datei »%s« ist zu groß um in den Speicher gelesen zu werden"
-
-#: ../libsvn_diff/diff_file.c:1106
+#: ../libsvn_diff/diff_file.c:1094
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Die Datei »%s« veränderte sich unerwartet während des Vergleichs"
-#: ../libsvn_diff/diff_file.c:1276
+#: ../libsvn_diff/diff_file.c:1264
msgid "Error in options to internal diff"
msgstr "Fehler in Optionen für internes Vergleichsprogramm"
-#: ../libsvn_diff/diff_file.c:1302
+#: ../libsvn_diff/diff_file.c:1290
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Ungültiges Argument »%s« in Vergleichsoptionen"
#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1799
+#: ../libsvn_diff/diff_file.c:1787
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%a %e. %b %H:%M:%S %Y"
-#: ../libsvn_diff/diff_file.c:1875 ../libsvn_diff/diff_file.c:1891
+#: ../libsvn_diff/diff_file.c:1863 ../libsvn_diff/diff_file.c:1879
#, c-format
msgid "Path '%s' must be inside the directory '%s'"
msgstr "Pfad »%s« muss innerhalb des Verzeichnisses »%s« sein"
-#: ../libsvn_diff/diff_file.c:2409
+#: ../libsvn_diff/diff_file.c:2397
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Konnte mmap »%s« nicht löschen"
@@ -2444,82 +2437,82 @@ msgstr "»%s« existiert schon, kann als
msgid "The filesystem does not support 'absent' nodes"
msgstr "Das Dateisystem unterstützt keine »absent« Knoten"
-#: ../libsvn_fs/fs-loader.c:121
+#: ../libsvn_fs/fs-loader.c:120
#, c-format
msgid "Invalid name for FS type '%s'"
msgstr "Ungültiger Name für Dateisystemtyp »%s«"
-#: ../libsvn_fs/fs-loader.c:138 ../libsvn_ra/ra_loader.c:161
+#: ../libsvn_fs/fs-loader.c:137 ../libsvn_ra/ra_loader.c:161
#: ../libsvn_ra/ra_loader.c:174
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "»%s« definiert »%s()« nicht"
-#: ../libsvn_fs/fs-loader.c:164
+#: ../libsvn_fs/fs-loader.c:163
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Konnte Modul für Dateisystemtyp »%s« nicht laden"
-#: ../libsvn_fs/fs-loader.c:186
+#: ../libsvn_fs/fs-loader.c:185
#, c-format
msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "Versionen in Dateisystemmodul »%s« stimmen nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s"
-#: ../libsvn_fs/fs-loader.c:266
+#: ../libsvn_fs/fs-loader.c:265
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Unbekannter Dateisystemtyp »%s«"
-#: ../libsvn_fs/fs-loader.c:389
+#: ../libsvn_fs/fs-loader.c:387
#, c-format
msgid "Path '%s' is not in UTF-8"
msgstr "Pfad »%s« ist kein UTF-8"
-#: ../libsvn_fs/fs-loader.c:397
+#: ../libsvn_fs/fs-loader.c:395
#, c-format
msgid "Path '%s' contains '.' or '..' element"
msgstr "Pfad »%s« enthält ein Element ».« oder »..«"
-#: ../libsvn_fs/fs-loader.c:554 ../libsvn_repos/repos.c:1982
+#: ../libsvn_fs/fs-loader.c:552 ../libsvn_repos/repos.c:1982
msgid "Hotcopy source and destination are equal"
msgstr "Quelle und Ziel für Kopie im laufenden Betrieb sind gleich"
-#: ../libsvn_fs/fs-loader.c:564
+#: ../libsvn_fs/fs-loader.c:562
#, c-format
msgid "'%s' already exists and is a file"
msgstr "»%s« existiert bereits und ist eine Datei"
-#: ../libsvn_fs/fs-loader.c:569
+#: ../libsvn_fs/fs-loader.c:567
#, c-format
msgid "'%s' already exists and has an unknown node kind"
msgstr "»%s« existiert bereits und hat einen unbekannten Knotentyp"
-#: ../libsvn_fs/fs-loader.c:587
+#: ../libsvn_fs/fs-loader.c:585
#, c-format
msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')"
msgstr "Der Dateisystemtyp der Quelle für die Kopie im laufenden Betrieb (»%s«) stimmt nicht mit dem Dateisystemtyp des Ziels der Kopie im laufenden Betrieb (»%s«) überein"
-#: ../libsvn_fs/fs-loader.c:1395
+#: ../libsvn_fs/fs-loader.c:1393
#, c-format
msgid "Malformed UUID '%s'"
msgstr "Fehlerhafte UUID »%s«"
-#: ../libsvn_fs/fs-loader.c:1423
+#: ../libsvn_fs/fs-loader.c:1421
#, c-format
msgid "Lock token URI '%s' has bad scheme; expected '%s'"
msgstr "URI der Sperrmarke »%s« hat fehlerhaften Schema, erwartete »%s«"
-#: ../libsvn_fs/fs-loader.c:1430
+#: ../libsvn_fs/fs-loader.c:1428
#, c-format
msgid "Lock token '%s' is not ASCII at byte %u"
msgstr "Sperrmarke »%s« besteht nicht aus ASCII bei Byte %u"
-#: ../libsvn_fs/fs-loader.c:1437
+#: ../libsvn_fs/fs-loader.c:1435
#, c-format
msgid "Lock token URI '%s' is not XML-safe"
msgstr "URI der Sperrmarke »%s« ist nicht sicher für XML"
-#: ../libsvn_fs/fs-loader.c:1444
+#: ../libsvn_fs/fs-loader.c:1442
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negatives Ablaufdatum an svn_fs_lock übergeben"
@@ -2536,19 +2529,19 @@ msgstr "Erzeuge Änderungen"
msgid "deleting changes"
msgstr "Lösche Änderungen"
-#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5911
+#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5863
msgid "Missing required node revision ID"
msgstr "Für den Knoten fehlt eine erforderliche Revisions ID"
-#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5921
+#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5873
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ungültige Reihenfolge bei Änderung: Neue Knoten Revisions ID ohne Löschen"
-#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5932
+#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5884
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf gelöschtem Pfad"
-#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5941
+#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5893
msgid "Invalid change ordering: add change on preexisting path"
msgstr "Ungültige Reihenfolge bei Änderung: Hinzufügende Änderung auf schon vorhandenem Pfad"
@@ -3017,7 +3010,7 @@ msgstr "Ungültiger Wert (%%%s) für Kno
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "Beschädigte Dateisystemrevision %ld in Dateisystem »%s«"
-#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2268
+#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2267
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "Verweis auf einen nicht existierenden Knoten »%s« in Dateisystem »%s«"
@@ -3077,151 +3070,151 @@ msgstr "Kein Datensatz in der »node-ori
msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
msgstr "Kein Datensatz in der »checksum-reps«-Tabelle für Prüfsumme »%s« im Dateisystem »%s«"
-#: ../libsvn_fs_base/fs.c:89
+#: ../libsvn_fs_base/fs.c:87
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "Falsche Datenbankversion: %d.%d.%d, sollte mindestens %d.%d.%d sein"
-#: ../libsvn_fs_base/fs.c:100
+#: ../libsvn_fs_base/fs.c:98
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Falsche Datenbankversion: Übersetzt mit %d.%d.%d, läuft mit %d.%d.%d"
-#: ../libsvn_fs_base/fs.c:190
+#: ../libsvn_fs_base/fs.c:188
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Schließen der Umgebung:\n"
-#: ../libsvn_fs_base/fs.c:553
+#: ../libsvn_fs_base/fs.c:551
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Erzeugen der Umgebung:\n"
-#: ../libsvn_fs_base/fs.c:559
+#: ../libsvn_fs_base/fs.c:557
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Öffnen der Umgebung:\n"
-#: ../libsvn_fs_base/fs.c:574
+#: ../libsvn_fs_base/fs.c:572
msgid "creating 'nodes' table"
msgstr "Erzeuge Tabelle »nodes« "
-#: ../libsvn_fs_base/fs.c:575
+#: ../libsvn_fs_base/fs.c:573
msgid "opening 'nodes' table"
msgstr "Öffne Tabelle »nodes«"
-#: ../libsvn_fs_base/fs.c:580
+#: ../libsvn_fs_base/fs.c:578
msgid "creating 'revisions' table"
msgstr "Erzeuge Tabelle »revisions«"
-#: ../libsvn_fs_base/fs.c:581
+#: ../libsvn_fs_base/fs.c:579
msgid "opening 'revisions' table"
msgstr "Öffne Tabelle »revisions«"
-#: ../libsvn_fs_base/fs.c:586
+#: ../libsvn_fs_base/fs.c:584
msgid "creating 'transactions' table"
msgstr "Erzeuge Tabelle »transactions«"
-#: ../libsvn_fs_base/fs.c:587
+#: ../libsvn_fs_base/fs.c:585
msgid "opening 'transactions' table"
msgstr "Öffne Tabelle »transactions«"
-#: ../libsvn_fs_base/fs.c:592
+#: ../libsvn_fs_base/fs.c:590
msgid "creating 'copies' table"
msgstr "Erzeuge Tabelle »copies«"
-#: ../libsvn_fs_base/fs.c:593
+#: ../libsvn_fs_base/fs.c:591
msgid "opening 'copies' table"
msgstr "Öffne Tabelle »copies«"
-#: ../libsvn_fs_base/fs.c:598
+#: ../libsvn_fs_base/fs.c:596
msgid "creating 'changes' table"
msgstr "Erzeuge Tabelle »changes«"
-#: ../libsvn_fs_base/fs.c:599
+#: ../libsvn_fs_base/fs.c:597
msgid "opening 'changes' table"
msgstr "Öffne Tabelle »changes«"
-#: ../libsvn_fs_base/fs.c:604
+#: ../libsvn_fs_base/fs.c:602
msgid "creating 'representations' table"
msgstr "Erzeuge Tabelle »representations«"
-#: ../libsvn_fs_base/fs.c:605
+#: ../libsvn_fs_base/fs.c:603
msgid "opening 'representations' table"
msgstr "Öffne Tabelle »representations«"
-#: ../libsvn_fs_base/fs.c:610
+#: ../libsvn_fs_base/fs.c:608
msgid "creating 'strings' table"
msgstr "Erzeuge Tabelle »strings«"
-#: ../libsvn_fs_base/fs.c:611
+#: ../libsvn_fs_base/fs.c:609
msgid "opening 'strings' table"
msgstr "Öffne Tabelle »strings«"
-#: ../libsvn_fs_base/fs.c:616
+#: ../libsvn_fs_base/fs.c:614
msgid "creating 'uuids' table"
msgstr "Erzeuge Tabelle »uuids«"
-#: ../libsvn_fs_base/fs.c:617
+#: ../libsvn_fs_base/fs.c:615
msgid "opening 'uuids' table"
msgstr "Öffne Tabelle »uuids«"
-#: ../libsvn_fs_base/fs.c:622
+#: ../libsvn_fs_base/fs.c:620
msgid "creating 'locks' table"
msgstr "Erzeuge Tabelle »locks«"
-#: ../libsvn_fs_base/fs.c:623
+#: ../libsvn_fs_base/fs.c:621
msgid "opening 'locks' table"
msgstr "Öffne Tabelle »locks«"
-#: ../libsvn_fs_base/fs.c:628
+#: ../libsvn_fs_base/fs.c:626
msgid "creating 'lock-tokens' table"
msgstr "Erzeuge Tabelle »lock-tokens«"
-#: ../libsvn_fs_base/fs.c:629
+#: ../libsvn_fs_base/fs.c:627
msgid "opening 'lock-tokens' table"
msgstr "Öffne Tabelle »lock-tokens«"
-#: ../libsvn_fs_base/fs.c:637
+#: ../libsvn_fs_base/fs.c:635
msgid "creating 'node-origins' table"
msgstr "Erzeuge Tabelle »node-origins«"
-#: ../libsvn_fs_base/fs.c:638
+#: ../libsvn_fs_base/fs.c:636
msgid "opening 'node-origins' table"
msgstr "Öffne Tabelle »node-origin«"
-#: ../libsvn_fs_base/fs.c:647
+#: ../libsvn_fs_base/fs.c:645
msgid "creating 'miscellaneous' table"
msgstr "Erzeuge Tabelle »miscellaneous«"
-#: ../libsvn_fs_base/fs.c:648
+#: ../libsvn_fs_base/fs.c:646
msgid "opening 'miscellaneous' table"
msgstr "Öffne Tabelle »miscellaneous«"
-#: ../libsvn_fs_base/fs.c:657
+#: ../libsvn_fs_base/fs.c:655
msgid "creating 'checksum-reps' table"
msgstr "Erzeuge Tabelle »checksum-reps«"
-#: ../libsvn_fs_base/fs.c:658
+#: ../libsvn_fs_base/fs.c:656
msgid "opening 'checksum-reps' table"
msgstr "Öffne Tabelle »checksum-reps«"
-#: ../libsvn_fs_base/fs.c:730
+#: ../libsvn_fs_base/fs.c:728
#, c-format
msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d"
msgstr "Das Merkmal »%s« erfordert Version %d des Dateisystemschemas; Dateisystem »%s« verwendet nur Version %d"
-#: ../libsvn_fs_base/fs.c:749
+#: ../libsvn_fs_base/fs.c:747
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Erwartetes Dateisystemformat »%d«; gefunden »%d«"
-#: ../libsvn_fs_base/fs.c:1215
+#: ../libsvn_fs_base/fs.c:1213
#, c-format
msgid "BDB repositories do not support incremental hotcopy"
msgstr "BDB-Projektarchive unterstützen inkrementelle Kopien im laufenden Betrieb nicht"
-#: ../libsvn_fs_base/fs.c:1319
+#: ../libsvn_fs_base/fs.c:1317
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -3232,7 +3225,7 @@ msgstr ""
"könnte den Hotcopy-Algorithmus stören. Falls das Problem weiterhin\n"
"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten"
-#: ../libsvn_fs_base/fs.c:1338
+#: ../libsvn_fs_base/fs.c:1336
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -3244,11 +3237,11 @@ msgstr ""
"könnte den Hotcopy-Algorithmus stören. Wenn das Problem weiterhin\n"
"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten"
-#: ../libsvn_fs_base/fs.c:1383
+#: ../libsvn_fs_base/fs.c:1381
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul zum Zugriff auf ein Berkeley-DB-Projektarchiv."
-#: ../libsvn_fs_base/fs.c:1430
+#: ../libsvn_fs_base/fs.c:1428
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für bdb"
@@ -3358,7 +3351,7 @@ msgstr "Transaktion ist nicht tot: »%sÂ
msgid "Transaction is dead: '%s'"
msgstr "Transaktion ist tot: »%s«"
-#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9763
+#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9710
#, c-format
msgid "revprop '%s' has unexpected value in filesystem"
msgstr "Revisionseigenschaft »%s« hat einen unerwarteten Wert im Dateisystem"
@@ -3398,7 +3391,7 @@ msgid "Unexpected immutable node at '%s'
msgstr "Unerwarteter unveränderlicher Knoten bei »%s«"
#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1546
-#: ../libsvn_repos/commit.c:1255
+#: ../libsvn_repos/commit.c:1244
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt bei »%s«"
@@ -3456,7 +3449,7 @@ msgid "Node-revision '%s' claims to sit
msgstr "Knotenrevision »%s« behauptet, über einem Baum, der Zusammenführungsinformationen enthält, zu sitzen, ist aber kein Verzeichnis"
#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442
-#: ../libsvn_ra_serf/serf.c:1038 ../libsvn_ra_serf/serf.c:1101
+#: ../libsvn_ra_serf/serf.c:971 ../libsvn_ra_serf/serf.c:1034
msgid "Can't get entries of non-directory"
msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen"
@@ -3480,21 +3473,21 @@ msgstr "Leere Knotenrevision im Zwischen
msgid "Attempted to update ancestry of non-mutable node"
msgstr "Versuchte, die Herkunft eines unveränderlichen Knotens zu ändern"
-#: ../libsvn_fs_fs/fs.c:83
+#: ../libsvn_fs_fs/fs.c:82
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Kann gemeinsame FSFS-Daten nicht holen"
-#: ../libsvn_fs_fs/fs.c:110
+#: ../libsvn_fs_fs/fs.c:106
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Kann gemeinsame FSFS-Daten nicht speichern"
-#: ../libsvn_fs_fs/fs.c:404
+#: ../libsvn_fs_fs/fs.c:400
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Modul zum Zugriff auf ein dateibasiertes (FSFS) Projektarchiv."
-#: ../libsvn_fs_fs/fs.c:454
+#: ../libsvn_fs_fs/fs.c:450
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsfs"
@@ -3530,7 +3523,7 @@ msgstr "Kann nicht in die Prototyp-Revis
msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process"
msgstr "Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da eine frühere Darstellung zurzeit von einem anderen Prozess geschrieben wird"
-#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2014
+#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2007
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Kann keinen exklusiven Zugriff auf Datei »%s« erlangen"
@@ -3540,381 +3533,371 @@ msgstr "Kann keinen exklusiven Zugriff a
msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'"
msgstr "Die Datei %s (»%s«) enthält eine unerwartete Nicht-Ziffer »%c« innerhalb »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:995
-#, c-format
-msgid "Found format '%d', only created by unreleased dev builds; see http://subversion.apache.org/docs/release-notes/1.7#revprop-packing"
-msgstr "Format »%d« gefunden, das nur durch nicht veröffentlichte Entwicklungsversionen erstellt wurde; siehe http://subversion.apache.org/docs/release-notes/1.7#revprop-packing"
-
-#: ../libsvn_fs_fs/fs_fs.c:1006
-#, c-format
-msgid "Expected FS format between '1' and '%d'; found format '%d'"
-msgstr "Erwartete Dateisystemformat zwischen 1 und %d; fand %d"
-
-#: ../libsvn_fs_fs/fs_fs.c:1052
+#: ../libsvn_fs_fs/fs_fs.c:1027
#, c-format
msgid "Can't read first line of format file '%s'"
msgstr "Die erste Zeile der Formatdatei »%s« kann nicht gelesen werden"
-#: ../libsvn_fs_fs/fs_fs.c:1092
+#: ../libsvn_fs_fs/fs_fs.c:1064
#, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr "»%s« enthält eine ungültige Dateisystemformat-Option »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:1582
+#: ../libsvn_fs_fs/fs_fs.c:1130
+#, c-format
+msgid "Found format '%d', only created by unreleased dev builds; see http://subversion.apache.org/docs/release-notes/1.7#revprop-packing"
+msgstr "Format »%d« gefunden, das nur durch nicht veröffentlichte Entwicklungsversionen erstellt wurde; siehe http://subversion.apache.org/docs/release-notes/1.7#revprop-packing"
+
+#: ../libsvn_fs_fs/fs_fs.c:1141
+#, c-format
+msgid "Expected FS format between '1' and '%d'; found format '%d'"
+msgstr "Erwartete Dateisystemformat zwischen 1 und %d; fand %d"
+
+#: ../libsvn_fs_fs/fs_fs.c:1581
#, c-format
msgid "'%s' is not a regular file. Please move it out of the way and try again"
msgstr "»%s« ist keine reguläre Datei. Bitte aus dem Weg bewegen und noch einmal versuchen."
-#: ../libsvn_fs_fs/fs_fs.c:1753
+#: ../libsvn_fs_fs/fs_fs.c:1752
#, c-format
msgid "Can't read '%s'"
msgstr "Kann »%s« nicht lesen"
-#: ../libsvn_fs_fs/fs_fs.c:1816 ../libsvn_fs_fs/fs_fs.c:1835
+#: ../libsvn_fs_fs/fs_fs.c:1815 ../libsvn_fs_fs/fs_fs.c:1834
#, c-format
msgid "Found malformed header '%s' in revision file"
msgstr "Fehlerhafte Kopfdaten »%s« in Revisionsdatei gefunden"
-#: ../libsvn_fs_fs/fs_fs.c:1871
+#: ../libsvn_fs_fs/fs_fs.c:1870
#, c-format
msgid "Invalid revision number '%ld'"
msgstr "Ungültige Revisionsnummer »%ld«"
-#: ../libsvn_fs_fs/fs_fs.c:1886 ../libsvn_fs_fs/fs_fs.c:1941
-#: ../libsvn_fs_fs/fs_fs.c:1952 ../libsvn_repos/log.c:2268
+#: ../libsvn_fs_fs/fs_fs.c:1885 ../libsvn_fs_fs/fs_fs.c:1940
+#: ../libsvn_fs_fs/fs_fs.c:1951 ../libsvn_repos/log.c:2268
#: ../libsvn_repos/log.c:2272
#, c-format
msgid "No such revision %ld"
msgstr "Keine Revision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:1986
+#: ../libsvn_fs_fs/fs_fs.c:1985
msgid "Unexpected EOF"
msgstr "Unerwartetes Dateiende (EOF)"
-#: ../libsvn_fs_fs/fs_fs.c:1993
+#: ../libsvn_fs_fs/fs_fs.c:1992
#, c-format
msgid "Number '%s' invalid or too large"
msgstr "Zahl »%s« ist ungültig oder zu groß"
-#: ../libsvn_fs_fs/fs_fs.c:2160 ../libsvn_fs_fs/fs_fs.c:2174
-#: ../libsvn_fs_fs/fs_fs.c:2182 ../libsvn_fs_fs/fs_fs.c:2190
-#: ../libsvn_fs_fs/fs_fs.c:2199 ../libsvn_fs_fs/fs_fs.c:2212
-#: ../libsvn_fs_fs/fs_fs.c:2221
+#: ../libsvn_fs_fs/fs_fs.c:2159 ../libsvn_fs_fs/fs_fs.c:2173
+#: ../libsvn_fs_fs/fs_fs.c:2181 ../libsvn_fs_fs/fs_fs.c:2189
+#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211
+#: ../libsvn_fs_fs/fs_fs.c:2220
msgid "Malformed text representation offset line in node-rev"
msgstr "Fehlerhafte »text representation offset«-Zeile in Knotenrevision"
-#: ../libsvn_fs_fs/fs_fs.c:2252
+#: ../libsvn_fs_fs/fs_fs.c:2251
#, c-format
msgid "While reading representation offsets for node-revision '%s':"
msgstr "Beim Lesen der Darstellungsoffsets für Knotenrevision »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2407
+#: ../libsvn_fs_fs/fs_fs.c:2406
msgid "Missing id field in node-rev"
msgstr "Fehlendes ID-Feld in Knotenrevision"
-#: ../libsvn_fs_fs/fs_fs.c:2421
+#: ../libsvn_fs_fs/fs_fs.c:2420
#, c-format
msgid "Missing kind field in node-rev '%s'"
msgstr "Fehlendes Feld »kind« in Knotenrevision »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2456
+#: ../libsvn_fs_fs/fs_fs.c:2455
#, c-format
msgid "Missing cpath field in node-rev '%s'"
msgstr "Fehlendes Feld »cpath« in Knotenrevision »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2484 ../libsvn_fs_fs/fs_fs.c:2491
+#: ../libsvn_fs_fs/fs_fs.c:2483 ../libsvn_fs_fs/fs_fs.c:2490
#, c-format
msgid "Malformed copyroot line in node-rev '%s'"
msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2508 ../libsvn_fs_fs/fs_fs.c:2515
+#: ../libsvn_fs_fs/fs_fs.c:2507 ../libsvn_fs_fs/fs_fs.c:2514
#, c-format
msgid "Malformed copyfrom line in node-rev '%s'"
msgstr "Fehlerhafte »copyfrom«-Zeile in Knotenrevision »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:7632
+#: ../libsvn_fs_fs/fs_fs.c:2683 ../libsvn_fs_fs/fs_fs.c:7584
#, c-format
msgid "Attempted to write to non-transaction '%s'"
msgstr "Versuch, in eine Nicht-Transaktion zu schreiben »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2821
+#: ../libsvn_fs_fs/fs_fs.c:2820
#, c-format
msgid "Malformed representation header at %s"
msgstr "Fehlerhafter Darstellungskopf in »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:2853
+#: ../libsvn_fs_fs/fs_fs.c:2852
#, c-format
msgid "Missing node-id in node-rev at r%ld (offset %s)"
msgstr "Fehlende Knoten-ID in Knotenrevision bei r%ld (Offset »%s«)"
-#: ../libsvn_fs_fs/fs_fs.c:2862
+#: ../libsvn_fs_fs/fs_fs.c:2861
#, c-format
msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)"
msgstr "Beschädigte Knoten-ID »%s« in Knotenrevision bei r%ld (Offset »%s«)"
-#: ../libsvn_fs_fs/fs_fs.c:2953
+#: ../libsvn_fs_fs/fs_fs.c:2952
#, c-format
msgid "Revision file (r%ld) lacks trailing newline"
msgstr "Revisionsdatei (r%ld) hat keinen abschließenden Zeilenumbruch"
-#: ../libsvn_fs_fs/fs_fs.c:2967
+#: ../libsvn_fs_fs/fs_fs.c:2966
#, c-format
msgid "Final line in revision file (r%ld) longer than 64 characters"
msgstr "Letzte Zeile in der Revisionsdatei (r%ld) ist länger als 64 Zeichen"
-#: ../libsvn_fs_fs/fs_fs.c:2982
+#: ../libsvn_fs_fs/fs_fs.c:2981
#, c-format
msgid "Final line in revision file r%ld missing space"
msgstr "Letzte Zeile in der Revisionsdatei r%ld hat nicht genug Leerzeichen"
-#: ../libsvn_fs_fs/fs_fs.c:3686
-#, fuzzy, c-format
-msgid "Packed revprop manifest for r%ld too small"
-msgstr "Verzeichnis für gepackte Revisionseigenschaften für Revision %ld ist zu klein"
-
-#: ../libsvn_fs_fs/fs_fs.c:3743
-#, c-format
-msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld"
-msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld enthält Revisionseigenschaften für r%ld .. %ld"
-
-#: ../libsvn_fs_fs/fs_fs.c:3754
+#: ../libsvn_fs_fs/fs_fs.c:3676
#, c-format
-msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld"
-msgstr "Datei mit gepackten Revisionseigenschaften für Revision r%ld beginnt mit nicht gepackter Revision r%ld"
+msgid "Packed revprop manifest for rev %ld too small"
+msgstr "Verzeichnis für gepackte Revisionseigenschaften für Revision %ld ist zu klein"
-#: ../libsvn_fs_fs/fs_fs.c:3763
+#: ../libsvn_fs_fs/fs_fs.c:3722
msgid "Header end not found"
msgstr "Ende der Kopfdaten nicht gefunden"
-#: ../libsvn_fs_fs/fs_fs.c:3791
+#: ../libsvn_fs_fs/fs_fs.c:3750
msgid "Packed revprop size exceeds pack file size"
msgstr "Größe der gepackten Revisionseigenschaften überschreitet die größe der gepackten Datei"
-#: ../libsvn_fs_fs/fs_fs.c:3850
+#: ../libsvn_fs_fs/fs_fs.c:3809
#, c-format
msgid "No such packed revision %ld"
msgstr "Keine gepackte Revision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:3890
+#: ../libsvn_fs_fs/fs_fs.c:3849
#, c-format
-msgid "Failed to read revprop pack file for r%ld"
-msgstr "Konnte gepackte Revisionseigenschaften-Datei für r%ld nicht lesen"
+msgid "Failed to read revprop pack file for rev %ld"
+msgstr "Konnte gepackte Revisionseigenschaften-Datei für Revision %ld nicht lesen"
-#: ../libsvn_fs_fs/fs_fs.c:3897
+#: ../libsvn_fs_fs/fs_fs.c:3856
#, c-format
-msgid "Revprop pack file for r%ld is corrupt"
-msgstr "Daten mit gepackten Revisionseigenschaften für r%ld ist beschädigt"
+msgid "Revprop pack file for rev %ld is corrupt"
+msgstr "Daten mit gepackten Revisionseigenschaften für Revision %ld ist beschädigt"
-#: ../libsvn_fs_fs/fs_fs.c:3970
+#: ../libsvn_fs_fs/fs_fs.c:3929
#, c-format
msgid "Could not read revprops for revision %ld"
msgstr "Konnte Revisionseigenschaften für Revision %ld nicht lesen"
-#: ../libsvn_fs_fs/fs_fs.c:4199
+#: ../libsvn_fs_fs/fs_fs.c:4154
#, c-format
msgid "Packed file '%s' misses a tag"
msgstr "Der gepackten Datei »%s« fehlt ein Tag"
-#: ../libsvn_fs_fs/fs_fs.c:4537
+#: ../libsvn_fs_fs/fs_fs.c:4491
msgid "Malformed svndiff data in representation"
msgstr "Fehlerhafte svndiff-Daten in Darstellung"
-#: ../libsvn_fs_fs/fs_fs.c:4973 ../libsvn_fs_fs/fs_fs.c:4992
+#: ../libsvn_fs_fs/fs_fs.c:4927 ../libsvn_fs_fs/fs_fs.c:4946
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Lesen eines svndiff-Fensters las über Ende der Darstellung hinaus"
-#: ../libsvn_fs_fs/fs_fs.c:5080
+#: ../libsvn_fs_fs/fs_fs.c:5034
msgid "svndiff window length is corrupt"
msgstr "Svndiff Fensterlänge ist beschädigt"
-#: ../libsvn_fs_fs/fs_fs.c:5248
+#: ../libsvn_fs_fs/fs_fs.c:5202
msgid "Checksum mismatch while reading representation"
msgstr "Prüfsummenfehler beim Lesen der Darstellung"
-#: ../libsvn_fs_fs/fs_fs.c:5613 ../libsvn_fs_fs/fs_fs.c:5627
-#: ../libsvn_fs_fs/fs_fs.c:5634
+#: ../libsvn_fs_fs/fs_fs.c:5565 ../libsvn_fs_fs/fs_fs.c:5579
+#: ../libsvn_fs_fs/fs_fs.c:5586
#, c-format
msgid "Directory entry corrupt in '%s'"
msgstr "Verzeichniseintrag beschädigt in »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:6112 ../libsvn_fs_fs/fs_fs.c:6117
-#: ../libsvn_fs_fs/fs_fs.c:6123 ../libsvn_fs_fs/fs_fs.c:6140
-#: ../libsvn_fs_fs/fs_fs.c:6173 ../libsvn_fs_fs/fs_fs.c:6193
-#: ../libsvn_fs_fs/fs_fs.c:6228 ../libsvn_fs_fs/fs_fs.c:6233
+#: ../libsvn_fs_fs/fs_fs.c:6064 ../libsvn_fs_fs/fs_fs.c:6069
+#: ../libsvn_fs_fs/fs_fs.c:6075 ../libsvn_fs_fs/fs_fs.c:6092
+#: ../libsvn_fs_fs/fs_fs.c:6125 ../libsvn_fs_fs/fs_fs.c:6145
+#: ../libsvn_fs_fs/fs_fs.c:6180 ../libsvn_fs_fs/fs_fs.c:6185
msgid "Invalid changes line in rev-file"
msgstr "Ungültige »changes« Zeile in Rev Datei"
-#: ../libsvn_fs_fs/fs_fs.c:6166
+#: ../libsvn_fs_fs/fs_fs.c:6118
msgid "Invalid change kind in rev file"
msgstr "Ungültiger Änderungstyp in Rev Datei"
-#: ../libsvn_fs_fs/fs_fs.c:6186
+#: ../libsvn_fs_fs/fs_fs.c:6138
msgid "Invalid text-mod flag in rev-file"
msgstr "Ungültiges »text-mod« Flag in Rev Datei"
-#: ../libsvn_fs_fs/fs_fs.c:6206
+#: ../libsvn_fs_fs/fs_fs.c:6158
msgid "Invalid prop-mod flag in rev-file"
msgstr "Ungültiges »prop-mod« Flag in Rev Datei"
-#: ../libsvn_fs_fs/fs_fs.c:6464
+#: ../libsvn_fs_fs/fs_fs.c:6416
msgid "Copying from transactions not allowed"
msgstr "Kopieren aus Transaktionen ist nicht erlaubt."
-#: ../libsvn_fs_fs/fs_fs.c:6597
+#: ../libsvn_fs_fs/fs_fs.c:6549
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Kann Transaktionsverzeichnis in »%s« in Revision %ld nicht anlegen"
-#: ../libsvn_fs_fs/fs_fs.c:6662
+#: ../libsvn_fs_fs/fs_fs.c:6614
msgid "Internal error: a null transaction id was passed to get_txn_proplist()"
msgstr "Interner Fehler: eine Transaktionskennung von Null wurde übergeben um get_txn_proplist() zu erhalten"
-#: ../libsvn_fs_fs/fs_fs.c:6821 ../libsvn_fs_fs/fs_fs.c:6828
+#: ../libsvn_fs_fs/fs_fs.c:6773 ../libsvn_fs_fs/fs_fs.c:6780
msgid "next-id file corrupt"
msgstr "»next-id« Datei beschädigt"
-#: ../libsvn_fs_fs/fs_fs.c:6924
+#: ../libsvn_fs_fs/fs_fs.c:6876
#, c-format
msgid "Transaction '%s' cleanup failed"
msgstr "Aufräumen der Transaktion »%s« schlug fehl"
-#: ../libsvn_fs_fs/fs_fs.c:7064
+#: ../libsvn_fs_fs/fs_fs.c:7016
#, c-format
msgid "Invalid change type %d"
msgstr "Ungültiger Änderungstyp %d"
-#: ../libsvn_fs_fs/fs_fs.c:7652
+#: ../libsvn_fs_fs/fs_fs.c:7604
msgid "Can't set text contents of a directory"
msgstr "Kann Textinhalt im Verzeichnis nicht erzeugen"
-#: ../libsvn_fs_fs/fs_fs.c:7738 ../libsvn_fs_fs/fs_fs.c:7743
-#: ../libsvn_fs_fs/fs_fs.c:7750
+#: ../libsvn_fs_fs/fs_fs.c:7690 ../libsvn_fs_fs/fs_fs.c:7695
+#: ../libsvn_fs_fs/fs_fs.c:7702
msgid "Corrupt 'current' file"
msgstr "Beschädigte Datei »current«"
-#: ../libsvn_fs_fs/fs_fs.c:8010
+#: ../libsvn_fs_fs/fs_fs.c:7962
#, c-format
msgid "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), committing r%ld"
msgstr "Anzahl der Vorgänger für die Revision des Wurzelknotens ist falsch: Gefunden (%d+%ld != %d) bei Übertragung von r%ld"
-#: ../libsvn_fs_fs/fs_fs.c:8145
+#: ../libsvn_fs_fs/fs_fs.c:8097
msgid "Truncated protorev file detected"
msgstr "Abgeschnittene Datei »protorev« entdeckt"
-#: ../libsvn_fs_fs/fs_fs.c:8545
+#: ../libsvn_fs_fs/fs_fs.c:8497
msgid "Transaction out of date"
msgstr "Transaktion ist veraltet"
-#: ../libsvn_fs_fs/fs_fs.c:9044
+#: ../libsvn_fs_fs/fs_fs.c:8991
msgid "Recovery encountered a non-directory node"
msgstr "Wiederherstellung fand einen Nicht-Verzeichnisknoten"
-#: ../libsvn_fs_fs/fs_fs.c:9066
+#: ../libsvn_fs_fs/fs_fs.c:9013
msgid "Recovery encountered a deltified directory representation"
msgstr "Wiederherstellung fand eine deltifizierte Verzeichnisrepräsentation"
-#: ../libsvn_fs_fs/fs_fs.c:9102 ../libsvn_fs_fs/fs_fs.c:9111
-#: ../libsvn_fs_fs/fs_fs.c:9117
+#: ../libsvn_fs_fs/fs_fs.c:9049 ../libsvn_fs_fs/fs_fs.c:9058
+#: ../libsvn_fs_fs/fs_fs.c:9064
msgid "Directory entry corrupt"
msgstr "Verzeichniseintrag beschädigt"
# FIXME: rev ==> revision
-#: ../libsvn_fs_fs/fs_fs.c:9290
+#: ../libsvn_fs_fs/fs_fs.c:9237
#, c-format
msgid "Expected current rev to be <= %ld but found %ld"
msgstr "Erwartete, dass aktuelle Revision <= %ld gilt, fand aber %ld"
-#: ../libsvn_fs_fs/fs_fs.c:9347
+#: ../libsvn_fs_fs/fs_fs.c:9294
#, c-format
msgid "Revision %ld has a revs file but no revprops file"
msgstr "Revision %ld hat eine Revisions-Datei aber keine Revisionseigenschafts-Datei"
-#: ../libsvn_fs_fs/fs_fs.c:9354
+#: ../libsvn_fs_fs/fs_fs.c:9301
#, c-format
msgid "Revision %ld has a revs file but the revprops file is inaccessible"
msgstr "Revision %ld hat eine Revisions-Datei aber die Revisionseigenschafts-Datei ist nicht verfügbar"
-#: ../libsvn_fs_fs/fs_fs.c:9363
+#: ../libsvn_fs_fs/fs_fs.c:9310
#, c-format
msgid "Revision %ld has a non-file where its revprops file should be"
msgstr "Revision %ld hat eine Nicht-Datei, wo seine Revisionseigenschafts-Datei sein sollte"
-#: ../libsvn_fs_fs/fs_fs.c:9541
+#: ../libsvn_fs_fs/fs_fs.c:9488
#, c-format
msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)"
msgstr "Knotenursprung für »%s« existiert mit einem anderen Wert (%s) als der, der gespeichert werden soll (%s)"
-#: ../libsvn_fs_fs/fs_fs.c:9647
+#: ../libsvn_fs_fs/fs_fs.c:9594
#, c-format
msgid "No such transaction '%s'"
msgstr "Keine solche Transaktion »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:10364
+#: ../libsvn_fs_fs/fs_fs.c:10311
#, c-format
msgid "FSFS format (%d) too old to pack; please upgrade the filesystem."
msgstr "Das FSFS-Format (%d) ist zum Packen zu alt, bitte verwenden Sie ein neueres Format"
-#: ../libsvn_fs_fs/fs_fs.c:10643 ../libsvn_subr/io.c:248
+#: ../libsvn_fs_fs/fs_fs.c:10590 ../libsvn_subr/io.c:248
#, c-format
msgid "Error converting entry in directory '%s' to UTF-8"
msgstr "Fehler beim Konvertieren eines Eintrags im Verzeichnis »%s« nach UTF-8"
-#: ../libsvn_fs_fs/fs_fs.c:10680 ../libsvn_subr/io.c:1021
+#: ../libsvn_fs_fs/fs_fs.c:10627 ../libsvn_subr/io.c:1021
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Quelle »%s« ist kein Verzeichnis"
-#: ../libsvn_fs_fs/fs_fs.c:10686 ../libsvn_subr/io.c:1027
+#: ../libsvn_fs_fs/fs_fs.c:10633 ../libsvn_subr/io.c:1027
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Ziel »%s« ist kein Verzeichnis"
-#: ../libsvn_fs_fs/fs_fs.c:10758 ../libsvn_subr/io.c:1104
-#: ../libsvn_subr/io.c:2492
+#: ../libsvn_fs_fs/fs_fs.c:10705 ../libsvn_subr/io.c:1104
+#: ../libsvn_subr/io.c:2485
#, c-format
msgid "Can't read directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht lesen"
-#: ../libsvn_fs_fs/fs_fs.c:10763 ../libsvn_subr/io.c:1109
-#: ../libsvn_subr/io.c:2497 ../libsvn_subr/io.c:4002
+#: ../libsvn_fs_fs/fs_fs.c:10710 ../libsvn_subr/io.c:1109
+#: ../libsvn_subr/io.c:2490 ../libsvn_subr/io.c:3995
#, c-format
msgid "Error closing directory '%s'"
msgstr "Fehler beim Schließen des Verzeichnisses »%s«"
-#: ../libsvn_fs_fs/fs_fs.c:11046
+#: ../libsvn_fs_fs/fs_fs.c:10950
#, c-format
msgid "The FSFS format (%d) of the hotcopy source does not match the FSFS format (%d) of the hotcopy destination; please upgrade both repositories to the same format"
msgstr "Das FSFS-Format (%d) der Quelle für die Kopie im laufenden Betrieb entspricht nicht dem FSFS-Format (%d) des Ziels; Verwenden Sie auf beiden Seiten das gleiche Format"
-#: ../libsvn_fs_fs/fs_fs.c:11055
+#: ../libsvn_fs_fs/fs_fs.c:10959
msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination"
msgstr "Die UUID der Quelle für die Kopie im laufenden Betrieb entspricht nicht der UUID des Ziels"
-#: ../libsvn_fs_fs/fs_fs.c:11062
+#: ../libsvn_fs_fs/fs_fs.c:10966
msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination"
msgstr "Die Einstellungen zur Fragmentierung der Quelle der Kopie im laufenden Betrieb entspricht nicht den Einstellungen zur Fragmentierung des Ziels"
-#: ../libsvn_fs_fs/fs_fs.c:11188
+#: ../libsvn_fs_fs/fs_fs.c:11071
#, c-format
msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'"
msgstr "Erstellen der hotcopy auf »%s« fehlgeschlagen. Die Datei »%s« fehlt im Quellprojektarchiv. Bitte diese Datei erstellen, z.B. durch die Ausführung von »svnadmin upgrade %s«"
-#: ../libsvn_fs_fs/fs_fs.c:11214
+#: ../libsvn_fs_fs/fs_fs.c:11097
#, c-format
msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?"
msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr Revisionen (%lu) als die Quelle (%lu); Wurden Quelle und Ziel vertauscht?"
-#: ../libsvn_fs_fs/fs_fs.c:11250
+#: ../libsvn_fs_fs/fs_fs.c:11133
#, c-format
msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)"
msgstr "Das Ziel der Kopie im laufenden Betrieb enthält bereits mehr gepackte Revisionen (%lu) als die Quelle (%lu)"
-#: ../libsvn_fs_fs/fs_fs.c:11365
+#: ../libsvn_fs_fs/fs_fs.c:11246
#, c-format
msgid "The assumed HEAD revision (%lu) of the hotcopy source has been packed while the hotcopy was in progress; please restart the hotcopy operation"
msgstr "Die angenommene Revision »HEAD« (%lu) der Quelle der Kopie im laufenden Betrieb wurde während des Vorgangs gepackt; Bitte starten Sie den Vorgang erneut"
-#: ../libsvn_fs_fs/fs_fs.c:11380
+#: ../libsvn_fs_fs/fs_fs.c:11261
#, c-format
msgid "Revision %lu disappeared from the hotcopy source while hotcopy was in progress"
msgstr "Revision %lu aus der Quelle für Kopie im laufenden Betrieb während des Vorgangs verschwunden"
@@ -3939,16 +3922,16 @@ msgstr "Kann »lock/entries« Hashdatei
msgid "Lock failed: newer version of '%s' exists"
msgstr "Sperren schlug fehl: eine neuere Version von »%s« existiert"
-#: ../libsvn_fs_fs/rep-cache.c:138
+#: ../libsvn_fs_fs/rep-cache.c:113
msgid "Couldn't open rep-cache database"
msgstr "Konnte »rep-cache«-Datenbank des Projektarchivs nicht öffnen"
# TODO: Same strings can be shared with another table!
-#: ../libsvn_fs_fs/rep-cache.c:267 ../libsvn_fs_fs/rep-cache.c:312
+#: ../libsvn_fs_fs/rep-cache.c:242 ../libsvn_fs_fs/rep-cache.c:287
msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
msgstr "Nur SHA1-Prüfsummen können als Schlüssel in der Tabelle rep_cache verwendet werden.\n"
-#: ../libsvn_fs_fs/rep-cache.c:348
+#: ../libsvn_fs_fs/rep-cache.c:323
#, c-format
msgid "Representation key for checksum '%%s' exists in filesystem '%%s' with a different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,%%%s,%%%s,%%%s)"
msgstr "Repräsentationsschlüssel für Prüfsumme »%%s« existiert im Dateisystem »%%s« mit einem anderen Wert (%%ld,%%%s,%%%s,%%%s) als der, der gespeichert werden soll (%%ld,%%%s,%%%s,%%%s)"
@@ -4016,7 +3999,7 @@ msgstr "Fix-Revision muss vor der Endrev
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "Version des ZM »%s« stimmt nicht überein: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s"
-#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:594
+#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:527
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Illegale Projektarchiv-URL »%s«"
@@ -4046,7 +4029,7 @@ msgstr "»%s« ist nicht im selben Proje
msgid "'%s' isn't a child of session URL '%s'"
msgstr "»%s« ist kein Kind der Sitzungs-URL »%s«"
-#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2465
+#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2420
#, c-format
msgid "'%s' isn't a child of repository root URL '%s'"
msgstr "»%s« ist kein Kind der Projektarchivwurzel-URL »%s«"
@@ -4095,130 +4078,125 @@ msgstr "Kann den lokalen Hostnamen nicht
msgid "Couldn't get lock on destination repos after %d attempts"
msgstr "Konnte Sperre für Zielprojektarchiv nach %d Versuchen nicht erhalten"
-#: ../libsvn_ra_local/ra_plugin.c:162
+#: ../libsvn_ra_local/ra_plugin.c:161
msgid "memory-cache-size invalid"
msgstr "Ungültige »memory-cache-size«"
#. ----------------------------------------------------------------
#. ** The RA vtable routines **
-#: ../libsvn_ra_local/ra_plugin.c:503
+#: ../libsvn_ra_local/ra_plugin.c:502
msgid "Module for accessing a repository on local disk."
msgstr "Modul zum Zugriff auf ein Projektarchiv auf der lokalen Festplatte"
-#: ../libsvn_ra_local/ra_plugin.c:579
+#: ../libsvn_ra_local/ra_plugin.c:578
msgid "Unable to open an ra_local session to URL"
msgstr "Kann keine ra_local-Verbindung zu einer URL aufbauen"
-#: ../libsvn_ra_local/ra_plugin.c:612 ../libsvn_ra_serf/serf.c:586
+#: ../libsvn_ra_local/ra_plugin.c:611 ../libsvn_ra_serf/serf.c:519
#, c-format
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
msgstr "URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s« der Sitzung"
-#: ../libsvn_ra_local/ra_plugin.c:1140 ../libsvn_ra_local/ra_plugin.c:1597
-#: ../libsvn_ra_serf/util.c:2604
+#: ../libsvn_ra_local/ra_plugin.c:1139 ../libsvn_ra_local/ra_plugin.c:1596
+#: ../libsvn_ra_serf/util.c:2414
#, c-format
msgid "'%s' path not found"
msgstr "»%s« Pfad nicht gefunden"
-#: ../libsvn_ra_local/ra_plugin.c:1539 ../libsvn_ra_serf/options.c:675
-#: ../libsvn_ra_svn/client.c:2666
+#: ../libsvn_ra_local/ra_plugin.c:1538 ../libsvn_ra_serf/options.c:616
+#: ../libsvn_ra_svn/client.c:2621
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Es ist nichts über die Eigenschaft »%s« bekannt"
-#: ../libsvn_ra_local/ra_plugin.c:1745
+#: ../libsvn_ra_local/ra_plugin.c:1744
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_local"
-#: ../libsvn_ra_local/split_url.c:50 ../libsvn_ra_local/split_url.c:56
+#: ../libsvn_ra_local/split_url.c:49 ../libsvn_ra_local/split_url.c:55
#, c-format
msgid "Unable to open repository '%s'"
msgstr "Projektarchiv »%s« kann nicht geöffnet werden"
-#: ../libsvn_ra_serf/commit.c:215
+#: ../libsvn_ra_serf/commit.c:219
#, c-format
msgid "%s of '%s': %d %s"
msgstr "%s von »%s«: %d %s"
-#: ../libsvn_ra_serf/commit.c:315
+#: ../libsvn_ra_serf/commit.c:319
msgid "No Location header received"
msgstr "Kein »Location« Kopf empfangen"
-#: ../libsvn_ra_serf/commit.c:325
+#: ../libsvn_ra_serf/commit.c:329
msgid "Error parsing Location header value"
msgstr "Fehler beim Auslesen des Wertes aus dem »Location« Kopf"
-#: ../libsvn_ra_serf/commit.c:435
+#: ../libsvn_ra_serf/commit.c:431
#, c-format
msgid "Directory '%s' is out of date; try updating"
msgstr "Verzeichnis »%s« ist veraltet; versuchen Sie zu aktualisieren"
-#: ../libsvn_ra_serf/commit.c:523 ../libsvn_repos/commit.c:512
+#: ../libsvn_ra_serf/commit.c:519 ../libsvn_repos/commit.c:512
#, c-format
msgid "Path '%s' not present"
msgstr "Pfad »%s« existiert nicht"
-#: ../libsvn_ra_serf/commit.c:573
+#: ../libsvn_ra_serf/commit.c:569
#, c-format
msgid "File '%s' is out of date; try updating"
msgstr "Datei »%s« ist veraltet; versuchen Sie zu aktualisieren"
-#: ../libsvn_ra_serf/commit.c:975
+#: ../libsvn_ra_serf/commit.c:971
msgid "At least one property change failed; repository is unchanged"
msgstr "Mindestens eine Eigenschaftsänderung schlug fehl; Projektarchiv nicht geändert"
-#: ../libsvn_ra_serf/commit.c:1233
+#: ../libsvn_ra_serf/commit.c:1171
#, c-format
msgid "Failed writing updated file"
msgstr "Fehler beim Schreiben der aktualisierten Datei"
-#: ../libsvn_ra_serf/commit.c:1421 ../libsvn_ra_serf/commit.c:1511
+#: ../libsvn_ra_serf/commit.c:1359 ../libsvn_ra_serf/commit.c:1449
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s von »%s«: %d %s (%s://%s)"
-#: ../libsvn_ra_serf/commit.c:1431
+#: ../libsvn_ra_serf/commit.c:1369
#, c-format
msgid "POST request did not return transaction information"
msgstr "POST-Anfrage lieferte keine Transaktionsinformationen zurück"
-#: ../libsvn_ra_serf/commit.c:1475
+#: ../libsvn_ra_serf/commit.c:1413
msgid "The OPTIONS response did not include the requested activity-collection-set value"
msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »activity-collection-set«"
-#: ../libsvn_ra_serf/commit.c:1718 ../libsvn_ra_serf/commit.c:2127
-#: ../libsvn_ra_serf/update.c:2619
+#: ../libsvn_ra_serf/commit.c:1678 ../libsvn_ra_serf/commit.c:2076
+#: ../libsvn_ra_serf/update.c:2631
#, c-format
msgid "Unable to parse URL '%s'"
msgstr "Konnte die URL »%s« nicht zerlegen"
-#: ../libsvn_ra_serf/commit.c:1746 ../libsvn_ra_serf/util.c:2600
+#: ../libsvn_ra_serf/commit.c:1706 ../libsvn_ra_serf/util.c:2410
#, c-format
msgid "Access to '%s' forbidden"
msgstr "Zugriff auf »%s« verboten"
-#: ../libsvn_ra_serf/commit.c:1750
+#: ../libsvn_ra_serf/commit.c:1710
#, c-format
msgid "Adding directory failed: %s on %s (%d %s)"
msgstr "Hinzufügen eines Verzeichnisses schlug fehl: %s auf %s (%d %s)"
-#: ../libsvn_ra_serf/commit.c:1979
+#: ../libsvn_ra_serf/commit.c:1928
#, c-format
msgid "File '%s' already exists"
msgstr "Datei »%s« existiert bereits"
-#: ../libsvn_ra_serf/commit.c:2250
+#: ../libsvn_ra_serf/commit.c:2199
#, c-format
msgid "MERGE request failed: returned %d (during commit)"
msgstr "»MERGE«-Anfrage fehlgeschlagen; gab während der Übertragung %d zurück"
-#: ../libsvn_ra_serf/commit.c:2324
-#, fuzzy, c-format
-msgid "DELETE returned unexpected status: %d"
-msgstr "GET-Anfrage gab eine nicht erwartete Delta-Basis zurück: %s"
-
-#: ../libsvn_ra_serf/commit.c:2518
+#: ../libsvn_ra_serf/commit.c:2464
msgid "DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent"
msgstr "DAV-Anfrage schlug fehl; möglicherweise ist entweder die Aktion »pre-revprop-change« gescheitert oder sie fehlt"
@@ -4227,36 +4205,25 @@ msgstr "DAV-Anfrage schlug fehl; möglic
msgid "'%s' REPORT not implemented"
msgstr "»%s« REPORT nicht implementiert"
-#: ../libsvn_ra_serf/inherited_props.c:171 ../libsvn_ra_serf/property.c:279
-#: ../libsvn_ra_serf/update.c:2468
-#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "Unbekannte Codierung »%s«"
-
-#: ../libsvn_ra_serf/locks.c:171
-#, c-format
-msgid "Invalid LOCK timeout value '%s'"
-msgstr "Ungültiger Timeout-Wert für Sperre »%s«"
-
-#: ../libsvn_ra_serf/locks.c:243
+#: ../libsvn_ra_serf/locks.c:234
#, c-format
msgid "Lock request failed: %d %s"
msgstr "Sperranforderung gescheitert: %d %s"
-#: ../libsvn_ra_serf/locks.c:424
+#: ../libsvn_ra_serf/locks.c:414
msgid "Malformed URL for repository"
msgstr "Fehlerhafte URL für Projektarchiv"
-#: ../libsvn_ra_serf/locks.c:430
+#: ../libsvn_ra_serf/locks.c:420
msgid "Server does not support locking features"
msgstr "Server unterstützt keine Sperroperationen"
-#: ../libsvn_ra_serf/locks.c:596
+#: ../libsvn_ra_serf/locks.c:581
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "»%s« ist im Projektarchiv nicht gesperrt"
-#: ../libsvn_ra_serf/locks.c:647 ../libsvn_ra_serf/locks.c:653
+#: ../libsvn_ra_serf/locks.c:632 ../libsvn_ra_serf/locks.c:638
#, c-format
msgid "Unlock request failed: %d %s"
msgstr "Sperrfreigabe gescheitert: %d %s"
@@ -4266,7 +4233,7 @@ msgstr "Sperrfreigabe gescheitert: %d %s
msgid "Unsupported encoding '%s'"
msgstr "Nicht unterstützte Kodierung »%s«"
-#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1577
+#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1573
msgid "Server does not support custom revprops via log"
msgstr "Server unterstützt benutzerdefinierte Revisionseigenschaften mittels log nicht"
@@ -4275,16 +4242,21 @@ msgstr "Server unterstützt benutzerdefi
msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
msgstr "Eine MERGE-Antwort für »%s« ist kein Kind des Ziels (»%s«)"
-#: ../libsvn_ra_serf/options.c:658
+#: ../libsvn_ra_serf/options.c:599
#, c-format
msgid "Don't know how to handle '%s' for capability '%s'"
msgstr "Es ist unklar, wie mit »%s« für Eigenschaft »%s« verfahren werden soll"
-#: ../libsvn_ra_serf/options.c:682
+#: ../libsvn_ra_serf/options.c:623
#, c-format
msgid "Attempt to fetch capability '%s' resulted in '%s'"
msgstr "Der Versuch, die Eigenschaft »%s« abzufragen, führte zu »%s«"
+#: ../libsvn_ra_serf/property.c:279 ../libsvn_ra_serf/update.c:2473
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr "Unbekannte Codierung »%s«"
+
#: ../libsvn_ra_serf/property.c:700
msgid "The PROPFIND response did not include the requested properties"
msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Eigenschaften"
@@ -4313,54 +4285,54 @@ msgstr "Die PROPFIND-Antwort enthielt ni
msgid "The PROPFIND response did not include the requested 'DAV:' properties"
msgstr "Die PROPFIND-Antwort enthielt nicht die angeforderten »DAV:«-Eigenschaften"
-#: ../libsvn_ra_serf/replay.c:222 ../libsvn_ra_serf/update.c:1657
+#: ../libsvn_ra_serf/replay.c:223 ../libsvn_ra_serf/update.c:1660
msgid "Missing revision attr in target-revision element"
msgstr "Fehlendes Revisionsattribut in Element »target-revision«"
-#: ../libsvn_ra_serf/replay.c:240
+#: ../libsvn_ra_serf/replay.c:241
msgid "Missing revision attr in open-root element"
msgstr "Fehlendes Revisionsattribut in Element »open-root«"
-#: ../libsvn_ra_serf/replay.c:260 ../libsvn_ra_serf/update.c:1885
+#: ../libsvn_ra_serf/replay.c:261 ../libsvn_ra_serf/update.c:1888
msgid "Missing name attr in delete-entry element"
msgstr "Fehlendes Namensattribut in Element »delete-entry«"
-#: ../libsvn_ra_serf/replay.c:266
+#: ../libsvn_ra_serf/replay.c:267
msgid "Missing revision attr in delete-entry element"
msgstr "Fehlendes Revisionsattribut in Element »delete-entry«"
-#: ../libsvn_ra_serf/replay.c:286 ../libsvn_ra_serf/update.c:1724
+#: ../libsvn_ra_serf/replay.c:287 ../libsvn_ra_serf/update.c:1727
msgid "Missing name attr in open-directory element"
msgstr "Fehlendes Namensattribut in Element »open-directory«"
-#: ../libsvn_ra_serf/replay.c:292 ../libsvn_ra_serf/update.c:1675
-#: ../libsvn_ra_serf/update.c:1715
+#: ../libsvn_ra_serf/replay.c:293 ../libsvn_ra_serf/update.c:1678
+#: ../libsvn_ra_serf/update.c:1718
msgid "Missing revision attr in open-directory element"
msgstr "Fehlendes Revisionsattribut in Element »open-directory«"
-#: ../libsvn_ra_serf/replay.c:312 ../libsvn_ra_serf/update.c:1762
+#: ../libsvn_ra_serf/replay.c:313 ../libsvn_ra_serf/update.c:1765
msgid "Missing name attr in add-directory element"
msgstr "Fehlendes Namensattribut in Element »add-directory«"
-#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1806
+#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1809
msgid "Missing name attr in open-file element"
msgstr "Fehlendes Namensattribut in Element »open-file«"
-#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1815
+#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1818
msgid "Missing revision attr in open-file element"
msgstr "Fehlendes Revisionsattribut in Element »open-file«"
-#: ../libsvn_ra_serf/replay.c:375 ../libsvn_ra_serf/update.c:1840
+#: ../libsvn_ra_serf/replay.c:376 ../libsvn_ra_serf/update.c:1843
msgid "Missing name attr in add-file element"
msgstr "Fehlendes Namensattribut in Element »add-file«"
-#: ../libsvn_ra_serf/replay.c:443 ../libsvn_ra_serf/update.c:1981
-#: ../libsvn_ra_serf/update.c:2068
+#: ../libsvn_ra_serf/replay.c:442 ../libsvn_ra_serf/update.c:1984
+#: ../libsvn_ra_serf/update.c:2071
#, c-format
msgid "Missing name attr in %s element"
msgstr "Fehlendes Namensattribut in Element %s"
-#: ../libsvn_ra_serf/replay.c:578
+#: ../libsvn_ra_serf/replay.c:579
msgid "Error writing stream: unexpected EOF"
msgstr "Fehler beim Schreiben in Datenstrom: unerwartetes EOF"
@@ -4372,176 +4344,131 @@ msgstr "Konnte die Anfrage nicht lesen"
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr "Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf."
-#: ../libsvn_ra_serf/serf.c:65
-#, c-format
-msgid ""
-"Module for accessing a repository via WebDAV protocol using serf.\n"
-" - using serf %d.%d.%d"
-msgstr ""
-"Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels serf.\n"
-" - verwendet serf %d.%d.%d"
-
# password store: kwallet, ...
-#: ../libsvn_ra_serf/serf.c:129
+#: ../libsvn_ra_serf/serf.c:122
#, c-format
msgid "Invalid config: unknown %s '%s'"
msgstr "Ungültige Konfiguration: Unbekanntes %s »%s«"
-#: ../libsvn_ra_serf/serf.c:327
+#: ../libsvn_ra_serf/serf.c:303
msgid "Invalid config: illegal character in timeout value"
msgstr "Ungültige Konfiguration: Illegales Zeichen im Timeout-Wert"
-#: ../libsvn_ra_serf/serf.c:331
+#: ../libsvn_ra_serf/serf.c:307
msgid "Invalid config: negative timeout value"
msgstr "Ungültige Konfiguration: Negativer Timeout-Wert"
-#: ../libsvn_ra_serf/serf.c:344
+#: ../libsvn_ra_serf/serf.c:320
msgid "Invalid URL: illegal character in proxy port number"
msgstr "Ungültige URL: Illegales Zeichen in Proxy Portnummer"
-#: ../libsvn_ra_serf/serf.c:348
+#: ../libsvn_ra_serf/serf.c:324
msgid "Invalid URL: negative proxy port number"
msgstr "Ungültige URL: Negative Proxy Portnummer"
-#: ../libsvn_ra_serf/serf.c:351
+#: ../libsvn_ra_serf/serf.c:327
msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr "Ungültige URL: Proxy Portnummer ist größer als die maximale TCP Portnummer 65535"
-#: ../libsvn_ra_serf/serf.c:371
+#: ../libsvn_ra_serf/serf.c:347
#, c-format
msgid "Could not resolve proxy server '%s'"
msgstr "Konnte Proxy-Server »%s« nicht auflösen"
-#: ../libsvn_ra_serf/serf.c:474
+#: ../libsvn_ra_serf/serf.c:420
#, c-format
msgid "Illegal URL '%s'"
msgstr "Ungültige URL »%s«"
-#: ../libsvn_ra_serf/serf.c:546
+#: ../libsvn_ra_serf/serf.c:488
#, c-format
msgid "Connection to '%s' failed"
msgstr "Verbindung zu »%s« fehlgeschlagen"
-#: ../libsvn_ra_serf/serf.c:1216
+#: ../libsvn_ra_serf/serf.c:1149
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "Die UUID-Eigenschaft wurde weder auf der Ressource noch ihren Eltern gefunden."
-#: ../libsvn_ra_serf/serf.c:1290
+#: ../libsvn_ra_serf/serf.c:1223
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_serf"
-#: ../libsvn_ra_serf/serf.c:1304
+#: ../libsvn_ra_serf/serf.c:1237
#, c-format
msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library"
msgstr "ra_serv wurde für serf %d.%d.%d übersetzt, lud aber die nicht kompatible Version %d.%d.%d der Bibliothek"
-#: ../libsvn_ra_serf/update.c:1115
+#: ../libsvn_ra_serf/update.c:1118
#, c-format
msgid "GET request returned unexpected delta base: %s"
msgstr "GET-Anfrage gab eine nicht erwartete Delta-Basis zurück: %s"
-#: ../libsvn_ra_serf/update.c:1133
+#: ../libsvn_ra_serf/update.c:1136
#, c-format
msgid "GET request failed: %d %s"
msgstr "GET-Anfrage schlug fehl: %d %s"
-#: ../libsvn_ra_serf/update.c:1919
+#: ../libsvn_ra_serf/update.c:1922
msgid "Missing name attr in absent-directory element"
msgstr "Fehlendes Namensattribut in Element »absent-directory«"
-#: ../libsvn_ra_serf/update.c:1944
+#: ../libsvn_ra_serf/update.c:1947
msgid "Missing name attr in absent-file element"
msgstr "Fehlendes Namensattribut in Element »absent-file«"
-#: ../libsvn_ra_serf/update.c:2012 ../libsvn_ra_serf/update.c:2119
+#: ../libsvn_ra_serf/update.c:2015 ../libsvn_ra_serf/update.c:2122
#, c-format
msgid "Unknown tag '%s' while at state %d"
msgstr "Unbekanntes Tag »%s« im Zustand %d"
-#: ../libsvn_ra_serf/update.c:2187 ../libsvn_ra_serf/update.c:2309
-#: ../libsvn_ra_serf/update.c:2346
+#: ../libsvn_ra_serf/update.c:2190 ../libsvn_ra_serf/update.c:2314
+#: ../libsvn_ra_serf/update.c:2351
msgid "The REPORT or PROPFIND response did not include the requested checked-in value"
msgstr "Die Antwort auf REPORT oder PROPFIND enthielt nicht den angeforderten Wert »checked-in«"
-#: ../libsvn_ra_serf/update.c:2528
+#: ../libsvn_ra_serf/update.c:2533
#, c-format
msgid "Error writing to '%s': unexpected EOF"
msgstr "Fehler beim Schreiben nach »%s«: unerwartetes EOF"
-#: ../libsvn_ra_serf/update.c:2884
+#: ../libsvn_ra_serf/update.c:2902
msgid "Error retrieving REPORT"
msgstr "Fehler beim Holen von REPORT"
-#: ../libsvn_ra_serf/update.c:3093
+#: ../libsvn_ra_serf/update.c:3111
msgid "Missing update-report close tag"
msgstr "Abschließendes Tag »update-report« fehlt"
-#: ../libsvn_ra_serf/update.c:3562
+#: ../libsvn_ra_serf/update.c:3581
msgid "Can't get text contents of a directory"
msgstr "Kann Textinhalt eines Verzeichnisses nicht lesen"
-#: ../libsvn_ra_serf/util.c:249
-msgid ": "
-msgstr ": "
-
-#: ../libsvn_ra_serf/util.c:251
-msgid ", "
-msgstr ", "
-
-#: ../libsvn_ra_serf/util.c:462
-msgid "Server SSL certificate verification failed"
-msgstr "Überprüfung des Server-SSL-Zertifikats fehlgeschlagen"
-
-#: ../libsvn_ra_serf/util.c:467
-msgid "certificate is not yet valid"
-msgstr "Das Zertifikat ist noch nicht gültig"
-
-#: ../libsvn_ra_serf/util.c:470
-msgid "certificate has expired"
-msgstr "Das Zertifikat ist abgelaufen"
-
-#: ../libsvn_ra_serf/util.c:474
-msgid "certificate issued for a different hostname"
-msgstr "Zertifikat wurde für einen anderen Hostnamen ausgestellt"
-
-#: ../libsvn_ra_serf/util.c:478
-msgid "issuer is not trusted"
-msgstr "Herausgeber wird nicht vertraut"
-
-#: ../libsvn_ra_serf/util.c:481
-msgid "and other reason(s)"
-msgstr "und weitere Gründe"
-
-#: ../libsvn_ra_serf/util.c:528
+#: ../libsvn_ra_serf/util.c:347
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Ungültige Konfiguration: Zertifikatsdatei »%s« kann nicht geladen werden"
-#: ../libsvn_ra_serf/util.c:960 ../libsvn_ra_serf/util.c:963
+#: ../libsvn_ra_serf/util.c:783 ../libsvn_ra_serf/util.c:786
msgid "Error running context"
msgstr "Fehler beim Ausführen des Kontextes"
-#: ../libsvn_ra_serf/util.c:1297 ../libsvn_ra_serf/util.c:1302
+#: ../libsvn_ra_serf/util.c:1103 ../libsvn_ra_serf/util.c:1108
#, c-format
msgid "Malformed DAV:status CDATA '%s'"
msgstr "Fehlerhafte »CDATA« Daten für »DAV:status«: »%s«"
-#: ../libsvn_ra_serf/util.c:1599 ../libsvn_ra_serf/util.c:1702
+#: ../libsvn_ra_serf/util.c:1400
#, c-format
msgid "XML parsing failed"
msgstr "XML-Parser schlug fehl"
-#: ../libsvn_ra_serf/util.c:1602
+#: ../libsvn_ra_serf/util.c:1403
#, c-format
msgid "XML parsing failed: (%d %s)"
msgstr "XML-Parser schlug fehl: (%d %s)"
-#: ../libsvn_ra_serf/util.c:1889
-msgid "The XML response contains invalid XML"
-msgstr "Die XML-Antwort enthält ungültiges XML"
-
-#: ../libsvn_ra_serf/util.c:1954
+#: ../libsvn_ra_serf/util.c:1778
msgid ""
"No more credentials or we tried too many times.\n"
"Authentication failed"
@@ -4549,60 +4476,50 @@ msgstr ""
"Keine weiteren Zugangsdaten oder zu viele Versuche.\n"
"Anmeldung fehlgeschlagen"
-#: ../libsvn_ra_serf/util.c:1976
+#: ../libsvn_ra_serf/util.c:1800
msgid "Proxy authentication failed"
msgstr "Proxy-Anmeldung schlug fehl"
-#: ../libsvn_ra_serf/util.c:2029
-#, c-format
-msgid "%s request on '%s' failed"
-msgstr "%s-Anfrage auf »%s« schlug fehl"
-
-#: ../libsvn_ra_serf/util.c:2101
+#: ../libsvn_ra_serf/util.c:1911
#, c-format
msgid "Premature EOF seen from server (http status=%d)"
msgstr "Vorzeitiges EOF vom Server (http Status=%d)"
-#: ../libsvn_ra_serf/util.c:2170
+#: ../libsvn_ra_serf/util.c:1980
#, c-format
msgid "%s request on '%s' failed: %d %s"
msgstr "%s-Anfrage auf »%s« schlug fehl: %d %s"
-#: ../libsvn_ra_serf/util.c:2492
+#: ../libsvn_ra_serf/util.c:2302
msgid "The PROPFIND response did not include the requested version-controlled-configuration value"
msgstr "Die PROPFIND-Antwort enthielt nicht den angeforderten Wert »version-controlled-configuration«"
-#: ../libsvn_ra_serf/util.c:2594
+#: ../libsvn_ra_serf/util.c:2404
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr "Das Projektarchiv wurde permanent nach »%s« verschoben; bitte umplatzieren"
-#: ../libsvn_ra_serf/util.c:2596
+#: ../libsvn_ra_serf/util.c:2406
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr "Das Projektarchiv wurde zeitweilig nach »%s« verschoben; bitte umplatzieren"
-#: ../libsvn_ra_serf/util.c:2607
+#: ../libsvn_ra_serf/util.c:2417
#, c-format
msgid "'%s': no lock token available"
msgstr "»%s«: Keine Sperrmarke verfügbar"
-#: ../libsvn_ra_serf/util.c:2611
-#, c-format
-msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration."
-msgstr "DAV-Anfrage fehlgeschlagen: 411 Angabe zur Länge des Inhalts erforderlich. Der Server oder ein dazwischengeschalteter Proxy-Server akzeptiert Kodierung in Teilstücken nicht. Versuchen Sie »http-chunked-requests« auf »auto« oder »no« in der Konfiguration des Clients."
-
-#: ../libsvn_ra_serf/util.c:2617
+#: ../libsvn_ra_serf/util.c:2421
#, c-format
-msgid "The requested feature is not supported by '%s'"
-msgstr "Die angeforderte Funktion wird von »%s« nicht unterstützt"
+msgid "DAV request failed: Content length required"
+msgstr "DAV-Anfrage fehlgeschlagen: Angabe zur Länge des Inhalts erforderlich"
-#: ../libsvn_ra_serf/util.c:2623
+#: ../libsvn_ra_serf/util.c:2427
#, c-format
msgid "Unexpected HTTP status %d '%s' on '%s'\n"
msgstr "Unerwarteter HTTP-Status %d »%s« auf »%s«\n"
-#: ../libsvn_ra_serf/util.c:2767
+#: ../libsvn_ra_serf/util.c:2571
#, c-format
msgid "The %s response contains invalid XML (%d %s)"
msgstr "Die Antwort auf »%s« enthält ungültiges XML (%d %s)"
@@ -4621,68 +4538,68 @@ msgstr "Fehlendes XML-Attribut: »%s«"
msgid "The response contains invalid XML"
msgstr "Die Antwort enthält ungültiges XML"
-#: ../libsvn_ra_svn/client.c:142
+#: ../libsvn_ra_svn/client.c:141
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Unbekannter Hostname »%s«"
-#: ../libsvn_ra_svn/client.c:167
+#: ../libsvn_ra_svn/client.c:166
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Kann nicht mit Host »%s« verbinden"
-#: ../libsvn_ra_svn/client.c:205
+#: ../libsvn_ra_svn/client.c:204
msgid "Prop diffs element not a list"
msgstr "Eigenschafts-Diff Element ist keine Liste"
-#: ../libsvn_ra_svn/client.c:403
+#: ../libsvn_ra_svn/client.c:402
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Undefiniertes Tunnelschema »%s«"
-#: ../libsvn_ra_svn/client.c:420
+#: ../libsvn_ra_svn/client.c:419
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Für Tunnelschema %s muss die Umgebungsvariable %s definiert sein"
-#: ../libsvn_ra_svn/client.c:431
+#: ../libsvn_ra_svn/client.c:430
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kann Anweisung »%s« nicht zerlegen"
-#: ../libsvn_ra_svn/client.c:464
+#: ../libsvn_ra_svn/client.c:463
#, c-format
msgid "Error in child process: %s"
msgstr "Fehler in Kindprozess: %s"
-#: ../libsvn_ra_svn/client.c:539
+#: ../libsvn_ra_svn/client.c:538
msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file."
msgstr "Um Probleme mit der Konfiguration von SSH zu untersuchen, entfernen Sie die Option »-q« von »ssh« im Abschnitt »[tunnels]« Ihrer Konfigurationsdatei für Subversion."
-#: ../libsvn_ra_svn/client.c:557
+#: ../libsvn_ra_svn/client.c:556
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Illegale svn Projektarchiv URL »%s«"
-#: ../libsvn_ra_svn/client.c:637
+#: ../libsvn_ra_svn/client.c:636
#, c-format
msgid "Server requires minimum version %d"
msgstr "Server erfordert mindestens Version %d"
-#: ../libsvn_ra_svn/client.c:641
+#: ../libsvn_ra_svn/client.c:640
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Server unterstützt nur Versionen bis zu %d"
-#: ../libsvn_ra_svn/client.c:649
+#: ../libsvn_ra_svn/client.c:648
msgid "Server does not support edit pipelining"
msgstr "Server unterstützt »edit pipelining« nicht"
-#: ../libsvn_ra_svn/client.c:686
+#: ../libsvn_ra_svn/client.c:685
msgid "Impossibly long repository root from server"
msgstr "Unmöglich lange Projektarchivbasis vom Server"
-#: ../libsvn_ra_svn/client.c:698
+#: ../libsvn_ra_svn/client.c:697
msgid ""
"Module for accessing a repository using the svn network protocol.\n"
" - with Cyrus SASL authentication"
@@ -4690,149 +4607,149 @@ msgstr ""
"Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll.\n"
" - mit Cyrus-SASL-Authentifizierung"
-#: ../libsvn_ra_svn/client.c:702
+#: ../libsvn_ra_svn/client.c:701
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll"
-#: ../libsvn_ra_svn/client.c:912
+#: ../libsvn_ra_svn/client.c:911
msgid "Server did not send repository root"
msgstr "Server gab keine Projektarchivbasis zurück"
-#: ../libsvn_ra_svn/client.c:985
+#: ../libsvn_ra_svn/client.c:984
#, c-format
msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server"
msgstr "ra_svn unterstützt die Angabe einer Logmeldung mit Servern älter als 1.5 nicht; Versuchen Sie, eine leere Logmeldung zu übergeben oder verwenden Sie eine neuere Version auf dem Server"
-#: ../libsvn_ra_svn/client.c:1008
+#: ../libsvn_ra_svn/client.c:1007
msgid "Server doesn't support setting arbitrary revision properties during commit"
msgstr "Der Server unterstützt das Setzen beliebiger Revisionseigenschaften während eines Commits nicht"
-#: ../libsvn_ra_svn/client.c:1111
+#: ../libsvn_ra_svn/client.c:1110
msgid "Inherited proplist element not a list"
msgstr "Element für geerbte Eigenschaften ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1186
+#: ../libsvn_ra_svn/client.c:1185
msgid "Non-string as part of file contents"
msgstr "Ein Teil des Dateiinhaltes ist keine Zeichenkette"
-#: ../libsvn_ra_svn/client.c:1272
+#: ../libsvn_ra_svn/client.c:1271
msgid "Dirlist element not a list"
msgstr "Verzeichniseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1357
+#: ../libsvn_ra_svn/client.c:1356
msgid "Mergeinfo element is not a list"
msgstr "Zusammenführungsinfo-Element ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1565
+#: ../libsvn_ra_svn/client.c:1561
msgid "Log entry not a list"
msgstr "Logeintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1612
+#: ../libsvn_ra_svn/client.c:1608
msgid "Changed-path entry not a list"
msgstr "Eintrag für geänderte Pfade ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1778
+#: ../libsvn_ra_svn/client.c:1733
msgid "'stat' not implemented"
msgstr "»stat« nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1837
+#: ../libsvn_ra_svn/client.c:1792
msgid "'get-locations' not implemented"
msgstr "»get-locations« nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1852
+#: ../libsvn_ra_svn/client.c:1807
msgid "Location entry not a list"
msgstr "Ortseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1891
+#: ../libsvn_ra_svn/client.c:1846
msgid "'get-location-segments' not implemented"
msgstr "»get-location-segments« nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1908
+#: ../libsvn_ra_svn/client.c:1863
msgid "Location segment entry not a list"
msgstr "Ortssegmenteintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1918
+#: ../libsvn_ra_svn/client.c:1873
msgid "Expected valid revision range"
msgstr "Erwartete einen gültigen Revisionsbereich"
-#: ../libsvn_ra_svn/client.c:1959
+#: ../libsvn_ra_svn/client.c:1914
msgid "'get-file-revs' not implemented"
msgstr "»get-file-revs« nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1983
+#: ../libsvn_ra_svn/client.c:1938
msgid "Revision entry not a list"
msgstr "Revisionseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2000 ../libsvn_ra_svn/client.c:2030
+#: ../libsvn_ra_svn/client.c:1955 ../libsvn_ra_svn/client.c:1985
msgid "Text delta chunk not a string"
msgstr "Text-Deltastück ist kein String"
-#: ../libsvn_ra_svn/client.c:2042
+#: ../libsvn_ra_svn/client.c:1997
msgid "The get-file-revs command didn't return any revisions"
msgstr "Der »get-file-revs« Befehl gab keine Revisionen zurück"
-#: ../libsvn_ra_svn/client.c:2089
+#: ../libsvn_ra_svn/client.c:2044
msgid "Server doesn't support the lock command"
msgstr "Server unterstützt das Kommando »lock« nicht"
-#: ../libsvn_ra_svn/client.c:2153
+#: ../libsvn_ra_svn/client.c:2108
msgid "Server doesn't support the unlock command"
msgstr "Server unterstützt das Kommando »unlock« nicht"
-#: ../libsvn_ra_svn/client.c:2251
+#: ../libsvn_ra_svn/client.c:2206
msgid "Lock response not a list"
msgstr "Antwort beim Sperren ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2265
+#: ../libsvn_ra_svn/client.c:2220
msgid "Unknown status for lock command"
msgstr "Unbekannter Status für Sperrbefehl"
-#: ../libsvn_ra_svn/client.c:2289
+#: ../libsvn_ra_svn/client.c:2244
msgid "Didn't receive end marker for lock responses"
msgstr "Keine Endemarke für Sperrantworten erhalten"
-#: ../libsvn_ra_svn/client.c:2379
+#: ../libsvn_ra_svn/client.c:2334
msgid "Unlock response not a list"
msgstr "Antwort beim Entsperren ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2393
+#: ../libsvn_ra_svn/client.c:2348
msgid "Unknown status for unlock command"
msgstr "Unbekannter Status für Entsperrbefehl"
-#: ../libsvn_ra_svn/client.c:2416
+#: ../libsvn_ra_svn/client.c:2371
msgid "Didn't receive end marker for unlock responses"
msgstr "Keine Endemarke für Entsperrantworten erhalten"
-#: ../libsvn_ra_svn/client.c:2440 ../libsvn_ra_svn/client.c:2492
+#: ../libsvn_ra_svn/client.c:2395 ../libsvn_ra_svn/client.c:2447
msgid "Server doesn't support the get-lock command"
msgstr "Server unterstützt das Kommando »get-lock« nicht"
-#: ../libsvn_ra_svn/client.c:2506
+#: ../libsvn_ra_svn/client.c:2461
msgid "Lock element not a list"
msgstr "Sperrelement ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2549
+#: ../libsvn_ra_svn/client.c:2504
msgid "Server doesn't support the replay command"
msgstr "Server unterstützt das Kommando »replay« nicht"
-#: ../libsvn_ra_svn/client.c:2580
+#: ../libsvn_ra_svn/client.c:2535
msgid "Server doesn't support the replay-range command"
msgstr "Server unterstützt das Kommando »replay-range« nicht"
-#: ../libsvn_ra_svn/client.c:2598
+#: ../libsvn_ra_svn/client.c:2553
#, c-format
msgid "Expected 'revprops', found '%s'"
msgstr "Erwartete »revprops«, fand »%s«"
-#: ../libsvn_ra_svn/client.c:2615
+#: ../libsvn_ra_svn/client.c:2570
msgid "Error while replaying commit"
msgstr "Fehler beim Wiederholen der Übertragung"
-#: ../libsvn_ra_svn/client.c:2688
+#: ../libsvn_ra_svn/client.c:2643
msgid "'get-deleted-rev' not implemented"
msgstr "»get-deleted-rev« nicht implementiert"
-#: ../libsvn_ra_svn/client.c:2787
+#: ../libsvn_ra_svn/client.c:2742
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_svn"
@@ -5006,8 +4923,8 @@ msgstr ""
"Aktion »post-commit« meldete einen Fehler:\n"
"%s"
-#: ../libsvn_repos/commit.c:1266 ../libsvn_repos/fs-wrap.c:98
-#: ../libsvn_repos/load-fs-vtable.c:1008
+#: ../libsvn_repos/commit.c:1255 ../libsvn_repos/fs-wrap.c:98
+#: ../libsvn_repos/load-fs-vtable.c:978
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Übertragen erfolgreich, aber die »post-commit«-Aktion schlug fehl"
@@ -5027,17 +4944,17 @@ msgstr "Delta-Tiefe »exclude« wird nic
msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
msgstr "Ungültiger Editoranker; zumindest einer der Eingabepfade ist kein Verzeichnis und es gab keinen Quelleintrag"
-#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:780
+#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:812
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* Revision %ld ausgegeben.\n"
-#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:786
+#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:818
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* Revision %ld verifiziert.\n"
-#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:834
+#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:866
#, c-format
msgid ""
"\n"
@@ -5048,7 +4965,7 @@ msgstr ""
"------- Übertrage Revision %ld >>>\n"
"\n"
-#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:840
+#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:872
#, c-format
msgid ""
"\n"
@@ -5059,114 +4976,114 @@ msgstr ""
"------- Neue Revision %ld übertragen (geladen aus Original %ld) >>>\n"
"\n"
-#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:853
+#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:885
#, c-format
msgid " * editing path : %s ..."
msgstr " * Bearbeite Pfad: %s ..."
-#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:859
+#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:891
#, c-format
msgid " * deleting path : %s ..."
msgstr " * Lösche Pfad: %s ..."
-#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:865
+#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:897
#, c-format
msgid " * adding path : %s ..."
msgstr " * Füge Pfad hinzu: %s ..."
-#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:871
+#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:903
#, c-format
msgid " * replacing path : %s ..."
msgstr " * Ersetze Pfad: %s ..."
-#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:881
+#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:912
msgid " done.\n"
msgstr " erledigt.\n"
-#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:891
+#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:921
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< Neue Transaktion basierend auf Originalrevision %ld gestartet\n"
-#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:904
+#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:934
#, c-format
msgid " removing '\\r' from %s ..."
msgstr " Entferne »\\r« aus %s ..."
-#: ../libsvn_repos/dump.c:248
-#, c-format
-msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo."
-msgstr "Zusammenführungsinformationen verweisen auf Revision(en) vor der ältesten ausgegebene Revision (r%ld). Das Laden dieser Datei kann ungültige Zusammenführungsinformationen zur Folge haben."
-
-#: ../libsvn_repos/dump.c:310
+#: ../libsvn_repos/dump.c:267
#, c-format
msgid "E%06d: While validating fspath '%s': %s"
msgstr "E%06d: Fehler bei Überprüfung von »fspath« »%s«: %s"
-#: ../libsvn_repos/dump.c:432
+#: ../libsvn_repos/dump.c:389
#, c-format
msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail."
msgstr "Verweis auf Daten in Revision %ld, welche älter als die älteste ausgegebene Revision (r%ld) ist. Das Laden dieser Datei in ein leeres Projektarchiv wird fehlschlagen."
-#: ../libsvn_repos/dump.c:1148 ../libsvn_repos/dump.c:1440
+#: ../libsvn_repos/dump.c:494
+#, c-format
+msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo."
+msgstr "Zusammenführungsinformationen verweisen auf Revision(en) vor der ältesten ausgegebene Revision (r%ld). Das Laden dieser Datei kann ungültige Zusammenführungsinformationen zur Folge haben."
+
+#: ../libsvn_repos/dump.c:1124 ../libsvn_repos/dump.c:1416
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
msgstr "Startrevision %ld ist größer als Endrevision %ld"
-#: ../libsvn_repos/dump.c:1153 ../libsvn_repos/dump.c:1445
+#: ../libsvn_repos/dump.c:1129 ../libsvn_repos/dump.c:1421
#, c-format
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "Endrevision %ld ist ungültig (neueste Revision ist %ld)"
-#: ../libsvn_repos/dump.c:1291
+#: ../libsvn_repos/dump.c:1267
msgid "The range of revisions dumped contained references to copy sources outside that range."
msgstr "Der ausgegebene Revisionsbereich enthält Verweise für Kopien auf Quellpfade außerhalb dieses Bereichs."
-#: ../libsvn_repos/dump.c:1305
+#: ../libsvn_repos/dump.c:1281
msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range."
msgstr "Der ausgegebene Revisionsbereich enthielt Zusammenführungsinformationen die auf Revisionen außerhalb dieses Bereichs verweisen."
-#: ../libsvn_repos/dump.c:1364
+#: ../libsvn_repos/dump.c:1340
#, c-format
msgid "Unexpected node kind %d for '%s'"
msgstr "Unerwartete Knotenart %d für »%s«"
-#: ../libsvn_repos/fs-wrap.c:194
+#: ../libsvn_repos/fs-wrap.c:183
#, c-format
msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
msgstr "Das Speichern der speziellen Eigenschaft »%s« wird vom Projektarchiv verhindert und könnte auf einen Bug in Ihrem Client hindeuten"
-#: ../libsvn_repos/fs-wrap.c:209
+#: ../libsvn_repos/fs-wrap.c:198
#, c-format
msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
msgstr "Kann Eigenschaft »%s« nicht akzeptieren, da sie nicht in UTF-8 kodiert ist"
-#: ../libsvn_repos/fs-wrap.c:219
+#: ../libsvn_repos/fs-wrap.c:208
#, c-format
msgid "Cannot accept non-LF line endings in '%s' property"
msgstr "Kann nicht-»LF« (LF = Unix-artige) Zeilenumbrüche in Eigenschaft »%s« nicht akzeptieren"
-#: ../libsvn_repos/fs-wrap.c:260
+#: ../libsvn_repos/fs-wrap.c:249
#, c-format
msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator"
msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht erwartete Zeichenkettenendmarken enthalten"
-#: ../libsvn_repos/fs-wrap.c:267
+#: ../libsvn_repos/fs-wrap.c:256
#, c-format
msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid"
msgstr "Übertragung abgewiesen, da die Zusammenführungsinformationen von »%s« nicht syntaktisch korrekt sind"
-#: ../libsvn_repos/fs-wrap.c:397
+#: ../libsvn_repos/fs-wrap.c:386
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Schreiben abgelehnt: Keine Berechtigung, alles von Revision %ld einzulesen."
-#: ../libsvn_repos/fs-wrap.c:581
+#: ../libsvn_repos/fs-wrap.c:570
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "Kann Pfad »%s« nicht freigeben, kein angemeldeter Benutzername verfügbar"
-#: ../libsvn_repos/fs-wrap.c:597
+#: ../libsvn_repos/fs-wrap.c:586
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Entsperren erfolgreich, aber die Aktion »post-unlock« schlug fehl"
@@ -5252,13 +5169,13 @@ msgstr ""
"Bitten Sie den Administrator darum, eine Aktion »pre-revprop-change«\n"
"einzurichten."
-#: ../libsvn_repos/load-fs-vtable.c:575 ../svnrdump/load_editor.c:766
+#: ../libsvn_repos/load-fs-vtable.c:565 ../svnrdump/load_editor.c:766
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr "Relative Quellrevision %ld ist im aktuellen Projektarchiv nicht verfügbar."
# CHECKME: Check quotes, s/rev/revision/
-#: ../libsvn_repos/load-fs-vtable.c:589
+#: ../libsvn_repos/load-fs-vtable.c:579
#, c-format
msgid ""
"Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -5267,11 +5184,11 @@ msgstr ""
"Prüfsummenfehler beim Kopieren von »%s«@%ld\n"
"nach »%s« in der auf r%ld basierten Revision"
-#: ../libsvn_repos/load-fs-vtable.c:653
+#: ../libsvn_repos/load-fs-vtable.c:638
msgid "Malformed dumpstream: Revision 0 must not contain node records"
msgstr "Fehlerhafter Dateiabzug: Revision 0 darf keine Knoteneinträge enthalten"
-#: ../libsvn_repos/load-fs-vtable.c:669
+#: ../libsvn_repos/load-fs-vtable.c:654
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "Unerkannte Knotenaktion auf Knoten »%s«"
@@ -5345,37 +5262,37 @@ msgstr "Ungültige Tiefe (%c) für Pfad
msgid "Working copy path '%s' does not exist in repository"
msgstr "Arbeitskopiepfad »%s« existiert nicht im Projektarchiv"
-#: ../libsvn_repos/reporter.c:1355
+#: ../libsvn_repos/reporter.c:1348
msgid "Not authorized to open root of edit operation"
msgstr "Keine Berechtigung die Basis der Änderung zu öffnen"
-#: ../libsvn_repos/reporter.c:1372
+#: ../libsvn_repos/reporter.c:1365
#, c-format
msgid "Target path '%s' does not exist"
msgstr "Zielpfad »%s« existiert nicht"
-#: ../libsvn_repos/reporter.c:1380
+#: ../libsvn_repos/reporter.c:1373
msgid "Cannot replace a directory from within"
msgstr "Kann ein Verzeichnis nicht innerhalb sich selbst ersetzen"
-#: ../libsvn_repos/reporter.c:1420
+#: ../libsvn_repos/reporter.c:1413
msgid "Invalid report for top level of working copy"
msgstr "Ungültiger Report für oberste Ebene der Arbeitskopie"
-#: ../libsvn_repos/reporter.c:1435
+#: ../libsvn_repos/reporter.c:1428
msgid "Two top-level reports with no target"
msgstr "Zwei oberste Reports ohne Zielangabe"
-#: ../libsvn_repos/reporter.c:1497
+#: ../libsvn_repos/reporter.c:1490
#, c-format
msgid "Unsupported report depth '%s'"
msgstr "Nicht unterstützte Reporttiefe »%s«"
-#: ../libsvn_repos/reporter.c:1527
+#: ../libsvn_repos/reporter.c:1520
msgid "Depth 'exclude' not supported for link"
msgstr "Tiefe »exclude« wird für Links nicht unterstützt"
-#: ../libsvn_repos/reporter.c:1584
+#: ../libsvn_repos/reporter.c:1577
msgid "Request depth 'exclude' not supported"
msgstr "Angefragte Tiefe »exclude« wird nicht unterstützt"
@@ -5495,7 +5412,7 @@ msgstr "Nichtlesbarer Pfad angetroffen;
msgid "'%s' is not a file in revision %ld"
msgstr "»%s« ist in Revision %ld keine Datei"
-#: ../libsvn_subr/auth.c:223
+#: ../libsvn_subr/auth.c:221
#, c-format
msgid "No provider registered for '%s' credentials"
msgstr "Kein Anbieter für Zugangsdaten vom Typ »%s« registriert"
@@ -5520,7 +5437,7 @@ msgstr "Kann Zwischenspeicher-Mutex nich
msgid "Can't create cache mutex"
msgstr "Kann Zwischenspeicher-Mutex nicht anlegen"
-#: ../libsvn_subr/cache-membuffer.c:2034
+#: ../libsvn_subr/cache-membuffer.c:2030
msgid "Can't iterate a membuffer-based cache"
msgstr "Kann einen »memcached«-Zwischenspeicher nicht durchlaufen"
@@ -5530,41 +5447,41 @@ msgstr "Kann einen »memcached«-Zwische
msgid "Unknown memcached error while reading"
msgstr "Unbekannter »memcached«-Fehler beim Lesen"
-#: ../libsvn_subr/cache-memcache.c:238
+#: ../libsvn_subr/cache-memcache.c:237
#, c-format
msgid "Unknown memcached error while writing"
msgstr "Unbekannter »memcached«-Fehler beim Schreiben"
-#: ../libsvn_subr/cache-memcache.c:344
+#: ../libsvn_subr/cache-memcache.c:343
msgid "Can't iterate a memcached cache"
msgstr "Kann keinen »memcached«-Zwischenspeicher durchlaufen"
-#: ../libsvn_subr/cache-memcache.c:444
+#: ../libsvn_subr/cache-memcache.c:443
#, c-format
msgid "Error parsing memcache server '%s'"
msgstr "Fehler beim Abfragen des »memcache«-Servers »%s«"
-#: ../libsvn_subr/cache-memcache.c:452
+#: ../libsvn_subr/cache-memcache.c:451
#, c-format
msgid "Scope not allowed in memcache server '%s'"
msgstr "Bereich ist im »memcache«-Server »%s« nicht erlaubt"
-#: ../libsvn_subr/cache-memcache.c:460
+#: ../libsvn_subr/cache-memcache.c:459
#, c-format
msgid "Must specify host and port for memcache server '%s'"
msgstr "Der Rechner und Port muss für den »memcache«-Server »%s« festgelegt werden"
-#: ../libsvn_subr/cache-memcache.c:480
+#: ../libsvn_subr/cache-memcache.c:479
#, c-format
msgid "Unknown error creating memcache server"
msgstr "Unbekannter Fehler beim Erzeugen eines »memcache«-Servers"
-#: ../libsvn_subr/cache-memcache.c:488
+#: ../libsvn_subr/cache-memcache.c:487
#, c-format
msgid "Unknown error adding server to memcache"
msgstr "Unbekannter Fehler beim Hinzufügen des Servers zu »memcache«"
-#: ../libsvn_subr/cache-memcache.c:561
+#: ../libsvn_subr/cache-memcache.c:560
#, c-format
msgid "Unknown error creating apr_memcache_t"
msgstr "Unbekannter Fehler beim Anlegen von apr_memcache_t"
@@ -5580,62 +5497,62 @@ msgstr ""
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: ../libsvn_subr/cmdline.c:655
+#: ../libsvn_subr/cmdline.c:646
#, c-format
msgid "Error initializing command line arguments"
msgstr "Fehler beim Initialisieren der Kommandozeilenparameter"
-#: ../libsvn_subr/cmdline.c:744
+#: ../libsvn_subr/cmdline.c:735
msgid "Invalid syntax of argument of --config-option"
msgstr "Ungültige Syntax im Argument von --config-option"
-#: ../libsvn_subr/cmdline.c:771
+#: ../libsvn_subr/cmdline.c:762
#, c-format
msgid "Unrecognized file in argument of %s"
msgstr "Unbekannte Datei im Parameter von %s"
# FIXME: s/whitespace/whitespaceS/?
-#: ../libsvn_subr/cmdline.c:1017
+#: ../libsvn_subr/cmdline.c:1008
msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command."
msgstr "Die Umgebungsvariable EDITOR, SVN_EDITOR oder VISUAL oder die Laufzeitkonfigurationsoption »editor-cmd« ist leer oder besteht nur aus Leerzeichen. Erwartete ein Shell-Kommando."
-#: ../libsvn_subr/cmdline.c:1024
+#: ../libsvn_subr/cmdline.c:1015
msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found"
msgstr "Keine der Umgebungsvariablen SVN_EDITOR, VISUAL oder EDITOR ist gesetzt und keine Laufzeitkonfigurationsoption »editor-cmd« wurde gefunden"
-#: ../libsvn_subr/cmdline.c:1049 ../libsvn_subr/cmdline.c:1133
+#: ../libsvn_subr/cmdline.c:1040 ../libsvn_subr/cmdline.c:1124
#, c-format
msgid "Can't get working directory"
msgstr "Kann Arbeitsverzeichnis nicht ermitteln"
-#: ../libsvn_subr/cmdline.c:1060 ../libsvn_subr/cmdline.c:1144
-#: ../libsvn_subr/cmdline.c:1169
+#: ../libsvn_subr/cmdline.c:1051 ../libsvn_subr/cmdline.c:1135
+#: ../libsvn_subr/cmdline.c:1160
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Kann Arbeitsverzeichnis nicht nach »%s« wechseln"
-#: ../libsvn_subr/cmdline.c:1068 ../libsvn_subr/cmdline.c:1316
+#: ../libsvn_subr/cmdline.c:1059 ../libsvn_subr/cmdline.c:1307
#, c-format
msgid "Can't restore working directory"
msgstr "Kann nicht in das Arbeitsverzeichnis zurückwechseln"
-#: ../libsvn_subr/cmdline.c:1075 ../libsvn_subr/cmdline.c:1251
+#: ../libsvn_subr/cmdline.c:1066 ../libsvn_subr/cmdline.c:1242
#, c-format
msgid "system('%s') returned %d"
msgstr "Aufruf des Editors »%s« gab Fehler %d zurück"
-#: ../libsvn_subr/cmdline.c:1196
+#: ../libsvn_subr/cmdline.c:1187
#, c-format
msgid "Can't write to '%s'"
msgstr "Kann nicht nach »%s« schreiben"
-#: ../libsvn_subr/cmdline.c:1211 ../libsvn_subr/cmdline.c:1226
-#: ../libsvn_subr/cmdline.c:1260 ../libsvn_subr/io.c:3616
+#: ../libsvn_subr/cmdline.c:1202 ../libsvn_subr/cmdline.c:1217
+#: ../libsvn_subr/cmdline.c:1251 ../libsvn_subr/io.c:3609
#, c-format
msgid "Can't stat '%s'"
msgstr "Kann Status von »%s« nicht ermitteln"
-#: ../libsvn_subr/cmdline.c:1285
+#: ../libsvn_subr/cmdline.c:1276
msgid "Error normalizing edited contents to internal format"
msgstr "Fehler beim Normalisieren des bearbeiteten Inhalts ins interne Format"
@@ -5654,25 +5571,25 @@ msgstr "Konfigurationsfehler: Ungültige
msgid "Config error: invalid integer value '%s'"
msgstr "Konfigurationsfehler: Ungültige Ganzzahl »%s«"
-#: ../libsvn_subr/config_auth.c:100
+#: ../libsvn_subr/config_auth.c:99
msgid "Unable to open auth file for reading"
msgstr "Kann »Auth« Datei nicht zum Lesen öffnen"
-#: ../libsvn_subr/config_auth.c:105
+#: ../libsvn_subr/config_auth.c:104
#, c-format
msgid "Error parsing '%s'"
msgstr "Fehler beim Zerlegen von »%s«"
# Ist hier jetzt 'Authentifizierung' = Anmeldung oder 'Autorisierung' = Berechtigung gemeint?
-#: ../libsvn_subr/config_auth.c:135
+#: ../libsvn_subr/config_auth.c:129
msgid "Unable to locate auth file"
msgstr "Kann »Auth« Datei nicht finden"
-#: ../libsvn_subr/config_auth.c:146
+#: ../libsvn_subr/config_auth.c:140
msgid "Unable to open auth file for writing"
msgstr "Kann »Auth« Datei nicht zum Schreiben öffnen"
-#: ../libsvn_subr/config_auth.c:150
+#: ../libsvn_subr/config_auth.c:144
#, c-format
msgid "Error writing hash to '%s'"
msgstr "Fehler beim Schreiben des Hashwerts nach »%s«"
@@ -5769,7 +5686,7 @@ msgstr "Kann die das angeforderte Datum
msgid "Can't expand time"
msgstr "Kann Zeitangabe nicht expandieren"
-#: ../libsvn_subr/deprecated.c:361 ../libsvn_subr/opt.c:302
+#: ../libsvn_subr/deprecated.c:360 ../libsvn_subr/opt.c:302
msgid ""
"\n"
"Valid options:\n"
@@ -5777,7 +5694,7 @@ msgstr ""
"\n"
"Gültige Optionen:\n"
-#: ../libsvn_subr/deprecated.c:437 ../libsvn_subr/opt.c:417
+#: ../libsvn_subr/deprecated.c:436 ../libsvn_subr/opt.c:417
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -5786,33 +5703,33 @@ msgstr ""
"»%s«: unbekannter Befehl.\n"
"\n"
-#: ../libsvn_subr/deprecated.c:615 ../libsvn_subr/opt.c:1239
+#: ../libsvn_subr/deprecated.c:614 ../libsvn_subr/opt.c:1237
#: ../svnrdump/svnrdump.c:646
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Geben Sie »%s help« für weitere Hilfe ein.\n"
-#: ../libsvn_subr/deprecated.c:1023
+#: ../libsvn_subr/deprecated.c:1022
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "»%s« ist weder ein Datei- noch ein Verzeichnisname"
-#: ../libsvn_subr/dirent_uri.c:1605
+#: ../libsvn_subr/dirent_uri.c:1604
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Konnte den absoluten Pfad von »%s« nicht ermitteln"
-#: ../libsvn_subr/dirent_uri.c:2314
+#: ../libsvn_subr/dirent_uri.c:2311
#, c-format
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "Lokale URL »%s« enthält keinen »file://« Präfix"
-#: ../libsvn_subr/dirent_uri.c:2393
+#: ../libsvn_subr/dirent_uri.c:2390
#, c-format
msgid "Local URL '%s' contains only a hostname, no path"
msgstr "Lokale URL »%s« enthält nur einen Rechnernamen aber keinen Pfad"
-#: ../libsvn_subr/dirent_uri.c:2407
+#: ../libsvn_subr/dirent_uri.c:2404
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "Lokale URL »%s« enthält einen nicht unterstützten Rechnernamen"
@@ -5895,7 +5812,7 @@ msgstr "Kann negative Länge nicht seria
msgid "Can't check path '%s'"
msgstr "Kann Pfad »%s« nicht prüfen"
-#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4558
+#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4551
#, c-format
msgid "Can't open '%s'"
msgstr "Kann »%s« nicht öffnen"
@@ -5930,13 +5847,12 @@ msgid "Can't copy '%s' to '%s'"
msgstr "Kann »%s« nicht nach »%s« kopieren"
#: ../libsvn_subr/io.c:895 ../libsvn_subr/io.c:917 ../libsvn_subr/io.c:963
-#: ../libsvn_subr/io.c:4691
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Kann Berechtigungen auf »%s« nicht setzen"
-#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1984 ../libsvn_subr/io.c:2043
-#: ../libsvn_subr/io.c:4596
+#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1977 ../libsvn_subr/io.c:2036
+#: ../libsvn_subr/io.c:4589
#, c-format
msgid "Can't get file name"
msgstr "Kann keinen Dateinamen holen"
@@ -5961,102 +5877,102 @@ msgstr "Kann Verzeichnis »%s« nicht an
msgid "Can't set access time of '%s'"
msgstr "Kann Zugriffszeit von »%s« nicht setzen"
-#: ../libsvn_subr/io.c:1535 ../libsvn_subr/io.c:1637
+#: ../libsvn_subr/io.c:1523 ../libsvn_subr/io.c:1630
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Kann die Zugriffsrechte der Datei »%s« nicht ändern"
-#: ../libsvn_subr/io.c:1803
+#: ../libsvn_subr/io.c:1796
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Kann den Schreibschutz der Datei »%s« nicht setzen"
-#: ../libsvn_subr/io.c:1835
+#: ../libsvn_subr/io.c:1828
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Kann den Schreibschutz der Datei »%s« nicht aufheben"
-#: ../libsvn_subr/io.c:1874 ../libsvn_subr/io.c:1908
+#: ../libsvn_subr/io.c:1867 ../libsvn_subr/io.c:1901
#, c-format
msgid "Error getting UID of process"
msgstr "Fehler beim Ermitteln der Prozess-UID"
-#: ../libsvn_subr/io.c:2010
+#: ../libsvn_subr/io.c:2003
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Kann keine gemeinsame Sperre für Datei »%s« erhalten"
-#: ../libsvn_subr/io.c:2048
+#: ../libsvn_subr/io.c:2041
#, c-format
msgid "Can't unlock file '%s'"
msgstr "Kann Datei »%s« nicht entsprerren"
-#: ../libsvn_subr/io.c:2103 ../libsvn_subr/io.c:3511
+#: ../libsvn_subr/io.c:2096 ../libsvn_subr/io.c:3504
#, c-format
msgid "Can't flush file '%s'"
msgstr "Kann Datei »%s« nicht leeren"
-#: ../libsvn_subr/io.c:2104 ../libsvn_subr/io.c:3512
+#: ../libsvn_subr/io.c:2097 ../libsvn_subr/io.c:3505
#, c-format
msgid "Can't flush stream"
msgstr "Kann Datenstrom nicht leeren"
-#: ../libsvn_subr/io.c:2116 ../libsvn_subr/io.c:2133
+#: ../libsvn_subr/io.c:2109 ../libsvn_subr/io.c:2126
#, c-format
msgid "Can't flush file to disk"
msgstr "Kann Datei nicht auf Festplatte leeren"
-#: ../libsvn_subr/io.c:2225 ../libsvn_subr/prompt.c:197
+#: ../libsvn_subr/io.c:2218 ../libsvn_subr/prompt.c:197
#: ../svnserve/svnserve.c:822
#, c-format
msgid "Can't open stdin"
msgstr "Kann Standardeingabe nicht öffnen"
-#: ../libsvn_subr/io.c:2245
+#: ../libsvn_subr/io.c:2238
msgid "Reading from stdin is disallowed"
msgstr "Lesen von der Standardeingabe ist nicht erlaubt"
-#: ../libsvn_subr/io.c:2312
+#: ../libsvn_subr/io.c:2305
#, c-format
msgid "Can't remove file '%s'"
msgstr "Kann Datei »%s« nicht löschen"
-#: ../libsvn_subr/io.c:2399
+#: ../libsvn_subr/io.c:2392
#, c-format
msgid "Can't remove '%s'"
msgstr "Kann »%s« nicht löschen"
-#: ../libsvn_subr/io.c:2562
+#: ../libsvn_subr/io.c:2555
#, c-format
msgid "Path '%s' not found, case obstructed by '%s'"
msgstr "Pfad »%s« nicht gefunden, Groß- und Kleinschreibung durch »%s« blockiert"
-#: ../libsvn_subr/io.c:2601
+#: ../libsvn_subr/io.c:2594
#, c-format
msgid "Path '%s' not found"
msgstr "Pfad »%s« nicht gefunden"
-#: ../libsvn_subr/io.c:2675
+#: ../libsvn_subr/io.c:2668
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Kann Attribute von Prozess »%s« nicht erzeugen"
-#: ../libsvn_subr/io.c:2682
+#: ../libsvn_subr/io.c:2675
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Kann Kommandotyp von Prozess »%s« nicht setzen "
-#: ../libsvn_subr/io.c:2694
+#: ../libsvn_subr/io.c:2687
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Kann Verzeichnis von Prozess »%s« nicht setzen"
-#: ../libsvn_subr/io.c:2708
+#: ../libsvn_subr/io.c:2701
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Kann Eingabe des Kindprozesses »%s« nicht setzen"
-#: ../libsvn_subr/io.c:2716
+#: ../libsvn_subr/io.c:2709
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Kann Ausgabe des Kindprozesses »%s« nicht setzen"
@@ -6064,65 +5980,65 @@ msgstr "Kann Ausgabe des Kindprozesses Â
# FIXME: Laut Code ist %s der Kindprozess. Müsste es dann nicht
# "Can't set child process '%s' errfile" (oder ganz ohne child) heißen?
# (Es gibt kein child von %s)
-#: ../libsvn_subr/io.c:2724
+#: ../libsvn_subr/io.c:2717
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Kann Fehlerausgabe des Kindprozesses »%s« nicht setzen"
-#: ../libsvn_subr/io.c:2738
+#: ../libsvn_subr/io.c:2731
#, c-format
msgid "Can't set process '%s' stdio pipes"
msgstr "Kann Standard-IO-Datenströme des Prozesses »%s« nicht setzen "
-#: ../libsvn_subr/io.c:2746
+#: ../libsvn_subr/io.c:2739
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Kann Datei für die Fehlerbehandlung des Kindprozesses »%s« nicht setzen"
-#: ../libsvn_subr/io.c:2753
+#: ../libsvn_subr/io.c:2746
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Kann die Fehlerbehandlung des Prozesses »%s« nicht setzen"
-#: ../libsvn_subr/io.c:2776
+#: ../libsvn_subr/io.c:2769
#, c-format
msgid "Can't start process '%s'"
msgstr "Kann Prozess »%s« nicht starten"
-#: ../libsvn_subr/io.c:2800
+#: ../libsvn_subr/io.c:2793
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Fehler beim Warten auf Prozess »%s«"
# CHECKME: Isn't "exitwhy" an internal detail?
-#: ../libsvn_subr/io.c:2809
+#: ../libsvn_subr/io.c:2802
#, c-format
msgid "Process '%s' failed (signal %d, core dumped)"
msgstr "Prozess »%s« schlug fehl (Signal %d, Core-Dump)"
# CHECKME: Isn't "exitwhy" an internal detail?
-#: ../libsvn_subr/io.c:2814
+#: ../libsvn_subr/io.c:2807
#, c-format
msgid "Process '%s' failed (signal %d)"
msgstr "Prozess »%s« schlug fehl (Signal %d)"
# CHECKME: Isn't "exitwhy" an internal detail?
-#: ../libsvn_subr/io.c:2820
+#: ../libsvn_subr/io.c:2813
#, c-format
msgid "Process '%s' failed (exitwhy %d, exitcode %d)"
msgstr "Prozess »%s« schlug fehl (Exit-Grund %d, Exit-Code %d)"
-#: ../libsvn_subr/io.c:2828
+#: ../libsvn_subr/io.c:2821
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Prozess »%s« hat Fehlerwert %d zurückgegeben"
-#: ../libsvn_subr/io.c:2935
+#: ../libsvn_subr/io.c:2928
#, c-format
msgid "'%s' returned %d"
msgstr "»%s« hat %d zurückgegeben"
-#: ../libsvn_subr/io.c:3055
+#: ../libsvn_subr/io.c:3048
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -6137,161 +6053,161 @@ msgstr ""
"%s\n"
"%s"
-#: ../libsvn_subr/io.c:3196
+#: ../libsvn_subr/io.c:3189
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Kann MIME Typ der nicht-Datei »%s« nicht ermitteln"
-#: ../libsvn_subr/io.c:3291
+#: ../libsvn_subr/io.c:3284
#, c-format
msgid "Can't open file '%s'"
msgstr "Kann Datei »%s« nicht öffnen"
-#: ../libsvn_subr/io.c:3331
+#: ../libsvn_subr/io.c:3324
#, c-format
msgid "Can't close file '%s'"
msgstr "Kann Datei »%s« nicht schließen"
-#: ../libsvn_subr/io.c:3332
+#: ../libsvn_subr/io.c:3325
#, c-format
msgid "Can't close stream"
msgstr "Kann Datenstrom nicht schließen"
-#: ../libsvn_subr/io.c:3341 ../libsvn_subr/io.c:3377 ../libsvn_subr/io.c:3402
+#: ../libsvn_subr/io.c:3334 ../libsvn_subr/io.c:3370 ../libsvn_subr/io.c:3395
#, c-format
msgid "Can't read file '%s'"
msgstr "Kann Datei »%s« nicht lesen"
-#: ../libsvn_subr/io.c:3342 ../libsvn_subr/io.c:3378 ../libsvn_subr/io.c:3403
+#: ../libsvn_subr/io.c:3335 ../libsvn_subr/io.c:3371 ../libsvn_subr/io.c:3396
#, c-format
msgid "Can't read stream"
msgstr "Kann nicht aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:3351
+#: ../libsvn_subr/io.c:3344
#, c-format
msgid "Can't write file '%s'"
msgstr "Kann Datei »%s« nicht schreiben"
-#: ../libsvn_subr/io.c:3352
+#: ../libsvn_subr/io.c:3345
#, c-format
msgid "Can't write stream"
msgstr "Kann nicht in Datenstrom schreiben"
-#: ../libsvn_subr/io.c:3366
+#: ../libsvn_subr/io.c:3359
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Kann keine Attributinformationen aus Datei »%s« lesen"
-#: ../libsvn_subr/io.c:3367
+#: ../libsvn_subr/io.c:3360
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Kann keine Attributinformationen aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:3414
+#: ../libsvn_subr/io.c:3407
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Kann Positionszeiger in Datei »%s« nicht setzen"
-#: ../libsvn_subr/io.c:3415
+#: ../libsvn_subr/io.c:3408
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Kann Positionszeiger in Datenstrom nicht setzen"
-#: ../libsvn_subr/io.c:3426 ../libsvn_subr/io.c:3473
+#: ../libsvn_subr/io.c:3419 ../libsvn_subr/io.c:3466
#, c-format
msgid "Can't write to file '%s'"
msgstr "Kann nicht in Datei »%s« schreiben"
-#: ../libsvn_subr/io.c:3427 ../libsvn_subr/io.c:3474
+#: ../libsvn_subr/io.c:3420 ../libsvn_subr/io.c:3467
#, c-format
msgid "Can't write to stream"
msgstr "Kann nicht in Datenstrom schreiben"
-#: ../libsvn_subr/io.c:3516
+#: ../libsvn_subr/io.c:3509
#, c-format
msgid "Can't truncate file '%s'"
msgstr "Kann Datei »%s« nicht abschneiden"
-#: ../libsvn_subr/io.c:3517
+#: ../libsvn_subr/io.c:3510
#, c-format
msgid "Can't truncate stream"
msgstr "Kann Datenstrom nicht abschneiden"
-#: ../libsvn_subr/io.c:3590
+#: ../libsvn_subr/io.c:3583
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Kann Längenzeile nicht aus Datei »%s« lesen"
-#: ../libsvn_subr/io.c:3594
+#: ../libsvn_subr/io.c:3587
msgid "Can't read length line in stream"
msgstr "Kann Längenzeile nicht aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:3651
+#: ../libsvn_subr/io.c:3644
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Kann »%s« nicht nach »%s« verschieben"
-#: ../libsvn_subr/io.c:3732
+#: ../libsvn_subr/io.c:3725
#, c-format
msgid "Can't create directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht anlegen"
-#: ../libsvn_subr/io.c:3755
+#: ../libsvn_subr/io.c:3748
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht verstecken"
-#: ../libsvn_subr/io.c:3815 ../libsvn_subr/io.c:3938
+#: ../libsvn_subr/io.c:3808 ../libsvn_subr/io.c:3931
#, c-format
msgid "Can't open directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht öffnen"
-#: ../libsvn_subr/io.c:3850
+#: ../libsvn_subr/io.c:3843
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht entfernen"
-#: ../libsvn_subr/io.c:3868
+#: ../libsvn_subr/io.c:3861
#, c-format
msgid "Can't read directory"
msgstr "Kann Verzeichnis nicht lesen"
-#: ../libsvn_subr/io.c:3888
+#: ../libsvn_subr/io.c:3881
#, c-format
msgid "Error closing directory"
msgstr "Fehler beim Schließen eines Verzeichnisses"
-#: ../libsvn_subr/io.c:3957
+#: ../libsvn_subr/io.c:3950
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Kann Verzeichniseintrag in »%s« nicht lesen"
-#: ../libsvn_subr/io.c:4083
+#: ../libsvn_subr/io.c:4076
#, c-format
msgid "Can't check directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht prüfen"
-#: ../libsvn_subr/io.c:4145
+#: ../libsvn_subr/io.c:4138
#, c-format
msgid "Reading '%s'"
msgstr "Lese »%s«"
-#: ../libsvn_subr/io.c:4164
+#: ../libsvn_subr/io.c:4157
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Die erste Zeile von »%s« enthält eine Nicht-Ziffer"
-#: ../libsvn_subr/io.c:4479
+#: ../libsvn_subr/io.c:4472
#, c-format
msgid "Can't create temporary file from template '%s'"
msgstr "Kann temporäre Datei von Vorlage »%s« nicht anlegen"
-#: ../libsvn_subr/io.c:4568
+#: ../libsvn_subr/io.c:4561
#, c-format
msgid "Can't set aside '%s'"
msgstr "Kann »%s« nicht beiseitelegen"
-#: ../libsvn_subr/io.c:4580
+#: ../libsvn_subr/io.c:4573
#, c-format
msgid "Unable to make name in '%s'"
msgstr "Kann Namen in »%s« nicht erstellen"
@@ -6427,42 +6343,42 @@ msgstr ""
"\n"
"Globale Optionen:\n"
-#: ../libsvn_subr/opt.c:818
+#: ../libsvn_subr/opt.c:816
#, c-format
msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«; Meinten Sie '%s@'?"
-#: ../libsvn_subr/opt.c:824
+#: ../libsvn_subr/opt.c:822
#, c-format
msgid "Syntax error parsing peg revision '%s'"
msgstr "Syntaxfehler bei der Analyse der Fix-Revision »%s«"
-#: ../libsvn_subr/opt.c:961
+#: ../libsvn_subr/opt.c:959
msgid "Revision property pair is empty"
msgstr "Revisionseigenschaftspaar ist leer"
-#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336
+#: ../libsvn_subr/opt.c:979 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336
#: ../svn/propset-cmd.c:68
#, c-format
msgid "'%s' is not a valid Subversion property name"
msgstr "»%s« ist kein gültiger Subversion-Eigenschaftsname"
-#: ../libsvn_subr/opt.c:1018
+#: ../libsvn_subr/opt.c:1016
#, c-format
msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
msgstr "»%s« ist nur eine Fix-Revision. Meinten Sie stattdessen »%s@«?"
-#: ../libsvn_subr/opt.c:1064
+#: ../libsvn_subr/opt.c:1062
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL »%s« enthält ein »..« Element"
-#: ../libsvn_subr/opt.c:1097
+#: ../libsvn_subr/opt.c:1095
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Fehler beim Ermitteln der Groß-/Kleinschreibung von »%s«"
-#: ../libsvn_subr/opt.c:1119
+#: ../libsvn_subr/opt.c:1117
#, c-format
msgid ""
"%s, version %s\n"
@@ -6473,7 +6389,7 @@ msgstr ""
" übersetzt am %s, um %s auf %s\n"
"\n"
-#: ../libsvn_subr/opt.c:1136
+#: ../libsvn_subr/opt.c:1134
msgid ""
"System information:\n"
"\n"
@@ -6481,21 +6397,21 @@ msgstr ""
"Systeminformationen:\n"
"\n"
-#: ../libsvn_subr/opt.c:1137
+#: ../libsvn_subr/opt.c:1135
#, c-format
msgid "* running on %s\n"
msgstr "* ausgeführt auf %s\n"
-#: ../libsvn_subr/opt.c:1141
+#: ../libsvn_subr/opt.c:1139
#, c-format
msgid " - %s\n"
msgstr " - %s\n"
-#: ../libsvn_subr/opt.c:1151
+#: ../libsvn_subr/opt.c:1149
msgid "* linked dependencies:\n"
msgstr "* eingebundene Abhändigleiten:\n"
-#: ../libsvn_subr/opt.c:1176
+#: ../libsvn_subr/opt.c:1174
msgid "* loaded shared libraries:\n"
msgstr "* geladene dynamische Bibliotheken:\n"
@@ -6742,7 +6658,7 @@ msgstr "Konnte SQLite nicht konfiguriere
msgid "Could not initialize SQLite"
msgstr "Konnte SQLite nicht initialisieren"
-#: ../libsvn_subr/sqlite.c:1219
+#: ../libsvn_subr/sqlite.c:1178
#, c-format
msgid "SQLite hotcopy failed for %s"
msgstr "SQLite-Hotcopy fehlgeschlagen für »%s«"
@@ -6752,24 +6668,24 @@ msgstr "SQLite-Hotcopy fehlgeschlagen fÃ
msgid "Could not convert '%s' into a number"
msgstr "Konnte »%s« nicht in Zahl umwandeln"
-#: ../libsvn_subr/subst.c:1803 ../libsvn_wc/props.c:1660
+#: ../libsvn_subr/subst.c:1793 ../libsvn_wc/props.c:1660
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Datei »%s« hat inkonsistente Zeilenenden"
-#: ../libsvn_subr/sysinfo.c:1106
+#: ../libsvn_subr/sysinfo.c:1075
msgid "Intel"
msgstr "Intel"
-#: ../libsvn_subr/sysinfo.c:1107
+#: ../libsvn_subr/sysinfo.c:1076
msgid "Intel 64-bit"
msgstr "Intel 64 Bit"
-#: ../libsvn_subr/sysinfo.c:1108
+#: ../libsvn_subr/sysinfo.c:1077
msgid "PowerPC"
msgstr "PowerPC"
-#: ../libsvn_subr/sysinfo.c:1109
+#: ../libsvn_subr/sysinfo.c:1078
msgid "PowerPC 64-bit"
msgstr "PowerPC 64 Bit"
@@ -6793,47 +6709,47 @@ msgstr "Ungültige Revisionsnummer beim
msgid "Negative revision number found parsing '%s'"
msgstr "Negative Revisionsnummer beim Einlesen von »%s« gefunden"
-#: ../libsvn_subr/utf.c:245
+#: ../libsvn_subr/utf.c:240
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "Kann keinen Zeichenkonverter von der eigenen Codierung nach »%s« erzeugen"
-#: ../libsvn_subr/utf.c:249
+#: ../libsvn_subr/utf.c:244
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "Kann keinen Zeichenkonverter von »%s« in die eigene Kodierung erzeugen"
-#: ../libsvn_subr/utf.c:253
+#: ../libsvn_subr/utf.c:248
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "Kann keinen Zeichenkonverter von »%s« nach »%s« erzeugen"
-#: ../libsvn_subr/utf.c:601
+#: ../libsvn_subr/utf.c:590
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Kann Zeichenkette nicht von der eigenen Codierung nach »%s« konvertieren:"
-#: ../libsvn_subr/utf.c:605
+#: ../libsvn_subr/utf.c:594
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Kann Zeichenkette nicht von »%s« in die eigene Codierung konvertieren:"
-#: ../libsvn_subr/utf.c:609
+#: ../libsvn_subr/utf.c:598
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Kann Zeichenkette nicht von »%s« nach »%s« konvertieren:"
-#: ../libsvn_subr/utf.c:654
+#: ../libsvn_subr/utf.c:643
#, c-format
msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8"
msgstr "Auf sichere Daten »%s« folgte ein nicht-ASCII Byte %d, das nicht von/nach UTF-8 konvertiert werden konnte"
-#: ../libsvn_subr/utf.c:662
+#: ../libsvn_subr/utf.c:651
#, c-format
msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
msgstr "Ein Nicht-ASCII Zeichen (Kode %d) wurde gefunden, das nicht von/nach UTF-8 konvertiert werden konnte"
-#: ../libsvn_subr/utf.c:707
+#: ../libsvn_subr/utf.c:696
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -6866,34 +6782,26 @@ msgstr "MIME-Typ »%s« enthält ein ung
msgid "MIME type '%s' contains invalid character '0x%02x' in postfix"
msgstr "MIME-Typ »%s« enthält ein ungültiges Zeichen »0x%02x« im Postfix"
-#: ../libsvn_subr/version.c:91
+#: ../libsvn_subr/version.c:89
#, c-format
-msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "Versionskonflikt in »%s«%s: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s"
-
-#: ../libsvn_subr/version.c:96
-msgid " (expecting equality)"
-msgstr " (Übereinstimmung erwartet)"
+msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "Version von »%s« ist unerwartet: gefunden %d.%d.%d%s, erwartet %d.%d.%d%s"
-#: ../libsvn_subr/version.c:98
-msgid " (expecting compatibility)"
-msgstr " (Kompatibilität erwartet)"
-
-#: ../libsvn_subr/version.c:139
+#: ../libsvn_subr/version.c:132
msgid ""
-"Copyright (C) 2014 The Apache Software Foundation.\n"
+"Copyright (C) 2013 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see http://subversion.apache.org/\n"
msgstr ""
-"Copyright (C) 2014 The Apache Software Foundation.\n"
+"Copyright (C) 2013 The Apache Software Foundation.\n"
"Diese Software besteht aus Beiträgen vieler Personen;\n"
"siehe Datei NOTICE für weitere Informationen.\n"
"Subversion ist Open Source Software, siehe http://subversion.apache.org/\n"
-#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228
-#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251
-#: ../libsvn_subr/version.c:258
+#: ../libsvn_subr/version.c:210 ../libsvn_subr/version.c:221
+#: ../libsvn_subr/version.c:227 ../libsvn_subr/version.c:244
+#: ../libsvn_subr/version.c:251
#, c-format
msgid "Failed to parse version number string '%s'"
msgstr "Konnte Zeichenkette mit Versionsnummer »%s« nicht verarbeiten"
@@ -6967,19 +6875,19 @@ msgstr "Revision %ld passt nicht zur exi
msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
msgstr "URL »%s« (UUID: »%s«) stimmt nicht mit der existierenden URL »%s« (UUID: »%s«) in »%s« überein"
-#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5281
+#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5240
#, c-format
msgid "Can't find parent directory's node while trying to add '%s'"
msgstr "Kann Knoten des Elternverzeichnisses während des Hinzufügens von »%s« nicht finden"
-#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5275
+#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5234
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr ""
"Kann »%s« nicht zu einem Elternverzeichnis hinzufügen, das selbst zum Löschen\n"
"vorgesehen ist"
-#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5288
+#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5247
#, c-format
msgid "Can't schedule an addition of '%s' below a not-directory node"
msgstr "Kann »%s« nicht zum Hinzufügen unter einem Knoten vorsehen, der kein Verzeichnis ist"
@@ -7063,13 +6971,13 @@ msgstr "Quelle »%s« ist unbekannten Ty
msgid "cannot handle node kind for '%s'"
msgstr "Kann Knotentyp für »%s« nicht verarbeiten"
-#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4507 ../libsvn_wc/wc_db.c:5082
+#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4412 ../libsvn_wc/wc_db.c:4987
#, c-format
msgid "Cannot handle status of '%s'"
msgstr "Kann Status von »%s« nicht verarbeiten"
-#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4498 ../libsvn_wc/wc_db.c:5076
-#: ../libsvn_wc/wc_db.c:5321
+#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4403 ../libsvn_wc/wc_db.c:4981
+#: ../libsvn_wc/wc_db.c:5215
#, c-format
msgid "Cannot copy '%s' excluded by server"
msgstr "Kann vom Server ausgeschlossenes »%s« nicht kopieren"
@@ -7300,7 +7208,7 @@ msgstr "Unbekanntes Format für die rela
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "Pfad »%s« endet mit »%s«, was für diese Operation nicht erlaubt ist"
-#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:14134
+#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:13652
#, c-format
msgid "Working copy '%s' locked"
msgstr "Arbeitskopie »%s« gesperrt"
@@ -7393,17 +7301,17 @@ msgstr "Ein nicht erwartetes \\0 wurde i
msgid "Illegal file external revision kind %d for path '%s'"
msgstr "Ungültiger Revisionstyp des externen Dateiverweises %d für Pfad »%s«"
-#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847
+#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:843
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Eintrag »%s« hat einen ungültigen Knotentyp"
-#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827
+#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:823
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Eintrag »%s« hat eine ungültige Projektarchiv-Basis"
-#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872
+#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:868
#, c-format
msgid "Entry '%s' has invalid 'schedule' value"
msgstr "Eintrag »%s« hat einen ungültigen Wert für »schedule«"
@@ -7418,37 +7326,37 @@ msgstr "Eintrag »%s« hat einen ungült
msgid "Entry '%s' has invalid '%s' value"
msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert"
-#: ../libsvn_wc/old-and-busted.c:1085
+#: ../libsvn_wc/old-and-busted.c:1081
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML-Parser schlug in »%s« fehl"
-#: ../libsvn_wc/old-and-busted.c:1141
+#: ../libsvn_wc/old-and-busted.c:1137
msgid "Missing default entry"
msgstr "Fehlender Standardeintrag"
-#: ../libsvn_wc/old-and-busted.c:1146
+#: ../libsvn_wc/old-and-busted.c:1142
msgid "Default entry has no revision number"
msgstr "Standardeintrag hat keine Revisionsnummer"
-#: ../libsvn_wc/old-and-busted.c:1151
+#: ../libsvn_wc/old-and-busted.c:1147
msgid "Default entry is missing URL"
msgstr "Standardeintrag hat keine URL"
-#: ../libsvn_wc/old-and-busted.c:1230
+#: ../libsvn_wc/old-and-busted.c:1226
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Ungültige Versionszeile in Datei »entry« von »%s«"
-#: ../libsvn_wc/old-and-busted.c:1247
+#: ../libsvn_wc/old-and-busted.c:1243
msgid "Missing entry terminator"
msgstr "Fehlender Abschluss des Eintrags"
-#: ../libsvn_wc/old-and-busted.c:1250
+#: ../libsvn_wc/old-and-busted.c:1246
msgid "Invalid entry terminator"
msgstr "Ungültiger Abschluss des Eintrags"
-#: ../libsvn_wc/old-and-busted.c:1254
+#: ../libsvn_wc/old-and-busted.c:1250
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Fehler bei Eintrag %d in Eintragsdatei für »%s«:"
@@ -7703,43 +7611,43 @@ msgstr ""
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: ../libsvn_wc/update_editor.c:1134
+#: ../libsvn_wc/update_editor.c:1130
#, c-format
msgid "'%s' is not valid as filename in directory '%s'"
msgstr "»%s« ist als Dateiname im Verzeichnis »%s« nicht gültig"
-#: ../libsvn_wc/update_editor.c:1611
+#: ../libsvn_wc/update_editor.c:1607
#, c-format
msgid "Unexpected attempt to add a node at path '%s'"
msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« hinzuzufügen"
-#: ../libsvn_wc/update_editor.c:1622
+#: ../libsvn_wc/update_editor.c:1618
#, c-format
msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'"
msgstr "Unerwarteter Versuch, einen Knoten im Pfad »%s« zu bearbeiten, zu löschen oder zu ersetzen"
-#: ../libsvn_wc/update_editor.c:2036
+#: ../libsvn_wc/update_editor.c:2032
#, c-format
msgid "Failed to add directory '%s': object of the same name as the administrative directory"
msgstr ""
"Konnte Verzeichnis »%s« nicht hinzufügen, da es denselben Namen wie das\n"
"Administrationsverzeichnis trägt"
-#: ../libsvn_wc/update_editor.c:2694
+#: ../libsvn_wc/update_editor.c:2690
msgid "Couldn't do property merge"
msgstr "Konnte Eigenschaften nicht zusammenführen"
-#: ../libsvn_wc/update_editor.c:3087
+#: ../libsvn_wc/update_editor.c:3046
#, c-format
msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition"
msgstr "Konnte »%s« nicht als fehlend markieren: ein Eintrag mit demselben Namen wurde bereits zur Hinzufügung eingeplant"
-#: ../libsvn_wc/update_editor.c:3175
+#: ../libsvn_wc/update_editor.c:3134
#, c-format
msgid "Failed to add file '%s': object of the same name as the administrative directory"
msgstr "Konnte Datei »%s« nicht hinzufügen, da es denselben Namen wie Administrationsverzeichnis trägt"
-#: ../libsvn_wc/update_editor.c:3697
+#: ../libsvn_wc/update_editor.c:3656
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -7750,22 +7658,22 @@ msgstr ""
" erwartet: %s\n"
"verzeichnet: %s\n"
-#: ../libsvn_wc/update_editor.c:5256
+#: ../libsvn_wc/update_editor.c:5215
#, c-format
msgid "Node '%s' exists."
msgstr "Knoten »%s« existiert bereits"
-#: ../libsvn_wc/update_editor.c:5316
+#: ../libsvn_wc/update_editor.c:5275
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Die Quell-URL »%s« hat eine andere Projektarchiv-Basis als »%s«"
-#: ../libsvn_wc/update_editor.c:5514
+#: ../libsvn_wc/update_editor.c:5473
#, c-format
msgid "'%s' is not an unmodified copied directory"
msgstr "»%s« ist kein kopiertes Verzeichnis ohne Veränderungen"
-#: ../libsvn_wc/update_editor.c:5525
+#: ../libsvn_wc/update_editor.c:5484
#, c-format
msgid "Copyfrom '%s' doesn't match original location of '%s'"
msgstr "Quell-URL »%s« stimmt nicht mit der ursprünglichen Position von »%s« überein"
@@ -7826,12 +7734,12 @@ msgstr "Format der Arbeitskopie »%s« i
msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use the current client"
msgstr "Format der Arbeitskopie »%s« ist das einer alten Entwicklungsversion (Format %d); Um sie in ein neues Format zu bringen, verwenden Sie einen mit Format 18 kompatiblen Client, starten Sie »tools/dev/wc-ng/bump-to-19.py« und verwenden Sie danach die neue Version"
-#: ../libsvn_wc/upgrade.c:2092
+#: ../libsvn_wc/upgrade.c:2088
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy"
msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Arbeitkopie ist"
-#: ../libsvn_wc/upgrade.c:2141
+#: ../libsvn_wc/upgrade.c:2137
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'"
msgstr "Kann »%s« nicht in ein neueres Format bringen, da es nicht die Basis einer Arbeitskopie ist - die Basis ist »%s«"
@@ -7841,165 +7749,165 @@ msgstr "Kann »%s« nicht in ein neueres
msgid "No REPOSITORY table entry for id '%ld'"
msgstr "Kein REPOSITORY-Tabelleneintrag für ID »%ld«"
-#: ../libsvn_wc/wc_db.c:768
+#: ../libsvn_wc/wc_db.c:718
#, c-format
msgid "The file '%s' has no checksum."
msgstr "Die Datei »%s« hat keine Prüfsumme."
-#: ../libsvn_wc/wc_db.c:2535 ../libsvn_wc/wc_db.c:2916
-#: ../libsvn_wc/wc_db.c:9372
+#: ../libsvn_wc/wc_db.c:2468 ../libsvn_wc/wc_db.c:2849
+#: ../libsvn_wc/wc_db.c:8890
#, c-format
msgid "The node '%s' has a corrupt checksum value."
msgstr "Der Knoten »%s« hat einen fehlerhaften Prüfsummenwert."
-#: ../libsvn_wc/wc_db.c:2720
+#: ../libsvn_wc/wc_db.c:2653
#, c-format
msgid "The node '%s' has a BASE status that has no properties."
msgstr "Der Knoten »%s« hat einen »BASE«-Status, der keine Eigenschaften hat."
-#: ../libsvn_wc/wc_db.c:3546
+#: ../libsvn_wc/wc_db.c:3479
#, c-format
msgid "The node '%s' is not an external."
msgstr "Der Knoten »%s« ist kein externer Verweis."
-#: ../libsvn_wc/wc_db.c:3960
+#: ../libsvn_wc/wc_db.c:3886
#, c-format
msgid "Expected node '%s' to be deleted."
msgstr "Erwartete, dass Knoten »%s« gelöscht wird."
-#: ../libsvn_wc/wc_db.c:6473 ../libsvn_wc/wc_db.c:6552
+#: ../libsvn_wc/wc_db.c:6367 ../libsvn_wc/wc_db.c:6445
#, c-format
msgid "Can't revert '%s' without reverting children"
msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Kindelemente zurückzusetzen"
-#: ../libsvn_wc/wc_db.c:6649
+#: ../libsvn_wc/wc_db.c:6542
#, c-format
msgid "Can't revert '%s' without reverting parent"
msgstr "Kann »%s« nicht zurücksetzen, ohne dessen Elternelement zurückzusetzen"
-#: ../libsvn_wc/wc_db.c:6768
+#: ../libsvn_wc/wc_db.c:6659
#, c-format
msgid "Unsupported depth for revert of '%s'"
msgstr "Nicht unterstützte Tiefe für Zurücksetzung von »%s«"
-#: ../libsvn_wc/wc_db.c:7740
+#: ../libsvn_wc/wc_db.c:7502
#, c-format
msgid "Cannot delete '%s' as '%s' is excluded by server"
msgstr "Kann »%s« nicht löschen, da »%s« vom Server ausgeschlossen wurde"
-#: ../libsvn_wc/wc_db.c:7751
+#: ../libsvn_wc/wc_db.c:7513
#, c-format
msgid "Cannot delete '%s' as it is excluded by server"
msgstr "Kann »%s« nicht löschen, da es vom Server ausgeschlossen wurde"
-#: ../libsvn_wc/wc_db.c:7758
+#: ../libsvn_wc/wc_db.c:7520
#, c-format
msgid "Cannot delete '%s' as it is excluded"
msgstr "Kann »%s« nicht löschen, da es ausgeschlossen wurde"
-#: ../libsvn_wc/wc_db.c:8210
+#: ../libsvn_wc/wc_db.c:7934
#, c-format
msgid "Cannot move '%s' to '%s' because they are not in the same working copy"
msgstr "Kann »%s« nicht nach »%s« verschieben, da dies nicht in der selben Arbeitskopie ist"
-#: ../libsvn_wc/wc_db.c:8568
+#: ../libsvn_wc/wc_db.c:8292
#, c-format
msgid "Corrupt data for '%s'"
msgstr "Fehlerhafte Daten für »%s«"
-#: ../libsvn_wc/wc_db.c:8872
+#: ../libsvn_wc/wc_db.c:8596
#, c-format
msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087"
msgstr "Der Knoten »%s« gehört unerwartet zum Projektarchiv »%s«, erwartet war »%s«; Falls der Knoten ein externer Dateiverweis ist, kann die Verwendung der korrekten URL in der Definition des externen Dateiverweises das Problem beheben, siehe Fehlerbericht #4087"
-#: ../libsvn_wc/wc_db.c:9497
+#: ../libsvn_wc/wc_db.c:9015
#, c-format
msgid "The node '%s' is not in working copy '%s'"
msgstr "Der Knoten »%s« ist nicht in der Arbeitskopie »%s«"
-#: ../libsvn_wc/wc_db.c:9534
+#: ../libsvn_wc/wc_db.c:9052
#, c-format
msgid "The node '%s' is not installable"
msgstr "Der Knoten »%s« konnte nicht installiert werden"
-#: ../libsvn_wc/wc_db.c:9963 ../libsvn_wc/wc_db.c:10222
+#: ../libsvn_wc/wc_db.c:9481 ../libsvn_wc/wc_db.c:9740
#, c-format
msgid "The node '%s' has a status that has no properties."
msgstr "Der Knoten »%s« hat einen Status, der keine Eigenschaften hat"
-#: ../libsvn_wc/wc_db.c:12062
+#: ../libsvn_wc/wc_db.c:11580
#, c-format
msgid "Expected node '%s' to be added."
msgstr "Erwartete, dass Knoten »%s« hinzugefügt wird."
-#: ../libsvn_wc/wc_db.c:12408
+#: ../libsvn_wc/wc_db.c:11926
#, c-format
msgid "Path '%s' was not moved here"
msgstr "Pfad »%s« wurde nicht hierhin verschoben"
-#: ../libsvn_wc/wc_db.c:12477
+#: ../libsvn_wc/wc_db.c:11995
#, c-format
msgid "The base node '%s' was not found."
msgstr "Der Basisknoten »%s« wurde nicht gefunden."
-#: ../libsvn_wc/wc_db.c:12909
+#: ../libsvn_wc/wc_db.c:12427
#, c-format
msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530."
msgstr "Die Eigenschaften von »%s« sind in einem unbestimmten Zustand und können nicht in ein neues Format gebreacht werden. Siehe Fehlerbericht #2530."
-#: ../libsvn_wc/wc_db.c:12921
+#: ../libsvn_wc/wc_db.c:12439
#, c-format
msgid "Insufficient NODES rows for '%s'"
msgstr "Nicht genügend »NODES«-Zeilen für »%s«"
-#: ../libsvn_wc/wc_db.c:13068
+#: ../libsvn_wc/wc_db.c:12586
#, c-format
msgid "Repository '%s' not found in the database"
msgstr "Projektverzeichnis »%s« nicht in der Datenbank gefunden"
-#: ../libsvn_wc/wc_db.c:14055 ../libsvn_wc/wc_db.c:14103
+#: ../libsvn_wc/wc_db.c:13573 ../libsvn_wc/wc_db.c:13621
#, c-format
msgid "'%s' is already locked."
msgstr "»%s« ist bereits gesperrt"
-#: ../libsvn_wc/wc_db.c:14060 ../libsvn_wc/wc_db.c:14111
+#: ../libsvn_wc/wc_db.c:13578 ../libsvn_wc/wc_db.c:13629
#, c-format
msgid "Working copy '%s' locked."
msgstr "Arbeitskopie »%s« gesperrt."
-#: ../libsvn_wc/wc_db.c:14183
+#: ../libsvn_wc/wc_db.c:13701
#, c-format
msgid "'%s' is already locked via '%s'."
msgstr "»%s« ist bereits durch »%s« gesperrt."
-#: ../libsvn_wc/wc_db.c:14357
+#: ../libsvn_wc/wc_db.c:13875
#, c-format
msgid "Working copy not locked at '%s'."
msgstr "Arbeitskopie »%s« ist nicht gesperrt."
-#: ../libsvn_wc/wc_db.c:14740
+#: ../libsvn_wc/wc_db.c:14258
#, c-format
msgid "Modification of '%s' already exists"
msgstr "Änderung von »%s« existiert bereits"
#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT
#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message.
-#: ../libsvn_wc/wc_db.c:15382
+#: ../libsvn_wc/wc_db.c:14900
#, c-format
msgid "database inconsistency at local_relpath='%s' verifying expression '%s'"
msgstr "Datenbankinkonsistenz bei »local_relpath« »%s« beim Auswerten des Ausdrucks »%s«"
-#: ../libsvn_wc/wc_db.c:15506
+#: ../libsvn_wc/wc_db.c:15024
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy root"
msgstr "Kann »%s« nicht in ein neueres Format bringen, da es keine Basis einer Arbeitskopie ist"
-#: ../libsvn_wc/wc_db.c:15512
+#: ../libsvn_wc/wc_db.c:15030
#, c-format
msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s"
msgstr "Arbeitskopie »%s« ist zu alt und muss mindestens in das Format %d gebracht werden, wie es von Subversion %s erstellt wurde"
-#: ../libsvn_wc/wc_db.c:15530
+#: ../libsvn_wc/wc_db.c:15048
msgid "Working copy upgrade failed"
msgstr "Arbeitskopie konnte nicht in ein nees Format gebracht werden"
@@ -8118,27 +8026,27 @@ msgid "The symlink at '%s' points nowher
msgstr "Der symbolische Link »%s« zeigt nirgendwohin."
# CHECKME: What's WCROOT? A variable or short for "working copy root"?
-#: ../libsvn_wc/wc_db_wcroot.c:665
+#: ../libsvn_wc/wc_db_wcroot.c:661
#, c-format
msgid "Missing a row in WCROOT for '%s'."
msgstr "Fehlende Zeile in WCROOT für »%s«."
-#: ../libsvn_wc/wc_db_wcroot.c:720
+#: ../libsvn_wc/wc_db_wcroot.c:709
#, c-format
msgid "The working copy at '%s' is corrupt."
msgstr "Die Arbeitskopie in »%s« ist beschädigt."
-#: ../libsvn_wc/wc_db_wcroot.c:736
+#: ../libsvn_wc/wc_db_wcroot.c:725
#, c-format
msgid "The working copy database at '%s' is missing."
msgstr "Die Datenbank der Arbeitskopie in »%s« fehlt."
-#: ../libsvn_wc/wc_db_wcroot.c:745
+#: ../libsvn_wc/wc_db_wcroot.c:734
#, c-format
msgid "The working copy database at '%s' is corrupt."
msgstr "Die Datenbank der Arbeitskopie in »%s« ist beschädigt."
-#: ../libsvn_wc/wc_db_wcroot.c:903
+#: ../libsvn_wc/wc_db_wcroot.c:881
#, c-format
msgid "'%s' is not a working copy root"
msgstr "»%s« ist keine Basis einer Arbeitskopie"
@@ -8171,7 +8079,7 @@ msgid "'verbose' option invalid in XML m
msgstr "Option »verbose« ist im XML-Modus ungültig"
#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312
-#: ../svn/status-cmd.c:308
+#: ../svn/status-cmd.c:302
msgid "'incremental' option only valid in XML mode"
msgstr "Option »incremental« ist nur im XML-Modus gültig"
@@ -8503,7 +8411,7 @@ msgstr "Akzeptiert fremde Version für a
msgid "their side of conflict"
msgstr "fremde Seite des Konflikts"
-#: ../svn/conflict-callbacks.c:469
+#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492
msgid "accept my version of entire file (even non-conflicts) [mine-full]"
msgstr "Akzeptiert eigene Version für ganze Datei (alles, nicht nur Konflikte) [mine-full]"
@@ -8512,7 +8420,7 @@ msgstr "Akzeptiert eigene Version für g
msgid "my version"
msgstr "meine Version"
-#: ../svn/conflict-callbacks.c:472
+#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495
msgid "accept their version of entire file (same) [theirs-full]"
msgstr "Akzeptiert fremde Version für ganze Datei (ebenso) [theirs-full]"
@@ -8571,14 +8479,6 @@ msgstr "alle Optionen anzeigen"
msgid "show this list (also 'h', '?')"
msgstr "Gibt diese Liste aus (auch: »h«, »?«)"
-#: ../svn/conflict-callbacks.c:492
-msgid "accept my version of entire property (even non-conflicts) [mine-full]"
-msgstr "Akzeptiert eigene Version für ganze Eigenschaft (alles, nicht nur Konflikte) [mine-full]"
-
-#: ../svn/conflict-callbacks.c:495
-msgid "accept their version of entire property (same) [theirs-full]"
-msgstr "Akzeptiert fremde Version für ganze Eigenschaft (ebenso) [theirs-full]"
-
#: ../svn/conflict-callbacks.c:498
msgid "show conflicts in this property"
msgstr "Zeigt Konflikte in dieser Eigenschaft an"
@@ -8957,7 +8857,7 @@ msgstr ""
"Subversion ist ein Programm zur Versionskontrolle.\n"
"Für weitere Informationen, siehe: http://subversion.apache.org/\n"
-#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1857
+#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1856
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -8991,7 +8891,7 @@ msgstr "Ungültige URL »%s«"
msgid "Resource is not under version control."
msgstr "Ressource ist nicht unter Versionskontrolle."
-#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1744
+#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1774
#, c-format
msgid "Path: %s\n"
msgstr "Pfad: %s\n"
@@ -9347,9 +9247,9 @@ msgid "Second revision required"
msgstr "Eine zweite Revision muss angegeben werden"
#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267
-#: ../svnadmin/svnadmin.c:1719 ../svnlook/svnlook.c:2061
-#: ../svnlook/svnlook.c:2254 ../svnlook/svnlook.c:2358
-#: ../svnlook/svnlook.c:2393
+#: ../svnadmin/svnadmin.c:1749 ../svnlook/svnlook.c:2060
+#: ../svnlook/svnlook.c:2253 ../svnlook/svnlook.c:2357
+#: ../svnlook/svnlook.c:2392
msgid "Too many arguments given"
msgstr "Zu viele Parameter angegeben"
@@ -9441,7 +9341,7 @@ msgid_plural "and %d already resolved"
msgstr[0] "und %d bereits aufgelöst"
msgstr[1] "und %d bereits aufgelöst"
-#: ../svn/notify.c:163 ../svn/status-cmd.c:93
+#: ../svn/notify.c:163 ../svn/status-cmd.c:90
#, c-format
msgid "Summary of conflicts:\n"
msgstr "Konfliktübersicht:\n"
@@ -9736,7 +9636,7 @@ msgstr "Ersetze %s\n"
msgid "Transmitting file data "
msgstr "Übertrage Daten "
-#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1698
+#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1728
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "»%s« gesperrt durch »%s«.\n"
@@ -9921,8 +9821,8 @@ msgid "Error writing to stream"
msgstr "Fehler beim Schreiben in Datenstrom"
#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156
-#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1754
-#: ../svnlook/svnlook.c:1908
+#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1753
+#: ../svnlook/svnlook.c:1907
#, c-format
msgid ""
"Inherited properties on '%s',\n"
@@ -9933,7 +9833,7 @@ msgstr ""
#. Not a --revprop
#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175
-#: ../svnlook/svnlook.c:1790 ../svnlook/svnlook.c:1943
+#: ../svnlook/svnlook.c:1789 ../svnlook/svnlook.c:1942
#, c-format
msgid "Properties on '%s':\n"
msgstr "Eigenschaften von »%s«:\n"
@@ -10071,22 +9971,22 @@ msgstr "Fehler bei der Auflösung einer
msgid "Try 'svn revert --depth infinity' instead?"
msgstr "Versuchen Sie »svn revert --depth infinity« stattdessen?"
-#: ../svn/status-cmd.c:97
+#: ../svn/status-cmd.c:94
#, c-format
msgid " Text conflicts: %u\n"
msgstr " Textkonflikte: %u\n"
-#: ../svn/status-cmd.c:101
+#: ../svn/status-cmd.c:98
#, c-format
msgid " Property conflicts: %u\n"
msgstr " Eigenschaftskonflikte: %u\n"
-#: ../svn/status-cmd.c:105
+#: ../svn/status-cmd.c:102
#, c-format
msgid " Tree conflicts: %u\n"
msgstr " Baumkonflikte: %u\n"
-#: ../svn/status-cmd.c:398
+#: ../svn/status-cmd.c:388
#, c-format
msgid ""
"\n"
@@ -10095,57 +9995,57 @@ msgstr ""
"\n"
"--- Änderungsliste »%s«:\n"
-#: ../svn/status.c:318
+#: ../svn/status.c:302
#, c-format
msgid "swapped places with %s"
msgstr "Platz mit %s vertauscht"
-#: ../svn/status.c:333
+#: ../svn/status.c:316
#, c-format
msgid "moved from %s"
msgstr "Verschoben von %s"
-#: ../svn/status.c:345
+#: ../svn/status.c:327
#, c-format
msgid "moved to %s"
msgstr "Verschoben nach %s"
-#: ../svn/svn.c:147
+#: ../svn/svn.c:146
msgid "force operation to run"
msgstr "Durchführung des Befehls erzwingen"
-#: ../svn/svn.c:149
+#: ../svn/svn.c:148
msgid "force validity of log message source"
msgstr "Gültigkeit der Quelle für die Logmeldung erzwingen"
-#: ../svn/svn.c:150 ../svn/svn.c:151 ../svnadmin/svnadmin.c:208
-#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1048
-#: ../svndumpfilter/svndumpfilter.c:1051 ../svnlook/svnlook.c:114
-#: ../svnlook/svnlook.c:126 ../svnsync/svnsync.c:244 ../svnsync/svnsync.c:246
+#: ../svn/svn.c:149 ../svn/svn.c:150 ../svnadmin/svnadmin.c:208
+#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1018
+#: ../svndumpfilter/svndumpfilter.c:1021 ../svnlook/svnlook.c:113
+#: ../svnlook/svnlook.c:125 ../svnsync/svnsync.c:243 ../svnsync/svnsync.c:245
msgid "show help on a subcommand"
msgstr "zeige Hilfe zu einem Unterbefehl"
-#: ../svn/svn.c:152
+#: ../svn/svn.c:151
msgid "specify log message ARG"
msgstr "PAR als Logmeldung verwenden"
-#: ../svn/svn.c:153
+#: ../svn/svn.c:152
msgid "print nothing, or only summary information"
msgstr "nichts oder nur Zusammenfassungen ausgeben"
-#: ../svn/svn.c:154
+#: ../svn/svn.c:153
msgid "descend recursively, same as --depth=infinity"
msgstr ""
"rekursiv absteigen, das gleiche wie\n"
" --depth=infinity"
-#: ../svn/svn.c:155
+#: ../svn/svn.c:154
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr ""
"veraltet; versuchen Sie --depth=files oder\n"
" --depth=immediates"
-#: ../svn/svn.c:157
+#: ../svn/svn.c:156
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1\n"
@@ -10157,7 +10057,7 @@ msgstr ""
" Falls PAR die Form PAR1-PAR2 hat, dann wie\n"
" PAR1:PAR2, wobei PAR1 eingeschlossen ist"
-#: ../svn/svn.c:165
+#: ../svn/svn.c:164
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -10179,44 +10079,44 @@ msgstr ""
" oder vor BASE\n"
" »PREV« letzte Revision vor COMMITTED"
-#: ../svn/svn.c:180
+#: ../svn/svn.c:179
msgid "read log message from file ARG"
msgstr "Logmeldung aus Datei PAR lesen"
-#: ../svn/svn.c:182
+#: ../svn/svn.c:181
msgid "give output suitable for concatenation"
msgstr "Ausgabe für Verkettung formatieren"
-#: ../svn/svn.c:184
+#: ../svn/svn.c:183
msgid "treat value as being in charset encoding ARG"
msgstr ""
"Wert behandeln, als sei er in der Zeichenkodierung\n"
" PAR"
-#: ../svn/svn.c:185 ../svnadmin/svnadmin.c:214
-#: ../svndumpfilter/svndumpfilter.c:1054 ../svnlook/svnlook.c:168
-#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:287
-#: ../svnsync/svnsync.c:242 ../svnversion/svnversion.c:141
+#: ../svn/svn.c:184 ../svnadmin/svnadmin.c:214
+#: ../svndumpfilter/svndumpfilter.c:1024 ../svnlook/svnlook.c:167
+#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:288
+#: ../svnsync/svnsync.c:241 ../svnversion/svnversion.c:140
msgid "show program version information"
msgstr "Zeige Versionsinformationen des Programms"
-#: ../svn/svn.c:186
+#: ../svn/svn.c:185
msgid "print extra information"
msgstr "zusätzliche Informationen ausgeben"
-#: ../svn/svn.c:187
+#: ../svn/svn.c:186
msgid "display update information"
msgstr "Aktualisierungsinformation ausgeben"
-#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:128
+#: ../svn/svn.c:187 ../svnrdump/svnrdump.c:128
msgid "specify a username ARG"
msgstr "Benutzername PAR angeben"
-#: ../svn/svn.c:189 ../svnrdump/svnrdump.c:130
+#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:130
msgid "specify a password ARG"
msgstr "Passwort PAR angeben"
-#: ../svn/svn.c:191
+#: ../svn/svn.c:190
msgid ""
"Specify differencing options for external diff or\n"
" internal diff or blame. Default: '-u'. Options are\n"
@@ -10245,13 +10145,13 @@ msgstr ""
" -p (--show-c-function):\n"
" Zeigt C-Funktionsname in Diff-Ausgabe."
-#: ../svn/svn.c:209
+#: ../svn/svn.c:208
msgid "pass contents of file ARG as additional args"
msgstr ""
"Inhalt der Datei PAR als zusätzliche Parameter\n"
" übergeben"
-#: ../svn/svn.c:211
+#: ../svn/svn.c:210
msgid ""
"limit operation by depth ARG ('empty', 'files',\n"
" 'immediates', or 'infinity')"
@@ -10259,7 +10159,7 @@ msgstr ""
"begrenzt Operation auf Tiefe PAR (»empty«, »files«,\n"
" »immediates« oder »infinity«)"
-#: ../svn/svn.c:215
+#: ../svn/svn.c:214
msgid ""
"set new working copy depth to ARG ('exclude',\n"
" 'empty', 'files', 'immediates', or 'infinity')"
@@ -10267,19 +10167,19 @@ msgstr ""
"setzt eine neue Tiefe PAR der Arbeitskopie (»exclude«,\n"
" »empty«, »files«, »immediates« oder »infinity«)"
-#: ../svn/svn.c:218 ../svnlook/svnlook.c:171
+#: ../svn/svn.c:217 ../svnlook/svnlook.c:170
msgid "output in XML"
msgstr "gibt XML aus"
-#: ../svn/svn.c:219
+#: ../svn/svn.c:218
msgid "use strict semantics"
msgstr "wendet strikte Semantik an"
-#: ../svn/svn.c:221
+#: ../svn/svn.c:220
msgid "do not cross copies while traversing history"
msgstr "beendet Log-Ausgabe bei Kopieroperationen"
-#: ../svn/svn.c:223
+#: ../svn/svn.c:222
msgid ""
"disregard default and svn:ignore and\n"
" svn:global-ignores property ignores"
@@ -10287,11 +10187,11 @@ msgstr ""
"ignoriert Einstellungen aus »global-ignores« und den\n"
" Eigenschaften »svn:ignore« und »svn:global-ignores«"
-#: ../svn/svn.c:227 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:188
+#: ../svn/svn.c:226 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:187
msgid "do not cache authentication tokens"
msgstr "Anmeldeinformationen nicht zwischenspeichern"
-#: ../svn/svn.c:229 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:198
+#: ../svn/svn.c:228 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:197
msgid ""
"accept SSL server certificates from unknown\n"
" certificate authorities without prompting (but only\n"
@@ -10301,7 +10201,7 @@ msgstr ""
" Ausstellern ohne Nachfrage (aber nur\n"
" mit »--non-interactive«)"
-#: ../svn/svn.c:235 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:180
+#: ../svn/svn.c:234 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:179
msgid ""
"do no interactive prompting (default is to prompt\n"
" only if standard input is a terminal device)"
@@ -10309,7 +10209,7 @@ msgstr ""
"verhindert interaktive Nachfragen (Standard sind Nachfragen\n"
" nur wenn die Standardeingabe ein Terminal ist)"
-#: ../svn/svn.c:239 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:184
+#: ../svn/svn.c:238 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:183
msgid ""
"do interactive prompting even if standard input\n"
" is not a terminal device"
@@ -10317,56 +10217,56 @@ msgstr ""
"erzwingt interaktive Nachfragen auch wenn die\n"
" Standardeingabe kein Terminal ist"
-#: ../svn/svn.c:243
+#: ../svn/svn.c:242
msgid "try operation but make no changes"
msgstr "Operation testen, aber keine Änderungen durchführen"
-#: ../svn/svn.c:245
+#: ../svn/svn.c:244
msgid "disable merge tracking; diff nodes as if related"
msgstr "deaktiviert Zusammenführungsverfolgung; erzeugt Unterschiede als ob Knoten verwandt wären"
-#: ../svn/svn.c:247
+#: ../svn/svn.c:246
msgid "ignore externals definitions"
msgstr "»svn:externals«-Definitionen ignorieren"
-#: ../svn/svn.c:248
+#: ../svn/svn.c:247
msgid "use ARG as merge command"
msgstr "PAR als Konflikteditor verwenden"
-#: ../svn/svn.c:249
+#: ../svn/svn.c:248
msgid "use ARG as external editor"
msgstr "PAR als externen Editor verwenden"
-#: ../svn/svn.c:251
+#: ../svn/svn.c:250
msgid "merge only mergeinfo differences"
msgstr "Führt nur Unterschiede in den Zusammenführungsinformationen zusammen"
-#: ../svn/svn.c:252
+#: ../svn/svn.c:251
msgid "use ARG as the older target"
msgstr "PAR als älteres Ziel verwenden"
-#: ../svn/svn.c:253
+#: ../svn/svn.c:252
msgid "use ARG as the newer target"
msgstr "PAR als neueres Ziel verwenden"
-#: ../svn/svn.c:255
+#: ../svn/svn.c:254
msgid "operate on a revision property (use with -r)"
msgstr ""
"auf einer Revisionseigenschaft arbeiten (mit -r\n"
" verwenden)"
-#: ../svn/svn.c:256
+#: ../svn/svn.c:255
msgid "relocate via URL-rewriting"
msgstr "durch Umschreiben der URL umplatzieren"
-#: ../svn/svn.c:258 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
-#: ../svnsync/svnsync.c:212
+#: ../svn/svn.c:257 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
+#: ../svnsync/svnsync.c:211
msgid "read user configuration files from directory ARG"
msgstr ""
"Benutzerkonfigurationsdateien aus dem Verzeichnis\n"
" PAR lesen"
-#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:214
+#: ../svn/svn.c:259 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:213
msgid ""
"set user configuration option in the format:\n"
" FILE:SECTION:OPTION=[VALUE]\n"
@@ -10378,15 +10278,15 @@ msgstr ""
" Zum Beispiel:\n"
" servers:global:http-library=serf"
-#: ../svn/svn.c:267
+#: ../svn/svn.c:266
msgid "enable automatic properties"
msgstr "automatische Eigenschaften einschalten"
-#: ../svn/svn.c:268
+#: ../svn/svn.c:267
msgid "disable automatic properties"
msgstr "automatische Eigenschaften ausschalten"
-#: ../svn/svn.c:270
+#: ../svn/svn.c:269
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -10398,40 +10298,40 @@ msgstr ""
" »svn:eol-style native«.\n"
" PAR kann »LF«, »CR« oder »CRLF« sein."
-#: ../svn/svn.c:277
+#: ../svn/svn.c:276
msgid "maximum number of log entries"
msgstr "maximale Anzahl Logeinträge"
-#: ../svn/svn.c:278
+#: ../svn/svn.c:277
msgid "don't unlock the targets"
msgstr "Ziele nicht freigeben"
# CHECKME
-#: ../svn/svn.c:279
+#: ../svn/svn.c:278
msgid "remove changelist association"
msgstr "Bezug zur Änderungsliste entfernen"
-#: ../svn/svn.c:281
+#: ../svn/svn.c:280
msgid "operate only on members of changelist ARG"
msgstr "nur auf Elementen der Änderungsliste PAR operieren"
-#: ../svn/svn.c:283
+#: ../svn/svn.c:282
msgid "don't delete changelists after commit"
msgstr "Änderungslisten nach Übertragung nicht löschen"
-#: ../svn/svn.c:284
+#: ../svn/svn.c:283
msgid "keep path in working copy"
msgstr "Pfad in Arbeitskopie beibehalten"
-#: ../svn/svn.c:286
+#: ../svn/svn.c:285
msgid "retrieve all revision properties"
msgstr "alle Revisionseigenschaften abfragen"
-#: ../svn/svn.c:288
+#: ../svn/svn.c:287
msgid "retrieve no revision properties"
msgstr "keine Revisionseigenschaften abfragen"
-#: ../svn/svn.c:290
+#: ../svn/svn.c:289
msgid ""
"set revision property ARG in new revision\n"
" using the name[=value] format"
@@ -10439,11 +10339,11 @@ msgstr ""
"Revisionseigenschaft PAR in neuer Revision\n"
" unter Verwendung des Formats name[=Wert] setzen"
-#: ../svn/svn.c:293
+#: ../svn/svn.c:292
msgid "make intermediate directories"
msgstr "Zwischenverzeichnisse erzeugen"
-#: ../svn/svn.c:295
+#: ../svn/svn.c:294
msgid ""
"use/display additional information from merge\n"
" history"
@@ -10451,7 +10351,7 @@ msgstr ""
"verwendet und zeigt zusätzliche Informationen aus der\n"
" Zusammenführungsgeschichte an"
-#: ../svn/svn.c:299
+#: ../svn/svn.c:298
msgid ""
"specify automatic conflict resolution action\n"
" ('postpone', 'working', 'base', 'mine-conflict',\n"
@@ -10465,7 +10365,7 @@ msgstr ""
" »edit«, »launch«)\n"
" (kurz: »p«, »mc«, »tc«, »mf«, »tf«, »e«, »l«)"
-#: ../svn/svn.c:310
+#: ../svn/svn.c:309
msgid ""
"specify which collection of revisions to display\n"
" ('merged', 'eligible')"
@@ -10473,11 +10373,11 @@ msgstr ""
"gibt anzuzeigende Menge der Revisionen an\n"
" (»merged«, »eligible«)"
-#: ../svn/svn.c:314
+#: ../svn/svn.c:313
msgid "deprecated"
msgstr "veraltet"
-#: ../svn/svn.c:316
+#: ../svn/svn.c:315
msgid ""
"number of leading path components to strip from\n"
" paths parsed from the patch file. --strip 0\n"
@@ -10496,65 +10396,65 @@ msgstr ""
" Das erwartete Trennzeichen für Pfadkomponenten ist »/« auf\n"
" allen Plattformen. Ein einleitendes »/« zählt als eine Komponente."
-#: ../svn/svn.c:332
+#: ../svn/svn.c:331
msgid "don't expand keywords"
msgstr "Schlüsselwörter nicht expandieren"
-#: ../svn/svn.c:334
+#: ../svn/svn.c:333
msgid "apply the unidiff in reverse"
msgstr "Wendet Unidiff rückwärts an"
-#: ../svn/svn.c:336
+#: ../svn/svn.c:335
msgid "ignore whitespace during pattern matching"
msgstr "Ignoriert während des Mustervergleichs Leerzeichen, Tabulatoren und andere nicht druckbare Zeichen"
-#: ../svn/svn.c:337
+#: ../svn/svn.c:336
msgid "produce diff output"
msgstr "Erzeugt Ausgabe von Unterschieden"
#. maps to show_diff
#. diff options
-#: ../svn/svn.c:339 ../svnlook/svnlook.c:138
+#: ../svn/svn.c:338 ../svnlook/svnlook.c:137
msgid "use ARG as diff command"
msgstr "PAR als Vergleichsprogramm verwenden"
-#: ../svn/svn.c:341
+#: ../svn/svn.c:340
msgid "override diff-cmd specified in config file"
msgstr "Setzt in den Einstellungen angegebenes »diff-cmd« außer Kraft"
-#: ../svn/svn.c:343 ../svnlook/svnlook.c:132
+#: ../svn/svn.c:342 ../svnlook/svnlook.c:131
msgid "do not print differences for added files"
msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben"
-#: ../svn/svn.c:345 ../svnlook/svnlook.c:135
+#: ../svn/svn.c:344 ../svnlook/svnlook.c:134
msgid "do not print differences for deleted files"
msgstr "keine Unterschiede für gelöschte Dateien ausgeben"
-#: ../svn/svn.c:347
+#: ../svn/svn.c:346
msgid "don't diff copied or moved files with their source"
msgstr "Gibt kopierte oder verschobene Dateien nicht als Unterschied zu ihrer Quelle aus"
-#: ../svn/svn.c:349
+#: ../svn/svn.c:348
msgid "diff unrelated nodes as delete and add"
msgstr "Gibt nicht verwandte Knoten als Löschungen und Hinzufügung aus"
-#: ../svn/svn.c:350
+#: ../svn/svn.c:349
msgid "show a summary of the results"
msgstr "Zeige eine Zusammenfassung der Ergebnisse"
-#: ../svn/svn.c:352
+#: ../svn/svn.c:351
msgid "use git's extended diff format"
msgstr "Erweitertes Format von git verwenden"
-#: ../svn/svn.c:354 ../svnlook/svnlook.c:141
+#: ../svn/svn.c:353 ../svnlook/svnlook.c:140
msgid "ignore properties during the operation"
msgstr "Während des Vorgangs Eigenschaften ignorieren"
-#: ../svn/svn.c:356 ../svnlook/svnlook.c:144
+#: ../svn/svn.c:355 ../svnlook/svnlook.c:143
msgid "show only properties during the operation"
msgstr "Während des Vorgangs nur Eigenschaften anzeigen"
-#: ../svn/svn.c:358
+#: ../svn/svn.c:357
msgid ""
"generate diff suitable for generic third-party\n"
" patch tools; currently the same as\n"
@@ -10564,7 +10464,7 @@ msgstr ""
" Werkzeuge von Drittanbietern eignen; momentan identisch\n"
" mit --show-copies-as-adds --ignore-properties"
-#: ../svn/svn.c:366
+#: ../svn/svn.c:365
msgid ""
"Allow operation on mixed-revision working copy.\n"
" Use of this option is not recommended!\n"
@@ -10574,7 +10474,7 @@ msgstr ""
" Wie Verwendung dieser Option wird nicht empfohlen!\n"
" Führen Sie stattdessen »svn update« aus."
-#: ../svn/svn.c:372
+#: ../svn/svn.c:371
msgid ""
"Also commit file and dir externals reached by\n"
" recursion. This does not include externals with a\n"
@@ -10584,19 +10484,19 @@ msgstr ""
" Rekursion erreicht werden. Dies schließt externe Verweise\n"
" mit fixen Revisionen aus. (siehe Eigenschaft »svn:externals«)"
-#: ../svn/svn.c:378
+#: ../svn/svn.c:377
msgid "retrieve target's inherited properties"
msgstr "Geerbte Eigenschaften des Ziels abfragen"
-#: ../svn/svn.c:380
+#: ../svn/svn.c:379
msgid "use ARG as search pattern (glob syntax)"
msgstr "PAR als Suchmuster verwenden (mit Platzhaltern)"
-#: ../svn/svn.c:382
+#: ../svn/svn.c:381
msgid "combine ARG with the previous search pattern"
msgstr "PAR mit dem vorherigen Suchmuster kombinieren"
-#: ../svn/svn.c:430
+#: ../svn/svn.c:429
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -10607,11 +10507,11 @@ msgstr ""
"Das tatsächliche Hinzufügen findet erst beim nächsten Übertragen statt.\n"
"Aufruf: add PFAD...\n"
-#: ../svn/svn.c:435
+#: ../svn/svn.c:434
msgid "add intermediate parents"
msgstr "direkte Eltern hinzufügen"
-#: ../svn/svn.c:438
+#: ../svn/svn.c:437
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -10626,7 +10526,7 @@ msgstr ""
"\n"
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n"
-#: ../svn/svn.c:447
+#: ../svn/svn.c:446
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -10639,7 +10539,7 @@ msgstr ""
"\n"
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut wird.\n"
-#: ../svn/svn.c:455
+#: ../svn/svn.c:454
msgid ""
"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME PATH...\n"
@@ -10650,7 +10550,7 @@ msgstr ""
"Aufruf: 1. changelist CLNAME PFAD...\n"
" 2. changelist --remove PFAD...\n"
-#: ../svn/svn.c:461
+#: ../svn/svn.c:460
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -10700,7 +10600,7 @@ msgstr ""
" Siehe auch »svn help update« für eine Liste möglicher Buchstaben,\n"
" die die durchgeführte Aktion beschreiben.\n"
-#: ../svn/svn.c:488
+#: ../svn/svn.c:487
msgid ""
"Recursively clean up the working copy, removing write locks, resuming\n"
"unfinished operations, etc.\n"
@@ -10731,7 +10631,7 @@ msgstr ""
" Kommandos während des Zugriffs eines anderen Clients auf die\n"
" Arbeitskopie kann diese irreparabel beschädigen!\n"
-#: ../svn/svn.c:504
+#: ../svn/svn.c:503
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -10750,7 +10650,7 @@ msgstr ""
" Falls Objekte gesperrt sind oder gesperrte Objekte enthalten, werden diese\n"
" nach einer erfolgreichen Übertragung entsperrt.\n"
-#: ../svn/svn.c:515
+#: ../svn/svn.c:514
msgid ""
"Copy files and directories in a working copy or repository.\n"
"usage: copy SRC[@REV]... DST\n"
@@ -10790,7 +10690,7 @@ msgstr ""
" standardmäßig nicht in der Lage sein, Zusammenführungsinformationen\n"
" von der Quelle der Kopie in das Ziel weiterzureichen.\n"
-#: ../svn/svn.c:534
+#: ../svn/svn.c:533
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -10821,7 +10721,7 @@ msgstr ""
" 2. Jedes mit einer URL angegebene Element wird mittels sofortiger\n"
" Übertragung aus dem Projektarchiv entfernt.\n"
-#: ../svn/svn.c:550
+#: ../svn/svn.c:549
msgid ""
"Display local changes or differences between two revisions or paths.\n"
"usage: 1. diff\n"
@@ -10898,7 +10798,7 @@ msgstr ""
" 5. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n"
" 6. Kurzform für »svn diff --old=URL-ALT[@REVALT] --new=URL-NEU[@REVNEU]«\n"
-#: ../svn/svn.c:591
+#: ../svn/svn.c:590
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -10937,7 +10837,7 @@ msgstr ""
"\n"
" PEGREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n"
-#: ../svn/svn.c:613
+#: ../svn/svn.c:612
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -10945,7 +10845,7 @@ msgstr ""
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
"Aufruf: help [UNTERBEFEHL...]\n"
-#: ../svn/svn.c:619
+#: ../svn/svn.c:618
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -10970,7 +10870,7 @@ msgstr ""
" Nichtversionierbare Elemente wie Gerätedateien und Pipes werden ignoriert,\n"
" falls --force angegeben wird.\n"
-#: ../svn/svn.c:633
+#: ../svn/svn.c:632
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -10991,7 +10891,7 @@ msgstr ""
# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt
# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut"
# FIXME: Standardsätze sollten eigene msgid haben!
-#: ../svn/svn.c:643
+#: ../svn/svn.c:642
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -11031,11 +10931,11 @@ msgstr ""
" Größe (in Bytes)\n"
" Datum und Zeit der letzten Übertragung\n"
-#: ../svn/svn.c:663
+#: ../svn/svn.c:662
msgid "include externals definitions"
msgstr "»svn:externals«-Definitionen einbeziehen"
-#: ../svn/svn.c:666
+#: ../svn/svn.c:665
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -11049,21 +10949,21 @@ msgstr ""
"\n"
" Benutze --force, um eine bereits vorhandene Sperre zu stehlen.\n"
-#: ../svn/svn.c:672
+#: ../svn/svn.c:671
msgid "read lock comment from file ARG"
msgstr "Sperrkommentar aus Datei PAR lesen"
-#: ../svn/svn.c:673
+#: ../svn/svn.c:672
msgid "specify lock comment ARG"
msgstr "PAR als Sperrkommentar verwenden"
-#: ../svn/svn.c:674
+#: ../svn/svn.c:673
msgid "force validity of lock comment source"
msgstr ""
"Gültigkeit der Quelle für die Sperrmeldung\n"
" erzwingen"
-#: ../svn/svn.c:677
+#: ../svn/svn.c:676
msgid ""
"Show the log messages for a set of revision(s) and/or path(s).\n"
"usage: 1. log [PATH][@REV]\n"
@@ -11214,18 +11114,18 @@ msgstr ""
" Ausgabe der Logmeldung für die Revision die »/branches/zweig» erzeugte:\n"
" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/zweig\n"
-#: ../svn/svn.c:755
+#: ../svn/svn.c:754
msgid "retrieve revision property ARG"
msgstr "Revisionseigenschaft PAR abfragen"
-#: ../svn/svn.c:756
+#: ../svn/svn.c:755
msgid "the change made in revision ARG"
msgstr "die in Revision PAR durchgeführte Änderung"
#. For this large section, let's keep it unindented for easier
#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
#. * (with quotes and newlines removed).
-#: ../svn/svn.c:762
+#: ../svn/svn.c:761
msgid ""
"Merge changes into a working copy.\n"
"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
@@ -11937,7 +11837,7 @@ msgstr ""
" eine Zusammenführungsverfolgung bei Zusammenführungen aus fremdem\n"
" Projektarchiven nicht unterstützt.\n"
-#: ../svn/svn.c:1094
+#: ../svn/svn.c:1093
msgid ""
"Display merge-related information.\n"
"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
@@ -11999,7 +11899,7 @@ msgstr ""
"\n"
" Die Tiefe kann »empty« oder »infinity« sein, Vorgabe ist »empty«.\n"
-#: ../svn/svn.c:1125
+#: ../svn/svn.c:1124
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -12031,7 +11931,7 @@ msgstr ""
" In beiden Fällen müssen alle Zwischenverzeichnisse bereits existieren,\n"
" es sei denn, die Option --parents wurde angegeben.\n"
-#: ../svn/svn.c:1142
+#: ../svn/svn.c:1141
msgid ""
"Move (rename) an item in a working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -12067,7 +11967,7 @@ msgstr ""
"\n"
" Die Option »--revision« ist funktionslos und veraltet.\n"
-#: ../svn/svn.c:1164
+#: ../svn/svn.c:1163
msgid ""
"Apply a patch to a working copy.\n"
"usage: patch PATCHFILE [WCPATH]\n"
@@ -12163,7 +12063,7 @@ msgstr ""
" und aktualisieren Sie dann auf HEAD. Auf diese Weise können\n"
" Konflikte interaktiv aufgelöst werden.\n"
-#: ../svn/svn.c:1212
+#: ../svn/svn.c:1211
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -12181,7 +12081,7 @@ msgstr ""
" 1. Entfernt eine versionierte Eigenschaft aus der Arbeitskopie.\n"
" 2. Entfernt eine nicht versionierte Eigenschaft aus dem Projektarchiv.\n"
-#: ../svn/svn.c:1222
+#: ../svn/svn.c:1221
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -12204,7 +12104,7 @@ msgstr ""
"\n"
"Siehe »svn help propset« für Weiteres zum Setzen von Eigenschaften.\n"
-#: ../svn/svn.c:1234
+#: ../svn/svn.c:1233
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -12245,15 +12145,15 @@ msgstr ""
" um diese Formatierungen abzuschalten. (dies ist nützlich, um einen binären\n"
" Eigenschaftswert in eine Datei umzuleiten)\n"
-#: ../svn/svn.c:1254 ../svn/svn.c:1271
+#: ../svn/svn.c:1253 ../svn/svn.c:1270
msgid "print path, name and value on separate lines"
msgstr "Pfad, Name und Wert in getrennten Zeilen ausgeben"
-#: ../svn/svn.c:1255
+#: ../svn/svn.c:1254
msgid "don't print an extra newline"
msgstr "Keinen zusätzlichen Zeilenumbruch ausgeben"
-#: ../svn/svn.c:1258
+#: ../svn/svn.c:1257
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -12280,12 +12180,12 @@ msgstr ""
" Mit »--verbose« werden auch die Eigenschaftwerte ausgegeben,wie mit \n"
" »svn propget --verbose«. Mit »--quiet« werden Pfade nicht ausgegeben.\n"
-#: ../svn/svn.c:1272
+#: ../svn/svn.c:1271
msgid "don't print the path"
msgstr "Pfad nicht ausgeben"
# FIXME: propchange?
-#: ../svn/svn.c:1275
+#: ../svn/svn.c:1274
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -12456,11 +12356,11 @@ msgstr ""
" »relative_URL relativer_Pfad« mit Peg-Revisionsunterstützung gedeutet.\n"
" Zeilen, die mit »#« beginnen, werden ignoriert.\n"
-#: ../svn/svn.c:1354
+#: ../svn/svn.c:1353
msgid "read property value from file ARG"
msgstr "Eigenschaftswert aus Datei PAR lesen"
-#: ../svn/svn.c:1357
+#: ../svn/svn.c:1356
msgid ""
"Relocate the working copy to point to a different repository root URL.\n"
"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
@@ -12504,7 +12404,7 @@ msgstr ""
" svn relocate http://www.example.com/repo/Projekt \\\n"
" svn://svn.example.com/repo/Projekt\n"
-#: ../svn/svn.c:1380
+#: ../svn/svn.c:1379
msgid ""
"Resolve conflicts on working copy files or directories.\n"
"usage: resolve [PATH...]\n"
@@ -12526,7 +12426,7 @@ msgstr ""
" die Konfliktlösung von PFAD in der durch PAR angegebenen Weise. Damit\n"
" arbeitet das Programm als Vorgabe nicht rekursiv. (Tiefe »empty«)\n"
-#: ../svn/svn.c:1390
+#: ../svn/svn.c:1389
msgid ""
"specify automatic conflict resolution source\n"
" ('base', 'working', 'mine-conflict',\n"
@@ -12536,7 +12436,7 @@ msgstr ""
" (»base«, »working«, »mine-conflict«,\n"
" »theirs-conflict«, »mine-full«, »theirs-full«)"
-#: ../svn/svn.c:1397
+#: ../svn/svn.c:1396
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -12556,7 +12456,7 @@ msgstr ""
" übertragen werden kann. Dies wird zugunsten von »svn resolve --accept\n"
" working« missbilligt.\n"
-#: ../svn/svn.c:1407
+#: ../svn/svn.c:1406
msgid ""
"Restore pristine working copy state (undo local changes).\n"
"usage: revert PATH...\n"
@@ -12580,7 +12480,7 @@ msgstr ""
" schon übertragenen Änderungen, siehe in »svn help merge« den\n"
" Abschnitt »undo«.\n"
-#: ../svn/svn.c:1419
+#: ../svn/svn.c:1418
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -12769,11 +12669,11 @@ msgstr ""
" > lokal fehlend, eingehend editiert bei Aktualisierung\n"
" D wc/qax.c\n"
-#: ../svn/svn.c:1512
+#: ../svn/svn.c:1511
msgid "don't print unversioned items"
msgstr "Gibt nicht versioniertes Objekte nicht aus"
-#: ../svn/svn.c:1515
+#: ../svn/svn.c:1514
msgid ""
"Update the working copy to a different URL within the same repository.\n"
"usage: 1. switch URL[@PEGREV] [PATH]\n"
@@ -12856,11 +12756,11 @@ msgstr ""
" svn switch --relocate http://www.example.com/repo/Projekt \\\n"
" svn://svn.example.com/repo/Projekt\n"
-#: ../svn/svn.c:1557
+#: ../svn/svn.c:1556
msgid "allow switching to a node with no common ancestor"
msgstr "Erlaubt Umstellung auf einen Knoten ohne gemeinsamen Vorfahren"
-#: ../svn/svn.c:1561
+#: ../svn/svn.c:1560
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -12874,7 +12774,7 @@ msgstr ""
# Parts of the text (--force and --set-depth) are shared with the
# switch help. Keep it consistent.
-#: ../svn/svn.c:1568
+#: ../svn/svn.c:1567
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -12972,7 +12872,7 @@ msgstr ""
" Arbeitskopieverzeichnisses nur erhöht werden (tiefer ineinander geschachtelt);\n"
" eine Verzeichnistiefe kann nicht reduziert werden.\n"
-#: ../svn/svn.c:1618
+#: ../svn/svn.c:1617
msgid ""
"Upgrade the metadata storage format for a working copy.\n"
"usage: upgrade [WCPATH...]\n"
@@ -12984,110 +12884,110 @@ msgstr ""
"\n"
" Lokale Änderungen bleiben erhalten.\n"
-#: ../svn/svn.c:1664 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:380
-#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:297
+#: ../svn/svn.c:1663 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:379
+#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:296
msgid "Caught signal"
msgstr "Abbruchsignal empfangen"
-#: ../svn/svn.c:1817 ../svnlook/svnlook.c:2565
+#: ../svn/svn.c:1816 ../svnlook/svnlook.c:2564
msgid "Non-numeric limit argument given"
msgstr "Nicht-numerische Bereichsgrenze angegeben"
-#: ../svn/svn.c:1823 ../svnlook/svnlook.c:2571
+#: ../svn/svn.c:1822 ../svnlook/svnlook.c:2570
msgid "Argument to --limit must be positive"
msgstr "Parameter für --limit muss positiv sein"
-#: ../svn/svn.c:1844 ../svn/svn.c:2121
+#: ../svn/svn.c:1843 ../svn/svn.c:2120
msgid "Can't specify -c with --old"
msgstr "-c kann nicht mit --old verwendet werden"
-#: ../svn/svn.c:1875
+#: ../svn/svn.c:1874
#, c-format
msgid "Negative number in range (%s) not supported with -c"
msgstr "Negative Zahl im Bereich (%s) ist mit -c nicht unterstützt"
-#: ../svn/svn.c:1888
+#: ../svn/svn.c:1887
#, c-format
msgid "Non-numeric change argument (%s) given to -c"
msgstr "Nicht-numerischer Parameter (%s) an -c übergeben"
-#: ../svn/svn.c:1896
+#: ../svn/svn.c:1895
msgid "There is no change 0"
msgstr "Es gibt keine Änderung 0"
-#: ../svn/svn.c:1939 ../svnadmin/svnadmin.c:2037 ../svnrdump/svnrdump.c:937
-#: ../svnsync/svnsync.c:2052
+#: ../svn/svn.c:1938 ../svnadmin/svnadmin.c:2067 ../svnrdump/svnrdump.c:937
+#: ../svnsync/svnsync.c:2051
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfehler in Revisionsparameter »%s«"
-#: ../svn/svn.c:2005 ../svn/svn.c:2024
+#: ../svn/svn.c:2004 ../svn/svn.c:2023
#, c-format
msgid "Error converting depth from locale to UTF-8"
msgstr "Fehler beim Konvertieren der Tiefe aus Locale nach UTF-8"
-#: ../svn/svn.c:2013
+#: ../svn/svn.c:2012
#, c-format
msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
msgstr "»%s« ist keine gültige Tiefe; versuchen Sie »empty«, »files«, »immediates« oder »infinity«"
-#: ../svn/svn.c:2032
+#: ../svn/svn.c:2031
#, c-format
msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'"
msgstr "»%s« ist keine gültige Tiefe; versuchen Sie »exclude«, »empty«, »files«, »immediates« oder »infinity«"
-#: ../svn/svn.c:2161
+#: ../svn/svn.c:2160
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfehler im »native-eol« Parameter »%s«"
-#: ../svn/svn.c:2181
+#: ../svn/svn.c:2180
msgid "Changelist names must not be empty"
msgstr "Namen von Änderungslisten dürfen nicht leer sein"
-#: ../svn/svn.c:2215
+#: ../svn/svn.c:2214
#, c-format
msgid "'%s' is not a valid --accept value"
msgstr "»%s« ist kein gültiger Wert für --accept"
-#: ../svn/svn.c:2223
+#: ../svn/svn.c:2222
#, c-format
msgid "'%s' is not a valid --show-revs value"
msgstr "»%s« ist kein gültiger Wert für --show-revs"
-#: ../svn/svn.c:2235
+#: ../svn/svn.c:2234
#, c-format
msgid "Invalid strip count '%s'"
msgstr "Ungültige Anzahl der zu entfernenden Komponenten »%s«"
-#: ../svn/svn.c:2241
+#: ../svn/svn.c:2240
msgid "Argument to --strip must be positive"
msgstr "Parameter für --strip muss positiv sein"
-#: ../svn/svn.c:2296 ../svnmucc/svnmucc.c:1208 ../svnrdump/svnrdump.c:993
-#: ../svnsync/svnsync.c:2096
+#: ../svn/svn.c:2295 ../svnmucc/svnmucc.c:1207 ../svnrdump/svnrdump.c:993
+#: ../svnsync/svnsync.c:2095
msgid "--non-interactive and --force-interactive are mutually exclusive"
msgstr "--non-interactive und --force-interactive schließen sich gegenseitig aus"
-#: ../svn/svn.c:2350 ../svndumpfilter/svndumpfilter.c:1539
-#: ../svnlook/svnlook.c:2667
+#: ../svn/svn.c:2349 ../svndumpfilter/svndumpfilter.c:1509
+#: ../svnlook/svnlook.c:2666
#, c-format
msgid "Subcommand argument required\n"
msgstr "Unterbefehl benötigt einen Parameter\n"
-#: ../svn/svn.c:2367 ../svnadmin/svnadmin.c:2220
-#: ../svndumpfilter/svndumpfilter.c:1559 ../svnlook/svnlook.c:2686
+#: ../svn/svn.c:2366 ../svnadmin/svnadmin.c:2250
+#: ../svndumpfilter/svndumpfilter.c:1529 ../svnlook/svnlook.c:2685
#: ../svnrdump/svnrdump.c:1039
#, c-format
msgid "Unknown subcommand: '%s'\n"
msgstr "Unbekannter Unterbefehl: »%s«\n"
-#: ../svn/svn.c:2376
+#: ../svn/svn.c:2375
#, c-format
msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
msgstr "Undo wird mit den Befehlen »svn revert« bzw. »svn merge« durchgeführt.\n"
-#: ../svn/svn.c:2411
+#: ../svn/svn.c:2410
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -13096,95 +12996,95 @@ msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svn help %s« für Hilfe ein.\n"
-#: ../svn/svn.c:2425
+#: ../svn/svn.c:2424
msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
msgstr "Mehrere Revisionsparameter gefunden; bitte nicht zweimal -c oder gleichzeitig -r und -c angeben"
-#: ../svn/svn.c:2437
+#: ../svn/svn.c:2436
msgid "--depth and --set-depth are mutually exclusive"
msgstr "--depth und --set-depth schließen sich gegenseitig aus"
-#: ../svn/svn.c:2447
+#: ../svn/svn.c:2446
msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
msgstr "--with-all-revprops und --with-no-revprops schließen sich gegenseitig aus"
-#: ../svn/svn.c:2457
+#: ../svn/svn.c:2456
msgid "--with-revprop and --with-no-revprops are mutually exclusive"
msgstr "--with-revprop und --with-no-revprops schließen sich gegenseitig aus"
-#: ../svn/svn.c:2470
+#: ../svn/svn.c:2469
msgid "--message (-m) and --file (-F) are mutually exclusive"
msgstr "--message (-m) und --file (-F) schließen sich gegenseitig aus"
-#: ../svn/svn.c:2479 ../svnmucc/svnmucc.c:1219 ../svnrdump/svnrdump.c:1098
-#: ../svnsync/svnsync.c:2147
+#: ../svn/svn.c:2478 ../svnmucc/svnmucc.c:1218 ../svnrdump/svnrdump.c:1098
+#: ../svnsync/svnsync.c:2146
msgid "--trust-server-cert requires --non-interactive"
msgstr "--trust-server-cert erfordert --non-interactive"
# TODO: Duplicated message!!!!
-#: ../svn/svn.c:2489
+#: ../svn/svn.c:2488
msgid "--diff-cmd and --internal-diff are mutually exclusive"
msgstr "--diff-cmd und --internal-diff schließen sich gegenseitig aus"
-#: ../svn/svn.c:2531
+#: ../svn/svn.c:2530
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate und --depth schließen sich gegenseitig aus"
-#: ../svn/svn.c:2539
+#: ../svn/svn.c:2538
msgid "--relocate and --non-recursive (-N) are mutually exclusive"
msgstr "--relocate und --non-recursive (-N) schließen sich gegenseitig aus"
-#: ../svn/svn.c:2661
+#: ../svn/svn.c:2660
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr "Die Datei für die Logmeldung ist versioniert; geben Sie »--force-log« an, um sie zu verwenden"
-#: ../svn/svn.c:2668
+#: ../svn/svn.c:2667
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr "Die Datei für den Sperrkommentar ist versioniert; geben Sie »--force-log« an, um sie zu verwenden"
-#: ../svn/svn.c:2689
+#: ../svn/svn.c:2688
msgid "The log message is a pathname (was -F intended?); use '--force-log' to override"
msgstr "Die Logmeldung ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um sie zu verwenden"
-#: ../svn/svn.c:2696
+#: ../svn/svn.c:2695
msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override"
msgstr "Der Sperrkommentar ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, um ihn zu verwenden"
-#: ../svn/svn.c:2720
+#: ../svn/svn.c:2719
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props und --no-auto-props schließen sich gegenseitig aus"
-#: ../svn/svn.c:2825 ../svn/svn.c:2832
+#: ../svn/svn.c:2824 ../svn/svn.c:2831
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s ist mit --non-interactive nicht kompatibel"
-#: ../svn/svn.c:2888
+#: ../svn/svn.c:2887
#, c-format
msgid "Try 'svn help %s' for more information"
msgstr "Versuchen Sie »svn help %s« für weitere Informationen"
-#: ../svn/svn.c:2894
+#: ../svn/svn.c:2893
msgid "Please see the 'svn upgrade' command"
msgstr "Siehe Kommando »svn upgrade«"
-#: ../svn/svn.c:2900 ../svnmucc/svnmucc.c:1457 ../svnrdump/svnrdump.c:1175
+#: ../svn/svn.c:2899 ../svnmucc/svnmucc.c:1449 ../svnrdump/svnrdump.c:1175
msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option"
msgstr "Authentifizierung schlug fehl und interaktives Nachfragen ist deaktiviert; Siehe Option »--force-interactive«"
-#: ../svn/svn.c:2905
+#: ../svn/svn.c:2904
msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting"
msgstr "Einlesen der Datei von der Standardeingabe wegen Option -F; dies kann interaktive Nachfragen stören"
-#: ../svn/svn.c:2916
+#: ../svn/svn.c:2915
msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
msgstr "Starten Sie »svn cleanup«, um die Sperren zu entfernen (Aufruf: »svn help cleanup« für Details)"
-#: ../svn/svn.c:2923
+#: ../svn/svn.c:2922
msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server"
msgstr "Ein anderer Vorgang blockiert die Datenbank der Arbeitskopie, oder das darunterliegende Dateisystem unterstützt das Sperren von Dateien nicht; falls sich die Arbeitskopie auf einem Netzwerkdateisystem befindet, stellen Sie sicher, dass Dateisperren auf dem Dateiserver aktiviert sind"
-#: ../svn/svn.c:2936
+#: ../svn/svn.c:2935
msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion"
msgstr "Bei der Verwendung von svn+ssh:// URLs sollte beachtet werden, dass die Optionen »--username« und »--password« ignoriert werden, da die Authentifizierung von SSH und nicht Subversion durchgeführt wird"
@@ -13269,7 +13169,7 @@ msgstr "-- Diese und die folgenden Zeile
msgid "Error normalizing log message to internal format"
msgstr "Fehler beim Normalisieren der Logmeldung ins interne Format"
-#: ../svn/util.c:447 ../svnmucc/svnmucc.c:764
+#: ../svn/util.c:447 ../svnmucc/svnmucc.c:763
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "Kann den Editor für Logmeldungen nur im interaktiven Modus aufrufen"
@@ -13326,7 +13226,7 @@ msgstr "svn: Warnung: »%s« ist ein bin
msgid "specify revision number ARG (or X:Y range)"
msgstr "spezifizieren Sie PAR für Revisionsnummer (oder X:Y Bereich)"
-#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:162
+#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:161
msgid "specify transaction name ARG"
msgstr "Transaktionsname PAR angeben"
@@ -13346,9 +13246,9 @@ msgstr "Umgeht das Aktionssystem des Pro
msgid "bypass property validation logic"
msgstr "Umgeht die Logik zur Überprüfung von Eigenschaften"
-#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:193
-#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:289
-#: ../svnversion/svnversion.c:143
+#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:192
+#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:290
+#: ../svnversion/svnversion.c:142
msgid "no progress (only errors) to stderr"
msgstr "keine Fortschrittsanzeige (nur Fehler) auf die Standardfehlerausgabe"
@@ -13818,8 +13718,8 @@ msgstr "%sWarnung: Das Dateisystemmodul
msgid "Repositories compatible with 1.0.x must use --fs-type=bdb"
msgstr "Projektarchive, die mit 1.0.x kompatibel sind, müssen --fs-type=bdb verwenden"
-#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1011
-#: ../svnadmin/svnadmin.c:1192
+#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1041
+#: ../svnadmin/svnadmin.c:1222
msgid "First revision cannot be higher than second"
msgstr "Die erste Revision darf kann nicht größer als zweite sein"
@@ -13828,39 +13728,37 @@ msgstr "Die erste Revision darf kann nic
msgid "Deltifying revision %ld..."
msgstr "Bilde Deltas für Revision %ld ..."
-#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:812
-#: ../svnadmin/svnadmin.c:827
+#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:844
+#: ../svnadmin/svnadmin.c:859
#, c-format
msgid "done.\n"
msgstr "erledigt.\n"
-#: ../svnadmin/svnadmin.c:793
-#, c-format
+#: ../svnadmin/svnadmin.c:825
msgid "* Verifying repository metadata ...\n"
msgstr "* Überprüfe Metadaten des Projektarchivs ...\n"
-#: ../svnadmin/svnadmin.c:796
+#: ../svnadmin/svnadmin.c:828
#, c-format
msgid "* Verifying metadata at revision %ld ...\n"
msgstr "* Überprüfe Metadaten der Revision %ld ...\n"
-#: ../svnadmin/svnadmin.c:806
+#: ../svnadmin/svnadmin.c:838
#, c-format
msgid "Packing revisions in shard %s..."
msgstr "Packe Revisionen in Fragment %s ..."
-#: ../svnadmin/svnadmin.c:821
+#: ../svnadmin/svnadmin.c:853
#, c-format
msgid "Packing revprops in shard %s..."
msgstr "Packe Revisionseigenschaften in Fragment %s ..."
-#: ../svnadmin/svnadmin.c:898
+#: ../svnadmin/svnadmin.c:928
#, c-format
msgid "<<< Skipped original revision %ld\n"
msgstr "<<< Originalrevision %ld übersprungen\n"
-#: ../svnadmin/svnadmin.c:915
-#, c-format
+#: ../svnadmin/svnadmin.c:945
msgid ""
"Repository lock acquired.\n"
"Please wait; recovering the repository may take some time...\n"
@@ -13868,7 +13766,7 @@ msgstr ""
"Exklusiven Zugriff auf das Projektarchiv erlangt\n"
"Bitte warten, die Wiederherstellung des Projektarchivs kann einige Zeit dauern ...\n"
-#: ../svnadmin/svnadmin.c:922
+#: ../svnadmin/svnadmin.c:952
msgid ""
"Repository lock acquired.\n"
"Please wait; upgrading the repository may take some time...\n"
@@ -13876,11 +13774,11 @@ msgstr ""
"Exklusiven Zugriff auf das Projektarchiv erlangt\n"
"Bitte warten, die Aktualisierung des Projektarchivs kann einige Zeit dauern ...\n"
-#: ../svnadmin/svnadmin.c:1072
+#: ../svnadmin/svnadmin.c:1102
msgid "No program provided"
msgstr "Kein Programm angegeben"
-#: ../svnadmin/svnadmin.c:1108
+#: ../svnadmin/svnadmin.c:1138
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -13896,8 +13794,8 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnadmin/svnadmin.c:1115 ../svnlook/svnlook.c:2226
-#: ../svnserve/svnserve.c:335
+#: ../svnadmin/svnadmin.c:1145 ../svnlook/svnlook.c:2225
+#: ../svnserve/svnserve.c:336
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -13905,20 +13803,20 @@ msgstr ""
"Die folgenden Dateisystemmodule für Projektarchive stehen zur Verfügung:\n"
"\n"
-#: ../svnadmin/svnadmin.c:1144
+#: ../svnadmin/svnadmin.c:1174
#, c-format
msgid "Invalid revision number (%ld) specified"
msgstr "Ungültige Revisionsnummer (%ld) angegeben"
-#: ../svnadmin/svnadmin.c:1154
+#: ../svnadmin/svnadmin.c:1184
msgid "Non-numeric revision specified"
msgstr "Nicht-numerische Revisionsnummer angegeben"
-#: ../svnadmin/svnadmin.c:1213
+#: ../svnadmin/svnadmin.c:1243
msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading."
msgstr "Ungültiger Eigenschaftswert in Datenstrom gefunden; Versuchen Sie die Quelle zu reparieren oder geben Sie »--bypass-prop-validation« beim Laden an."
-#: ../svnadmin/svnadmin.c:1279 ../svnadmin/svnadmin.c:1911
+#: ../svnadmin/svnadmin.c:1309 ../svnadmin/svnadmin.c:1941
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -13927,12 +13825,12 @@ msgstr ""
"Vielleicht hat noch ein anderer Prozess (httpd, svnserve, svn)\n"
"das Projektarchiv geöffnet?"
-#: ../svnadmin/svnadmin.c:1284 ../svnadmin/svnadmin.c:1916
+#: ../svnadmin/svnadmin.c:1314 ../svnadmin/svnadmin.c:1946
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "Warte auf Freigabe des Projektarchivs; Vielleicht ist es durch einen anderen Prozess geöffnet?\n"
-#: ../svnadmin/svnadmin.c:1292
+#: ../svnadmin/svnadmin.c:1322
#, c-format
msgid ""
"\n"
@@ -13941,52 +13839,52 @@ msgstr ""
"\n"
"Wiederherstellung vollständig abgeschlossen.\n"
-#: ../svnadmin/svnadmin.c:1299
+#: ../svnadmin/svnadmin.c:1329
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Die neueste Revision des Projektarchivs ist %ld.\n"
-#: ../svnadmin/svnadmin.c:1414
+#: ../svnadmin/svnadmin.c:1444
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transaktion »%s« entfernt.\n"
-#: ../svnadmin/svnadmin.c:1476 ../svnadmin/svnadmin.c:1521
+#: ../svnadmin/svnadmin.c:1506 ../svnadmin/svnadmin.c:1551
#, c-format
msgid "Missing revision"
msgstr "Fehlende Revision"
-#: ../svnadmin/svnadmin.c:1479 ../svnadmin/svnadmin.c:1524
+#: ../svnadmin/svnadmin.c:1509 ../svnadmin/svnadmin.c:1554
#, c-format
msgid "Only one revision allowed"
msgstr "Nur eine Revision zulässig"
-#: ../svnadmin/svnadmin.c:1578
+#: ../svnadmin/svnadmin.c:1608
#, c-format
msgid "--revision (-r) and --transaction (-t) are mutually exclusive"
msgstr "--revision (-r) und --transaction (-t) schließen sich gegenseitig aus"
-#: ../svnadmin/svnadmin.c:1745 ../svnlook/svnlook.c:2289
+#: ../svnadmin/svnadmin.c:1775 ../svnlook/svnlook.c:2288
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID-Marke: %s\n"
-#: ../svnadmin/svnadmin.c:1746 ../svnlook/svnlook.c:2290
+#: ../svnadmin/svnadmin.c:1776 ../svnlook/svnlook.c:2289
#, c-format
msgid "Owner: %s\n"
msgstr "Eigentümer: %s\n"
-#: ../svnadmin/svnadmin.c:1747 ../svnlook/svnlook.c:2291
+#: ../svnadmin/svnadmin.c:1777 ../svnlook/svnlook.c:2290
#, c-format
msgid "Created: %s\n"
msgstr "Erstellt: %s\n"
-#: ../svnadmin/svnadmin.c:1748 ../svnlook/svnlook.c:2292
+#: ../svnadmin/svnadmin.c:1778 ../svnlook/svnlook.c:2291
#, c-format
msgid "Expires: %s\n"
msgstr "Läuft ab: %s\n"
-#: ../svnadmin/svnadmin.c:1750
+#: ../svnadmin/svnadmin.c:1780
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -14005,34 +13903,34 @@ msgstr[1] ""
"%s\n"
"\n"
-#: ../svnadmin/svnadmin.c:1796
+#: ../svnadmin/svnadmin.c:1826
msgid "No paths to unlock provided"
msgstr "Keine Pfade zum Entsperren angegeben"
-#: ../svnadmin/svnadmin.c:1814
+#: ../svnadmin/svnadmin.c:1844
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Pfad »%s« ist nicht gesperrt.\n"
-#: ../svnadmin/svnadmin.c:1826
+#: ../svnadmin/svnadmin.c:1856
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Sperre für »%s« entfernt.\n"
-#: ../svnadmin/svnadmin.c:1879
+#: ../svnadmin/svnadmin.c:1909
#, c-format
msgid "'%s' unlocked by user '%s'.\n"
msgstr "»%s« entsperrt durch Benutzer »%s«.\n"
-#: ../svnadmin/svnadmin.c:1926
+#: ../svnadmin/svnadmin.c:1956
msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere"
msgstr "Eine Aktualisierung des diesem Projektarchiv zugrundeliegenden versionierten Dateisystems wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo"
-#: ../svnadmin/svnadmin.c:1933
+#: ../svnadmin/svnadmin.c:1963
msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere"
msgstr "Eine Aktualisierung dieses Projektarchivs wird nicht unterstützt; versuchen Sie stattdessen »dump« und laden Sie die Daten mit »load« anderswo"
-#: ../svnadmin/svnadmin.c:1939
+#: ../svnadmin/svnadmin.c:1969
#, c-format
msgid ""
"\n"
@@ -14041,35 +13939,35 @@ msgstr ""
"\n"
"Aktualisierung abgeschlossen.\n"
-#: ../svnadmin/svnadmin.c:2024 ../svnrdump/svnrdump.c:923
+#: ../svnadmin/svnadmin.c:2054 ../svnrdump/svnrdump.c:923
msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr "Mehrere Revisionsparameter gefunden; Bitte »-r N:M« anstelle »-r N -r M« verwenden"
-#: ../svnadmin/svnadmin.c:2102
+#: ../svnadmin/svnadmin.c:2132
#, c-format
msgid "Cannot create pre-1.0-compatible repositories"
msgstr "Kann keine Projektarchive erstellen, die mit Versionen älter als 1.0 kompatibel sind"
-#: ../svnadmin/svnadmin.c:2115
+#: ../svnadmin/svnadmin.c:2145
#, c-format
msgid "Cannot guarantee compatibility beyond the current running version (%s)"
msgstr "Kann Kompatibilität für höhere Versionen als die momentan laufende nicht garantieren (%s)"
-#: ../svnadmin/svnadmin.c:2204
+#: ../svnadmin/svnadmin.c:2234
#, c-format
msgid "subcommand argument required\n"
msgstr "Unterbefehl benötigt einen Parameter\n"
-#: ../svnadmin/svnadmin.c:2239
+#: ../svnadmin/svnadmin.c:2269
msgid "Repository argument required"
msgstr "Projektarchiv Parameter erforderlich"
-#: ../svnadmin/svnadmin.c:2252
+#: ../svnadmin/svnadmin.c:2282
#, c-format
msgid "'%s' is a URL when it should be a local path"
msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte"
-#: ../svnadmin/svnadmin.c:2283
+#: ../svnadmin/svnadmin.c:2313
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -14078,77 +13976,72 @@ msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnadmin help %s« ein, um Hilfe zu erhalten.\n"
-#: ../svnadmin/svnadmin.c:2326
+#: ../svnadmin/svnadmin.c:2356
msgid "Try 'svnadmin help' for more info"
msgstr "Geben Sie »svnadmin help« für weitere Hilfe ein"
-#: ../svndumpfilter/svndumpfilter.c:79
+#: ../svndumpfilter/svndumpfilter.c:78
#, c-format
msgid "Can't open stdio file"
msgstr "Kann Standardeingabe nicht öffnen"
-#: ../svndumpfilter/svndumpfilter.c:406
+#: ../svndumpfilter/svndumpfilter.c:405
msgid "This is an empty revision for padding."
msgstr "Dies ist eine leere Revision zum Auffüllen"
-#: ../svndumpfilter/svndumpfilter.c:489
+#: ../svndumpfilter/svndumpfilter.c:488
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Revision %ld als %ld übertragen.\n"
-#: ../svndumpfilter/svndumpfilter.c:512
+#: ../svndumpfilter/svndumpfilter.c:511
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Revision: »%ld« übersprungen\n"
-#: ../svndumpfilter/svndumpfilter.c:608
+#: ../svndumpfilter/svndumpfilter.c:605
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "Ungültiger Quellpfad einer Kopie: »%s«"
-#: ../svndumpfilter/svndumpfilter.c:649
-#, c-format
-msgid "Missing Node-action for path '%s'"
-msgstr "Fehlende Knotenaktion für Pfad »%s«"
-
-#: ../svndumpfilter/svndumpfilter.c:692
+#: ../svndumpfilter/svndumpfilter.c:662
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Keine gültige Quellrevision im gefilterten Datenstrom"
-#: ../svndumpfilter/svndumpfilter.c:817
+#: ../svndumpfilter/svndumpfilter.c:787
#, c-format
msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources"
msgstr "Fehlender Zusammenführungsquellpfad »%s«; versuchen Sie es mit --skip-missing-merge-sources"
-#: ../svndumpfilter/svndumpfilter.c:839
+#: ../svndumpfilter/svndumpfilter.c:809
#, c-format
msgid "No valid revision range 'start' in filtered stream"
msgstr "Kein gültiger Revisionsbereich »start« im gefilterten Datenstrom"
-#: ../svndumpfilter/svndumpfilter.c:846
+#: ../svndumpfilter/svndumpfilter.c:816
#, c-format
msgid "No valid revision range 'end' in filtered stream"
msgstr "Kein gültiger Revisionsbereich »end« im gefilterten Datenstrom"
-#: ../svndumpfilter/svndumpfilter.c:892 ../svndumpfilter/svndumpfilter.c:923
+#: ../svndumpfilter/svndumpfilter.c:862 ../svndumpfilter/svndumpfilter.c:893
#, c-format
msgid "Delta property block detected, but deltas are not enabled for node '%s' in original revision %ld"
msgstr "Block mit Deltas für Eigenschaften entdeckt, Deltas sind aber für Knoten »%s« in originaler Revision %ld nicht aktiviert"
-#: ../svndumpfilter/svndumpfilter.c:1056
+#: ../svndumpfilter/svndumpfilter.c:1026
msgid "Do not display filtering statistics."
msgstr "Filterstatistik nicht anzeigen."
-#: ../svndumpfilter/svndumpfilter.c:1058
+#: ../svndumpfilter/svndumpfilter.c:1028
msgid "Treat the path prefixes as file glob patterns."
msgstr "Pfadpräfix als Dateiplatzhalter behandeln."
-#: ../svndumpfilter/svndumpfilter.c:1060
+#: ../svndumpfilter/svndumpfilter.c:1030
msgid "Remove revisions emptied by filtering."
msgstr "Durch das Filtern geleerte Revisionen entfernen."
-#: ../svndumpfilter/svndumpfilter.c:1062
+#: ../svndumpfilter/svndumpfilter.c:1032
msgid ""
"Remove all empty revisions found in dumpstream\n"
" except revision 0."
@@ -14156,19 +14049,19 @@ msgstr ""
"Entfernt alle im Dateiabzug gefundenen leeren Revisionen\n"
" mit Ausnahme von Revision 0."
-#: ../svndumpfilter/svndumpfilter.c:1065
+#: ../svndumpfilter/svndumpfilter.c:1035
msgid "Renumber revisions left after filtering."
msgstr "Revisionen nach dem Filtern neu nummerieren."
-#: ../svndumpfilter/svndumpfilter.c:1068
+#: ../svndumpfilter/svndumpfilter.c:1038
msgid "Skip missing merge sources."
msgstr "Fehlende Zusammenführungsquellen übersprungen."
-#: ../svndumpfilter/svndumpfilter.c:1070
+#: ../svndumpfilter/svndumpfilter.c:1040
msgid "Don't filter revision properties."
msgstr "Revisionseigenschaften nicht filtern."
-#: ../svndumpfilter/svndumpfilter.c:1072
+#: ../svndumpfilter/svndumpfilter.c:1042
msgid ""
"Read additional prefixes, one per line, from\n"
" file ARG."
@@ -14176,7 +14069,7 @@ msgstr ""
"Liest zusätzliche Prefixe, einen je Zeile, aus\n"
" Datei PAR."
-#: ../svndumpfilter/svndumpfilter.c:1084
+#: ../svndumpfilter/svndumpfilter.c:1054
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -14184,7 +14077,7 @@ msgstr ""
"Knoten mit den angegebenen Präfixen aus dem Datenstrom ausfiltern.\n"
"Aufruf: svndumpfilter exclude PFAD_PRÄFIX ...\n"
-#: ../svndumpfilter/svndumpfilter.c:1093
+#: ../svndumpfilter/svndumpfilter.c:1063
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -14192,7 +14085,7 @@ msgstr ""
"Knoten, die nicht den angegebenen Präfixen entsprechen, aus dem Datenstrom ausfiltern.\n"
"Aufruf: svndumpfilter include PFAD_PRÄFIX ...\n"
-#: ../svndumpfilter/svndumpfilter.c:1102
+#: ../svndumpfilter/svndumpfilter.c:1072
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -14200,7 +14093,7 @@ msgstr ""
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
"Aufruf: svndumpfilter help [UNTERBEFEHL...]\n"
-#: ../svndumpfilter/svndumpfilter.c:1178
+#: ../svndumpfilter/svndumpfilter.c:1148
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -14215,47 +14108,47 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svndumpfilter/svndumpfilter.c:1236
+#: ../svndumpfilter/svndumpfilter.c:1206
#, c-format
msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
msgstr "Präfixmuster ausschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/svndumpfilter.c:1238
+#: ../svndumpfilter/svndumpfilter.c:1208
#, c-format
msgid "Excluding prefix patterns:\n"
msgstr "Präfixmuster ausschließen:\n"
-#: ../svndumpfilter/svndumpfilter.c:1241
+#: ../svndumpfilter/svndumpfilter.c:1211
#, c-format
msgid "Including (and dropping empty revisions for) prefix patterns:\n"
msgstr "Präfixmuster einschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/svndumpfilter.c:1243
+#: ../svndumpfilter/svndumpfilter.c:1213
#, c-format
msgid "Including prefix patterns:\n"
msgstr "Präfixmuster einschließen:\n"
-#: ../svndumpfilter/svndumpfilter.c:1251
+#: ../svndumpfilter/svndumpfilter.c:1221
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Präfixe ausschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/svndumpfilter.c:1253
+#: ../svndumpfilter/svndumpfilter.c:1223
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Präfixe ausschließen:\n"
-#: ../svndumpfilter/svndumpfilter.c:1256
+#: ../svndumpfilter/svndumpfilter.c:1226
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Präfixe einschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/svndumpfilter.c:1258
+#: ../svndumpfilter/svndumpfilter.c:1228
#, c-format
msgid "Including prefixes:\n"
msgstr "Präfixe einschließen:\n"
-#: ../svndumpfilter/svndumpfilter.c:1286
+#: ../svndumpfilter/svndumpfilter.c:1256
#, c-format
msgid ""
"Dropped %d revision.\n"
@@ -14270,27 +14163,27 @@ msgstr[1] ""
"%d Revisionen verworfen.\n"
"\n"
-#: ../svndumpfilter/svndumpfilter.c:1294
+#: ../svndumpfilter/svndumpfilter.c:1264
msgid "Revisions renumbered as follows:\n"
msgstr "Revisionen folgendermaßen neu nummeriert:\n"
-#: ../svndumpfilter/svndumpfilter.c:1322
+#: ../svndumpfilter/svndumpfilter.c:1292
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (verworfen)\n"
-#: ../svndumpfilter/svndumpfilter.c:1337
+#: ../svndumpfilter/svndumpfilter.c:1307
#, c-format
msgid "Dropped %d node:\n"
msgid_plural "Dropped %d nodes:\n"
msgstr[0] "%d Knoten verworfen:\n"
msgstr[1] "%d Knoten verworfen:\n"
-#: ../svndumpfilter/svndumpfilter.c:1506
+#: ../svndumpfilter/svndumpfilter.c:1476
msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs"
msgstr "--drop-empty-revs« kann nicht mit --drop-all-empty-revs verwendet werden"
-#: ../svndumpfilter/svndumpfilter.c:1626
+#: ../svndumpfilter/svndumpfilter.c:1596
#, c-format
msgid ""
"\n"
@@ -14299,7 +14192,7 @@ msgstr ""
"\n"
"Fehler: keine Präfixe angegeben.\n"
-#: ../svndumpfilter/svndumpfilter.c:1657
+#: ../svndumpfilter/svndumpfilter.c:1627
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -14308,53 +14201,53 @@ msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svndumpfilter help %s« für Hilfe ein.\n"
-#: ../svndumpfilter/svndumpfilter.c:1675
+#: ../svndumpfilter/svndumpfilter.c:1645
msgid "Try 'svndumpfilter help' for more info"
msgstr "Versuchen Sie »svndumpfilter help« für weitere Informationen"
-#: ../svnlook/svnlook.c:117
+#: ../svnlook/svnlook.c:116
msgid "show details for copies"
msgstr "Zeige Details für Kopien"
-#: ../svnlook/svnlook.c:120
+#: ../svnlook/svnlook.c:119
msgid "print differences against the copy source"
msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus"
-#: ../svnlook/svnlook.c:123
+#: ../svnlook/svnlook.c:122
msgid "show full paths instead of indenting them"
msgstr "Zeige vollständige Pfade anstatt sie einzurücken"
-#: ../svnlook/svnlook.c:129
+#: ../svnlook/svnlook.c:128
msgid "maximum number of history entries"
msgstr "Maximale Anzahl von Logeinträgen"
-#: ../svnlook/svnlook.c:147
+#: ../svnlook/svnlook.c:146
msgid "operate on single directory only"
msgstr "Nicht rekursiv hinabsteigen"
-#: ../svnlook/svnlook.c:150
+#: ../svnlook/svnlook.c:149
msgid "specify revision number ARG"
msgstr "Revisionsnummer PAR angegeben"
-#: ../svnlook/svnlook.c:153
+#: ../svnlook/svnlook.c:152
msgid "operate on a revision property (use with -r or -t)"
msgstr ""
"auf einer Revisionseigenschaft arbeiten (mit -r\n"
" oder -t verwenden)"
-#: ../svnlook/svnlook.c:156
+#: ../svnlook/svnlook.c:155
msgid "show node revision ids for each path"
msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus"
-#: ../svnlook/svnlook.c:159
+#: ../svnlook/svnlook.c:158
msgid "show path's inherited properties"
msgstr "Gibt die geerbten Eigenschaften des Pfades aus"
-#: ../svnlook/svnlook.c:165
+#: ../svnlook/svnlook.c:164
msgid "be verbose"
msgstr "ausführliche Meldungen"
-#: ../svnlook/svnlook.c:174
+#: ../svnlook/svnlook.c:173
msgid ""
"Specify differencing options for external diff or\n"
" internal diff. Default: '-u'. Options are\n"
@@ -14383,7 +14276,7 @@ msgstr ""
" -p (--show-c-function):\n"
" Zeigt C-Funktionsname in Diff-Ausgabe."
-#: ../svnlook/svnlook.c:205
+#: ../svnlook/svnlook.c:204
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -14393,7 +14286,7 @@ msgstr ""
"\n"
"Gibt den Autor aus.\n"
-#: ../svnlook/svnlook.c:210
+#: ../svnlook/svnlook.c:209
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -14404,7 +14297,7 @@ msgstr ""
"Gibt den Inhalt einer Datei aus. Ein vorangestellter »/« im DATEI_PFAD ist\n"
"optional.\n"
-#: ../svnlook/svnlook.c:215
+#: ../svnlook/svnlook.c:214
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -14414,7 +14307,7 @@ msgstr ""
"\n"
"Gibt die geänderten Pfade aus.\n"
-#: ../svnlook/svnlook.c:220
+#: ../svnlook/svnlook.c:219
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -14424,7 +14317,7 @@ msgstr ""
"\n"
"Gibt das Datum aus.\n"
-#: ../svnlook/svnlook.c:225
+#: ../svnlook/svnlook.c:224
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -14434,7 +14327,7 @@ msgstr ""
"\n"
"Gibt Unterschiede von geänderten Dateien oder Eigenschaften im GNU-Stil aus.\n"
-#: ../svnlook/svnlook.c:232
+#: ../svnlook/svnlook.c:231
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -14446,7 +14339,7 @@ msgstr ""
"Gibt diejenigen Pfade aus, die (durch Eigenschaftsmodifikationen) selbst\n"
"bzw. deren Dateien geändert wurden.\n"
-#: ../svnlook/svnlook.c:238
+#: ../svnlook/svnlook.c:237
msgid ""
"usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -14458,7 +14351,7 @@ msgstr ""
"Gibt die Größe (in Bytes) der in PFAD_IN_ARCHIV befindlichen Datei\n"
"aus, wie sie im Projektarchiv vorliegt.\n"
-#: ../svnlook/svnlook.c:244
+#: ../svnlook/svnlook.c:243
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -14468,7 +14361,7 @@ msgstr ""
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: ../svnlook/svnlook.c:249
+#: ../svnlook/svnlook.c:248
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -14480,7 +14373,7 @@ msgstr ""
"Gibt Informationen über die Historie eines Pfades im Projektarchiv aus (oder\n"
"über das Basisverzeichnis, falls kein Pfad angegeben wurde.)\n"
-#: ../svnlook/svnlook.c:255
+#: ../svnlook/svnlook.c:254
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -14490,7 +14383,7 @@ msgstr ""
"\n"
"Gibt den Autor, das Datum, die Größe der Logmeldung und die Logmeldung aus.\n"
-#: ../svnlook/svnlook.c:260
+#: ../svnlook/svnlook.c:259
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -14500,7 +14393,7 @@ msgstr ""
"\n"
"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe diese.\n"
-#: ../svnlook/svnlook.c:265
+#: ../svnlook/svnlook.c:264
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -14510,7 +14403,7 @@ msgstr ""
"\n"
"Gibt die Logmeldung aus.\n"
-#: ../svnlook/svnlook.c:270
+#: ../svnlook/svnlook.c:269
msgid ""
"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
@@ -14524,7 +14417,7 @@ msgstr ""
"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n"
"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n"
-#: ../svnlook/svnlook.c:279
+#: ../svnlook/svnlook.c:278
msgid ""
"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
" 2. svnlook proplist --revprop REPOS_PATH\n"
@@ -14540,7 +14433,7 @@ msgstr ""
"Mit --revprop werden Revisionseigenschaften ausgegeben.\n"
"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n"
-#: ../svnlook/svnlook.c:290
+#: ../svnlook/svnlook.c:289
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -14552,7 +14445,7 @@ msgstr ""
"Gibt den Baum beginnend bei PFAD_IN_PROJ aus (falls angegeben, sonst an der\n"
"Basis des Baumes), wobei optional die IDs der Knotenrevisionen ausgegeben werden.\n"
-#: ../svnlook/svnlook.c:296
+#: ../svnlook/svnlook.c:295
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -14562,7 +14455,7 @@ msgstr ""
"\n"
"Gibt die UUID des Projektarchivs aus.\n"
-#: ../svnlook/svnlook.c:301
+#: ../svnlook/svnlook.c:300
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -14572,28 +14465,28 @@ msgstr ""
"\n"
"Gibt die neueste Revisionsnummer aus.\n"
-#: ../svnlook/svnlook.c:861
+#: ../svnlook/svnlook.c:860
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Kopiert: %s (von Rev %ld, %s)\n"
-#: ../svnlook/svnlook.c:929
+#: ../svnlook/svnlook.c:928
msgid "Added"
msgstr "Hinzugefügt"
-#: ../svnlook/svnlook.c:930
+#: ../svnlook/svnlook.c:929
msgid "Deleted"
msgstr "Gelöscht"
-#: ../svnlook/svnlook.c:931
+#: ../svnlook/svnlook.c:930
msgid "Modified"
msgstr "Geändert"
-#: ../svnlook/svnlook.c:932
+#: ../svnlook/svnlook.c:931
msgid "Index"
msgstr "Index"
-#: ../svnlook/svnlook.c:943
+#: ../svnlook/svnlook.c:942
msgid ""
"(Binary files differ)\n"
"\n"
@@ -14601,30 +14494,30 @@ msgstr ""
"(Binärdateien sind unterschiedlich)\n"
"\n"
-#: ../svnlook/svnlook.c:1222
+#: ../svnlook/svnlook.c:1221
msgid "unknown"
msgstr "unbekannt"
-#: ../svnlook/svnlook.c:1279
+#: ../svnlook/svnlook.c:1278
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transaktion »%s« ist nicht von einer Revision abgeleitet, wie eigenartig"
-#: ../svnlook/svnlook.c:1422
+#: ../svnlook/svnlook.c:1421
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "»%s« ist eine URL, sollte vermutlich ein Pfad sein"
-#: ../svnlook/svnlook.c:1445 ../svnlook/svnlook.c:1468
+#: ../svnlook/svnlook.c:1444 ../svnlook/svnlook.c:1467
#, c-format
msgid "Path '%s' is not a file"
msgstr "Pfad »%s« ist keine Datei"
-#: ../svnlook/svnlook.c:1604
+#: ../svnlook/svnlook.c:1603
msgid "History item limit reached"
msgstr "Beschränkung für Anzahl der Verlaufselemente erreicht"
-#: ../svnlook/svnlook.c:1623
+#: ../svnlook/svnlook.c:1622
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -14633,7 +14526,7 @@ msgstr ""
"REVISION PFAD <ID>\n"
"-------- ---------\n"
-#: ../svnlook/svnlook.c:1628
+#: ../svnlook/svnlook.c:1627
#, c-format
msgid ""
"REVISION PATH\n"
@@ -14642,36 +14535,36 @@ msgstr ""
"REVISION PFAD\n"
"-------- ----\n"
-#: ../svnlook/svnlook.c:1700
+#: ../svnlook/svnlook.c:1699
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Eigenschaft »%s« wurde in Revision %ld nicht gefunden"
-#: ../svnlook/svnlook.c:1709
+#: ../svnlook/svnlook.c:1708
#, c-format
msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld"
msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden und nicht vom übergeordneten Element geerbt"
-#: ../svnlook/svnlook.c:1715
+#: ../svnlook/svnlook.c:1714
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Revision %ld nicht gefunden"
-#: ../svnlook/svnlook.c:1723
+#: ../svnlook/svnlook.c:1722
#, c-format
msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s"
msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden und nicht vom übergeordneten Element geerbt"
-#: ../svnlook/svnlook.c:1729
+#: ../svnlook/svnlook.c:1728
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Eigenschaft »%s« wurde im Pfad »%s« in Transaktion %s nicht gefunden"
-#: ../svnlook/svnlook.c:2064
+#: ../svnlook/svnlook.c:2063
msgid "Missing repository path argument"
msgstr "Fehlende Option für Pfad des Projektarchivs"
-#: ../svnlook/svnlook.c:2216
+#: ../svnlook/svnlook.c:2215
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -14693,7 +14586,7 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnlook/svnlook.c:2294
+#: ../svnlook/svnlook.c:2293
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -14708,50 +14601,50 @@ msgstr[1] ""
"Kommentar (%i Zeilen):\n"
"%s\n"
-#: ../svnlook/svnlook.c:2346
+#: ../svnlook/svnlook.c:2345
#, c-format
msgid "Missing propname argument"
msgstr "Fehlender PROPNAME Parameter"
-#: ../svnlook/svnlook.c:2347
+#: ../svnlook/svnlook.c:2346
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Eigenschaftsname und Pfad im Projektarchiv nicht angegeben"
-#: ../svnlook/svnlook.c:2353
+#: ../svnlook/svnlook.c:2352
msgid "Missing propname or repository path argument"
msgstr "Eigenschaftsname oder Pfad im Projektarchiv nicht angegeben"
-#: ../svnlook/svnlook.c:2517
+#: ../svnlook/svnlook.c:2516
msgid "Invalid revision number supplied"
msgstr "Ungültige Revisionsnummer angegeben"
-#: ../svnlook/svnlook.c:2629
+#: ../svnlook/svnlook.c:2628
msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist"
msgstr ""
"Die Parameter »--transaction« (-t) und »--revision« (-r) können nicht\n"
"gleichzeitig angegeben werden"
-#: ../svnlook/svnlook.c:2636
+#: ../svnlook/svnlook.c:2635
msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option"
msgstr "Die Option »--show-inherited-props« kann nicht zusammen mit der Option »--revprop« verwendet werden"
-#: ../svnlook/svnlook.c:2695
+#: ../svnlook/svnlook.c:2694
#, c-format
msgid "Try 'svnadmin verify' instead.\n"
msgstr "Versuchen Sie stattdessen »svnadmin verify«.\n"
-#: ../svnlook/svnlook.c:2729
+#: ../svnlook/svnlook.c:2728
#, c-format
msgid "Repository argument required\n"
msgstr "Projektarchiv Parameter erforderlich\n"
-#: ../svnlook/svnlook.c:2738
+#: ../svnlook/svnlook.c:2737
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte\n"
-#: ../svnlook/svnlook.c:2790
+#: ../svnlook/svnlook.c:2789
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -14760,11 +14653,11 @@ msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnlook help %s« ein, um Hilfe zu erhalten.\n"
-#: ../svnlook/svnlook.c:2833
+#: ../svnlook/svnlook.c:2832
msgid "Try 'svnlook help' for more info"
msgstr "Versuchen Sie »svnlook help« für weitere Informationen"
-#: ../svnmucc/svnmucc.c:927
+#: ../svnmucc/svnmucc.c:926
msgid ""
"Subversion multiple URL command client\n"
"usage: svnmucc ACTION...\n"
@@ -14848,11 +14741,11 @@ msgstr ""
" --no-auth-cache : speichert Anmeldeinformationen nicht zwischen\n"
" --version : gibt Versionsinformationen aus\n"
-#: ../svnmucc/svnmucc.c:1003
+#: ../svnmucc/svnmucc.c:1002
msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive"
msgstr "--message (-m), --file (-F), und --with-revprop=svn:log schließen sich gegenseitig aus"
-#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:327
+#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:326
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
@@ -14901,8 +14794,8 @@ msgstr ""
msgid "dump incrementally"
msgstr "Inkrementell ausgeben"
-#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:281
-#: ../svnversion/svnversion.c:139
+#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:282
+#: ../svnversion/svnversion.c:138
msgid "display this help"
msgstr "Hilfe anzeigen"
@@ -14961,58 +14854,58 @@ msgstr "Konnte die Liste der SASL-Mechan
msgid "Couldn't obtain the authenticated username"
msgstr "Kann den angemeldeten Benutzername nicht erhalten"
-#: ../svnserve/serve.c:2058
+#: ../svnserve/serve.c:2043
msgid "Path is not a string"
msgstr "Pfad ist keine Zeichenkette"
-#: ../svnserve/serve.c:2215
+#: ../svnserve/serve.c:2200
msgid "Log revprop entry not a string"
msgstr "Log-Revisionseigenschaftseintrag ist keine Zeichenkette"
-#: ../svnserve/serve.c:2221
+#: ../svnserve/serve.c:2206
#, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Unbekanntes Revisionseigenschaftswort »%s« in Log-Kommando"
-#: ../svnserve/serve.c:2237
+#: ../svnserve/serve.c:2222
msgid "Log path entry not a string"
msgstr "Logpfadeintrag ist keine Zeichenkette"
-#: ../svnserve/svnserve.c:162
+#: ../svnserve/svnserve.c:161
msgid "daemon mode"
msgstr "Daemonmodus"
-#: ../svnserve/svnserve.c:163
+#: ../svnserve/svnserve.c:162
msgid "inetd mode"
msgstr "Inetd-Modus"
-#: ../svnserve/svnserve.c:164
+#: ../svnserve/svnserve.c:163
msgid "tunnel mode"
msgstr "Tunnelmodus"
-#: ../svnserve/svnserve.c:165
+#: ../svnserve/svnserve.c:164
msgid "listen-once mode (useful for debugging)"
msgstr "»listen-once«-Modus (nützlich zum Debuggen)"
-#: ../svnserve/svnserve.c:168
+#: ../svnserve/svnserve.c:167
msgid "Windows service mode (Service Control Manager)"
msgstr "Windows-Service-Modus (Service Control Manager)"
-#: ../svnserve/svnserve.c:170
+#: ../svnserve/svnserve.c:169
msgid "root of directory to serve"
msgstr "Basis des bereitzustellenden Verzeichnisses"
-#: ../svnserve/svnserve.c:172
+#: ../svnserve/svnserve.c:171
msgid "force read only, overriding repository config file"
msgstr ""
"Erzwinge Schreibschutz. Setze Einstellung in der\n"
"Projektarchivkonfiguration außer Kraft."
-#: ../svnserve/svnserve.c:174
+#: ../svnserve/svnserve.c:173
msgid "read configuration from file ARG"
msgstr "Konfiguration aus Datei PAR lesen"
-#: ../svnserve/svnserve.c:177
+#: ../svnserve/svnserve.c:176
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, service, listen-once]"
@@ -15020,7 +14913,7 @@ msgstr ""
"abzuhörender Port. Die Vorgabe ist 3690.\n"
" [Modus: daemon, service, listen-once]"
-#: ../svnserve/svnserve.c:181
+#: ../svnserve/svnserve.c:180
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, listen-once]"
@@ -15028,7 +14921,7 @@ msgstr ""
"abzuhörender Port. Die Vorgabe ist 3690.\n"
" [Modus: daemon, listen-once]"
-#: ../svnserve/svnserve.c:187
+#: ../svnserve/svnserve.c:186
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -15038,7 +14931,7 @@ msgstr ""
" Als Vorgabe hört svnserve auf allen Adressen.\n"
" [Modus: daemon, service, listen-once]"
-#: ../svnserve/svnserve.c:193
+#: ../svnserve/svnserve.c:192
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -15048,7 +14941,7 @@ msgstr ""
" Als Vorgabe hört svnserve auf allen Adressen.\n"
" [Modus: daemon, listen-once]"
-#: ../svnserve/svnserve.c:200
+#: ../svnserve/svnserve.c:199
msgid ""
"prefer IPv6 when resolving the listen hostname\n"
" [IPv4 is preferred by default. Using IPv4 and IPv6\n"
@@ -15061,7 +14954,7 @@ msgstr ""
" nicht unterstützt. Verwenden Sie bei Bedarf inetd\n"
" oder den Tunnel-Modus."
-#: ../svnserve/svnserve.c:208
+#: ../svnserve/svnserve.c:207
msgid ""
"compression level to use for network transmissions\n"
" [0 .. no compression, 5 .. default, \n"
@@ -15071,19 +14964,21 @@ msgstr ""
" [0 .. keine Kompression, 5 .. Vorgabe, \n"
" 9 .. maximale Kompression]"
-#: ../svnserve/svnserve.c:214
-#, fuzzy
+#: ../svnserve/svnserve.c:213
msgid ""
"size of the extra in-memory cache in MB used to\n"
" minimize redundant operations.\n"
-" Default is 16.\n"
+" Default is 128 for threaded and 16 for non-\n"
+" threaded mode.\n"
" [used for FSFS repositories only]"
msgstr ""
"Größe des extra Zwischenspeichers im RAM in MB zur\n"
-" Minimierung redundanter Operationen. Vorgabe: 16.\n"
-" [nur für FSFS-Projektarchive verwendet]"
+" Minimierung redundanter Operationen.\n"
+" Vorgabe ist 128 für mehrere Threads\n"
+" und 16 für einen einzigen Thread.\n"
+" [nur für FSFS-Projektarchive verwendet]"
-#: ../svnserve/svnserve.c:222
+#: ../svnserve/svnserve.c:223
msgid ""
"enable or disable caching of deltas between older\n"
" revisions.\n"
@@ -15095,7 +14990,7 @@ msgstr ""
" Vorgabe ist »no«.\n"
" [nur für FSFS-Projektarchive verwendet]"
-#: ../svnserve/svnserve.c:230
+#: ../svnserve/svnserve.c:231
msgid ""
"enable or disable caching of file contents\n"
" Default is yes.\n"
@@ -15105,7 +15000,7 @@ msgstr ""
" Vorgabe ist »yes«.\n"
" [nur für FSFS-Projektarchive verwendet]"
-#: ../svnserve/svnserve.c:236
+#: ../svnserve/svnserve.c:237
msgid ""
"enable or disable caching of revision properties.\n"
" Consult the documentation before activating this.\n"
@@ -15117,7 +15012,7 @@ msgstr ""
" Vorgabe ist »no«.\n"
" [nur für FSFS-Projektarchive verwendet]"
-#: ../svnserve/svnserve.c:244
+#: ../svnserve/svnserve.c:245
msgid ""
"Optimize network handling based on the assumption\n"
" that most clients are connected with a bitrate of\n"
@@ -15131,11 +15026,11 @@ msgstr ""
#. ### Making the assumption here that WIN32 never has fork and so
#. * ### this option never exists when --service exists.
-#: ../svnserve/svnserve.c:254
+#: ../svnserve/svnserve.c:255
msgid "use threads instead of fork [mode: daemon]"
msgstr "Verwende Threads anstelle von »fork« [Modus: daemon]"
-#: ../svnserve/svnserve.c:258
+#: ../svnserve/svnserve.c:259
msgid ""
"run in foreground (useful for debugging)\n"
" [mode: daemon]"
@@ -15143,7 +15038,7 @@ msgstr ""
"Im Vordergrund starten (nützlich zum Debuggen)\n"
" [Modus: daemon]"
-#: ../svnserve/svnserve.c:262
+#: ../svnserve/svnserve.c:263
msgid ""
"handle one connection at a time in the parent process\n"
" (useful for debugging)"
@@ -15151,11 +15046,11 @@ msgstr ""
"Bearbeitet im Elternprozess nur eine eingegende Verbindung gleichzeitig\n"
" (nützlich zum Debuggen)"
-#: ../svnserve/svnserve.c:266
+#: ../svnserve/svnserve.c:267
msgid "svnserve log file"
msgstr "Protokolldatei von svnserve"
-#: ../svnserve/svnserve.c:269
+#: ../svnserve/svnserve.c:270
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once, service]"
@@ -15163,7 +15058,7 @@ msgstr ""
"Schreibe Server-Prozess-ID in Datei PAR\n"
" [Modus: daemon, listen-once, service]"
-#: ../svnserve/svnserve.c:273
+#: ../svnserve/svnserve.c:274
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once]"
@@ -15171,7 +15066,7 @@ msgstr ""
"Schreibe Server-Prozess-ID in Datei PAR\n"
" [Modus: daemon, listen-once]"
-#: ../svnserve/svnserve.c:278
+#: ../svnserve/svnserve.c:279
msgid ""
"tunnel username (default is current uid's name)\n"
" [mode: tunnel]"
@@ -15179,7 +15074,7 @@ msgstr ""
"Tunnel-Benutzername (Vorgabe ist der Name zur aktuellen UID)\n"
" [Modus: tunnel]"
-#: ../svnserve/svnserve.c:283
+#: ../svnserve/svnserve.c:284
msgid ""
"virtual host mode (look for repo in directory\n"
" of provided hostname)"
@@ -15187,12 +15082,12 @@ msgstr ""
"Virtual-Host-Modus (Sucht nach Projektarchiv dem Verzeichnis\n"
" das dem übertragenen Hostnamen entspricht)"
-#: ../svnserve/svnserve.c:300
+#: ../svnserve/svnserve.c:301
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Geben Sie »%s --help« für weitere Hilfe ein.\n"
-#: ../svnserve/svnserve.c:310
+#: ../svnserve/svnserve.c:311
msgid ""
"usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
"\n"
@@ -15202,7 +15097,7 @@ msgstr ""
"\n"
"Gültige Optionen:\n"
-#: ../svnserve/svnserve.c:316
+#: ../svnserve/svnserve.c:317
msgid ""
"usage: svnserve [-d | -i | -t | -X] [options]\n"
"\n"
@@ -15212,7 +15107,7 @@ msgstr ""
"\n"
"Gültige Optionen:\n"
-#: ../svnserve/svnserve.c:344
+#: ../svnserve/svnserve.c:345
msgid ""
"\n"
"Cyrus SASL authentication is available.\n"
@@ -15265,12 +15160,12 @@ msgstr "Kann Adressinformation nicht erm
#: ../svnserve/svnserve.c:947
#, c-format
msgid "Can't create server socket"
-msgstr "Kann Server-Socket nicht erzeugen"
+msgstr "Kann Serververbindung nicht erzeugen"
#: ../svnserve/svnserve.c:958
#, c-format
msgid "Can't bind server socket"
-msgstr "Kann Server-Socket nicht anbinden"
+msgstr "Kann Serververbindung nicht binden"
#: ../svnserve/svnserve.c:1056
#, c-format
@@ -15312,7 +15207,7 @@ msgstr "Konnte nicht mit dem Service Con
msgid "The service failed to start; an internal error occurred while starting the service"
msgstr "Der Dienst konnte nicht gestartet werden; ein interner Fehler trat beim Starten des Dienstes auf"
-#: ../svnsync/svnsync.c:92
+#: ../svnsync/svnsync.c:91
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -15356,7 +15251,7 @@ msgstr ""
"Anders ausgedrückt stellt das Zielprojektarchiv einen Spiegel des\n"
"Quellprojektarchivs dar, auf den nur lesend zugegriffen werden darf.\n"
-#: ../svnsync/svnsync.c:118
+#: ../svnsync/svnsync.c:117
msgid ""
"usage: svnsync synchronize DEST_URL [SOURCE_URL]\n"
"\n"
@@ -15380,7 +15275,7 @@ msgstr ""
"Benutzer oder Administratoren Schreibzugriff auf ZIEL_URL haben.\n"
"\n"
-#: ../svnsync/svnsync.c:131
+#: ../svnsync/svnsync.c:130
msgid ""
"usage:\n"
"\n"
@@ -15424,7 +15319,7 @@ msgstr ""
"und ist gleichbedeutend mit der Angabe der Option »-r PAR1[:PAR2]«\n"
# CHECKME: s/destination/source/?
-#: ../svnsync/svnsync.c:152
+#: ../svnsync/svnsync.c:151
msgid ""
"usage: svnsync info DEST_URL\n"
"\n"
@@ -15436,7 +15331,7 @@ msgstr ""
"Gibt Informationen über das Zielprojektarchiv der Synchronisation aus,\n"
"das sich unter ZIEL_URL befindet.\n"
-#: ../svnsync/svnsync.c:158
+#: ../svnsync/svnsync.c:157
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -15446,11 +15341,11 @@ msgstr ""
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: ../svnsync/svnsync.c:168
+#: ../svnsync/svnsync.c:167
msgid "print as little as possible"
msgstr "So wenig wie möglich ausgeben"
-#: ../svnsync/svnsync.c:170
+#: ../svnsync/svnsync.c:169
msgid ""
"operate on revision ARG (or range ARG1:ARG2)\n"
" A revision argument can be one of:\n"
@@ -15462,11 +15357,11 @@ msgstr ""
" ZAHL Revisionsnummer\n"
" »HEAD« neueste im Projektarchiv"
-#: ../svnsync/svnsync.c:178
+#: ../svnsync/svnsync.c:177
msgid "allow a non-empty destination repository"
msgstr "erlaubt nicht-leeres Zielprojektarchiv"
-#: ../svnsync/svnsync.c:190
+#: ../svnsync/svnsync.c:189
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
@@ -15474,7 +15369,7 @@ msgstr ""
"gibt einen Benutzernamen PAR an (veraltet;\n"
" siehe --source-username und --sync-username)"
-#: ../svnsync/svnsync.c:194
+#: ../svnsync/svnsync.c:193
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -15482,24 +15377,24 @@ msgstr ""
"gibt ein Passwort PAR an (veraltet;\n"
" siehe --source-password und --sync-password)"
-#: ../svnsync/svnsync.c:204
+#: ../svnsync/svnsync.c:203
msgid "connect to source repository with username ARG"
msgstr "verbindet mit dem Quellprojektarchiv mit dem Benutzernamen PAR"
-#: ../svnsync/svnsync.c:206
+#: ../svnsync/svnsync.c:205
msgid "connect to source repository with password ARG"
msgstr "verbindet mit dem Quellprojektarchiv mit dem Passwort PAR"
# FIXME: s/sync/synced/, option sync-username
-#: ../svnsync/svnsync.c:208
+#: ../svnsync/svnsync.c:207
msgid "connect to sync repository with username ARG"
msgstr "verbindet mit synchronisiertem Projektarchiv mit Benutzernamen PAR"
-#: ../svnsync/svnsync.c:210
+#: ../svnsync/svnsync.c:209
msgid "connect to sync repository with password ARG"
msgstr "verbindet mit synchronisiertem Projektarchiv mit Passwort PAR"
-#: ../svnsync/svnsync.c:222
+#: ../svnsync/svnsync.c:221
msgid ""
"convert translatable properties from encoding ARG\n"
" to UTF-8. If not specified, then properties are\n"
@@ -15509,7 +15404,7 @@ msgstr ""
" nach UTF-8. Wenn nicht angegeben, werden die\n"
" Eigenschaften als in UTF-8 kodiert angenommen."
-#: ../svnsync/svnsync.c:228
+#: ../svnsync/svnsync.c:227
msgid ""
"Disable built-in locking. Use of this option can\n"
" corrupt the mirror unless you ensure that no other\n"
@@ -15519,7 +15414,7 @@ msgstr ""
" kann Spiegelprojektarchive beschädigen, falls nicht sichergestellt ist,\n"
" dass keine andere Instanz von svnsync gleichzeitig läuft."
-#: ../svnsync/svnsync.c:234
+#: ../svnsync/svnsync.c:233
msgid ""
"Steal locks as necessary. Use, with caution,\n"
" if your mirror repository contains stale locks\n"
@@ -15530,120 +15425,120 @@ msgstr ""
" wenn das Spiegelprojektarchiv nicht mehr notwendige Sperren enthält\n"
" und nicht gleichzeitig von einer anderen svnsync-Instanz verwendet wird."
-#: ../svnsync/svnsync.c:357
+#: ../svnsync/svnsync.c:356
msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program"
msgstr "Zielserver unterstützt keine atomaren Änderungen von Revisionseigenschaften; Verwenden Sie entweder 1.7 oder ein externes Programm zum Sperren."
-#: ../svnsync/svnsync.c:371
+#: ../svnsync/svnsync.c:370
#, c-format
msgid "Stole lock previously held by '%s'\n"
msgstr "Zuvor von »%s« gehaltene Sperre gestohlen\n"
-#: ../svnsync/svnsync.c:460
+#: ../svnsync/svnsync.c:459
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Basis der Sitzung ist »%s«, aber die Basis des Projektarchivs ist »%s«"
-#: ../svnsync/svnsync.c:602
+#: ../svnsync/svnsync.c:601
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Kopierte Eigenschaften für Revision %ld (%s* Eigenschaften übergangen).\n"
-#: ../svnsync/svnsync.c:607
+#: ../svnsync/svnsync.c:606
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Eigenschaften für Revision %ld kopiert.\n"
-#: ../svnsync/svnsync.c:623
+#: ../svnsync/svnsync.c:622
#, c-format
msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n"
msgstr "HINWEIS: %s* Eigenschaften nach LF-Zeilenenden normalisiert (%d Revisionseigenschaften, %d Knoteneigenschaften).\n"
-#: ../svnsync/svnsync.c:753
+#: ../svnsync/svnsync.c:752
msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository"
msgstr "Das Zielprojektarchiv enthält schon eine Revisionsgeschichte. Sie können es mit »--allow-non-empty« versuchen, falls die Revisionen dieses Projektarchivs denen des Quellprojektarchivs genau entsprechen."
-#: ../svnsync/svnsync.c:762
+#: ../svnsync/svnsync.c:761
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Das Zielprojektarchiv synchronisiert bereits von »%s«"
-#: ../svnsync/svnsync.c:797
+#: ../svnsync/svnsync.c:796
msgid "Destination repository has more revisions than source repository"
msgstr "Zielprojektarchiv hat mehr Revisionen als Quellprojektarchiv"
-#: ../svnsync/svnsync.c:862 ../svnsync/svnsync.c:865 ../svnsync/svnsync.c:1518
-#: ../svnsync/svnsync.c:1525 ../svnsync/svnsync.c:1762
-#: ../svnsync/svnsync.c:1765 ../svnsync/svnsync.c:1809
+#: ../svnsync/svnsync.c:861 ../svnsync/svnsync.c:864 ../svnsync/svnsync.c:1517
+#: ../svnsync/svnsync.c:1524 ../svnsync/svnsync.c:1761
+#: ../svnsync/svnsync.c:1764 ../svnsync/svnsync.c:1808
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Pfad »%s« ist keine URL"
-#: ../svnsync/svnsync.c:892
+#: ../svnsync/svnsync.c:891
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Revision %ld übertragen.\n"
-#: ../svnsync/svnsync.c:935
+#: ../svnsync/svnsync.c:934
msgid "Destination repository has not been initialized"
msgstr "Zielprojektarchiv wurde noch nicht initialisiert"
-#: ../svnsync/svnsync.c:1301
+#: ../svnsync/svnsync.c:1300
#, c-format
-msgid "Commit created r%ld but should have created r%ld"
-msgstr "Übertragung erzeugte Revision r%ld, sollte aber r%ld erzeugen"
+msgid "Commit created rev %ld but should have created %ld"
+msgstr "Übertragung erzeugte Revision %ld, sollte aber %ld erzeugen"
-#: ../svnsync/svnsync.c:1416
+#: ../svnsync/svnsync.c:1415
#, c-format
msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?"
msgstr "Die aktuell kopierte Revision (%ld), zuletzt zusammengeführte Revision (%ld) und Ziel-HEAD (%ld) sind inkonsistent. Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?"
-#: ../svnsync/svnsync.c:1453
+#: ../svnsync/svnsync.c:1452
#, c-format
msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?"
msgstr "Ziel-HEAD (%ld) ist nicht die zuletzt zusammengeführte Revision (%ld). Haben Sie in das Ziel ohne Verwendung von svnsync übertragen?"
-#: ../svnsync/svnsync.c:1576 ../svnsync/svnsync.c:1581
+#: ../svnsync/svnsync.c:1575 ../svnsync/svnsync.c:1580
#, c-format
msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "Kann keine Revisionseigenschaften für eine Revision (%ld) kopieren, die noch nicht synchronisiert wurde"
-#: ../svnsync/svnsync.c:1645 ../svnsync/svnsync.c:1665
+#: ../svnsync/svnsync.c:1644 ../svnsync/svnsync.c:1664
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Ungültige Revisionsnummer (%ld)"
-#: ../svnsync/svnsync.c:1715
+#: ../svnsync/svnsync.c:1714
msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option"
msgstr "Revisionen dürfen nicht gleichzeitig durch Argumente in der Kommandozeile und die Option »--revision« (»-r«) angegeben werden"
-#: ../svnsync/svnsync.c:1723 ../svnsync/svnsync.c:2066
+#: ../svnsync/svnsync.c:1722 ../svnsync/svnsync.c:2065
#, c-format
msgid "Invalid revision range '%s' provided"
msgstr "Ungültiger Revisionsbereich »%s« angegeben"
-#: ../svnsync/svnsync.c:1822
+#: ../svnsync/svnsync.c:1821
#, c-format
msgid "Repository '%s' is not initialized for synchronization"
msgstr "Das Projektarchiv »%s« ist für die Synchronisation nicht initialisiert"
#. Print the info.
-#: ../svnsync/svnsync.c:1828
+#: ../svnsync/svnsync.c:1827
#, c-format
msgid "Source URL: %s\n"
msgstr "Quell-URL: %s\n"
-#: ../svnsync/svnsync.c:1830
+#: ../svnsync/svnsync.c:1829
#, c-format
msgid "Source Repository UUID: %s\n"
msgstr "UUID des Quellprojektarchivs: %s\n"
-#: ../svnsync/svnsync.c:1833
+#: ../svnsync/svnsync.c:1832
#, c-format
msgid "Last Merged Revision: %s\n"
msgstr "Letzte zusammengeführte Revision: %s\n"
-#: ../svnsync/svnsync.c:1850
+#: ../svnsync/svnsync.c:1849
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -15659,16 +15554,16 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnsync/svnsync.c:2114
+#: ../svnsync/svnsync.c:2113
msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n"
msgstr "Man kann nicht --username oder --password mit einem von --source-username, --source-password, --sync-username oder --sync-password verwenden.\n"
# TODO: Duplicated message!!!!
-#: ../svnsync/svnsync.c:2138
+#: ../svnsync/svnsync.c:2137
msgid "--disable-locking and --steal-lock are mutually exclusive"
msgstr "--disable-locking und --steal-lock schließen sich gegenseitig aus"
-#: ../svnsync/svnsync.c:2214
+#: ../svnsync/svnsync.c:2213
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -15677,16 +15572,16 @@ msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnsync help %s« für Hilfe ein.\n"
-#: ../svnsync/svnsync.c:2297
+#: ../svnsync/svnsync.c:2296
msgid "Try 'svnsync help' for more info"
msgstr "Versuchen Sie »svnsync help« für weitere Informationen"
-#: ../svnversion/svnversion.c:50
+#: ../svnversion/svnversion.c:49
#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Geben Sie »svnversion --help« für weitere Hilfe ein.\n"
-#: ../svnversion/svnversion.c:61
+#: ../svnversion/svnversion.c:60
#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
@@ -15754,41 +15649,2143 @@ msgstr ""
"\n"
"Gültige Optionen:\n"
-#: ../svnversion/svnversion.c:137
+#: ../svnversion/svnversion.c:136
msgid "do not output the trailing newline"
msgstr "gibt den anhängenden Zeilenumbruch nicht aus"
-#: ../svnversion/svnversion.c:138
+#: ../svnversion/svnversion.c:137
msgid "last changed rather than current revisions"
msgstr "gibt letzte geänderte statt aktueller Revisionen aus"
-#: ../svnversion/svnversion.c:246
+#: ../svnversion/svnversion.c:245
#, c-format
msgid "Unversioned symlink%s"
msgstr "Nicht versionierter symbolischer Link%s"
-#: ../svnversion/svnversion.c:249
+#: ../svnversion/svnversion.c:248
#, c-format
msgid "Unversioned directory%s"
msgstr "Nicht versioniertes Verzeichnis%s"
-#: ../svnversion/svnversion.c:252
+#: ../svnversion/svnversion.c:251
#, c-format
msgid "Unversioned file%s"
msgstr "Nicht versionierte Datei%s"
-#: ../svnversion/svnversion.c:258
+#: ../svnversion/svnversion.c:257
#, c-format
msgid "'%s' doesn't exist\n"
msgstr "»%s« existiert nicht\n"
-#: ../svnversion/svnversion.c:259
+#: ../svnversion/svnversion.c:258
#, c-format
msgid "'%s' is of unknown type\n"
msgstr "»%s« ist unbekannten Typs\n"
#. Local uncommitted modifications, no revision info was found.
-#: ../svnversion/svnversion.c:274
+#: ../svnversion/svnversion.c:273
#, c-format
msgid "Uncommitted local addition, copy or move%s"
msgstr "Nicht übertragenes lokal hinzugefügtes, kopiertes oder verschobenes Element%s"
+
+#~ msgid "Unexpected XML element found"
+#~ msgstr "Unerwartetes XML-Element gefunden"
+
+#~ msgid "Repository is corrupt"
+#~ msgstr "Projektarchiv ist beschädigt"
+
+#~ msgid "utf8proc library error"
+#~ msgstr "Fehler in utf8proc-Bibliothek"
+
+#~ msgid "Bad arguments to SQL operators GLOB or LIKE"
+#~ msgstr "Fehlerhafte Parameter für SQL-Operatoren GLOB oder LIKE"
+
+#~ msgid "Working copy at '%s' is already locked."
+#~ msgstr "Arbeitskopie »%s« ist schon gesperrt."
+
+#~ msgid "The XML response contains invalid XML"
+#~ msgstr "Die XML-Antwort enthält ungültiges XML"
+
+#~ msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'busted-proxy=yes' in your client configuration."
+#~ msgstr "DAV-Anfrage fehlgeschlagen: 411 Angabe zur Länge des Inhalts erforderlich. Der Server oder ein dazwischengeschalteter Proxy-Server akzeptiert Kodierung in Teilstücken nicht. Versuchen Sie, »busted-proxy=yes« in der Konfiguration des Clients."
+
+#~ msgid "XML stream truncated: closing '%s' missing"
+#~ msgstr "XML-Strom abgeschnitten: Abschließendes »%s« fehlt"
+
+#~ msgid "document element not found"
+#~ msgstr "Dokumenten-Element nicht gefunden"
+
+#~ msgid "XML stream truncated: %s"
+#~ msgstr "XML-Strom abgeschnitten: %s"
+
+#~ msgid "Missing XML attribute '%s' on '%s' element"
+#~ msgstr "Fehlendes XML-Attribut: »%s« in Element »%s«"
+
+#~ msgid "Items are nested too deeply"
+#~ msgstr "Elemente sind zu tief verschachtelt"
+
+#~ msgid "Word is too long"
+#~ msgstr "Wort ist zu lang"
+
+#~ msgid "Repository '%s' failed to verify"
+#~ msgstr "Überprüfung des Projektarchivs »%s« fehlgeschlagen"
+
+#~ msgid "Revision number longer than 10 digits '%s'"
+#~ msgstr "Revisionsnummer ist länger als 10 Ziffern »%s«"
+
+#~ msgid "Revision number too large '%s'"
+#~ msgstr "Revisionsnummer ist zu groß »%s«"
+
+#~ msgid "Invalid Unicode character U+%04lX"
+#~ msgstr "Ungültiges Unicode-Zeichen U+%04lX"
+
+#~ msgid "Cannot use a custom escape token in glob matching mode"
+#~ msgstr "Kann kein benutzerdefiniertes geschütztes Zeichen im Platzhalter-Suchmodus verwenden"
+
+#~ msgid "Escape token must be one character"
+#~ msgstr "Geschützes Zeichen muss ein einzelnes Zeichen sein"
+
+#~ msgid "Invalid escape character U+%04lX"
+#~ msgstr "Ungültiges geschütztes Zeichen U+%04lX"
+
+#~ msgid "Memory for processing UTF-8 data could not be allocated."
+#~ msgstr "Speicher für die Verarbeitung von UTF-8 Daten konnte nicht zugewiesen werden."
+
+#~ msgid "UTF-8 string is too long to be processed."
+#~ msgstr "UTF-8 Zeichenkette ist für die Verarbeitung zu lang."
+
+#~ msgid "Invalid UTF-8 string"
+#~ msgstr "Ungültige UTF-8 Zeichenkette"
+
+#~ msgid "Unassigned Unicode code point found in UTF-8 string."
+#~ msgstr "Nicht zugewiesener Unicode-Codepunkt in UTF-8 Zeichenkette gefunden."
+
+#~ msgid "Invalid options for UTF-8 processing chosen."
+#~ msgstr "Ungültige Optionen für die Verarbeitung von UTF-8 ausgewählt."
+
+#~ msgid "An unknown error occured while processing UTF-8 data."
+#~ msgstr "Ein unbekannter Fehler trat bei der Verarbeitung von UTF-8 Daten auf."
+
+#~ msgid "Working copy locked; if no other Subversion client is currently using the working copy, try running 'svn cleanup' without the --remove-unversioned and --remove-ignored options first."
+#~ msgstr "Arbeitskopie gesperrt; Wenn kein anderer Subversion-Client gerade die Arbeitskopie verwendet, versuchen Sie zuerst »svn cleanup« ohne die Optionen »--remove-unversioned« und »--remove-ignored« auszuführen."
+
+#~ msgid "Cannot remove unversioned or ignored items from something that is not a working copy"
+#~ msgstr "Kann ignorierte oder nicht versionierte Elemente nicht aus etwas entfernen, was keine Arbeitskopie ist"
+
+#~ msgid "accept my version of entire property (even non-conflicts) [mine-full]"
+#~ msgstr "Akzeptiert eigene Version für ganze Eigenschaft (alles, nicht nur Konflikte) [mine-full]"
+
+#~ msgid "accept their version of entire property (same) [theirs-full]"
+#~ msgstr "Akzeptiert fremde Version für ganze Eigenschaft (ebenso) [theirs-full]"
+
+#~ msgid "prepare for updating moved-away children, if any (recommended)"
+#~ msgstr "Bereitet die Aktualisierung von ggf. verschobenen Kindelementen vor (empfohlen)"
+
+#~ msgid "allow updating moved-away children with 'svn resolve' [mine-conflict]"
+#~ msgstr "Erlaubt die Aktualisierung von verschobenen Kindelementen mit »svn resolve« [mine-conflict]"
+
+#~ msgid "--log option valid only with --show-revs option"
+#~ msgstr "Option »--log« ist nur in Verbindung mit der Option »--show-revs« zulässig"
+
+#~ msgid "Performing cleanup on external item at '%s'.\n"
+#~ msgstr "Räume externen Verweis »%s« auf.\n"
+
+#~ msgid ""
+#~ "also operate on externals defined by\n"
+#~ " svn:externals properties"
+#~ msgstr ""
+#~ "Arbeitet auch auf externen Verweisen\n"
+#~ " (»svn:externals« Eigenschaften)"
+
+#~ msgid "show revision log message, author and date"
+#~ msgstr "Zeigt Logmeldung, Author und Datum der Revision an"
+
+#~ msgid "remove unversioned items"
+#~ msgstr "Entfernt nicht versionierte Objekte"
+
+#~ msgid "remove ignored items"
+#~ msgstr "Entfernt ignorierte Objekte"
+
+#~ msgid ""
+#~ "Send changes from your working copy to the repository.\n"
+#~ "usage: commit [PATH...]\n"
+#~ "\n"
+#~ " A log message must be provided, but it can be empty. If it is not\n"
+#~ " given by a --message or --file option, an editor will be started.\n"
+#~ " If any targets are (or contain) locked items, those will be\n"
+#~ " unlocked after a successful commit.\n"
+#~ "\n"
+#~ " If --include-externals is given, also commit file and directory\n"
+#~ " externals reached by recursion. Do not commit externals with a\n"
+#~ " fixed revision.\n"
+#~ msgstr ""
+#~ "Überträgt Änderungen Ihrer Arbeitskopie ins Projektarchiv.\n"
+#~ "Aufruf: commit [PFAD...]\n"
+#~ "\n"
+#~ " Eine Logmeldung muss angegeben werden; diese kann jedoch leer sein.\n"
+#~ " Wird sie nicht mittels einer --message- oder --file-Option übergeben, wird\n"
+#~ " ein Editor gestartet.\n"
+#~ " Falls Objekte gesperrt sind oder gesperrte Objekte enthalten, werden diese\n"
+#~ " nach einer erfolgreichen Übertragung entsperrt.\n"
+#~ "\n"
+#~ " Wenn --include-externals angegeben wird, werden auch Dateien und\n"
+#~ " Verzeichnisse in externen Verweisen übertragen, die durch Rekursion\n"
+#~ " erreicht werden. Übertragen Sie keine externen Verweise mit einer\n"
+#~ " festgelegten Revision.\n"
+
+#~ msgid "no progress (only errors to stderr)"
+#~ msgstr "keine Fortschrittsanzeige (nur Fehler auf die Standardfehlerausgabe)"
+
+#~ msgid "continue verification after detecting a corruption"
+#~ msgstr "Setzt die Verifikation nach einer entdeckten Beschädigung fort"
+
+#~ msgid ""
+#~ "usage: svnadmin info REPOS_PATH\n"
+#~ "\n"
+#~ "Print information about the repository at REPOS_PATH.\n"
+#~ msgstr ""
+#~ "Aufruf: svnadmin info ARCHIV_PFAD\n"
+#~ "\n"
+#~ "Gibt Informationen über das Projektarchiv in ARCHIV_PFAD aus.\n"
+
+#~ msgid ""
+#~ "Successfully opened repository '%s'.\n"
+#~ "Will now crash to simulate a crashing server process.\n"
+#~ msgstr ""
+#~ "Projektarchive »%s« erfolgreich geöffnet.\n"
+#~ "Es folgt ein Abbruch, um den Absturz eines Serverprozesses zu simulieren.\n"
+
+#~ msgid "* Error verifying revision %ld.\n"
+#~ msgstr "* Fehler bei der Verifikation der Revision %ld.\n"
+
+#~ msgid "Packing revision properties in shard %s..."
+#~ msgstr "Packe Revisionseigenschaften in Fragment %s ..."
+
+#~ msgid "Removing non-packed revision properties in shard %s..."
+#~ msgstr "Entferne nicht gepackte Revisionseigenschaften in Fragment %s ..."
+
+#~ msgid "Bumped repository format to %ld\n"
+#~ msgstr "Format des Projektarchivs erhöht auf: %ld\n"
+
+#~ msgid "Repository Format: %d\n"
+#~ msgstr "Format des Projektarchivs: %d\n"
+
+#~ msgid "Compatible With Version: %d.%d.0\n"
+#~ msgstr "Kompatibel mit Version: %d.%d.0\n"
+
+#~ msgid "Repository Capability: %s\n"
+#~ msgstr "Funktion des Projektarchivs: %s\n"
+
+#~ msgid "Filesystem Type: %s\n"
+#~ msgstr "Typ des Dateisystems: %s\n"
+
+#~ msgid "Filesystem Format: %d\n"
+#~ msgstr "Format des Dateisystems: %d\n"
+
+#~ msgid "FSFS Sharded: yes\n"
+#~ msgstr "FSFS Fragmentiert: ja\n"
+
+#~ msgid "FSFS Sharded: no\n"
+#~ msgstr "FSFS Fragmentiert: nein\n"
+
+#~ msgid "FSFS Shard Size: %d\n"
+#~ msgstr "FSFS Fragmentgröße: %d\n"
+
+#~ msgid "FSFS Shards Packed: %d/%d\n"
+#~ msgstr "FSFS Fragmente gepackt: %d/%d\n"
+
+# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf)
+#~ msgid "Configuration File: %s\n"
+#~ msgstr "Konfigurationsdatei: %s\n"
+
+#~ msgid ""
+#~ "usage: svnauth help [SUBCOMMAND...]\n"
+#~ "\n"
+#~ "Describe the usage of this program or its subcommands.\n"
+#~ msgstr ""
+#~ "Aufruf: svnauth help [UNTERBEFEHL...]\n"
+#~ "\n"
+#~ "Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
+
+#~ msgid ""
+#~ "usage: svnauth list\n"
+#~ "\n"
+#~ "List cached authentication credentials.\n"
+#~ msgstr ""
+#~ "Aufruf: svnauth list\n"
+#~ "\n"
+#~ "Gibt eine Liste gespeicherter Zugangsdaten aus.\n"
+
+#~ msgid "use auth cache in config directory ARG"
+#~ msgstr "Verwendet Speicherbereich für Zugangsdaten im Konfigurationsverzeichnis PAR"
+
+#~ msgid "show cached passwords"
+#~ msgstr "Zeigt gespeicherte Passwörter an"
+
+#~ msgid ""
+#~ "general usage: svnauth SUBCOMMAND [ARGS & OPTIONS ...]\n"
+#~ "Type 'svnauth help <subcommand>' for help on a specific subcommand.\n"
+#~ "Type 'svnauth --version' to see the program version and available\n"
+#~ "authentication credential caches.\n"
+#~ "\n"
+#~ "Available subcommands:\n"
+#~ msgstr ""
+#~ "Aufruf: svnauth UNTERBEFEHL [Optionen & Parameter ...]\n"
+#~ "Geben Sie »svnauth help <Unterbefehl>« ein, um Hilfe zu einem Unterbefehl\n"
+#~ " zu erhalten.\n"
+#~ "Geben Sie »svnauth --version« ein, um die Programmversion und die verfügbaren\n"
+#~ " Speicherbereiche für Zugangsdaten anzuzeigen\n"
+#~ "\n"
+#~ "Verfügbare Unterbefehle:\n"
+
+#~ msgid "Available authentication credential caches:\n"
+#~ msgstr "Verfügbare Speicherbereiche für Zugangsdaten:\n"
+
+#~ msgid "%s Wincrypt cache in %s\n"
+#~ msgstr "%s Wincrypt-Speicher in %s\n"
+
+#~ msgid "%s Plaintext cache in %s\n"
+#~ msgstr "%s Klartext-Speicher in %s\n"
+
+#~ msgid "Credential kind: %s\n"
+#~ msgstr "Art der Zugangsdaten: %s\n"
+
+#~ msgid "%s: [not shown]\n"
+#~ msgstr "%s: [nicht angezeigt]\n"
+
+#~ msgid "Try 'svnauth help' for more info"
+#~ msgstr "Geben Sie »svnauth help« für weitere Hilfe ein"
+
+#~ msgid "'--no-ignore' option only valid with '--remove-unversioned' option"
+#~ msgstr "Option »--no-ignore« ist nur in Verbindung mit der Option »--remove-unversioned« zulässig"
+
+#~ msgid ""
+#~ "Recursively clean up the working copy, removing locks, resuming\n"
+#~ "unfinished operations, etc.\n"
+#~ "usage: cleanup [WCPATH...]\n"
+#~ "\n"
+#~ " If the --remove-unversioned option is given, also remove unversioned\n"
+#~ " items within WCPATH. If --no-ignore is also given, disregard any\n"
+#~ " ignore patterns and remove ignored unversioned items as well.\n"
+#~ msgstr ""
+#~ "Räumt eine Arbeitskopie rekursiv auf, entfernt Sperren, führt\n"
+#~ "nicht beendete Operationen zu Ende usw.\n"
+#~ "Aufruf: cleanup [AKPFAD...]\n"
+#~ "\n"
+#~ " Wenn die Option --remove-unversioned angegeben ist, werden auch alle\n"
+#~ " nicht versionierten Objekte in AKPFAD entfernt. Wenn --no-ignore auch\n"
+#~ " angegeben ist, werden Einstellungen aus »global-ignores« sowie die\n"
+#~ " Eigenschaften »svn:ignore« und »svn:global-ignores«\" nicht beachtet\n"
+#~ " und ignorierte nicht versionierte Objekte ebenfalls entfernt.\n"
+
+#~ msgid ""
+#~ "Recursively clean up the working copy, removing locks, resuming\n"
+#~ "unfinished operations, etc.\n"
+#~ "usage: cleanup [WCPATH...]\n"
+#~ msgstr ""
+#~ "Räumt die Arbeitskopie rekursiv auf, gibt Sperren frei,\n"
+#~ "nimmt unvollständige Operationen wieder auf, usw.\n"
+#~ "Aufruf: cleanup [AKPFAD...]\n"
+
+#~ msgid "Invalid config: unknown http authtype '%s'"
+#~ msgstr "Ungültige Konfiguration: Unbekannter HTTP-Autorisationstyp »%s«"
+
+#~ msgid "OOM"
+#~ msgstr "Nicht genügend Speicher"
+
+#~ msgid "--- Checking branch relationship\n"
+#~ msgstr "--- Überprüfung des Verhältnisses der Zweige\n"
+
+#~ msgid "Source and target must be different but related branches"
+#~ msgstr "Quelle und Ziel müssen verschiedene aber verwandte Zweige sein"
+
+#~ msgid "Source and target have no common ancestor: '%s' and '%s'"
+#~ msgstr "Quelle und Ziel haben keinen gemeinsamen Vorfahren: »%s« und »%s«"
+
+#~ msgid "Pristine text not found"
+#~ msgstr "Ursprungstext nicht gefunden"
+
+#~ msgid "The pristine text with checksum '%s' was found in the DB but not on disk"
+#~ msgstr "Der Ursprungstext mit der Prüfsumme »%s« wurde in der Datenbank gefunden, aber nicht auf der Festplatte"
+
+#~ msgid "The tree '%s' is not single-revision and unswitched"
+#~ msgstr "Der Baum »%s« hat mehr als eine Revision oder umgestellte Unterbäume"
+
+#~ msgid "edit"
+#~ msgstr "editiert"
+
+#~ msgid "add"
+#~ msgstr "hinzugefügt"
+
+#~ msgid "replace"
+#~ msgstr "ersetzt"
+
+#~ msgid "missing"
+#~ msgstr "fehlend"
+
+#~ msgid "prefer local change"
+#~ msgstr "Bevorzugt lokale Änderungen "
+
+#~ msgid "prefer incoming change"
+#~ msgstr "Bevorzugt empfangene Änderungen "
+
+#~ msgid "break the move, change move destination into a copy"
+#~ msgstr "Teilt die Verschiebung auf, wandelt Ziel der Verschiebung in eine Kopie um"
+
+#~ msgid "--- Calculating automatic merge\n"
+#~ msgstr "--- Berechnung der automatischen Zusammenführung\n"
+
+#~ msgid "The required merge is reintegrate-like, and the --record-only option cannot be used with this kind of merge"
+#~ msgstr "Die benötigte Zusammenführung sieht wie eine Reintegration aus, die Option »--record-only« kann mit dieser Art der Zusammenführung aber nicht verwendet werden"
+
+#~ msgid "The required merge is reintegrate-like, and the --depth option cannot be used with this kind of merge"
+#~ msgstr "Die benötigte Zusammenführung sieht wie eine Reintegration aus, die Option »--depth« kann mit dieser Art der Zusammenführung aber nicht verwendet werden"
+
+#~ msgid "The required merge is reintegrate-like, and the --force option cannot be used with this kind of merge"
+#~ msgstr "Die benötigte Zusammenführung sieht wie eine Reintegration aus, die Option »--force« kann mit dieser Art der Zusammenführung aber nicht verwendet werden"
+
+#~ msgid "The required merge is reintegrate-like, and the --allow-mixed-revisions option cannot be used with this kind of merge"
+#~ msgstr "Die benötigte Zusammenführung sieht wie eine Reintegration aus, die Option »--allow-mixed-revisions« kann mit dieser Art der Zusammenführung aber nicht verwendet werden"
+
+#~ msgid ""
+#~ "Restore pristine working copy file (undo most local edits).\n"
+#~ "usage: revert PATH...\n"
+#~ "\n"
+#~ " Note: this subcommand does not require network access, and resolves\n"
+#~ " any conflicted states.\n"
+#~ msgstr ""
+#~ "Stellt den ursprünglichen Inhalt einer Datei in der Arbeitskopie wieder her\n"
+#~ "(macht die meisten lokalen Änderungen rückgängig).\n"
+#~ "Aufruf: revert PFAD...\n"
+#~ "\n"
+#~ " Hinweis: Dieser Unterbefehl erfordert keinen Netzwerkzugriff und löst\n"
+#~ " Konfliktzustände auf.\n"
+
+#~ msgid ""
+#~ "usage: svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
+#~ "\n"
+#~ "Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
+#~ msgstr ""
+#~ "Aufruf: svnadmin freeze ARCHIV_PFAD PROGRAMM [PAR...]\n"
+#~ "\n"
+#~ "Führt PROGRAMM mit den Optionen PAR aus, während ARCHIV_PFAD mit einer Schreibsperre belegt wird.\n"
+
+#~ msgid "Path '%s' has no URL"
+#~ msgstr "Pfad »%s« hat keine URL"
+
+#~ msgid "merging...\n"
+#~ msgstr "Zusammenführung...\n"
+
+#~ msgid "The node '%s' is not in a working copy."
+#~ msgstr "Der Knoten »%s« ist nicht in einer Arbeitskopie."
+
+#~ msgid "Can't read stdin"
+#~ msgstr "Kann nicht aus Standardeingabe lesen"
+
+#, fuzzy
+#~ msgid ""
+#~ " youngest last repos.\n"
+#~ " common full tip of path of\n"
+#~ " ancestor merge branch branch\n"
+#~ "\n"
+#~ msgstr ""
+#~ " jüngster letzte neueste Projektarchiv-\n"
+#~ " gemeins. vollst. im pfade der\n"
+#~ " Vorgänger Merge Zweig Zweige\n"
+#~ "\n"
+
+#~ msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
+#~ msgstr "Quell URL »%s« ist aus einem fremden Projektarchiv; lasse sie als getrennte Arbeitskopie"
+
+#, fuzzy
+#~ msgid "Checksum doesn't match for '%s'"
+#~ msgstr "Prüfsummenfehler für »%s«"
+
+#~ msgid "calculating reintegrate merge...\n"
+#~ msgstr "Berechnung der Zusammenführung für Reintegration\n"
+
+#~ msgid "ignore ancestry when calculating merges"
+#~ msgstr "beim Zusammenführen Vorgänger ignorieren"
+
+#~ msgid "notice ancestry when calculating differences"
+#~ msgstr ""
+#~ "beim Berechnen von Differenzen Vorgänger\n"
+#~ " berücksichtigen"
+
+# FIXME: duplicated message (differs only in ".")
+#~ msgid "Conflict callback violated API: returned no results."
+#~ msgstr "Konflikt-Rückruffunktion verletzte die API: keine Ergebnisse wurden zurückgeliefert."
+
+#~ msgid "Conflict callback violated API: returned no merged file."
+#~ msgstr "Konflikt-Rückruffunktion verletzte die API: keine zusammengeführte Datei wurde zurückgeliefert."
+
+#~ msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
+#~ msgstr "Das Löschen eines Verzeichnisses mit Untereinträgen kann nur rekursiv übertragen werden"
+
+#~ msgid "Unknown entry kind for '%s'"
+#~ msgstr "»%s« hat einen unbekannten Eintragstyp"
+
+#~ msgid "Entry '%s' has unexpectedly changed special status"
+#~ msgstr "Der Spezialstatus von Eintrag »%s« hat sich unerwarteterweise geändert"
+
+#~ msgid "Entry for '%s' has no URL"
+#~ msgstr "Eintrag für »%s« hat keine URL"
+
+# CHECKME
+#~ msgid "'%s' is scheduled for addition within unversioned parent"
+#~ msgstr "»%s« ist zum Hinzufügen innerhalb einer nicht versionierten Struktur vorgesehen"
+
+#~ msgid "Entry for '%s' exists (though the working file is missing)"
+#~ msgstr "Eintrag für »%s« existiert (die Arbeitsdatei fehlt jedoch)"
+
+#~ msgid "Summarizing diff can only compare repository to repository"
+#~ msgstr "Zusammenfassender Vergleich kann nur ein Projektarchiv mit einem Projektarchiv vergleichen"
+
+#~ msgid "'%s' is not a URL"
+#~ msgstr "»%s« ist keine URL"
+
+#~ msgid "Server does not support retrieving information about the repository root"
+#~ msgstr "Server unterstützt die Abfrage von Informationen über die Projektarchivwurzel nicht"
+
+#~ msgid "URL '%s' non-existent in that revision"
+#~ msgstr "URL »%s« existiert nicht in dieser Revision"
+
+#~ msgid "URLs have no scheme ('%s' and '%s')"
+#~ msgstr "Die URLs haben kein Schema (»%s« und »%s«)"
+
+#~ msgid "URL has no scheme: '%s'"
+#~ msgstr "URL hat kein Schema: »%s«"
+
+#~ msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+#~ msgstr "Gemischte Zugriffsverfahren werden noch nicht unterstützt (»%s« and »%s«)"
+
+#~ msgid "Setting property recursively on non-local target '%s' is not supported"
+#~ msgstr "Das rekursive Setzen einer Eigenschaft für ein nicht lokales Ziel »%s« wird nicht unterstützt"
+
+#~ msgid "URL '%s' is not a child of repository root URL '%s'"
+#~ msgstr "Die URL »%s« ist kein Kind der Projektarchivwurzel-URL »%s«"
+
+#~ msgid "No newline at end of file"
+#~ msgstr "Kein Zeilenumbruch am Ende der Datei"
+
+#~ msgid "Can't grab FS mutex"
+#~ msgstr "Kann FS Mutex nicht greifen"
+
+#~ msgid "Can't ungrab FS mutex"
+#~ msgstr "Kann FS Mutex nicht loslassen"
+
+#~ msgid "Can't allocate FS mutex"
+#~ msgstr "Kann FS Mutex nicht anlegen"
+
+#~ msgid " expected: %s"
+#~ msgstr " erwartet: %s"
+
+#~ msgid " actual: %s"
+#~ msgstr "tatsächlich: %s"
+
+#, fuzzy
+#~ msgid "Attempt to obliterate '%s' using itself "
+#~ msgstr "Versuch, Deltas von »%s« gegen sich selber zu erstellen"
+
+#~ msgid "Bad ID in cache"
+#~ msgstr "Fehlerhafte ID im Zwischenspeicher"
+
+#~ msgid "Kindless noderev in cache"
+#~ msgstr "Nutzlose Knotenrevision im Zwischenspeicher"
+
+#~ msgid "Unknown kind for noderev in cache: '%c'"
+#~ msgstr "Unbekannte Art der Knotenrevision im Zwischenspeicher: »%c«"
+
+#~ msgid "Unterminated ID in cache"
+#~ msgstr "Nicht abgeschlossene ID im Zwischenspeicher"
+
+#~ msgid "Bogus ID '%s' in cache"
+#~ msgstr "Fehlerhafte ID »%s« im Zwischenspeicher"
+
+#~ msgid "No created path"
+#~ msgstr "Kein erzeugter Pfad"
+
+#~ msgid "Unknown node type in cache: '%c'"
+#~ msgstr "Unbekannter Knotentyp im Zwischenspeicher: »%c«"
+
+#~ msgid "Can't create FSFS write-lock mutex"
+#~ msgstr "Kann FSFS Schreibschutz-Mutex nicht anlegen"
+
+#~ msgid "Can't create FSFS txn-current mutex"
+#~ msgstr "Kann FSFS-txn-current-Mutex nicht anlegen"
+
+# CHECKME: s/txn list/txn-list/? Compare txn-current
+#~ msgid "Can't create FSFS txn list mutex"
+#~ msgstr "Kann FSFS-txn-list-Mutex nicht anlegen"
+
+#~ msgid "Revision file '%s' does not exist, and r%ld is not packed"
+#~ msgstr "Revisionsdatei »%s« existiert nicht und r%ld ist nicht gepackt"
+
+#~ msgid "Can't grab FSFS txn list mutex"
+#~ msgstr "Kann FSFS-txn-list-Mutex nicht greifen"
+
+#~ msgid "Can't ungrab FSFS txn list mutex"
+#~ msgstr "Kann FSFS-txn-list-Mutex nicht loslassen"
+
+#~ msgid "Can't grab FSFS mutex for '%s'"
+#~ msgstr "Kann FSFS-Mutex für »%s« nicht greifen"
+
+#~ msgid "Can't ungrab FSFS mutex for '%s'"
+#~ msgstr "Kann FSFS-Mutex für »%s« nicht loslassen"
+
+#~ msgid "Manifest offset too large"
+#~ msgstr "Manifest offset zu groß"
+
+#~ msgid "svndiff data requested non-existent source"
+#~ msgstr "svndiff-Daten verlangten nicht existierende Quelle"
+
+#~ msgid "svndiff requested position beyond end of stream"
+#~ msgstr "Von svndiff verlangte Position ist jenseits des Datenstromendes"
+
+#, fuzzy
+#~ msgid "Obliteration of already-packed revision is not supported"
+#~ msgstr "Annotieren der WORKING-Revision wird nicht unterstützt"
+
+#~ msgid "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)"
+#~ msgstr "Konnte die Versionsressourcen-URL nicht bestimmen (wird für einen Import oder, falls sie in den lokalen, zwischengespeicherten Eigenschaften fehlt, benötigt)"
+
+#~ msgid "File or directory '%s' is out of date; try updating"
+#~ msgstr "Datei oder Verzeichnis »%s« ist veraltet; versuchen Sie zu aktualisieren"
+
+#~ msgid "The CHECKOUT response did not contain a 'Location:' header"
+#~ msgstr "Die CHECKOUT-Antwort enthielt keinen »Location:« Kopf"
+
+#~ msgid "Could not save the URL of the version resource"
+#~ msgstr "Konnte die URL der versionierten Ressource nicht speichern"
+
+#~ msgid "Could not get content-type from response"
+#~ msgstr "Konnte »content-type« nicht aus der Antwort lesen"
+
+#~ msgid "Could not save file"
+#~ msgstr "Konnte Datei nicht sichern"
+
+#~ msgid "Server response missing the expected deadprop-count property"
+#~ msgstr "Die Serverantwort enthält die erwartete Eigenschaft »deadprop-count« nicht"
+
+# FIXME: collect messages!
+#~ msgid "Missing rev attr in target-revision element"
+#~ msgstr "Fehlendes Revisionsattribut in Element »target-revision«"
+
+#~ msgid "Missing path attr in resource element"
+#~ msgstr "Fehlendes Pfadattribut in Ressourcen-Element"
+
+#~ msgid "Missing rev attr in open-directory element"
+#~ msgstr "Fehlendes Revisionsattribut in Element »open-directory«"
+
+#~ msgid "Missing copyfrom-rev attr in add-directory element"
+#~ msgstr "Fehlendes Attribut »copyfrom-rev« in Element »add-directory«"
+
+#~ msgid "Missing rev attr in open-file element"
+#~ msgstr "Fehlendes Revisionsattribut in Element »open-file«"
+
+#~ msgid "Missing copyfrom-rev attr in add-file element"
+#~ msgstr "Fehlendes Attribut »copyfrom-rev« in Element »add-file«"
+
+#~ msgid "Missing name attr in set-prop element"
+#~ msgstr "Fehlendes Namensattribut in Element »set-prop«"
+
+#~ msgid "Missing name attr in remove-prop element"
+#~ msgstr "Fehlendes Namensattribut in Element »remove-prop«"
+
+#~ msgid "Unknown XML encoding: '%s'"
+#~ msgstr "Unbekannte XML Kodierung: »%s«"
+
+#~ msgid "REPORT response handling failed to complete the editor drive"
+#~ msgstr "Die Abwicklung der REPORT-Antwort konnte den Editorlauf nicht vollenden."
+
+#~ msgid "Failed to write full amount to stream"
+#~ msgstr "Konnte nicht alles in den Datenstrom schreiben"
+
+#~ msgid "The file-revs report didn't contain any revisions"
+#~ msgstr "Der Report »file-revs« enthielt keine Revisionen"
+
+#~ msgid "Server does not support date-based operations"
+#~ msgstr "Server unterstützt keine datumsbasierten Operationen"
+
+#~ msgid "Invalid server response to dated-rev request"
+#~ msgstr "Ungültige Antwort des Servers auf datierte Revisionsanfrage"
+
+#~ msgid "Expected a valid revnum and path"
+#~ msgstr "Erwartete eine gültige Revisionsnummer samt Pfad"
+
+#~ msgid "Incomplete lock data returned"
+#~ msgstr "Unvollständige Sperrdaten zurückgegeben"
+
+#~ msgid "Invalid creation date header value in response."
+#~ msgstr "Ungültiges Erzeugungsdatum im Header-Feld in Antwort."
+
+#~ msgid "Invalid timeout value"
+#~ msgstr "Ungültiger Timeout-Wert"
+
+#~ msgid "Failed to parse URI '%s'"
+#~ msgstr "Konnte URI »%s« nicht zerlegen"
+
+#~ msgid "Failed to fetch lock information"
+#~ msgstr "Konnte Sperrinformationen nicht ermitteln"
+
+#~ msgid "Missing name attr in revprop element"
+#~ msgstr "Fehlendes Namensattribut in Element »revprop«"
+
+#~ msgid "Protocol error: we told the server not to auto-merge any resources, but it said that '%s' was merged"
+#~ msgstr "Protokollfehler: Wir haben dem Server mitgeteilt, Ressourcen nicht automatisch zusammenzuführen, aber dieser behauptet, dass »%s« zusammengeführt wurde"
+
+#~ msgid "Internal error: there is an unknown parent (%d) for the 'DAV:response' element within the MERGE response"
+#~ msgstr "Interner Fehler: Es gibt ein unbekanntes Elternteil (%d) für das »DAV:response« Element innerhalb der MERGE-Antwort"
+
+#~ msgid "Protocol error: the MERGE response for the '%s' resource did not return all of the properties that we asked for (and need to complete the commit)"
+#~ msgstr "Protokollfehler: Die MERGE-Antwort für die »%s«-Ressource hat nicht alle angeforderten Eigenschaften zurück geliefert (und Übertragung muss beendet werden)"
+
+#~ msgid "The MERGE property response had an error status"
+#~ msgstr "Die MERGE-Eigenschaftsantwort hatte einen Fehlerstatus"
+
+#~ msgid "The OPTIONS response did not include the requested activity-collection-set; this often means that the URL is not WebDAV-enabled"
+#~ msgstr "Die OPTIONS-Antwort enthielt nicht das angeforderte »activity-collection-set«; dies heißt oft, dass die URL nicht WebDAV-fähig ist"
+
+#~ msgid "Failed to find label '%s' for URL '%s'"
+#~ msgstr "Marke »%s« für URL »%s« nicht gefunden"
+
+#~ msgid "'%s' was not present on the resource '%s'"
+#~ msgstr "»%s« existierte nicht für die Ressource »%s«"
+
+#~ msgid "Neon was unable to parse URL '%s'"
+#~ msgstr "Neon konnte die URL »%s« nicht zerlegen"
+
+#~ msgid "The path was not part of a repository"
+#~ msgstr "Der Pfad war kein Teil eines Projektarchivs"
+
+#~ msgid "No part of path '%s' was found in repository HEAD"
+#~ msgstr "Kein Teil des Pfades »%s« wurde in HEAD des Projektarchivs gefunden"
+
+#~ msgid "The VCC property was not found on the resource"
+#~ msgstr "Die VCC Eigenschaft wurde in der Ressource nicht gefunden"
+
+#~ msgid "The relative-path property was not found on the resource"
+#~ msgstr "Die »relative-path« Eigenschaft wurde in der Ressource nicht gefunden"
+
+#~ msgid "'DAV:baseline-collection' was not present on the baseline resource"
+#~ msgstr "»DAV:baseline-collection« ist nicht in der Baseline-Ressource enthalten"
+
+# TODO: proper translation for Baseline
+#~ msgid "'%s' was not present on the baseline resource"
+#~ msgstr "»%s« existierte nicht für die Baseline-Ressource"
+
+#~ msgid "Got apply-textdelta element without preceding add-file or open-file"
+#~ msgstr "Fand Element »apply-textdelta« ohne vorhergehendes »add-file« oder »open-file«"
+
+#~ msgid "Got close-file element without preceding add-file or open-file"
+#~ msgstr "Fand Element »close-file« ohne vorhergehendes »add-file« oder »open-file«"
+
+# FIXME: inkonsistent zu obigen Meldungen: open_directory statt opening a directory
+# (Wird Bezug zu Elementen in Dump hergestellt oder nicht?)
+#~ msgid "Got close-directory element without ever opening a directory"
+#~ msgstr "Fand Element »close-directory« ohne vorhergehendes Öffnen eines Verzeichnisses"
+
+#~ msgid "Got cdata content for a prop delete"
+#~ msgstr "Fand cdata-Inhalt für eine Eigenschaftslöschung"
+
+#~ msgid "PIN for token \"%s\" in slot \"%s\""
+#~ msgstr "PIN für Token »%s« in Slot »%s«"
+
+#~ msgid "Invalid config: illegal character in debug mask value"
+#~ msgstr "Ungültige Konfiguration: Illegales Zeichen in Debugmaske"
+
+#~ msgid "Module for accessing a repository via WebDAV protocol using Neon."
+#~ msgstr "Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels Neon."
+
+#~ msgid "URL '%s' is malformed or the scheme or host or path is missing"
+#~ msgstr "URL »%s« ist fehlerhaft oder das Schema, der Rechner oder Pfad fehlt"
+
+#~ msgid "Network socket initialization failed"
+#~ msgstr "Initialisierung der Netzwerkverbindung schlug fehl"
+
+#~ msgid "SSL is not supported"
+#~ msgstr "SSL wird nicht unterstützt"
+
+#~ msgid "Invalid config: unable to load PKCS#11 provider '%s'"
+#~ msgstr "Ungültige Konfiguration: PKCS#11-Anbieter »%s« kann nicht geladen werden"
+
+#~ msgid "Unsupported RA loader version (%d) for ra_neon"
+#~ msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_neon"
+
+#~ msgid "The request response contained at least one error"
+#~ msgstr "Die Antwort auf die Anfrage enthielt zumindest einen Fehler"
+
+#~ msgid "The response contains a non-conforming HTTP status line"
+#~ msgstr "Die Antwort enthält eine nicht konforme HTTP-Statuszeile"
+
+#~ msgid "Error setting property '%s': "
+#~ msgstr "Fehler beim Setzen der Eigenschaft »%s«: "
+
+# FIXME: missing translator comments!
+#~ msgid "Server sent unexpected return value (%d %s) in response to %s request for '%s'"
+#~ msgstr "Der Server hat einen unerwarteten Rückgabewert (%d %s) in Antwort auf die Anfrage %s für »%s« zurückgeliefert"
+
+#~ msgid "authorization failed: %s"
+#~ msgstr "Autorisierung schlug fehl: %s"
+
+#~ msgid "authorization failed"
+#~ msgstr "Autorisierung schlug fehl"
+
+#~ msgid "could not connect to server"
+#~ msgstr "Konnte keine Verbindung zum Server herstellen"
+
+#~ msgid "timed out waiting for server"
+#~ msgstr "Zeitüberschreitung beim Warten auf Server"
+
+#~ msgid "Can't calculate the request body size"
+#~ msgstr "Kann die Größe der Anfrage nicht berechnen"
+
+#~ msgid "The %s request returned invalid XML in the response: %s (%s)"
+#~ msgstr "Die %s-Anfrage gab in der Antwort ungültiges XML zurück: %s (%s)"
+
+#~ msgid "Error reading spooled %s request response"
+#~ msgstr "Fehler beim Lesen der Antwort auf die %s Anfrage von Festplatte"
+
+#~ msgid "Missing 'realm' attribute in Authorization header"
+#~ msgstr "Fehlendes Attribut »realm« in Autorisations-Header"
+
+# CHECKME: full stop in error message?
+#~ msgid "Incorrect response-digest in Authentication-Info header."
+#~ msgstr "Falsche Antwortnummer im Header der Authentifizierungs-Informationen."
+
+#~ msgid ""
+#~ "Initialization of the GSSAPI context failed.\n"
+#~ " %s\n"
+#~ " %s\n"
+#~ msgstr ""
+#~ "Initialisierung des GSSAPI-Kontextes schlug fehl.\n"
+#~ " %s\n"
+#~ " %s\n"
+
+#~ msgid "Location segment report failed on '%s'@'%ld'"
+#~ msgstr "Ortssegmentreport schlug auf »%s«@»%ld« fehl"
+
+#~ msgid "Error retrieving replay REPORT (%d)"
+#~ msgstr "Fehler beim Holen des Wiederholungs-REPORT (%d)"
+
+#~ msgid "Could not lookup hostname `%s'"
+#~ msgstr "Konnte Rechnernamen »%s« nicht nachschlagen"
+
+#~ msgid "The OPTIONS response did not include the requested resourcetype value"
+#~ msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert »resourcetype«"
+
+# CHECKME, has to match first %s in "local %s, incoming %s upon %s"
+#, fuzzy
+#~ msgid "Obliteration"
+#~ msgstr "blockiert"
+
+#~ msgid "Can't create pipe for hook '%s'"
+#~ msgstr "Kann »Pipe« für Aktion »%s« nicht anlegen"
+
+# CHECKME: non-inherited = losgelöst???
+#~ msgid "Can't make pipe read handle non-inherited for hook '%s'"
+#~ msgstr "Kann Pipe-Lese-Handle für Aktion »%s« nicht nicht-erbbar machen"
+
+#~ msgid "Can't make pipe write handle non-inherited for hook '%s'"
+#~ msgstr "Kann Pipe-Schreib-Handle für Aktion »%s« nicht nicht-erbbar machen"
+
+#~ msgid "Error closing write end of stderr pipe"
+#~ msgstr "Fehler beim Schließen des Schreib-Endes der Standardfehlerausgabe"
+
+#~ msgid "Error closing read end of stderr pipe"
+#~ msgstr "Fehler beim Schließen des Lese-Endes der Standardfehlerausgabe"
+
+#, fuzzy
+#~ msgid "Repository has not been enabled to accept obliteration"
+#~ msgstr "Für diese Operation wird Zugang zum Projektarchiv benötigt"
+
+#~ msgid "Creating pre-obliterate hook"
+#~ msgstr "Erzeuge Aktion »pre-obliterate«"
+
+#~ msgid "Creating post-obliterate hook"
+#~ msgstr "Erzeuge Aktion »post-obliterate«"
+
+#~ msgid "Can't grab DSO mutex"
+#~ msgstr "Kann DSO-Mutex nicht greifen"
+
+#~ msgid "Can't ungrab DSO mutex"
+#~ msgstr "Kann DSO-Mutex nicht loslassen"
+
+#~ msgid "NULL mergeinfo\n"
+#~ msgstr "Zusammenführungsinformationen sind NULL\n"
+
+#~ msgid "empty mergeinfo\n"
+#~ msgstr "Zusammenführungsinformationen sind leer\n"
+
+#~ msgid "Schema format %d not recognized"
+#~ msgstr "Schema-Format %d wird nicht erkannt"
+
+#~ msgid "Expected SQLite database not found: %s"
+#~ msgstr "Erwartete SQLite-Datenbank wurde nicht gefunden: %s"
+
+#~ msgid "Number '%s' is out of range '[%llu, %llu]'"
+#~ msgstr "Zahl »%s« ist außerhalb des zulässigen Bereichs »[%llu, %llu]«"
+
+#~ msgid "Number '%s' is out of range '[%lld, %lld]'"
+#~ msgstr "Zahl »%s« ist außerhalb des zulässigen Bereichs »[%lld, %lld]«"
+
+#~ msgid "Can't lock charset translation mutex"
+#~ msgstr "Kann das Semaphor zur Zeichensatzkonvertierung nicht sperren"
+
+#~ msgid "Can't unlock charset translation mutex"
+#~ msgstr "Kann das Semaphor zur Zeichensatzkonvertierung nicht freigeben"
+
+#~ msgid "Can't retrieve base revision for %s"
+#~ msgstr "Kann Basisrevision für »%s« nicht abfragen"
+
+#~ msgid ""
+#~ "Checksum mismatch for text base of '%s':\n"
+#~ " expected: %s\n"
+#~ " actual: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler für Textbasis von »%s«:\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "Node '%s' has no pristine base text"
+#~ msgstr "Knoten »%s« hat keine ursprüngliche Textbasis"
+
+#~ msgid "File '%s' has no text base"
+#~ msgstr "Datei »%s« hat keine Textbasis"
+
+#~ msgid "Cannot revert '%s': unsupported entry node kind"
+#~ msgstr "Kann »%s« nicht zurücksetzen: nicht unterstützter Eintragsknotentyp"
+
+#~ msgid "Cannot revert '%s': unsupported node kind in working copy"
+#~ msgstr "Kann »%s« nicht zurücksetzen: nicht unterstützter Knotentyp in Arbeitskopie"
+
+#~ msgid "'%s' is a directory, and thus cannot be a member of a changelist"
+#~ msgstr "»%s« ist ein Verzeichnis and kann deswegen nicht Element einer Änderungsliste sein"
+
+#~ msgid ""
+#~ "Trying to create property '%s' with value '%s',\n"
+#~ "but it has been locally deleted."
+#~ msgstr ""
+#~ "Versuch, die Eigenschaft »%s« mit dem Wert »%s« anzulegen,\n"
+#~ "aber die Eigenschaft wurde lokal bereits gelöscht."
+
+#~ msgid ""
+#~ "Trying to delete property '%s' with value '%s',\n"
+#~ "but it has been modified from '%s' to '%s'."
+#~ msgstr ""
+#~ "Versuch, die Eigenschaft »%s« mit dem Wert »%s« zu löschen,\n"
+#~ "aber der Wert wurde von »%s« nach »%s« geändert."
+
+#~ msgid ""
+#~ "Trying to delete property '%s' with value '%s',\n"
+#~ "but property with value '%s' is locally deleted."
+#~ msgstr ""
+#~ "Versuch, die Eigenschaft »%s« mit dem Wert »%s« zu löschen,\n"
+#~ "aber die Eigenschaft mit dem Wert »%s« wurde lokal gelöscht."
+
+#~ msgid ""
+#~ "Checksum mismatch indicates corrupt text base for file: '%s':\n"
+#~ " expected: %s\n"
+#~ " actual: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler ist Anzeichen für beschädigte Textbasis der Datei: »%s«\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "Failed to add directory '%s': a separate working copy with the same name already exists"
+#~ msgstr "Konnte Verzeichnis »%s« nicht hinzufügen: ein andere Arbeitskopie mit gleichem Namen existiert bereits"
+
+#~ msgid "Switched directory '%s' does not match expected URL '%s'"
+#~ msgstr "Umgestelltes Vereichnis »%s« entspricht nicht der erwarteten URL »%s«"
+
+#~ msgid "Failed to add directory '%s': a non-directory object of the same name already exists"
+#~ msgstr "Konnte Verzeichnis »%s« nicht hinzufügen: ein nicht-Verzeichnisobjekt mit demselben Namen existiert bereits"
+
+#~ msgid "Switched file '%s' does not match expected URL '%s'"
+#~ msgstr "Umgestellte Datei »%s« entspricht nicht der erwarteten URL »%s«"
+
+#~ msgid "Unrecognized node kind: '%s'"
+#~ msgstr "Unbekannter Knotentyp: »%s«"
+
+#~ msgid "Cannot upgrade with existing logs; please run 'svn cleanup' with Subversion 1.6"
+#~ msgstr "Kann die Arbeitskopie nicht in ein neues Format bringen; bitte führen Sie »svn cleanup« mit Subversion 1.6 aus"
+
+#~ msgid "The working copy '%s' is at format 18; use 'tools/dev/wc-ng/bump-to-19.py' to upgrade it"
+#~ msgstr "Die Arbeitskopie »%s« hat das Format 18; verwenden Sie »tools/dev/wc-ng/bump-to-19.py« um es in ein neues Format zu bringen"
+
+#~ msgid "Can't store properties for '%s' in '%s'."
+#~ msgstr "Kann Eigenschaftswert für »%s« nicht in »%s« speichern"
+
+#~ msgid "Could not find node '%s' for recording file information."
+#~ msgstr "Knoten »%s« für Aufzeichnung von Dateiinformationen nicht gefunden."
+
+#~ msgid "'%s' has no BASE_NODE"
+#~ msgstr "»%s« hat keinen »BASE_NODE«"
+
+#~ msgid "Error restoring text for '%s'"
+#~ msgstr "Fehler beim Wiederherstellen des Textes für »%s«"
+
+#~ msgid "Error processing post-commit work for '%s'"
+#~ msgstr "Fehler beim Verarbeiten der Arbeitsschritte nach Übertragung für »%s«"
+
+#~ msgid "svn: warning: The depth of this commit is '%s', but copied directories will regardless be committed with depth '%s'. You must remove unwanted children of those directories in a separate commit.\n"
+#~ msgstr "svn: Warnung: Die Tiefe dieser Übertragung ist »%s«, jedoch werden kopierte Verzeichnisse dennoch mit Tiefe »%s« übertragen. Sie müssen nicht gewollte Kinder dieser Verzeichnisse in einer gesonderten Übertragung entfernen.\n"
+
+#~ msgid "They want to delete the property, you want to change the value to '%s'.\n"
+#~ msgstr "Versuch, die Eigenschaft zu löschen, aber der Wert soll auf »%s« gesetzt werden.\n"
+
+#~ msgid "They want to change the property value to '%s', you want to delete the property.\n"
+#~ msgstr "Versuch, den Wert der Eigenschaft auf »%s« zu ändern, aber die Eigenschaft soll gelöscht werden.\n"
+
+# Once you change "Auswahl:" don't forget to adapt indentation of other strings!
+#~ msgid "Select: (p) postpone"
+#~ msgstr "Auswahl: (p) zurückstellen"
+
+#~ msgid ", (df) diff-full, (e) edit"
+#~ msgstr ", (df) voller Diff, (e) editieren"
+
+#~ msgid ""
+#~ ",\n"
+#~ " (mc) mine-conflict, (tc) theirs-conflict"
+#~ msgstr ""
+#~ ",\n"
+#~ " (mc) eigene konfliktbehaftete Datei, (tc) fremde konfliktbehaftete Datei"
+
+#~ msgid ""
+#~ ",\n"
+#~ " (mf) mine-full, (tf) theirs-full"
+#~ msgstr ""
+#~ ",\n"
+#~ " (mf) volle eigene Datei, (tf) volle fremde Datei"
+
+# CHECKME: translate mine-conflict, ... or not (sometimes used as option!)?
+#~ msgid ""
+#~ "\n"
+#~ " (e) edit - change merged file in an editor\n"
+#~ " (df) diff-full - show all changes made to merged file\n"
+#~ " (r) resolved - accept merged version of file\n"
+#~ "\n"
+#~ " (dc) display-conflict - show all conflicts (ignoring merged version)\n"
+#~ " (mc) mine-conflict - accept my version for all conflicts (same)\n"
+#~ " (tc) theirs-conflict - accept their version for all conflicts (same)\n"
+#~ "\n"
+#~ " (mf) mine-full - accept my version of entire file (even non-conflicts)\n"
+#~ " (tf) theirs-full - accept their version of entire file (same)\n"
+#~ "\n"
+#~ " (p) postpone - mark the conflict to be resolved later\n"
+#~ " (l) launch - launch external tool to resolve conflict\n"
+#~ " (s) show all - show this list\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ " (e) editieren - zusammengeführte Datei in einem Editor ändern\n"
+#~ " (df) voller Diff - alle Änderungen in der zusammengeführten Datei anzeigen\n"
+#~ " (r) aufgelöst - akzeptieren der zusammengeführten Version der Datei\n"
+#~ " (dc) Konflikte anzeigen - alle Konflikte anzeigen (die zusammengeführte Version\n"
+#~ " ignorieren)\n"
+#~ " (mc) mine-conflict - eigene Version für alle Konflikte akzeptieren (das selbe)\n"
+#~ " (tc) theirs-conflict - fremde Version für alle Konflikte akzeptieren (das selbe)\n"
+#~ "\n"
+#~ " (mf) volle eigene Datei - die eigene Version der kompletten Datei akzeptieren\n"
+#~ " (selbst Nicht-Konflikte)\n"
+#~ " (tf) volle fremde Datei - die fremde Version der kompletten Datei akzeptieren\n"
+#~ " (das selbe)\n"
+#~ " (p) zurückstellen - den Konflikt erst später auflösen\n"
+#~ " (l) starten - Starten eines externen Programms zur Konfliktauflösung\n"
+#~ " (s) alle anzeigen - diese Liste anzeigen\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Invalid option; cannot choose based on conflicts for properties.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ungültige Option; Auswahl anhand von Konflikten ist für Eigenschaften nicht möglich.\n"
+#~ "\n"
+
+# TODO: merge with other messages
+#~ msgid "Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (h) help:"
+#~ msgstr "Auswahl: (p) zurückstellen, (mf) volle eigene Datei, (tf) volle fremde Datei, (h) Hilfe:"
+
+#~ msgid ""
+#~ " (p) postpone - resolve the conflict later\n"
+#~ " (mf) mine-full - accept pre-existing item (ignore upstream addition)\n"
+#~ " (tf) theirs-full - accept incoming item (overwrite pre-existing item)\n"
+#~ " (h) help - show this help\n"
+#~ "\n"
+#~ msgstr ""
+#~ " (p) zurückstellen - den Konflikt erst später auflösen\n"
+#~ " (mf) volle eigene Datei - vorher existierende Daten akzeptieren (Hinzufügungen\n"
+#~ " ignorieren)\n"
+#~ " (tf) volle fremde Datei - eingehende Daten akzeptieren (überschreiben vorher\n"
+#~ " existierender Daten)\n"
+#~ " (h) Hilfe - diese Hilfe anzeigen\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%s: (Not a versioned resource)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s: (Keine versionierte Ressource)\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%s: (Not a valid URL)\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s: (Keine gültige URL)\n"
+#~ "\n"
+
+#~ msgid "the change made by revision ARG (like -r ARG-1:ARG)\n"
+#~ msgstr "die in Revision PAR durchgeführte Änderung (wie -r PAR-1:PAR)\n"
+
+#~ msgid "ARG (some commands also take ARG1:ARG2 range)\n"
+#~ msgstr "PAR (einige Kommandos akzeptieren auch Bereiche PAR1:PAR2)\n"
+
+#~ msgid "limit operation by depth ARG ('empty', 'files',\n"
+#~ msgstr "begrenzt Operation durch Tiefe PAR (»empty«, »files«,\n"
+
+#~ msgid "do no interactive prompting"
+#~ msgstr "keine interaktiven Rückfragen ausgeben"
+
+#~ msgid "set user configuration option in the format:\n"
+#~ msgstr "Konfigurationsoption in diesem Format setzen:\n"
+
+#~ msgid "set revision property ARG in new revision\n"
+#~ msgstr "Revisionseigenschaft PAR in neuer Revision setzen\n"
+
+#~ msgid "Allow merge into mixed-revision working copy.\n"
+#~ msgstr "Erlaube Zusammenführung in eine Arbeitskopie mit verschiedenen Revisionen.\n"
+
+# FIXME: behaviour oder behavior?
+# www.example.com is a reserved URL, let's not translate it.
+#, fuzzy
+#~ msgid ""
+#~ "Show the log messages for a set of revision(s) and/or path(s).\n"
+#~ "usage: 1. log [PATH][@REV]\n"
+#~ " 2. log URL[@REV] [PATH...]\n"
+#~ "\n"
+#~ " 1. Print the log messages for the URL corresponding to PATH\n"
+#~ " (default: '.'). If specified, REV is the revision in which the\n"
+#~ " URL is first looked up, and the default revision range is REV:1.\n"
+#~ " If REV is not specified, the default revision range is BASE:1,\n"
+#~ " since the URL might not exist in the HEAD revision.\n"
+#~ "\n"
+#~ " 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+#~ " If specified, REV is the revision in which the URL is first\n"
+#~ " looked up, and the default revision range is REV:1; otherwise,\n"
+#~ " the URL is looked up in HEAD, and the default revision range is\n"
+#~ " HEAD:1.\n"
+#~ "\n"
+#~ " Multiple '-c' or '-r' options may be specified (but not a\n"
+#~ " combination of '-c' and '-r' options), and mixing of forward and\n"
+#~ " reverse ranges is allowed.\n"
+#~ "\n"
+#~ " With -v, also print all affected paths with each log message.\n"
+#~ " With -q, don't print the log message body itself (note that this is\n"
+#~ " compatible with -v).\n"
+#~ "\n"
+#~ " Each log message is printed just once, even if more than one of the\n"
+#~ " affected paths for that revision were explicitly requested. Logs\n"
+#~ " follow copy history by default. Use --stop-on-copy to disable this\n"
+#~ " behavior, which can be useful for determining branchpoints.\n"
+#~ "\n"
+#~ " Examples:\n"
+#~ " svn log\n"
+#~ " svn log foo.c\n"
+#~ " svn log bar.c@42\n"
+#~ " svn log http://www.example.com/repo/project/foo.c\n"
+#~ " svn log http://www.example.com/repo/project foo.c bar.c\n"
+#~ " svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
+#~ msgstr ""
+#~ "Zeigt die Logmeldungen für eine Menge von Revisionen und/oder Dateien.\n"
+#~ "Aufruf: 1. log [PFAD]\n"
+#~ " 2. log URL[@REV] [PFAD...]\n"
+#~ "\n"
+#~ " 1. Gibt die Logmeldungen für einen lokalen PFAD aus (Vorgabe: ».«).\n"
+#~ " Die Vorgabe für den Revisionsbereich ist BASE:1.\n"
+#~ "\n"
+#~ " 2. Gibt die Logmeldungen für die PFADe (Vorgabe: ».«) unterhalb der URL aus.\n"
+#~ " Falls angegeben, bestimmt REV, in welcher Revision die URL zuerst\n"
+#~ " durchsucht wird und der Standardrevisionsbereich ist REV:1. Andernfalls\n"
+#~ " wird die URL in HEAD gesucht und die Vorgabe für den Revisionsbereich\n"
+#~ " ist HEAD:1.\n"
+#~ "\n"
+#~ " Mehrere »-c«- oder »-r«-Optionen dürfen angegeben werden (aber keine\n"
+#~ " Kombination von »-c« und »-r«) und das Mischen von vor- und\n"
+#~ " rückwärtigen Bereichen ist erlaubt.\n"
+#~ "\n"
+#~ " Mit -v werden auch die betroffenen Pfade mit jeder Logmeldung ausgegeben.\n"
+#~ " Mit -q wird die Logmeldung selbst nicht ausgegeben (Hinweis: Diese Option\n"
+#~ " ist kompatibel mit -v).\n"
+#~ "\n"
+#~ " Jede Logmeldung wird nur einmal ausgegeben, selbst wenn mehr als einer\n"
+#~ " der betroffenen Pfade explizit angefragt wurde. Logs folgen per Vorgabe\n"
+#~ " der Historie von Kopien. Benutzen Sie »--stop-on-copy«, um dieses Verhalten,\n"
+#~ " z.B. zum Auffinden von Verzweigungen, zu deaktivieren.\n"
+#~ "\n"
+#~ " Beispiele:\n"
+#~ " svn log\n"
+#~ " svn log foo.c\n"
+#~ " svn log http://www.example.com/repo/projekt/foo.c\n"
+#~ " svn log http://www.example.com/repo/projekt foo.c bar.c\n"
+
+# FIXME: WCPATH oder WC_PATH?
+#, fuzzy
+#~ msgid ""
+#~ "Apply the differences between two sources to a working copy path.\n"
+#~ "usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+#~ " 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+#~ " 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]\n"
+#~ "\n"
+#~ " 1. In the first form, the source URLs are specified at revisions\n"
+#~ " N and M. These are the two sources to be compared. The revisions\n"
+#~ " default to HEAD if omitted.\n"
+#~ "\n"
+#~ " 2. In the second form, the URLs corresponding to the source working\n"
+#~ " copy paths define the sources to be compared. The revisions must\n"
+#~ " be specified.\n"
+#~ "\n"
+#~ " 3. In the third form, SOURCE can be either a URL or a working copy\n"
+#~ " path (in which case its corresponding URL is used). SOURCE (in\n"
+#~ " revision REV) is compared as it existed between revisions N and M\n"
+#~ " for each revision range provided. If REV is not specified, HEAD\n"
+#~ " is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
+#~ " does the reverse: '-r M:<M-1>'. If no revision ranges are\n"
+#~ " specified, the default range of 0:REV is used. Multiple '-c'\n"
+#~ " and/or '-r' options may be specified, and mixing of forward\n"
+#~ " and reverse ranges is allowed.\n"
+#~ "\n"
+#~ " WCPATH is the working copy path that will receive the changes.\n"
+#~ " If WCPATH is omitted, a default value of '.' is assumed, unless\n"
+#~ " the sources have identical basenames that match a file within '.':\n"
+#~ " in which case, the differences will be applied to that file.\n"
+#~ "\n"
+#~ " For each merged item a line will be printed with characters reporting\n"
+#~ " the action taken. These characters have the following meaning:\n"
+#~ "\n"
+#~ " A Added\n"
+#~ " D Deleted\n"
+#~ " U Updated\n"
+#~ " C Conflict\n"
+#~ " G Merged\n"
+#~ " E Existed\n"
+#~ " R Replaced\n"
+#~ "\n"
+#~ " Characters in the first column report about the item itself.\n"
+#~ " Characters in the second column report about properties of the item.\n"
+#~ " A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
+#~ " the first and second columns indicate textual conflicts in files\n"
+#~ " and in property values, respectively.\n"
+#~ "\n"
+#~ " NOTE: Subversion will only record metadata to track the merge\n"
+#~ " if the two sources are on the same line of history -- if the\n"
+#~ " first source is an ancestor of the second, or vice-versa. This is\n"
+#~ " guaranteed to be the case when using the third form listed above.\n"
+#~ " The --ignore-ancestry option overrides this, forcing Subversion to\n"
+#~ " regard the sources as unrelated and not to track the merge.\n"
+#~ msgstr ""
+#~ "Wendet die Unterschiede zwischen zwei Quellen auf einen Arbeitskopiepfad\n"
+#~ "an.\n"
+#~ "Aufruf: 1. merge QuellURL1[@N] QuellURL2[@M] [AKPfad]\n"
+#~ " 2. merge QuellAKPfad1@N QuellAKPfad2@M [AKPfad]\n"
+#~ " 3. merge [-c M[,N...] | -r N:M ...] QUELLE[@REV] [AKPfad]\n"
+#~ "\n"
+#~ " 1. In der ersten Form werden die Quell-URLs in den Revisionen\n"
+#~ " N und M angegeben. Dies sind die beiden Quellen, die verglichen werden.\n"
+#~ " Die Revisionen entsprechen HEAD, wenn keine Nummern angegeben wurden.\n"
+#~ "\n"
+#~ " 2. In der zweiten Form werden die den Arbeitskopiepfaden entsprechenden\n"
+#~ " URLs miteinander verglichen. Die Revisionen müssen angegeben werden.\n"
+#~ "\n"
+#~ " 3. In der dritten Form kann QUELLE eine URL oder ein Arbeitskopiepfad\n"
+#~ " (in diesem Fall wird die entsprechende URL verwendet) sein. QUELLE\n"
+#~ " (in Revision REV) wird verglichen, wie es zwischen den Revisionen N\n"
+#~ " und M für jeden angegebenen Revisionsbereich existierte. Ohne Angabe\n"
+#~ " von REV wird HEAD verwendet. Die Option »-c M« ist äquivalent zu\n"
+#~ " »-r <M-1>:M« und »-c -M« kehrt dies um: »-r M:<M-1>«. Falls keine\n"
+#~ " Revisionsbereiche angegeben wurden, wird 0:REV verwendet. Mehrere\n"
+#~ " Angaben von »-c« und/oder »-r« sind möglich und das Mischen von\n"
+#~ " vor- und rückwärtigen Bereichen ist erlaubt.\n"
+#~ "\n"
+#~ " AKPfad ist der Arbeitskopiepfad, in den die Änderungen geschrieben werden.\n"
+#~ " Die Vorgabe für AKPfad ist ».«, es sei denn, die Quellen haben einen\n"
+#~ " identischen Basisnamen, der eine Datei unterhalb von ».« beschreibt.\n"
+#~ " In diesem Fall werden die Änderungen auf die gefundene Datei angewandt.\n"
+#~ "\n"
+#~ " ACHTUNG: Subversion wird nur Metadaten zum Verfolgen der Zusammenführung\n"
+#~ " aufzeichnen, falls die zwei Quellen sich in der selben Historienabfolge\n"
+#~ " befinden - falls die erste Quelle ein Vorgänger der zweiten ist oder\n"
+#~ " umgekehrt. Dies ist garantiert der Fall, falls die dritte Form verwendet\n"
+#~ " wird. Die Option --ignore-ancestry überschreibt dies und zwingt Subversion\n"
+#~ " dazu, die Quellen als nicht zueinander bezogen zu betrachten und die\n"
+#~ " Zusammenführung nicht aufzuzeichnen.\n"
+
+#~ msgid ""
+#~ "Display merge-related information.\n"
+#~ "usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
+#~ "\n"
+#~ " Display information related to merges (or potential merges) between\n"
+#~ " SOURCE and TARGET (default: '.'). If the --show-revs option\n"
+#~ " is not provided, display revisions which have been merged from\n"
+#~ " SOURCE to TARGET; otherwise, display the type of information\n"
+#~ " specified by the --show-revs option.\n"
+#~ msgstr ""
+#~ "Anzeige relevanter Informationen zu Zusammenführungen.\n"
+#~ "Aufruf: mergeinfo QUELLE[@REV] [ZIEL[@REV]]\n"
+#~ "\n"
+#~ " Zeigt Informationen zu Zusammenführungen (oder potentiellen\n"
+#~ " Zusammenführungen) zwischen QUELLE und ZIEL (Standard: ».«) an.\n"
+#~ " Falls die Option --show-revs nicht angegeben wurde, werden\n"
+#~ " Revisionen, die von QUELLE nach ZIEL zusammengeführt wurden,\n"
+#~ " angezeigt. Andernfalls wird die Art der Information angezeigt,\n"
+#~ " die durch die Option --show-revs spezifiziert wurde.\n"
+
+#~ msgid ""
+#~ "Move and/or rename something in working copy or repository.\n"
+#~ "usage: move SRC... DST\n"
+#~ "\n"
+#~ "When moving multiple sources, they will be added as children of DST,\n"
+#~ "which must be a directory.\n"
+#~ "\n"
+#~ " Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
+#~ " Note: the --revision option has no use and is deprecated.\n"
+#~ "\n"
+#~ " SRC and DST can both be working copy (WC) paths or URLs:\n"
+#~ " WC -> WC: move and schedule for addition (with history)\n"
+#~ " URL -> URL: complete server-side rename.\n"
+#~ " All the SRCs must be of the same type.\n"
+#~ msgstr ""
+#~ "Verschiebt oder benennt etwas in der Arbeitskopie oder\n"
+#~ "im Projektarchiv um.\n"
+#~ "Aufruf: move QUELLE... ZIEL\n"
+#~ "\n"
+#~ "Beim Verschieben mehrerer Quellen, werden sie als Kinder von ZIEL\n"
+#~ "hinzugefügt, was ein Verzeichnis sein muss.\n"
+#~ "\n"
+#~ " Hinweis: Dieser Unterbefehl entspricht der Folge »copy« und »delete«.\n"
+#~ " Hinweis: Die Option --revision bewirkt nichts und wird missbilligt.\n"
+#~ "\n"
+#~ " QUELLE und ZIEL können beides Arbeitskopiepfade (AK) oder URLs sein:\n"
+#~ " AK -> AK: Verschieben und zum Hinzufügen (mit Historie) einplanen\n"
+#~ " URL -> URL: Vollständig serverseitiges Verschieben.\n"
+#~ " Alle QUELLEn müssen vom selben Typ sein.\n"
+
+#~ msgid ""
+#~ "Resolve conflicts on working copy files or directories.\n"
+#~ "usage: resolve --accept=ARG [PATH...]\n"
+#~ "\n"
+#~ " Note: the --accept option is currently required.\n"
+#~ msgstr ""
+#~ "Auflösen von Konflikten in Arbeitskopiedateien oder -verzeichnissen.\n"
+#~ "Aufruf: resolve --accept=PAR [PFAD...]\n"
+#~ "\n"
+#~ " Bemerkung: Die Option --accept wird zurzeit benötigt.\n"
+
+#~ msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
+#~ msgstr "--reintegrate kann nicht mit --ignore-ancestry oder --record-only verwendet werden"
+
+#~ msgid "A working copy merge source needs an explicit revision"
+#~ msgstr "Beim Zusammenführen von Arbeitskopien wird eine explizite Revision benötigt"
+
+#~ msgid "Wrong number of arguments"
+#~ msgstr "Falsche Anzahl von Argumenten"
+
+#~ msgid "Target must specify the revision as a number"
+#~ msgstr "Ziel muss die Revision als Zahl angegeben"
+
+#~ msgid "'%s' has lock token, but no lock owner"
+#~ msgstr "»%s« has Sperrmarke, aber keinen Sperreigner"
+
+#~ msgid "'%s' is an URL when it should be a path"
+#~ msgstr "»%s« ist eine URL, obwohl es ein Pfad sein sollte"
+
+#~ msgid ""
+#~ "use format compatible with Subversion versions\n"
+#~ " earlier than 1.4"
+#~ msgstr "Ein mit Subversion-Versionen vor 1.4 kompatibles Format verwenden"
+
+#~ msgid ""
+#~ "use format compatible with Subversion versions\n"
+#~ " earlier than 1.6"
+#~ msgstr "Ein mit Subversion-Versionen vor 1.6 kompatibles Format verwenden"
+
+#~ msgid ""
+#~ "use format compatible with Subversion versions\n"
+#~ " earlier than 1.7"
+#~ msgstr "Ein mit Subversion-Versionen vor 1.7 kompatibles Format verwenden"
+
+#~ msgid ""
+#~ "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
+#~ "\n"
+#~ "Makes a hot copy of a repository.\n"
+#~ msgstr ""
+#~ "Aufruf: svnadmin hotcopy ARCHIV_PFAD ARCHIV_PFAD_NEU\n"
+#~ "\n"
+#~ "Erstellt eine Kopie des Projektarchivs im laufenden Betrieb.\n"
+
+#~ msgid "Exactly one property name and one file argument required"
+#~ msgstr "Genau ein Eigenschaftsname und ein Dateiparameter erforderlich"
+
+#~ msgid "Exactly one file argument required"
+#~ msgstr "Genau ein Dateiparameter benötigt"
+
+#~ msgid "Delta property block detected - not supported by svndumpfilter"
+#~ msgstr "Delta Eigenschaftsblock erkannt - wird von svndumpfilter nicht unterstützt"
+
+#~ msgid "Pass contents of file ARG as additional args"
+#~ msgstr ""
+#~ "Inhalt der Datei PAR als zusätzliche Parameter\n"
+#~ " übergeben"
+
+#~ msgid ""
+#~ "Default: '-u'. When Subversion is invoking an\n"
+#~ " external diff program, ARG is simply passed along\n"
+#~ " to the program. But when Subversion is using its\n"
+#~ " default internal diff implementation, or when\n"
+#~ " Subversion is displaying blame annotations, ARG\n"
+#~ " could be any of the following:\n"
+#~ " -u (--unified):\n"
+#~ " Output 3 lines of unified context.\n"
+#~ " -b (--ignore-space-change):\n"
+#~ " Ignore changes in the amount of white space.\n"
+#~ " -w (--ignore-all-space):\n"
+#~ " Ignore all white space.\n"
+#~ " --ignore-eol-style:\n"
+#~ " Ignore changes in EOL style"
+#~ msgstr ""
+#~ "Vorgabe: »-u«. Wenn Subversion ein\n"
+#~ " externes Vergleichsprogramm aufruft, wird PAR nur\n"
+#~ " an das Programm weitergereicht. Wenn Subversion\n"
+#~ " aber sein internes Vergleichsprogramm benutzt\n"
+#~ " oder Annotierungen anzeigt, kann PAR einen der\n"
+#~ " folgenden Werte annehmen:\n"
+#~ " -u (--unified):\n"
+#~ " Gibt 3 Zeilen Standardkontext aus.\n"
+#~ " -b (--ignore-space-change):\n"
+#~ " Ignoriert Änderungen in der Anzahl von\n"
+#~ " Leerzeichen.\n"
+#~ " -w (--ignore-all-space):\n"
+#~ " Ignoriert sämtliche Leerzeichen.\n"
+#~ " --ignore-eol-style:\n"
+#~ " Ignoriert Änderungen im EOL-Stil"
+
+#~ msgid "Missing path argument"
+#~ msgstr "Fehlender Pfad Parameter"
+
+#~ msgid "\"svnrdump load\"'s lock was stolen; can't remove it"
+#~ msgstr "Die Sperre von »svnrump load« wurde gestohlen und konnte nicht entfernt werden"
+
+#~ msgid ""
+#~ "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n"
+#~ "Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n"
+#~ "\n"
+#~ "Available subcommands:\n"
+#~ msgstr ""
+#~ "Aufruf: svnrdump UNTERBEFEHL URL [-r [ VON[:BIS]]\n"
+#~ "Geben Sie »svnrdump help <Unterbefehl>« ein, um Hilfe zu einem\n"
+#~ " Unterbefehl zu erhalten.\n"
+#~ "\n"
+#~ "Verfügbare Unterbefehle:\n"
+
+#~ msgid "LOWER cannot be greater than UPPER.\n"
+#~ msgstr "VON kann nicht größer als BIS sein.\n"
+
+#~ msgid "Parent(s) of '%s' should have been present."
+#~ msgstr "Eltern von »%s« sollten vorhanden sein."
+
+#~ msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
+#~ msgstr "Kann nicht zurück in eine Arbeitskopie integrieren, die keine vollständig unendliche Tiefe hat"
+
+#~ msgid "Properties Last Updated"
+#~ msgstr "Eigenschaften zuletzt geändert"
+
+#~ msgid "UUID mismatch: existing file '%s' was checked out from a different repository"
+#~ msgstr "UUID-Fehler: Existierende Datei »%s« wurde aus einem anderen Projektarchiv ausgecheckt"
+
+#~ msgid "Error comparing '%s' and '%s'"
+#~ msgstr "Fehler beim Vergleichen von »%s« und »%s«"
+
+#~ msgid "Revision type requires a working copy path, not a URL"
+#~ msgstr "Revisionstyp erfordert einen Arbeitskopiepfad, keine URL"
+
+#~ msgid "Can't move source to dest"
+#~ msgstr "Kann Quelle nicht nach Ziel verschieben"
+
+#~ msgid "Can't get file perms for file at '%s' (file stat error)"
+#~ msgstr "Kann die Berechtigungen für Datei in »%s« nicht holen (Dateistatus)"
+
+#~ msgid "Error during add of '%s'"
+#~ msgstr "Fehler beim Hinzufügen von »%s«"
+
+#~ msgid " You have added '%s' locally.\n"
+#~ msgstr " »%s« wurde lokal hinzugefügt.\n"
+
+#~ msgid "Can't write property hash to '%s'"
+#~ msgstr "Kann Eigenschafts-Hashwert nicht nach »%s« schreiben"
+
+#~ msgid "Can't get default file perms for file at '%s' (file stat error)"
+#~ msgstr "Kann die Standardberechtigungen für Datei in »%s« nicht holen (Dateistatus)"
+
+#~ msgid "Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try again"
+#~ msgstr ""
+#~ "Ihr .svn/tmp Verzeichnis könnte fehlen oder beschädigt sein; führen Sie\n"
+#~ "»svn cleanup« aus und versuchen Sie es erneut"
+
+#~ msgid ".patch"
+#~ msgstr ".patch"
+
+#~ msgid "Failed to add file '%s': a file of the same name is already scheduled for addition with history"
+#~ msgstr "Konnte Datei »%s« nicht hinzufügen: eine Datei mit dem selben Namen ist bereits zur Übertragung mit Historie eingeplant"
+
+#~ msgid "Unknown or unexpected kind for path '%s'"
+#~ msgstr "Unbekannte oder unerwartete Art für Pfad »%s«"
+
+#~ msgid "Can't parse '%s'"
+#~ msgstr "Kann »%s« nicht analysieren"
+
+#~ msgid "This action was obstructed by an item in the working copy.\n"
+#~ msgstr "Diese Aktion wurde von einem Objekt in der Arbeitskopie behindert.\n"
+
+#~ msgid ""
+#~ " '%s' does not exist locally.\n"
+#~ " Maybe you renamed it?\n"
+#~ msgstr ""
+#~ " »%s« existiert lokal nicht.\n"
+#~ " Eventuell wurde das Objekt umbenannt?\n"
+
+#~ msgid " The merge attempted to add '%s'.\n"
+#~ msgstr " Die Zusammenführung versuchte »%s« hinzuzufügen.\n"
+
+#~ msgid "'get-location-segments' REPORT not implemented"
+#~ msgstr "»get-locations-segments«-REPORT nicht implementiert"
+
+#~ msgid ""
+#~ "'%s' does not exist locally. Maybe you renamed it? Or has it been\n"
+#~ "renamed in the history of the branch you are merging into?\n"
+#~ msgstr ""
+#~ "»%s« existiert lokal nicht. Eventuell wurde es umbenannt? Oder es wurde\n"
+#~ "in der Geschichte des Zweiges, in den zusammengeführt wird, umbenannt?\n"
+
+#~ msgid " The merge attempted to edit '%s'.\n"
+#~ msgstr " Die Zusammenführung versuchte »%s« zu bearbeiten.\n"
+
+#~ msgid "Entry '%s' is already under version control"
+#~ msgstr "Eintrag »%s« ist bereits unter Versionskontrolle"
+
+#~ msgid ""
+#~ "Checksum mismatch on representation '%s':\n"
+#~ " expected: %s\n"
+#~ " actual: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler auf Darstellung »%s«:\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "property '%s' deleted (recursively) from '%s'.\n"
+#~ msgstr "Eigenschaft »%s« wurde (rekursiv) von »%s« gelöscht.\n"
+
+#~ msgid ""
+#~ " The update attempted to delete '%s'\n"
+#~ " (possibly as part of a rename operation).\n"
+#~ msgstr ""
+#~ " Die Aktualisierung versuchte »%s« zu löschen\n"
+#~ " (möglicherweise als Teil einer Umbenennung).\n"
+
+#~ msgid ""
+#~ " The switch attempted to delete '%s'\n"
+#~ " (possibly as part of a rename operation).\n"
+#~ msgstr ""
+#~ " Die Umstellung versuchte »%s« zu löschen\n"
+#~ " (möglicherweise als Teil einer Umbenennung).\n"
+
+#~ msgid " The switch attempted to edit '%s'.\n"
+#~ msgstr " Die Umstellung versuchte »%s« zu bearbeiten.\n"
+
+#~ msgid ""
+#~ "Lock Comment (%i lines):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Sperrkommentar (%i Zeilen):\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "output in svnpatch format, implies the\n"
+#~ " --no-diff-deleted option"
+#~ msgstr ""
+#~ "Ausgabe in svnpatch-Format, impliziert die\n"
+#~ " Option --no-diff-deleted"
+
+#~ msgid " The switch attempted to add '%s'.\n"
+#~ msgstr " Die Umstellung versuchte »%s« hinzuzufügen.\n"
+
+#~ msgid ""
+#~ " The merge attempted to delete '%s'\n"
+#~ " (possibly as part of a rename operation).\n"
+#~ msgstr ""
+#~ " Die Zusammenführung versuchte »%s« zu löschen\n"
+#~ " (möglicherweise als Teil einer Umbenennung).\n"
+
+#~ msgid " The update attempted to add '%s'.\n"
+#~ msgstr " Die Aktualisierung versuchte »%s« hinzuzufügen.\n"
+
+#~ msgid ""
+#~ "Comment (%i lines):\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kommentar (%i Zeilen):\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "No delimiter after 'action' in tree conflict description"
+#~ msgstr "Kein Trenner nach »action« in Baumkonfliktbeschreibung"
+
+#~ msgid "Unescaped description delimiter inside 'victim_path' in tree conflict description"
+#~ msgstr "Nicht geschützter Beschreibungstrenner innerhalb von »victim_path« der Baumkonfliktbeschreibung"
+
+#~ msgid "Expected tree conflict data but got none"
+#~ msgstr "Daten zu einem Baumkonflikt wurden erwartet aber nichts erhalten"
+
+#~ msgid "No delimiter after 'operation' in tree conflict description"
+#~ msgstr "Kein Trenner nach »operation« in Baumkonfliktbeschreibung"
+
+#~ msgid "Invalid tree conflict data in entries file, but no idea what went wrong"
+#~ msgstr "Ungültige Baumkonfliktdaten in Datei »entries«, Ursache ist unbekannt"
+
+#~ msgid "Bad node_kind in tree conflict description"
+#~ msgstr "Fehlerhafter Wert von »node_kind« in Baumkonfliktbeschreibung"
+
+#~ msgid "No delimiter after 'victim_path' in tree conflict description"
+#~ msgstr "Kein Trenner nach »victim_path« in Baumkonfliktbeschreibung"
+
+#~ msgid "Shallowing of working copy depths is not yet supported"
+#~ msgstr "Das Verringern der Arbeitskopietiefen wird nicht unterstützt"
+
+#~ msgid "Bad action in tree conflict description"
+#~ msgstr "Fehlerhafter Wert von »action« in Baumkonfliktbeschreibung"
+
+#~ msgid "Unexpected end of tree conflict description, within escape sequence in 'victim_path'"
+#~ msgstr "Unerwartetes Ende der Baumkonfliktbeschreibung innerhalb einer Escape-Sequenz in »victim_path«"
+
+#~ msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for replacement) has an invalid schedule"
+#~ msgstr ""
+#~ "Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Ersetzen\n"
+#~ "eingeplant ist) hat einen ungültigen Übertragungsplan"
+
+#~ msgid "No delimiter at end of tree conflict description, even though there is still data left to read"
+#~ msgstr "Es befindet sich kein Trenner am Ende der Baumkonfliktbeschreibung, obwohl weitere zu lesende Daten vorhanden sind"
+
+#~ msgid "Failed to add file '%s': object of the same name already exists"
+#~ msgstr ""
+#~ "Konnte die Datei »%s« nicht hinzufügen: ein Objekt mit demselben Namen\n"
+#~ "existiert bereits"
+
+#~ msgid ""
+#~ "Checksum mismatch, representation '%s':\n"
+#~ " expected: %s\n"
+#~ " actual: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler, Darstellung »%s«:\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "Invalid 'operation' field in tree conflict description"
+#~ msgstr "Ungültiges Feld »operation« in Baumkonfliktbeschreibung"
+
+#~ msgid "Entry '%s' has invalid depth"
+#~ msgstr "Eintrag »%s« hat eine ungültige Tiefe"
+
+#~ msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for deletion) is not itself scheduled for deletion"
+#~ msgstr ""
+#~ "Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Löschen\n"
+#~ "eingeplant ist) ist selbst nicht zum Löschen vorgesehen"
+
+#~ msgid "Can't rewind directory '%s'"
+#~ msgstr "Kann Verzeichnis »%s« nicht zurückspulen"
+
+#~ msgid "Illegal escaped character in 'victim_path' of tree conflict description"
+#~ msgstr "Ungültiges geschütztes Zeichen in »victim_path« der Baumkonfliktbeschreibung"
+
+#~ msgid "The OPTIONS request returned invalid XML in the response: %s (%s)"
+#~ msgstr "Die OPTIONS-Anfrage gab in der Antwort ungültiges XML zurück: %s (%s)"
+
+#~ msgid "No REPOSITORY table entry for uuid '%s'"
+#~ msgstr "Kein REPOSITORY-Tabelleneintrag für UUID »%s«"
+
+#~ msgid "UUID mismatch: existing directory '%s' was checked out from a different repository"
+#~ msgstr "UUID-Fehler: Existierendes Verzeichnis »%s« wurde aus einem anderen Projektarchiv ausgecheckt"
+
+#~ msgid ""
+#~ "Apply a patch to a working copy path.\n"
+#~ "usage: patch PATCHFILE [WCPATH]\n"
+#~ "\n"
+#~ " PATCHFILE is an input file which, when applied, turns the working\n"
+#~ " copy WCPATH into a modified tree that reflects all the changes the\n"
+#~ " patch carries along. When WCPATH is omitted '.' is assumed.\n"
+#~ "\n"
+#~ " The format of bytes embedded in the patch can be of two types: Unified\n"
+#~ " diff and/or svnpatch diff (see 'svn diff --svnpatch').\n"
+#~ "\n"
+#~ " This command allows some amount of fuzzing as Unidiff is contextual\n"
+#~ " and svnpatch revisionless.\n"
+#~ msgstr ""
+#~ "Wendet einen Patch auf einen Arbeitskopiepfad an.\n"
+#~ "Aufruf: patch PATCHDATEI [AKPfad]\n"
+#~ "\n"
+#~ " PATCHDATEI ist eine Eingabedatei, die, wenn angewandt, die Arbeitskopie\n"
+#~ " AKPfad in einen veränderten Baum umwandelt, der all die Änderungen umfasst,\n"
+#~ " die der Patch enthält. Falls AKPfad weggelassen wird, wird ».« verwendet.\n"
+#~ "\n"
+#~ " Das Format der im Patch eingebetteten Bytes kann von zwei Arten sein:\n"
+#~ " Unified Diff und/oder svnpatch-Diff (vergleiche »svn diff --svnpatch«).\n"
+#~ "\n"
+#~ " Dieses Kommando ermöglicht eine kleine Unschärfe, da Unidiff textabhängig\n"
+#~ " und svnpatch revisionsunabhängig ist.\n"
+
+#~ msgid "exported%s"
+#~ msgstr "exportiert%s"
+
+#~ msgid "Path '%s' is no longer a member of a changelist.\n"
+#~ msgstr "Pfad »%s« ist nicht länger ein Element einer Änderungsliste.\n"
+
+#~ msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
+#~ msgstr "Prüfsummenfehler für »%s«; erwartet: »%s«, tatsächlich: »%s«"
+
+#~ msgid "OPTIONS request (for capabilities) got HTTP response code %d"
+#~ msgstr "OPTIONS-Anfrage (für Eigenschaften) führte zu HTTP-Antwort-Code %d"
+
+#~ msgid "'%s' is not a valid revision range"
+#~ msgstr "»%s« ist kein gültiger Revisionsbereich"
+
+#~ msgid "Path '%s' is now a member of changelist '%s'.\n"
+#~ msgstr "Pfad »%s« ist nun ein Element der Änderungsliste »%s«.\n"
+
+#~ msgid "Unrecognized node kind '%s' from server"
+#~ msgstr "Unbekannter Knotentyp »%s« vom Server"
+
+#~ msgid "File or directory '%s' is out of date"
+#~ msgstr "Datei oder Verzeichnis »%s« ist veraltet"
+
+#~ msgid "Bad type indicator"
+#~ msgstr "Falscher Typindikator"
+
+#~ msgid "Corrupt working copy: '%s' has no default entry"
+#~ msgstr "Beschädigte Arbeitskopie: »%s« hat keinen Standardeintrag"
+
+#~ msgid "Unable to parse unordered revision ranges '%s' and '%s'"
+#~ msgstr "Unsortierte Revisionsbereiche »%s« und »%s« können nicht verarbeitet werden"
+
+#~ msgid "'%s' has invalid revision"
+#~ msgstr "»%s« hat eine ungültige Revision"
+
+#~ msgid ""
+#~ "No 'patch' program was found in your system. Please try\n"
+#~ "to use --patch-cmd or 'patch-cmd' run-time configuration\n"
+#~ "option or manually use an external tool to apply Unidiffs."
+#~ msgstr ""
+#~ "Kein »patch«-Programm wurde in Ihrem System gefunden. Bitte versuchen Sie\n"
+#~ "--patch-cmd oder die Laufzeitkonfigurationsoption »patch-cmd«. Alternativ\n"
+#~ "können Sie ein externes Werkzeug einsetzen, um Unidiffs einzuspielen."
+
+#~ msgid "use ARG as external patch command"
+#~ msgstr "PAR als externes Patch-Kommando verwenden"
+
+#~ msgid "APR_APPEND not supported for adm files"
+#~ msgstr "APR_APPEND wird für administrative Dateien nicht unterstützt"
+
+#~ msgid "Summary of conflicts in external item:\n"
+#~ msgstr "Konfliktübersicht für externen Verweis:\n"
+
+#~ msgid "; run 'svn update' to complete it"
+#~ msgstr "; vervollständigen Sie diese mit »svn update«."
+
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
+#~ "\n"
+#~ "Copy the revision properties in a given range of revisions to the\n"
+#~ "destination from the source with which it was initialized.\n"
+#~ "\n"
+#~ "If REV and REV2 are provided, copy properties for the revisions\n"
+#~ "specified by that range, inclusively. If only REV is provided,\n"
+#~ "copy properties for that revision alone. If REV is not provided,\n"
+#~ "copy properties for all revisions previously transferred to the\n"
+#~ "destination.\n"
+#~ "\n"
+#~ "REV and REV2 must be revisions which were previously transferred\n"
+#~ "to the destination. You may use \"HEAD\" for either revision to\n"
+#~ "mean \"the last revision transferred\".\n"
+#~ msgstr ""
+#~ "Aufruf: svnsync copy-revprops ZIEL_URL [REV[:REV2]]\n"
+#~ "\n"
+#~ "Kopiert die Revisionseigenschaften in einem gegebenen Revisionsbereich\n"
+#~ "von der Quelle, mit der es initialisiert wurde, auf das Ziel.\n"
+#~ "\n"
+#~ "Falls REV und REV2 angegeben wurden, werden nur Eigenschaften für die\n"
+#~ "durch diesen Bereich angegebenen Revisionen kopiert. Falls nur REV\n"
+#~ "angegeben wurde, werden nur Eigenschaften für diese Revision kopiert.\n"
+#~ "Falls REV nicht angegeben wurde, werden alle Eigenschaften kopiert, für\n"
+#~ "die die Revisionen früher auf das Ziel übertragen wurden.\n"
+#~ "\n"
+#~ "REV und REV2 müssen Revisionen sein, die vorher auf das Ziel transferiert\n"
+#~ "wurden. Sie können »HEAD« für eine Revision verwenden, im Sinne von »die\n"
+#~ "letzte übertragene Revision«.\n"
+
+#~ msgid "Cannot revert"
+#~ msgstr "Kann nicht zurücksetzen"
+
+#~ msgid "Version %d is not non-negative"
+#~ msgstr "Version %d ist nicht positiv"
+
+#~ msgid "Added: %s\n"
+#~ msgstr "Hinzugefügt: %s\n"
+
+#~ msgid "External program is missing"
+#~ msgstr "Externes Programm fehlt"
+
+#~ msgid "Corrupt working copy: directory '%s' has an invalid schedule"
+#~ msgstr "Beschädigte Arbeitskopie: Verzeichnis »%s« hat einen ungültigen Plan"
+
+#~ msgid ""
+#~ "Copyright (C) 2000-2009 CollabNet.\n"
+#~ "Subversion is open source software, see http://subversion.tigris.org/\n"
+#~ "This product includes software developed by CollabNet (http://www.Collab.Net/).\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 2000-2009 CollabNet.\n"
+#~ "Subversion ist Open-Source-Software, siehe http://subversion.tigris.org/\n"
+#~ "Dieses Produkt enthält Software, die von CollabNet (http://www.Collab.Net/) entwickelt wurde.\n"
+#~ "\n"
+
+#~ msgid "lump-merge all of source URL's unmerged changes"
+#~ msgstr ""
+#~ "komplettes Rückführen aller nicht zusammengeführten\n"
+#~ " Änderungen der Quell-URL"
+
+#~ msgid "Error modifying entry for '%s'"
+#~ msgstr "Fehler beim Bearbeiten des Eintrags für »%s«"
+
+#~ msgid ""
+#~ "Either you have added '%s' locally, or it has been added in the\n"
+#~ "history of the branch you are merging into.\n"
+#~ msgstr ""
+#~ "Entweder wurde »%s« lokal hinzugefügt oder dies geschah in der\n"
+#~ "Geschichte des Zweiges, in den zusammengeführt wird.\n"
+
+#~ msgid ""
+#~ " You have deleted '%s' locally.\n"
+#~ " Maybe you renamed it?\n"
+#~ msgstr ""
+#~ " »%s« wurde lokal gelöscht.\n"
+#~ " Eventuell wurde das Objekt umbenannt?\n"
+
+#~ msgid ""
+#~ "usage: svnsync synchronize DEST_URL\n"
+#~ "\n"
+#~ "Transfer all pending revisions to the destination from the source\n"
+#~ "with which it was initialized.\n"
+#~ msgstr ""
+#~ "Aufruf: svnsync synchronize ZIEL_URL\n"
+#~ "\n"
+#~ "Überträgt alle laufenden Revisionen von der Quelle, mit der es\n"
+#~ "initialisiert wurde, zum Ziel.\n"
+
+#~ msgid "Won't delete locally modified directory '%s'"
+#~ msgstr "Werde lokal verändertes Verzeichnis »%s« nicht löschen"
+
+#~ msgid "Existing sqlite database found at '%s'"
+#~ msgstr "Existierende SQLite-Datenbank wurde unter »%s« gefunden"
+
+#~ msgid "'get-deleted-rev' REPORT not implemented"
+#~ msgstr "»get-deleted-rev« REPORT nicht implementiert"
+
+#~ msgid "property '%s' set (recursively) on '%s'\n"
+#~ msgstr "Eigenschaft »%s« (rekursiv) für »%s« gesetzt\n"
+
+#~ msgid "'get-locations' REPORT not implemented"
+#~ msgstr "»get-locations« REPORT nicht implementiert"
+
+#~ msgid "Can't chmod '%s'"
+#~ msgstr "Kann »chmod '%s'« nicht durchführen"
+
+#~ msgid "Can't create a character converter from '%i' to '%i'"
+#~ msgstr "Kann keinen Zeichenkonverter von »%i« nach »%i« erzeugen"
+
+#~ msgid "Cannot initialize a repository with content in it"
+#~ msgstr "Kann kein Projektarchiv mit Inhalt initialisieren"
+
+#~ msgid ""
+#~ "Either you have edited '%s' locally, or it has been edited in the\n"
+#~ "history of the branch you are merging into, but those edits are not\n"
+#~ "present on the branch you are merging from.\n"
+#~ msgstr ""
+#~ "Entweder wurde »%s« lokal bearbeitet oder in der Geschichte des\n"
+#~ "Zweiges, in den zusammengeführt wird, editiert, aber diese\n"
+#~ "Veränderungen befinden sich nicht im Zweig, aus dem zusammengeführt wird.\n"
+
+#~ msgid ""
+#~ "Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
+#~ "for addition. Perhaps you're committing a target that is\n"
+#~ "inside an unversioned (or not-yet-versioned) directory?"
+#~ msgstr ""
+#~ "Eintrag für »%s« ist als »kopiert« markiert, aber ist selbst nicht\n"
+#~ "zum Hinzufügen geplant. Vielleicht übertragen Sie ein Ziel, das\n"
+#~ "sich in einem nicht versionierten (oder noch-nicht-versionierten)\n"
+#~ "Verzeichnis befindet?"
+
+#~ msgid "Deleted: %s%s"
+#~ msgstr "Gelöscht: %s%s"
+
+#~ msgid "Can't replace '%s' with a node of a differing type; the deletion must be committed and the parent updated before adding '%s'"
+#~ msgstr "Kann »%s« nicht durch einen Knoten eines anderen Typs ersetzen; Übertragen Sie die Löschung, aktualisieren Sie das Elternverzeichnis und fügen Sie erst dann »%s« hinzu"
+
+#~ msgid "Cannot exclude root directory"
+#~ msgstr "Kann Wurzelverzeichnis nicht exkludieren"
+
+#~ msgid "Error replacing text-base of '%s'"
+#~ msgstr "Fehler beim Ersetzen der Textbasis von »%s«"
+
+#~ msgid "Can't close directory '%s'"
+#~ msgstr "Kann Verzeichnis »%s« nicht schließen"
+
+#~ msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
+#~ msgstr ""
+#~ "»%s« ist als abwesend markiert, es kann daher nicht für die Übertragung\n"
+#~ "eingeplant werden"
+
+#~ msgid "No such entry: '%s'"
+#~ msgstr "Kein Eintrag: »%s«"
+
+#~ msgid "Error getting 'affected time' for '%s'"
+#~ msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
+
+#~ msgid "Write-lock stolen in '%s'"
+#~ msgstr "Schreibsperre gestohlen in »%s«"
+
+#~ msgid "Added: %s%s"
+#~ msgstr "Hinzugefügt: %s%s"
+
+#~ msgid "Error modifying entry of '%s'"
+#~ msgstr "Fehler beim Bearbeiten des Eintrags von »%s«"
+
+#~ msgid "Error getting 'affected time' on '%s'"
+#~ msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
+
+#~ msgid "Entry '%s' has illegal schedule"
+#~ msgstr "Eintrag »%s« hat einen ungültigen Plan"
+
+#~ msgid "Error removing changelist from entry '%s'"
+#~ msgstr "Fehler beim Entfernen der Änderungsliste von Eintrag »%s«"
+
+#~ msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
+#~ msgstr "»name«-Attribut fehlt im Log-Eintrag (Eintrag »%s« für Verzeichnis »%s«)"
+
+#~ msgid "Error getting 'affected time' of '%s'"
+#~ msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
+
+#~ msgid "Cannot revert addition of current directory; please try again from the parent directory"
+#~ msgstr "Kann Hinzufügen des aktuellen Verzeichnisses nicht zurücknehmen; bitte versuchen Sie es aus dem Elternverzeichnis erneut"
+
+#~ msgid "Invalid 'format' attribute"
+#~ msgstr "Ungültiges »format«-Attribut"
+
+#~ msgid "Couldn't open log"
+#~ msgstr "Kann Log-Datei nicht öffnen"
+
+#~ msgid "Expected '%s' to be a file but found a directory"
+#~ msgstr "Erwartete, dass »%s« eine Datei ist, es ist aber ein Verzeichnis"
+
+#~ msgid "Error writing entries file for '%s'"
+#~ msgstr "Fehler beim Schreiben der Eintragsdatei für »%s«"
+
+#~ msgid "Error writing log for '%s'"
+#~ msgstr "Fehler beim Schreiben des Logs für »%s«"
+
+#~ msgid "Checksum mismatch while updating '%s'; expected: '%s', actual: '%s'"
+#~ msgstr "Prüfsummenfehler beim Aktualisieren von »%s«; erwartet: »%s«, tatsächlich: »%s«"
+
+#~ msgid "Destination directory of add-with-history is missing a URL"
+#~ msgstr "Dem Zielverzeichnis von add-with-history fehlt eine URL"
+
+#~ msgid "Failed to add file '%s': a non-file object of the same name already exists"
+#~ msgstr ""
+#~ "Konnte die Datei »%s« nicht hinzufügen: ein nicht-Dateiobjekt mit demselben\n"
+#~ "Namen existiert bereits"
+
+#~ msgid "Unable to lock '%s'"
+#~ msgstr "Kann »%s« nicht sperren"
+
+#~ msgid ""
+#~ "Checksum mismatch for '%s':\n"
+#~ " expected checksum: %s\n"
+#~ " actual checksum: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler für »%s«:\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "'%s' returned error exitcode %d"
+#~ msgstr "»%s« hat Fehlerwert %d zurückgegeben"
+
+#~ msgid "At least one revision (r%ld) not yet merged from '%s'"
+#~ msgstr "Zumindest eine Revision (r%ld) aus »%s« wurde nicht zusammengeführt"
+
+#~ msgid "Error during recursive copy of '%s'"
+#~ msgstr "Fehler beim rekursiven Kopieren von »%s«"
+
+#~ msgid "Error in post-commit clean-up (details follow):"
+#~ msgstr "Fehler beim Aufräumen nach der Übertragung (Details folgen):"
+
+#~ msgid "No '.' entry in: '%s'"
+#~ msgstr "Kein ».« Eintrag in: »%s«"
+
+#~ msgid "unexpected kind for revert-base '%s'"
+#~ msgstr "Unerwartete Art für revert-base »%s«"
+
+#~ msgid "Can't add '%s' to deleted directory; try undeleting its parent directory first"
+#~ msgstr ""
+#~ "Kann »%s« in gelöschtem Verzeichnis nicht hinzufügen; versuchen Sie zuerst,\n"
+#~ "das Löschen des Elternverzeichnisses rückgängig zu machen"
+
+#~ msgid "Failed to add directory '%s': an unversioned directory of the same name already exists"
+#~ msgstr "Verzeichnis »%s« konnte nicht hinzugefügt werden: ein nicht versioniertes Verzeichnis mit demselben Namen existiert bereits"
+
+#~ msgid "Directory '%s' containing working copy admin area is missing"
+#~ msgstr "Verzeichnis »%s« mit Administrationsdateien der Arbeitskopie fehlt"
+
+#~ msgid "Malformed patch data"
+#~ msgstr "Fehlerhafte Patchdaten"
+
+#~ msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
+#~ msgstr ""
+#~ "Konnte Verzeichnis »%s« nicht hinzufügen: Parameter »copyfrom« wird noch nicht\n"
+#~ "unterstützt"
+
+#~ msgid "Log command for directory '%s' is mislocated"
+#~ msgstr "Log-Kommando für Verzeichnis »%s« ist falsch platziert"
+
+#~ msgid "In directory '%s'"
+#~ msgstr "In Verzeichnis »%s«"
+
+#~ msgid "Unrecognized logfile element '%s' in '%s'"
+#~ msgstr "Unbekanntes Log-Datei Element »%s« in »%s«"
+
+#~ msgid "Destination URLs are broken"
+#~ msgstr "Ziel-URLs sind kaputt"
+
+#~ msgid "Relocate can only change the repository part of an URL"
+#~ msgstr "Relocate kann nur den Projektarchivteil der URL ändern"
+
+#~ msgid "Cannot exclude current directory"
+#~ msgstr "Kann aktuelles Verzeichnis nicht exkludieren"
+
+#~ msgid "No fetch_func supplied to update_editor"
+#~ msgstr "Keine Angabe von fetch_func für update_editor"
+
+#~ msgid "Bad copyfrom arguments received"
+#~ msgstr "Falsche Parameter »kopieren von« erhalten"
+
+#~ msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
+#~ msgstr "Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« hat einen ungültigen Plan"
+
+#~ msgid "Missing 'right' attribute in '%s'"
+#~ msgstr "Fehlendes »right« Attribut für »%s«"
+
+#~ msgid "Error reading administrative log file in '%s'"
+#~ msgstr "Fehler beim Lesen der administrativen Log-Dateien in »%s«"
+
+#~ msgid "Failed to add file '%s': an unversioned file of the same name already exists"
+#~ msgstr "Datei »%s« konnte nicht hinzugefügt werden: eine nicht versionierte Datei mit demselben Namen existiert bereits"
+
+#~ msgid "mark revisions as merged (use with -r)"
+#~ msgstr ""
+#~ "Revisionen als zusammengeführt markieren (mit -r\n"
+#~ " verwenden)"
+
+#~ msgid " You have edited '%s' locally.\n"
+#~ msgstr " »%s« wurde lokal bearbeitet.\n"
+
+#~ msgid "Can't open file at '%s'"
+#~ msgstr "Kann Datei in »%s« nicht öffnen"
+
+#~ msgid "'%s' not versioned, and not exported\n"
+#~ msgstr "»%s« nicht versioniert und nicht exportiert\n"
+
+#~ msgid "Missing 'timestamp' attribute in '%s'"
+#~ msgstr "Fehlendes »timestamp« Attribut für »%s«"
+
+#~ msgid "Bad reason in tree conflict description"
+#~ msgstr "Fehlerhafter Wert von »reason« in Baumkonfliktbeschreibung"
+
+#~ msgid ""
+#~ "Base checksum mismatch on '%s':\n"
+#~ " expected: %s\n"
+#~ " actual: %s\n"
+#~ msgstr ""
+#~ "Prüfsummenfehler für »%s«:\n"
+#~ " Erwartet: %s\n"
+#~ " Tatsächlich: %s\n"
+
+#~ msgid "Use of an external editor to fetch log message is not supported on OS400; consider using the --message (-m) or --file (-F) options"
+#~ msgstr "Die Verwendung eines externen Editors zur Eingabe der Logmeldung wird auf OS400 nicht unterstützt. Verwenden Sie die Option --message (-m) oder --file (-F)"
+
+#~ msgid "No WC table entry"
+#~ msgstr "Kein AK-Tabelleneintrag"
+
+#~ msgid " The update attempted to edit '%s'.\n"
+#~ msgstr " Die Aktualisierung versuchte »%s« zu bearbeiten.\n"
+
+#~ msgid ".empty"
+#~ msgstr ".leer"
+
+#~ msgid "Error getting file size on '%s'"
+#~ msgstr "Fehler beim Ermitteln der Dateigröße von »%s«"
+
+#~ msgid "Target lists to diff may not contain both working copy paths and URLs"
+#~ msgstr "Ziellisten für Vergleiche dürfen nicht gleichzeitig Arbeitskopien und URLs enthalten"
+
+#~ msgid "Parent(s) of '%s' should have repository information."
+#~ msgstr "Eltern von »%s« sollten Informationen über das Projektarchiv haben."
+
+#~ msgid ""
+#~ "Comment (%i lines):\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Kommentar (%i Zeilen):\n"
+#~ "%s\n"
+
+#~ msgid "Error removing lock from entry for '%s'"
+#~ msgstr "Fehler beim Entfernen des Sperreintrags für »%s«"
+
+#~ msgid "Unable to make any directories"
+#~ msgstr "Kann keinerlei Verzeichnisse erzeugen"
+
+#~ msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for addition) is not itself scheduled for addition"
+#~ msgstr ""
+#~ "Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Hinzufügen\n"
+#~ "eingeplant ist) ist selbst nicht zum Hinzufügen vorgesehen"
+
+#~ msgid "Can't replace '%s' in deleted directory; try undeleting its parent directory first"
+#~ msgstr ""
+#~ "Kann »%s« in gelöschtem Verzeichnis nicht ersetzen; versuchen Sie zuerst,\n"
+#~ "das Löschen des Elternverzeichnisses rückgängig zu machen"
+
+#~ msgid "File '%s' in directory '%s' is not a versioned resource"
+#~ msgstr "Datei »%s« im Verzeichnis »%s« ist keine versionierte Ressource"
+
+#~ msgid "Modified: %s%s"
+#~ msgstr "Geändert: %s%s"
+
+#~ msgid "Missing 'revision' attribute for '%s'"
+#~ msgstr "Fehlendes Revisions Attribut für »%s«"
+
+#~ msgid "No delimiter after 'node_kind' in tree conflict description"
+#~ msgstr "Kein Trenner nach »node_kind« in Baumkonfliktbeschreibung"
+
+#~ msgid "URL '%s' is not properly URI-encoded"
+#~ msgstr "URL »%s« ist nicht korrekt URI-kodiert"
+
+#~ msgid "No such thing as 'base' working copy properties!"
+#~ msgstr "Es gibt keine »base«-Eigenschaften der Arbeitskopie"
+
+#~ msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
+#~ msgstr "Kann Zeichenkette nicht von CCSID »%i« nach CCSID »%i« konvertieren"
diff --unified -rupN 1.8.11/subversion/po/es.po 1.8.10/subversion/po/es.po
--- 1.8.11/subversion/po/es.po 2015-06-16 14:59:44.961493716 +0200
+++ 1.8.10/subversion/po/es.po 2015-06-16 14:59:00.522368291 +0200
@@ -53,7 +53,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-02-19 14:22-0200\n"
diff --unified -rupN 1.8.11/subversion/po/fr.po 1.8.10/subversion/po/fr.po
--- 1.8.11/subversion/po/fr.po 2015-06-16 14:59:44.957493705 +0200
+++ 1.8.10/subversion/po/fr.po 2015-06-16 14:58:59.983366781 +0200
@@ -22,7 +22,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2012-07-07 14:51+0200\n"
"PO-Revision-Date: 2012-07-07 17:04+0200\n"
diff --unified -rupN 1.8.11/subversion/po/it.po 1.8.10/subversion/po/it.po
--- 1.8.11/subversion/po/it.po 2015-06-16 14:59:44.975493756 +0200
+++ 1.8.10/subversion/po/it.po 2015-06-16 14:59:00.530368313 +0200
@@ -101,7 +101,7 @@
# working copy: copia di lavoro (CL)
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2007-10-12 10:09+0200\n"
diff --unified -rupN 1.8.11/subversion/po/ja.po 1.8.10/subversion/po/ja.po
--- 1.8.11/subversion/po/ja.po 2015-06-16 14:59:44.965493728 +0200
+++ 1.8.10/subversion/po/ja.po 2015-06-16 14:59:00.523368293 +0200
@@ -195,7 +195,7 @@
# zero byte ゼロバイト文字
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2007-10-28 01:23+0900\n"
diff --unified -rupN 1.8.11/subversion/po/ko.po 1.8.10/subversion/po/ko.po
--- 1.8.11/subversion/po/ko.po 2015-06-16 14:59:44.968493736 +0200
+++ 1.8.10/subversion/po/ko.po 2015-06-16 14:59:00.527368305 +0200
@@ -19,7 +19,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2011-03-07 00:53+0900\n"
"PO-Revision-Date: 2011-03-03 18:16+0900\n"
diff --unified -rupN 1.8.11/subversion/po/nb.po 1.8.10/subversion/po/nb.po
--- 1.8.11/subversion/po/nb.po 2015-06-16 14:59:44.971493745 +0200
+++ 1.8.10/subversion/po/nb.po 2015-06-16 14:59:00.526368302 +0200
@@ -87,7 +87,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-10-14 16:21+0200\n"
diff --unified -rupN 1.8.11/subversion/po/pl.po 1.8.10/subversion/po/pl.po
--- 1.8.11/subversion/po/pl.po 2015-06-16 14:59:44.964493725 +0200
+++ 1.8.10/subversion/po/pl.po 2015-06-16 14:59:00.706368806 +0200
@@ -55,7 +55,7 @@
# work queue - kolejka pracy
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2009-11-14 22:00+0100\n"
diff --unified -rupN 1.8.11/subversion/po/pt_BR.po 1.8.10/subversion/po/pt_BR.po
--- 1.8.11/subversion/po/pt_BR.po 2015-06-16 14:59:44.958493708 +0200
+++ 1.8.10/subversion/po/pt_BR.po 2015-06-16 14:58:59.985366787 +0200
@@ -19,7 +19,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2004-07-26 19:19-300\n"
diff --unified -rupN 1.8.11/subversion/po/zh_CN.po 1.8.10/subversion/po/zh_CN.po
--- 1.8.11/subversion/po/zh_CN.po 2015-06-16 14:59:44.973493750 +0200
+++ 1.8.10/subversion/po/zh_CN.po 2015-06-16 14:58:59.984366784 +0200
@@ -62,7 +62,7 @@ msgstr ""
"PO-Revision-Date: 2013-07-03 16:57+0800\n"
"Last-Translator: Subversion Developers <[email protected]>\n"
"Language-Team: Simplified Chinese <[email protected]>\n"
-"Language: zh_CN\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --unified -rupN 1.8.11/subversion/po/zh_TW.po 1.8.10/subversion/po/zh_TW.po
--- 1.8.11/subversion/po/zh_TW.po 2015-06-16 14:59:44.966493730 +0200
+++ 1.8.10/subversion/po/zh_TW.po 2015-06-16 14:59:00.532368319 +0200
@@ -22,13 +22,13 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.8\n"
+"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-11-12 08:49-0600\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion Developers <[email protected]>\n"
"Language-Team: Traditional Chinese <[email protected]>\n"
-"Language: zh_TW\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --unified -rupN 1.8.11/subversion/svn/conflict-callbacks.c 1.8.10/subversion/svn/conflict-callbacks.c
--- 1.8.11/subversion/svn/conflict-callbacks.c 2015-06-16 14:59:42.927487932 +0200
+++ 1.8.10/subversion/svn/conflict-callbacks.c 2015-06-16 14:59:03.447376485 +0200
@@ -509,6 +509,24 @@ static const resolver_option_t prop_conf
{ NULL }
};
+/* Resolver options for an obstructued addition */
+static const resolver_option_t obstructed_add_options[] =
+{
+ { "mf", N_("my version"), N_("accept pre-existing item (ignore "
+ "upstream addition) [mine-full]"),
+ svn_wc_conflict_choose_mine_full },
+ { "tf", N_("their version"), N_("accept incoming item (overwrite "
+ "pre-existing item) [theirs-full]"),
+ svn_wc_conflict_choose_theirs_full },
+ { "p", N_("postpone"), N_("mark the conflict to be resolved later"
+ " [postpone]"),
+ svn_wc_conflict_choose_postpone },
+ { "q", N_("quit resolution"), N_("postpone all remaining conflicts"),
+ svn_wc_conflict_choose_postpone },
+ { "h", N_("help"), N_("show this help (also '?')"), -1 },
+ { NULL }
+};
+
/* Resolver options for a tree conflict */
static const resolver_option_t tree_conflict_options[] =
{
@@ -1114,6 +1132,56 @@ handle_tree_conflict(svn_wc_conflict_res
return SVN_NO_ERROR;
}
+/* Ask the user what to do about the obstructed add described by DESC.
+ * Return the answer in RESULT. B is the conflict baton for this
+ * conflict resolution session.
+ * SCRATCH_POOL is used for temporary allocations. */
+static svn_error_t *
+handle_obstructed_add(svn_wc_conflict_result_t *result,
+ const svn_wc_conflict_description2_t *desc,
+ svn_cl__interactive_conflict_baton_t *b,
+ apr_pool_t *scratch_pool)
+{
+ apr_pool_t *iterpool;
+
+ SVN_ERR(svn_cmdline_fprintf(
+ stderr, scratch_pool,
+ _("Conflict discovered when trying to add '%s'.\n"
+ "An object of the same name already exists.\n"),
+ svn_cl__local_style_skip_ancestor(b->path_prefix,
+ desc->local_abspath,
+ scratch_pool)));
+
+ iterpool = svn_pool_create(scratch_pool);
+ while (1)
+ {
+ const resolver_option_t *opt;
+
+ svn_pool_clear(iterpool);
+
+ SVN_ERR(prompt_user(&opt, obstructed_add_options, NULL, b->pb,
+ iterpool));
+ if (! opt)
+ continue;
+
+ if (strcmp(opt->code, "q") == 0)
+ {
+ result->choice = opt->choice;
+ b->accept_which = svn_cl__accept_postpone;
+ b->quit = TRUE;
+ break;
+ }
+ else if (opt->choice != -1)
+ {
+ result->choice = opt->choice;
+ break;
+ }
+ }
+ svn_pool_destroy(iterpool);
+
+ return SVN_NO_ERROR;
+}
+
/* The body of svn_cl__conflict_func_interactive(). */
static svn_error_t *
conflict_func_interactive(svn_wc_conflict_result_t **result,
@@ -1262,6 +1330,29 @@ conflict_func_interactive(svn_wc_conflic
SVN_ERR(handle_text_conflict(*result, desc, b, scratch_pool));
else if (desc->kind == svn_wc_conflict_kind_property)
SVN_ERR(handle_prop_conflict(*result, desc, b, result_pool, scratch_pool));
+
+ /*
+ Dealing with obstruction of additions can be tricky. The
+ obstructing item could be unversioned, versioned, or even
+ schedule-add. Here's a matrix of how the caller should behave,
+ based on results we return.
+
+ Unversioned Versioned Schedule-Add
+
+ choose_mine skip addition, skip addition skip addition
+ add existing item
+
+ choose_theirs destroy file, schedule-delete, revert add,
+ add new item. add new item. rm file,
+ add new item
+
+ postpone [ bail out ]
+
+ */
+ else if ((desc->action == svn_wc_conflict_action_add)
+ && (desc->reason == svn_wc_conflict_reason_obstructed))
+ SVN_ERR(handle_obstructed_add(*result, desc, b, scratch_pool));
+
else if (desc->kind == svn_wc_conflict_kind_tree)
SVN_ERR(handle_tree_conflict(*result, desc, b, scratch_pool));
diff --unified -rupN 1.8.11/subversion/tests/cmdline/externals_tests.py 1.8.10/subversion/tests/cmdline/externals_tests.py
--- 1.8.11/subversion/tests/cmdline/externals_tests.py 2015-06-16 14:59:45.804496115 +0200
+++ 1.8.10/subversion/tests/cmdline/externals_tests.py 2015-06-16 14:59:03.046375361 +0200
@@ -2794,26 +2794,23 @@ def include_immediate_dir_externals(sbox
@Issue(4085)
+@XFail()
def shadowing(sbox):
"external shadows an existing dir"
- sbox.build()
+ sbox.build(read_only=True)
wc_dir = sbox.wc_dir
# Setup external: /A/B/F as 'C' child of /A
externals_prop = "^/A/B/F C\n"
- change_external(sbox.ospath('A'), externals_prop, commit=False)
-
- # An update errors out because the external is shadowed by an existing dir
- svntest.main.run_svn("W205011: Error handling externals definition for '%s'"
- % (sbox.wc_dir) + "/A/C", 'update', wc_dir)
-
- # Remove the shadowed directory to unblock the external
- svntest.main.run_svn(None, 'rm', sbox.repo_url + '/A/C', '-m', 'remove A/C')
-
- # The next update should fetch the external and not error out
- sbox.simple_update()
+ raised = False
+ try:
+ change_external(sbox.ospath('A'), externals_prop, commit=False)
+ except:
+ raised = True
+ if not raised:
+ raise svntest.Failure("Creating conflicting child 'C' of 'A' didn't error")
# Test for issue #4093 'remapping a file external can segfault due to
# "deleted" props'.
@@ -3166,7 +3163,6 @@ def pinned_externals(sbox):
# The interesting values
'Z/old-plain' : Item(contents="This is the file 'mu'.\n"),
'Z/new-plain' : Item(contents="This is the file 'mu'.\n"),
- 'Z/new-rev' : Item(contents="This is the file 'mu'.\n"),
# And verifying X
'X/D/H/psi' : Item(contents="This is the file 'psi'.\n"),
diff --unified -rupN 1.8.11/subversion/tests/libsvn_diff/parse-diff-test.c 1.8.10/subversion/tests/libsvn_diff/parse-diff-test.c
--- 1.8.11/subversion/tests/libsvn_diff/parse-diff-test.c 2015-06-16 14:59:46.000496672 +0200
+++ 1.8.10/subversion/tests/libsvn_diff/parse-diff-test.c 2015-06-16 14:59:02.773374596 +0200
@@ -132,6 +132,8 @@ static const char *bad_git_diff_header =
"diff --git foo4 b/foo4" NL
"diff --git a/foo5 b/foo5" NL
"random noise" NL
+ "copy from foo5" NL
+ "copy to foo5" NL
"diff --git a/foo6 b/foo6" NL
"copy from foo6" NL
"random noise" NL
diff --unified -rupN 1.8.11/subversion/tests/libsvn_fs_fs/fs-pack-test.c 1.8.10/subversion/tests/libsvn_fs_fs/fs-pack-test.c
--- 1.8.11/subversion/tests/libsvn_fs_fs/fs-pack-test.c 2015-06-16 14:59:46.001496675 +0200
+++ 1.8.10/subversion/tests/libsvn_fs_fs/fs-pack-test.c 2015-06-16 14:59:03.383376306 +0200
@@ -38,16 +38,6 @@
x12
/*** Helper Functions ***/
-static void
-ignore_fs_warnings(void *baton, svn_error_t *err)
-{
-#ifdef SVN_DEBUG
- SVN_DBG(("Ignoring FS warning %s\n",
- svn_error_symbolic_name(err ? err->apr_err : 0)));
-#endif
- return;
-}
-
/* Write the format number and maximum number of files per directory
to a new format file in PATH, overwriting a previously existing
file. Use POOL for temporary allocation.
@@ -867,57 +857,6 @@ get_set_multiple_huge_revprops_packed_fs
#undef SHARD_SIZE
/* ------------------------------------------------------------------------ */
-
-#define REPO_NAME "revprop_caching_on_off"
-static svn_error_t *
-revprop_caching_on_off(const svn_test_opts_t *opts,
- apr_pool_t *pool)
-{
- svn_fs_t *fs1;
- svn_fs_t *fs2;
- apr_hash_t *fs_config;
- svn_string_t *value;
- const svn_string_t *another_value_for_avoiding_warnings_from_a_broken_api;
- const svn_string_t *new_value = svn_string_create("new", pool);
-
- if (strcmp(opts->fs_type, "fsfs") != 0)
- return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL, NULL);
-
- /* Open two filesystem objects, enable revision property caching
- * in one of them. */
- SVN_ERR(svn_test__create_fs(&fs1, REPO_NAME, opts, pool));
-
- fs_config = apr_hash_make(pool);
- apr_hash_set(fs_config, SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
- APR_HASH_KEY_STRING, "1");
-
- SVN_ERR(svn_fs_open(&fs2, svn_fs_path(fs1, pool), fs_config, pool));
-
- /* With inefficient named atomics, the filesystem will output a warning
- and disable the revprop caching, but we still would like to test
- these cases. Ignore the warning(s). */
- svn_fs_set_warning_func(fs2, ignore_fs_warnings, NULL);
-
- SVN_ERR(svn_fs_revision_prop(&value, fs2, 0, "svn:date", pool));
- another_value_for_avoiding_warnings_from_a_broken_api = value;
- SVN_ERR(svn_fs_change_rev_prop2(
- fs1, 0, "svn:date",
- &another_value_for_avoiding_warnings_from_a_broken_api,
- new_value, pool));
-
- /* Expect the change to be visible through both objects.*/
- SVN_ERR(svn_fs_revision_prop(&value, fs1, 0, "svn:date", pool));
- SVN_TEST_STRING_ASSERT(value->data, "new");
-
- SVN_ERR(svn_fs_revision_prop(&value, fs2, 0, "svn:date", pool));
- SVN_TEST_STRING_ASSERT(value->data, "new");
-
- return SVN_NO_ERROR;
-}
-
-#undef REPO_NAME
-
-/* ------------------------------------------------------------------------ */
x12
/* The test table. */
@@ -944,7 +883,5 @@ struct svn_test_descriptor_t test_funcs[
"test file hint at shard boundary"),
SVN_TEST_OPTS_PASS(get_set_multiple_huge_revprops_packed_fs,
"set multiple huge revprops in packed FSFS"),
- SVN_TEST_OPTS_PASS(revprop_caching_on_off,
- "change revprops with enabled and disabled caching"),
SVN_TEST_NULL
};
diff --unified -rupN 1.8.11/.svn/pristine/00/007669f87468198d43572c7e48089b43a36249de.svn-base 1.8.10/.svn/pristine/00/007669f87468198d43572c7e48089b43a36249de.svn-base
--- 1.8.11/.svn/pristine/00/007669f87468198d43572c7e48089b43a36249de.svn-base 2015-06-16 14:59:43.071488342 +0200
+++ 1.8.10/.svn/pristine/00/007669f87468198d43572c7e48089b43a36249de.svn-base 1970-01-01 01:00:00.000000000 +0100
@@ -1,678 +0,0 @@
-/* caching.c : in-memory caching
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
-
-#include "fs.h"
-#include "fs_fs.h"
-#include "id.h"
-#include "dag.h"
-#include "tree.h"
-#include "temp_serializer.h"
-#include "../libsvn_fs/fs-loader.h"
-
-#include "svn_config.h"
-#include "svn_cache_config.h"
-
-#include "svn_private_config.h"
-#include "svn_hash.h"
-#include "svn_pools.h"
-
-#include "private/svn_debug.h"
-#include "private/svn_subr_private.h"
-
-/* Take the ORIGINAL string and replace all occurrences of ":" without
- * limiting the key space. Allocate the result in POOL.
- */
-static const char *
-normalize_key_part(const char *original,
- apr_pool_t *pool)
-{
- apr_size_t i;
- apr_size_t len = strlen(original);
- svn_stringbuf_t *normalized = svn_stringbuf_create_ensure(len, pool);
-
- for (i = 0; i < len; ++i)
- {
- char c = original[i];
- switch (c)
- {
- case ':': svn_stringbuf_appendbytes(normalized, "%_", 2);
- break;
- case '%': svn_stringbuf_appendbytes(normalized, "%%", 2);
- break;
- default : svn_stringbuf_appendbyte(normalized, c);
- }
- }
-
- return normalized->data;
-}
-
-/* Return a memcache in *MEMCACHE_P for FS if it's configured to use
- memcached, or NULL otherwise. Also, sets *FAIL_STOP to a boolean
- indicating whether cache errors should be returned to the caller or
- just passed to the FS warning handler.
-
- *CACHE_TXDELTAS, *CACHE_FULLTEXTS and *CACHE_REVPROPS flags will be set
- according to FS->CONFIG. *CACHE_NAMESPACE receives the cache prefix
- to use.
-
- Use FS->pool for allocating the memcache and CACHE_NAMESPACE, and POOL
- for temporary allocations. */
-static svn_error_t *
-read_config(svn_memcache_t **memcache_p,
- svn_boolean_t *fail_stop,
- const char **cache_namespace,
- svn_boolean_t *cache_txdeltas,
- svn_boolean_t *cache_fulltexts,
- svn_boolean_t *cache_revprops,
- svn_fs_t *fs,
- apr_pool_t *pool)
-{
- fs_fs_data_t *ffd = fs->fsap_data;
-
- SVN_ERR(svn_cache__make_memcache_from_config(memcache_p, ffd->config,
- fs->pool));
-
- /* No cache namespace by default. I.e. all FS instances share the
- * cached data. If you specify different namespaces, the data will
- * share / compete for the same cache memory but keys will not match
- * across namespaces and, thus, cached data will not be shared between
- * namespaces.
- *
- * Since the namespace will be concatenated with other elements to form
- * the complete key prefix, we must make sure that the resulting string
- * is unique and cannot be created by any other combination of elements.
- */
- *cache_namespace
- = normalize_key_part(svn_hash__get_cstring(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_NS,
- ""),
- pool);
-
- /* don't cache text deltas by default.
- * Once we reconstructed the fulltexts from the deltas,
- * these deltas are rarely re-used. Therefore, only tools
- * like svnadmin will activate this to speed up operations
- * dump and verify.
- */
- *cache_txdeltas
- = svn_hash__get_bool(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_DELTAS,
- FALSE);
- /* by default, cache fulltexts.
- * Most SVN tools care about reconstructed file content.
- * Thus, this is a reasonable default.
- * SVN admin tools may set that to FALSE because fulltexts
- * won't be re-used rendering the cache less effective
- * by squeezing wanted data out.
- */
- *cache_fulltexts
- = svn_hash__get_bool(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS,
- TRUE);
-
- /* For now, always disable revprop caching.
- */
- *cache_revprops = FALSE;
-
- return svn_config_get_bool(ffd->config, fail_stop,
- CONFIG_SECTION_CACHES, CONFIG_OPTION_FAIL_STOP,
- FALSE);
-}
-
-
-/* Implements svn_cache__error_handler_t
- * This variant clears the error after logging it.
- */
-static svn_error_t *
-warn_and_continue_on_cache_errors(svn_error_t *err,
- void *baton,
- apr_pool_t *pool)
-{
- svn_fs_t *fs = baton;
- (fs->warning)(fs->warning_baton, err);
- svn_error_clear(err);
-
- return SVN_NO_ERROR;
-}
-
-/* Implements svn_cache__error_handler_t
- * This variant logs the error and passes it on to the callers.
- */
-static svn_error_t *
-warn_and_fail_on_cache_errors(svn_error_t *err,
- void *baton,
- apr_pool_t *pool)
-{
- svn_fs_t *fs = baton;
- (fs->warning)(fs->warning_baton, err);
- return err;
-}
-
-#ifdef SVN_DEBUG_CACHE_DUMP_STATS
-/* Baton to be used for the dump_cache_statistics() pool cleanup function, */
-struct dump_cache_baton_t
-{
- /* the pool about to be cleaned up. Will be used for temp. allocations. */
- apr_pool_t *pool;
-
- /* the cache to dump the statistics for */
- svn_cache__t *cache;
-};
-
-/* APR pool cleanup handler that will printf the statistics of the
- cache referenced by the baton in BATON_VOID. */
-static apr_status_t
-dump_cache_statistics(void *baton_void)
-{
- struct dump_cache_baton_t *baton = baton_void;
-
- apr_status_t result = APR_SUCCESS;
- svn_cache__info_t info;
- svn_string_t *text_stats;
- apr_array_header_t *lines;
- int i;
-
- svn_error_t *err = svn_cache__get_info(baton->cache,
- &info,
- TRUE,
- baton->pool);
-
- if (! err)
- {
- text_stats = svn_cache__format_info(&info, baton->pool);
- lines = svn_cstring_split(text_stats->data, "\n", FALSE, baton->pool);
-
- for (i = 0; i < lines->nelts; ++i)
- {
- const char *line = APR_ARRAY_IDX(lines, i, const char *);
-#ifdef SVN_DEBUG
- SVN_DBG(("%s\n", line));
-#endif
- }
- }
-
- /* process error returns */
- if (err)
- {
- result = err->apr_err;
- svn_error_clear(err);
- }
-
- return result;
-}
-#endif /* SVN_DEBUG_CACHE_DUMP_STATS */
-
-/* This function sets / registers the required callbacks for a given
- * not transaction-specific CACHE object in FS, if CACHE is not NULL.
- *
- * All these svn_cache__t instances shall be handled uniformly. Unless
- * ERROR_HANDLER is NULL, register it for the given CACHE in FS.
- */
-static svn_error_t *
-init_callbacks(svn_cache__t *cache,
- svn_fs_t *fs,
- svn_cache__error_handler_t error_handler,
- apr_pool_t *pool)
-{
- if (cache != NULL)
- {
-#ifdef SVN_DEBUG_CACHE_DUMP_STATS
-
- /* schedule printing the access statistics upon pool cleanup,
- * i.e. end of FSFS session.
- */
- struct dump_cache_baton_t *baton;
-
- baton = apr_palloc(pool, sizeof(*baton));
- baton->pool = pool;
- baton->cache = cache;
-
- apr_pool_cleanup_register(pool,
- baton,
- dump_cache_statistics,
- apr_pool_cleanup_null);
-#endif
-
- if (error_handler)
- SVN_ERR(svn_cache__set_error_handler(cache,
- error_handler,
- fs,
- pool));
-
- }
-
- return SVN_NO_ERROR;
-}
-
-/* Sets *CACHE_P to cache instance based on provided options.
- * Creates memcache if MEMCACHE is not NULL. Creates membuffer cache if
- * MEMBUFFER is not NULL. Fallbacks to inprocess cache if MEMCACHE and
- * MEMBUFFER are NULL and pages is non-zero. Sets *CACHE_P to NULL
- * otherwise.
- *
- * Unless NO_HANDLER is true, register an error handler that reports errors
- * as warnings to the FS warning callback.
- *
- * Cache is allocated in POOL.
- * */
-static svn_error_t *
-create_cache(svn_cache__t **cache_p,
- svn_memcache_t *memcache,
- svn_membuffer_t *membuffer,
- apr_int64_t pages,
- apr_int64_t items_per_page,
- svn_cache__serialize_func_t serializer,
- svn_cache__deserialize_func_t deserializer,
- apr_ssize_t klen,
- const char *prefix,
- svn_fs_t *fs,
- svn_boolean_t no_handler,
- apr_pool_t *pool)
-{
- svn_cache__error_handler_t error_handler = no_handler
- ? NULL
- : warn_and_fail_on_cache_errors;
-
- if (memcache)
- {
- SVN_ERR(svn_cache__create_memcache(cache_p, memcache,
- serializer, deserializer, klen,
- prefix, pool));
- error_handler = no_handler
- ? NULL
- : warn_and_continue_on_cache_errors;
- }
- else if (membuffer)
- {
- SVN_ERR(svn_cache__create_membuffer_cache(
- cache_p, membuffer, serializer, deserializer,
- klen, prefix, FALSE, pool));
- }
- else if (pages)
- {
- SVN_ERR(svn_cache__create_inprocess(
- cache_p, serializer, deserializer, klen, pages,
- items_per_page, FALSE, prefix, pool));
- }
- else
- {
- *cache_p = NULL;
- }
-
- SVN_ERR(init_callbacks(*cache_p, fs, error_handler, pool));
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_fs_fs__initialize_caches(svn_fs_t *fs,
- apr_pool_t *pool)
-{
- fs_fs_data_t *ffd = fs->fsap_data;
- const char *prefix = apr_pstrcat(pool,
- "fsfs:", fs->uuid,
- "/", normalize_key_part(fs->path, pool),
- ":",
- (char *)NULL);
- svn_memcache_t *memcache;
- svn_membuffer_t *membuffer;
- svn_boolean_t no_handler;
- svn_boolean_t cache_txdeltas;
- svn_boolean_t cache_fulltexts;
- svn_boolean_t cache_revprops;
- const char *cache_namespace;
-
- /* Evaluating the cache configuration. */
- SVN_ERR(read_config(&memcache,
- &no_handler,
- &cache_namespace,
- &cache_txdeltas,
- &cache_fulltexts,
- &cache_revprops,
- fs,
- pool));
-
- prefix = apr_pstrcat(pool, "ns:", cache_namespace, ":", prefix, NULL);
-
- membuffer = svn_cache__get_global_membuffer_cache();
-
- /* Make the cache for revision roots. For the vast majority of
- * commands, this is only going to contain a few entries (svnadmin
- * dump/verify is an exception here), so to reduce overhead let's
- * try to keep it to just one page. I estimate each entry has about
- * 72 bytes of overhead (svn_revnum_t key, svn_fs_id_t +
- * id_private_t + 3 strings for value, and the cache_entry); the
- * default pool size is 8192, so about a hundred should fit
- * comfortably. */
- SVN_ERR(create_cache(&(ffd->rev_root_id_cache),
- NULL,
- membuffer,
- 1, 100,
- svn_fs_fs__serialize_id,
- svn_fs_fs__deserialize_id,
- sizeof(svn_revnum_t),
- apr_pstrcat(pool, prefix, "RRI", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* Rough estimate: revision DAG nodes have size around 320 bytes, so
- * let's put 16 on a page. */
- SVN_ERR(create_cache(&(ffd->rev_node_cache),
- NULL,
- membuffer,
- 1024, 16,
- svn_fs_fs__dag_serialize,
- svn_fs_fs__dag_deserialize,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "DAG", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* 1st level DAG node cache */
- ffd->dag_node_cache = svn_fs_fs__create_dag_cache(pool);
-
- /* Very rough estimate: 1K per directory. */
- SVN_ERR(create_cache(&(ffd->dir_cache),
- NULL,
- membuffer,
- 1024, 8,
- svn_fs_fs__serialize_dir_entries,
- svn_fs_fs__deserialize_dir_entries,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "DIR", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* Only 16 bytes per entry (a revision number + the corresponding offset).
- Since we want ~8k pages, that means 512 entries per page. */
- SVN_ERR(create_cache(&(ffd->packed_offset_cache),
- NULL,
- membuffer,
- 32, 1,
- svn_fs_fs__serialize_manifest,
- svn_fs_fs__deserialize_manifest,
- sizeof(svn_revnum_t),
- apr_pstrcat(pool, prefix, "PACK-MANIFEST",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* initialize node revision cache, if caching has been enabled */
- SVN_ERR(create_cache(&(ffd->node_revision_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_node_revision,
- svn_fs_fs__deserialize_node_revision,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "NODEREVS", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* initialize node change list cache, if caching has been enabled */
- SVN_ERR(create_cache(&(ffd->changes_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_changes,
- svn_fs_fs__deserialize_changes,
- sizeof(svn_revnum_t),
- apr_pstrcat(pool, prefix, "CHANGES", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- /* if enabled, cache fulltext and other derived information */
- if (cache_fulltexts)
- {
- SVN_ERR(create_cache(&(ffd->fulltext_cache),
- memcache,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- /* Values are svn_stringbuf_t */
- NULL, NULL,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "TEXT", (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- SVN_ERR(create_cache(&(ffd->properties_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_properties,
- svn_fs_fs__deserialize_properties,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "PROP",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- SVN_ERR(create_cache(&(ffd->mergeinfo_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_mergeinfo,
- svn_fs_fs__deserialize_mergeinfo,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "MERGEINFO",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- SVN_ERR(create_cache(&(ffd->mergeinfo_existence_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- /* Values are svn_stringbuf_t */
- NULL, NULL,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "HAS_MERGEINFO",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
- }
- else
- {
- ffd->fulltext_cache = NULL;
- ffd->properties_cache = NULL;
- ffd->mergeinfo_cache = NULL;
- ffd->mergeinfo_existence_cache = NULL;
- }
-
- /* initialize revprop cache, if full-text caching has been enabled */
- if (cache_revprops)
- {
- SVN_ERR(create_cache(&(ffd->revprop_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_properties,
- svn_fs_fs__deserialize_properties,
- sizeof(pair_cache_key_t),
- apr_pstrcat(pool, prefix, "REVPROP",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
- }
- else
- {
- ffd->revprop_cache = NULL;
- }
-
- /* if enabled, cache text deltas and their combinations */
- if (cache_txdeltas)
- {
- SVN_ERR(create_cache(&(ffd->txdelta_window_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- svn_fs_fs__serialize_txdelta_window,
- svn_fs_fs__deserialize_txdelta_window,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "TXDELTA_WINDOW",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
-
- SVN_ERR(create_cache(&(ffd->combined_window_cache),
- NULL,
- membuffer,
- 0, 0, /* Do not use inprocess cache */
- /* Values are svn_stringbuf_t */
- NULL, NULL,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "COMBINED_WINDOW",
- (char *)NULL),
- fs,
- no_handler,
- fs->pool));
- }
- else
- {
- ffd->txdelta_window_cache = NULL;
- ffd->combined_window_cache = NULL;
- }
-
- return SVN_NO_ERROR;
-}
-
-/* Baton to be used for the remove_txn_cache() pool cleanup function, */
-struct txn_cleanup_baton_t
-{
- /* the cache to reset */
- svn_cache__t *txn_cache;
-
- /* the position where to reset it */
- svn_cache__t **to_reset;
-};
-
-/* APR pool cleanup handler that will reset the cache pointer given in
- BATON_VOID. */
-static apr_status_t
-remove_txn_cache(void *baton_void)
-{
- struct txn_cleanup_baton_t *baton = baton_void;
-
- /* be careful not to hurt performance by resetting newer txn's caches. */
- if (*baton->to_reset == baton->txn_cache)
- {
- /* This is equivalent to calling svn_fs_fs__reset_txn_caches(). */
- *baton->to_reset = NULL;
- }
-
- return APR_SUCCESS;
-}
-
-/* This function sets / registers the required callbacks for a given
- * transaction-specific *CACHE object, if CACHE is not NULL and a no-op
- * otherwise. In particular, it will ensure that *CACHE gets reset to NULL
- * upon POOL destruction latest.
- */
-static void
-init_txn_callbacks(svn_cache__t **cache,
- apr_pool_t *pool)
-{
- if (*cache != NULL)
- {
- struct txn_cleanup_baton_t *baton;
-
- baton = apr_palloc(pool, sizeof(*baton));
- baton->txn_cache = *cache;
- baton->to_reset = cache;
-
- apr_pool_cleanup_register(pool,
- baton,
- remove_txn_cache,
- apr_pool_cleanup_null);
- }
-}
-
-svn_error_t *
-svn_fs_fs__initialize_txn_caches(svn_fs_t *fs,
- const char *txn_id,
- apr_pool_t *pool)
-{
- fs_fs_data_t *ffd = fs->fsap_data;
-
- /* Transaction content needs to be carefully prefixed to virtually
- eliminate any chance for conflicts. The (repo, txn_id) pair
- should be unique but if a transaction fails, it might be possible
- to start a new transaction later that receives the same id.
- Therefore, throw in a uuid as well - just to be sure. */
- const char *prefix = apr_pstrcat(pool,
- "fsfs:", fs->uuid,
- "/", fs->path,
- ":", txn_id,
- ":", svn_uuid_generate(pool), ":",
- (char *)NULL);
-
- /* We don't support caching for concurrent transactions in the SAME
- * FSFS session. Maybe, you forgot to clean POOL. */
- if (ffd->txn_dir_cache != NULL || ffd->concurrent_transactions)
- {
- ffd->txn_dir_cache = NULL;
- ffd->concurrent_transactions = TRUE;
-
- return SVN_NO_ERROR;
- }
-
- /* create a txn-local directory cache */
- SVN_ERR(create_cache(&ffd->txn_dir_cache,
- NULL,
- svn_cache__get_global_membuffer_cache(),
- 1024, 8,
- svn_fs_fs__serialize_dir_entries,
- svn_fs_fs__deserialize_dir_entries,
- APR_HASH_KEY_STRING,
- apr_pstrcat(pool, prefix, "TXNDIR",
- (char *)NULL),
- fs,
- TRUE,
- pool));
-
- /* reset the transaction-specific cache if the pool gets cleaned up. */
- init_txn_callbacks(&(ffd->txn_dir_cache), pool);
-
- return SVN_NO_ERROR;
-}
-
-void
-svn_fs_fs__reset_txn_caches(svn_fs_t *fs)
-{
- /* we can always just reset the caches. This may degrade performance but
- * can never cause in incorrect behavior. */
-
- fs_fs_data_t *ffd = fs->fsap_data;
- ffd->txn_dir_cache = NULL;
-}
diff --unified -rupN 1.8.11/.svn/pristine/07/07168c254199debe25dbac936bdb95def6f09b81.svn-base 1.8.10/.svn/pristine/07/07168c254199debe25dbac936bdb95def6f09b81.svn-base
--- 1.8.11/.svn/pristine/07/07168c254199debe25dbac936bdb95def6f09b81.svn-base 2015-06-16 14:59:44.815493301 +0200
+++ 1.8.10/.svn/pristine/07/07168c254199debe25dbac936bdb95def6f09b81.svn-base 1970-01-01 01:00:00.000000000 +0100
@@ -1,13055 +0,0 @@
-# Tranditional Chinese translation for subversion package
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# The original repos for this translation could be found at
-# http://svn.ntcu.net/tmprepo/svn.pot. There is a glossary.txt.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: subversion 1.8\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-11-12 08:49-0600\n"
-"PO-Revision-Date: 2004-09-12 22:05+0800\n"
-"Last-Translator: Subversion Developers <[email protected]>\n"
-"Language-Team: Traditional Chinese <[email protected]>\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Constructing nice error messages for roots.
-#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
-#. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:68
-#, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "檔案找不到: 修訂版 '%s', 路徑 '%s'"
-
-#: ../include/private/svn_fs_util.h:73
-#, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "檔案找不到: 修訂版 %ld, 路徑 '%s'"
-
-#. Build a detailed `file already exists' message for PATH in ROOT.
-#. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:84
-#, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "檔案已存在: 檔案系統 '%s', 修訂版 '%s', 路徑 '%s'"
-
-#: ../include/private/svn_fs_util.h:89
-#, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "檔案已存在: 檔案系統 '%s', 修訂版 %ld, 路徑 '%s'"
-
-#. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:97
-msgid "Root object must be a transaction root"
-msgstr "根物件必須為異動的根"
-
-#. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
-#. outside of a transaction. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:104
-#, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "檔案無法變更: 檔案系統 '%s', 修訂版 %ld, 路徑 '%s'"
-
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:111
-#, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "'%s' 不是檔案系統 '%s' 的目錄"
-
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:118
-#, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "'%s' 不是檔案系統 '%s' 裡的檔案"
-
-#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:126
-#, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "路徑 '%s' 已經被使用者 '%s' 鎖定於檔案系統 '%s' 中"
-
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:133
-#, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "沒有路徑 '%s' 於檔案系統 '%s' 中的鎖定"
-
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:140
-#, fuzzy, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr "鎖定已過時; 鎖定符記 '%s' 於檔案系統 '%s' 中"
-
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:147
-#, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "目前沒有使用者名稱與檔案系統 '%s' 關聯在一起"
-
-#. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
-#. LOCK_OWNER doesn't match the USERNAME associated with FS.
-#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:156
-#, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "使用者 '%s' 試著要使用一個被 '%s' 擁有的鎖定於檔案系統 '%s' 中"
-
-# as-is
-#: ../include/svn_error_codes.h:160
-msgid "Bad parent pool passed to svn_make_pool()"
-msgstr "Bad parent pool passed to svn_make_pool()"
-
-#: ../include/svn_error_codes.h:164
-msgid "Bogus filename"
-msgstr "有問題的檔名"
-
-#: ../include/svn_error_codes.h:168
-msgid "Bogus URL"
-msgstr "有問題的 URL"
-
-#: ../include/svn_error_codes.h:172
-msgid "Bogus date"
-msgstr "有問題的日期"
-
-#: ../include/svn_error_codes.h:176
-msgid "Bogus mime-type"
-msgstr "有問題的 mime-type"
-
-#: ../include/svn_error_codes.h:186
-msgid "Wrong or unexpected property value"
-msgstr ""
-
-#: ../include/svn_error_codes.h:190
-msgid "Version file format not correct"
-msgstr "版本檔案格式不正確"
-
-#: ../include/svn_error_codes.h:194
-#, fuzzy
-msgid "Path is not an immediate child of the specified directory"
-msgstr "路徑不是工作複本目錄"
-
-#: ../include/svn_error_codes.h:198
-#, fuzzy
-msgid "Bogus UUID"
-msgstr "有問題的 URL"
-
-#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
-msgid "Invalid configuration value"
-msgstr "無效的配置值"
-
-#: ../include/svn_error_codes.h:207
-#, fuzzy
-msgid "Bogus server specification"
-msgstr "未提供要求的修訂版規格"
-
-#: ../include/svn_error_codes.h:211
-#, fuzzy
-msgid "Unsupported checksum type"
-msgstr "不支援的檔案庫版本"
-
-#: ../include/svn_error_codes.h:215
-#, fuzzy
-msgid "Invalid character in hex checksum"
-msgstr "無效的結束修訂版 %ld"
-
-#: ../include/svn_error_codes.h:220
-#, fuzzy
-msgid "Unknown string value of token"
-msgstr "鎖定命令的未知狀態"
-
-#: ../include/svn_error_codes.h:226
-msgid "No such XML tag attribute"
-msgstr "沒有這樣的 XML 標籤屬性"
-
-#: ../include/svn_error_codes.h:230
-msgid "<delta-pkg> is missing ancestry"
-msgstr "<delta-pkg> 沒有演進歷程"
-
-#: ../include/svn_error_codes.h:234
-msgid "Unrecognized binary data encoding; can't decode"
-msgstr "無法辨識的二進制資料編碼: 無法解譯"
-
-#: ../include/svn_error_codes.h:238
-msgid "XML data was not well-formed"
-msgstr "XML 的資料不合語法"
-
-#: ../include/svn_error_codes.h:242
-msgid "Data cannot be safely XML-escaped"
-msgstr "資料無法安全地以 XML 逸出序列處理"
-
-#: ../include/svn_error_codes.h:248
-msgid "Inconsistent line ending style"
-msgstr "不一致的列尾樣式"
-
-#: ../include/svn_error_codes.h:252
-msgid "Unrecognized line ending style"
-msgstr "無法辨識的列尾樣式"
-
-#: ../include/svn_error_codes.h:257
-msgid "Line endings other than expected"
-msgstr "一列以意料之外的方式結束"
-
-#: ../include/svn_error_codes.h:261
-msgid "Ran out of unique names"
-msgstr "用完不重覆的名稱"
-
-# as-is
-#: ../include/svn_error_codes.h:266
-msgid "Framing error in pipe protocol"
-msgstr "Framing error in pipe protocol"
-
-#: ../include/svn_error_codes.h:271
-msgid "Read error in pipe"
-msgstr "管道發生讀取錯誤"
-
-#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
-#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
-#, c-format
-msgid "Write error"
-msgstr "寫入錯誤"
-
-#: ../include/svn_error_codes.h:281
-msgid "Unexpected EOF on stream"
-msgstr "串流中有意料之外的檔尾符號"
-
-#: ../include/svn_error_codes.h:285
-msgid "Malformed stream data"
-msgstr "有缺陷的串流資料"
-
-#: ../include/svn_error_codes.h:289
-msgid "Unrecognized stream data"
-msgstr "無法辨識的串流資料"
-
-#: ../include/svn_error_codes.h:294
-#, fuzzy
-msgid "Stream doesn't support seeking"
-msgstr "伺服器不支援 lock 命令"
-
-#: ../include/svn_error_codes.h:300
-msgid "Unknown svn_node_kind"
-msgstr "未知的 svn_node_kind"
-
-#: ../include/svn_error_codes.h:304
-msgid "Unexpected node kind found"
-msgstr "找到一個意料之外的節點種類"
-
-#: ../include/svn_error_codes.h:310
-msgid "Can't find an entry"
-msgstr "無法找到一個項目"
-
-#: ../include/svn_error_codes.h:316
-msgid "Entry already exists"
-msgstr "項目已存在"
-
-#: ../include/svn_error_codes.h:320
-msgid "Entry has no revision"
-msgstr "項目沒有修訂版"
-
-#: ../include/svn_error_codes.h:324
-msgid "Entry has no URL"
-msgstr "項目沒有 URL"
-
-#: ../include/svn_error_codes.h:328
-msgid "Entry has an invalid attribute"
-msgstr "項目有無效的屬性"
-
-#: ../include/svn_error_codes.h:332
-msgid "Can't create an entry for a forbidden name"
-msgstr ""
-
-#: ../include/svn_error_codes.h:338
-msgid "Obstructed update"
-msgstr "塞住的更新"
-
-# as-is
-#: ../include/svn_error_codes.h:343
-msgid "Mismatch popping the WC unwind stack"
-msgstr "Mismatch popping the WC unwind stack"
-
-# as-is
-#: ../include/svn_error_codes.h:348
-msgid "Attempt to pop empty WC unwind stack"
-msgstr "Attempt to pop empty WC unwind stack"
-
-# as-is
-#: ../include/svn_error_codes.h:353
-msgid "Attempt to unlock with non-empty unwind stack"
-msgstr "Attempt to unlock with non-empty unwind stack"
-
-#: ../include/svn_error_codes.h:357
-msgid "Attempted to lock an already-locked dir"
-msgstr "企圖要鎖定一個已鎖定的目錄"
-
-#: ../include/svn_error_codes.h:361
-msgid "Working copy not locked; this is probably a bug, please report"
-msgstr "工作複本未鎖定; 這大概是臭蟲, 請回報"
-
-#: ../include/svn_error_codes.h:366
-msgid "Invalid lock"
-msgstr "無效的鎖定"
-
-#: ../include/svn_error_codes.h:373
-msgid "Path is not a working copy directory"
-msgstr "路徑不是工作複本目錄"
-
-#: ../include/svn_error_codes.h:381
-msgid "Path is not a working copy file"
-msgstr "路徑不是工作複本檔案"
-
-#: ../include/svn_error_codes.h:385
-msgid "Problem running log"
-msgstr "無法執行紀錄"
-
-#: ../include/svn_error_codes.h:389
-msgid "Can't find a working copy path"
-msgstr "找不到工作複本路徑"
-
-#: ../include/svn_error_codes.h:393
-msgid "Working copy is not up-to-date"
-msgstr "工作複本未更新至最新版"
-
-#: ../include/svn_error_codes.h:397
-msgid "Left locally modified or unversioned files"
-msgstr "遺留本地修改或是未納入版本管理的檔案"
-
-#: ../include/svn_error_codes.h:401
-msgid "Unmergeable scheduling requested on an entry"
-msgstr "該項目有一個無法合併的排程要求"
-
-#: ../include/svn_error_codes.h:405
-msgid "Found a working copy path"
-msgstr "找到一個工作複本路徑"
-
-#: ../include/svn_error_codes.h:409
-msgid "A conflict in the working copy obstructs the current operation"
-msgstr "工作複本中的衝突阻礙了目前的動作"
-
-#: ../include/svn_error_codes.h:413
-msgid "Working copy is corrupt"
-msgstr "工作複本已損毀"
-
-#: ../include/svn_error_codes.h:417
-msgid "Working copy text base is corrupt"
-msgstr "工作複本的文件參考基礎已損毀"
-
-#: ../include/svn_error_codes.h:421
-msgid "Cannot change node kind"
-msgstr "無法更改節點種類"
-
-#: ../include/svn_error_codes.h:425
-msgid "Invalid operation on the current working directory"
-msgstr "這個動作對目前的工作複本目錄無效"
-
-#: ../include/svn_error_codes.h:429
-msgid "Problem on first log entry in a working copy"
-msgstr "作業於工作複本的第一個紀錄項目時發生問題"
-
-#: ../include/svn_error_codes.h:433
-msgid "Unsupported working copy format"
-msgstr "不支援的工作複本格式"
-
-#: ../include/svn_error_codes.h:437
-msgid "Path syntax not supported in this context"
-msgstr "路徑語法在此文脈中並不支援"
-
-#: ../include/svn_error_codes.h:442
-msgid "Invalid schedule"
-msgstr "無效的排程"
-
-#: ../include/svn_error_codes.h:447
-msgid "Invalid relocation"
-msgstr "無效的重新安置"
-
-#: ../include/svn_error_codes.h:452
-msgid "Invalid switch"
-msgstr "無效的切換"
-
-#: ../include/svn_error_codes.h:457
-#, fuzzy
-msgid "Changelist doesn't match"
-msgstr "總和檢查值: %s\n"
-
-#: ../include/svn_error_codes.h:462
-#, fuzzy
-msgid "Conflict resolution failed"
-msgstr "檔案庫建立失敗"
-
-#: ../include/svn_error_codes.h:466
-#, fuzzy
-msgid "Failed to locate 'copyfrom' path in working copy"
-msgstr "路徑不是工作複本檔案"
-
-#: ../include/svn_error_codes.h:473
-msgid "Moving a path from one changelist to another"
-msgstr ""
-
-#: ../include/svn_error_codes.h:478
-#, fuzzy
-msgid "Cannot delete a file external"
-msgstr "無法取得檔案名稱"
-
-#: ../include/svn_error_codes.h:483
-#, fuzzy
-msgid "Cannot move a file external"
-msgstr "無法移動路徑 '%s' 至其本身"
-
-#: ../include/svn_error_codes.h:488
-msgid "Something's amiss with the wc sqlite database"
-msgstr ""
-
-#: ../include/svn_error_codes.h:493
-#, fuzzy
-msgid "The working copy is missing"
-msgstr "工作複本 '%s' 不存在或未鎖定"
-
-#: ../include/svn_error_codes.h:498
-#, fuzzy
-msgid "The specified node is not a symlink"
-msgstr "指定的異動不可更動"
-
-#: ../include/svn_error_codes.h:503
-#, fuzzy
-msgid "The specified path has an unexpected status"
-msgstr "指定的 diff 選項不支援"
-
-#: ../include/svn_error_codes.h:508
-msgid "The working copy needs to be upgraded"
-msgstr ""
-
-#: ../include/svn_error_codes.h:513
-#, fuzzy
-msgid "Previous operation was interrupted; run 'svn cleanup'"
-msgstr "動作被中斷"
-
-#: ../include/svn_error_codes.h:518
-msgid "This operation can not be performed with just this depth."
-msgstr ""
-
-#: ../include/svn_error_codes.h:524
-msgid "General filesystem error"
-msgstr "一般性檔案系統錯誤"
-
-#: ../include/svn_error_codes.h:528
-msgid "Error closing filesystem"
-msgstr "關閉檔案系統發生錯誤"
-
-#: ../include/svn_error_codes.h:532
-msgid "Filesystem is already open"
-msgstr "檔案系統已開啟"
-
-#: ../include/svn_error_codes.h:536
-msgid "Filesystem is not open"
-msgstr "檔案系檔未開啟"
-
-#: ../include/svn_error_codes.h:540
-msgid "Filesystem is corrupt"
-msgstr "檔案系統損毀"
-
-#: ../include/svn_error_codes.h:544
-msgid "Invalid filesystem path syntax"
-msgstr "無效的檔案系統路徑語法"
-
-#: ../include/svn_error_codes.h:548
-msgid "Invalid filesystem revision number"
-msgstr "無效的檔案系統修訂版號碼"
-
-#: ../include/svn_error_codes.h:552
-msgid "Invalid filesystem transaction name"
-msgstr "無效的檔案系統異動名稱"
-
-#: ../include/svn_error_codes.h:556
-msgid "Filesystem directory has no such entry"
-msgstr "檔案系統目錄沒有這樣的項目"
-
-#: ../include/svn_error_codes.h:560
-msgid "Filesystem has no such representation"
-msgstr "檔案系統沒有這樣的表現 (representation)"
-
-#: ../include/svn_error_codes.h:564
-msgid "Filesystem has no such string"
-msgstr "檔案系統沒有這樣的字串"
-
-#: ../include/svn_error_codes.h:568
-msgid "Filesystem has no such copy"
-msgstr "檔案系統沒有這樣的複本"
-
-#: ../include/svn_error_codes.h:572
-msgid "The specified transaction is not mutable"
-msgstr "指定的異動不可更動"
-
-#: ../include/svn_error_codes.h:576
-msgid "Filesystem has no item"
-msgstr "檔案系統沒有項目"
-
-#: ../include/svn_error_codes.h:580
-msgid "Filesystem has no such node-rev-id"
-msgstr "檔案系統沒有這樣的 node-rev-id"
-
-#: ../include/svn_error_codes.h:584
-msgid "String does not represent a node or node-rev-id"
-msgstr "字串並未表示一個節點或 node-rev-id"
-
-#: ../include/svn_error_codes.h:588
-msgid "Name does not refer to a filesystem directory"
-msgstr "名稱沒有指向檔案系統目錄"
-
-#: ../include/svn_error_codes.h:592
-msgid "Name does not refer to a filesystem file"
-msgstr "名稱沒有指向檔案系統檔案"
-
-#: ../include/svn_error_codes.h:596
-msgid "Name is not a single path component"
-msgstr "名稱不是一個單一路徑元件"
-
-#: ../include/svn_error_codes.h:600
-msgid "Attempt to change immutable filesystem node"
-msgstr "企圖要修改不可更動的檔案系統節點"
-
-#: ../include/svn_error_codes.h:604
-msgid "Item already exists in filesystem"
-msgstr "該項目已存在於檔案系統中"
-
-#: ../include/svn_error_codes.h:608
-msgid "Attempt to remove or recreate fs root dir"
-msgstr "企圖要移除或再次建立檔案系統的根目錄"
-
-#: ../include/svn_error_codes.h:612
-msgid "Object is not a transaction root"
-msgstr "物件不是一個異動的根物件"
-
-#: ../include/svn_error_codes.h:616
-msgid "Object is not a revision root"
-msgstr "物件不是一個修訂版的根物件"
-
-#: ../include/svn_error_codes.h:620
-msgid "Merge conflict during commit"
-msgstr "送交時發生合併衝突"
-
-# as-is
-#: ../include/svn_error_codes.h:624
-msgid "A representation vanished or changed between reads"
-msgstr "A representation vanished or changed between reads"
-
-#: ../include/svn_error_codes.h:628
-msgid "Tried to change an immutable representation"
-msgstr "嘗試變更一個不可更動的表現 (representation)"
-
-#: ../include/svn_error_codes.h:632
-msgid "Malformed skeleton data"
-msgstr "有缺陷的骨架資料"
-
-#: ../include/svn_error_codes.h:636
-msgid "Transaction is out of date"
-msgstr "異動已過時"
-
-#: ../include/svn_error_codes.h:640
-msgid "Berkeley DB error"
-msgstr "Berkeley DB 錯誤"
-
-#: ../include/svn_error_codes.h:644
-msgid "Berkeley DB deadlock error"
-msgstr "Berkeley DB 發生死結錯誤"
-
-#: ../include/svn_error_codes.h:648
-msgid "Transaction is dead"
-msgstr "異動掛點"
-
-#: ../include/svn_error_codes.h:652
-msgid "Transaction is not dead"
-msgstr "異動未結束"
-
-#: ../include/svn_error_codes.h:657
-msgid "Unknown FS type"
-msgstr "未知的 FS 類別"
-
-# as-is
-#: ../include/svn_error_codes.h:662
-msgid "No user associated with filesystem"
-msgstr "No user associated with filesystem"
-
-#: ../include/svn_error_codes.h:667
-msgid "Path is already locked"
-msgstr "路徑已被鎖定"
-
-#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
-msgid "Path is not locked"
-msgstr "路徑未被鎖定"
-
-#: ../include/svn_error_codes.h:677
-msgid "Lock token is incorrect"
-msgstr "鎖定符記不正確"
-
-#: ../include/svn_error_codes.h:682
-msgid "No lock token provided"
-msgstr "未提供鎖定符記"
-
-#: ../include/svn_error_codes.h:687
-msgid "Username does not match lock owner"
-msgstr "使用者名稱不符合鎖定擁有者"
-
-#: ../include/svn_error_codes.h:692
-msgid "Filesystem has no such lock"
-msgstr "檔案系統沒有這樣的鎖定"
-
-#: ../include/svn_error_codes.h:697
-msgid "Lock has expired"
-msgstr "鎖定已過期"
-
-#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
-msgid "Item is out of date"
-msgstr "項目已過時"
-
-#: ../include/svn_error_codes.h:714
-msgid "Unsupported FS format"
-msgstr "不支援的 FS 格式"
-
-#: ../include/svn_error_codes.h:719
-#, fuzzy
-msgid "Representation is being written"
-msgstr "表現不是 'delta' 類別"
-
-#: ../include/svn_error_codes.h:724
-#, fuzzy
-msgid "The generated transaction name is too long"
-msgstr "指定的異動不可更動"
-
-#: ../include/svn_error_codes.h:729
-#, fuzzy
-msgid "Filesystem has no such node origin record"
-msgstr "檔案系統沒有這樣的 node-rev-id"
-
-#: ../include/svn_error_codes.h:734
-#, fuzzy
-msgid "Filesystem upgrade is not supported"
-msgstr "檔案系檔未開啟"
-
-#: ../include/svn_error_codes.h:739
-#, fuzzy
-msgid "Filesystem has no such checksum-representation index record"
-msgstr "檔案系統沒有這樣的表現 (representation)"
-
-#: ../include/svn_error_codes.h:744
-msgid "Property value in filesystem differs from the provided base value"
-msgstr ""
-
-#: ../include/svn_error_codes.h:751
-msgid "The repository is locked, perhaps for db recovery"
-msgstr "檔案庫被鎖定, 也許正在作資料庫修復"
-
-#: ../include/svn_error_codes.h:755
-msgid "A repository hook failed"
-msgstr "檔案庫掛勾錯誤"
-
-#: ../include/svn_error_codes.h:759
-msgid "Incorrect arguments supplied"
-msgstr "使用不正確的引數"
-
-#: ../include/svn_error_codes.h:763
-msgid "A report cannot be generated because no data was supplied"
-msgstr "無法產生回報, 因為沒有提供任何資料"
-
-#: ../include/svn_error_codes.h:767
-msgid "Bogus revision report"
-msgstr "有問題的修訂版回報"
-
-#: ../include/svn_error_codes.h:776
-msgid "Unsupported repository version"
-msgstr "不支援的檔案庫版本"
-
-#: ../include/svn_error_codes.h:780
-msgid "Disabled repository feature"
-msgstr "關閉了的檔案庫功能"
-
-#: ../include/svn_error_codes.h:784
-msgid "Error running post-commit hook"
-msgstr "執行 post-commit 掛勾時發生錯誤"
-
-#: ../include/svn_error_codes.h:789
-msgid "Error running post-lock hook"
-msgstr "執行 post-lock 掛勾時發生錯誤"
-
-#: ../include/svn_error_codes.h:794
-msgid "Error running post-unlock hook"
-msgstr "執行 post-unlock 掛勾時發生錯誤"
-
-#: ../include/svn_error_codes.h:799
-#, fuzzy
-msgid "Repository upgrade is not supported"
-msgstr "'%s' 不支援"
-
-#: ../include/svn_error_codes.h:805
-msgid "Bad URL passed to RA layer"
-msgstr "傳遞至 RA 層的 URL 有問題"
-
-#: ../include/svn_error_codes.h:809
-msgid "Authorization failed"
-msgstr "授權失敗"
-
-#: ../include/svn_error_codes.h:813
-msgid "Unknown authorization method"
-msgstr "未知的授權方法"
-
-#: ../include/svn_error_codes.h:817
-msgid "Repository access method not implemented"
-msgstr "該檔案庫存取方法未實作"
-
-#: ../include/svn_error_codes.h:825
-msgid "Repository has no UUID"
-msgstr "檔案庫沒有 UUID"
-
-#: ../include/svn_error_codes.h:829
-msgid "Unsupported RA plugin ABI version"
-msgstr "不支援的 RA 外掛 ABI 版本"
-
-#: ../include/svn_error_codes.h:839
-#, fuzzy
-msgid "Server can only replay from the root of a repository"
-msgstr "'%s' 不是檔案庫的根目錄"
-
-#: ../include/svn_error_codes.h:844
-#, fuzzy
-msgid "Repository UUID does not match expected UUID"
-msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
-
-#: ../include/svn_error_codes.h:849
-#, fuzzy
-msgid "Repository root URL does not match expected root URL"
-msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
-
-#: ../include/svn_error_codes.h:854
-msgid "Session URL does not match expected session URL"
-msgstr ""
-
-#: ../include/svn_error_codes.h:860
-msgid "RA layer failed to init socket layer"
-msgstr "RA 層無法起始 socket 層"
-
-#: ../include/svn_error_codes.h:864
-msgid "RA layer failed to create HTTP request"
-msgstr "RA 層建立 HTTP 要求失敗"
-
-#: ../include/svn_error_codes.h:868
-msgid "RA layer request failed"
-msgstr "RA 層要求失敗"
-
-#: ../include/svn_error_codes.h:872
-msgid "RA layer didn't receive requested OPTIONS info"
-msgstr "RA 層無法取得要求的 OPTIONS 資訊"
-
-#: ../include/svn_error_codes.h:876
-msgid "RA layer failed to fetch properties"
-msgstr "RA 層無法取得性質"
-
-#: ../include/svn_error_codes.h:880
-msgid "RA layer file already exists"
-msgstr "RA 層檔案已存在"
-
-#: ../include/svn_error_codes.h:894
-msgid "HTTP Path Not Found"
-msgstr "找不到 HTTP 路徑"
-
-#: ../include/svn_error_codes.h:898
-msgid "Failed to execute WebDAV PROPPATCH"
-msgstr "執行 WebDAV PROPPATCH 失敗"
-
-#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
-#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
-#: ../libsvn_ra_svn/marshal.c:859
-msgid "Malformed network data"
-msgstr "有缺陷的網路資料"
-
-#: ../include/svn_error_codes.h:908
-msgid "Unable to extract data from response header"
-msgstr "無法自回應檔頭取得資料"
-
-#: ../include/svn_error_codes.h:913
-#, fuzzy
-msgid "Repository has been moved"
-msgstr "檔案庫沒有 UUID"
-
-#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
-#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
-#, fuzzy
-msgid "Connection timed out"
-msgstr "網路連線無預期地關閉"
-
-#: ../include/svn_error_codes.h:923
-msgid "URL access forbidden for unknown reason"
-msgstr ""
-
-#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
-msgid "Couldn't find a repository"
-msgstr "無法找到檔案庫"
-
-#: ../include/svn_error_codes.h:933
-msgid "Couldn't open a repository"
-msgstr "無法開啟檔案庫"
-
-# as-is
-#: ../include/svn_error_codes.h:938
-msgid "Special code for wrapping server errors to report to client"
-msgstr "Special code for wrapping server errors to report to client"
-
-#: ../include/svn_error_codes.h:942
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 通訊協定命令"
-
-#: ../include/svn_error_codes.h:946
-msgid "Network connection closed unexpectedly"
-msgstr "網路連線無預期地關閉"
-
-#: ../include/svn_error_codes.h:950
-msgid "Network read/write error"
-msgstr "網路讀寫錯誤"
-
-#: ../include/svn_error_codes.h:962
-msgid "Client/server version mismatch"
-msgstr "用戶端/伺服器版本不匹配"
-
-#: ../include/svn_error_codes.h:967
-msgid "Cannot negotiate authentication mechanism"
-msgstr "無法協商出認識機制"
-
-#: ../include/svn_error_codes.h:972
-msgid "Editor drive was aborted"
-msgstr ""
-
-#: ../include/svn_error_codes.h:978
-msgid "Initialization of SSPI library failed"
-msgstr ""
-
-#: ../include/svn_error_codes.h:982
-msgid "Server SSL certificate untrusted"
-msgstr ""
-
-#: ../include/svn_error_codes.h:986
-msgid "Initialization of the GSSAPI context failed"
-msgstr ""
-
-#: ../include/svn_error_codes.h:991
-msgid "While handling serf response:"
-msgstr ""
-
-#: ../include/svn_error_codes.h:999
-msgid "Credential data unavailable"
-msgstr "無法取得憑證資料"
-
-#: ../include/svn_error_codes.h:1003
-msgid "No authentication provider available"
-msgstr "無可用的認證供給者"
-
-#: ../include/svn_error_codes.h:1007
-msgid "All authentication providers exhausted"
-msgstr "所有的認證供給者已耗盡"
-
-#: ../include/svn_error_codes.h:1011
-#, fuzzy
-msgid "Credentials not saved"
-msgstr "無法取得憑證資料"
-
-#: ../include/svn_error_codes.h:1016
-#, fuzzy
-msgid "Authentication failed"
-msgstr "授權失敗"
-
-#: ../include/svn_error_codes.h:1022
-msgid "Read access denied for root of edit"
-msgstr "編輯的根目錄讀取拒絕"
-
-#: ../include/svn_error_codes.h:1027
-msgid "Item is not readable"
-msgstr "項目無法讀取"
-
-#: ../include/svn_error_codes.h:1032
-msgid "Item is partially readable"
-msgstr "項目只有部份可讀取"
-
-#: ../include/svn_error_codes.h:1036
-msgid "Invalid authz configuration"
-msgstr "無效的 authz 設定"
-
-#: ../include/svn_error_codes.h:1041
-msgid "Item is not writable"
-msgstr "項目無法寫入"
-
-#: ../include/svn_error_codes.h:1047
-msgid "Svndiff data has invalid header"
-msgstr "svndiff 資料包含了無效的檔頭"
-
-# as-is
-#: ../include/svn_error_codes.h:1051
-msgid "Svndiff data contains corrupt window"
-msgstr "Svndiff data contains corrupt window"
-
-# as-is
-#: ../include/svn_error_codes.h:1055
-msgid "Svndiff data contains backward-sliding source view"
-msgstr "Svndiff data contains backward-sliding source view"
-
-#: ../include/svn_error_codes.h:1059
-msgid "Svndiff data contains invalid instruction"
-msgstr "svndiff 資料包含了無效的指令"
-
-#: ../include/svn_error_codes.h:1063
-msgid "Svndiff data ends unexpectedly"
-msgstr "svndiff 資料無預期地結束"
-
-#: ../include/svn_error_codes.h:1067
-msgid "Svndiff compressed data is invalid"
-msgstr "無效的 svndiff 壓縮資料"
-
-#: ../include/svn_error_codes.h:1073
-msgid "Diff data source modified unexpectedly"
-msgstr "差異的資料來源被無預期地更改"
-
-#: ../include/svn_error_codes.h:1079
-msgid "Apache has no path to an SVN filesystem"
-msgstr "Apache 沒有指向 SVN 檔案系統的路徑"
-
-#: ../include/svn_error_codes.h:1083
-msgid "Apache got a malformed URI"
-msgstr "Apache 得到一個有缺陷的 URI"
-
-# as-is
-#: ../include/svn_error_codes.h:1087
-msgid "Activity not found"
-msgstr "Activity not found"
-
-#: ../include/svn_error_codes.h:1091
-msgid "Baseline incorrect"
-msgstr "基線不正確"
-
-#: ../include/svn_error_codes.h:1095
-msgid "Input/output error"
-msgstr "輸出入錯誤"
-
-#: ../include/svn_error_codes.h:1101
-msgid "A path under version control is needed for this operation"
-msgstr "本動作僅能作用於納入版本控制的路徑"
-
-#: ../include/svn_error_codes.h:1105
-msgid "Repository access is needed for this operation"
-msgstr "本動作需要對檔案庫進行存取"
-
-#: ../include/svn_error_codes.h:1109
-msgid "Bogus revision information given"
-msgstr "使用了有問題的修訂版資訊"
-
-#: ../include/svn_error_codes.h:1113
-msgid "Attempting to commit to a URL more than once"
-msgstr "企圖對 URL 進行一次以上的送交"
-
-#: ../include/svn_error_codes.h:1117
-msgid "Operation does not apply to binary file"
-msgstr "本動作不適用於二進制檔案"
-
-#: ../include/svn_error_codes.h:1123
-msgid "Format of an svn:externals property was invalid"
-msgstr "svn:externals 性質的格式是無效的"
-
-#: ../include/svn_error_codes.h:1127
-msgid "Attempting restricted operation for modified resource"
-msgstr "企圖對已修改的資源進行受限的作業"
-
-#: ../include/svn_error_codes.h:1131
-msgid "Operation does not apply to directory"
-msgstr "本動作不適用於目錄"
-
-#: ../include/svn_error_codes.h:1135
-msgid "Revision range is not allowed"
-msgstr "不允許的修訂版範圍"
-
-#: ../include/svn_error_codes.h:1139
-msgid "Inter-repository relocation not allowed"
-msgstr "不支援不同檔案庫之間的重新安置 (relocation)"
-
-#: ../include/svn_error_codes.h:1143
-msgid "Author name cannot contain a newline"
-msgstr "作者名稱不可包含換列字元"
-
-#: ../include/svn_error_codes.h:1147
-msgid "Bad property name"
-msgstr "有問題的性質名稱"
-
-#: ../include/svn_error_codes.h:1152
-msgid "Two versioned resources are unrelated"
-msgstr "兩個納入版本控制的資源沒有相關性"
-
-#: ../include/svn_error_codes.h:1157
-msgid "Path has no lock token"
-msgstr "路徑無鎖定符記"
-
-#: ../include/svn_error_codes.h:1162
-#, fuzzy
-msgid "Operation does not support multiple sources"
-msgstr "本動作不適用於目錄"
-
-#: ../include/svn_error_codes.h:1167
-msgid "No versioned parent directories"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1172
-#, fuzzy
-msgid "Working copy and merge source not ready for reintegration"
-msgstr "工作複本的合併來源需特別指定修訂版"
-
-#: ../include/svn_error_codes.h:1177
-msgid "A file external cannot overwrite an existing versioned item"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1182
-#, fuzzy
-msgid "Invalid path component strip count specified"
-msgstr "提供了無效的版本號碼"
-
-#: ../include/svn_error_codes.h:1187
-msgid "Detected a cycle while processing the operation"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1193
-#, fuzzy
-msgid "A problem occurred; see other errors for details"
-msgstr "有問題發生; 請參閱隨附的細節"
-
-#: ../include/svn_error_codes.h:1197
-msgid "Failure loading plugin"
-msgstr "載入外掛失敗"
-
-#: ../include/svn_error_codes.h:1201
-msgid "Malformed file"
-msgstr "有缺陷的檔案"
-
-#: ../include/svn_error_codes.h:1205
-msgid "Incomplete data"
-msgstr "不完全的資料"
-
-#: ../include/svn_error_codes.h:1209
-msgid "Incorrect parameters given"
-msgstr "使用不正確的參數"
-
-#: ../include/svn_error_codes.h:1213
-msgid "Tried a versioning operation on an unversioned resource"
-msgstr "試著對未納入版本控制的資源進行版本控制動作"
-
-#: ../include/svn_error_codes.h:1217
-msgid "Test failed"
-msgstr "測試失敗"
-
-#: ../include/svn_error_codes.h:1221
-msgid "Trying to use an unsupported feature"
-msgstr "試著要使用不支援的功能"
-
-#: ../include/svn_error_codes.h:1225
-msgid "Unexpected or unknown property kind"
-msgstr "不預期或未知的性質種類"
-
-#: ../include/svn_error_codes.h:1229
-msgid "Illegal target for the requested operation"
-msgstr "對要求的動作來說是不合法的目標"
-
-#: ../include/svn_error_codes.h:1233
-msgid "MD5 checksum is missing"
-msgstr "沒有 MD5 檢查值"
-
-#: ../include/svn_error_codes.h:1237
-msgid "Directory needs to be empty but is not"
-msgstr "目錄必須為空的, 但是結果並非如此"
-
-#: ../include/svn_error_codes.h:1241
-msgid "Error calling external program"
-msgstr "呼叫外部程式時發生錯誤"
-
-#: ../include/svn_error_codes.h:1245
-msgid "Python exception has been set with the error"
-msgstr "Python 例外已被設定為錯誤"
-
-#: ../include/svn_error_codes.h:1249
-msgid "A checksum mismatch occurred"
-msgstr "總和檢查值不符"
-
-#: ../include/svn_error_codes.h:1253
-msgid "The operation was interrupted"
-msgstr "動作被中斷"
-
-#: ../include/svn_error_codes.h:1257
-msgid "The specified diff option is not supported"
-msgstr "指定的 diff 選項不支援"
-
-#: ../include/svn_error_codes.h:1261
-msgid "Property not found"
-msgstr "找不到性質"
-
-#: ../include/svn_error_codes.h:1265
-msgid "No auth file path available"
-msgstr "未提供 auth 檔案路徑"
-
-#: ../include/svn_error_codes.h:1270
-msgid "Incompatible library version"
-msgstr "不相容的程式庫版本"
-
-#: ../include/svn_error_codes.h:1275
-msgid "Mergeinfo parse error"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1280
-msgid "Cease invocation of this API"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1285
-#, fuzzy
-msgid "Error parsing revision number"
-msgstr "剖析修訂版 '%s' 時發生語法錯誤"
-
-#: ../include/svn_error_codes.h:1290
-msgid "Iteration terminated before completion"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1295
-#, fuzzy
-msgid "Unknown changelist"
-msgstr "沒有這樣的項目: '%s'"
-
-#: ../include/svn_error_codes.h:1300
-#, fuzzy
-msgid "Reserved directory name in command line arguments"
-msgstr "無法初始化命令列引數"
-
-#: ../include/svn_error_codes.h:1305
-msgid "Inquiry about unknown capability"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1310
-#, fuzzy
-msgid "Test skipped"
-msgstr "測試失敗"
-
-#: ../include/svn_error_codes.h:1315
-msgid "apr memcache library not available"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1320
-msgid "Couldn't perform atomic initialization"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1325
-#, fuzzy
-msgid "SQLite error"
-msgstr "寫入錯誤"
-
-#: ../include/svn_error_codes.h:1330
-#, fuzzy
-msgid "Attempted to write to readonly SQLite db"
-msgstr "企圖寫至非異動"
-
-#: ../include/svn_error_codes.h:1335
-msgid "Unsupported schema found in SQLite db"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1340
-msgid "The SQLite db is busy"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1345
-msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
-msgstr ""
-
-#: ../include/svn_error_codes.h:1352
-#, fuzzy
-msgid "Error parsing arguments"
-msgstr "用戶端於剖析引數時發生錯誤"
-
-#: ../include/svn_error_codes.h:1356
-#, fuzzy
-msgid "Not enough arguments provided"
-msgstr "未提供足夠的引數"
-
-#: ../include/svn_error_codes.h:1360
-msgid "Mutually exclusive arguments specified"
-msgstr "指定了互斥的引數"
-
-#: ../include/svn_error_codes.h:1364
-msgid "Attempted command in administrative dir"
-msgstr "企圖於管理目錄中執行命令"
-
-#: ../include/svn_error_codes.h:1368
-msgid "The log message file is under version control"
-msgstr "紀錄訊息檔於版本控制之下"
-
-#: ../include/svn_error_codes.h:1372
-msgid "The log message is a pathname"
-msgstr "紀錄訊息是路徑名"
-
-#: ../include/svn_error_codes.h:1376
-msgid "Committing in directory scheduled for addition"
-msgstr "於預計新增的目錄中進行送交"
-
-#: ../include/svn_error_codes.h:1380
-msgid "No external editor available"
-msgstr "無法使用外部編輯器"
-
-#: ../include/svn_error_codes.h:1384
-msgid "Something is wrong with the log message's contents"
-msgstr "紀錄訊息的內容有不妥的地方"
-
-#: ../include/svn_error_codes.h:1388
-msgid "A log message was given where none was necessary"
-msgstr "給了一個送交訊息, 但是根本不需要"
-
-#: ../include/svn_error_codes.h:1392
-#, fuzzy
-msgid "No external merge tool available"
-msgstr "無法使用外部編輯器"
-
-#: ../include/svn_error_codes.h:1396
-#, fuzzy
-msgid "Failed processing one or more externals definitions"
-msgstr "忽略外部定義"
-
-#: ../include/svn_error_codes.h:1402
-#, fuzzy
-msgid "Assertion failure"
-msgstr "授權失敗"
-
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:392
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:447
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:554
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:610
-msgid "GNOME Keyring is locked and we are non-interactive"
-msgstr ""
-
-#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:881
-#: ../libsvn_wc/workqueue.c:1658 ../libsvn_wc/workqueue.c:1740
-#, c-format
-msgid "'%s' not found"
-msgstr "找不到 '%s'"
-
-#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
-#: ../libsvn_wc/adm_ops.c:886
-#, c-format
-msgid "Unsupported node kind for path '%s'"
-msgstr "路徑 '%s' 為不支援的節點種類"
-
-#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
-#: ../libsvn_subr/opt.c:878
-#, c-format
-msgid "'%s' ends in a reserved name"
-msgstr ""
-
-#: ../libsvn_client/add.c:580 ../libsvn_client/changelist.c:116
-#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
-#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
-#: ../libsvn_client/export.c:952 ../libsvn_client/resolved.c:54
-#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:274
-#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
-#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
-#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
-#: ../svn/upgrade-cmd.c:72
-#, fuzzy, c-format
-msgid "'%s' is not a local path"
-msgstr "'%s' 不是檔案"
-
-#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
-#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
-#, fuzzy, c-format
-msgid "Illegal repository URL '%s'"
-msgstr "不合法的 svn 檔案庫 URL '%s'"
-
-#: ../libsvn_client/blame.c:397
-#, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "無法為二進制檔案 '%s' 計算譴責資訊"
-
-#: ../libsvn_client/blame.c:627
-msgid "Start revision must precede end revision"
-msgstr "起始修訂版必須大於結束修訂版"
-
-#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1038
-#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:429
-#: ../libsvn_client/prop_commands.c:947 ../libsvn_client/prop_commands.c:1264
-#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2008
-#: ../libsvn_wc/adm_ops.c:2042 ../libsvn_wc/copy.c:596
-#: ../libsvn_wc/entries.c:1405 ../libsvn_wc/entries.c:2450
-#: ../libsvn_wc/entries.c:2481 ../libsvn_wc/node.c:1247
-#: ../libsvn_wc/update_editor.c:4171
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' 尚未納入版本控制"
-
-#: ../libsvn_client/cat.c:79
-#, c-format
-msgid "'%s' refers to a directory"
-msgstr "'%s' 指向一個目錄"
-
-#: ../libsvn_client/cat.c:89
-#, c-format
-msgid "'%s' has no base revision until it is committed"
-msgstr ""
-
-# as-is
-#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
-msgid "(local)"
-msgstr "(local)"
-
-#: ../libsvn_client/cat.c:236
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "URL '%s' 指向一個目錄"
-
-#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
-#, c-format
-msgid "URL '%s' doesn't exist"
-msgstr "URL '%s' 不存在"
-
-#: ../libsvn_client/checkout.c:168
-#, c-format
-msgid "URL '%s' refers to a file, not a directory"
-msgstr "URL '%s' 指向一個檔案, 而非目錄"
-
-#: ../libsvn_client/checkout.c:204
-#, fuzzy, c-format
-msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
-msgstr "'%s' 已是不同 URL 的工作複本"
-
-#: ../libsvn_client/checkout.c:212
-#, c-format
-msgid "'%s' already exists and is not a directory"
-msgstr "'%s' 已存在, 但不是目錄"
-
-#: ../libsvn_client/cmdline.c:78
-#, fuzzy, c-format
-msgid "Improper relative URL '%s'"
-msgstr "'%s' 的性質:\n"
-
-#: ../libsvn_client/cmdline.c:149
-#, c-format
-msgid "All non-relative targets must have the same root URL"
-msgstr ""
-
-#: ../libsvn_client/commit.c:433
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "路徑 '%s' 為未知或未納入版本控制的種類"
-
-#: ../libsvn_client/commit.c:538
-msgid "New entry name required when importing a file"
-msgstr "匯入檔案時, 需要一個新的項目名稱"
-
-#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:567
-#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
-#, c-format
-msgid "'%s' does not exist"
-msgstr "'%s' 不存在"
-
-#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
-#: ../libsvn_client/merge.c:8975 ../libsvn_client/merge.c:10231
-#: ../libsvn_client/merge.c:10506 ../svnlook/main.c:1407
-#, c-format
-msgid "Path '%s' does not exist"
-msgstr "路徑 '%s' 不存在"
-
-#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
-#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
-#: ../libsvn_client/copy.c:1860
-#, c-format
-msgid "Path '%s' already exists"
-msgstr "路徑 '%s' 已存在"
-
-#: ../libsvn_client/commit.c:810
-#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "'%s' 是一個保留的名稱, 無法被匯入"
-
-#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
-msgid "Commit failed (details follow):"
-msgstr "送交失敗 (細節隨附):"
-
-#: ../libsvn_client/commit.c:856
-msgid "Commit succeeded, but other errors follow:"
-msgstr "送交成功, 但是發生了其它的錯誤, 如後:"
-
-#: ../libsvn_client/commit.c:863
-msgid "Error unlocking locked dirs (details follow):"
-msgstr "解除鎖定目錄時發生錯誤 (細節隨附):"
-
-#: ../libsvn_client/commit.c:874
-msgid "Error bumping revisions post-commit (details follow):"
-msgstr "post-commit 增加修訂版時發生錯誤 (細節隨附):"
-
-#: ../libsvn_client/commit.c:968
-#, fuzzy
-msgid "Are all targets part of the same working copy?"
-msgstr "是否所有的目標都是同一個工作複本的一部份?"
-
-#: ../libsvn_client/commit.c:1007
-#, fuzzy
-msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
-msgstr "無法以非遞迴式送交目錄刪除"
-
-#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
-#, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "'%s' 是 URL, 但是 URL 不可為送交的目標"
-
-#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:132
-#, fuzzy, c-format
-msgid "Directory '%s' is out of date"
-msgstr "目錄 '%s' 沒有 URL"
-
-#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:134
-#, fuzzy, c-format
-msgid "File '%s' is out of date"
-msgstr "項目已過時"
-
-#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
-#: ../libsvn_client/commit_util.c:1032
-#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "中止送交: '%s' 仍處於衝突狀態"
-
-#: ../libsvn_client/commit_util.c:330
-#, fuzzy, c-format
-msgid "Aborting commit: '%s' remains in tree-conflict"
-msgstr "中止送交: '%s' 仍處於衝突狀態"
-
-#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
-#, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "未知的項目類型 '%s'"
-
-#: ../libsvn_client/commit_util.c:457
-#, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "項目 '%s' 不預期地變換特殊狀態"
-
-#: ../libsvn_client/commit_util.c:654
-#, fuzzy, c-format
-msgid "'%s' is scheduled for addition, but is missing"
-msgstr "'%s' 於未納入版本控制的父路徑中被排入新增時程"
-
-#: ../libsvn_client/commit_util.c:935
-#, c-format
-msgid "'%s' is not under version control and is not part of the commit, yet its child '%s' is part of the commit"
-msgstr "'%s' 尚未納入版本控制, 也不是送交的一部份, 但是它的子路徑 '%s' 是送交的一部份"
-
-#: ../libsvn_client/commit_util.c:1052 ../libsvn_client/url.c:198
-#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "'%s' 的項目沒有 URL"
-
-#: ../libsvn_client/commit_util.c:1069
-#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "'%s' 於未納入版本控制的父路徑中被排入新增時程"
-
-#: ../libsvn_client/commit_util.c:1210
-#, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr "無法送交 '%s' 與 '%s', 因為它們都指向同一個 URL"
-
-#: ../libsvn_client/commit_util.c:1367
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "送交項目 '%s' 有複製旗標, 但是沒有 copyfrom URL"
-
-#: ../libsvn_client/commit_util.c:1372
-#, c-format
-msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "送交項目 '%s' 有複製旗標, 但是修訂版無效"
-
-#: ../libsvn_client/commit_util.c:2080
-msgid "Standard properties can't be set explicitly as revision properties"
-msgstr ""
-
-#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1876
-#, c-format
-msgid "Path '%s' is not a directory"
-msgstr "路徑 '%s' 不是目錄"
-
-#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
-#, fuzzy, c-format
-msgid "Path '%s' already exists, but is not a directory"
-msgstr "'%s' 已存在, 但不是目錄"
-
-#: ../libsvn_client/copy.c:775
-#, fuzzy
-msgid "Source and destination URLs appear not to all point to the same repository."
-msgstr "來源與目的似乎不在同一個檔案庫中 (來源: '%s'; 目的: '%s')"
-
-#: ../libsvn_client/copy.c:985
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "無法移動 URL '%s' 至本身"
-
-#: ../libsvn_client/copy.c:1007 ../libsvn_client/prop_commands.c:229
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "路徑 '%s' 不存在於修訂版 %ld"
-
-#: ../libsvn_client/copy.c:1536
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "來源 URL '%s' 來自其它的檔案庫; 把它當作是脫離的 WC"
-
-#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
-#: ../libsvn_wc/adm_ops.c:941 ../libsvn_wc/copy.c:691
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "'%s' 已納入版本控制"
-
-#: ../libsvn_client/copy.c:1671
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "存在 '%s' 的項目 (不過工作檔案已消失)"
-
-#: ../libsvn_client/copy.c:1844
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "路徑 '%s' 於修訂版 %ld 中找不到"
-
-#: ../libsvn_client/copy.c:1849
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "路徑 '%s' 於 HEAD 修訂版中找不到"
-
-#: ../libsvn_client/copy.c:1970
-#, fuzzy
-msgid "Cannot mix repository and working copy sources"
-msgstr "路徑不是工作複本檔案"
-
-#: ../libsvn_client/copy.c:2022
-#, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "無法複製路徑 '%s' 至其子目錄 '%s' 中"
-
-#: ../libsvn_client/copy.c:2054
-#, c-format
-msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
-msgstr ""
-
-#: ../libsvn_client/copy.c:2069
-msgid "Moves between the working copy and the repository are not supported"
-msgstr ""
-
-#: ../libsvn_client/copy.c:2083
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "無法移動路徑 '%s' 至其本身"
-
-#: ../libsvn_client/copy.c:2152
-#, fuzzy, c-format
-msgid "'%s' does not have a URL associated with it"
-msgstr "'%s' 似乎沒有關聯的 URL"
-
-#: ../libsvn_client/delete.c:59
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "'%s' 擋了實際納入版本控制資源的路"
-
-#: ../libsvn_client/delete.c:74
-#, fuzzy, c-format
-msgid "'%s' has local modifications -- commit or revert them first"
-msgstr "'%s' 已有本地修改"
-
-#: ../libsvn_client/delete.c:104
-#, c-format
-msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
-msgstr ""
-
-#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
-#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
-#, fuzzy, c-format
-msgid "Cannot mix repository and working copy targets"
-msgstr "路徑不是工作複本檔案"
-
-#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移動動作不可指定修訂版 (HEAD 除外)"
-
-#: ../libsvn_client/deprecated.c:1331
-msgid "No commits in repository"
-msgstr "檔案庫中沒有任何送交"
-
-#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
-#, fuzzy
-msgid "Non-recursive relocation not supported"
-msgstr "不支援不同檔案庫之間的重新安置 (relocation)"
-
-#: ../libsvn_client/diff.c:136
-#, fuzzy, c-format
-msgid " Reverse-merged %s:r%s%s"
-msgstr "已復原 '%s'\n"
-
-#: ../libsvn_client/diff.c:151
-#, c-format
-msgid " Merged %s:r%s%s"
-msgstr ""
-
-#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1226
-#: ../libsvn_diff/diff_file.c:1242
-#, c-format
-msgid "Path '%s' must be an immediate child of the directory '%s'"
-msgstr ""
-
-# as-is
-#: ../libsvn_client/diff.c:359
-#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(revision %ld)"
-
-# as-is
-#: ../libsvn_client/diff.c:361
-#, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(working copy)"
-
-# as-is
-#: ../libsvn_client/diff.c:637
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%sProperty changes on: %s%s"
-
-#: ../libsvn_client/diff.c:921
-#, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "無法顯示: 檔案標示為二進制類型. %s"
-
-#: ../libsvn_client/diff.c:1326
-#, fuzzy, c-format
-msgid "Path '%s' has no URL"
-msgstr "'%s' 沒有 URL"
-
-#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
-#: ../libsvn_client/merge.c:8984
-msgid "Not all required revisions are specified"
-msgstr "並未提供全部所需的修訂版"
-
-#: ../libsvn_client/diff.c:1410
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "對於 peg 差異, 必須至少有一個非本地端的修訂版"
-
-#: ../libsvn_client/diff.c:1518 ../libsvn_client/diff.c:1530
-#, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "'%s' 於檔案庫的修訂版 %ld 找不到"
-
-#: ../libsvn_client/diff.c:1588
-#, fuzzy
-msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
-msgstr "抱歉, svn_client_diff3 以尚不支援的方式被叫用"
-
-#: ../libsvn_client/diff.c:1630
-msgid "Only diffs between a path's text-base and its working files are supported at this time"
-msgstr "目前只支援路徑的文件參考基礎與其工作檔案之間的檔案差異"
-
-#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
-#, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目錄 '%s' 沒有 URL"
-
-# as-is
-#: ../libsvn_client/diff.c:2064
-msgid "Summarizing diff can only compare repository to repository"
-msgstr "Summarizing diff can only compare repository to repository"
-
-#: ../libsvn_client/export.c:92
-#, c-format
-msgid "'%s' is not a valid EOL value"
-msgstr "'%s' 不是一個有效的 EOL 值"
-
-#: ../libsvn_client/export.c:377
-msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr "目的目錄已存在, 除非強迫為之, 否則不會複寫過去"
-
-#: ../libsvn_client/export.c:532 ../libsvn_client/export.c:678
-#, c-format
-msgid "'%s' exists and is not a directory"
-msgstr "'%s' 已存在, 但不是目錄"
-
-#: ../libsvn_client/export.c:536 ../libsvn_client/export.c:682
-#, c-format
-msgid "'%s' already exists"
-msgstr "'%s' 已存在"
-
-#: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch for '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"表現 '%s' 的總和檢查值不一致:\n"
-" 預期: %s\n"
-" 實際: %s\n"
-
-#: ../libsvn_client/externals.c:364
-#, c-format
-msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
-msgstr ""
-
-#: ../libsvn_client/externals.c:401
-#, c-format
-msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
-msgstr ""
-
-#: ../libsvn_client/externals.c:427
-#, c-format
-msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
-msgstr ""
-
-#: ../libsvn_client/externals.c:536
-#, fuzzy, c-format
-msgid "URL '%s' does not begin with a scheme"
-msgstr "URL '%s' 不存在"
-
-#: ../libsvn_client/externals.c:603
-#, fuzzy, c-format
-msgid "Illegal parent directory URL '%s'"
-msgstr "不合法的 svn 檔案庫 URL '%s'"
-
-#: ../libsvn_client/externals.c:639
-#, fuzzy, c-format
-msgid "Illegal repository root URL '%s'"
-msgstr "不合法的 svn 檔案庫 URL '%s'"
-
-#: ../libsvn_client/externals.c:686
-#, c-format
-msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
-msgstr ""
-
-#: ../libsvn_client/externals.c:714
-#, fuzzy, c-format
-msgid "Unrecognized format for the relative external URL '%s'"
-msgstr "無法辨識要求的 '%s' 的修訂版類別"
-
-#: ../libsvn_client/externals.c:806
-#, fuzzy, c-format
-msgid "URL '%s' at revision %ld doesn't exist"
-msgstr "URL '%s' 不存在"
-
-#: ../libsvn_client/externals.c:812
-#, fuzzy, c-format
-msgid "URL '%s' at revision %ld is not a file or a directory"
-msgstr "'%s' 不是檔案或目錄"
-
-#: ../libsvn_client/externals.c:1111
-#, c-format
-msgid "Traversal of '%s' found no ambient depth"
-msgstr ""
-
-#: ../libsvn_client/externals.c:1262
-#, fuzzy, c-format
-msgid "'%s' is not a URL"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
-#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5358
-#: ../libsvn_wc/wc_db.c:596 ../libsvn_wc/wc_db.c:2039
-#: ../libsvn_wc/wc_db.c:2132 ../libsvn_wc/wc_db.c:2191
-#: ../libsvn_wc/wc_db.c:2215 ../libsvn_wc/wc_db.c:5456
-#: ../libsvn_wc/wc_db.c:5884 ../libsvn_wc/wc_db.c:6834
-#: ../libsvn_wc/wc_db.c:6952 ../libsvn_wc/wc_db.c:7016
-#: ../libsvn_wc/wc_db.c:7228 ../libsvn_wc/wc_db.c:8277
-#: ../libsvn_wc/wc_db.c:8457 ../libsvn_wc/wc_db.c:8795
-#, fuzzy, c-format
-msgid "The node '%s' was not found."
-msgstr "找不到路徑 '%s'"
-
-#: ../libsvn_client/info.c:565
-#, fuzzy, c-format
-msgid "Server does not support retrieving information about the repository root"
-msgstr "伺服器不支援鎖定功能"
-
-#: ../libsvn_client/info.c:572 ../libsvn_client/info.c:587
-#: ../libsvn_client/info.c:597
-#, c-format
-msgid "URL '%s' non-existent in revision %ld"
-msgstr "URL '%s' 並不存在於修訂版 %ld 中"
-
-#: ../libsvn_client/list.c:249
-#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "URL '%s' 並不存在於該修訂版中"
-
-#: ../libsvn_client/locking_commands.c:237
-msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "找不到共同的父路徑, 無法對不相交的引數進行處理"
-
-#: ../libsvn_client/locking_commands.c:282 ../libsvn_client/merge.c:9006
-#: ../libsvn_client/merge.c:9013 ../libsvn_client/merge.c:10240
-#: ../libsvn_client/merge.c:10515 ../libsvn_client/ra.c:484
-#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
-#, c-format
-msgid "'%s' has no URL"
-msgstr "'%s' 沒有 URL"
-
-#: ../libsvn_client/locking_commands.c:305
-msgid "Unable to lock/unlock across multiple repositories"
-msgstr "無法在多個檔案庫之間進行鎖定/解鎖"
-
-#: ../libsvn_client/locking_commands.c:346
-#, c-format
-msgid "'%s' is not locked in this working copy"
-msgstr "'%s' 未於這個工作複本中鎖定"
-
-#: ../libsvn_client/locking_commands.c:391
-#, c-format
-msgid "'%s' is not locked"
-msgstr "'%s' 未被鎖定"
-
-#: ../libsvn_client/locking_commands.c:425 ../libsvn_fs/fs-loader.c:1269
-#: ../libsvn_ra/ra_loader.c:1056
-#, fuzzy
-msgid "Lock comment contains illegal characters"
-msgstr "鎖定註解含有不合法的字元"
-
-#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
-msgid "Missing required revision specification"
-msgstr "未提供要求的修訂版規格"
-
-#: ../libsvn_client/log.c:401
-#, fuzzy, c-format
-msgid "'%s' is not a relative path"
-msgstr "'%s' 不是檔案"
-
-#: ../libsvn_client/log.c:422
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "指定工作複本路徑時, 只可提供一個目標"
-
-#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:388
-#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "項目 '%s' 沒有 URL"
-
-#: ../libsvn_client/merge.c:179
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URL 中沒有綱要 ('%s' 與 '%s')"
-
-#: ../libsvn_client/merge.c:185 ../libsvn_client/merge.c:191
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL 中沒有綱要: '%s'"
-
-#: ../libsvn_client/merge.c:198
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支援混合的存取綱要 ('%s' 與 '%s')"
-
-# as-is
-#. xgettext: the '.working', '.merge-left.r%ld' and
-#. '.merge-right.r%ld' strings are used to tag onto a file
-#. name in case of a merge conflict
-#: ../libsvn_client/merge.c:1482
-msgid ".working"
-msgstr ".working"
-
-# as-is
-#: ../libsvn_client/merge.c:1484
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
-
-# as-is
-#: ../libsvn_client/merge.c:1487
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
-
-#: ../libsvn_client/merge.c:3957
-msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
-msgstr ""
-
-#: ../libsvn_client/merge.c:4661
-#, c-format
-msgid ""
-"One or more conflicts were produced while merging r%ld:%ld into\n"
-"'%s' --\n"
-"resolve all conflicts and rerun the merge to apply the remaining\n"
-"unmerged revisions"
-msgstr ""
-
-#: ../libsvn_client/merge.c:5820
-msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
-msgstr ""
-
-#: ../libsvn_client/merge.c:8502
-msgid "Use of two URLs is not compatible with mergeinfo modification"
-msgstr ""
-
-#: ../libsvn_client/merge.c:8509 ../libsvn_client/merge.c:8793
-msgid "Merge from foreign repository is not compatible with mergeinfo modification"
-msgstr ""
-
-#: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
-#: ../libsvn_client/merge.c:10523
-#, fuzzy, c-format
-msgid "Merge target '%s' does not exist in the working copy"
-msgstr "'%s' 未於這個工作複本中鎖定"
-
-#: ../libsvn_client/merge.c:8896
-#, fuzzy
-msgid "Cannot merge into a working copy with a switched subtree"
-msgstr "路徑不是工作複本檔案"
-
-#: ../libsvn_client/merge.c:8901
-#, fuzzy
-msgid "Cannot merge into a working copy that has local modifications"
-msgstr "路徑不是工作複本檔案"
-
-#: ../libsvn_client/merge.c:8918
-#, fuzzy
-msgid "Cannot determine revision of working copy"
-msgstr "路徑不是工作複本檔案"
-
-#: ../libsvn_client/merge.c:8924
-#, c-format
-msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
-msgstr ""
-
-#: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
-msgid "Merge sources must both be either paths or URLs"
-msgstr ""
-
-#: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
-#, c-format
-msgid "'%s' isn't in the same repository as '%s'"
-msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-
-#: ../libsvn_client/merge.c:10057 ../libsvn_client/merge.c:10348
-#, c-format
-msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
-msgstr ""
-
-#: ../libsvn_client/merge.c:10258
-#, fuzzy, c-format
-msgid "'%s' must be from the same repository as '%s'"
-msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-
-#: ../libsvn_client/merge.c:10290
-#, fuzzy, c-format
-msgid "Neither the reintegrate source nor target can be the root of the repository"
-msgstr "'%s' 不是檔案庫的根目錄"
-
-#: ../libsvn_client/merge.c:10376
-#, c-format
-msgid ""
-"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
-"%s"
-msgstr ""
-
-#: ../libsvn_client/mergeinfo.c:1721
-msgid "Only depths 'infinity' and 'empty' are currently supported"
-msgstr ""
-
-#: ../libsvn_client/patch.c:243
-#, fuzzy, c-format
-msgid "Cannot strip %u components from '%s'"
-msgstr "無法寫入 '%s' 的性質雜湊"
-
-#: ../libsvn_client/patch.c:2754
-#, fuzzy
-msgid "strip count must be positive"
-msgstr "--limit 的引數必須為正數"
-
-#: ../libsvn_client/prop_commands.c:80
-#, c-format
-msgid "'%s' is a wcprop, thus not accessible to clients"
-msgstr "'%s' 是工作複本性質, 因此無法供用戶端存取"
-
-#: ../libsvn_client/prop_commands.c:216
-#, fuzzy, c-format
-msgid "Property '%s' is not a regular property"
-msgstr "性質 '%s' 是項目性質"
-
-#: ../libsvn_client/prop_commands.c:363
-#, c-format
-msgid "Revision property '%s' not allowed in this context"
-msgstr "修訂版性質 '%s' 在此文脈中並不允許"
-
-#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
-#, c-format
-msgid "Bad property name: '%s'"
-msgstr "有問題的性質名稱: '%s'"
-
-#: ../libsvn_client/prop_commands.c:380
-#, fuzzy, c-format
-msgid "Setting property on non-local target '%s' needs a base revision"
-msgstr "設定非本地目標 '%s' 的性質尚不支援"
-
-#: ../libsvn_client/prop_commands.c:385
-#, fuzzy, c-format
-msgid "Setting property recursively on non-local target '%s' is not supported"
-msgstr "設定非本地目標 '%s' 的性質尚不支援"
-
-#: ../libsvn_client/prop_commands.c:400
-#, fuzzy, c-format
-msgid "Setting property '%s' on non-local target '%s' is not supported"
-msgstr "設定非本地目標 '%s' 的性質尚不支援"
-
-#: ../libsvn_client/prop_commands.c:471
-#, c-format
-msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
-msgstr ""
-
-#: ../libsvn_client/prop_commands.c:480
-#, c-format
-msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
-msgstr ""
-
-#: ../libsvn_client/prop_commands.c:488
-#, c-format
-msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
-msgstr ""
-
-#: ../libsvn_client/prop_commands.c:519
-#, fuzzy
-msgid "Author name should not contain a newline; value will not be set unless forced"
-msgstr "除非強迫為之, 否則其值不會被設定"
-
-#: ../libsvn_client/prop_commands.c:764
-#, c-format
-msgid "'%s' does not exist in revision %ld"
-msgstr "'%s' 不存在於修訂版 %ld"
-
-#: ../libsvn_client/prop_commands.c:771 ../libsvn_client/prop_commands.c:1089
-#: ../libsvn_wc/crop.c:183
-#, c-format
-msgid "Unknown node kind for '%s'"
-msgstr "'%s' 為未知的節點類型"
-
-#: ../libsvn_client/ra.c:145
-#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr "企圖在非送交動作中, 設定工作複本性質 '%s' 於 '%s'"
-
-#: ../libsvn_client/ra.c:378
-#, c-format
-msgid "Redirect cycle detected for URL '%s'"
-msgstr ""
-
-#: ../libsvn_client/ra.c:750 ../libsvn_ra/compat.c:376
-#, c-format
-msgid "Unable to find repository location for '%s' in revision %ld"
-msgstr "無法找到 '%s' 的檔案庫位置於修訂版 %ld"
-
-#: ../libsvn_client/ra.c:757
-#, c-format
-msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
-msgstr "'%s' 的位置對應至修訂版 %ld 並不存在於檔案庫之中, 或是指向一個無關的物件"
-
-#: ../libsvn_client/relocate.c:115
-#, c-format
-msgid "'%s' is not the root of the repository"
-msgstr "'%s' 不是檔案庫的根目錄"
-
-#: ../libsvn_client/relocate.c:122
-#, c-format
-msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "於 '%s' 的檔案庫有 uuid '%s', 但是工作複本的是 '%s'"
-
-#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:136
-#, c-format
-msgid "Path '%s' has no committed revision"
-msgstr "路徑 '%s' 沒有被送交的修訂版"
-
-#: ../libsvn_client/revisions.c:162
-#, c-format
-msgid "Unrecognized revision type requested for '%s'"
-msgstr "無法辨識要求的 '%s' 的修訂版類別"
-
-#: ../libsvn_client/revisions.c:185
-msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
-msgstr ""
-
-#: ../libsvn_client/status.c:302 ../libsvn_client/status.c:331
-#: ../libsvn_client/status.c:340 ../libsvn_client/status.c:533
-#: ../libsvn_wc/lock.c:539 ../libsvn_wc/lock.c:899 ../libsvn_wc/lock.c:1598
-#: ../libsvn_wc/wc_db.c:7808 ../libsvn_wc/wc_db_pdh.c:485
-#, c-format
-msgid "'%s' is not a working copy"
-msgstr "'%s' 不是工作複本"
-
-#: ../libsvn_client/switch.c:102
-#, c-format
-msgid "Cannot both exclude and switch a path"
-msgstr ""
-
-#: ../libsvn_client/switch.c:175 ../libsvn_ra_local/ra_plugin.c:199
-#: ../libsvn_ra_local/ra_plugin.c:275 ../libsvn_wc/update_editor.c:5032
-#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
-msgstr ""
-"'%s'\n"
-"與\n"
-"'%s'\n"
-"並不在同一個檔案庫中"
-
-#: ../libsvn_client/util.c:215
-#, fuzzy, c-format
-msgid "URL '%s' is not a child of repository root URL '%s'"
-msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-
-#: ../libsvn_delta/svndiff.c:165
-msgid "Compression of svndiff data failed"
-msgstr "svndiff 資料壓縮失敗"
-
-#: ../libsvn_delta/svndiff.c:432
-#, fuzzy
-msgid "Decompression of svndiff data failed: no size"
-msgstr "svndiff 資料解壓縮失敗"
-
-#: ../libsvn_delta/svndiff.c:435
-#, fuzzy
-msgid "Decompression of svndiff data failed: size too large"
-msgstr "svndiff 資料解壓縮失敗"
-
-#: ../libsvn_delta/svndiff.c:456
-msgid "Decompression of svndiff data failed"
-msgstr "svndiff 資料解壓縮失敗"
-
-#: ../libsvn_delta/svndiff.c:463
-msgid "Size of uncompressed data does not match stored original length"
-msgstr "解壓縮後的資料大小與儲存的原始長度不符"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:538
-#, c-format
-msgid "Invalid diff stream: insn %d cannot be decoded"
-msgstr "Invalid diff stream: insn %d cannot be decoded"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:542
-#, fuzzy, c-format
-msgid "Invalid diff stream: insn %d has length zero"
-msgstr "Invalid diff stream: insn %d has non-positive length"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:546
-#, c-format
-msgid "Invalid diff stream: insn %d overflows the target view"
-msgstr "Invalid diff stream: insn %d overflows the target view"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:555
-#, c-format
-msgid "Invalid diff stream: [src] insn %d overflows the source view"
-msgstr "Invalid diff stream: [src] insn %d overflows the source view"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:562
-#, c-format
-msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:569
-#, c-format
-msgid "Invalid diff stream: [new] insn %d overflows the new data section"
-msgstr "Invalid diff stream: [new] insn %d overflows the new data section"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:579
-msgid "Delta does not fill the target window"
-msgstr "Delta does not fill the target window"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:582
-msgid "Delta does not contain enough new data"
-msgstr "Delta does not contain enough new data"
-
-#: ../libsvn_delta/svndiff.c:688
-msgid "Svndiff has invalid header"
-msgstr "Svndiff 資料包含了無效的檔頭"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:744 ../libsvn_delta/svndiff.c:908
-#, fuzzy
-msgid "Svndiff contains a too-large window"
-msgstr "Svndiff data contains corrupt window"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:751 ../libsvn_delta/svndiff.c:915
-msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff contains corrupt window header"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:760
-msgid "Svndiff has backwards-sliding source views"
-msgstr "Svndiff has backwards-sliding source views"
-
-# as-is
-#: ../libsvn_delta/svndiff.c:809 ../libsvn_delta/svndiff.c:856
-#: ../libsvn_delta/svndiff.c:937
-msgid "Unexpected end of svndiff input"
-msgstr "Unexpected end of svndiff input"
-
-#: ../libsvn_diff/diff_file.c:466
-#, c-format
-msgid "The file '%s' changed unexpectedly during diff"
-msgstr "檔案 '%s' 在產生差異時發生無預期的變動"
-
-#: ../libsvn_diff/diff_file.c:630
-msgid "Error in options to internal diff"
-msgstr ""
-
-#: ../libsvn_diff/diff_file.c:656
-#, c-format
-msgid "Invalid argument '%s' in diff options"
-msgstr "差異選項中有無效的引數 '%s'"
-
-#: ../libsvn_diff/diff_file.c:942
-#, fuzzy
-msgid "No newline at end of file"
-msgstr "%s\\ 檔案結尾沒有換列字元%s"
-
-#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1149
-msgid "%a %b %e %H:%M:%S %Y"
-msgstr ""
-
-#: ../libsvn_diff/diff_file.c:1766
-#, c-format
-msgid "Failed to delete mmap '%s'"
-msgstr "無法刪除 mmap '%s'"
-
-#: ../libsvn_fs/fs-loader.c:115 ../libsvn_ra/ra_loader.c:179
-#: ../libsvn_ra/ra_loader.c:192
-#, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "'%s' 未定義 '%s()'"
-
-#: ../libsvn_fs/fs-loader.c:132
-#, c-format
-msgid "Can't grab FS mutex"
-msgstr "無法取得 FS mutex"
-
-#: ../libsvn_fs/fs-loader.c:144
-#, c-format
-msgid "Can't ungrab FS mutex"
-msgstr "無法釋放 FS mutex"
-
-#: ../libsvn_fs/fs-loader.c:165
-#, c-format
-msgid "Failed to load module for FS type '%s'"
-msgstr "無法載入 FS 類別 '%s' 的模組"
-
-#: ../libsvn_fs/fs-loader.c:198
-#, c-format
-msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "對 '%s' 有不符合的 FS 模組版本: 找到 %d.%d.%d%s, 預期 %d.%d.%d%s"
-
-#: ../libsvn_fs/fs-loader.c:223
-#, c-format
-msgid "Unknown FS type '%s'"
-msgstr "未知的 FS 類別 '%s'"
-
-#: ../libsvn_fs/fs-loader.c:313
-#, c-format
-msgid "Can't allocate FS mutex"
-msgstr "無法配置 FS mutex"
-
-#: ../libsvn_fs/fs-loader.c:348
-#, fuzzy, c-format
-msgid "Path '%s' is not in UTF-8"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../libsvn_fs/fs-loader.c:356
-#, fuzzy, c-format
-msgid "Path '%s' contains '.' or '..' element"
-msgstr "URL '%s' 包含 '..' 元素"
-
-#: ../libsvn_fs/fs-loader.c:1251
-#, fuzzy, c-format
-msgid "Malformed UUID '%s'"
-msgstr "有缺陷的錯誤列表"
-
-#: ../libsvn_fs/fs-loader.c:1275
-msgid "Negative expiration date passed to svn_fs_lock"
-msgstr "負的過期日期傳遞至 svn_fs_lock"
-
-#: ../libsvn_fs_base/bdb/bdb-err.c:104
-#, c-format
-msgid "Berkeley DB error for filesystem '%s' while %s:\n"
-msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當進行 %s 時:\n"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:92
-msgid "creating change"
-msgstr "建立更動"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:116
-msgid "deleting changes"
-msgstr "刪除更動"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:148 ../libsvn_fs_fs/fs_fs.c:4012
-msgid "Missing required node revision ID"
-msgstr "未提供必須的節點修訂版 ID"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:159 ../libsvn_fs_fs/fs_fs.c:4022
-msgid "Invalid change ordering: new node revision ID without delete"
-msgstr "無效的更動順序: 有新的節點修訂版 ID 而沒刪除"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:169 ../libsvn_fs_fs/fs_fs.c:4033
-msgid "Invalid change ordering: non-add change on deleted path"
-msgstr "無效的更動順序: 對刪除路徑進行非新增的更動"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:178 ../libsvn_fs_fs/fs_fs.c:4042
-#, fuzzy
-msgid "Invalid change ordering: add change on preexisting path"
-msgstr "無效的更動順序: 對刪除路徑進行非新增的更動"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:270
-#: ../libsvn_fs_base/bdb/changes-table.c:393
-msgid "creating cursor for reading changes"
-msgstr "為讀取更動而建立 cursor"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:295
-#: ../libsvn_fs_base/bdb/changes-table.c:414
-#, c-format
-msgid "Error reading changes for key '%s'"
-msgstr "讀取鍵值為 '%s' 的更動時發生錯誤"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:354
-#: ../libsvn_fs_base/bdb/changes-table.c:437
-msgid "fetching changes"
-msgstr "取得更動"
-
-#: ../libsvn_fs_base/bdb/changes-table.c:367
-#: ../libsvn_fs_base/bdb/changes-table.c:450
-msgid "closing changes cursor"
-msgstr "關鍵更動 cursor"
-
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:87
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:116
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:159
-msgid "Only SHA1 checksums can be used as keys in the checksum-reps table.\n"
-msgstr ""
-
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:135
-#, fuzzy, c-format
-msgid "Representation key for checksum '%s' exists in filesystem '%s'."
-msgstr "未指定路徑 '%s' 於檔案系統 '%s' 中的符記"
-
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:142
-#, fuzzy
-msgid "storing checksum-reps record"
-msgstr "儲存複本紀錄"
-
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:186
-#, fuzzy
-msgid "allocating new representation reuse ID (getting 'next-key')"
-msgstr "配置新的表現 (取得 next-key)"
-
-#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207
-#, fuzzy
-msgid "bumping next representation reuse ID"
-msgstr "更新下一個表現的鍵值"
-
-#: ../libsvn_fs_base/bdb/copies-table.c:92
-msgid "storing copy record"
-msgstr "儲存複本紀錄"
-
-#: ../libsvn_fs_base/bdb/copies-table.c:115
-msgid "allocating new copy ID (getting 'next-key')"
-msgstr "配置新的複本 ID (取得 'next-key')"
-
-#: ../libsvn_fs_base/bdb/copies-table.c:133
-msgid "bumping next copy key"
-msgstr "更新下一個複本鍵值"
-
-#: ../libsvn_fs_base/bdb/copies-table.c:171
-msgid "deleting entry from 'copies' table"
-msgstr "自 'copies' 資料表格刪除紀錄"
-
-#: ../libsvn_fs_base/bdb/copies-table.c:199
-msgid "reading copy"
-msgstr "讀取複本"
-
-#: ../libsvn_fs_base/bdb/node-origins-table.c:117
-#, c-format
-msgid "Node origin for '%s' exists in filesystem '%s' with a different value (%s) than what we were about to store (%s)"
-msgstr ""
-
-#: ../libsvn_fs_base/bdb/node-origins-table.c:127
-#, fuzzy
-msgid "storing node-origins record"
-msgstr "儲存複本紀錄"
-
-#: ../libsvn_fs_base/bdb/nodes-table.c:102
-msgid "allocating new node ID (getting 'next-key')"
-msgstr "配置新的節點 ID (取得 'next-key')"
-
-#: ../libsvn_fs_base/bdb/nodes-table.c:120
-msgid "bumping next node ID key"
-msgstr "更新下一個節點 ID 鍵值"
-
-#: ../libsvn_fs_base/bdb/nodes-table.c:156
-#, c-format
-msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
-msgstr "後續 id '%s' (針對 '%s') 已存在於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/bdb/nodes-table.c:182
-msgid "deleting entry from 'nodes' table"
-msgstr "自 'nodes' 資料表格中刪除紀錄"
-
-#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/nodes-table.c:220
-msgid "reading node revision"
-msgstr "讀取節點修訂版"
-
-#: ../libsvn_fs_base/bdb/nodes-table.c:253
-msgid "storing node revision"
-msgstr "儲存節點修訂版"
-
-#: ../libsvn_fs_base/bdb/reps-table.c:98
-#: ../libsvn_fs_base/bdb/reps-table.c:200
-#, c-format
-msgid "No such representation '%s'"
-msgstr "沒有這樣的表現: '%s'"
-
-#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/reps-table.c:101
-msgid "reading representation"
-msgstr "讀取表現"
-
-#: ../libsvn_fs_base/bdb/reps-table.c:128
-msgid "storing representation"
-msgstr "儲存表現"
-
-#: ../libsvn_fs_base/bdb/reps-table.c:156
-msgid "allocating new representation (getting next-key)"
-msgstr "配置新的表現 (取得 next-key)"
-
-#: ../libsvn_fs_base/bdb/reps-table.c:177
-msgid "bumping next representation key"
-msgstr "更新下一個表現的鍵值"
-
-#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/reps-table.c:203
-msgid "deleting representation"
-msgstr "刪除表現"
-
-#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/rev-table.c:95
-msgid "reading filesystem revision"
-msgstr "讀取檔案系統修訂版"
-
-#: ../libsvn_fs_base/bdb/strings-table.c:94
-msgid "creating cursor for reading a string"
-msgstr "為讀取字串而建立 cursor"
-
-#: ../libsvn_fs_base/bdb/txn-table.c:99
-msgid "storing transaction record"
-msgstr "儲存異動紀錄"
-
-#: ../libsvn_fs_base/bdb/uuids-table.c:119
-msgid "get repository uuid"
-msgstr "取得檔案庫 uuid"
-
-#: ../libsvn_fs_base/bdb/uuids-table.c:147
-msgid "set repository uuid"
-msgstr "設定檔案庫 uuid"
-
-#: ../libsvn_fs_base/dag.c:227
-#, c-format
-msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
-msgstr "毀損的 DB: 檔案系統 '%s' 中的初始異動編號不為 '0'"
-
-#: ../libsvn_fs_base/dag.c:235
-#, c-format
-msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "毀損的 DB: 檔案系統 '%s' 中的初始複本編號不為 '0'"
-
-#: ../libsvn_fs_base/dag.c:244
-#, c-format
-msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
-msgstr "毀損的 DB: 檔案系統 '%s' 中的初始修訂版號不為 '0'"
-
-#: ../libsvn_fs_base/dag.c:293
-#, fuzzy
-msgid "Attempted to get entries of a non-directory node"
-msgstr "企圖設定非目錄節點中的項目"
-
-#: ../libsvn_fs_base/dag.c:460 ../libsvn_fs_fs/dag.c:380
-#, c-format
-msgid "Attempted to create a node with an illegal name '%s'"
-msgstr "企圖以不合法的名稱 '%s' 建立一個節點"
-
-#: ../libsvn_fs_base/dag.c:466 ../libsvn_fs_fs/dag.c:386
-msgid "Attempted to create entry in non-directory parent"
-msgstr "企圖在非目錄的父項目建立一個項目"
-
-#: ../libsvn_fs_base/dag.c:472 ../libsvn_fs_base/dag.c:736
-#: ../libsvn_fs_fs/dag.c:392
-#, c-format
-msgid "Attempted to clone child of non-mutable node"
-msgstr "企圖建立不可更動的節點的複本"
-
-#: ../libsvn_fs_base/dag.c:479
-#, c-format
-msgid "Attempted to create entry that already exists"
-msgstr "企圖建立一個已存在的項目"
-
-#: ../libsvn_fs_base/dag.c:528 ../libsvn_fs_fs/dag.c:453
-msgid "Attempted to set entry in non-directory node"
-msgstr "企圖設定非目錄節點中的項目"
-
-#: ../libsvn_fs_base/dag.c:534 ../libsvn_fs_fs/dag.c:459
-msgid "Attempted to set entry in immutable node"
-msgstr "企圖在不可更動的節點中設定項目"
-
-#: ../libsvn_fs_base/dag.c:601
-#, c-format
-msgid "Can't set proplist on *immutable* node-revision %s"
-msgstr "無法對 *不可更動* 的節點編號 %s 設定 proplist"
-
-#: ../libsvn_fs_base/dag.c:742
-#, c-format
-msgid "Attempted to make a child clone with an illegal name '%s'"
-msgstr "企圖以不合法的名稱 '%s' 建立一個子複本"
-
-#: ../libsvn_fs_base/dag.c:859
-#, c-format
-msgid "Attempted to delete entry '%s' from *non*-directory node"
-msgstr "企圖自 *非* 目錄節點中刪除項目 '%s'"
-
-#: ../libsvn_fs_base/dag.c:865
-#, c-format
-msgid "Attempted to delete entry '%s' from immutable directory node"
-msgstr "企圖自不可更動的節點刪除項目 '%s'"
-
-#: ../libsvn_fs_base/dag.c:872
-#, c-format
-msgid "Attempted to delete a node with an illegal name '%s'"
-msgstr "企圖刪除一個有不合法名稱 '%s' 的節點"
-
-#: ../libsvn_fs_base/dag.c:887 ../libsvn_fs_base/dag.c:920
-#, c-format
-msgid "Delete failed: directory has no entry '%s'"
-msgstr "刪除失敗: 目錄沒有項目 '%s'"
-
-#: ../libsvn_fs_base/dag.c:969
-#, c-format
-msgid "Attempted removal of immutable node"
-msgstr "企圖刪除不可更動的節點"
-
-#: ../libsvn_fs_base/dag.c:1087
-#, c-format
-msgid "Attempted to get textual contents of a *non*-file node"
-msgstr "企圖取得 *非* 檔案節點的文字內容"
-
-#: ../libsvn_fs_base/dag.c:1120
-#, c-format
-msgid "Attempted to get length of a *non*-file node"
-msgstr "企圖取得 *非* 檔案節點的長度"
-
-#: ../libsvn_fs_base/dag.c:1147
-#, c-format
-msgid "Attempted to get checksum of a *non*-file node"
-msgstr "企圖取得 *非* 檔案節點的總和檢查值"
-
-#: ../libsvn_fs_base/dag.c:1186 ../libsvn_fs_base/dag.c:1243
-#, c-format
-msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "企圖設定 *非* 文字節點的文字內容"
-
-#: ../libsvn_fs_base/dag.c:1192 ../libsvn_fs_base/dag.c:1249
-#, c-format
-msgid "Attempted to set textual contents of an immutable node"
-msgstr "企圖設定不可更動節點的文字內容"
-
-#: ../libsvn_fs_base/dag.c:1280 ../libsvn_fs_base/reps-strings.c:829
-#, fuzzy, c-format
-msgid "Checksum mismatch on representation '%s'"
-msgstr "沒有這樣的表現: '%s'"
-
-#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:830
-#: ../libsvn_fs_base/reps-strings.c:926 ../libsvn_fs_base/reps-strings.c:941
-#: ../libsvn_fs_base/tree.c:3882 ../libsvn_fs_fs/dag.c:1027
-#: ../libsvn_fs_fs/fs_fs.c:3494 ../libsvn_fs_fs/tree.c:2463
-#: ../libsvn_ra_neon/fetch.c:750 ../libsvn_ra_svn/client.c:1073
-#: ../libsvn_repos/commit.c:607 ../libsvn_repos/load-fs-vtable.c:484
-#, c-format
-msgid " expected: %s"
-msgstr ""
-
-#: ../libsvn_fs_base/dag.c:1282 ../libsvn_fs_base/reps-strings.c:831
-#: ../libsvn_fs_base/reps-strings.c:927 ../libsvn_fs_base/reps-strings.c:942
-#: ../libsvn_fs_base/tree.c:3883 ../libsvn_fs_fs/dag.c:1028
-#: ../libsvn_fs_fs/fs_fs.c:3495 ../libsvn_fs_fs/tree.c:2464
-#: ../libsvn_ra_neon/fetch.c:751 ../libsvn_ra_svn/client.c:1074
-#: ../libsvn_repos/commit.c:608 ../libsvn_repos/load-fs-vtable.c:485
-#, c-format
-msgid " actual: %s"
-msgstr ""
-
-#: ../libsvn_fs_base/dag.c:1378
-#, c-format
-msgid "Attempted to open non-existent child node '%s'"
-msgstr "企圖開啟一個不存在的子節點 '%s'"
-
-#: ../libsvn_fs_base/dag.c:1384
-#, c-format
-msgid "Attempted to open node with an illegal name '%s'"
-msgstr "企圖開啟一個有不合法名稱 '%s' 的節點"
-
-#: ../libsvn_fs_base/dag.c:1926
-#, fuzzy, c-format
-msgid "Attempted merge tracking info change on immutable node"
-msgstr "企圖刪除不可更動的節點"
-
-#: ../libsvn_fs_base/dag.c:1966
-#, fuzzy, c-format
-msgid "Attempted mergeinfo count change on immutable node"
-msgstr "企圖刪除不可更動的節點"
-
-#: ../libsvn_fs_base/dag.c:1978
-#, c-format
-msgid "Invalid value (%%%s) for node revision mergeinfo count"
-msgstr ""
-
-#: ../libsvn_fs_base/err.c:46
-#, c-format
-msgid "Corrupt filesystem revision %ld in filesystem '%s'"
-msgstr "損毀的檔案系統修訂版 %ld 於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2160
-#, c-format
-msgid "Reference to non-existent node '%s' in filesystem '%s'"
-msgstr "引用至不存在的節點 '%s' 於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:67
-#, fuzzy, c-format
-msgid "No such revision %ld in filesystem '%s'"
-msgstr "損毀的檔案系統修訂版 %ld 於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:79
-#, c-format
-msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "'%s' 的 'transactions' 表格有缺陷的項目於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:90
-#, c-format
-msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "'%s' 的 'copies' 表格有缺陷的項目於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:101
-#, c-format
-msgid "No transaction named '%s' in filesystem '%s'"
-msgstr "不存在名為 '%s' 的異動於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:112
-#, c-format
-msgid "Cannot modify transaction named '%s' in filesystem '%s'"
-msgstr "無法修改名為 '%s' 的更動於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:123
-#, c-format
-msgid "No copy with id '%s' in filesystem '%s'"
-msgstr "沒有 id '%s' 的複本於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:133
-#, c-format
-msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
-msgstr "符記 '%s' 沒有指向檔案系統 '%s' 中任何一個現存的鎖定"
-
-#: ../libsvn_fs_base/err.c:143
-#, c-format
-msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "未指定路徑 '%s' 於檔案系統 '%s' 中的符記"
-
-#: ../libsvn_fs_base/err.c:152
-#, c-format
-msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "'%s' 的 'locks' 資料表格有缺陷的鎖定於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:162
-#, fuzzy, c-format
-msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
-msgstr "'%s' 的 'copies' 表格有缺陷的項目於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/err.c:172
-#, fuzzy, c-format
-msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
-msgstr "'%s' 的 'copies' 表格有缺陷的項目於檔案系統 '%s' 中"
-
-#: ../libsvn_fs_base/fs.c:86
-#, c-format
-msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
-msgstr "不良的資料庫版本: 取得 %d.%d.%d, 應至少為 %d.%d.%d"
-
-#: ../libsvn_fs_base/fs.c:97
-#, c-format
-msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "不良的資料庫版本: 與 %d.%d.%d 編譯, 與 %d.%d.%d 執行"
-
-#: ../libsvn_fs_base/fs.c:187
-#, c-format
-msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當關閉環境時:\n"
-
-#: ../libsvn_fs_base/fs.c:538
-#, c-format
-msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當建立環境時:\n"
-
-#: ../libsvn_fs_base/fs.c:544
-#, c-format
-msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當開啟環境時:\n"
-
-#: ../libsvn_fs_base/fs.c:710
-#, c-format
-msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d"
-msgstr ""
-
-#: ../libsvn_fs_base/fs.c:729
-#, c-format
-msgid "Expected FS format '%d'; found format '%d'"
-msgstr "預期 FS 格式 '%d'; 找到格式 '%d'"
-
-#: ../libsvn_fs_base/fs.c:1272
-#, fuzzy
-msgid ""
-"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
-"may be interfering with the hotcopy algorithm. If\n"
-"the problem persists, try deactivating this feature\n"
-"in DB_CONFIG"
-msgstr ""
-"複製紀錄檔時發生錯誤; DB_LOG_AUTOREMOVE 可能對製作\n"
-"即時複本的演算法有所影響. 如果問題依舊存在, 請試著\n"
-"在 DB_CONFIG 中取消這個功能."
-
-#: ../libsvn_fs_base/fs.c:1291
-#, fuzzy
-msgid ""
-"Error running catastrophic recovery on hotcopy; the\n"
-"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
-"hotcopy algorithm. If the problem persists, try deactivating\n"
-"this feature in DB_CONFIG"
-msgstr ""
-"對即時複本執行災後重建時發生錯誤; DB_LOG_AUTOREMOVE 功能\n"
-"可能對製作即時複本的演算法有所影響. 如果問題依舊存在, 請\n"
-"試著在 DB_CONFIG 中取消這個功能."
-
-#: ../libsvn_fs_base/fs.c:1336
-msgid "Module for working with a Berkeley DB repository."
-msgstr "與 Berkeley DB 檔案庫使用的模組"
-
-#: ../libsvn_fs_base/fs.c:1372
-#, c-format
-msgid "Unsupported FS loader version (%d) for bdb"
-msgstr "不支援的 bdb 的 FS 載入器版本 (%d)"
-
-#: ../libsvn_fs_base/lock.c:104 ../libsvn_fs_base/lock.c:109
-#: ../libsvn_fs_fs/lock.c:755 ../libsvn_fs_fs/lock.c:760
-#: ../libsvn_fs_fs/lock.c:782
-#, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路徑 '%s' 不存在於 HEAD 修訂版中"
-
-#: ../libsvn_fs_base/lock.c:457 ../libsvn_fs_fs/lock.c:652
-#, c-format
-msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "無法驗證路徑 '%s' 的鎖定; 無法取得使用者名稱"
-
-#: ../libsvn_fs_base/lock.c:463 ../libsvn_fs_fs/lock.c:658
-#, fuzzy, c-format
-msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')"
-msgstr "使用者 %s 未擁有路徑 '%s' 的鎖定 (目前被 %s 鎖定)"
-
-#: ../libsvn_fs_base/lock.c:470 ../libsvn_fs_fs/lock.c:665
-#, c-format
-msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "無法驗証路徑 '%s' 的鎖定; 找不到符合的鎖定符記"
-
-#. Helper macro that evaluates to an error message indicating that
-#. the representation referred to by X has an unknown node kind.
-#: ../libsvn_fs_base/reps-strings.c:58
-#, c-format
-msgid "Unknown node kind for representation '%s'"
-msgstr "'%s' 為未知表現 (representation) 的節點類型"
-
-#: ../libsvn_fs_base/reps-strings.c:110
-msgid "Representation is not of type 'delta'"
-msgstr "表現不是 'delta' 類別"
-
-#: ../libsvn_fs_base/reps-strings.c:380
-msgid "Svndiff source length inconsistency"
-msgstr "Svndiff 的來源長度不相符"
-
-#: ../libsvn_fs_base/reps-strings.c:507
-#, c-format
-msgid "Diff version inconsistencies in representation '%s'"
-msgstr "差異版本與表現 '%s' 中不一致"
-
-# as-is
-#: ../libsvn_fs_base/reps-strings.c:533
-#, c-format
-msgid "Corruption detected whilst reading delta chain from representation '%s' to '%s'"
-msgstr "Corruption detected whilst reading delta chain from representation '%s' to '%s'"
-
-#: ../libsvn_fs_base/reps-strings.c:797
-#, c-format
-msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "表現內容太大了: 取得 %s, 限制為 %s"
-
-#: ../libsvn_fs_base/reps-strings.c:813
-#, fuzzy, c-format
-msgid "Failure reading representation '%s'"
-msgstr "讀取表現 '%s' 失敗"
-
-#: ../libsvn_fs_base/reps-strings.c:925
-#, fuzzy, c-format
-msgid "MD5 checksum mismatch on representation '%s'"
-msgstr "沒有這樣的表現: '%s'"
-
-#: ../libsvn_fs_base/reps-strings.c:940
-#, fuzzy, c-format
-msgid "SHA1 checksum mismatch on representation '%s'"
-msgstr "沒有這樣的表現: '%s'"
-
-#: ../libsvn_fs_base/reps-strings.c:956
-msgid "Null rep, but offset past zero already"
-msgstr "空的表現, 但是位移已超過零"
-
-#: ../libsvn_fs_base/reps-strings.c:1070 ../libsvn_fs_base/reps-strings.c:1261
-#, c-format
-msgid "Rep '%s' is not mutable"
-msgstr "表現 '%s' 不是可變的"
-
-#: ../libsvn_fs_base/reps-strings.c:1085
-#, c-format
-msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "表現 '%s' 是可變且非全文"
-
-#: ../libsvn_fs_base/reps-strings.c:1380
-msgid "Failed to get new string key"
-msgstr "無法取得新的字串鍵值"
-
-#: ../libsvn_fs_base/reps-strings.c:1457
-#, c-format
-msgid "Attempt to deltify '%s' against itself"
-msgstr "嘗試要對 '%s' deltify 自己"
-
-#: ../libsvn_fs_base/reps-strings.c:1528 ../libsvn_fs_base/reps-strings.c:1721
-#, c-format
-msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "無法計算 '%s' 的 MD5"
-
-#: ../libsvn_fs_base/reps-strings.c:1670
-#, fuzzy, c-format
-msgid "Attempt to obliterate '%s' using itself "
-msgstr "嘗試要對 '%s' deltify 自己"
-
-#: ../libsvn_fs_base/revs-txns.c:73
-#, c-format
-msgid "Transaction is not dead: '%s'"
-msgstr "異動未終結: '%s'"
-
-#: ../libsvn_fs_base/revs-txns.c:76
-#, c-format
-msgid "Transaction is dead: '%s'"
-msgstr "異動已終結: '%s'"
-
-#: ../libsvn_fs_base/revs-txns.c:274 ../libsvn_fs_fs/fs_fs.c:7358
-#, fuzzy, c-format
-msgid "revprop '%s' has unexpected value in filesystem"
-msgstr "'%s' 不是檔案系統 '%s' 裡的檔案"
-
-#: ../libsvn_fs_base/revs-txns.c:1231
-msgid "Transaction aborted, but cleanup failed"
-msgstr "異動已取消, 但是清除失敗."
-
-#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:695
-#, c-format
-msgid "Failure opening '%s'"
-msgstr "無法開啟 '%s'"
-
-#: ../libsvn_fs_base/tree.c:1404 ../libsvn_fs_fs/tree.c:1124
-msgid "Cannot compare property value between two different filesystems"
-msgstr "無法比較兩個不同檔案系統中的性質內容"
-
-#: ../libsvn_fs_base/tree.c:1850 ../libsvn_fs_base/tree.c:1920
-msgid "Corrupt DB: faulty predecessor count"
-msgstr "毀損的資料庫: 有問題的前導計數"
-
-#: ../libsvn_fs_base/tree.c:1977 ../libsvn_fs_base/tree.c:2996
-#: ../libsvn_fs_fs/tree.c:1157
-#, c-format
-msgid "Unexpected immutable node at '%s'"
-msgstr "路徑 '%s' 有不可更動的種類"
-
-#: ../libsvn_fs_base/tree.c:1998 ../libsvn_fs_fs/tree.c:1178
-#, c-format
-msgid "Conflict at '%s'"
-msgstr "'%s' 有衝突"
-
-#: ../libsvn_fs_base/tree.c:2051 ../libsvn_fs_base/tree.c:2845
-#: ../libsvn_fs_fs/tree.c:1229 ../libsvn_fs_fs/tree.c:1787
-msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "不良的合併: 演進源頭, 來源與目錄不是全都在同一個檔案系統"
-
-#: ../libsvn_fs_base/tree.c:2067 ../libsvn_fs_fs/tree.c:1245
-#, c-format
-msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "不良的合併: 目標 '%s' 的 id 為 '%s', 與演進源頭一樣"
-
-#: ../libsvn_fs_base/tree.c:2611
-#, fuzzy, c-format
-msgid "Transaction '%s' out-of-date with respect to revision '%s'"
-msgstr "異動 '%s' 對修訂版 '%s' 已過時"
-
-#: ../libsvn_fs_base/tree.c:2929
-#, c-format
-msgid "Cannot deltify revisions prior to r%ld"
-msgstr ""
-
-#: ../libsvn_fs_base/tree.c:3001
-#, fuzzy, c-format
-msgid "Cannot obliterate '%s' as it is not a file"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../libsvn_fs_base/tree.c:3136 ../libsvn_fs_fs/tree.c:1924
-msgid "The root directory cannot be deleted"
-msgstr "根目錄無法被刪除"
-
-#: ../libsvn_fs_base/tree.c:3359 ../libsvn_fs_fs/tree.c:2005
-#, c-format
-msgid "Cannot copy between two different filesystems ('%s' and '%s')"
-msgstr "無法在兩個不同檔案系統 ('%s' 與 '%s') 之間進行複製"
-
-#: ../libsvn_fs_base/tree.c:3368 ../libsvn_fs_fs/tree.c:2011
-msgid "Copy from mutable tree not currently supported"
-msgstr "複製自可更動的樹目前尚不支援"
-
-#: ../libsvn_fs_base/tree.c:3881 ../libsvn_fs_fs/tree.c:2462
-#, fuzzy, c-format
-msgid "Base checksum mismatch on '%s'"
-msgstr "總和檢查值不符"
-
-#: ../libsvn_fs_base/tree.c:4130 ../libsvn_fs_fs/tree.c:2694
-msgid "Cannot compare file contents between two different filesystems"
-msgstr "無法比較兩個不同檔案系統中的檔案內容"
-
-#: ../libsvn_fs_base/tree.c:4139 ../libsvn_fs_base/tree.c:4144
-#: ../libsvn_fs_fs/tree.c:2703 ../libsvn_fs_fs/tree.c:2708
-#: ../libsvn_ra/compat.c:671
-#, c-format
-msgid "'%s' is not a file"
-msgstr "'%s' 不是檔案"
-
-#: ../libsvn_fs_base/tree.c:5169 ../libsvn_fs_base/tree.c:5357
-#, c-format
-msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
-msgstr ""
-
-#: ../libsvn_fs_base/tree.c:5193
-#, c-format
-msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory"
-msgstr ""
-
-#: ../libsvn_fs_fs/caching.c:75
-msgid "Bad ID in cache"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:435 ../libsvn_ra_serf/serf.c:845
-msgid "Can't get entries of non-directory"
-msgstr "無法取得非目錄的項目"
-
-#: ../libsvn_fs_fs/dag.c:542
-#, c-format
-msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:553
-#, fuzzy, c-format
-msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)"
-msgstr "無法對 *不可更動* 的節點編號 %s 設定 proplist"
-
-#: ../libsvn_fs_fs/dag.c:1026 ../libsvn_ra_neon/fetch.c:749
-#: ../libsvn_ra_svn/client.c:1072
-#, fuzzy, c-format
-msgid "Checksum mismatch for '%s'"
-msgstr "總和檢查值不符"
-
-#: ../libsvn_fs_fs/dag.c:1131
-msgid "Empty noderev in cache"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:1141
-msgid "Kindless noderev in cache"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:1148
-#, fuzzy, c-format
-msgid "Unknown kind for noderev in cache: '%c'"
-msgstr "'%s' 為未知表現 (representation) 的節點類型"
-
-#: ../libsvn_fs_fs/dag.c:1155
-msgid "Unterminated ID in cache"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:1160
-#, c-format
-msgid "Bogus ID '%s' in cache"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:1167
-msgid "No created path"
-msgstr ""
-
-#: ../libsvn_fs_fs/dag.c:1193
-#, fuzzy, c-format
-msgid "Unknown node type in cache: '%c'"
-msgstr "未知的節點類型: '%s'"
-
-#: ../libsvn_fs_fs/fs.c:80
-#, fuzzy, c-format
-msgid "Can't fetch FSFS shared data"
-msgstr "無法取得 FSFS mutex"
-
-#: ../libsvn_fs_fs/fs.c:96
-#, fuzzy, c-format
-msgid "Can't create FSFS write-lock mutex"
-msgstr "無法建立 FSFS mutex"
-
-#: ../libsvn_fs_fs/fs.c:103
-#, fuzzy, c-format
-msgid "Can't create FSFS txn-current mutex"
-msgstr "無法建立 FSFS mutex"
-
-#: ../libsvn_fs_fs/fs.c:112
-#, fuzzy, c-format
-msgid "Can't create FSFS txn list mutex"
-msgstr "無法建立 FSFS mutex"
-
-#: ../libsvn_fs_fs/fs.c:119
-#, fuzzy, c-format
-msgid "Can't store FSFS shared data"
-msgstr "無法儲存 FSFS mutex"
-
-#: ../libsvn_fs_fs/fs.c:332
-msgid "Module for working with a plain file (FSFS) repository."
-msgstr "用於與普通檔案 (FSFS) 檔案庫的模組"
-
-#: ../libsvn_fs_fs/fs.c:368
-#, c-format
-msgid "Unsupported FS loader version (%d) for fsfs"
-msgstr "不支援的 fsfs 的 FS 載入器版本 (%d)"
-
-#: ../libsvn_fs_fs/fs_fs.c:288
-#, fuzzy, c-format
-msgid "Revision file '%s' does not exist, and r%ld is not packed"
-msgstr "'%s' 不存在於修訂版 %ld"
-
-#: ../libsvn_fs_fs/fs_fs.c:535
-#, fuzzy, c-format
-msgid "Can't grab FSFS txn list mutex"
-msgstr "無法取得 FS mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:543
-#, fuzzy, c-format
-msgid "Can't ungrab FSFS txn list mutex"
-msgstr "無法釋放 FS mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:597
-#, fuzzy, c-format
-msgid "Can't grab FSFS mutex for '%s'"
-msgstr "無法取得 FS mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:623
-#, fuzzy, c-format
-msgid "Can't ungrab FSFS mutex for '%s'"
-msgstr "無法釋放 FS mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:694
-#, fuzzy, c-format
-msgid "Can't unlock unknown transaction '%s'"
-msgstr "無法解鎖字元轉譯 mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:698
-#, fuzzy, c-format
-msgid "Can't unlock nonlocked transaction '%s'"
-msgstr "無法解鎖字元轉譯 mutex"
-
-#: ../libsvn_fs_fs/fs_fs.c:705
-#, c-format
-msgid "Can't unlock prototype revision lockfile for transaction '%s'"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:711
-#, c-format
-msgid "Can't close prototype revision lockfile for transaction '%s'"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:773
-#, c-format
-msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:809
-#, c-format
-msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:816 ../libsvn_subr/io.c:1702
-#, c-format
-msgid "Can't get exclusive lock on file '%s'"
-msgstr "無法取得檔案 '%s' 的獨佔鎖定"
-
-#: ../libsvn_fs_fs/fs_fs.c:928
-#, fuzzy, c-format
-msgid "Format file '%s' contains unexpected non-digit '%c' within '%s'"
-msgstr "'%s' 的第一行包含非數字字元"
-
-#: ../libsvn_fs_fs/fs_fs.c:977
-#, fuzzy, c-format
-msgid "Can't read first line of format file '%s'"
-msgstr "無法讀取檔案 '%s' 中的長度列"
-
-#: ../libsvn_fs_fs/fs_fs.c:1021
-#, fuzzy, c-format
-msgid "'%s' contains invalid filesystem format option '%s'"
-msgstr "'%s' 不是檔案系統 '%s' 裡的檔案"
-
-#: ../libsvn_fs_fs/fs_fs.c:1091
-#, fuzzy, c-format
-msgid "Expected FS format between '1' and '%d'; found format '%d'"
-msgstr "預期 FS 格式 '%d'; 找到格式 '%d'"
-
-#: ../libsvn_fs_fs/fs_fs.c:1335
-#, c-format
-msgid "'%s' is not a regular file. Please move it out of the way and try again"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:1593
-#, c-format
-msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:1830 ../libsvn_fs_fs/fs_fs.c:1844
-msgid "Found malformed header in revision file"
-msgstr "在修訂版檔案中找到有缺陷的檔頭"
-
-#: ../libsvn_fs_fs/fs_fs.c:1878
-#, fuzzy, c-format
-msgid "Invalid revision number '%ld'"
-msgstr "提供了無效的版本號碼"
-
-#: ../libsvn_fs_fs/fs_fs.c:1893 ../libsvn_fs_fs/fs_fs.c:1919
-#: ../libsvn_fs_fs/fs_fs.c:2933 ../libsvn_fs_fs/fs_fs.c:2971
-#: ../libsvn_repos/log.c:1644 ../libsvn_repos/log.c:1648
-#, c-format
-msgid "No such revision %ld"
-msgstr "沒有這個修訂版 %ld"
-
-#: ../libsvn_fs_fs/fs_fs.c:1976
-msgid "Manifest offset too large"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:2086 ../libsvn_fs_fs/fs_fs.c:2100
-#: ../libsvn_fs_fs/fs_fs.c:2108 ../libsvn_fs_fs/fs_fs.c:2116
-#: ../libsvn_fs_fs/fs_fs.c:2125 ../libsvn_fs_fs/fs_fs.c:2138
-#: ../libsvn_fs_fs/fs_fs.c:2147
-#, fuzzy
-msgid "Malformed text representation offset line in node-rev"
-msgstr "node-rev 中沒有 text rep offset 列"
-
-#: ../libsvn_fs_fs/fs_fs.c:2226
-#, fuzzy
-msgid "Missing id field in node-rev"
-msgstr "node-rev 中沒有 kind 欄位"
-
-#: ../libsvn_fs_fs/fs_fs.c:2238
-msgid "Missing kind field in node-rev"
-msgstr "node-rev 中沒有 kind 欄位"
-
-#: ../libsvn_fs_fs/fs_fs.c:2272
-msgid "Missing cpath in node-rev"
-msgstr "node-rev 中沒有 cpath"
-
-#: ../libsvn_fs_fs/fs_fs.c:2299 ../libsvn_fs_fs/fs_fs.c:2305
-msgid "Malformed copyroot line in node-rev"
-msgstr "node-rev 中的 copyroot 列有缺陷"
-
-#: ../libsvn_fs_fs/fs_fs.c:2323 ../libsvn_fs_fs/fs_fs.c:2329
-msgid "Malformed copyfrom line in node-rev"
-msgstr "node-rev 中的 copyfrom 列有缺陷"
-
-#: ../libsvn_fs_fs/fs_fs.c:2489 ../libsvn_fs_fs/fs_fs.c:5472
-msgid "Attempted to write to non-transaction"
-msgstr "企圖寫至非異動"
-
-#: ../libsvn_fs_fs/fs_fs.c:2582
-msgid "Malformed representation header"
-msgstr "有缺陷的表現檔頭"
-
-#: ../libsvn_fs_fs/fs_fs.c:2610
-msgid "Missing node-id in node-rev"
-msgstr "node-rev 中沒有 node-id"
-
-#: ../libsvn_fs_fs/fs_fs.c:2616
-msgid "Corrupt node-id in node-rev"
-msgstr "node-rev 中的 node-id 損毀"
-
-#: ../libsvn_fs_fs/fs_fs.c:2692
-#, c-format
-msgid "Revision file lacks trailing newline"
-msgstr "修訂版檔案缺少結尾換列字元"
-
-#: ../libsvn_fs_fs/fs_fs.c:2705
-#, c-format
-msgid "Final line in revision file longer than 64 characters"
-msgstr "修訂版檔案的最後一列大於 64 個字元長"
-
-#: ../libsvn_fs_fs/fs_fs.c:2719
-msgid "Final line in revision file missing space"
-msgstr "修訂版檔案的最後一列少掉空白字元"
-
-#: ../libsvn_fs_fs/fs_fs.c:3050
-msgid "Malformed svndiff data in representation"
-msgstr "svndiff 資料的表現有缺陷"
-
-# as-is
-#: ../libsvn_fs_fs/fs_fs.c:3242 ../libsvn_fs_fs/fs_fs.c:3255
-msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "Reading one svndiff window read beyond the end of the representation"
-
-#: ../libsvn_fs_fs/fs_fs.c:3395
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff 資料要求不存在的來源"
-
-#: ../libsvn_fs_fs/fs_fs.c:3401
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 要求的位置超出了串流的結尾"
-
-#: ../libsvn_fs_fs/fs_fs.c:3424 ../libsvn_fs_fs/fs_fs.c:3441
-msgid "svndiff window length is corrupt"
-msgstr "svndiff 的窗格長度已毀損"
-
-#: ../libsvn_fs_fs/fs_fs.c:3493
-#, fuzzy
-msgid "Checksum mismatch while reading representation"
-msgstr ""
-"讀取表現時, 總和檢查值不一致:\n"
-" 預期的: %s\n"
-" 實際的: %s\n"
-
-#: ../libsvn_fs_fs/fs_fs.c:3790 ../libsvn_fs_fs/fs_fs.c:3803
-#: ../libsvn_fs_fs/fs_fs.c:3809 ../libsvn_fs_fs/fs_fs.c:6772
-#: ../libsvn_fs_fs/fs_fs.c:6781 ../libsvn_fs_fs/fs_fs.c:6787
-msgid "Directory entry corrupt"
-msgstr "目錄項目損毀"
-
-#: ../libsvn_fs_fs/fs_fs.c:4211 ../libsvn_fs_fs/fs_fs.c:4216
-#: ../libsvn_fs_fs/fs_fs.c:4222 ../libsvn_fs_fs/fs_fs.c:4239
-#: ../libsvn_fs_fs/fs_fs.c:4272 ../libsvn_fs_fs/fs_fs.c:4292
-#: ../libsvn_fs_fs/fs_fs.c:4326 ../libsvn_fs_fs/fs_fs.c:4331
-msgid "Invalid changes line in rev-file"
-msgstr "rev-file 中有無效的更動列"
-
-#: ../libsvn_fs_fs/fs_fs.c:4265
-msgid "Invalid change kind in rev file"
-msgstr "rev 檔案中有無效的更動種類"
-
-#: ../libsvn_fs_fs/fs_fs.c:4285
-msgid "Invalid text-mod flag in rev-file"
-msgstr "rev-file 中有無效的 text-mod 旗標"
-
-#: ../libsvn_fs_fs/fs_fs.c:4305
-msgid "Invalid prop-mod flag in rev-file"
-msgstr "rev-file 中有無效的 prop-mod 旗標"
-
-#: ../libsvn_fs_fs/fs_fs.c:4482
-msgid "Copying from transactions not allowed"
-msgstr "自異動進行複製是不被允許的"
-
-#: ../libsvn_fs_fs/fs_fs.c:4638
-#, c-format
-msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "無法在 '%s' 建立更動目錄於修訂版 %ld"
-
-#: ../libsvn_fs_fs/fs_fs.c:4761
-msgid "Internal error: a null transaction id was passed to get_txn_proplist()"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:4920 ../libsvn_fs_fs/fs_fs.c:4927
-msgid "next-id file corrupt"
-msgstr "next-id 檔案損毀"
-
-#: ../libsvn_fs_fs/fs_fs.c:5023
-msgid "Transaction cleanup failed"
-msgstr "異動清除失敗"
-
-#: ../libsvn_fs_fs/fs_fs.c:5136
-msgid "Invalid change type"
-msgstr "無效的更動類型"
-
-#: ../libsvn_fs_fs/fs_fs.c:5491
-msgid "Can't set text contents of a directory"
-msgstr "無法設定目錄的文字內容"
-
-#: ../libsvn_fs_fs/fs_fs.c:5575 ../libsvn_fs_fs/fs_fs.c:5580
-#: ../libsvn_fs_fs/fs_fs.c:5587
-#, fuzzy
-msgid "Corrupt 'current' file"
-msgstr "目前檔案損毀"
-
-#: ../libsvn_fs_fs/fs_fs.c:6058
-msgid "Transaction out of date"
-msgstr "異動過時"
-
-#: ../libsvn_fs_fs/fs_fs.c:6234
-#, fuzzy
-msgid "Obliteration of already-packed revision is not supported"
-msgstr "不支援 WORKING 修訂版的 blame 功能"
-
-#: ../libsvn_fs_fs/fs_fs.c:6714
-#, fuzzy
-msgid "Recovery encountered a non-directory node"
-msgstr "企圖設定非目錄節點中的項目"
-
-#: ../libsvn_fs_fs/fs_fs.c:6736
-msgid "Recovery encountered a deltified directory representation"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:6886
-#, fuzzy, c-format
-msgid "Expected current rev to be <= %ld but found %ld"
-msgstr "'%s' 預期為目錄, 但是結果為檔案"
-
-#: ../libsvn_fs_fs/fs_fs.c:6959
-#, c-format
-msgid "Revision %ld has a revs file but no revprops file"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:6967
-#, c-format
-msgid "Revision %ld has a non-file where its revprops file should be"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:7145
-#, c-format
-msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)"
-msgstr ""
-
-#: ../libsvn_fs_fs/fs_fs.c:7251
-msgid "No such transaction"
-msgstr "無此異動"
-
-#: ../libsvn_fs_fs/fs_fs.c:7711
-msgid "FS format too old to pack, please upgrade."
-msgstr ""
-
-#: ../libsvn_fs_fs/lock.c:117
-#, c-format
-msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "路徑 '%s' 於檔案系統 '%s' 中的鎖定檔損毀"
-
-#: ../libsvn_fs_fs/lock.c:219
-#, c-format
-msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "無法寫入 lock/entries 雜湊檔 '%s'"
-
-#: ../libsvn_fs_fs/lock.c:271
-#, c-format
-msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "無法剖析 lock/entries 雜湊檔 '%s'"
-
-#: ../libsvn_fs_fs/lock.c:787
-#, c-format
-msgid "Lock failed: newer version of '%s' exists"
-msgstr "鎖定失敗: 存在 '%s' 的新版本"
-
-#: ../libsvn_fs_fs/rep-cache.c:96 ../libsvn_fs_fs/rep-cache.c:136
-msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
-msgstr ""
-
-#: ../libsvn_fs_fs/rep-cache.c:153
-#, c-format
-msgid "Representation key for checksum '%%s' exists in filesystem '%%s' with a different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,%%%s,%%%s,%%%s)"
-msgstr ""
-
-#: ../libsvn_fs_fs/tree.c:3435
-#, c-format
-msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
-msgstr ""
-
-#: ../libsvn_fs_fs/tree.c:3557
-#, c-format
-msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
-msgstr ""
-
-#: ../libsvn_fs_fs/tree.c:3678
-#, c-format
-msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d"
-msgstr ""
-
-#: ../libsvn_fs_util/fs-util.c:104
-msgid "Filesystem object has not been opened yet"
-msgstr "檔案系統物件尚未開啟"
-
-#: ../libsvn_fs_util/fs-util.c:107
-msgid "Filesystem object already open"
-msgstr "檔案系統物件已開啟"
-
-#: ../libsvn_ra/compat.c:180
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未提供 '%s' 於修訂版 %ld 的 changed-path 資訊"
-
-#: ../libsvn_ra/compat.c:307 ../libsvn_ra/compat.c:554
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in revision %ld"
-msgstr "路徑 '%s' 不存在於修訂版 %ld 中"
-
-#: ../libsvn_ra/compat.c:384
-#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "'%s' 於修訂版 %ld 是一個無關的物件"
-
-#: ../libsvn_ra/compat.c:844 ../libsvn_ra/ra_loader.c:1201
-#, fuzzy, c-format
-msgid "Invalid peg revision %ld"
-msgstr "無效的結束修訂版 %ld"
-
-#: ../libsvn_ra/compat.c:847 ../libsvn_ra/ra_loader.c:1204
-#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:323
-#, c-format
-msgid "Invalid end revision %ld"
-msgstr "無效的結束修訂版 %ld"
-
-#: ../libsvn_ra/compat.c:850 ../libsvn_ra/ra_loader.c:1207
-#, fuzzy
-msgid "Peg revision must precede end revision"
-msgstr "起始修訂版必須大於結束修訂版"
-
-#: ../libsvn_ra/ra_loader.c:234
-#, c-format
-msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "'%s' 的 RA 外掛版本不符合: 遇到 %d.%d.%d%s, 預期 %d.%d.%d%s"
-
-#: ../libsvn_ra/ra_loader.c:419
-#, fuzzy, c-format
-msgid "Invalid config: unknown HTTP library '%s'"
-msgstr "無效的配置: 無法載入憑證檔 '%s'"
-
-#: ../libsvn_ra/ra_loader.c:483
-#, c-format
-msgid "Unrecognized URL scheme for '%s'"
-msgstr "無法辨識的 URL 綱要 '%s'"
-
-#: ../libsvn_ra/ra_loader.c:518
-#, fuzzy, c-format
-msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
-msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
-
-#: ../libsvn_ra/ra_loader.c:568
-#, fuzzy, c-format
-msgid "'%s' isn't a child of session URL '%s'"
-msgstr "'%s' 不是檔案系統 '%s' 裡的檔案"
-
-#: ../libsvn_ra/ra_loader.c:591 ../libsvn_ra_neon/session.c:1155
-#: ../libsvn_ra_svn/client.c:2271
-#, fuzzy, c-format
-msgid "'%s' isn't a child of repository root URL '%s'"
-msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-
-#: ../libsvn_ra/ra_loader.c:638
-#, fuzzy, c-format
-msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client"
-msgstr "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
-
-#: ../libsvn_ra/ra_loader.c:1238
-msgid "Obliterate is not supported by this Repository Access method"
-msgstr ""
-
-# as-is
-#: ../libsvn_ra/ra_loader.c:1284
-#, c-format
-msgid " - handles '%s' scheme\n"
-msgstr " - handles '%s' scheme\n"
-
-#: ../libsvn_ra/ra_loader.c:1368
-#, c-format
-msgid "Unrecognized URL scheme '%s'"
-msgstr "無法辨識的 URL 綱要 '%s'"
-
-#: ../libsvn_ra/util.c:66
-#, c-format
-msgid "Retrieval of mergeinfo unsupported by '%s'"
-msgstr ""
-
-# as-is
-#. ----------------------------------------------------------------
-#. ** The RA vtable routines **
-#: ../libsvn_ra_local/ra_plugin.c:401
-msgid "Module for accessing a repository on local disk."
-msgstr "Module for accessing a repository on local disk."
-
-#: ../libsvn_ra_local/ra_plugin.c:468
-msgid "Unable to open an ra_local session to URL"
-msgstr "無法開啟 URL 的 ra_local session"
-
-#: ../libsvn_ra_local/ra_plugin.c:503
-#, fuzzy, c-format
-msgid "URL '%s' is not a child of the session's repository root URL '%s'"
-msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
-
-#: ../libsvn_ra_local/ra_plugin.c:1414 ../libsvn_ra_neon/options.c:452
-#: ../libsvn_ra_serf/options.c:622 ../libsvn_ra_svn/client.c:2464
-#, c-format
-msgid "Don't know anything about capability '%s'"
-msgstr ""
-
-# as-is
-#: ../libsvn_ra_local/ra_plugin.c:1537
-#, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "Unsupported RA loader version (%d) for ra_local"
-
-#: ../libsvn_ra_local/split_url.c:49 ../libsvn_ra_local/split_url.c:55
-#, c-format
-msgid "Unable to open repository '%s'"
-msgstr "無法開啟檔案庫 '%s'"
-
-# as-is
-#: ../libsvn_ra_neon/commit.c:245
-msgid "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)"
-msgstr "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)"
-
-#: ../libsvn_ra_neon/commit.c:503
-#, fuzzy, c-format
-msgid "File or directory '%s' is out of date; try updating"
-msgstr "你的檔案或目錄 '%s' 可能已過時"
-
-#: ../libsvn_ra_neon/commit.c:511
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "CHECKOUT 回應未包含一個 'Location:' 標頭"
-
-#: ../libsvn_ra_neon/commit.c:521 ../libsvn_ra_neon/props.c:216
-#: ../libsvn_ra_neon/util.c:566 ../libsvn_ra_serf/commit.c:1648
-#: ../libsvn_ra_serf/commit.c:2055 ../libsvn_ra_serf/update.c:2130
-#, fuzzy, c-format
-msgid "Unable to parse URL '%s'"
-msgstr "Neon 無法剖析網址 '%s'"
-
-#: ../libsvn_ra_neon/commit.c:1049 ../libsvn_ra_serf/commit.c:1913
-#, c-format
-msgid "File '%s' already exists"
-msgstr "檔案 '%s' 已存在"
-
-#: ../libsvn_ra_neon/commit.c:1176
-#, c-format
-msgid "Could not write svndiff to temp file"
-msgstr "無法寫 svndiff 至暫存檔"
-
-#: ../libsvn_ra_neon/fetch.c:246
-msgid "Could not save the URL of the version resource"
-msgstr "無法儲存版本資源的 URL"
-
-#: ../libsvn_ra_neon/fetch.c:439
-msgid "Could not get content-type from response"
-msgstr "無法自回應取得 content-type"
-
-#: ../libsvn_ra_neon/fetch.c:532
-msgid "Could not save file"
-msgstr "無法儲存檔案"
-
-#: ../libsvn_ra_neon/fetch.c:995
-msgid "Server response missing the expected deadprop-count property"
-msgstr "伺服器回應缺少預期的 deadprop-count 性質"
-
-#: ../libsvn_ra_neon/fetch.c:1091 ../libsvn_ra_serf/property.c:1001
-msgid "The OPTIONS response did not include the youngest revision"
-msgstr ""
-
-#: ../libsvn_ra_neon/fetch.c:1199 ../libsvn_ra_serf/commit.c:2471
-msgid "DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent"
-msgstr "DAV 要求失敗; 可能是檔案庫的 pre-revprop-change 掛勾執行失敗, 或是不存在"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1450
-#, fuzzy, c-format
-msgid "Missing rev attr in target-revision element"
-msgstr "Missing revision attr in target-revision element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1461 ../libsvn_ra_serf/update.c:1513
-#, fuzzy, c-format
-msgid "Missing name attr in absent-directory element"
-msgstr "Missing name attr in open-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1477 ../libsvn_ra_serf/update.c:1536
-#, fuzzy, c-format
-msgid "Missing name attr in absent-file element"
-msgstr "Missing name attr in open-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1492
-#, fuzzy, c-format
-msgid "Missing path attr in resource element"
-msgstr "Missing path attr in open-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1501
-#, fuzzy, c-format
-msgid "Missing rev attr in open-directory element"
-msgstr "Missing revision attr in open-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1532 ../libsvn_ra_serf/replay.c:282
-#: ../libsvn_ra_serf/update.c:1342
-#, c-format
-msgid "Missing name attr in open-directory element"
-msgstr "Missing name attr in open-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1559 ../libsvn_ra_serf/replay.c:308
-#: ../libsvn_ra_serf/update.c:1377
-#, fuzzy, c-format
-msgid "Missing name attr in add-directory element"
-msgstr "Missing path attr in add-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1572
-#, fuzzy, c-format
-msgid "Missing copyfrom-rev attr in add-directory element"
-msgstr "Missing path attr in add-directory element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1649
-#, fuzzy, c-format
-msgid "Missing rev attr in open-file element"
-msgstr "Missing revision attr in open-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1656 ../libsvn_ra_serf/replay.c:343
-#: ../libsvn_ra_serf/update.c:1417
-#, c-format
-msgid "Missing name attr in open-file element"
-msgstr "Missing name attr in open-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1682 ../libsvn_ra_serf/replay.c:369
-#: ../libsvn_ra_serf/update.c:1452
-#, c-format
-msgid "Missing name attr in add-file element"
-msgstr "Missing name attr in add-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1695
-#, fuzzy, c-format
-msgid "Missing copyfrom-rev attr in add-file element"
-msgstr "Missing name attr in add-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1752
-#, fuzzy, c-format
-msgid "Missing name attr in set-prop element"
-msgstr "Missing name attr in %s element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1766
-#, fuzzy, c-format
-msgid "Missing name attr in remove-prop element"
-msgstr "Missing name attr in open-file element"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:1840 ../libsvn_ra_serf/replay.c:256
-#: ../libsvn_ra_serf/update.c:1482
-#, c-format
-msgid "Missing name attr in delete-entry element"
-msgstr "Missing name attr in delete-entry element"
-
-#: ../libsvn_ra_neon/fetch.c:2002
-#, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "寫入 '%s' 時發生錯誤: 不預期的 EOF"
-
-#: ../libsvn_ra_neon/fetch.c:2149
-#, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML 編碼: '%s'"
-
-# as-is
-#: ../libsvn_ra_neon/fetch.c:2456
-#, c-format
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "REPORT response handling failed to complete the editor drive"
-
-#: ../libsvn_ra_neon/file_revs.c:290
-#, fuzzy
-msgid "Failed to write full amount to stream"
-msgstr "無法寫入至串流"
-
-# as-is
-#: ../libsvn_ra_neon/file_revs.c:376 ../libsvn_ra_neon/get_deleted_rev.c:170
-#: ../libsvn_ra_neon/get_location_segments.c:211
-#: ../libsvn_ra_neon/get_locations.c:194
-#: ../libsvn_ra_serf/get_deleted_rev.c:236
-#, fuzzy, c-format
-msgid "'%s' REPORT not implemented"
-msgstr "'get-locations' REPORT not implemented"
-
-#: ../libsvn_ra_neon/file_revs.c:383
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs 回報中沒有任何修訂版"
-
-#: ../libsvn_ra_neon/get_dated_rev.c:158
-msgid "Server does not support date-based operations"
-msgstr "伺服器不支援基於日期的動作"
-
-#: ../libsvn_ra_neon/get_dated_rev.c:165
-msgid "Invalid server response to dated-rev request"
-msgstr "對 dated-rev 要求的無效伺服器回應"
-
-#: ../libsvn_ra_neon/get_location_segments.c:122
-#: ../libsvn_ra_serf/getlocationsegments.c:109 ../libsvn_ra_svn/client.c:1717
-#, fuzzy
-msgid "Expected valid revision range"
-msgstr "項目 '%s' 有無效的修訂版"
-
-#: ../libsvn_ra_neon/get_locations.c:112
-msgid "Expected a valid revnum and path"
-msgstr ""
-
-#: ../libsvn_ra_neon/get_locks.c:238
-msgid "Incomplete lock data returned"
-msgstr "傳回不完全的鎖定資料"
-
-#: ../libsvn_ra_neon/get_locks.c:329 ../libsvn_ra_serf/property.c:370
-#: ../libsvn_ra_serf/update.c:1998
-#, fuzzy, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "無法確認的節點種類: '%s'"
-
-#: ../libsvn_ra_neon/get_locks.c:425 ../libsvn_ra_neon/get_locks.c:429
-#: ../libsvn_ra_serf/locks.c:566
-msgid "Server does not support locking features"
-msgstr "伺服器不支援鎖定功能"
-
-#: ../libsvn_ra_neon/lock.c:196
-msgid "Invalid creation date header value in response."
-msgstr ""
-
-#: ../libsvn_ra_neon/lock.c:221
-#, fuzzy
-msgid "Invalid timeout value"
-msgstr "無效的配置: 負的逾時數值"
-
-#: ../libsvn_ra_neon/lock.c:261 ../libsvn_ra_neon/lock.c:410
-#, fuzzy, c-format
-msgid "Failed to parse URI '%s'"
-msgstr "無法剖析 URI"
-
-#: ../libsvn_ra_neon/lock.c:321 ../libsvn_ra_serf/locks.c:380
-#: ../libsvn_ra_serf/locks.c:391 ../libsvn_ra_serf/locks.c:423
-#, c-format
-msgid "Lock request failed: %d %s"
-msgstr "鎖定要求失敗: %d %s"
-
-#: ../libsvn_ra_neon/lock.c:425 ../libsvn_ra_serf/locks.c:719
-#, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "'%s' 未於檔案庫中鎖定"
-
-#: ../libsvn_ra_neon/lock.c:553
-msgid "Failed to fetch lock information"
-msgstr "無法取得鎖定資料"
-
-# as-is
-#: ../libsvn_ra_neon/log.c:169 ../libsvn_ra_serf/log.c:228
-#, fuzzy, c-format
-msgid "Missing name attr in revprop element"
-msgstr "Missing name attr in %s element"
-
-#: ../libsvn_ra_neon/log.c:459 ../libsvn_ra_serf/log.c:625
-#: ../libsvn_ra_svn/client.c:1422
-#, fuzzy
-msgid "Server does not support custom revprops via log"
-msgstr "伺服器不支援 replay 命令"
-
-#: ../libsvn_ra_neon/merge.c:221
-#, c-format
-msgid "Protocol error: we told the server not to auto-merge any resources, but it said that '%s' was merged"
-msgstr "通訊協定錯誤: 我們告知伺服器不要自動合併任何資源, 但是它回報 '%s' 已被合併"
-
-#: ../libsvn_ra_neon/merge.c:230
-#, c-format
-msgid "Internal error: there is an unknown parent (%d) for the 'DAV:response' element within the MERGE response"
-msgstr "內部錯誤: 在 MERGE 回應中, 'DAV:response' 元素有個未知的父項目 (%d)"
-
-#: ../libsvn_ra_neon/merge.c:245
-#, c-format
-msgid "Protocol error: the MERGE response for the '%s' resource did not return all of the properties that we asked for (and need to complete the commit)"
-msgstr "通訊協定錯誤: 對 '%s' 的 MERGE 回應並未傳回所有我們要求的性質 (這些是完成送交動作所不可或缺的)"
-
-#: ../libsvn_ra_neon/merge.c:264 ../libsvn_ra_serf/merge.c:304
-#, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "對 '%s' 的 MERGE 回應並不是目標 ('%s') 的子項目"
-
-#: ../libsvn_ra_neon/merge.c:518
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 性質回應包含錯誤狀態"
-
-#: ../libsvn_ra_neon/options.c:316
-msgid "The OPTIONS response did not include the requested activity-collection-set; this often means that the URL is not WebDAV-enabled"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_neon/options.c:435 ../libsvn_ra_serf/options.c:605
-#, c-format
-msgid "Don't know how to handle '%s' for capability '%s'"
-msgstr ""
-
-#: ../libsvn_ra_neon/options.c:459 ../libsvn_ra_serf/options.c:629
-#, c-format
-msgid "Attempt to fetch capability '%s' resulted in '%s'"
-msgstr ""
-
-#: ../libsvn_ra_neon/props.c:607
-#, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "無法找到標記 '%s' 於 URL '%s'"
-
-#: ../libsvn_ra_neon/props.c:636
-#, fuzzy, c-format
-msgid "'%s' was not present on the resource '%s'"
-msgstr "'%s' 不存在於本資源上"
-
-#: ../libsvn_ra_neon/props.c:703
-#, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon 無法剖析網址 '%s'"
-
-#: ../libsvn_ra_neon/props.c:736
-msgid "The path was not part of a repository"
-msgstr "路徑不是檔案庫的一部份"
-
-#: ../libsvn_ra_neon/props.c:745
-#, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路徑 '%s' 的任何一部份在檔案庫 HEAD 中都找不到"
-
-#: ../libsvn_ra_neon/props.c:801 ../libsvn_ra_neon/props.c:857
-msgid "The VCC property was not found on the resource"
-msgstr "本資源找不到 VCC 性質"
-
-#: ../libsvn_ra_neon/props.c:870
-msgid "The relative-path property was not found on the resource"
-msgstr "本資源上找不到相對路徑性質"
-
-#: ../libsvn_ra_neon/props.c:991
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' 不存在於基線資源"
-
-#: ../libsvn_ra_neon/props.c:1010
-#, fuzzy, c-format
-msgid "'%s' was not present on the baseline resource"
-msgstr "'%s' 不存在於本資源上"
-
-#: ../libsvn_ra_neon/props.c:1234 ../libsvn_ra_serf/commit.c:983
-msgid "At least one property change failed; repository is unchanged"
-msgstr "至少有一個性質變更失敗; 檔案庫未更動"
-
-# as-is
-#: ../libsvn_ra_neon/replay.c:277
-msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr "Got apply-textdelta element without preceding add-file or open-file"
-
-# as-is
-#: ../libsvn_ra_neon/replay.c:301
-msgid "Got close-file element without preceding add-file or open-file"
-msgstr "Got close-file element without preceding add-file or open-file"
-
-# as-is
-#: ../libsvn_ra_neon/replay.c:318
-msgid "Got close-directory element without ever opening a directory"
-msgstr "Got close-directory element without ever opening a directory"
-
-#: ../libsvn_ra_neon/replay.c:437 ../libsvn_ra_serf/replay.c:565
-#, c-format
-msgid "Error writing stream: unexpected EOF"
-msgstr "寫入串流時發生錯誤: 無預期的 EOF"
-
-#: ../libsvn_ra_neon/replay.c:444
-#, c-format
-msgid "Got cdata content for a prop delete"
-msgstr "性質刪除得到 cdata 內容"
-
-#: ../libsvn_ra_neon/session.c:340
-#, c-format
-msgid "PIN for token \"%s\" in slot \"%s\""
-msgstr ""
-
-#: ../libsvn_ra_neon/session.c:541 ../libsvn_ra_serf/serf.c:278
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "無效的 URL: proxy 通訊埠編號中有不合法的字元"
-
-#: ../libsvn_ra_neon/session.c:545 ../libsvn_ra_serf/serf.c:282
-msgid "Invalid URL: negative proxy port number"
-msgstr "無效的 URL: 負的 proxy 通訊埠數值"
-
-#: ../libsvn_ra_neon/session.c:548 ../libsvn_ra_serf/serf.c:285
-msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr "無效的 URL: proxy 通訊埠數值大於最大值的 TCP 通訊埠數值 65535"
-
-#: ../libsvn_ra_neon/session.c:562 ../libsvn_ra_serf/serf.c:260
-msgid "Invalid config: illegal character in timeout value"
-msgstr "無效的配置: 逾時數值中有不合法的字元"
-
-#: ../libsvn_ra_neon/session.c:566 ../libsvn_ra_serf/serf.c:264
-msgid "Invalid config: negative timeout value"
-msgstr "無效的配置: 負的逾時數值"
-
-#: ../libsvn_ra_neon/session.c:579
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "無效的配置: 除錯遮罩值中有不合法的字元"
-
-#: ../libsvn_ra_neon/session.c:604 ../libsvn_ra_serf/serf.c:120
-#, fuzzy, c-format
-msgid "Invalid config: unknown http authtype '%s'"
-msgstr "無效的配置: 無法載入憑證檔 '%s'"
-
-# as-is
-#: ../libsvn_ra_neon/session.c:665
-#, fuzzy
-msgid "Module for accessing a repository via WebDAV protocol using Neon."
-msgstr "Module for accessing a repository via WebDAV (DeltaV) protocol."
-
-#: ../libsvn_ra_neon/session.c:745
-#, c-format
-msgid "URL '%s' is malformed or the scheme or host or path is missing"
-msgstr ""
-
-#: ../libsvn_ra_neon/session.c:761
-msgid "Network socket initialization failed"
-msgstr "網路 socket 啟始失敗"
-
-#: ../libsvn_ra_neon/session.c:825
-msgid "SSL is not supported"
-msgstr "不支援 SSL"
-
-#: ../libsvn_ra_neon/session.c:997 ../libsvn_ra_serf/util.c:264
-#, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "無效的配置: 無法載入憑證檔 '%s'"
-
-#: ../libsvn_ra_neon/session.c:1025
-#, fuzzy, c-format
-msgid "Invalid config: unable to load PKCS#11 provider '%s'"
-msgstr "無效的配置: 無法載入憑證檔 '%s'"
-
-#: ../libsvn_ra_neon/session.c:1182 ../libsvn_ra_serf/serf.c:984
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "無法在本資源或任何其父項目中找到 UUID 性質"
-
-# as-is
-#: ../libsvn_ra_neon/session.c:1259
-#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_neon"
-msgstr "Unsupported RA loader version (%d) for ra_svn"
-
-#: ../libsvn_ra_neon/util.c:233
-msgid "The request response contained at least one error"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:275
-msgid "The response contains a non-conforming HTTP status line"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:285
-#, fuzzy, c-format
-msgid "Error setting property '%s': "
-msgstr "剖析 %s 性質於 '%s' 發生錯誤: '%s'"
-
-#: ../libsvn_ra_neon/util.c:580
-#, c-format
-msgid "%s of '%s'"
-msgstr "%s of '%s'"
-
-#: ../libsvn_ra_neon/util.c:592 ../libsvn_ra_serf/util.c:1929
-#, c-format
-msgid "'%s' path not found"
-msgstr "找不到路徑 '%s'"
-
-#: ../libsvn_ra_neon/util.c:596
-#, c-format
-msgid "access to '%s' forbidden"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:606 ../libsvn_ra_serf/util.c:1923
-#, c-format
-msgid "Repository moved permanently to '%s'; please relocate"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:608 ../libsvn_ra_serf/util.c:1925
-#, c-format
-msgid "Repository moved temporarily to '%s'; please relocate"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:616
-#, c-format
-msgid "Server sent unexpected return value (%d %s) in response to %s request for '%s'"
-msgstr ""
-
-#: ../libsvn_ra_neon/util.c:628
-#, fuzzy, c-format
-msgid "authorization failed: %s"
-msgstr "授權失敗"
-
-#: ../libsvn_ra_neon/util.c:630
-msgid "authorization failed"
-msgstr "授權失敗"
-
-#: ../libsvn_ra_neon/util.c:635
-msgid "could not connect to server"
-msgstr "無法連接到伺服器"
-
-#: ../libsvn_ra_neon/util.c:639
-msgid "timed out waiting for server"
-msgstr "等待伺服器逾時"
-
-#: ../libsvn_ra_neon/util.c:983
-#, c-format
-msgid "Can't calculate the request body size"
-msgstr "無法算出要求的本體大小"
-
-#: ../libsvn_ra_neon/util.c:1147
-#, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s 要求的回應傳回無效的 XML: %s (%s)"
-
-#: ../libsvn_ra_neon/util.c:1332
-#, c-format
-msgid "Error reading spooled %s request response"
-msgstr "讀取置入 spool 的 %s 要求回應時發生錯誤"
-
-#: ../libsvn_ra_serf/auth.c:413 ../libsvn_ra_serf/auth.c:419
-#: ../libsvn_ra_serf/auth_digest.c:270
-#, fuzzy
-msgid "Missing 'realm' attribute in Authorization header"
-msgstr "'%s' 遺漏 'timestamp' 屬性"
-
-#: ../libsvn_ra_serf/auth_digest.c:465
-msgid "Incorrect response-digest in Authentication-Info header."
-msgstr ""
-
-#: ../libsvn_ra_serf/auth_kerb.c:160
-#, c-format
-msgid ""
-"Initialization of the GSSAPI context failed.\n"
-" %s\n"
-" %s\n"
-msgstr ""
-
-#: ../libsvn_ra_serf/commit.c:307
-msgid "No Location header received"
-msgstr ""
-
-#: ../libsvn_ra_serf/commit.c:438
-#, fuzzy, c-format
-msgid "Directory '%s' is out of date; try updating"
-msgstr "找不到目錄 '%s'"
-
-#: ../libsvn_ra_serf/commit.c:542 ../libsvn_repos/commit.c:394
-#, c-format
-msgid "Path '%s' not present"
-msgstr "路徑 '%s' 不存在"
-
-#: ../libsvn_ra_serf/commit.c:629
-#, c-format
-msgid "File '%s' is out of date; try updating"
-msgstr ""
-
-#: ../libsvn_ra_serf/commit.c:1206
-#, c-format
-msgid "Failed writing updated file"
-msgstr "寫入更新檔案失敗"
-
-#: ../libsvn_ra_serf/commit.c:1330 ../libsvn_ra_serf/commit.c:1408
-#, c-format
-msgid "%s of '%s': %d %s (%s://%s)"
-msgstr ""
-
-#: ../libsvn_ra_serf/commit.c:1340
-#, fuzzy, c-format
-msgid "POST request did not return transaction information"
-msgstr "物件不是一個異動的根物件"
-
-#: ../libsvn_ra_serf/commit.c:1380
-#, fuzzy
-msgid "The OPTIONS response did not include the requested activity-collection-set value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_serf/commit.c:1679
-#, c-format
-msgid "Adding a directory failed: %s on %s (%d %s)"
-msgstr ""
-
-#: ../libsvn_ra_serf/getlocationsegments.c:233
-#, c-format
-msgid "Location segment report failed on '%s'@'%ld'"
-msgstr ""
-
-#: ../libsvn_ra_serf/locks.c:560
-msgid "Malformed URL for repository"
-msgstr "檔案庫的 URL 有缺陷"
-
-#: ../libsvn_ra_serf/locks.c:759
-#, c-format
-msgid "Unlock request failed: %d %s"
-msgstr "解除鎖定要求失敗: %d %s"
-
-#: ../libsvn_ra_serf/property.c:1030 ../libsvn_ra_serf/update.c:1184
-#: ../libsvn_ra_serf/update.c:1732
-#, fuzzy
-msgid "The OPTIONS response did not include the requested checked-in value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_serf/property.c:1047
-#, fuzzy
-msgid "The OPTIONS response did not include the requested baseline-collection value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_serf/property.c:1063
-#, fuzzy
-msgid "The OPTIONS response did not include the requested version-name value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:218 ../libsvn_ra_serf/update.c:1279
-msgid "Missing revision attr in target-revision element"
-msgstr "Missing revision attr in target-revision element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:236
-msgid "Missing revision attr in open-root element"
-msgstr "Missing revision attr in open-root element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:262
-msgid "Missing revision attr in delete-entry element"
-msgstr "Missing revision attr in delete-entry element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:288 ../libsvn_ra_serf/update.c:1297
-#: ../libsvn_ra_serf/update.c:1333
-msgid "Missing revision attr in open-directory element"
-msgstr "Missing revision attr in open-directory element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1426
-msgid "Missing revision attr in open-file element"
-msgstr "Missing revision attr in open-file element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:436 ../libsvn_ra_serf/update.c:1572
-#: ../libsvn_ra_serf/update.c:1654
-#, c-format
-msgid "Missing name attr in %s element"
-msgstr "Missing name attr in %s element"
-
-# as-is
-#: ../libsvn_ra_serf/replay.c:864
-#, fuzzy, c-format
-msgid "Error retrieving replay REPORT (%d)"
-msgstr "Error retrieving REPORT (%d)"
-
-# as-is
-#: ../libsvn_ra_serf/serf.c:61
-#, fuzzy
-msgid "Module for accessing a repository via WebDAV protocol using serf."
-msgstr "Module for accessing a repository via WebDAV (DeltaV) protocol."
-
-#: ../libsvn_ra_serf/serf.c:408
-#, fuzzy, c-format
-msgid "Could not lookup hostname `%s'"
-msgstr "無法查得主機名稱: %s://%s"
-
-#: ../libsvn_ra_serf/serf.c:675
-#, fuzzy
-msgid "The OPTIONS response did not include the requested resourcetype value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_serf/serf.c:839
-msgid "The PROPFIND response did not include the requested resourcetype value"
-msgstr ""
-
-# as-is
-#: ../libsvn_ra_serf/serf.c:1054
-#, c-format
-msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "Unsupported RA loader version (%d) for ra_serf"
-
-#: ../libsvn_ra_serf/update.c:852
-#, fuzzy, c-format
-msgid "GET request failed: %d %s"
-msgstr "鎖定要求失敗: %d %s"
-
-# as-is
-#: ../libsvn_ra_serf/update.c:2332
-#, c-format
-msgid "Error retrieving REPORT (%d)"
-msgstr "Error retrieving REPORT (%d)"
-
-#: ../libsvn_ra_serf/util.c:699 ../libsvn_ra_serf/util.c:702
-#, fuzzy, c-format
-msgid "Error running context"
-msgstr "執行 post-commit 掛勾時發生錯誤"
-
-#: ../libsvn_ra_serf/util.c:1398
-msgid ""
-"No more credentials or we tried too many times.\n"
-"Authentication failed"
-msgstr ""
-
-#: ../libsvn_ra_serf/util.c:1421
-#, fuzzy
-msgid "Proxy authentication failed"
-msgstr "授權失敗"
-
-# as-is
-#: ../libsvn_ra_serf/util.c:1495
-#, fuzzy, c-format
-msgid "Premature EOF seen from server (http status=%d)"
-msgstr "Premature EOF seen from server"
-
-#: ../libsvn_ra_serf/util.c:1547
-#, fuzzy, c-format
-msgid "Unspecified error message: %d %s"
-msgstr "指定送交訊息 ARG"
-
-#: ../libsvn_ra_serf/util.c:1815
-#, fuzzy
-msgid "The OPTIONS response did not include the requested version-controlled-configuration value"
-msgstr "OPTIONS 回應並不包含要求的 activity-collection-set; 通常這表示該 URL 並不支援 WebDAV"
-
-#: ../libsvn_ra_serf/util.c:1932
-#, fuzzy, c-format
-msgid "'%s': no lock token available"
-msgstr "未提供鎖定符記"
-
-#: ../libsvn_ra_svn/client.c:136
-#, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主機名稱 '%s'"
-
-#: ../libsvn_ra_svn/client.c:161
-#, c-format
-msgid "Can't connect to host '%s'"
-msgstr "無法連線至主機 '%s'"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:199
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs element not a list"
-
-#: ../libsvn_ra_svn/client.c:395
-#, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "無法辨識的 tunnel 綱要 '%s'"
-
-#: ../libsvn_ra_svn/client.c:412
-#, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "Tunnel 綱要 %s 需要設定環境變數 %s"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:423
-#, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "Can't tokenize command '%s'"
-
-#: ../libsvn_ra_svn/client.c:454
-#, c-format
-msgid "Error in child process: %s"
-msgstr "子程序錯誤: %s"
-
-#: ../libsvn_ra_svn/client.c:480
-#, c-format
-msgid "Can't create tunnel"
-msgstr "無法建立 tunnel"
-
-#: ../libsvn_ra_svn/client.c:525
-msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file."
-msgstr ""
-
-#: ../libsvn_ra_svn/client.c:543
-#, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "不合法的 svn 檔案庫 URL '%s'"
-
-#: ../libsvn_ra_svn/client.c:604
-#, c-format
-msgid "Server requires minimum version %d"
-msgstr "伺服器最低要求的版號為 %d"
-
-#: ../libsvn_ra_svn/client.c:608
-#, fuzzy, c-format
-msgid "Server only supports versions up to %d"
-msgstr "伺服器不支援 unlock 命令"
-
-#: ../libsvn_ra_svn/client.c:616
-#, fuzzy
-msgid "Server does not support edit pipelining"
-msgstr "伺服器不支援基於日期的動作"
-
-#: ../libsvn_ra_svn/client.c:655
-msgid "Impossibly long repository root from server"
-msgstr "伺服器回傳的檔案庫根路徑長得太誇張"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:667
-#, fuzzy
-msgid ""
-"Module for accessing a repository using the svn network protocol.\n"
-" - with Cyrus SASL authentication"
-msgstr "Module for accessing a repository using the svn network protocol."
-
-# as-is
-#: ../libsvn_ra_svn/client.c:671
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "Module for accessing a repository using the svn network protocol."
-
-#: ../libsvn_ra_svn/client.c:883
-msgid "Server did not send repository root"
-msgstr "伺服器沒有傳回檔案庫根路徑"
-
-#: ../libsvn_ra_svn/client.c:958
-msgid "Server doesn't support setting arbitrary revision properties during commit"
-msgstr ""
-
-#: ../libsvn_ra_svn/client.c:1046
-msgid "Non-string as part of file contents"
-msgstr "檔案內容的一部份不是字串"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1138
-msgid "Dirlist element not a list"
-msgstr "Dirlist element not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1198
-#, fuzzy
-msgid "Mergeinfo element is not a list"
-msgstr "Prop diffs element not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1411
-msgid "Log entry not a list"
-msgstr "Log entry not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1452
-msgid "Changed-path entry not a list"
-msgstr "Changed-path entry not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1577
-msgid "'stat' not implemented"
-msgstr "'stat' not implemented"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1637
-msgid "'get-locations' not implemented"
-msgstr "'get-locations' not implemented"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1652
-msgid "Location entry not a list"
-msgstr "Location entry not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1691
-#, fuzzy
-msgid "'get-location-segments' not implemented"
-msgstr "'get-locations' not implemented"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1707
-#, fuzzy
-msgid "Location segment entry not a list"
-msgstr "Location entry not a list"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1758
-msgid "'get-file-revs' not implemented"
-msgstr "'get-file-revs' not implemented"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:1782
-msgid "Revision entry not a list"
-msgstr "Revision entry not a list"
-
-#: ../libsvn_ra_svn/client.c:1799 ../libsvn_ra_svn/client.c:1829
-msgid "Text delta chunk not a string"
-msgstr "文字差異區段並非字串"
-
-#: ../libsvn_ra_svn/client.c:1841
-msgid "The get-file-revs command didn't return any revisions"
-msgstr "get-file-revs 命令沒有傳回任何修訂版"
-
-#: ../libsvn_ra_svn/client.c:1889
-msgid "Server doesn't support the lock command"
-msgstr "伺服器不支援 lock 命令"
-
-#: ../libsvn_ra_svn/client.c:1953
-msgid "Server doesn't support the unlock command"
-msgstr "伺服器不支援 unlock 命令"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:2051
-msgid "Lock response not a list"
-msgstr "Lock response not a list"
-
-#: ../libsvn_ra_svn/client.c:2065
-msgid "Unknown status for lock command"
-msgstr "鎖定命令的未知狀態"
-
-#: ../libsvn_ra_svn/client.c:2089
-msgid "Didn't receive end marker for lock responses"
-msgstr "未收到鎖定回應的結束標記"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:2179
-msgid "Unlock response not a list"
-msgstr "Unlock response not a list"
-
-#: ../libsvn_ra_svn/client.c:2193
-msgid "Unknown status for unlock command"
-msgstr "解鎖命令的未知狀態"
-
-#: ../libsvn_ra_svn/client.c:2216
-msgid "Didn't receive end marker for unlock responses"
-msgstr "未收到解鎖回應的結束標記"
-
-#: ../libsvn_ra_svn/client.c:2240 ../libsvn_ra_svn/client.c:2301
-msgid "Server doesn't support the get-lock command"
-msgstr "伺服器不支援 get-lock 命令"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:2315
-msgid "Lock element not a list"
-msgstr "Lock element not a list"
-
-#: ../libsvn_ra_svn/client.c:2358
-msgid "Server doesn't support the replay command"
-msgstr "伺服器不支援 replay 命令"
-
-#: ../libsvn_ra_svn/client.c:2389
-#, fuzzy
-msgid "Server doesn't support the replay-range command"
-msgstr "伺服器不支援 replay 命令"
-
-#: ../libsvn_ra_svn/client.c:2407
-#, fuzzy, c-format
-msgid "Expected 'revprops', found '%s'"
-msgstr "移除 '%s' 的性質時發生錯誤"
-
-#: ../libsvn_ra_svn/client.c:2424
-msgid "Error while replaying commit"
-msgstr ""
-
-# as-is
-#: ../libsvn_ra_svn/client.c:2488
-#, fuzzy
-msgid "'get-deleted-rev' not implemented"
-msgstr "'get-file-revs' not implemented"
-
-# as-is
-#: ../libsvn_ra_svn/client.c:2553
-#, c-format
-msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "Unsupported RA loader version (%d) for ra_svn"
-
-#: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217
-#: ../libsvn_ra_svn/cyrus_auth.c:448 ../libsvn_ra_svn/cyrus_auth.c:503
-#: ../libsvn_ra_svn/internal_auth.c:66
-msgid "Unexpected server response to authentication"
-msgstr "不預期對認證的伺服器回應"
-
-#: ../libsvn_ra_svn/cyrus_auth.c:176 ../svnserve/cyrus_auth.c:113
-#: ../svnserve/cyrus_auth.c:123
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr ""
-
-#: ../libsvn_ra_svn/cyrus_auth.c:830 ../libsvn_ra_svn/internal_auth.c:63
-#: ../libsvn_ra_svn/internal_auth.c:114
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "來自伺服器的認證錯誤: %s"
-
-#: ../libsvn_ra_svn/cyrus_auth.c:834
-#, fuzzy
-msgid "Can't get username or password"
-msgstr "無法取得密碼"
-
-# as-is
-#: ../libsvn_ra_svn/editorp.c:131
-msgid "Successful edit status returned too soon"
-msgstr "Successful edit status returned too soon"
-
-# as-is
-#: ../libsvn_ra_svn/editorp.c:458
-msgid "Invalid file or dir token during edit"
-msgstr "Invalid file or dir token during edit"
-
-# as-is
-#: ../libsvn_ra_svn/editorp.c:667
-msgid "Apply-textdelta already active"
-msgstr "Apply-textdelta already active"
-
-# as-is
-#: ../libsvn_ra_svn/editorp.c:689 ../libsvn_ra_svn/editorp.c:707
-msgid "Apply-textdelta not active"
-msgstr "Apply-textdelta not active"
-
-#: ../libsvn_ra_svn/editorp.c:802
-#, c-format
-msgid "Command 'finish-replay' invalid outside of replays"
-msgstr ""
-
-#: ../libsvn_ra_svn/editorp.c:893 ../libsvn_ra_svn/marshal.c:1025
-#, c-format
-msgid "Unknown command '%s'"
-msgstr "未知的命令: '%s'"
-
-#: ../libsvn_ra_svn/internal_auth.c:101 ../libsvn_subr/prompt.c:163
-#, c-format
-msgid "Can't get password"
-msgstr "無法取得密碼"
-
-# as-is
-#: ../libsvn_ra_svn/marshal.c:105
-msgid "Capability entry is not a word"
-msgstr "Capability entry is not a word"
-
-#: ../libsvn_ra_svn/marshal.c:559
-msgid "String length larger than maximum"
-msgstr "字串長度超出上限"
-
-#: ../libsvn_ra_svn/marshal.c:647
-msgid "Too many nested items"
-msgstr "太多巢狀項目"
-
-#: ../libsvn_ra_svn/marshal.c:666
-msgid "Number is larger than maximum"
-msgstr "數字大小超過上限"
-
-# as-is
-#: ../libsvn_ra_svn/marshal.c:881
-msgid "Proplist element not a list"
-msgstr "Proplist element not a list"
-
-#: ../libsvn_ra_svn/marshal.c:919
-msgid "Empty error list"
-msgstr "空的錯誤列表"
-
-#: ../libsvn_ra_svn/marshal.c:928 ../libsvn_ra_svn/marshal.c:954
-msgid "Malformed error list"
-msgstr "有缺陷的錯誤列表"
-
-#: ../libsvn_ra_svn/marshal.c:982
-#, c-format
-msgid "Unknown status '%s' in command response"
-msgstr "命令回應中的未知狀態 '%s'"
-
-#: ../libsvn_ra_svn/streams.c:78 ../libsvn_ra_svn/streams.c:157
-#, c-format
-msgid "Can't read from connection"
-msgstr "無法讀取連線"
-
-#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:170
-#, c-format
-msgid "Can't write to connection"
-msgstr "無法寫入連線"
-
-#: ../libsvn_ra_svn/streams.c:144
-#, fuzzy, c-format
-msgid "Can't get socket timeout"
-msgstr "無法設定逾時"
-
-#: ../libsvn_repos/commit.c:135
-#, fuzzy, c-format
-msgid "'%s' is out of date"
-msgstr "項目已過時"
-
-#: ../libsvn_repos/commit.c:302 ../libsvn_repos/commit.c:447
-#, c-format
-msgid "Got source path but no source revision for '%s'"
-msgstr "'%s' 中有來源路徑, 但是沒有來源修訂版"
-
-#: ../libsvn_repos/commit.c:334 ../libsvn_repos/commit.c:478
-#, c-format
-msgid "Source url '%s' is from different repository"
-msgstr "來源 URL '%s' 來自其它的檔案庫"
-
-#: ../libsvn_repos/commit.c:606
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch for resulting fulltext\n"
-"(%s)"
-msgstr ""
-"全文總和檢查值不符合:\n"
-"(%s):\n"
-" 預期的檢查值: %s\n"
-" 實際的檢查值: %s\n"
-
-# as-is
-#: ../libsvn_repos/delta.c:191
-msgid "Unable to open root of edit"
-msgstr "Unable to open root of edit"
-
-#: ../libsvn_repos/delta.c:242
-msgid "Invalid target path"
-msgstr "無效的目標類型"
-
-#: ../libsvn_repos/delta.c:246
-msgid "Delta depth 'exclude' not supported"
-msgstr ""
-
-# as-is
-#: ../libsvn_repos/delta.c:272
-msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
-msgstr "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
-
-# as-is
-#: ../libsvn_repos/deprecated.c:570 ../svnadmin/main.c:671
-#, c-format
-msgid "* Dumped revision %ld.\n"
-msgstr "* Dumped revision %ld.\n"
-
-# as-is
-#: ../libsvn_repos/deprecated.c:576 ../svnadmin/main.c:677
-#, c-format
-msgid "* Verified revision %ld.\n"
-msgstr "* Verified revision %ld.\n"
-
-# as-is
-#: ../libsvn_repos/deprecated.c:584 ../svnadmin/main.c:717
-#, c-format
-msgid ""
-"\n"
-"------- Committed revision %ld >>>\n"
-"\n"
-msgstr ""
-"\n"
-"------- Committed revision %ld >>>\n"
-"\n"
-
-# as-is
-#: ../libsvn_repos/deprecated.c:590 ../svnadmin/main.c:723
-#, c-format
-msgid ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
-msgstr ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
-
-#: ../libsvn_repos/deprecated.c:603 ../svnadmin/main.c:736
-#, c-format
-msgid " * editing path : %s ..."
-msgstr " * 編輯路徑 : %s ..."
-
-#: ../libsvn_repos/deprecated.c:609 ../svnadmin/main.c:742
-#, c-format
-msgid " * deleting path : %s ..."
-msgstr " * 刪除路徑 : %s ..."
-
-#: ../libsvn_repos/deprecated.c:615 ../svnadmin/main.c:748
-#, c-format
-msgid " * adding path : %s ..."
-msgstr " * 新增路徑 : %s ..."
-
-#: ../libsvn_repos/deprecated.c:621 ../svnadmin/main.c:754
-#, c-format
-msgid " * replacing path : %s ..."
-msgstr " * 取代路徑 : %s ..."
-
-#: ../libsvn_repos/deprecated.c:631 ../svnadmin/main.c:764
-msgid " done.\n"
-msgstr " 完成.\n"
-
-# as-is
-#: ../libsvn_repos/deprecated.c:641 ../svnadmin/main.c:774
-#, c-format
-msgid "<<< Started new transaction, based on original revision %ld\n"
-msgstr "<<< Started new transaction, based on original revision %ld\n"
-
-#: ../libsvn_repos/deprecated.c:648 ../svnadmin/main.c:781
-#, fuzzy, c-format
-msgid " removing '\\r' from %s ..."
-msgstr "移除 '%s' 的性質時發生錯誤"
-
-# as-is
-#: ../libsvn_repos/dump.c:353
-#, c-format
-msgid ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-msgstr ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-
-# as-is
-#: ../libsvn_repos/dump.c:457
-#, fuzzy, c-format
-msgid ""
-"WARNING: Mergeinfo referencing revision(s) prior to the oldest dumped revision (%ld).\n"
-"WARNING: Loading this dump may result in invalid mergeinfo.\n"
-msgstr ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-
-#: ../libsvn_repos/dump.c:979 ../libsvn_repos/dump.c:1235
-#, c-format
-msgid "Start revision %ld is greater than end revision %ld"
-msgstr "起始修訂版 %ld 比結束修訂版號 %ld 為大"
-
-#: ../libsvn_repos/dump.c:984 ../libsvn_repos/dump.c:1240
-#, c-format
-msgid "End revision %ld is invalid (youngest revision is %ld)"
-msgstr "結束修訂版 %ld 無效 (最年輕的修訂版為 %ld)"
-
-#: ../libsvn_repos/dump.c:1120
-msgid ""
-"WARNING: The range of revisions dumped contained references to\n"
-"WARNING: copy sources outside that range.\n"
-msgstr ""
-
-#: ../libsvn_repos/dump.c:1131
-msgid ""
-"WARNING: The range of revisions dumped contained mergeinfo\n"
-"WARNING: which reference revisions outside that range.\n"
-msgstr ""
-
-#: ../libsvn_repos/dump.c:1188
-#, fuzzy, c-format
-msgid "Unexpected node kind %d for '%s'"
-msgstr "找到一個意料之外的節點種類"
-
-#: ../libsvn_repos/fs-wrap.c:64 ../libsvn_repos/load-fs-vtable.c:818
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "送交成功, 但是 post-commit 掛勾失敗"
-
-#: ../libsvn_repos/fs-wrap.c:171
-#, c-format
-msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
-msgstr "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
-
-#: ../libsvn_repos/fs-wrap.c:186
-#, c-format
-msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
-msgstr ""
-
-#: ../libsvn_repos/fs-wrap.c:196
-#, c-format
-msgid "Cannot accept non-LF line endings in '%s' property"
-msgstr ""
-
-#: ../libsvn_repos/fs-wrap.c:330
-#, c-format
-msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "拒絕寫入: 未授權讀取所有的修訂版 %ld"
-
-#: ../libsvn_repos/fs-wrap.c:507
-#, c-format
-msgid "Cannot unlock path '%s', no authenticated username available"
-msgstr "無法解除路徑 '%s' 的鎖定, 沒有通過認證的使用者名稱"
-
-#: ../libsvn_repos/fs-wrap.c:522
-msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "送交成功, 但是 post-unlock 掛勾失敗"
-
-#: ../libsvn_repos/hooks.c:87
-#, fuzzy, c-format
-msgid "'%s' hook succeeded, but error output could not be read"
-msgstr "'%s' 掛勾失敗; 無錯誤輸出"
-
-#: ../libsvn_repos/hooks.c:102
-msgid "[Error output could not be translated from the native locale to UTF-8.]"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:107
-msgid "[Error output could not be read.]"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:116
-#, c-format
-msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). "
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:125
-msgid "Commit"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:127
-msgid "Revprop change"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:129
-msgid "Obliteration"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:131
-msgid "Lock"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:133
-msgid "Unlock"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:138
-#, fuzzy, c-format
-msgid "%s hook failed (exit code %d)"
-msgstr ""
-"'%s' 掛勾失敗, 錯誤輸出為:\n"
-"%s"
-
-#: ../libsvn_repos/hooks.c:142
-#, c-format
-msgid "%s blocked by %s hook (exit code %d)"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:149
-msgid " with output:\n"
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:155
-msgid " with no output."
-msgstr ""
-
-#: ../libsvn_repos/hooks.c:190 ../libsvn_repos/hooks.c:217
-#, c-format
-msgid "Can't create pipe for hook '%s'"
-msgstr "無法為掛勾 '%s' 建立管道"
-
-#: ../libsvn_repos/hooks.c:202 ../libsvn_repos/hooks.c:223
-#, c-format
-msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "無法為掛勾 '%s' 建立非繼承式的讀取管道代號"
-
-#: ../libsvn_repos/hooks.c:208 ../libsvn_repos/hooks.c:229
-#, c-format
-msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "無法為掛勾 '%s' 建立非繼承式的寫入管道代號"
-
-#: ../libsvn_repos/hooks.c:238
-#, c-format
-msgid "Can't create null stdout for hook '%s'"
-msgstr "無法為掛勾 '%s' 建立 null 標準輸出"
-
-#: ../libsvn_repos/hooks.c:252 ../libsvn_repos/hooks.c:259
-#, c-format
-msgid "Error closing write end of stderr pipe"
-msgstr "關閉標準錯誤管道的寫入端時發生錯誤"
-
-#: ../libsvn_repos/hooks.c:265
-#, c-format
-msgid "Failed to start '%s' hook"
-msgstr "無法啟動 '%s' 掛勾"
-
-#: ../libsvn_repos/hooks.c:278 ../libsvn_repos/hooks.c:287
-#, c-format
-msgid "Error closing read end of stderr pipe"
-msgstr "關閉標準錯誤管道的讀取端時發生錯誤"
-
-#: ../libsvn_repos/hooks.c:295
-#, c-format
-msgid "Error closing null file"
-msgstr "關閉 null 檔案時發生錯誤"
-
-#: ../libsvn_repos/hooks.c:379
-#, c-format
-msgid "Failed to run '%s' hook; broken symlink"
-msgstr "無法執行 '%s' 掛勾: 壞掉的符號連結"
-
-#: ../libsvn_repos/hooks.c:589
-msgid ""
-"Repository has not been enabled to accept revision propchanges;\n"
-"ask the administrator to create a pre-revprop-change hook"
-msgstr ""
-"檔案庫並未設定成可接受修訂版性質更動;\n"
-"請要求管理員建立 pre-revprop-change 掛勾"
-
-#: ../libsvn_repos/hooks.c:688
-#, fuzzy
-msgid "Repository has not been enabled to accept obliteration"
-msgstr "本動作需要對檔案庫進行存取"
-
-#: ../libsvn_repos/load-fs-vtable.c:466
-#, c-format
-msgid "Relative source revision %ld is not available in current repository"
-msgstr "相對來源修訂版 %ld 不存在於目前檔案庫之中"
-
-#: ../libsvn_repos/load-fs-vtable.c:482
-#, c-format
-msgid ""
-"Copy source checksum mismatch on copy from '%s'@%ld\n"
-"to '%s' in rev based on r%ld"
-msgstr ""
-
-#: ../libsvn_repos/load-fs-vtable.c:539
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "有缺陷的傾印串流: 修訂版 0 不可包含節點紀錄"
-
-# as-is
-#: ../libsvn_repos/load-fs-vtable.c:548
-#, c-format
-msgid "Unrecognized node-action on node '%s'"
-msgstr "無法辨識路徑 '%s' 的路徑動作"
-
-# as-is
-#: ../libsvn_repos/load.c:53
-msgid "Premature end of content data in dumpstream"
-msgstr "Premature end of content data in dumpstream"
-
-# as-is
-#: ../libsvn_repos/load.c:60
-msgid "Dumpstream data appears to be malformed"
-msgstr "Dumpstream data appears to be malformed"
-
-#: ../libsvn_repos/load.c:109
-#, c-format
-msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr "傾印串流在 '%.20s' 處有一個缺陷檔頭 (沒有 ':')"
-
-#: ../libsvn_repos/load.c:122
-#, c-format
-msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr "傾印串流在 '%.20s' 處有一個缺陷檔頭 (沒有值)"
-
-#: ../libsvn_repos/load.c:211
-msgid "Incomplete or unterminated property block"
-msgstr "不完全或未結束的性質區塊"
-
-#: ../libsvn_repos/load.c:359
-msgid "Unexpected EOF writing contents"
-msgstr "寫入資料時發生未預期的檔尾符號"
-
-#: ../libsvn_repos/load.c:388
-msgid "Malformed dumpfile header"
-msgstr "有缺陷的傾印檔頭"
-
-#: ../libsvn_repos/load.c:394 ../libsvn_repos/load.c:439
-#, c-format
-msgid "Unsupported dumpfile version: %d"
-msgstr "不支援的傾印檔版號: %d"
-
-#: ../libsvn_repos/load.c:542
-msgid "Unrecognized record type in stream"
-msgstr "串流中有無法辨識的紀錄種類"
-
-#: ../libsvn_repos/load.c:655
-msgid "Sum of subblock sizes larger than total block content length"
-msgstr "子區塊大小的總和大於總區塊的內容長度"
-
-#: ../libsvn_repos/node_tree.c:243
-#, c-format
-msgid "'%s' not found in filesystem"
-msgstr "檔案系統中找不到 '%s'"
-
-#: ../libsvn_repos/replay.c:418
-#, c-format
-msgid "Filesystem path '%s' is neither a file nor a directory"
-msgstr "檔案系統路徑 '%s' 不是檔案或目錄"
-
-#: ../libsvn_repos/reporter.c:195
-#, c-format
-msgid "Invalid length (%%%s) when about to read a string"
-msgstr ""
-
-#: ../libsvn_repos/reporter.c:256
-#, fuzzy, c-format
-msgid "Invalid depth (%c) for path '%s'"
-msgstr "無效的複製來源路徑 '%s'"
-
-#: ../libsvn_repos/reporter.c:849
-#, c-format
-msgid "Working copy path '%s' does not exist in repository"
-msgstr "路徑 '%s' 不存在於檔案庫中"
-
-# as-is
-#: ../libsvn_repos/reporter.c:1217
-msgid "Not authorized to open root of edit operation"
-msgstr "Not authorized to open root of edit operation"
-
-#: ../libsvn_repos/reporter.c:1234
-#, fuzzy, c-format
-msgid "Target path '%s' does not exist"
-msgstr "目標路徑不存在"
-
-#: ../libsvn_repos/reporter.c:1242
-msgid "Cannot replace a directory from within"
-msgstr "無法在目錄中取代它"
-
-#: ../libsvn_repos/reporter.c:1285
-msgid "Invalid report for top level of working copy"
-msgstr "這個回報對工作複本的最上層目錄無效"
-
-# as-is
-#: ../libsvn_repos/reporter.c:1300
-msgid "Two top-level reports with no target"
-msgstr "Two top-level reports with no target"
-
-#: ../libsvn_repos/reporter.c:1358
-#, fuzzy, c-format
-msgid "Unsupported report depth '%s'"
-msgstr "路徑 '%s' 為不支援的節點種類"
-
-#: ../libsvn_repos/reporter.c:1386
-msgid "Depth 'exclude' not supported for link"
-msgstr ""
-
-#: ../libsvn_repos/reporter.c:1446
-msgid "Request depth 'exclude' not supported"
-msgstr ""
-
-#: ../libsvn_repos/repos.c:199
-#, c-format
-msgid "'%s' exists and is non-empty"
-msgstr "'%s' 已存在, 而且有內容"
-
-# as-is
-#: ../libsvn_repos/repos.c:245
-msgid "Creating db logs lock file"
-msgstr "Creating db logs lock file"
-
-#: ../libsvn_repos/repos.c:263
-msgid "Creating db lock file"
-msgstr "建立 db 鎖定檔"
-
-#: ../libsvn_repos/repos.c:273
-msgid "Creating lock dir"
-msgstr "建立鎖定目錄"
-
-#: ../libsvn_repos/repos.c:302
-msgid "Creating hook directory"
-msgstr "建立掛勾目錄"
-
-#: ../libsvn_repos/repos.c:378
-msgid "Creating start-commit hook"
-msgstr "建立 start-commit 掛勾"
-
-#: ../libsvn_repos/repos.c:468
-msgid "Creating pre-commit hook"
-msgstr "建立 pre-commit 掛勾"
-
-#: ../libsvn_repos/repos.c:544
-msgid "Creating pre-revprop-change hook"
-msgstr "建立 pre-revprop-change 掛勾"
-
-#: ../libsvn_repos/repos.c:618
-#, fuzzy
-msgid "Creating pre-obliterate hook"
-msgstr "建立 pre-commit 掛勾"
-
-#: ../libsvn_repos/repos.c:846
-msgid "Creating post-commit hook"
-msgstr "建立 post-commit 掛勾"
-
-#: ../libsvn_repos/repos.c:1032
-msgid "Creating post-revprop-change hook"
-msgstr "建立 post-revprop-change 掛勾"
-
-#: ../libsvn_repos/repos.c:1090
-#, fuzzy
-msgid "Creating post-obliterate hook"
-msgstr "建立 post-commit 掛勾"
-
-#: ../libsvn_repos/repos.c:1100
-msgid "Creating conf directory"
-msgstr "建立 conf 目錄"
-
-#: ../libsvn_repos/repos.c:1169
-msgid "Creating svnserve.conf file"
-msgstr "建立 svnserve.conf 檔案"
-
-#: ../libsvn_repos/repos.c:1187
-msgid "Creating passwd file"
-msgstr "建立 passwd 檔案"
-
-#: ../libsvn_repos/repos.c:1229
-msgid "Creating authz file"
-msgstr "建立 authz 檔案"
-
-#: ../libsvn_repos/repos.c:1264
-msgid "Could not create top-level directory"
-msgstr "無法建立臨時目錄"
-
-#: ../libsvn_repos/repos.c:1276
-msgid "Creating DAV sandbox dir"
-msgstr "建立 DAV 沙箱目錄"
-
-#: ../libsvn_repos/repos.c:1345
-msgid "Error opening db lockfile"
-msgstr "開啟 db 鎖定檔時發生錯誤"
-
-#: ../libsvn_repos/repos.c:1384
-#, fuzzy, c-format
-msgid "'%s' is a subdirectory of an existing repository rooted at '%s'"
-msgstr "'%s' 不是檔案系統 '%s' 的目錄"
-
-#: ../libsvn_repos/repos.c:1392
-msgid "Repository creation failed"
-msgstr "檔案庫建立失敗"
-
-#: ../libsvn_repos/repos.c:1473
-#, fuzzy, c-format
-msgid "Expected repository format '%d' or '%d'; found format '%d'"
-msgstr "預期 FS 格式 '%d'; 找到格式 '%d'"
-
-#: ../libsvn_repos/repos.c:1701
-#, fuzzy, c-format
-msgid "unknown capability '%s'"
-msgstr "未知的命令: '%s'\n"
-
-#: ../libsvn_repos/rev_hunt.c:70
-#, c-format
-msgid "Failed to find time on revision %ld"
-msgstr "無法找到修訂版 %ld 的時間"
-
-#: ../libsvn_repos/rev_hunt.c:204 ../libsvn_repos/rev_hunt.c:319
-#, c-format
-msgid "Invalid start revision %ld"
-msgstr "無效的起始修訂版 %ld"
-
-#: ../libsvn_repos/rev_hunt.c:512
-msgid "Unreadable path encountered; access denied"
-msgstr "遇到無法讀取的路徑; 拒絕存取"
-
-#: ../libsvn_repos/rev_hunt.c:1106
-#, fuzzy, c-format
-msgid "'%s' is not a file in revision %ld"
-msgstr "'%s' 不存在於修訂版 %ld"
-
-#: ../libsvn_subr/auth.c:607
-#, fuzzy, c-format
-msgid "Invalid config: unknown password store '%s'"
-msgstr "無效的配置: 無法載入憑證檔 '%s'"
-
-#: ../libsvn_subr/cache-inprocess.c:184
-#, fuzzy, c-format
-msgid "Can't lock cache mutex"
-msgstr "無法配置 FS mutex"
-
-#: ../libsvn_subr/cache-inprocess.c:202
-#, fuzzy, c-format
-msgid "Can't unlock cache mutex"
-msgstr "無法配置 FS mutex"
-
-#: ../libsvn_subr/cache-inprocess.c:454
-#, fuzzy, c-format
-msgid "Can't create cache mutex"
-msgstr "無法建立 socket"
-
-#: ../libsvn_subr/cache-memcache.c:157
-#, c-format
-msgid "Unknown memcached error while reading"
-msgstr ""
-
-#: ../libsvn_subr/cache-memcache.c:207
-#, c-format
-msgid "Unknown memcached error while writing"
-msgstr ""
-
-# as-is
-#: ../libsvn_subr/cache-memcache.c:222
-#, fuzzy
-msgid "Can't iterate a memcached cache"
-msgstr "Can't set detached state"
-
-#: ../libsvn_subr/cache-memcache.c:286
-#, fuzzy, c-format
-msgid "Error parsing memcache server '%s'"
-msgstr "剖析 '%s' 時發生錯誤"
-
-#: ../libsvn_subr/cache-memcache.c:294
-#, c-format
-msgid "Scope not allowed in memcache server '%s'"
-msgstr ""
-
-#: ../libsvn_subr/cache-memcache.c:302
-#, c-format
-msgid "Must specify host and port for memcache server '%s'"
-msgstr ""
-
-#: ../libsvn_subr/cache-memcache.c:321
-#, c-format
-msgid "Unknown error creating memcache server"
-msgstr ""
-
-#: ../libsvn_subr/cache-memcache.c:329
-#, c-format
-msgid "Unknown error adding server to memcache"
-msgstr ""
-
-#: ../libsvn_subr/cache-memcache.c:399
-#, c-format
-msgid "Unknown error creating apr_memcache_t"
-msgstr ""
-
-#: ../libsvn_subr/cmdline.c:599
-#, c-format
-msgid "Error initializing command line arguments"
-msgstr "無法初始化命令列引數"
-
-#: ../libsvn_subr/cmdline.c:681
-#, fuzzy
-msgid "Invalid syntax of argument of --config-option"
-msgstr "差異選項中有無效的引數 '%s'"
-
-#: ../libsvn_subr/cmdline.c:708
-#, fuzzy, c-format
-msgid "Unrecognized file in argument of %s"
-msgstr "'%s' 的節點種類無法辨識"
-
-#: ../libsvn_subr/config.c:667
-#, fuzzy, c-format
-msgid "Config error: invalid boolean value '%s' for '[%s] %s'"
-msgstr "設定錯誤: 無效的布林值 '%s'"
-
-#: ../libsvn_subr/config.c:674
-#, fuzzy, c-format
-msgid "Config error: invalid boolean value '%s' for '%s'"
-msgstr "設定錯誤: 無效的布林值 '%s'"
-
-#: ../libsvn_subr/config.c:957
-#, c-format
-msgid "Config error: invalid integer value '%s'"
-msgstr "設定錯誤: 無效的整數值 '%s'"
-
-#: ../libsvn_subr/config_auth.c:95
-msgid "Unable to open auth file for reading"
-msgstr "無法開啟 auth 檔案進行讀取"
-
-#: ../libsvn_subr/config_auth.c:100
-#, c-format
-msgid "Error parsing '%s'"
-msgstr "剖析 '%s' 時發生錯誤"
-
-#: ../libsvn_subr/config_auth.c:125
-msgid "Unable to locate auth file"
-msgstr "無法找到 auth 檔案"
-
-#: ../libsvn_subr/config_auth.c:136
-msgid "Unable to open auth file for writing"
-msgstr "無法開啟 auth 檔案進行寫入"
-
-#: ../libsvn_subr/config_auth.c:140
-#, c-format
-msgid "Error writing hash to '%s'"
-msgstr "寫入雜湊至 '%s' 時發生錯誤"
-
-#: ../libsvn_subr/date.c:209
-#, c-format
-msgid "Can't manipulate current date"
-msgstr "無法處理目前的日期"
-
-#: ../libsvn_subr/date.c:283 ../libsvn_subr/date.c:291
-#, c-format
-msgid "Can't calculate requested date"
-msgstr "無法算出要求的日期"
-
-#: ../libsvn_subr/date.c:286
-#, c-format
-msgid "Can't expand time"
-msgstr "無法擴展時間"
-
-#: ../libsvn_subr/deprecated.c:355 ../libsvn_subr/opt.c:300
-msgid ""
-"\n"
-"Valid options:\n"
-msgstr ""
-"\n"
-"有效選項:\n"
-
-#: ../libsvn_subr/deprecated.c:431 ../libsvn_subr/opt.c:407
-#, c-format
-msgid ""
-"\"%s\": unknown command.\n"
-"\n"
-msgstr ""
-"\"%s\": 未知的命令.\n"
-"\n"
-
-#: ../libsvn_subr/deprecated.c:578 ../libsvn_subr/opt.c:1109
-#: ../svnrdump/svnrdump.c:340
-#, c-format
-msgid "Type '%s help' for usage.\n"
-msgstr "請使用 '%s help' 以了解用法.\n"
-
-#: ../libsvn_subr/deprecated.c:928
-#, c-format
-msgid "'%s' is neither a file nor a directory name"
-msgstr "'%s' 不是檔案或目錄名稱"
-
-#: ../libsvn_subr/dirent_uri.c:1661
-#, c-format
-msgid "Couldn't determine absolute path of '%s'"
-msgstr "無法決定 '%s' 的絕對路徑"
-
-#: ../libsvn_subr/dirent_uri.c:2319
-#, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "本地 URL '%s' 並未包含 'file://' 字首"
-
-#: ../libsvn_subr/dirent_uri.c:2398
-#, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "本地 URL '%s' 僅含主機名稱, 沒有路徑"
-
-#: ../libsvn_subr/dirent_uri.c:2412
-#, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "本地 URL '%s' 包含未支援的主機名稱"
-
-#: ../libsvn_subr/dso.c:64
-#, fuzzy, c-format
-msgid "Can't create DSO mutex"
-msgstr "無法取得 FS mutex"
-
-#: ../libsvn_subr/dso.c:83
-#, fuzzy, c-format
-msgid "Can't grab DSO mutex"
-msgstr "無法取得 FS mutex"
-
-#: ../libsvn_subr/dso.c:97 ../libsvn_subr/dso.c:123 ../libsvn_subr/dso.c:138
-#, fuzzy, c-format
-msgid "Can't ungrab DSO mutex"
-msgstr "無法釋放 FS mutex"
-
-#: ../libsvn_subr/error.c:445
-msgid "Can't recode error string from APR"
-msgstr "無法自 APR 將錯誤訊息重新編碼"
-
-#: ../libsvn_subr/error.c:544
-#, c-format
-msgid "%swarning: %s\n"
-msgstr "%s警告: %s\n"
-
-#: ../libsvn_subr/error.c:598
-#, c-format
-msgid "In file '%s' line %d: assertion failed (%s)"
-msgstr ""
-
-#: ../libsvn_subr/error.c:602
-#, c-format
-msgid "In file '%s' line %d: internal malfunction"
-msgstr ""
-
-#: ../libsvn_subr/io.c:169
-#, fuzzy, c-format
-msgid "Error converting entry in directory '%s' to UTF-8"
-msgstr "無法關閉目錄 '%s'"
-
-#: ../libsvn_subr/io.c:229
-#, c-format
-msgid "Can't check path '%s'"
-msgstr "無法檢查路徑 '%s'"
-
-#: ../libsvn_subr/io.c:457 ../libsvn_subr/io.c:3771
-#, c-format
-msgid "Can't open '%s'"
-msgstr "無法開啟 '%s'"
-
-#: ../libsvn_subr/io.c:483 ../libsvn_subr/io.c:569
-#, c-format
-msgid "Unable to make name for '%s'"
-msgstr "無法為 '%s' 產生名稱"
-
-#: ../libsvn_subr/io.c:556
-#, fuzzy, c-format
-msgid "Can't create symbolic link '%s'"
-msgstr "無法建立目錄 '%s'"
-
-#: ../libsvn_subr/io.c:573 ../libsvn_subr/io.c:606 ../libsvn_subr/io.c:634
-msgid "Symbolic links are not supported on this platform"
-msgstr "本平台不支援符號連結"
-
-#: ../libsvn_subr/io.c:596
-#, c-format
-msgid "Can't read contents of link"
-msgstr "無法讀取連線的內容"
-
-#: ../libsvn_subr/io.c:654
-#, c-format
-msgid "Can't find a temporary directory"
-msgstr "無法找到臨時目錄"
-
-#: ../libsvn_subr/io.c:773
-#, c-format
-msgid "Can't copy '%s' to '%s'"
-msgstr "無法複製 '%s' 至 '%s'"
-
-#: ../libsvn_subr/io.c:816 ../libsvn_subr/io.c:838 ../libsvn_subr/io.c:884
-#, c-format
-msgid "Can't set permissions on '%s'"
-msgstr "無法設定 '%s' 的檔案權限"
-
-#: ../libsvn_subr/io.c:834 ../libsvn_subr/io.c:3809
-#, c-format
-msgid "Can't get file name"
-msgstr "無法取得檔案名稱"
-
-#: ../libsvn_subr/io.c:908
-#, c-format
-msgid "Can't append '%s' to '%s'"
-msgstr "無法附加 '%s' 至 '%s'"
-
-#: ../libsvn_subr/io.c:942
-#, c-format
-msgid "Source '%s' is not a directory"
-msgstr "來源 '%s' 不是目錄"
-
-#: ../libsvn_subr/io.c:948
-#, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目標 p'%s' 不是目錄"
-
-#: ../libsvn_subr/io.c:954
-#, c-format
-msgid "Destination '%s' already exists"
-msgstr "目標 '%s' 已存在"
-
-#: ../libsvn_subr/io.c:1025 ../libsvn_subr/io.c:2113
-#, c-format
-msgid "Can't read directory '%s'"
-msgstr "無法讀取目錄 '%s'"
-
-#: ../libsvn_subr/io.c:1030 ../libsvn_subr/io.c:2118 ../libsvn_subr/io.c:3387
-#, c-format
-msgid "Error closing directory '%s'"
-msgstr "無法關閉目錄 '%s'"
-
-#: ../libsvn_subr/io.c:1058
-#, c-format
-msgid "Can't make directory '%s'"
-msgstr "無法建立目錄 '%s'"
-
-#: ../libsvn_subr/io.c:1127
-#, c-format
-msgid "Can't set access time of '%s'"
-msgstr "無法設定 '%s' 的存取時間"
-
-#: ../libsvn_subr/io.c:1403 ../libsvn_subr/io.c:1510
-#, c-format
-msgid "Can't change perms of file '%s'"
-msgstr "無法變更檔案 '%s' 的權限"
-
-#: ../libsvn_subr/io.c:1551
-#, c-format
-msgid "Can't set file '%s' read-only"
-msgstr "無法設定檔案 '%s' 為唯讀"
-
-#: ../libsvn_subr/io.c:1583
-#, c-format
-msgid "Can't set file '%s' read-write"
-msgstr "無法設定檔案 '%s' 為讀寫"
-
-#: ../libsvn_subr/io.c:1627
-#, c-format
-msgid "Error getting UID of process"
-msgstr "取得行程的 UID 時發生錯誤"
-
-#: ../libsvn_subr/io.c:1698
-#, c-format
-msgid "Can't get shared lock on file '%s'"
-msgstr "無法取得檔案 '%s' 的共享鎖定"
-
-# as-is
-#: ../libsvn_subr/io.c:1736
-#, c-format
-msgid "Can't flush file '%s'"
-msgstr "無法清空檔案 '%s'"
-
-#: ../libsvn_subr/io.c:1737
-#, c-format
-msgid "Can't flush stream"
-msgstr "無法清空串流"
-
-#: ../libsvn_subr/io.c:1749 ../libsvn_subr/io.c:1766
-#, c-format
-msgid "Can't flush file to disk"
-msgstr "無法將檔案清空至磁碟"
-
-#: ../libsvn_subr/io.c:1858 ../libsvn_subr/prompt.c:102 ../svnserve/main.c:625
-#, c-format
-msgid "Can't open stdin"
-msgstr "無法開啟標準輸入"
-
-# as-is
-#: ../libsvn_subr/io.c:1878
-#, fuzzy
-msgid "Reading from stdin is disallowed"
-msgstr "Reading from stdin is currently broken, so disabled"
-
-# as-is
-#: ../libsvn_subr/io.c:1935
-#, c-format
-msgid "Can't remove file '%s'"
-msgstr "無法移除檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2020
-#, c-format
-msgid "Can't remove '%s'"
-msgstr "無法移除 '%s'"
-
-# as-is
-#: ../libsvn_subr/io.c:2211
-#, c-format
-msgid "Can't create process '%s' attributes"
-msgstr "Can't create process '%s' attributes"
-
-# as-is
-#: ../libsvn_subr/io.c:2217
-#, c-format
-msgid "Can't set process '%s' cmdtype"
-msgstr "Can't set process '%s' cmdtype"
-
-# as-is
-#: ../libsvn_subr/io.c:2229
-#, c-format
-msgid "Can't set process '%s' directory"
-msgstr "Can't set process '%s' directory"
-
-# as-is
-#: ../libsvn_subr/io.c:2242
-#, c-format
-msgid "Can't set process '%s' child input"
-msgstr "Can't set process '%s' child input"
-
-# as-is
-#: ../libsvn_subr/io.c:2249
-#, c-format
-msgid "Can't set process '%s' child outfile"
-msgstr "Can't set process '%s' child outfile"
-
-# as-is
-#: ../libsvn_subr/io.c:2256
-#, c-format
-msgid "Can't set process '%s' child errfile"
-msgstr "Can't set process '%s' child errfile"
-
-# as-is
-#: ../libsvn_subr/io.c:2263
-#, c-format
-msgid "Can't set process '%s' child errfile for error handler"
-msgstr "Can't set process '%s' child errfile for error handler"
-
-# as-is
-#: ../libsvn_subr/io.c:2269
-#, c-format
-msgid "Can't set process '%s' error handler"
-msgstr "Can't set process '%s' error handler"
-
-#: ../libsvn_subr/io.c:2291
-#, c-format
-msgid "Can't start process '%s'"
-msgstr "無法啟動行程 '%s'"
-
-#: ../libsvn_subr/io.c:2315
-#, c-format
-msgid "Error waiting for process '%s'"
-msgstr "等待行程 '%s' 時發生錯誤"
-
-#: ../libsvn_subr/io.c:2323
-#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "行程 '%s' 失敗 (exitwhy %d)"
-
-#: ../libsvn_subr/io.c:2330
-#, c-format
-msgid "Process '%s' returned error exitcode %d"
-msgstr "行程 '%s' 傳回錯誤結束代碼 %d"
-
-#: ../libsvn_subr/io.c:2436
-#, c-format
-msgid "'%s' returned %d"
-msgstr "'%s' 傳回 %d"
-
-#: ../libsvn_subr/io.c:2557
-#, c-format
-msgid ""
-"Error running '%s': exitcode was %d, args were:\n"
-"in directory '%s', basenames:\n"
-"%s\n"
-"%s\n"
-"%s"
-msgstr ""
-"執行 '%s' 發生錯誤: 結束代碼為 %d, 參數為:\n"
-"於目錄 '%s' 中, 主檔名:\n"
-"%s\n"
-"%s\n"
-"%s"
-
-#: ../libsvn_subr/io.c:2697
-#, c-format
-msgid "Can't detect MIME type of non-file '%s'"
-msgstr "無法偵測非檔案的 '%s' 的 MIME 類別"
-
-#: ../libsvn_subr/io.c:2778
-#, c-format
-msgid "Can't open file '%s'"
-msgstr "無法開啟檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2814
-#, c-format
-msgid "Can't close file '%s'"
-msgstr "無法關閉檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2815
-#, c-format
-msgid "Can't close stream"
-msgstr "無法開啟串流"
-
-#: ../libsvn_subr/io.c:2825 ../libsvn_subr/io.c:2849 ../libsvn_subr/io.c:2862
-#, c-format
-msgid "Can't read file '%s'"
-msgstr "無法讀取檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2826 ../libsvn_subr/io.c:2850 ../libsvn_subr/io.c:2863
-#, c-format
-msgid "Can't read stream"
-msgstr "無法讀取串流"
-
-#: ../libsvn_subr/io.c:2837
-#, c-format
-msgid "Can't get attribute information from file '%s'"
-msgstr "無法自檔案 '%s' 取得屬性資訊"
-
-#: ../libsvn_subr/io.c:2838
-#, c-format
-msgid "Can't get attribute information from stream"
-msgstr "無法自串流取得屬性資訊"
-
-#: ../libsvn_subr/io.c:2874
-#, c-format
-msgid "Can't set position pointer in file '%s'"
-msgstr "無法於檔案 '%s' 中設定位置指標"
-
-#: ../libsvn_subr/io.c:2875
-#, c-format
-msgid "Can't set position pointer in stream"
-msgstr "無法於串流中設定位置指標"
-
-#: ../libsvn_subr/io.c:2886 ../libsvn_subr/io.c:2920
-#, c-format
-msgid "Can't write to file '%s'"
-msgstr "無法寫入至檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2887 ../libsvn_subr/io.c:2921
-#, c-format
-msgid "Can't write to stream"
-msgstr "無法寫入至串流"
-
-#: ../libsvn_subr/io.c:2956
-#, fuzzy, c-format
-msgid "Can't truncate file '%s'"
-msgstr "無法讀取檔案 '%s'"
-
-#: ../libsvn_subr/io.c:2957
-#, fuzzy, c-format
-msgid "Can't truncate stream"
-msgstr "無法讀取串流"
-
-#: ../libsvn_subr/io.c:2997
-#, c-format
-msgid "Can't read length line in file '%s'"
-msgstr "無法讀取檔案 '%s' 中的長度列"
-
-#: ../libsvn_subr/io.c:3001
-msgid "Can't read length line in stream"
-msgstr "無法讀取串流中的長度列"
-
-# as-is
-#: ../libsvn_subr/io.c:3020 ../svn/util.c:421 ../svn/util.c:436
-#: ../svn/util.c:460
-#, c-format
-msgid "Can't stat '%s'"
-msgstr "Can't stat '%s'"
-
-#: ../libsvn_subr/io.c:3055
-#, c-format
-msgid "Can't move '%s' to '%s'"
-msgstr "無法搬移 '%s' 至 '%s'"
-
-#: ../libsvn_subr/io.c:3136
-#, c-format
-msgid "Can't create directory '%s'"
-msgstr "無法建立目錄 '%s'"
-
-#: ../libsvn_subr/io.c:3147
-#, c-format
-msgid "Can't hide directory '%s'"
-msgstr "無法隱藏目錄 '%s'"
-
-#: ../libsvn_subr/io.c:3207 ../libsvn_subr/io.c:3323
-#, c-format
-msgid "Can't open directory '%s'"
-msgstr "無法開啟目錄 '%s'"
-
-#: ../libsvn_subr/io.c:3247
-#, c-format
-msgid "Can't remove directory '%s'"
-msgstr "無法移除目錄 '%s'"
-
-#: ../libsvn_subr/io.c:3265
-#, c-format
-msgid "Can't read directory"
-msgstr "無法讀取目錄"
-
-#: ../libsvn_subr/io.c:3342
-#, c-format
-msgid "Can't read directory entry in '%s'"
-msgstr "無法於 '%s' 中讀取目錄項目"
-
-#: ../libsvn_subr/io.c:3468
-#, c-format
-msgid "Can't check directory '%s'"
-msgstr "無法檢查目錄 '%s'"
-
-#: ../libsvn_subr/io.c:3530
-#, c-format
-msgid "Reading '%s'"
-msgstr "讀取 '%s' 中"
-
-#: ../libsvn_subr/io.c:3549
-#, c-format
-msgid "First line of '%s' contains non-digit"
-msgstr "'%s' 的第一行包含非數字字元"
-
-#: ../libsvn_subr/io.c:3690
-#, fuzzy, c-format
-msgid "Can't create temporary file from template '%s'"
-msgstr "無法建立臨時目錄"
-
-# as-is
-#: ../libsvn_subr/io.c:3781
-#, fuzzy, c-format
-msgid "Can't set aside '%s'"
-msgstr "Can't stat '%s'"
-
-#: ../libsvn_subr/io.c:3793
-#, fuzzy, c-format
-msgid "Unable to make name in '%s'"
-msgstr "無法為 '%s' 產生名稱"
-
-#: ../libsvn_subr/kitchensink.c:46
-#, fuzzy, c-format
-msgid "Invalid revision number found parsing '%s'"
-msgstr "提供了無效的版本號碼"
-
-#: ../libsvn_subr/kitchensink.c:58
-#, fuzzy, c-format
-msgid "Negative revision number found parsing '%s'"
-msgstr "提供了無效的版本號碼"
-
-#: ../libsvn_subr/mergeinfo.c:96 ../libsvn_subr/mergeinfo.c:599
-msgid "Pathname not terminated by ':'"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:99
-msgid "No pathname preceding ':'"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:490
-#, fuzzy, c-format
-msgid "Mergeinfo for '%s' maps to an empty revision range"
-msgstr "項目 '%s' 有無效的修訂版"
-
-#: ../libsvn_subr/mergeinfo.c:504
-#, fuzzy, c-format
-msgid "Invalid character '%c' found in revision list"
-msgstr "無效的結束修訂版 %ld"
-
-#: ../libsvn_subr/mergeinfo.c:512
-#, fuzzy, c-format
-msgid "Invalid revision number '0' found in range list"
-msgstr "提供了無效的版本號碼"
-
-#: ../libsvn_subr/mergeinfo.c:523
-#, c-format
-msgid "Unable to parse reversed revision range '%ld-%ld'"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:528
-#, fuzzy, c-format
-msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions"
-msgstr "起始修訂版 %ld 比結束修訂版號 %ld 為大"
-
-#: ../libsvn_subr/mergeinfo.c:565 ../libsvn_subr/mergeinfo.c:572
-#, fuzzy, c-format
-msgid "Invalid character '%c' found in range list"
-msgstr "無效的結束修訂版 %ld"
-
-#: ../libsvn_subr/mergeinfo.c:579
-#, fuzzy
-msgid "Range list parsing ended before hitting newline"
-msgstr "修訂版檔案缺少結尾換列字元"
-
-#: ../libsvn_subr/mergeinfo.c:607
-#, fuzzy, c-format
-msgid "Could not find end of line in range list line in '%s'"
-msgstr "無法找到修訂版 %ld 的時間"
-
-#: ../libsvn_subr/mergeinfo.c:638
-#, c-format
-msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:702
-#, fuzzy, c-format
-msgid "Could not parse mergeinfo string '%s'"
-msgstr "無法產生 '%s' 的 GET 要求"
-
-#: ../libsvn_subr/mergeinfo.c:1922
-msgid "NULL mergeinfo catalog\n"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:1927
-msgid "empty mergeinfo catalog\n"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:1960
-msgid "NULL mergeinfo\n"
-msgstr ""
-
-#: ../libsvn_subr/mergeinfo.c:1965
-msgid "empty mergeinfo\n"
-msgstr ""
-
-#: ../libsvn_subr/nls.c:90
-#, c-format
-msgid "Can't convert string to UCS-2: '%s'"
-msgstr "無法將字串轉換至 UCS-2: '%s'"
-
-#: ../libsvn_subr/nls.c:97
-msgid "Can't get module file name"
-msgstr "無法取得模組的檔案名稱"
-
-#: ../libsvn_subr/nls.c:112
-#, c-format
-msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
-msgstr "無法將模組路徑自 UCS-2 轉換至 UTF-8: '%s'"
-
-#: ../libsvn_subr/opt.c:187
-msgid " ARG"
-msgstr ""
-
-#: ../libsvn_subr/opt.c:322
-#, fuzzy
-msgid ""
-"\n"
-"Global options:\n"
-msgstr ""
-"\n"
-"有效選項:\n"
-
-#: ../libsvn_subr/opt.c:770
-#, c-format
-msgid "Syntax error parsing revision '%s'"
-msgstr "剖析修訂版 '%s' 時發生語法錯誤"
-
-# as-is
-#: ../libsvn_subr/opt.c:907
-#, fuzzy
-msgid "Revision property pair is empty"
-msgstr "Revision entry not a list"
-
-#: ../libsvn_subr/opt.c:927 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:207
-#: ../svn/propset-cmd.c:68
-#, fuzzy, c-format
-msgid "'%s' is not a valid Subversion property name"
-msgstr "'%s' 不是有效的管理目錄名稱"
-
-#: ../libsvn_subr/opt.c:964
-#, c-format
-msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
-msgstr ""
-
-#: ../libsvn_subr/opt.c:996
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "URL '%s' 包含 '..' 元素"
-
-#: ../libsvn_subr/opt.c:1029
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "解析 '%s' 時發生錯誤"
-
-#: ../libsvn_subr/opt.c:1048
-#, c-format
-msgid ""
-"%s, version %s\n"
-" compiled %s, %s\n"
-"\n"
-msgstr ""
-"%s, 版本 %s\n"
-" 編譯於 %s, %s\n"
-"\n"
-
-#: ../libsvn_subr/opt.c:1051
-msgid ""
-"Copyright (C) 2010 The Apache Software Foundation.\n"
-"This software consists of contributions made by many people;\n"
-"see the NOTICE file for more information.\n"
-"Subversion is open source software, see http://subversion.apache.org/\n"
-"\n"
-msgstr ""
-
-#: ../libsvn_subr/path.c:958
-#, c-format
-msgid "Can't determine the native path encoding"
-msgstr "無法決定原生的路徑編碼"
-
-#: ../libsvn_subr/path.c:1068
-#, c-format
-msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "無效的控制字元 '0x%02x' 出現在路徑 '%s'"
-
-#: ../libsvn_subr/prompt.c:120 ../libsvn_subr/prompt.c:124
-#, c-format
-msgid "Can't read stdin"
-msgstr "無法讀取標準輸入"
-
-#: ../libsvn_subr/prompt.c:183
-#, c-format
-msgid "Authentication realm: %s\n"
-msgstr "認證領域: %s\n"
-
-#: ../libsvn_subr/prompt.c:209 ../libsvn_subr/prompt.c:232
-msgid "Username: "
-msgstr "使用者名稱: "
-
-#: ../libsvn_subr/prompt.c:211
-#, c-format
-msgid "Password for '%s': "
-msgstr "'%s' 的密碼: "
-
-#: ../libsvn_subr/prompt.c:254
-#, c-format
-msgid "Error validating server certificate for '%s':\n"
-msgstr "驗證 '%s' 的伺服器憑證時發生錯誤:\n"
-
-#: ../libsvn_subr/prompt.c:260
-msgid ""
-" - The certificate is not issued by a trusted authority. Use the\n"
-" fingerprint to validate the certificate manually!\n"
-msgstr ""
-" - 本憑證並不是由受信任的權威機權所核發. 請手動利用指紋以驗證\n"
-" 憑證的有效性!\n"
-
-#: ../libsvn_subr/prompt.c:267
-msgid " - The certificate hostname does not match.\n"
-msgstr " - 本憑證的主機名稱不符.\n"
-
-#: ../libsvn_subr/prompt.c:273
-msgid " - The certificate is not yet valid.\n"
-msgstr " - 本憑證尚未進入有效期間.\n"
-
-#: ../libsvn_subr/prompt.c:279
-msgid " - The certificate has expired.\n"
-msgstr " - 本憑證已過期.\n"
-
-#: ../libsvn_subr/prompt.c:285
-msgid " - The certificate has an unknown error.\n"
-msgstr " - 本憑證發生不明的錯誤.\n"
-
-#: ../libsvn_subr/prompt.c:290
-#, c-format
-msgid ""
-"Certificate information:\n"
-" - Hostname: %s\n"
-" - Valid: from %s until %s\n"
-" - Issuer: %s\n"
-" - Fingerprint: %s\n"
-msgstr ""
-"憑證資訊:\n"
-" - 主機名稱: %s\n"
-" - 有效期間: 自 %s 至 %s\n"
-" - 發行者: %s\n"
-" - 指紋: %s\n"
-
-#: ../libsvn_subr/prompt.c:305
-msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
-msgstr "(R)拒絕, (t)暫時接受 或 (p)永遠接受? "
-
-#: ../libsvn_subr/prompt.c:309
-msgid "(R)eject or accept (t)emporarily? "
-msgstr "(R)拒絕 或 (t)暫時接受? "
-
-#: ../libsvn_subr/prompt.c:349
-msgid "Client certificate filename: "
-msgstr "用戶憑證檔名: "
-
-#: ../libsvn_subr/prompt.c:373
-#, c-format
-msgid "Passphrase for '%s': "
-msgstr "'%s' 的密碼: "
-
-#: ../libsvn_subr/prompt.c:421
-msgid "yes"
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:426
-msgid "no"
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:432
-msgid "Please type 'yes' or 'no': "
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:446
-msgid "Store password unencrypted (yes/no)? "
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:448
-#, c-format
-msgid ""
-"\n"
-"-----------------------------------------------------------------------\n"
-"ATTENTION! Your password for authentication realm:\n"
-"\n"
-" %s\n"
-"\n"
-"can only be stored to disk unencrypted! You are advised to configure\n"
-"your system so that Subversion can store passwords encrypted, if\n"
-"possible. See the documentation for details.\n"
-"\n"
-"You can avoid future appearances of this warning by setting the value\n"
-"of the 'store-plaintext-passwords' option to either 'yes' or 'no' in\n"
-"'%s'.\n"
-"-----------------------------------------------------------------------\n"
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:475
-msgid "Store passphrase unencrypted (yes/no)? "
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:477
-#, c-format
-msgid ""
-"\n"
-"-----------------------------------------------------------------------\n"
-"ATTENTION! Your passphrase for client certificate:\n"
-"\n"
-" %s\n"
-"\n"
-"can only be stored to disk unencrypted! You are advised to configure\n"
-"your system so that Subversion can store passphrase encrypted, if\n"
-"possible. See the documentation for details.\n"
-"\n"
-"You can avoid future appearances of this warning by setting the value\n"
-"of the 'store-ssl-client-cert-pp-plaintext' option to either 'yes' or\n"
-"'no' in '%s'.\n"
-"-----------------------------------------------------------------------\n"
-msgstr ""
-
-#: ../libsvn_subr/prompt.c:523
-#, fuzzy, c-format
-msgid "Password for '%s' GNOME keyring: "
-msgstr "'%s' 的密碼: "
-
-#: ../libsvn_subr/simple_providers.c:446
-#: ../libsvn_subr/ssl_client_cert_pw_providers.c:296
-#, fuzzy, c-format
-msgid "Config error: invalid value '%s' for option '%s'"
-msgstr "設定錯誤: 無效的布林值 '%s'"
-
-#: ../libsvn_subr/sqlite.c:183
-msgid "Expected database row missing"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:184
-msgid "Extra database row found"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:693
-#, c-format
-msgid "Schema format %d not recognized"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:709
-#, c-format
-msgid "SQLite compiled for %s, but running with %s"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:721
-msgid "SQLite is required to be compiled and run in thread-safe mode"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:731
-#, fuzzy
-msgid "Could not configure SQLite"
-msgstr "無法儲存檔案"
-
-#: ../libsvn_subr/sqlite.c:733
-#, fuzzy
-msgid "Could not initialize SQLite"
-msgstr "無法儲存檔案"
-
-#: ../libsvn_subr/sqlite.c:742
-msgid "Could not initialize SQLite shared cache"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:812
-#, c-format
-msgid "Expected SQLite database not found: %s"
-msgstr ""
-
-#: ../libsvn_subr/sqlite.c:1125
-#, c-format
-msgid "SQLite hotcopy failed for %s"
-msgstr ""
-
-#: ../libsvn_subr/subst.c:1640 ../libsvn_wc/props.c:1950
-#, c-format
-msgid "File '%s' has inconsistent newlines"
-msgstr "檔案 '%s' 內的換列字元不一致"
-
-#: ../libsvn_subr/svn_string.c:706 ../libsvn_subr/svn_string.c:750
-#, fuzzy, c-format
-msgid "Could not convert '%s' into a number"
-msgstr "無法連接到伺服器"
-
-#: ../libsvn_subr/svn_string.c:712
-#, c-format
-msgid "Number '%s' is out of range '[%llu, %llu]'"
-msgstr ""
-
-#: ../libsvn_subr/svn_string.c:756
-#, c-format
-msgid "Number '%s' is out of range '[%lld, %lld]'"
-msgstr ""
-
-#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
-#: ../libsvn_subr/time.c:85
-msgid " (%a, %d %b %Y)"
-msgstr ""
-
-#: ../libsvn_subr/token.c:66
-#, fuzzy, c-format
-msgid "Token '%s' is unrecognized"
-msgstr "'%s' 的節點種類無法辨識"
-
-#: ../libsvn_subr/utf.c:190
-msgid "Can't lock charset translation mutex"
-msgstr "無法鎖定字元轉譯 mutex"
-
-#: ../libsvn_subr/utf.c:208 ../libsvn_subr/utf.c:304
-msgid "Can't unlock charset translation mutex"
-msgstr "無法解鎖字元轉譯 mutex"
-
-#: ../libsvn_subr/utf.c:262
-#, c-format
-msgid "Can't create a character converter from native encoding to '%s'"
-msgstr "無法建立自原生編碼至 '%s' 的字元轉換器"
-
-#: ../libsvn_subr/utf.c:266
-#, c-format
-msgid "Can't create a character converter from '%s' to native encoding"
-msgstr "無法建立自 '%s' 至原生編碼的字元轉換器"
-
-#: ../libsvn_subr/utf.c:270
-#, c-format
-msgid "Can't create a character converter from '%s' to '%s'"
-msgstr "無法建立自 '%s' 至 '%s' 的字元轉換器"
-
-#: ../libsvn_subr/utf.c:499
-#, c-format
-msgid "Can't convert string from native encoding to '%s':"
-msgstr "無法將字串自原生編碼轉換至 '%s'"
-
-#: ../libsvn_subr/utf.c:503
-#, c-format
-msgid "Can't convert string from '%s' to native encoding:"
-msgstr "無法將字串自 '%s' 轉換至原生編碼"
-
-#: ../libsvn_subr/utf.c:507
-#, c-format
-msgid "Can't convert string from '%s' to '%s':"
-msgstr "無法將字串自 '%s' 轉換至 '%s'"
-
-#: ../libsvn_subr/utf.c:552
-#, c-format
-msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8"
-msgstr "安全資料 '%s' 跟著非 ASCII 位元 %d: 無法轉換自/至 UTF-8"
-
-#: ../libsvn_subr/utf.c:560
-#, c-format
-msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "偵測到非 ASCII 字元 (字碼 %d), 無法轉換自/至 UTF-8"
-
-#: ../libsvn_subr/utf.c:605
-#, c-format
-msgid ""
-"Valid UTF-8 data\n"
-"(hex:%s)\n"
-"followed by invalid UTF-8 sequence\n"
-"(hex:%s)"
-msgstr ""
-"有效 UTF-8 資料\n"
-"(十六進制:%s)\n"
-"跟隨無效的 UTF-8 序列\n"
-"(十六進制:%s)"
-
-#: ../libsvn_subr/validate.c:55
-#, c-format
-msgid "MIME type '%s' has empty media type"
-msgstr "MIME 類別 '%s' 含有空的媒體類別"
-
-#: ../libsvn_subr/validate.c:60
-#, c-format
-msgid "MIME type '%s' does not contain '/'"
-msgstr "MIME 類別 '%s' 沒包含 '/'"
-
-#: ../libsvn_subr/validate.c:72
-#, fuzzy, c-format
-msgid "MIME type '%s' contains invalid character '%c'"
-msgstr "MIME 類別 '%s' 以非字母與數字字元結束"
-
-#: ../libsvn_subr/version.c:87
-#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "'%s' 的版本不一致: 找到 %d.%d.%d%s, 預期 %d.%d.%d%s"
-
-#: ../libsvn_subr/xml.c:415
-#, fuzzy, c-format
-msgid "Malformed XML: %s at line %ld"
-msgstr "有缺陷 XML: %s 於第 %d 列"
-
-#: ../libsvn_wc/adm_crawler.c:114
-#, c-format
-msgid "The existing node '%s' can not be restored."
-msgstr ""
-
-#: ../libsvn_wc/adm_crawler.c:141
-#, fuzzy, c-format
-msgid "The node '%s' can not be restored."
-msgstr "根目錄無法被刪除"
-
-#: ../libsvn_wc/adm_crawler.c:724
-#, fuzzy, c-format
-msgid "Can't retrieve base revision for %s"
-msgstr "無法設定 '%s' 的檔案權限"
-
-#: ../libsvn_wc/adm_crawler.c:999
-msgid "Error aborting report"
-msgstr "取消回報時發生錯誤"
-
-#: ../libsvn_wc/adm_crawler.c:1274
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch for text base of '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"表現 '%s' 的總和檢查值不一致:\n"
-" 預期: %s\n"
-" 實際: %s\n"
-
-#: ../libsvn_wc/adm_crawler.c:1288
-#, c-format
-msgid "While preparing '%s' for commit"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:105
-#, c-format
-msgid "'%s' is not a valid administrative directory name"
-msgstr "'%s' 不是有效的管理目錄名稱"
-
-#: ../libsvn_wc/adm_files.c:208
-#, c-format
-msgid "Node '%s' has no pristine text"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:234
-#, c-format
-msgid "Node '%s' has no pristine base text"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:259
-#, fuzzy, c-format
-msgid "File '%s' has no text base"
-msgstr "檔案 '%s' 內的換列字元不一致"
-
-#: ../libsvn_wc/adm_files.c:286
-#, fuzzy, c-format
-msgid "Base node of '%s' is not a file"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../libsvn_wc/adm_files.c:322
-#, c-format
-msgid "Can only get the pristine contents of files; '%s' is not a file"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:348
-#, c-format
-msgid "Cannot get the pristine contents of '%s' because its delete is already committed"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:356
-#, c-format
-msgid "Cannot get the pristine contents of '%s' because it has an unexpected status"
-msgstr ""
-
-#: ../libsvn_wc/adm_files.c:639
-#, c-format
-msgid "Revision %ld doesn't match existing revision %ld in '%s'"
-msgstr "修訂版 %ld 不符合現有的修訂版 %ld 於 '%s' 中"
-
-#: ../libsvn_wc/adm_files.c:685
-#, c-format
-msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
-msgstr "URL '%s' 不符合現有的 URL '%s' 於 '%s' 中"
-
-#: ../libsvn_wc/adm_ops.c:625
-#, fuzzy, c-format
-msgid "'%s' cannot be deleted"
-msgstr "根目錄無法被刪除"
-
-#: ../libsvn_wc/adm_ops.c:795 ../libsvn_wc/update_editor.c:5607
-#, fuzzy, c-format
-msgid "Can't find parent directory's node while trying to add '%s'"
-msgstr "在試著新增 '%s' 時, 無法找到父目錄的項目"
-
-#: ../libsvn_wc/adm_ops.c:804 ../libsvn_wc/update_editor.c:5601
-#, c-format
-msgid "Can't add '%s' to a parent directory scheduled for deletion"
-msgstr "無法新增 '%s' 至已預定要刪除的父目錄"
-
-#: ../libsvn_wc/adm_ops.c:813 ../libsvn_wc/update_editor.c:5614
-#, c-format
-msgid "Can't schedule an addition of '%s' below a not-directory node"
-msgstr ""
-
-#: ../libsvn_wc/adm_ops.c:872
-#, fuzzy, c-format
-msgid "Can't create an entry with a reserved name while trying to add '%s'"
-msgstr "在試著新增 '%s' 時, 無法找到父目錄的項目"
-
-#: ../libsvn_wc/adm_ops.c:1050
-#, c-format
-msgid "The URL '%s' has a different repository root than its parent"
-msgstr "URL '%s' 的檔案庫根路徑與其父目錄的不同"
-
-#: ../libsvn_wc/adm_ops.c:1068
-#, c-format
-msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'."
-msgstr ""
-
-#: ../libsvn_wc/adm_ops.c:1082
-#, c-format
-msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
-msgstr ""
-
-#: ../libsvn_wc/adm_ops.c:1313
-#, c-format
-msgid "Can't revert '%s' with this depth, as that requires reverting '%s'."
-msgstr ""
-
-#: ../libsvn_wc/adm_ops.c:1414
-#, fuzzy, c-format
-msgid "Cannot revert unversioned item '%s'"
-msgstr "路徑 '%s' 為未知或未納入版本控制的種類"
-
-#: ../libsvn_wc/adm_ops.c:1445
-#, c-format
-msgid "Cannot revert '%s': unsupported entry node kind"
-msgstr "無法復原 '%s': 不支援的項目節點種類"
-
-#: ../libsvn_wc/adm_ops.c:1460
-#, c-format
-msgid "Cannot revert '%s': unsupported node kind in working copy"
-msgstr "無法復原 '%s': 工作複本中有不支援的節點種類"
-
-#: ../libsvn_wc/adm_ops.c:1785
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "檔案 '%s' 有本地的修改"
-
-#: ../libsvn_wc/adm_ops.c:2087
-#, fuzzy, c-format
-msgid "'%s' is a directory, and thus cannot be a member of a changelist"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../libsvn_wc/adm_ops.c:2155
-#, fuzzy, c-format
-msgid "Can't add a file external to '%s' as it is not a file in repository '%s'."
-msgstr "無法複製至 '%s', 因為它不是來自檔案庫 '%s'; 它是來自 '%s'"
-
-#: ../libsvn_wc/cleanup.c:58
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s' 並不是工作複本目錄"
-
-#: ../libsvn_wc/cleanup.c:64
-msgid "Log format too old, please use Subversion 1.6 or earlier"
-msgstr ""
-
-#: ../libsvn_wc/conflicts.c:299
-#, fuzzy
-msgid "Invalid 'conflict_result' argument"
-msgstr "無效的配置值"
-
-#: ../libsvn_wc/conflicts.c:409
-#, c-format
-msgid "Tree conflicts can only be resolved to 'working' state; '%s' not resolved"
-msgstr ""
-
-#: ../libsvn_wc/copy.c:78
-#, fuzzy, c-format
-msgid "Source '%s' is unexpected kind"
-msgstr "來源 '%s' 不是目錄"
-
-#: ../libsvn_wc/copy.c:384
-#, fuzzy, c-format
-msgid "cannot handle node kind for '%s'"
-msgstr "'%s' 為未知的節點類型"
-
-#: ../libsvn_wc/copy.c:648
-#, c-format
-msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "無法複製至 '%s', 因為它不是來自檔案庫 '%s'; 它是來自 '%s'"
-
-#: ../libsvn_wc/copy.c:656
-#, c-format
-msgid "Cannot copy to '%s' as it is scheduled for deletion"
-msgstr "無法複製至 '%s', 因為它已預定要刪除"
-
-#: ../libsvn_wc/copy.c:685
-#, fuzzy, c-format
-msgid "'%s' is already under version control but is excluded."
-msgstr "'%s' 已納入版本控制"
-
-#: ../libsvn_wc/copy.c:700
-#, c-format
-msgid "There is already a versioned item '%s'"
-msgstr "已有納入版本控制項目 '%s'"
-
-#: ../libsvn_wc/copy.c:716
-#, c-format
-msgid "'%s' already exists and is in the way"
-msgstr "'%s' 已存在, 變成路中間的大石頭"
-
-#: ../libsvn_wc/crop.c:224
-#, fuzzy, c-format
-msgid "Cannot exclude '%s': it is a working copy root"
-msgstr "並未預期 '%s' 是工作複本的根目錄"
-
-#: ../libsvn_wc/crop.c:232
-#, fuzzy, c-format
-msgid "Cannot exclude '%s': it is a switched path"
-msgstr "無法清除 '%s': 不是一個目錄"
-
-#: ../libsvn_wc/crop.c:256
-#, fuzzy, c-format
-msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead"
-msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-
-#: ../libsvn_wc/crop.c:263
-#, fuzzy, c-format
-msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead"
-msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-
-#: ../libsvn_wc/crop.c:333
-msgid "Can only crop a working copy with a restrictive depth"
-msgstr ""
-
-#: ../libsvn_wc/crop.c:348
-#, fuzzy
-msgid "Can only crop directories"
-msgstr "無法開啟目錄 '%s'"
-
-#: ../libsvn_wc/crop.c:359
-#, fuzzy, c-format
-msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead"
-msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-
-#: ../libsvn_wc/crop.c:366
-#, fuzzy, c-format
-msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead"
-msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-
-#: ../libsvn_wc/deprecated.c:2052
-#, c-format
-msgid "Unexpectedly found '%s': path is marked 'missing'"
-msgstr "不預期地找到了 '%s': 路徑已被標示為 '遺漏'"
-
-#: ../libsvn_wc/entries.c:1148
-#, fuzzy, c-format
-msgid "'%s' is not a versioned working copy"
-msgstr "'%s' 不是工作複本"
-
-#: ../libsvn_wc/entries.c:1394
-#, fuzzy, c-format
-msgid "Admin area of '%s' is missing"
-msgstr "找不到目錄 '%s'"
-
-#: ../libsvn_wc/entries.c:1414
-#, fuzzy, c-format
-msgid "'%s' is not of the right kind"
-msgstr "'%s' 不是檔案庫的根目錄"
-
-#: ../libsvn_wc/entries.c:2143
-#, c-format
-msgid "No default entry in directory '%s'"
-msgstr "在目錄 '%s' 中沒有預設的項目"
-
-#: ../libsvn_wc/entries.c:2321
-#, c-format
-msgid "Directory '%s' has no THIS_DIR entry"
-msgstr "目錄 '%s' 沒有 THIS_DIR 項目"
-
-#: ../libsvn_wc/entries.c:2504 ../libsvn_wc/node.c:769
-#, c-format
-msgid "'%s' has an unrecognized node kind"
-msgstr "'%s' 的節點種類無法辨識"
-
-#: ../libsvn_wc/lock.c:504
-#, c-format
-msgid "Path '%s' ends in '%s', which is unsupported for this operation"
-msgstr "路徑 '%s' 以 '%s' 結束, 本動作不支援"
-
-#: ../libsvn_wc/lock.c:553 ../libsvn_wc/upgrade.c:1266
-#, fuzzy, c-format
-msgid "Working copy format of '%s' is too old (%d); please run 'svn upgrade'"
-msgstr "'%s' 的工作複本格式已過時 (%d); 請重新取出你的工作複本"
-
-#: ../libsvn_wc/lock.c:817 ../libsvn_wc/wc_db.c:8585
-#, c-format
-msgid "Working copy '%s' locked"
-msgstr "工作複本 '%s' 被鎖定了"
-
-#: ../libsvn_wc/lock.c:961
-#, c-format
-msgid "Unable to check path existence for '%s'"
-msgstr "無法檢查路徑 '%s' 是否存在"
-
-#: ../libsvn_wc/lock.c:981
-#, c-format
-msgid "Expected '%s' to be a directory but found a file"
-msgstr "'%s' 預期為目錄, 但是結果為檔案"
-
-#: ../libsvn_wc/lock.c:991
-#, fuzzy, c-format
-msgid "Can't retrieve an access baton for non-directory '%s'"
-msgstr "無法取得非目錄的項目"
-
-#: ../libsvn_wc/lock.c:1000
-#, c-format
-msgid "Directory '%s' is missing"
-msgstr "找不到目錄 '%s'"
-
-#: ../libsvn_wc/lock.c:1008
-#, c-format
-msgid "Working copy '%s' is not locked"
-msgstr "工作複本 '%s' 未被鎖定了"
-
-#: ../libsvn_wc/lock.c:1469
-#, c-format
-msgid "No write-lock in '%s'"
-msgstr "'%s' 中沒有寫入鎖定"
-
-#: ../libsvn_wc/lock.c:1564 ../libsvn_wc/lock.c:1615
-#, fuzzy, c-format
-msgid "Can't obtain lock on non-directory '%s'."
-msgstr "無法 stat 新目錄 '%s'"
-
-#: ../libsvn_wc/merge.c:866 ../libsvn_wc/merge.c:1139
-msgid "Conflict callback violated API: returned no results"
-msgstr ""
-
-#: ../libsvn_wc/merge.c:1175
-msgid "Conflict callback violated API: returned no merged file"
-msgstr ""
-
-#: ../libsvn_wc/old-and-busted.c:122
-msgid "Invalid escape sequence"
-msgstr "無效的逸出序列"
-
-#: ../libsvn_wc/old-and-busted.c:129
-msgid "Invalid escaped character"
-msgstr "無效的逸出字元"
-
-# as-is
-#: ../libsvn_wc/old-and-busted.c:147 ../libsvn_wc/old-and-busted.c:176
-#: ../libsvn_wc/old-and-busted.c:240 ../libsvn_wc/old-and-busted.c:252
-msgid "Unexpected end of entry"
-msgstr "Unexpected end of entry"
-
-#: ../libsvn_wc/old-and-busted.c:202
-#, c-format
-msgid "Entry contains non-canonical path '%s'"
-msgstr ""
-
-#: ../libsvn_wc/old-and-busted.c:274
-#, c-format
-msgid "Invalid value for field '%s'"
-msgstr "給欄位 '%s' 的無效數值"
-
-#: ../libsvn_wc/old-and-busted.c:346
-#, c-format
-msgid "Found an unexpected \\0 in the file external '%s'"
-msgstr ""
-
-#: ../libsvn_wc/old-and-busted.c:390
-#, fuzzy, c-format
-msgid "Illegal file external revision kind %d for path '%s'"
-msgstr "檔案找不到: 修訂版 %ld, 路徑 '%s'"
-
-#: ../libsvn_wc/old-and-busted.c:488 ../libsvn_wc/old-and-busted.c:842
-#, c-format
-msgid "Entry '%s' has invalid node kind"
-msgstr "項目 '%s' 有無效的節點種類"
-
-#: ../libsvn_wc/old-and-busted.c:509 ../libsvn_wc/old-and-busted.c:822
-#, c-format
-msgid "Entry for '%s' has invalid repository root"
-msgstr "項目 '%s' 有無效的檔案庫根目錄"
-
-#: ../libsvn_wc/old-and-busted.c:530 ../libsvn_wc/old-and-busted.c:867
-#, fuzzy, c-format
-msgid "Entry '%s' has invalid 'schedule' value"
-msgstr "項目 '%s' 有無效的 '%s' 值"
-
-#: ../libsvn_wc/old-and-busted.c:680
-#, fuzzy, c-format
-msgid "Entry '%s' has invalid 'depth' value"
-msgstr "項目 '%s' 有無效的 '%s' 值"
-
-#: ../libsvn_wc/old-and-busted.c:731
-#, c-format
-msgid "Entry '%s' has invalid '%s' value"
-msgstr "項目 '%s' 有無效的 '%s' 值"
-
-#: ../libsvn_wc/old-and-busted.c:1084
-#, c-format
-msgid "XML parser failed in '%s'"
-msgstr "XML 剖析器無法處理 '%s'"
-
-#: ../libsvn_wc/old-and-busted.c:1140
-msgid "Missing default entry"
-msgstr "遺漏預設項目"
-
-#: ../libsvn_wc/old-and-busted.c:1145
-msgid "Default entry has no revision number"
-msgstr "預設項目沒有修訂版編號"
-
-#: ../libsvn_wc/old-and-busted.c:1150
-msgid "Default entry is missing URL"
-msgstr "預設項目沒有 URL"
-
-#: ../libsvn_wc/old-and-busted.c:1229
-#, c-format
-msgid "Invalid version line in entries file of '%s'"
-msgstr "項目檔案 '%s' 中有無效的版本列"
-
-#: ../libsvn_wc/old-and-busted.c:1246
-msgid "Missing entry terminator"
-msgstr "遺漏項目終止符"
-
-#: ../libsvn_wc/old-and-busted.c:1249
-msgid "Invalid entry terminator"
-msgstr "無效的項目終止符"
-
-#: ../libsvn_wc/old-and-busted.c:1253
-#, c-format
-msgid "Error at entry %d in entries file for '%s':"
-msgstr "項目 %d 於 '%s' 項目檔案中發生錯誤"
-
-#: ../libsvn_wc/props.c:283
-#, fuzzy, c-format
-msgid "The property '%s' may not be merged into '%s'."
-msgstr "性質 '%s' 自 '%s' 刪除.\n"
-
-#: ../libsvn_wc/props.c:427
-#, c-format
-msgid ""
-"Trying to add new property '%s' with value '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"預計新增性質 '%s', 其值為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:437
-#, fuzzy, c-format
-msgid ""
-"Trying to create property '%s' with value '%s',\n"
-"but it has been locally deleted."
-msgstr ""
-"預計新增性質 '%s', 其值為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:451
-#, fuzzy, c-format
-msgid ""
-"Trying to delete property '%s' with value '%s',\n"
-"but property has been locally added with value '%s'."
-msgstr ""
-"預計新增性質 '%s', 其值為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:468
-#, fuzzy, c-format
-msgid ""
-"Trying to delete property '%s' with value '%s',\n"
-"but it has been modified from '%s' to '%s'."
-msgstr "預計刪除性質 '%s', 但是其值已自 '%s' 變更為 '%s'."
-
-#: ../libsvn_wc/props.c:479
-#, fuzzy, c-format
-msgid ""
-"Trying to delete property '%s' with value '%s',\n"
-"but property with value '%s' is locally deleted."
-msgstr ""
-"預計新增性質 '%s', 其值為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:491
-#, fuzzy, c-format
-msgid ""
-"Trying to delete property '%s' with value '%s',\n"
-"but the local value is '%s'."
-msgstr ""
-"預計新增性質 '%s', 其值為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:510
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:519
-#, fuzzy, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property has been locally changed from '%s' to '%s'."
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質不存在."
-
-#: ../libsvn_wc/props.c:527
-#, fuzzy, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but it has been locally deleted."
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質不存在."
-
-#: ../libsvn_wc/props.c:533
-#, fuzzy, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property has been locally added with value '%s'."
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質已存在, 其值為 '%s'."
-
-#: ../libsvn_wc/props.c:540
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質不存在."
-
-#: ../libsvn_wc/props.c:874
-msgid "Conflict callback violated API: returned no results."
-msgstr ""
-
-#: ../libsvn_wc/props.c:914
-msgid "Conflict callback violated API: returned no merged file."
-msgstr ""
-
-#: ../libsvn_wc/props.c:1757 ../libsvn_wc/props.c:2008
-#, c-format
-msgid "Property '%s' is an entry property"
-msgstr "性質 '%s' 是項目性質"
-
-#: ../libsvn_wc/props.c:1804 ../libsvn_wc/props.c:1811
-#, fuzzy
-msgid "Failed to load properties"
-msgstr "無法自磁碟載入性質"
-
-#: ../libsvn_wc/props.c:1853
-#, c-format
-msgid "Cannot set '%s' on a directory ('%s')"
-msgstr "無法設定 '%s' 於目錄 ('%s')"
-
-#: ../libsvn_wc/props.c:1861
-#, c-format
-msgid "Cannot set '%s' on a file ('%s')"
-msgstr "無法設定 '%s' 於檔案 ('%s')"
-
-#: ../libsvn_wc/props.c:1867
-#, c-format
-msgid "'%s' is not a file or directory"
-msgstr "'%s' 不是檔案或目錄"
-
-#: ../libsvn_wc/props.c:1931
-#, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "檔案 '%s' 有二進制的 mime 型別性質"
-
-#: ../libsvn_wc/props.c:2000
-#, c-format
-msgid "Can't set properties on '%s': invalid status for updating properties."
-msgstr ""
-
-#: ../libsvn_wc/props.c:2063
-#, fuzzy
-msgid "Failed to load current properties"
-msgstr "無法自磁碟載入性質"
-
-#: ../libsvn_wc/props.c:2208
-#, fuzzy, c-format
-msgid "Unrecognized line ending style '%s' for '%s'"
-msgstr "無法辨識的列尾樣式"
-
-#: ../libsvn_wc/props.c:2267
-#, fuzzy, c-format
-msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')"
-msgstr "無法設定 '%s' 於目錄 ('%s')"
-
-#: ../libsvn_wc/props.c:2488 ../libsvn_wc/props.c:2564
-#, c-format
-msgid "Error parsing %s property on '%s': '%s'"
-msgstr "剖析 %s 性質於 '%s' 發生錯誤: '%s'"
-
-#: ../libsvn_wc/props.c:2533
-#, fuzzy, c-format
-msgid "Can't split line into components: '%s'"
-msgstr "無法讀取檔案 '%s' 中的長度列"
-
-#: ../libsvn_wc/props.c:2589
-#, c-format
-msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to"
-msgstr ""
-
-#: ../libsvn_wc/props.c:2598 ../libsvn_wc/props.c:2606
-#, c-format
-msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition"
-msgstr ""
-
-#: ../libsvn_wc/props.c:2643
-#, fuzzy, c-format
-msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
-msgstr "無效性質 %s 於 '%s': 目錄牽涉到 '.' 或 '..' 或是絕對路徑"
-
-#: ../libsvn_wc/questions.c:203
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch indicates corrupt text base for file: '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"總和檢查值不一致, 表示文件參考基礎損毀: '%s'\n"
-" 預期: %s\n"
-" 實際: %s\n"
-
-#: ../libsvn_wc/relocate.c:105
-#, fuzzy, c-format
-msgid "Cannot relocate '%s' as it is not the root of a working copy"
-msgstr "無法復原 '%s': 工作複本中有不支援的節點種類"
-
-#: ../libsvn_wc/relocate.c:112
-#, fuzzy, c-format
-msgid "Cannot relocate '%s' as it is not the root of a working copy; try relocating '%s' instead"
-msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-
-#: ../libsvn_wc/relocate.c:129
-#, fuzzy
-msgid "Cannot relocate a single file"
-msgstr "無法寫入 lock/entries 雜湊檔 '%s'"
-
-#: ../libsvn_wc/relocate.c:136
-#, c-format
-msgid "Invalid source URL prefix: '%s' (does not overlap target's URL '%s')"
-msgstr ""
-
-#: ../libsvn_wc/relocate.c:146 ../libsvn_wc/relocate.c:151
-#, fuzzy, c-format
-msgid "Invalid destination URL: '%s'"
-msgstr "無效 URL '%s'"
-
-#: ../libsvn_wc/tree_conflicts.c:130
-msgid "Unknown enumeration value in tree conflict description"
-msgstr ""
-
-#: ../libsvn_wc/tree_conflicts.c:152
-#, fuzzy
-msgid "Invalid version info in tree conflict description"
-msgstr "項目檔案 '%s' 中有無效的版本列"
-
-#: ../libsvn_wc/tree_conflicts.c:210
-msgid "Invalid conflict info in tree conflict description"
-msgstr ""
-
-#: ../libsvn_wc/tree_conflicts.c:219
-msgid "Empty 'victim' field in tree conflict description"
-msgstr ""
-
-#: ../libsvn_wc/tree_conflicts.c:227
-msgid "Invalid 'node_kind' field in tree conflict description"
-msgstr ""
-
-#: ../libsvn_wc/tree_conflicts.c:291
-#, fuzzy
-msgid "Error parsing tree conflict skel"
-msgstr "用戶端於剖析引數時發生錯誤"
-
-#: ../libsvn_wc/tree_conflicts.c:468
-#, fuzzy, c-format
-msgid "Attempt to add tree conflict that already exists at '%s'"
-msgstr "企圖建立一個已存在的項目"
-
-#: ../libsvn_wc/update_editor.c:1051
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch while updating '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"總和檢查值不符合, 檔案 '%s':\n"
-" 預期的: %s\n"
-" 實際的: %s\n"
-
-#: ../libsvn_wc/update_editor.c:1169
-#, fuzzy, c-format
-msgid "Path '%s' is not in the working copy"
-msgstr "'%s' 不是工作複本"
-
-#: ../libsvn_wc/update_editor.c:2187
-#, c-format
-msgid "Failed to add directory '%s': object of the same name as the administrative directory"
-msgstr "無法新增目錄 '%s': 物件與管理目錄同名"
-
-#: ../libsvn_wc/update_editor.c:2313
-#, fuzzy, c-format
-msgid "Failed to add directory '%s': a separate working copy with the same name already exists"
-msgstr "無法新增目錄 '%s': 同名物件已存在"
-
-#: ../libsvn_wc/update_editor.c:2322
-#, fuzzy, c-format
-msgid "Switched directory '%s' does not match expected URL '%s'"
-msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
-
-#: ../libsvn_wc/update_editor.c:2348
-#, fuzzy, c-format
-msgid "Failed to add directory '%s': a non-directory object of the same name already exists"
-msgstr "無法新增目錄 '%s': 同名物件已存在"
-
-#: ../libsvn_wc/update_editor.c:2811
-msgid "Couldn't do property merge"
-msgstr "無法進行性質合併"
-
-#: ../libsvn_wc/update_editor.c:2990
-#, c-format
-msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition"
-msgstr "無法將 '%s' 標記為不存在: 同名項目已排入新增時程"
-
-#: ../libsvn_wc/update_editor.c:3081
-#, fuzzy, c-format
-msgid "Failed to add file '%s': object of the same name as the administrative directory"
-msgstr "無法新增目錄 '%s': 物件與管理目錄同名"
-
-#: ../libsvn_wc/update_editor.c:3208
-#, fuzzy, c-format
-msgid "Switched file '%s' does not match expected URL '%s'"
-msgstr "URL '%s' 不符合現有的 URL '%s' 於 '%s' 中"
-
-#: ../libsvn_wc/update_editor.c:3469
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch for '%s':\n"
-" expected: %s\n"
-" recorded: %s\n"
-msgstr ""
-"表現 '%s' 的總和檢查值不一致:\n"
-" 預期: %s\n"
-" 實際: %s\n"
-
-#: ../libsvn_wc/update_editor.c:4911
-#, c-format
-msgid "Unrecognized node kind: '%s'"
-msgstr "無法確認的節點種類: '%s'"
-
-#: ../libsvn_wc/update_editor.c:5582
-#, fuzzy, c-format
-msgid "Node '%s' exists."
-msgstr "檔案 '%s' 已存在"
-
-#: ../libsvn_wc/update_editor.c:5637
-#, c-format
-msgid "Copyfrom-url '%s' has different repository root than '%s'"
-msgstr "Copyfrom-url '%s' 與 '%s' 的檔案庫根目錄不同"
-
-#: ../libsvn_wc/upgrade.c:254
-#, c-format
-msgid "Missing end of line in wcprops file for '%s'"
-msgstr "'%s' 的 wcprops 檔案缺少換列符號"
-
-#: ../libsvn_wc/upgrade.c:601
-#, c-format
-msgid "Working copy '%s' can't be upgraded because the repository root is not available and can't be retrieved"
-msgstr ""
-
-#: ../libsvn_wc/upgrade.c:608
-#, c-format
-msgid "Working copy '%s' can't be upgraded because the repository uuid is not available and can't be retrieved"
-msgstr ""
-
-#: ../libsvn_wc/upgrade.c:615
-#, c-format
-msgid "Working copy '%s' can't be upgraded because it doesn't have a url"
-msgstr ""
-
-#: ../libsvn_wc/upgrade.c:1127
-msgid "Cannot upgrade with existing logs; please run 'svn cleanup' with Subversion 1.6"
-msgstr ""
-
-#: ../libsvn_wc/upgrade.c:1355
-#, c-format
-msgid "The working copy '%s' is at format 18; use 'tools/dev/wc-ng/bump-to-19.py' to upgrade it"
-msgstr ""
-
-#: ../libsvn_wc/upgrade.c:1545
-#, fuzzy, c-format
-msgid "Cannot upgrade '%s' as it is not a pre-1.7 working copy root"
-msgstr "並未預期 '%s' 是工作複本的根目錄"
-
-#: ../libsvn_wc/util.c:58
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "'%s' 不是目錄"
-
-#: ../libsvn_wc/wc_db.c:511
-#, c-format
-msgid "No REPOSITORY table entry for id '%ld'"
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:1456 ../libsvn_wc/wc_db.c:1502
-#, fuzzy, c-format
-msgid "The node '%s' is not in a workingcopy."
-msgstr "'%s' 不是工作複本"
-
-#: ../libsvn_wc/wc_db.c:2019 ../libsvn_wc/wc_db.c:5288
-#, c-format
-msgid "The node '%s' has a corrupt checksum value."
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:2286
-#, fuzzy, c-format
-msgid "Pristine text not found"
-msgstr "找不到性質"
-
-#: ../libsvn_wc/wc_db.c:2473
-#, c-format
-msgid "The pristine text with checksum '%s' was not found"
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:2513
-#, c-format
-msgid "The pristine text with MD5 checksum '%s' was not found"
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:2705
-#, c-format
-msgid "The pristine text with checksum '%s' was found in the DB or on disk but not both"
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:3036 ../libsvn_wc/wc_db.c:3258
-#, c-format
-msgid "Cannot copy '%s' excluded by server"
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:3042
-#, fuzzy, c-format
-msgid "Cannot handle status of '%s'"
-msgstr "無法找到 '%s' 的項目"
-
-#: ../libsvn_wc/wc_db.c:3885
-#, fuzzy, c-format
-msgid "Can't store properties for '%s' in '%s'."
-msgstr "無法寫入 '%s' 的性質雜湊"
-
-#: ../libsvn_wc/wc_db.c:5392
-#, fuzzy, c-format
-msgid "Corrupt data for '%s'"
-msgstr "無法找到 '%s' 的項目"
-
-#: ../libsvn_wc/wc_db.c:6603
-#, c-format
-msgid "Could not find node '%s' for recording file information."
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:6863 ../libsvn_wc/wc_db.c:6965
-#, fuzzy, c-format
-msgid "Expected node '%s' to be added."
-msgstr "'%s' 預期為目錄, 但是結果為檔案"
-
-#: ../libsvn_wc/wc_db.c:7280
-#, c-format
-msgid "Expected node '%s' to be deleted."
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:7554
-#, c-format
-msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530."
-msgstr ""
-
-#: ../libsvn_wc/wc_db.c:7643
-#, fuzzy, c-format
-msgid "Repository '%s' not found in the database"
-msgstr "路徑 '%s' 於 HEAD 修訂版中找不到"
-
-#: ../libsvn_wc/wc_db.c:8505 ../libsvn_wc/wc_db.c:8552
-#, fuzzy, c-format
-msgid "'%s' is already locked."
-msgstr "路徑已被鎖定"
-
-#: ../libsvn_wc/wc_db.c:8509 ../libsvn_wc/wc_db.c:8560
-#, fuzzy, c-format
-msgid "Working copy '%s' locked."
-msgstr "工作複本 '%s' 被鎖定了"
-
-#: ../libsvn_wc/wc_db.c:8639
-#, fuzzy, c-format
-msgid "'%s' is already locked via '%s'."
-msgstr "路徑已被鎖定"
-
-#: ../libsvn_wc/wc_db.c:8753
-#, fuzzy, c-format
-msgid "Working copy not locked at '%s'."
-msgstr "工作複本未鎖定"
-
-#: ../libsvn_wc/wc_db.c:9370
-#, fuzzy, c-format
-msgid "'%s' has no BASE_NODE"
-msgstr "'%s' 沒有 URL"
-
-#: ../libsvn_wc/wc_db_pdh.c:234
-#, c-format
-msgid "Working copy format of '%s' is too old (%d); please check out your working copy again"
-msgstr "'%s' 的工作複本格式已過時 (%d); 請重新取出你的工作複本"
-
-#: ../libsvn_wc/wc_db_pdh.c:244
-#, c-format
-msgid ""
-"This client is too old to work with the working copy at\n"
-"'%s' (format %d).\n"
-"You need to get a newer Subversion client. For more details, see\n"
-" http://subversion.apache.org/faq.html#working-copy-format-change\n"
-msgstr ""
-
-#: ../libsvn_wc/wc_db_pdh.c:265
-msgid "Cleanup with an older 1.7 client before upgrading with this client"
-msgstr ""
-
-#: ../libsvn_wc/wc_db_pdh.c:526
-#, fuzzy, c-format
-msgid "Missing a row in WCROOT for '%s'."
-msgstr "'%s' 遺漏了 'revision' 屬性"
-
-#: ../libsvn_wc/wc_db_pdh.c:668
-#, fuzzy, c-format
-msgid "'%s' is not a working copy root"
-msgstr "'%s' 不是工作複本"
-
-#: ../libsvn_wc/wc_db_util.c:68
-#, c-format
-msgid "Missing a row in WCROOT."
-msgstr ""
-
-#: ../libsvn_wc/workqueue.c:338
-#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "還原 '%s' 文字時發生錯誤"
-
-#: ../libsvn_wc/workqueue.c:1294
-#, fuzzy, c-format
-msgid "Error processing post-commit work for '%s'"
-msgstr "處理命令 '%s' 於 '%s' 中時發生錯誤"
-
-#: ../libsvn_wc/workqueue.c:2213
-#, fuzzy, c-format
-msgid "Unrecognized work item in the queue associated with '%s'"
-msgstr "無法辨識要求的 '%s' 的修訂版類別"
-
-#: ../svn/blame-cmd.c:302 ../svn/list-cmd.c:232
-msgid "'verbose' option invalid in XML mode"
-msgstr "'verbose' 選項在 XML 模式中無效"
-
-#: ../svn/blame-cmd.c:314 ../svn/info-cmd.c:531 ../svn/list-cmd.c:244
-#: ../svn/status-cmd.c:281
-msgid "'incremental' option only valid in XML mode"
-msgstr "'incremental' 選項僅於 XML 模式中有效"
-
-#: ../svn/blame-cmd.c:377
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "略過二進制檔案: '%s'\n"
-
-#: ../svn/changelist-cmd.c:60 ../svn/main.c:1706
-#, fuzzy
-msgid "Changelist names must not be empty"
-msgstr "總和檢查值: %s\n"
-
-#: ../svn/checkout-cmd.c:135 ../svn/switch-cmd.c:145
-#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "'%s' 不像是 URL"
-
-#: ../svn/commit-cmd.c:107
-#, c-format
-msgid "svn: warning: The depth of this commit is '%s', but copied directories will regardless be committed with depth '%s'. You must remove unwanted children of those directories in a separate commit.\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:158
-msgid "||||||| ORIGINAL"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:159
-msgid "<<<<<<< MINE (select with 'mc')"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:160
-msgid ">>>>>>> THEIRS (select with 'tc')"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:192
-#, fuzzy
-msgid "No editor found."
-msgstr "沒有這個修訂版 %ld"
-
-#: ../svn/conflict-callbacks.c:199
-#, fuzzy
-msgid "Error running editor."
-msgstr "執行 post-commit 掛勾時發生錯誤"
-
-#: ../svn/conflict-callbacks.c:209
-#, c-format
-msgid ""
-"Invalid option; there's no merged version to edit.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:239
-msgid "No merge tool found.\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:246
-#, fuzzy
-msgid "Error running merge tool."
-msgstr "執行 post-commit 掛勾時發生錯誤"
-
-#: ../svn/conflict-callbacks.c:316
-msgid "No editor found; leaving all conflicts."
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:325
-msgid "Error running editor; leaving all conflicts."
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:361
-msgid "No merge tool found; leaving all conflicts."
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:370
-msgid "Error running merge tool; leaving all conflicts."
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:414
-#, fuzzy, c-format
-msgid "Conflict discovered in '%s'.\n"
-msgstr "衝突性質的檔案: %s\n"
-
-#: ../svn/conflict-callbacks.c:419
-#, fuzzy, c-format
-msgid "Conflict for property '%s' discovered on '%s'.\n"
-msgstr "性質 '%s' 設定於 '%s'\n"
-
-#: ../svn/conflict-callbacks.c:436
-#, c-format
-msgid "They want to delete the property, you want to change the value to '%s'.\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:445
-#, fuzzy, c-format
-msgid "They want to change the property value to '%s', you want to delete the property.\n"
-msgstr ""
-"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
-"但是該性質不存在."
-
-#: ../svn/conflict-callbacks.c:467
-msgid "Select: (p) postpone"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:472
-msgid ", (df) diff-full, (e) edit"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:476 ../svn/conflict-callbacks.c:489
-msgid ", (r) resolved"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:482
-msgid ""
-",\n"
-" (mc) mine-conflict, (tc) theirs-conflict"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:492
-msgid ""
-",\n"
-" (mf) mine-full, (tf) theirs-full"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:499
-msgid "(s) show all options: "
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:508
-#, c-format
-msgid ""
-"\n"
-" (e) edit - change merged file in an editor\n"
-" (df) diff-full - show all changes made to merged file\n"
-" (r) resolved - accept merged version of file\n"
-"\n"
-" (dc) display-conflict - show all conflicts (ignoring merged version)\n"
-" (mc) mine-conflict - accept my version for all conflicts (same)\n"
-" (tc) theirs-conflict - accept their version for all conflicts (same)\n"
-"\n"
-" (mf) mine-full - accept my version of entire file (even non-conflicts)\n"
-" (tf) theirs-full - accept their version of entire file (same)\n"
-"\n"
-" (p) postpone - mark the conflict to be resolved later\n"
-" (l) launch - launch external tool to resolve conflict\n"
-" (s) show all - show this list\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:543 ../svn/conflict-callbacks.c:567
-#, c-format
-msgid ""
-"Invalid option; cannot choose based on conflicts in a binary file.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:551 ../svn/conflict-callbacks.c:575
-#, c-format
-msgid ""
-"Invalid option; cannot choose based on conflicts for properties.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:604
-#, c-format
-msgid ""
-"Invalid option; cannot display conflicts for a binary file.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:612
-#, c-format
-msgid ""
-"Invalid option; cannot display conflicts for properties.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:620
-#, c-format
-msgid ""
-"Invalid option; original files not available.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:632
-#, c-format
-msgid ""
-"Invalid option; there's no merged version to diff.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:651
-#, c-format
-msgid ""
-"Invalid option; cannot resolve property conflicts with an external merge tool.\n"
-"\n"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:666 ../svn/conflict-callbacks.c:680
-#, fuzzy, c-format
-msgid ""
-"Invalid option.\n"
-"\n"
-msgstr "無效的重新安置"
-
-#: ../svn/conflict-callbacks.c:710
-#, fuzzy, c-format
-msgid ""
-"Conflict discovered when trying to add '%s'.\n"
-"An object of the same name already exists.\n"
-msgstr "無法新增檔案 '%s': 同名物件已存在"
-
-#: ../svn/conflict-callbacks.c:713
-msgid "Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (h) help:"
-msgstr ""
-
-#: ../svn/conflict-callbacks.c:725
-#, c-format
-msgid ""
-" (p) postpone - resolve the conflict later\n"
-" (mf) mine-full - accept pre-existing item (ignore upstream addition)\n"
-" (tf) theirs-full - accept incoming item (overwrite pre-existing item)\n"
-" (h) help - show this help\n"
-"\n"
-msgstr ""
-
-#: ../svn/copy-cmd.c:132 ../svn/delete-cmd.c:79 ../svn/mkdir-cmd.c:66
-#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:251
-#, fuzzy
-msgid "Local, non-commit operations do not take a log message or revision properties"
-msgstr "本地非送交的動作不需要送交訊息"
-
-#: ../svn/diff-cmd.c:172 ../svn/log-cmd.c:280 ../svnserve/main.c:632
-#, c-format
-msgid "Can't open stdout"
-msgstr "無法開啟標準輸出 (stdout)"
-
-#: ../svn/diff-cmd.c:174 ../svn/log-cmd.c:282
-#, c-format
-msgid "Can't open stderr"
-msgstr "無法開啟標準錯誤 (stderr)"
-
-#: ../svn/diff-cmd.c:183
-#, fuzzy
-msgid "'--xml' option only valid with '--summarize' option"
-msgstr "'--new' 選項只有與 '--old' 選項併用才有效"
-
-#: ../svn/diff-cmd.c:258
-msgid "'--new' option only valid with '--old' option"
-msgstr "'--new' 選項只有與 '--old' 選項併用才有效"
-
-#: ../svn/diff-cmd.c:322
-#, fuzzy, c-format
-msgid "Path '%s' not relative to base URLs"
-msgstr "路徑 '%s' 不是檔案"
-
-#: ../svn/export-cmd.c:113
-msgid "Destination directory exists; please remove the directory or use --force to overwrite"
-msgstr "目的目錄已存在; 請刪除目錄或用 --force 來覆寫目錄"
-
-#: ../svn/export-cmd.c:118 ../svn/switch-cmd.c:179 ../svn/update-cmd.c:107
-#, fuzzy
-msgid "Failure occured processing one or more externals definitions"
-msgstr "忽略外部定義"
-
-#: ../svn/help-cmd.c:50
-#, fuzzy, c-format
-msgid ""
-"usage: svn <subcommand> [options] [args]\n"
-"Subversion command-line client, version %s.\n"
-"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
-"Type 'svn --version' to see the program version and RA modules\n"
-" or 'svn --version --quiet' to see just the version number.\n"
-"\n"
-"Most subcommands take file and/or directory arguments, recursing\n"
-"on the directories. If no arguments are supplied to such a\n"
-"command, it recurses on the current directory (inclusive) by default.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"用法: svn <subcommand> [options] [args]\n"
-"Subversion 命令列用戶端, 版本 %s.\n"
-"請使用 'svn help <subcommand>' 顯示子命令的輔助說明.\n"
-"\n"
-"大多數的子命令可接受檔案或目錄引數, 對目錄進行遞迴存取.\n"
-"如無指定引數給命令, 預設行為將會自目前的目錄 (包含) 進\n"
-"行遞迴式存取\n"
-"\n"
-"可用的子命令:\n"
-
-#: ../svn/help-cmd.c:63
-#, fuzzy
-msgid ""
-"Subversion is a tool for version control.\n"
-"For additional information, see http://subversion.apache.org/\n"
-msgstr ""
-"Subversion 是個版本控制系統的工具.\n"
-"欲取得詳細資料, 請參考 http://subversion.tigris.org/\n"
-
-#: ../svn/help-cmd.c:70 ../svnrdump/svnrdump.c:349 ../svnsync/main.c:1762
-msgid ""
-"The following repository access (RA) modules are available:\n"
-"\n"
-msgstr ""
-"可使用以下的檔案庫存取 (RA) 模組:\n"
-"\n"
-
-#: ../svn/import-cmd.c:87
-msgid "Repository URL required when importing"
-msgstr "匯入時必須提供檔案庫的 URL"
-
-#: ../svn/import-cmd.c:91
-msgid "Too many arguments to import command"
-msgstr "匯入命令有太多引數"
-
-#: ../svn/import-cmd.c:111
-#, c-format
-msgid "Invalid URL '%s'"
-msgstr "無效 URL '%s'"
-
-#: ../svn/info-cmd.c:95
-#, fuzzy
-msgid "Resource is not under version control."
-msgstr "'%s' 尚未納入版本控制"
-
-#: ../svn/info-cmd.c:255 ../svnadmin/main.c:1394
-#, c-format
-msgid "Path: %s\n"
-msgstr "路徑: %s\n"
-
-# this points to filename according to sunny256
-#: ../svn/info-cmd.c:261
-#, c-format
-msgid "Name: %s\n"
-msgstr "檔案名: %s\n"
-
-#: ../svn/info-cmd.c:265
-#, fuzzy, c-format
-msgid "Working Copy Root Path: %s\n"
-msgstr "工作複本未鎖定"
-
-#: ../svn/info-cmd.c:270
-#, c-format
-msgid "URL: %s\n"
-msgstr "URL: %s\n"
-
-#: ../svn/info-cmd.c:273
-#, c-format
-msgid "Repository Root: %s\n"
-msgstr "檔案庫根目錄: %s\n"
-
-#: ../svn/info-cmd.c:277
-#, c-format
-msgid "Repository UUID: %s\n"
-msgstr "檔案庫 UUID: %s\n"
-
-#: ../svn/info-cmd.c:281
-#, c-format
-msgid "Revision: %ld\n"
-msgstr "修訂版: %ld\n"
-
-#: ../svn/info-cmd.c:286
-#, c-format
-msgid "Node Kind: file\n"
-msgstr "節點種類: 檔案\n"
-
-#: ../svn/info-cmd.c:290
-#, c-format
-msgid "Node Kind: directory\n"
-msgstr "節點種類: 目錄\n"
-
-#: ../svn/info-cmd.c:294
-#, c-format
-msgid "Node Kind: none\n"
-msgstr "節點種類: 無\n"
-
-#: ../svn/info-cmd.c:299
-#, c-format
-msgid "Node Kind: unknown\n"
-msgstr "節點種類: 未知\n"
-
-#: ../svn/info-cmd.c:308
-#, c-format
-msgid "Schedule: normal\n"
-msgstr "排程: 正常\n"
-
-#: ../svn/info-cmd.c:312
-#, c-format
-msgid "Schedule: add\n"
-msgstr "排程: 新增\n"
-
-#: ../svn/info-cmd.c:316
-#, c-format
-msgid "Schedule: delete\n"
-msgstr "排程: 刪除\n"
-
-#: ../svn/info-cmd.c:320
-#, c-format
-msgid "Schedule: replace\n"
-msgstr "排程: 取代\n"
-
-#: ../svn/info-cmd.c:336
-#, c-format
-msgid "Depth: empty\n"
-msgstr ""
-
-#: ../svn/info-cmd.c:340
-#, c-format
-msgid "Depth: files\n"
-msgstr ""
-
-#: ../svn/info-cmd.c:344
-#, c-format
-msgid "Depth: immediates\n"
-msgstr ""
-
-#. Other depths should never happen here.
-#: ../svn/info-cmd.c:355
-#, c-format
-msgid "Depth: INVALID\n"
-msgstr ""
-
-#: ../svn/info-cmd.c:359
-#, c-format
-msgid "Copied From URL: %s\n"
-msgstr "拷貝自 URL: %s\n"
-
-#: ../svn/info-cmd.c:363
-#, c-format
-msgid "Copied From Rev: %ld\n"
-msgstr "拷貝自修訂版: %ld\n"
-
-#: ../svn/info-cmd.c:368
-#, c-format
-msgid "Last Changed Author: %s\n"
-msgstr "最後更新作者: %s\n"
-
-#: ../svn/info-cmd.c:372
-#, c-format
-msgid "Last Changed Rev: %ld\n"
-msgstr "最後修改修訂版: %ld\n"
-
-#: ../svn/info-cmd.c:377
-msgid "Last Changed Date"
-msgstr "最後修改日期"
-
-#: ../svn/info-cmd.c:383
-msgid "Text Last Updated"
-msgstr "文字最後更新"
-
-#: ../svn/info-cmd.c:386
-#, c-format
-msgid "Checksum: %s\n"
-msgstr "總和檢查值: %s\n"
-
-#: ../svn/info-cmd.c:391
-#, c-format
-msgid "Conflict Previous Base File: %s\n"
-msgstr "衝突前的基礎檔案: %s\n"
-
-#: ../svn/info-cmd.c:397
-#, c-format
-msgid "Conflict Previous Working File: %s\n"
-msgstr "衝突前的工作檔案: %s\n"
-
-#: ../svn/info-cmd.c:402
-#, c-format
-msgid "Conflict Current Base File: %s\n"
-msgstr "衝突後的基礎檔案: %s\n"
-
-#: ../svn/info-cmd.c:407
-#, c-format
-msgid "Conflict Properties File: %s\n"
-msgstr "衝突性質的檔案: %s\n"
-
-#: ../svn/info-cmd.c:415
-#, c-format
-msgid "Lock Token: %s\n"
-msgstr "鎖定符記: %s\n"
-
-#: ../svn/info-cmd.c:419
-#, c-format
-msgid "Lock Owner: %s\n"
-msgstr "鎖定擁有者: %s\n"
-
-#: ../svn/info-cmd.c:424
-msgid "Lock Created"
-msgstr "鎖定建立於"
-
-#: ../svn/info-cmd.c:428
-msgid "Lock Expires"
-msgstr "鎖定過期於"
-
-#: ../svn/info-cmd.c:436
-#, fuzzy, c-format
-msgid ""
-"Lock Comment (%i line):\n"
-"%s\n"
-msgid_plural ""
-"Lock Comment (%i lines):\n"
-"%s\n"
-msgstr[0] ""
-"鎖定註解 (%i 列):\n"
-"%s\n"
-msgstr[1] ""
-"鎖定註解 (%i 列):\n"
-"%s\n"
-
-#: ../svn/info-cmd.c:445
-#, fuzzy, c-format
-msgid "Changelist: %s\n"
-msgstr "總和檢查值: %s\n"
-
-#: ../svn/info-cmd.c:467
-msgid "Tree conflict"
-msgstr ""
-
-#: ../svn/info-cmd.c:473
-msgid "Source left"
-msgstr ""
-
-#: ../svn/info-cmd.c:482
-msgid "Source right"
-msgstr ""
-
-# as-is
-#: ../svn/info-cmd.c:580
-#, c-format
-msgid ""
-"%s: (Not a versioned resource)\n"
-"\n"
-msgstr ""
-"%s: (Not a versioned resource)\n"
-"\n"
-
-# as-is
-#: ../svn/info-cmd.c:589
-#, c-format
-msgid ""
-"%s: (Not a valid URL)\n"
-"\n"
-msgstr ""
-"%s: (Not a valid URL)\n"
-"\n"
-
-#: ../svn/list-cmd.c:92
-msgid "%b %d %H:%M"
-msgstr ""
-
-#: ../svn/list-cmd.c:97
-msgid "%b %d %Y"
-msgstr ""
-
-#: ../svn/lock-cmd.c:58
-msgid "Lock comment contains a zero byte"
-msgstr "鎖定註解中有一個零位元組"
-
-# as-is
-#: ../svn/log-cmd.c:184
-msgid "(no author)"
-msgstr "(no author)"
-
-# as-is
-#: ../svn/log-cmd.c:190
-msgid "(no date)"
-msgstr "(no date)"
-
-#: ../svn/log-cmd.c:205
-#, c-format
-msgid " | %d line"
-msgid_plural " | %d lines"
-msgstr[0] ""
-msgstr[1] ""
-
-# as-is
-#: ../svn/log-cmd.c:221
-#, c-format
-msgid "Changed paths:\n"
-msgstr "Changed paths:\n"
-
-# as-is
-#: ../svn/log-cmd.c:236
-#, c-format
-msgid " (from %s:%ld)"
-msgstr " (from %s:%ld)"
-
-#. Print the result of merge line
-#: ../svn/log-cmd.c:251
-#, c-format
-msgid "Merged via:"
-msgstr ""
-
-#: ../svn/log-cmd.c:296 ../svn/log-cmd.c:373
-#, c-format
-msgid "\n"
-msgstr ""
-
-#: ../svn/log-cmd.c:573
-#, fuzzy
-msgid "'with-all-revprops' option only valid in XML mode"
-msgstr "'incremental' 選項僅於 XML 模式中有效"
-
-#: ../svn/log-cmd.c:577
-#, fuzzy
-msgid "'with-no-revprops' option only valid in XML mode"
-msgstr "'incremental' 選項僅於 XML 模式中有效"
-
-#: ../svn/log-cmd.c:581
-#, fuzzy
-msgid "'with-revprop' option only valid in XML mode"
-msgstr "'incremental' 選項僅於 XML 模式中有效"
-
-#: ../svn/log-cmd.c:588
-#, fuzzy
-msgid "'diff' option is not supported in XML mode"
-msgstr "指定的 diff 選項不支援"
-
-#: ../svn/log-cmd.c:594
-#, fuzzy
-msgid "'quiet' and 'diff' options are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/log-cmd.c:598
-msgid "'diff-cmd' option requires 'diff' option"
-msgstr ""
-
-#: ../svn/log-cmd.c:602
-msgid "'internal-diff' option requires 'diff' option"
-msgstr ""
-
-#: ../svn/log-cmd.c:606
-msgid "'extensions' option requires 'diff' option"
-msgstr ""
-
-#: ../svn/log-cmd.c:625
-#, fuzzy
-msgid "-c and -r are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/log-cmd.c:652
-#, fuzzy, c-format
-msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path"
-msgstr "在 URL 之後只可指定相對路徑"
-
-#: ../svn/log-cmd.c:697
-#, c-format
-msgid "cannot assign with 'with-revprop' option (drop the '=')"
-msgstr ""
-
-#: ../svn/main.c:136
-msgid "force operation to run"
-msgstr "強制進行作業"
-
-#: ../svn/main.c:138
-msgid "force validity of log message source"
-msgstr "強制將記錄訊息視為有效"
-
-#: ../svn/main.c:139 ../svn/main.c:140 ../svnadmin/main.c:244
-#: ../svnadmin/main.c:247 ../svndumpfilter/main.c:916
-#: ../svndumpfilter/main.c:919 ../svnlook/main.c:103 ../svnlook/main.c:115
-#: ../svnsync/main.c:212 ../svnsync/main.c:214
-msgid "show help on a subcommand"
-msgstr "顯示子命令的輔助說明"
-
-#: ../svn/main.c:141
-msgid "specify log message ARG"
-msgstr "指定送交訊息 ARG"
-
-#: ../svn/main.c:142
-#, fuzzy
-msgid "print nothing, or only summary information"
-msgstr "輸出詳細資料"
-
-#: ../svn/main.c:143
-msgid "descend recursively, same as --depth=infinity"
-msgstr ""
-
-#: ../svn/main.c:144
-msgid "obsolete; try --depth=files or --depth=immediates"
-msgstr ""
-
-#: ../svn/main.c:146
-msgid "the change made by revision ARG (like -r ARG-1:ARG)\n"
-msgstr ""
-
-#: ../svn/main.c:150
-msgid "ARG (some commands also take ARG1:ARG2 range)\n"
-msgstr ""
-
-#: ../svn/main.c:165
-msgid "read log message from file ARG"
-msgstr "從檔案 ARG 讀取紀錄訊息"
-
-#: ../svn/main.c:167
-msgid "give output suitable for concatenation"
-msgstr "提供適於接續的輸出"
-
-#: ../svn/main.c:169
-msgid "treat value as being in charset encoding ARG"
-msgstr "把數值當以 ARG 字元集編碼的文字"
-
-#: ../svn/main.c:170 ../svnadmin/main.c:250 ../svndumpfilter/main.c:922
-#: ../svnlook/main.c:145 ../svnrdump/svnrdump.c:89 ../svnserve/main.c:220
-#: ../svnsync/main.c:210 ../svnversion/main.c:135
-#, fuzzy
-msgid "show program version information"
-msgstr "顯示版本資訊"
-
-#: ../svn/main.c:171
-msgid "print extra information"
-msgstr "輸出詳細資料"
-
-#: ../svn/main.c:172
-msgid "display update information"
-msgstr "顯示更新資料"
-
-#: ../svn/main.c:173 ../svnrdump/svnrdump.c:81
-msgid "specify a username ARG"
-msgstr "指定使用者名稱 ARG"
-
-#: ../svn/main.c:174 ../svnrdump/svnrdump.c:82
-msgid "specify a password ARG"
-msgstr "指定密碼 ARG"
-
-#: ../svn/main.c:176
-msgid "Default: '-u'. When Subversion is invoking an\n"
-msgstr ""
-
-#: ../svn/main.c:208
-msgid "pass contents of file ARG as additional args"
-msgstr "把檔案內容 ARG 當作附加引數"
-
-#: ../svn/main.c:210
-msgid "limit operation by depth ARG ('empty', 'files',\n"
-msgstr ""
-
-#: ../svn/main.c:214
-msgid "set new working copy depth to ARG ('exclude',\n"
-msgstr ""
-
-#: ../svn/main.c:217 ../svnlook/main.c:148
-msgid "output in XML"
-msgstr "以 XML 輸出"
-
-#: ../svn/main.c:218
-msgid "use strict semantics"
-msgstr "應用嚴格語意"
-
-#: ../svn/main.c:220
-msgid "do not cross copies while traversing history"
-msgstr "收集歷史記錄時, 不溯及複製點之前"
-
-#: ../svn/main.c:222
-msgid "disregard default and svn:ignore property ignores"
-msgstr "無視預設與 svn:ignore 性質的忽略設定"
-
-#: ../svn/main.c:224 ../svnrdump/svnrdump.c:85 ../svnsync/main.c:172
-msgid "do not cache authentication tokens"
-msgstr "不記憶認證符"
-
-#: ../svn/main.c:226
-msgid "accept unknown SSL server certificates without\n"
-msgstr ""
-
-#: ../svn/main.c:230 ../svnrdump/svnrdump.c:83 ../svnsync/main.c:170
-msgid "do no interactive prompting"
-msgstr "無互動式提示"
-
-#: ../svn/main.c:232
-msgid "try operation but make no changes"
-msgstr "嘗試作業, 但不做更改"
-
-#: ../svn/main.c:234 ../svnlook/main.c:124
-msgid "do not print differences for deleted files"
-msgstr "不顯示已刪除檔案的差異"
-
-#: ../svn/main.c:236
-msgid "notice ancestry when calculating differences"
-msgstr "計算檔案差異時注意演進歷程"
-
-#: ../svn/main.c:238
-msgid "ignore ancestry when calculating merges"
-msgstr "計算檔案合併時忽略演進歷程"
-
-#: ../svn/main.c:240
-msgid "ignore externals definitions"
-msgstr "忽略外部定義"
-
-#: ../svn/main.c:241
-msgid "use ARG as diff command"
-msgstr "把 ARG 當檔案差異命令"
-
-#: ../svn/main.c:242
-msgid "use ARG as merge command"
-msgstr "把 ARG 當合併命令"
-
-#: ../svn/main.c:243
-msgid "use ARG as external editor"
-msgstr "把 ARG 當外部編輯器"
-
-#: ../svn/main.c:245
-msgid "merge only mergeinfo differences"
-msgstr ""
-
-#: ../svn/main.c:246
-msgid "use ARG as the older target"
-msgstr "將 ARG 視為較舊的目標"
-
-#: ../svn/main.c:247
-msgid "use ARG as the newer target"
-msgstr "將 ARG 視為較新的目標"
-
-#: ../svn/main.c:249
-msgid "operate on a revision property (use with -r)"
-msgstr "操作修訂版性質 (與 -r 一同使用)"
-
-#: ../svn/main.c:250
-msgid "relocate via URL-rewriting"
-msgstr "透過改寫 URL 以進行工作複本重新安置"
-
-#: ../svn/main.c:252 ../svnadmin/main.c:286 ../svnrdump/svnrdump.c:79
-#: ../svnsync/main.c:194
-msgid "read user configuration files from directory ARG"
-msgstr "自目錄 ARG 讀取使用者設定檔"
-
-#: ../svn/main.c:254
-#, fuzzy
-msgid "set user configuration option in the format:\n"
-msgstr "自目錄 ARG 讀取使用者設定檔"
-
-#: ../svn/main.c:261
-msgid "enable automatic properties"
-msgstr "啟動自動性質"
-
-#: ../svn/main.c:262
-msgid "disable automatic properties"
-msgstr "關閉自動性質"
-
-#: ../svn/main.c:264
-msgid "use a different EOL marker than the standard\n"
-msgstr ""
-
-#: ../svn/main.c:271
-msgid "maximum number of log entries"
-msgstr "顯示紀錄訊息的上限值"
-
-#: ../svn/main.c:272
-msgid "don't unlock the targets"
-msgstr "無法對目錄解除鎖定"
-
-#: ../svn/main.c:273
-msgid "show a summary of the results"
-msgstr "顯示結果的摘要"
-
-#: ../svn/main.c:274
-msgid "remove changelist association"
-msgstr ""
-
-#: ../svn/main.c:276
-msgid "operate only on members of changelist ARG"
-msgstr ""
-
-#: ../svn/main.c:278
-msgid "don't delete changelists after commit"
-msgstr ""
-
-#: ../svn/main.c:279
-#, fuzzy
-msgid "keep path in working copy"
-msgstr "路徑不是工作複本檔案"
-
-#: ../svn/main.c:281
-#, fuzzy
-msgid "retrieve all revision properties"
-msgstr "不過濾修訂版性質."
-
-#: ../svn/main.c:283
-#, fuzzy
-msgid "retrieve no revision properties"
-msgstr "不過濾修訂版性質."
-
-#: ../svn/main.c:285
-#, fuzzy
-msgid "set revision property ARG in new revision\n"
-msgstr "修訂版 %ld 上的未納入版本控制的性質:\n"
-
-#: ../svn/main.c:288
-#, fuzzy
-msgid "make intermediate directories"
-msgstr "無法建立任何目錄"
-
-#: ../svn/main.c:290
-#, fuzzy
-msgid "use/display additional information from merge\n"
-msgstr "顯示更新資料"
-
-#: ../svn/main.c:294
-msgid "specify automatic conflict resolution action\n"
-msgstr ""
-
-#: ../svn/main.c:302
-msgid "specify which collection of revisions to display\n"
-msgstr ""
-
-#: ../svn/main.c:306
-msgid "merge a branch back into its parent branch"
-msgstr ""
-
-#: ../svn/main.c:308
-msgid "number of leading path components to strip from\n"
-msgstr ""
-
-#: ../svn/main.c:324
-msgid "don't diff copied or moved files with their source"
-msgstr ""
-
-#: ../svn/main.c:326
-#, fuzzy
-msgid "don't expand keywords"
-msgstr "無法擴展時間"
-
-#: ../svn/main.c:328
-msgid "apply the unidiff in reverse"
-msgstr ""
-
-#: ../svn/main.c:330
-msgid "ignore whitespace during pattern matching"
-msgstr ""
-
-#: ../svn/main.c:331
-msgid "produce diff output"
-msgstr ""
-
-#: ../svn/main.c:333
-msgid "override diff-cmd specified in config file"
-msgstr ""
-
-#: ../svn/main.c:335
-msgid "use git's extended diff format"
-msgstr ""
-
-#: ../svn/main.c:337
-msgid "Allow merge into mixed-revision working copy.\n"
-msgstr ""
-
-#: ../svn/main.c:408
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository. They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"將目錄與檔案置於版本控制之下, 並且排定預備加入檔案庫. 它們會在你\n"
-"下一次送交時新增進去.\n"
-"用法: add PATH...\n"
-
-#: ../svn/main.c:413
-msgid "add intermediate parents"
-msgstr ""
-
-#: ../svn/main.c:416
-msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"輸出指定檔案或 URL 的內容, 每行包含修訂版與作者資料.\n"
-"用法: blame TARGET[@REV]...\n"
-"\n"
-" 如果指定 REV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-
-#: ../svn/main.c:425
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"輸出指定檔案或 URL 的內容.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" 如果指定 REV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-
-#: ../svn/main.c:433
-msgid ""
-"Associate (or dissociate) changelist CLNAME with the named files.\n"
-"usage: 1. changelist CLNAME PATH...\n"
-" 2. changelist --remove PATH...\n"
-msgstr ""
-
-#: ../svn/main.c:439
-#, fuzzy
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-" If specified, REV determines in which revision the URL is first\n"
-" looked up.\n"
-"\n"
-" If PATH is omitted, the basename of the URL will be used as\n"
-" the destination. If multiple URLs are given each will be checked\n"
-" out into a sub-directory of PATH, with the name of the sub-directory\n"
-" being the basename of the URL.\n"
-"\n"
-" If --force is used, unversioned obstructing paths in the working\n"
-" copy destination do not automatically cause the check out to fail.\n"
-" If the obstructing path is the same type (file or directory) as the\n"
-" corresponding path in the repository it becomes versioned but its\n"
-" contents are left 'as-is' in the working copy. This means that an\n"
-" obstructing directory's unversioned children may also obstruct and\n"
-" become versioned. For files, any content differences between the\n"
-" obstruction and the repository are treated like a local modification\n"
-" to the working copy. All properties from the repository are applied\n"
-" to the obstructing path.\n"
-"\n"
-" See also 'svn help update' for a list of possible characters\n"
-" reporting the action taken.\n"
-msgstr ""
-"更新工作複本至不同的 URL.\n"
-"用法: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. 更新你的工作複本, 映射到一個新的 URL. 這動作跟 'svn update' 很像, \n"
-" 也是將工作複本移至同一檔案庫中的某一分支或標記.\n"
-"\n"
-" 2. 改寫工作複本的 URL 描述資料, 以反映單純的語法更動. 當檔案庫的根\n"
-" URL 變動 (像是綱要或是主機名稱變動), 但是工作複本仍舊對映到同一\n"
-" 檔案庫的同一目錄時用之.\n"
-
-#: ../svn/main.c:466
-#, fuzzy
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [WCPATH...]\n"
-msgstr ""
-"遞迴式地清除工作複本, 移除未完成動作的鎖定, 繼續未完全的動作等等.\n"
-"用法: cleanup [PATH...]\n"
-
-#: ../svn/main.c:472
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-" A log message must be provided, but it can be empty. If it is not\n"
-" given by a --message or --file option, an editor will be started.\n"
-" If any targets are (or contain) locked items, those will be\n"
-" unlocked after a successful commit.\n"
-msgstr ""
-"從工作複本傳送更動至檔案庫.\n"
-"用法: commit [PATH...]\n"
-"\n"
-" 必須提供紀錄訊息, 但是可以為空內容. 如果不是以 --message 或 --file\n"
-" 選項來指定, 就會啟動你的文字編輯器. 如果任何目錄都是 (或是包括)\n"
-" 鎖定項目, 那麼在送交成功之後, 就會解除鎖定.\n"
-
-#: ../svn/main.c:483
-#, fuzzy
-msgid ""
-"Duplicate something in working copy or repository, remembering\n"
-"history.\n"
-"usage: copy SRC[@REV]... DST\n"
-"\n"
-"When copying multiple sources, they will be added as children of DST,\n"
-"which must be a directory.\n"
-"\n"
-" SRC and DST can each be either a working copy (WC) path or URL:\n"
-" WC -> WC: copy and schedule for addition (with history)\n"
-" WC -> URL: immediately commit a copy of WC to URL\n"
-" URL -> WC: check out URL into WC, schedule for addition\n"
-" URL -> URL: complete server-side copy; used to branch and tag\n"
-" All the SRCs must be of the same type.\n"
-"\n"
-"WARNING: For compatibility with previous versions of Subversion,\n"
-"copies performed using two working copy paths (WC -> WC) will not\n"
-"contact the repository. As such, they may not, by default, be able\n"
-"to propagate merge tracking information from the source of the copy\n"
-"to the destination.\n"
-msgstr ""
-"複製一個工作複本或檔案庫的東西, 並且保留歷史紀錄.\n"
-"用法: copy SRC DST\n"
-"\n"
-" SRC 與 DST 可以是工作複本 (WC) 或是 URL:\n"
-" WC -> WC: 複製一個項目, 並排定新增它 (連同歷史紀錄)\n"
-" WC -> URL: 立即送交一個 WC 的複本至 URL\n"
-" URL -> WC: 將 URL 取出至 WC, 並排定新增它\n"
-" URL -> URL: 完成伺服器端的複製. 這通常是用來進行分支與標記\n"
-
-#: ../svn/main.c:505
-#, fuzzy
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. Each item specified by a PATH is scheduled for deletion upon\n"
-" the next commit. Files, and directories that have not been\n"
-" committed, are immediately removed from the working copy\n"
-" unless the --keep-local option is given.\n"
-" PATHs that are, or contain, unversioned or modified items will\n"
-" not be removed unless the --force or --keep-local option is given.\n"
-"\n"
-" 2. Each item specified by a URL is deleted from the repository\n"
-" via an immediate commit.\n"
-msgstr ""
-"將目錄與檔案移出版本控制.\n"
-"用法: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. 以 PATH 指定的項目, 會被排定在下一次送交時刪除. 檔案與尚未送交\n"
-" 的目錄會馬上自工作複本中刪除. 包含或本身為不受版本控制, 或是被\n"
-" 修改的檔案, 除非使用 --force 選項, 否則不會被刪除.\n"
-"\n"
-" 2. 以 URL 指定的項目, 會透過立即送交自檔案庫中刪除.\n"
-
-#: ../svn/main.c:521
-#, fuzzy
-msgid ""
-"Display the differences between two revisions or paths.\n"
-"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. Display the changes made to TARGETs as they are seen in REV between\n"
-" two revisions. TARGETs may be all working copy paths or all URLs.\n"
-" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
-" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
-" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
-" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
-"\n"
-" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
-" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n"
-" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-" Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"顯示兩個路徑之間的差異.\n"
-"用法: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. 顯示在 REV 修訂版中存在的 TARGET, 它 (們) 在兩個不同的修訂版之間的\n"
-" 差異. TARGET 可以全為工作複本路徑, 或是全為 URL. 如果 TARGET 皆為\n"
-" 工作複本路徑, N 預設為 BASE, M 為工作複本; 如果皆為 URL, N 必須指定,\n"
-" M 預設為 HEAD. '-c M' 選項與 '-r N:M' 相同, 其中 N = M-1.\n"
-" 使用 '-c -M' 則為相反: '-r M:N', 其中 N = M-1.\n"
-"\n"
-" 2. 顯示於 OLDREV 修訂版的 OLD-TGT 與於 NEWREV 修訂版的 NEW-TGT 之間的\n"
-" 差異. 如果有指定 PATH 的話, 它們是相對於 OLD-TGT 與 NEW-TGT, 而差異\n"
-" 的輸出會限制在這些路徑中. OLD-TGT 與 NEW-TGT 可為工作路徑或\n"
-" URL[@REV]. 沒有指定 NEW-TGT 時, 其預設為 OLD-TGT. -r N 使得 OLDREV \n"
-" 預設為 N, 而 -r N:M 讓 OLDREV 預設為 N, NEWREV 預設為 M,\n"
-" 3. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' 的便利寫法.\n"
-"\n"
-" 僅僅使用 'svn diff' 時, 會顯示工作複本中的本地修改.\n"
-
-#: ../svn/main.c:549
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. Exports a clean directory tree from the repository specified by\n"
-" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
-"\n"
-" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
-"\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"產生一個無版本控制的目錄樹複本.\n"
-"用法: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. 從 URL 指定的檔案庫, 匯出一個乾淨的目錄樹到 PATH. 如果有指定\n"
-" REV 的話, 內容即為該修訂版的, 否則就是 HEAD 修訂版. 如果 PATH\n"
-" 被省略的話, URL 的最後部份會被用來當成本地的目錄名稱.\n"
-"\n"
-" 2. 在工作複本中, 從指定的 PATH1 匯出一個乾淨的目錄樹到 PATH2. 如果\n"
-" 有指定 REV 的話, 會從指定的修訂版匯出, 否則從 WORKING 匯出. 如果\n"
-" PATH2 被省略的話, PATH1 的最後部份會被用來當成本地的目錄名稱.\n"
-" 如果沒有指定 REV 的話, 所有的本地修改都還會保持著, 但是未納入\n"
-" 版本控制的檔案不會被複製.\n"
-"\n"
-" 如果指定 PEGREV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-
-#: ../svn/main.c:571
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"描述本程式或其子命令的用法.\n"
-"用法: help [SUBCOMMAND...]\n"
-
-#: ../svn/main.c:577
-#, fuzzy
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-" Recursively commit a copy of PATH to URL.\n"
-" If PATH is omitted '.' is assumed.\n"
-" Parent directories are created as necessary in the repository.\n"
-" If PATH is a directory, the contents of the directory are added\n"
-" directly under URL.\n"
-" Unversionable items such as device files and pipes are ignored\n"
-" if --force is specified.\n"
-msgstr ""
-"送交未納入版本控制的檔案或檔案樹至檔案庫.\n"
-"用法: import [PATH] URL\n"
-"\n"
-" 遞迴式地送交 PATH 的複本至 URL.\n"
-" 如果省略 PATH, 預設為 '.'.\n"
-" 父目錄會依需要於檔案庫內建立.\n"
-" 如果 PATH 是個目錄, 那麼該目錄的內容會被直接新增至該 URL 下.\n"
-
-#: ../svn/main.c:591
-#, fuzzy
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET[@REV]...]\n"
-"\n"
-" Print information about each TARGET (default: '.').\n"
-" TARGET may be either a working-copy path or URL. If specified, REV\n"
-" determines in which revision the target is first looked up.\n"
-msgstr ""
-"顯示本地或遠端項目的資訊.\n"
-"用法: info [TARGET...]\n"
-"\n"
-" 顯示每個 TARGET 的資訊 (預設: '.').\n"
-" TARGET 可為工作複本路徑或是 URL. 如果指定 REV 的話,\n"
-" 它會用來決定從哪個修訂版開始檢閱目標.\n"
-
-#: ../svn/main.c:601
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-" List each TARGET file and the contents of each TARGET directory as\n"
-" they exist in the repository. If TARGET is a working copy path, the\n"
-" corresponding repository URL will be used. If specified, REV determines\n"
-" in which revision the target is first looked up.\n"
-"\n"
-" The default TARGET is '.', meaning the repository URL of the current\n"
-" working directory.\n"
-"\n"
-" With --verbose, the following fields will be shown for each item:\n"
-"\n"
-" Revision number of the last commit\n"
-" Author of the last commit\n"
-" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
-" Size (in bytes)\n"
-" Date and time of the last commit\n"
-msgstr ""
-"列出檔案庫中的目錄項目.\n"
-"用法: list [TARGET[@REV]...]\n"
-"\n"
-" 列出每個 TARGET 檔案與每個檔案庫裡的 TARGET 目錄. 如果 TARGET 是\n"
-" 工作複本的路徑, 那麼相對應的檔案庫 URL 就會被拿來使用. 如果指定 REV\n"
-" 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-"\n"
-" 預設的 TARGET 是 '.', 表示目前工作複本目錄的檔案庫 URL.\n"
-"\n"
-" 加上 --verbose 的話, 以下的欄位會顯示出項目的狀態:\n"
-"\n"
-" 前次送交的修訂版號碼\n"
-" 前次送交的作者\n"
-" 如果被鎖定的話, 顯示字母 'O'. (請利用 'svn info URL' 以取得更多的細節)\n"
-" 大小 (以位元組為單位)\n"
-" 前次送交的日期與時間\n"
-
-#: ../svn/main.c:622
-msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-" Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"鎖定工作複本路徑或是檔案庫的 URL, 這樣就沒有其它使用者可以對它們\n"
-"送交任何更動.\n"
-"用法: lock TARGET...\n"
-"\n"
-" 用 --force, 從其它使用者或工作複本偷走鎖定.\n"
-
-#: ../svn/main.c:628
-msgid "read lock comment from file ARG"
-msgstr "從檔案 ARG 讀取鎖定註解"
-
-#: ../svn/main.c:629
-msgid "specify lock comment ARG"
-msgstr "指定送交鎖定註解 ARG"
-
-#: ../svn/main.c:630
-#, fuzzy
-msgid "force validity of lock comment source"
-msgstr "強制將記錄訊息視為有效"
-
-#: ../svn/main.c:633
-#, fuzzy
-msgid ""
-"Show the log messages for a set of revision(s) and/or path(s).\n"
-"usage: 1. log [PATH][@REV]\n"
-" 2. log URL[@REV] [PATH...]\n"
-"\n"
-" 1. Print the log messages for the URL corresponding to PATH\n"
-" (default: '.'). If specified, REV is the revision in which the\n"
-" URL is first looked up, and the default revision range is REV:1.\n"
-" If REV is not specified, the default revision range is BASE:1,\n"
-" since the URL might not exist in the HEAD revision.\n"
-"\n"
-" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
-" If specified, REV is the revision in which the URL is first\n"
-" looked up, and the default revision range is REV:1; otherwise,\n"
-" the URL is looked up in HEAD, and the default revision range is\n"
-" HEAD:1.\n"
-"\n"
-" Multiple '-c' or '-r' options may be specified (but not a\n"
-" combination of '-c' and '-r' options), and mixing of forward and\n"
-" reverse ranges is allowed.\n"
-"\n"
-" With -v, also print all affected paths with each log message.\n"
-" With -q, don't print the log message body itself (note that this is\n"
-" compatible with -v).\n"
-"\n"
-" Each log message is printed just once, even if more than one of the\n"
-" affected paths for that revision were explicitly requested. Logs\n"
-" follow copy history by default. Use --stop-on-copy to disable this\n"
-" behavior, which can be useful for determining branchpoints.\n"
-"\n"
-" Examples:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log bar.c@42\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-" svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
-msgstr ""
-"顯示一組修訂版與/或檔案的送交紀錄訊息.\n"
-"用法: 1. log [PATH]\n"
-" 2. log URL[@REV] [PATH...]\n"
-"\n"
-" 1. 顯示本地 PATH (預設: '.') 的紀錄訊息. 預設的修訂版範圍為\n"
-" BASE:1.\n"
-"\n"
-" 2. 顯示 URL 下的 PATH (預設: '.') 的紀錄訊息. 如果指定 REV\n"
-" 的話, 它會用來決定該 URL 先從哪一個修訂版開始檢閱. 預設的\n"
-" 修訂版範圍為 HEAD:1.\n"
-"\n"
-" 使用 -v 時, 一併於每個紀錄訊息中顯示受影響的路徑.\n"
-" 使用 -q 時, 不顯示紀錄訊息本體 (請注意, 這可和 -v 並存).\n"
-"\n"
-" 每一個紀錄訊息只會顯示一次而已, 就算明確地指定多個被它所影響的路徑\n"
-" 亦同. 預設的顯示訊息會追溯複製歷史; 使用 --stop-on-copy 可以關閉這\n"
-" 個功能, 這在找出分支點的很方便.\n"
-"\n"
-" 範例:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-
-#: ../svn/main.c:672
-#, fuzzy
-msgid "retrieve revision property ARG"
-msgstr "不過濾修訂版性質."
-
-#: ../svn/main.c:673
-#, fuzzy
-msgid "the change made in revision ARG"
-msgstr "讀取節點修訂版"
-
-#: ../svn/main.c:676
-#, fuzzy
-msgid ""
-"Apply the differences between two sources to a working copy path.\n"
-"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. In the first form, the source URLs are specified at revisions\n"
-" N and M. These are the two sources to be compared. The revisions\n"
-" default to HEAD if omitted.\n"
-"\n"
-" 2. In the second form, the URLs corresponding to the source working\n"
-" copy paths define the sources to be compared. The revisions must\n"
-" be specified.\n"
-"\n"
-" 3. In the third form, SOURCE can be either a URL or a working copy\n"
-" path (in which case its corresponding URL is used). SOURCE (in\n"
-" revision REV) is compared as it existed between revisions N and M\n"
-" for each revision range provided. If REV is not specified, HEAD\n"
-" is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
-" does the reverse: '-r M:<M-1>'. If no revision ranges are\n"
-" specified, the default range of 0:REV is used. Multiple '-c'\n"
-" and/or '-r' options may be specified, and mixing of forward\n"
-" and reverse ranges is allowed.\n"
-"\n"
-" WCPATH is the working copy path that will receive the changes.\n"
-" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
-" the sources have identical basenames that match a file within '.':\n"
-" in which case, the differences will be applied to that file.\n"
-"\n"
-" For each merged item a line will be printed with characters reporting\n"
-" the action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-" E Existed\n"
-" R Replaced\n"
-"\n"
-" Characters in the first column report about the item itself.\n"
-" Characters in the second column report about properties of the item.\n"
-" A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
-" the first and second columns indicate textual conflicts in files\n"
-" and in property values, respectively.\n"
-"\n"
-" NOTE: Subversion will only record metadata to track the merge\n"
-" if the two sources are on the same line of history -- if the\n"
-" first source is an ancestor of the second, or vice-versa. This is\n"
-" guaranteed to be the case when using the third form listed above.\n"
-" The --ignore-ancestry option overrides this, forcing Subversion to\n"
-" regard the sources as unrelated and not to track the merge.\n"
-msgstr ""
-"將兩個來源之間的差異套用至工作複本路徑.\n"
-"用法: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. 第一種形式中, 來源 URL 各被指定到修訂版 N 與 M. 這兩個就是作為\n"
-" 比較的來源. 如果沒有指定修訂版的話, 預設為 HEAD.\n"
-"\n"
-" 2. 在第二種形式中, 對應到兩個來源的工作複本路徑的 URL 定義出用以\n"
-" 進行比較的來源. 這裡必須指定修訂版.\n"
-"\n"
-" 3. 第三種形式中, SOURCE 可為 URL 或工作複本項目, 後者會使用對應的\n"
-" URL. 在修訂版 REV 的 URL 會以它存在於修訂版 N 與 M 的路徑來作\n"
-" 比較. 如果未指定 REV, 就會假設為 HEAD. '-c M' 選項等同於 \n"
-" '-r N:M', 其中 N = M-1. 使用 '-c -M' 則為相反: '-r M:N',\n"
-" 其中 N = M-1.\n"
-"\n"
-" WCPATH 是接受更動的工作複本路徑. 如果省略 WCPATH 的話, 預設值為\n"
-" '.', 除非來源的主檔名符合 '.' 裡的某個檔案; 在這種情況下, 檔案\n"
-" 差異將會直接套用至該檔案去.\n"
-
-#: ../svn/main.c:732
-msgid ""
-"Display merge-related information.\n"
-"usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
-"\n"
-" Display information related to merges (or potential merges) between\n"
-" SOURCE and TARGET (default: '.'). If the --show-revs option\n"
-" is not provided, display revisions which have been merged from\n"
-" SOURCE to TARGET; otherwise, display the type of information\n"
-" specified by the --show-revs option.\n"
-msgstr ""
-
-#: ../svn/main.c:743
-#, fuzzy
-msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" Create version controlled directories.\n"
-"\n"
-" 1. Each directory specified by a working copy PATH is created locally\n"
-" and scheduled for addition upon the next commit.\n"
-"\n"
-" 2. Each directory specified by a URL is created in the repository via\n"
-" an immediate commit.\n"
-"\n"
-" In both cases, all the intermediate directories must already exist,\n"
-" unless the --parents option is given.\n"
-msgstr ""
-"建立納入版本控制下的新目錄.\n"
-"用法: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" 建立版本控制的目錄.\n"
-"\n"
-" 1. 每一個以工作複本 PATH 指定的目錄, 都會建立在本地端, 並且排入新增\n"
-" 排程, 以待下一次的送交.\n"
-"\n"
-" 2. 每個以 URL 指定的目錄, 都會透過立即送交於檔案庫中建立.\n"
-"\n"
-" 在這兩個情況下, 所有的中介目錄都必須事先存在.\n"
-
-#: ../svn/main.c:760
-#, fuzzy
-msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC... DST\n"
-"\n"
-"When moving multiple sources, they will be added as children of DST,\n"
-"which must be a directory.\n"
-"\n"
-" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
-" Note: the --revision option has no use and is deprecated.\n"
-"\n"
-" SRC and DST can both be working copy (WC) paths or URLs:\n"
-" WC -> WC: move and schedule for addition (with history)\n"
-" URL -> URL: complete server-side rename.\n"
-" All the SRCs must be of the same type.\n"
-msgstr ""
-"移動或更名工作複本或檔案庫裡的東西.\n"
-"用法: move SRC DST\n"
-"\n"
-" 注意: 本子命令等同於 'copy' 然後 'delete'.\n"
-" 注意: --revision 選項已無作用, 並不建議使用.\n"
-"\n"
-" SRC 可同時為工作複本 (WC) 路徑或 URL:\n"
-" WC -> WC: 移動並排入新增時程 (連同歷史紀錄)\n"
-" URL -> URL: 完全是伺服器端的更名.\n"
-
-#: ../svn/main.c:777
-msgid ""
-"Permanently delete a specific node-revision from the repository.\n"
-"usage: obliterate URL@REV\n"
-msgstr ""
-
-#: ../svn/main.c:783
-msgid ""
-"Apply a patch to a working copy.\n"
-"usage: patch PATCHFILE [WCPATH]\n"
-"\n"
-" Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
-" If WCPATH is omitted, '.' is assumed.\n"
-"\n"
-" A unidiff patch suitable for application to a working copy can be\n"
-" produced with the 'svn diff' command or third-party diffing tools.\n"
-" Any non-unidiff content of PATCHFILE is ignored.\n"
-"\n"
-" Changes listed in the patch will either be applied or rejected.\n"
-" If a change does not match at its exact line offset, it may be applied\n"
-" earlier or later in the file if a match is found elsewhere for the\n"
-" surrounding lines of context provided by the patch.\n"
-" A change may also be applied with fuzz, which means that one\n"
-" or more lines of context are ignored when matching the change.\n"
-" If no matching context can be found for a change, the change conflicts\n"
-" and will be written to a reject file with the extension .svnpatch.rej.\n"
-"\n"
-" For each patched file a line will be printed with characters reporting\n"
-" the action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged (with local uncommitted changes)\n"
-"\n"
-" Changes applied with an offset or fuzz are reported on lines starting\n"
-" with the '>' symbol. You should review such changes carefully.\n"
-"\n"
-" If the patch removes all content from a file, that file is scheduled\n"
-" for deletion. If the patch creates a new file, that file is scheduled\n"
-" for addition. Use 'svn revert' to undo deletions and additions you\n"
-" do not agree with.\n"
-msgstr ""
-
-#: ../svn/main.c:823
-msgid ""
-"Remove a property from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. Removes versioned props in working copy.\n"
-" 2. Removes unversioned remote prop on repos revision.\n"
-" TARGET only determines which repository to access.\n"
-msgstr ""
-"移除目錄, 檔案, 或修訂版的性質.\n"
-"用法: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. 移除納入版本控制的工作複本性質.\n"
-" 2. 移除無版本控制的遠端檔案庫修訂版性質.\n"
-" TARGET 只是用來決定存在哪個檔案庫\n"
-
-#: ../svn/main.c:833
-#, fuzzy
-msgid ""
-"Edit a property with an external editor.\n"
-"usage: 1. propedit PROPNAME TARGET...\n"
-" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. Edits versioned prop in working copy or repository.\n"
-" 2. Edits unversioned remote prop on repos revision.\n"
-" TARGET only determines which repository to access.\n"
-"\n"
-"See 'svn help propset' for more on setting properties.\n"
-msgstr ""
-"以外部編輯器編輯目標的性質 PROPNAME.\n"
-"用法: 1. propedit PROPNAME PATH...\n"
-" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. 編輯納入版本控制的工作複本性質.\n"
-" 2. 編輯無版本控制的遠端檔案庫修訂版性質更動.\n"
-" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-
-#: ../svn/main.c:845
-#, fuzzy
-msgid ""
-"Print the value of a property on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. Prints versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Prints unversioned remote prop on repos revision.\n"
-" TARGET only determines which repository to access.\n"
-"\n"
-" By default, this subcommand will add an extra newline to the end\n"
-" of the property values so that the output looks pretty. Also,\n"
-" whenever there are multiple paths involved, each property value\n"
-" is prefixed with the path with which it is associated. Use the\n"
-" --strict option to disable these beautifications (useful when\n"
-" redirecting a binary property value to a file, but available only\n"
-" if you supply a single TARGET to a non-recursive propget operation).\n"
-msgstr ""
-"顯示目錄, 檔案, 或修訂版的性質內容.\n"
-"用法: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
-"\n"
-" 1. 顯示納入版本控制的性質. 如果指定 REV 的話, 它會用來決定目標的\n"
-" 哪一個版本會最先被檢閱.\n"
-" 2. 顯示無版本控制的遠端檔案庫修訂版性質.\n"
-" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-"\n"
-" 本子命令的預設行為會在性質內容加上額外的換列字元, 如此可得到較\n"
-" 美觀的輸出. 另外, 當同時處理多個路徑時, 每一個性質內容會加上它\n"
-" 所對應到的路徑. 使用 --strict 選項以關閉這項美化行為 (舉例來說,\n"
-" 將二進制性質內容重導至一個檔案時就很有用).\n"
-
-#: ../svn/main.c:865
-msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [TARGET]\n"
-"\n"
-" 1. Lists versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Lists unversioned remote props on repos revision.\n"
-" TARGET only determines which repository to access.\n"
-msgstr ""
-"列出所有目錄, 檔案, 或修訂版的性質.\n"
-"用法: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [TARGET]\n"
-"\n"
-" 1. 列出納入版本管理的性質. 如果指定 REV 的話, 它會用來決定目標的\n"
-" 哪一個版本會最先被檢閱.\n"
-" 2. 列出無版本控制的遠端檔案庫修訂版性質更動.\n"
-" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-
-#: ../svn/main.c:876
-#, fuzzy
-msgid ""
-"Set the value of a property on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME PROPVAL PATH...\n"
-" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
-"\n"
-" 1. Changes a versioned file or directory property in a working copy.\n"
-" 2. Changes an unversioned property on a repository revision.\n"
-" (TARGET only determines which repository to access.)\n"
-"\n"
-" The value may be provided with the --file option instead of PROPVAL.\n"
-"\n"
-" Note: svn recognizes the following special versioned properties\n"
-" but will store any arbitrary properties set:\n"
-" svn:ignore - A newline separated list of file glob patterns to ignore.\n"
-" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the object.\n"
-" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last modified.\n"
-" Rev, Revision, - The last revision the object changed.\n"
-" LastChangedRevision\n"
-" Id - A compressed summary of the previous\n"
-" 4 keywords.\n"
-" Header - Similar to Id but includes the full URL.\n"
-" svn:executable - If present, make the file executable. Use\n"
-" 'svn propdel svn:executable PATH...' to clear.\n"
-" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-" svn:mime-type - The mimetype of the file. Used to determine\n"
-" whether to merge the file, and how to serve it from Apache.\n"
-" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-" treated as text. Anything else is treated as binary.\n"
-" svn:externals - A newline separated list of module specifiers,\n"
-" each of which consists of a URL and a relative directory path,\n"
-" similar to the syntax of the 'svn checkout' command:\n"
-" http://example.com/repos/zag foo/bar\n"
-" An optional peg revision may be appended to the URL to pin the\n"
-" external to a known revision:\n"
-" http://example.com/repos/zig@42 foo\n"
-" Relative URLs are indicated by starting the URL with one\n"
-" of the following strings:\n"
-" ../ to the parent directory of the extracted external\n"
-" ^/ to the repository root\n"
-" // to the scheme\n"
-" / to the server root\n"
-" The ambiguous format 'relative_path relative_path' is taken as\n"
-" 'relative_url relative_path' with peg revision support.\n"
-" Lines in externals definitions starting with the '#' character\n"
-" are considered comments and are ignored.\n"
-" Subversion 1.4 and earlier only support the following formats\n"
-" where peg revisions can only be specified using a -r modifier\n"
-" and where URLs cannot be relative:\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" Use of these formats is discouraged. They should only be used if\n"
-" interoperability with 1.4 clients is desired.\n"
-" svn:needs-lock - If present, indicates that the file should be locked\n"
-" before it is modified. Makes the working copy file read-only\n"
-" when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n"
-" to clear.\n"
-"\n"
-" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
-" attempt will fail, and a recursive attempt will set the property\n"
-" only on the file children of the directory.\n"
-msgstr ""
-"設定目錄, 檔案, 或修訂版的性質的內容.\n"
-"用法: 1. propset PROPNAME PROPVAL PATH...\n"
-" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
-"\n"
-" 1. 在工作複本中建立一個版本控制的本地性質更動.\n"
-" 2. 對檔案庫修訂版建立一個無版本控制的遠端性質更動.\n"
-" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-"\n"
-" 性質的內容可以不用 PROPVAL 而改以 --file 選項來提供.\n"
-"\n"
-" 注意: svn 認得以下受版本控制的特殊性質, 不過還是可以儲存任意的性質:\n"
-" svn:ignore - 以換列字元隔開的忽略檔案樣式列表.\n"
-" svn:keywords - 欲展開的關鍵字. 有效的關鍵字為:\n"
-" URL, HeadURL - 本物件於檔案庫 HEAD 版的 URL.\n"
-" Author, LastChangedBy - 最後一次修改檔案的使用者.\n"
-" Date, LastChangedDate - 本物件最近一次更動的日期.\n"
-" Rev, Revision, - 本物件最後一次更動的修訂版.\n"
-" LastChangedRevision\n"
-" Id - 前四個關鍵字的壓縮摘要.\n"
-" svn:executable - 如果存在的話, 讓檔案變成可執行檔.\n"
-" svn:eol-style - 'native', 'LF', 'CR', 'CRLF' 其中之一.\n"
-" svn:mime-type - 檔案的 mime 類別. 用以決定是否該合併該檔案, \n"
-" 或是該如何從 Apache 處理它. 以 'text/' (或是沒有指定 mime 類別)\n"
-" 開始的會被視為文字, 其它則為二進制資料.\n"
-" svn:externals - 以換列字元隔開的模組指定列表, 每一個都包含了一個\n"
-" 相對目錄路徑, 選擇性的修訂版旗標, 以及一個 URL. 舉例說明\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果存在的話, 表示這個檔案在它被修改前應該要被鎖定.\n"
-" 當它不被鎖定時, 工作複本的檔案會變成唯讀模式.\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 與\n"
-" svn:needs-lock 性質都不可對目錄設定. 非遞迴式的設定會失敗, 而\n"
-" 遞迴式的設定只會對目錄的子檔案產生效果.\n"
-
-#: ../svn/main.c:940
-msgid "read property value from file ARG"
-msgstr "從檔案 ARG 讀取性質內容"
-
-#: ../svn/main.c:943
-msgid ""
-"Relocate the working copy to point to a different repository root URL.\n"
-"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
-" 2. relocate TO-URL [PATH]\n"
-"\n"
-" Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-" This is used when repository's root URL changes (such as a scheme\n"
-" or hostname change) but your working copy still reflects the same\n"
-" directory within the same repository.\n"
-"\n"
-" 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
-" copy's current and new URLs, respectively. (You may specify the\n"
-" complete old and new URLs if you wish.) Use 'svn info' to determine\n"
-" the current working copy URL.\n"
-"\n"
-" 2. TO-URL is the (complete) new repository URL to use for for PATH.\n"
-"\n"
-" Examples:\n"
-" svn relocate http:// svn:// project1 project2\n"
-" svn relocate http://www.example.com/repo/project \\\n"
-" svn://svn.example.com/repo/project\n"
-msgstr ""
-
-#: ../svn/main.c:966
-msgid ""
-"Resolve conflicts on working copy files or directories.\n"
-"usage: resolve --accept=ARG [PATH...]\n"
-"\n"
-" Note: the --accept option is currently required.\n"
-msgstr ""
-
-#: ../svn/main.c:971
-msgid "specify automatic conflict resolution source\n"
-msgstr ""
-
-#: ../svn/main.c:978
-#, fuzzy
-msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
-"\n"
-" Note: this subcommand does not semantically resolve conflicts or\n"
-" remove conflict markers; it merely removes the conflict-related\n"
-" artifact files and allows PATH to be committed again. It has been\n"
-" deprecated in favor of running 'svn resolve --accept working'.\n"
-msgstr ""
-"移除工作複本的目錄或檔案的 '衝突' 狀態.\n"
-"用法: resolved PATH...\n"
-"\n"
-" 注意: 本子命令不會依語法來解決衝突或是移除衝突標記; 它只是移除衝突的\n"
-" 相關檔案, 然後讓 PATH 可以再度送交.\n"
-
-#: ../svn/main.c:988
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
-"\n"
-" Note: this subcommand does not require network access, and resolves\n"
-" any conflicted states. However, it does not restore removed directories.\n"
-msgstr ""
-"回復原始未更動的工作複本檔案 (回復大部份的本地修改).\n"
-"用法: revert PATH...\n"
-"\n"
-" 注意: 本子命令不會存取網路, 並且會解除衝突的狀況. 但是它不會復原\n"
-" 被刪除的目錄\n"
-
-#: ../svn/main.c:996
-#, fuzzy
-msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
-"\n"
-" With no args, print only locally modified items (no network access).\n"
-" With -q, print only summary information about locally modified items.\n"
-" With -u, add working revision and server out-of-date information.\n"
-" With -v, print full revision information on every item.\n"
-"\n"
-" The first seven columns in the output are each one character wide:\n"
-" First column: Says if item was added, deleted, or otherwise changed\n"
-" ' ' no modifications\n"
-" 'A' Added\n"
-" 'C' Conflicted\n"
-" 'D' Deleted\n"
-" 'I' Ignored\n"
-" 'M' Modified\n"
-" 'R' Replaced\n"
-" 'X' an unversioned directory created by an externals definition\n"
-" '?' item is not under version control\n"
-" '!' item is missing (removed by non-svn command) or incomplete\n"
-" '~' versioned item obstructed by some item of a different kind\n"
-" Second column: Modifications of a file's or directory's properties\n"
-" ' ' no modifications\n"
-" 'C' Conflicted\n"
-" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
-" Fourth column: Scheduled commit will contain addition-with-history\n"
-" ' ' no history scheduled with commit\n"
-" '+' history scheduled with commit\n"
-" Fifth column: Whether the item is switched or a file external\n"
-" ' ' normal\n"
-" 'S' the item has a Switched URL relative to the parent\n"
-" 'X' a versioned file created by an eXternals definition\n"
-" Sixth column: Repository lock token\n"
-" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
-" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
-" Seventh column: Whether the item is the victim of a tree conflict\n"
-" ' ' normal\n"
-" 'C' tree-Conflicted\n"
-" If the item is a tree conflict victim, an additional line is printed\n"
-" after the item's status line, explaining the nature of the conflict.\n"
-"\n"
-" The out-of-date information appears in the ninth column (with -u):\n"
-" '*' a newer revision exists on the server\n"
-" ' ' the working copy is up to date\n"
-"\n"
-" Remaining fields are variable width and delimited by spaces:\n"
-" The working revision (with -u or -v; '-' if the item is copied)\n"
-" The last committed revision and last committed author (with -v)\n"
-" The working copy path is always the final field, so it can\n"
-" include spaces.\n"
-"\n"
-" The presence of a question mark ('?') where a working revision, last\n"
-" committed revision, or last committed author was expected indicates\n"
-" that the information is unknown or irrelevant given the state of the\n"
-" item (for example, when the item is the result of a copy operation).\n"
-" The question mark serves as a visual placeholder to facilitate parsing.\n"
-"\n"
-" Example output:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + - wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + - 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status\n"
-" M wc/bar.c\n"
-" ! C wc/qaz.c\n"
-" > local missing, incoming edit upon update\n"
-" D wc/qax.c\n"
-msgstr ""
-"顯示工作複本目錄與檔案的狀態.\n"
-"用法: status [PATH...]\n"
-"\n"
-" 未指定引數時, 它只會顯示本地修改的項目 (沒有網路的存取動作).\n"
-" 使用 -u 時, 再加上工作修訂版與伺服器過時的資訊.\n"
-" 使用 -v 時, 顯示每一個項目的完整修訂版資訊.\n"
-"\n"
-" 輸出的前六個欄位各為一個字元寬:\n"
-" 第一欄: 表示一個項目是新增, 刪除, 不然就是修改過的\n"
-" ' ' 無修改\n"
-" 'A' 新增\n"
-" 'C' 衝突\n"
-" 'D' 刪除\n"
-" 'G' 合併\n"
-" 'I' 忽略\n"
-" 'M' 更動\n"
-" 'R' 取代\n"
-" 'X' 未納入版本控制, 但被外部定義所用\n"
-" '?' 該項目未納入版本控制\n"
-" '!' 該項目已遺失 (被非 svn 命令所刪除) 或是不完整\n"
-" '~' 版本控制下的項目被不同類型的所取代\n"
-" 第二欄: 顯示目錄或檔案的性質狀態\n"
-" ' ' 無修改\n"
-" 'C' 衝突\n"
-" 'M' 更動\n"
-" 第三欄: 只在工作複本目錄被鎖定時才會出現\n"
-" ' ' 未鎖定\n"
-" 'L' 鎖定\n"
-" 第四欄: 預定要連同歷史紀錄被新增\n"
-" ' ' 預定的送交並不包含歷史紀錄\n"
-" '+' 預定的送交包含歷史紀錄\n"
-" 第五欄: 該項目相對其父目錄是否已被切換\n"
-" ' ' 正常\n"
-" 'S' 被切換\n"
-" 第六欄: 檔案庫鎖定符記\n"
-" (沒有 -u)\n"
-" ' ' 無鎖定符記\n"
-" 'K' 有鎖定符記\n"
-" (有 -u)\n"
-" ' ' 檔案庫中未被鎖定, 無鎖定符記\n"
-" 'K' 檔案庫中被鎖定, 有鎖定符記\n"
-" 'O' 檔案庫中被鎖定, 別的工作複本有鎖定符記\n"
-" 'T' 檔案庫中被鎖定, 有鎖定符記但被偷走\n"
-" 'B' 檔案庫中未被鎖定, 有鎖定符記但損毀\n"
-"\n"
-" 是否過時的資訊, 出現的位置是第八欄 (與 -u 併用時):\n"
-" '*' 伺服器上有更新修訂版\n"
-" ' ' 工作複本是最新版的\n"
-"\n"
-" 剩餘的欄位皆為變動寬度, 並以空白隔開:\n"
-" 工作修訂版 (與 -u 或 -v 併用時)\n"
-" 最後送交的修訂版與最後送交的作者 (與 -v 併用時)\n"
-" 工作複本路徑一定是最後一欄, 所以它可以包含空白字元.\n"
-"\n"
-" 範例輸出:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
-
-#: ../svn/main.c:1090
-#, fuzzy
-msgid ""
-"Update the working copy to a different URL within the same repository.\n"
-"usage: 1. switch URL[@PEGREV] [PATH]\n"
-" 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
-"\n"
-" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behavior is similar to 'svn update', and is the way to\n"
-" move a working copy to a branch or tag within the same repository.\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-"\n"
-" If --force is used, unversioned obstructing paths in the working\n"
-" copy do not automatically cause a failure if the switch attempts to\n"
-" add the same path. If the obstructing path is the same type (file\n"
-" or directory) as the corresponding path in the repository it becomes\n"
-" versioned but its contents are left 'as-is' in the working copy.\n"
-" This means that an obstructing directory's unversioned children may\n"
-" also obstruct and become versioned. For files, any content differences\n"
-" between the obstruction and the repository are treated like a local\n"
-" modification to the working copy. All properties from the repository\n"
-" are applied to the obstructing path.\n"
-"\n"
-" Use the --set-depth option to set a new working copy depth on the\n"
-" targets of this operation.\n"
-"\n"
-" 2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
-" 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
-"\n"
-" See also 'svn help update' for a list of possible characters\n"
-" reporting the action taken.\n"
-"\n"
-" Examples:\n"
-" svn switch ^/branches/1.x-release\n"
-" svn switch --relocate http:// svn://\n"
-" svn switch --relocate http://www.example.com/repo/project \\\n"
-" svn://svn.example.com/repo/project\n"
-msgstr ""
-"更新工作複本至不同的 URL.\n"
-"用法: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. 更新你的工作複本, 映射到一個新的 URL. 這動作跟 'svn update' 很像, \n"
-" 也是將工作複本移至同一檔案庫中的某一分支或標記.\n"
-"\n"
-" 2. 改寫工作複本的 URL 描述資料, 以反映單純的語法更動. 當檔案庫的根\n"
-" URL 變動 (像是綱要或是主機名稱變動), 但是工作複本仍舊對映到同一\n"
-" 檔案庫的同一目錄時用之.\n"
-
-#: ../svn/main.c:1129
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
-"\n"
-" Use --force to break the lock.\n"
-msgstr ""
-"解除工作複本路徑或 URL 的鎖定.\n"
-"用法: unlock TARGET...\n"
-"\n"
-" 使用 --force 以打破該鎖定.\n"
-
-#: ../svn/main.c:1136
-#, fuzzy
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
-"\n"
-" If no revision is given, bring working copy up-to-date with HEAD rev.\n"
-" Else synchronize working copy to revision given by -r.\n"
-"\n"
-" For each updated item a line will be printed with characters reporting\n"
-" the action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-" E Existed\n"
-" R Replaced\n"
-"\n"
-" Characters in the first column report about the item itself.\n"
-" Characters in the second column report about properties of the item.\n"
-" A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
-" the first and second columns indicate textual conflicts in files\n"
-" and in property values, respectively.\n"
-"\n"
-" If --force is used, unversioned obstructing paths in the working\n"
-" copy do not automatically cause a failure if the update attempts to\n"
-" add the same path. If the obstructing path is the same type (file\n"
-" or directory) as the corresponding path in the repository it becomes\n"
-" versioned but its contents are left 'as-is' in the working copy.\n"
-" This means that an obstructing directory's unversioned children may\n"
-" also obstruct and become versioned. For files, any content differences\n"
-" between the obstruction and the repository are treated like a local\n"
-" modification to the working copy. All properties from the repository\n"
-" are applied to the obstructing path. Obstructing paths are reported\n"
-" in the first column with code 'E'.\n"
-"\n"
-" Use the --set-depth option to set a new working copy depth on the\n"
-" targets of this operation.\n"
-msgstr ""
-"將檔案庫的更動反應至工作複本.\n"
-"用法: update [PATH...]\n"
-"\n"
-" 如果沒有提供修訂版的話, 它會將你的工作複本更新至 HEAD 修訂版.\n"
-" 不然的話, 同步至 -r 選項所指定的修訂版.\n"
-"\n"
-" 對每一個更新的項目, 每一列開頭會以一個字元表示所採取的行為.\n"
-" 這些字元代表如下:\n"
-"\n"
-" A 新增\n"
-" D 刪除\n"
-" U 更新\n"
-" C 衝突\n"
-" G 合併\n"
-"\n"
-" 第一欄的字元表示實際檔案的更新, 而檔案性質顯示在第二欄.\n"
-" 第三欄的 'B' 表示該檔案的鎖定已經打破或被偷走.\n"
-
-#: ../svn/main.c:1177
-msgid ""
-"Upgrade the metadata storage format for a working copy.\n"
-"usage: upgrade WCPATH...\n"
-msgstr ""
-
-#: ../svn/main.c:1221 ../svnadmin/main.c:86 ../svnlook/main.c:354
-#: ../svnsync/main.c:263
-msgid "Caught signal"
-msgstr "捕捉到信號"
-
-#: ../svn/main.c:1340 ../svnlook/main.c:2321
-msgid "Non-numeric limit argument given"
-msgstr "使用了非數字的限制引數"
-
-#: ../svn/main.c:1346 ../svnlook/main.c:2327
-msgid "Argument to --limit must be positive"
-msgstr "--limit 的引數必須為正數"
-
-#: ../svn/main.c:1367 ../svn/main.c:1642
-msgid "Can't specify -c with --old"
-msgstr "--old 無法與 -c 一同使用"
-
-#: ../svn/main.c:1391
-#, c-format
-msgid "Negative number in range (%s) not supported with -c"
-msgstr ""
-
-#: ../svn/main.c:1404
-#, fuzzy, c-format
-msgid "Non-numeric change argument (%s) given to -c"
-msgstr "對 -c 使用了非數字的更動引數"
-
-#: ../svn/main.c:1412
-msgid "There is no change 0"
-msgstr "沒有更動 0"
-
-#: ../svn/main.c:1457 ../svnadmin/main.c:1651 ../svnsync/main.c:1947
-#, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "修訂版引數 '%s' 中有語法錯誤"
-
-#: ../svn/main.c:1530 ../svn/main.c:1549
-#, c-format
-msgid "Error converting depth from locale to UTF-8"
-msgstr ""
-
-#: ../svn/main.c:1538
-#, fuzzy, c-format
-msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
-msgstr "'%s' 不是有效的管理目錄名稱"
-
-#: ../svn/main.c:1557
-#, fuzzy, c-format
-msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'"
-msgstr "'%s' 不是有效的管理目錄名稱"
-
-#: ../svn/main.c:1687
-#, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生換列符號引數 '%s' 中有語法錯誤"
-
-#: ../svn/main.c:1742
-#, fuzzy, c-format
-msgid "'%s' is not a valid --accept value"
-msgstr "'%s' 不是一個有效的 EOL 值"
-
-#: ../svn/main.c:1751
-#, fuzzy, c-format
-msgid "'%s' is not a valid --show-revs value"
-msgstr "'%s' 不是一個有效的 EOL 值"
-
-#: ../svn/main.c:1764
-#, fuzzy, c-format
-msgid "Invalid strip count '%s'"
-msgstr "無效的複製來源路徑 '%s'"
-
-#: ../svn/main.c:1770
-#, fuzzy
-msgid "Argument to --strip must be positive"
-msgstr "--limit 的引數必須為正數"
-
-#: ../svn/main.c:1851 ../svndumpfilter/main.c:1395 ../svnlook/main.c:2399
-#: ../svnrdump/svnrdump.c:522
-#, c-format
-msgid "Subcommand argument required\n"
-msgstr "必須提供子命令引數\n"
-
-#: ../svn/main.c:1870 ../svnadmin/main.c:1787 ../svndumpfilter/main.c:1414
-#: ../svnlook/main.c:2418 ../svnrdump/svnrdump.c:541
-#, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知的命令: '%s'\n"
-
-#: ../svn/main.c:1904
-#, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
-msgstr ""
-"子命令 '%s' 不接受選項 '%s'\n"
-"請輸入 'svn help %s' 以取得用法.\n"
-
-#: ../svn/main.c:1919
-msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
-msgstr "遇到了多個修訂版引數; 不可指定兩個 -c, 或同時指定 -c 與 -r"
-
-#: ../svn/main.c:1931
-#, fuzzy
-msgid "--depth and --set-depth are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:1941
-#, fuzzy
-msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:1951
-#, fuzzy
-msgid "--with-revprop and --with-no-revprops are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:1960 ../svnsync/main.c:2019
-msgid "--trust-server-cert requires --non-interactive"
-msgstr ""
-
-#: ../svn/main.c:1970
-#, fuzzy
-msgid "--diff-cmd and --internal-diff are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:2030
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "紀錄訊息檔是一個版本控制中的檔案; 請使用 '--force-log' 以略過此限制"
-
-#: ../svn/main.c:2037
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "鎖定註解檔是一個版本控制中的檔案; 請使用 '--force-log' 以略過此限制"
-
-#: ../svn/main.c:2058
-msgid "The log message is a pathname (was -F intended?); use '--force-log' to override"
-msgstr "紀錄訊息是一個路徑名稱 (確定要用 -F?); 請使用 '--force-log' 以略過此限制"
-
-#: ../svn/main.c:2065
-msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override"
-msgstr "鎖定註解是一個路徑名稱 (確定要用 -F?); 請使用 '--force-log' 以略過此限制"
-
-#: ../svn/main.c:2079
-#, fuzzy
-msgid "--relocate and --depth are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:2087
-#, fuzzy
-msgid "--relocate and --non-recursive (-N) are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:2171
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-
-#: ../svn/main.c:2185
-msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
-msgstr ""
-
-#: ../svn/main.c:2193
-msgid "--reintegrate cannot be used with --ignore-ancestry"
-msgstr ""
-
-#: ../svn/main.c:2201
-msgid "--reintegrate cannot be used with --record-only"
-msgstr ""
-
-#: ../svn/main.c:2325 ../svn/main.c:2331
-#, c-format
-msgid "--accept=%s incompatible with --non-interactive"
-msgstr ""
-
-#: ../svn/main.c:2358
-#, fuzzy
-msgid "Try 'svn help' for more info"
-msgstr "請使用 '%s help' 以了解用法.\n"
-
-#: ../svn/main.c:2368
-msgid "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)\n"
-msgstr "svn: 請執行 'svn cleanup' 以移去鎖定 (輸入 'svn help cleanup' 以取得詳細說明)\n"
-
-#: ../svn/merge-cmd.c:65
-msgid "-r and -c can't be used with --reintegrate"
-msgstr ""
-
-#: ../svn/merge-cmd.c:120
-#, fuzzy
-msgid "Merge source required"
-msgstr "需要第二個修訂版"
-
-#: ../svn/merge-cmd.c:166
-msgid "Second revision required"
-msgstr "需要第二個修訂版"
-
-#: ../svn/merge-cmd.c:175 ../svn/merge-cmd.c:208 ../svn/mergeinfo-cmd.c:84
-msgid "Too many arguments given"
-msgstr "指定過多引數"
-
-#: ../svn/merge-cmd.c:197
-#, fuzzy
-msgid "Cannot specify a revision range with two URLs"
-msgstr "移動動作不可指定修訂版 (HEAD 除外)"
-
-#: ../svn/merge-cmd.c:224
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作複本的合併來源需特別指定修訂版"
-
-#: ../svn/merge-cmd.c:284
-msgid "--depth cannot be used with --reintegrate"
-msgstr ""
-
-#: ../svn/merge-cmd.c:289
-msgid "--force cannot be used with --reintegrate"
-msgstr ""
-
-#: ../svn/merge-cmd.c:294
-msgid "--reintegrate can only be used with a single merge source"
-msgstr ""
-
-#: ../svn/merge-cmd.c:298
-msgid "--allow-mixed-revisions cannot be used with --reintegrate"
-msgstr ""
-
-#: ../svn/mergeinfo-cmd.c:81
-#, fuzzy
-msgid "Not enough arguments given"
-msgstr "未提供足夠的引數"
-
-#: ../svn/mkdir-cmd.c:89
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "請改試 'svn add' 或 'svn add --non-recursive'?"
-
-#: ../svn/mkdir-cmd.c:95
-#, fuzzy
-msgid "Try 'svn mkdir --parents' instead?"
-msgstr "請改試 'svn revert --recursive'?"
-
-#: ../svn/notify.c:82 ../svn/status-cmd.c:87
-msgid "Summary of conflicts:\n"
-msgstr ""
-
-#: ../svn/notify.c:86 ../svn/status-cmd.c:91
-#, c-format
-msgid " Text conflicts: %u\n"
-msgstr ""
-
-#: ../svn/notify.c:90 ../svn/status-cmd.c:95
-#, fuzzy, c-format
-msgid " Property conflicts: %u\n"
-msgstr "找不到性質"
-
-#: ../svn/notify.c:94 ../svn/status-cmd.c:99
-#, c-format
-msgid " Tree conflicts: %u\n"
-msgstr ""
-
-#: ../svn/notify.c:98
-#, fuzzy, c-format
-msgid " Skipped paths: %u\n"
-msgstr "略過 '%s'\n"
-
-#: ../svn/notify.c:134
-#, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "略過找不到的目標: '%s'\n"
-
-#: ../svn/notify.c:141
-#, c-format
-msgid "Skipped target: '%s' -- copy-source is missing\n"
-msgstr ""
-
-#: ../svn/notify.c:148
-#, c-format
-msgid "Skipped '%s'\n"
-msgstr "略過 '%s'\n"
-
-#: ../svn/notify.c:211
-#, c-format
-msgid "Restored '%s'\n"
-msgstr "已還原 '%s'\n"
-
-#: ../svn/notify.c:217
-#, c-format
-msgid "Reverted '%s'\n"
-msgstr "已復原 '%s'\n"
-
-#: ../svn/notify.c:223
-#, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "無法復原 '%s' -- 請改用更新試試.\n"
-
-#: ../svn/notify.c:231
-#, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "'%s' 的衝突狀態已解決\n"
-
-#: ../svn/notify.c:320 ../svn/notify.c:360
-#, c-format
-msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
-msgstr ""
-
-#: ../svn/notify.c:337 ../svn/notify.c:374
-#, c-format
-msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
-msgstr ""
-
-#: ../svn/notify.c:395
-#, c-format
-msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %d (%s)\n"
-msgstr ""
-
-#: ../svn/notify.c:405
-#, c-format
-msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %d\n"
-msgstr ""
-
-#: ../svn/notify.c:423
-#, c-format
-msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
-msgstr ""
-
-#: ../svn/notify.c:432
-#, c-format
-msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
-msgstr ""
-
-#: ../svn/notify.c:446
-#, c-format
-msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
-msgstr ""
-
-#: ../svn/notify.c:456
-#, c-format
-msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
-msgstr ""
-
-#: ../svn/notify.c:516
-#, c-format
-msgid ""
-"\n"
-"Fetching external item into '%s'\n"
-msgstr ""
-"\n"
-"正在取得外部項目至 '%s'\n"
-
-#: ../svn/notify.c:542
-#, fuzzy, c-format
-msgid "Error handling externals definition for '%s':"
-msgstr "驗證 '%s' 的伺服器憑證時發生錯誤:\n"
-
-#: ../svn/notify.c:560
-#, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "匯出修訂版 %ld 的外部定義.\n"
-
-#: ../svn/notify.c:561
-#, c-format
-msgid "Exported revision %ld.\n"
-msgstr "匯出修訂版 %ld.\n"
-
-#: ../svn/notify.c:569
-#, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "取出修訂版 %ld 的外部定義.\n"
-
-#: ../svn/notify.c:570
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "取出修訂版 %ld.\n"
-
-#: ../svn/notify.c:580
-#, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部定義至修訂版 %ld.\n"
-
-#: ../svn/notify.c:581
-#, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新至修訂版 %ld.\n"
-
-#: ../svn/notify.c:589
-#, c-format
-msgid "External at revision %ld.\n"
-msgstr "於修訂版 %ld 的外部定義.\n"
-
-#: ../svn/notify.c:590
-#, c-format
-msgid "At revision %ld.\n"
-msgstr "於修訂版 %ld.\n"
-
-#: ../svn/notify.c:602
-#, c-format
-msgid "External export complete.\n"
-msgstr "外部定義匯出完成.\n"
-
-#: ../svn/notify.c:603
-#, c-format
-msgid "Export complete.\n"
-msgstr "匯出完成.\n"
-
-#: ../svn/notify.c:610
-#, c-format
-msgid "External checkout complete.\n"
-msgstr "外部定義取出完成.\n"
-
-#: ../svn/notify.c:611
-#, c-format
-msgid "Checkout complete.\n"
-msgstr "取出完成.\n"
-
-#: ../svn/notify.c:618
-#, c-format
-msgid "External update complete.\n"
-msgstr "外部定義更新完成.\n"
-
-#: ../svn/notify.c:619
-#, c-format
-msgid "Update complete.\n"
-msgstr "更新完成.\n"
-
-#: ../svn/notify.c:636
-#, c-format
-msgid ""
-"\n"
-"Performing status on external item at '%s'\n"
-msgstr ""
-"\n"
-"對外部項目 '%s' 進行狀態檢查\n"
-
-#: ../svn/notify.c:644
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "狀態於修訂版: %6ld\n"
-
-#: ../svn/notify.c:652
-#, c-format
-msgid "Sending %s\n"
-msgstr "傳送 %s\n"
-
-#: ../svn/notify.c:661
-#, c-format
-msgid "Adding (bin) %s\n"
-msgstr "新增 (二進制) %s\n"
-
-#: ../svn/notify.c:668
-#, c-format
-msgid "Adding %s\n"
-msgstr "新增 %s\n"
-
-#: ../svn/notify.c:675
-#, c-format
-msgid "Deleting %s\n"
-msgstr "刪除 %s\n"
-
-#: ../svn/notify.c:682
-#, c-format
-msgid "Replacing %s\n"
-msgstr "取代 %s\n"
-
-#: ../svn/notify.c:692 ../svnsync/sync.c:320
-#, c-format
-msgid "Transmitting file data "
-msgstr "傳送檔案資料"
-
-#: ../svn/notify.c:701
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "'%s' 被使用者 '%s' 鎖定.\n"
-
-#: ../svn/notify.c:707
-#, c-format
-msgid "'%s' unlocked.\n"
-msgstr "'%s' 解除鎖定.\n"
-
-#: ../svn/notify.c:734
-#, c-format
-msgid "--- Merging differences between repository URLs into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:739
-#, c-format
-msgid "--- Merging r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:743
-#, c-format
-msgid "--- Reverse-merging r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:747
-#, c-format
-msgid "--- Merging r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:753
-#, c-format
-msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:765
-#, c-format
-msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:775
-#, c-format
-msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:780
-#, c-format
-msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:785
-#, c-format
-msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:790
-#, c-format
-msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:800
-#, c-format
-msgid "--- Eliding mergeinfo from '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:808
-#, c-format
-msgid "--- Merging differences between foreign repository URLs into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:814
-#, c-format
-msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:819
-#, c-format
-msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:824
-#, c-format
-msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:830
-#, c-format
-msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
-msgstr ""
-
-#: ../svn/notify.c:848
-#, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "性質 '%s' 設定於 '%s'\n"
-
-#: ../svn/notify.c:856
-#, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "性質 '%s' 自 '%s' 刪除.\n"
-
-#: ../svn/notify.c:864
-#, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "設定性質 '%s' 於檔案庫修訂版 %ld\n"
-
-#: ../svn/notify.c:872
-#, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "性質 '%s' 自檔案庫修訂版 %ld 中刪除\n"
-
-#: ../svn/notify.c:879
-#, fuzzy, c-format
-msgid "Upgraded '%s'.\n"
-msgstr "略過 '%s'\n"
-
-#: ../svn/notify.c:885
-#, fuzzy, c-format
-msgid "Redirecting to URL '%s'\n"
-msgstr "讀取 '%s' 中"
-
-#: ../svn/obliterate-cmd.c:60
-#, c-format
-msgid "Obliterate %8ld %s\n"
-msgstr ""
-
-#: ../svn/obliterate-cmd.c:111
-#, fuzzy
-msgid "Wrong number of arguments"
-msgstr "指定了錯誤數目的目標"
-
-#: ../svn/obliterate-cmd.c:116
-#, fuzzy
-msgid "Target must specify the revision as a number"
-msgstr "指定修訂版編號 ARG"
-
-#: ../svn/obliterate-cmd.c:119
-msgid "Target must specify a URL"
-msgstr ""
-
-#: ../svn/propdel-cmd.c:117
-#, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "刪除納入版本控制的性質 '%s' 時不可指定修訂版"
-
-#: ../svn/propdel-cmd.c:152
-#, fuzzy, c-format
-msgid "Attempting to delete nonexistent property '%s'"
-msgstr "企圖開啟一個不存在的子節點 '%s'"
-
-#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:315
-#, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "性質 '%s' 於 '%s' 設為新值\n"
-
-#: ../svn/propedit-cmd.c:92 ../svn/propset-cmd.c:93
-msgid "--encoding option applies only to textual Subversion-controlled properties"
-msgstr ""
-
-#: ../svn/propedit-cmd.c:158
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "性質 '%s' 於修訂版 %ld 設為新值\n"
-
-#: ../svn/propedit-cmd.c:164
-#, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "性質 '%s' 於修訂版 %ld 沒有更動\n"
-
-#: ../svn/propedit-cmd.c:172
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "編輯納入版本控制的性質 '%s' 時不可指定修訂版"
-
-#: ../svn/propedit-cmd.c:200 ../svn/propset-cmd.c:170
-msgid "Explicit target argument required"
-msgstr "必須明確地提供目標"
-
-#: ../svn/propedit-cmd.c:264
-#, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "'%s' 不像是工作複本路徑"
-
-#: ../svn/propedit-cmd.c:322
-#, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "性質 '%s' 於 '%s' 沒有更動\n"
-
-#: ../svn/propget-cmd.c:140 ../svn/proplist-cmd.c:100
-#, c-format
-msgid "Properties on '%s':\n"
-msgstr "'%s' 的性質:\n"
-
-#: ../svn/propget-cmd.c:197
-msgid "--verbose cannot be used with --revprop or --strict or --xml"
-msgstr ""
-
-#: ../svn/propget-cmd.c:290
-msgid "Strict output of property values only available for single-target, non-recursive propget operations"
-msgstr ""
-
-#: ../svn/proplist-cmd.c:158
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修訂版 %ld 上的未納入版本控制的性質:\n"
-
-#: ../svn/props.c:62
-msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a revision property"
-msgstr "在操作修訂版性質時, 必須以數字, 日期或是 'HEAD' 來指定修訂版"
-
-#: ../svn/props.c:69
-msgid "Wrong number of targets specified"
-msgstr "指定了錯誤數目的目標"
-
-#: ../svn/props.c:78
-msgid "Either a URL or versioned item is required"
-msgstr "必須提供 URL 或納入版本控制的項目"
-
-#: ../svn/props.c:208
-#, c-format
-msgid ""
-"To turn off the %s property, use 'svn propdel';\n"
-"setting the property to '%s' will not turn it off."
-msgstr ""
-
-#: ../svn/propset-cmd.c:127
-#, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "無法指定修訂版以設定版本控制下的性質 '%s'"
-
-#: ../svn/propset-cmd.c:163
-#, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必須明確地提供目的 ('%s' 解釋為性質內容)"
-
-#: ../svn/resolve-cmd.c:80
-msgid "missing --accept option"
-msgstr ""
-
-#: ../svn/resolve-cmd.c:83
-msgid "invalid 'accept' ARG"
-msgstr ""
-
-#: ../svn/revert-cmd.c:88
-#, fuzzy
-msgid "Try 'svn revert --depth infinity' instead?"
-msgstr "請改試 'svn revert --recursive'?"
-
-#: ../svn/status-cmd.c:364
-#, c-format
-msgid ""
-"\n"
-"--- Changelist '%s':\n"
-msgstr ""
-
-#: ../svn/status.c:372
-#, c-format
-msgid "'%s' has lock token, but no lock owner"
-msgstr "'%s' 的鎖定被拿走了, 但是沒有鎖定擁有者"
-
-#: ../svn/switch-cmd.c:63
-#, c-format
-msgid "'%s' to '%s' is not a valid relocation"
-msgstr "'%s' 至 '%s' 不是有效的重新安置"
-
-#: ../svn/tree-conflicts.c:38 ../svn/tree-conflicts.c:58
-msgid "edit"
-msgstr ""
-
-#: ../svn/tree-conflicts.c:39 ../svn/tree-conflicts.c:59
-#, fuzzy
-msgid "delete"
-msgstr "已刪除"
-
-#: ../svn/tree-conflicts.c:40 ../svn/tree-conflicts.c:62
-msgid "add"
-msgstr ""
-
-#: ../svn/tree-conflicts.c:41 ../svn/tree-conflicts.c:63
-msgid "replace"
-msgstr ""
-
-#: ../svn/tree-conflicts.c:60
-msgid "missing"
-msgstr ""
-
-#: ../svn/tree-conflicts.c:61
-#, fuzzy
-msgid "obstruction"
-msgstr "無此異動"
-
-#: ../svn/tree-conflicts.c:64
-msgid "unversioned"
-msgstr ""
-
-#: ../svn/tree-conflicts.c:107
-#, c-format
-msgid "local %s, incoming %s upon %s"
-msgstr ""
-
-#: ../svn/util.c:74
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Committed revision %ld%s.\n"
-msgstr ""
-"\n"
-"送交修訂版 %ld.\n"
-
-#: ../svn/util.c:78
-msgid " (the answer to life, the universe, and everything)"
-msgstr ""
-
-#: ../svn/util.c:87
-#, c-format
-msgid ""
-"\n"
-"Warning: %s\n"
-msgstr ""
-"\n"
-"警告: %s\n"
-
-#: ../svn/util.c:147
-msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command."
-msgstr ""
-
-#: ../svn/util.c:154
-#, fuzzy
-msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found"
-msgstr "沒有一個 SVN_EDITOR, VISUAL 或 EDITOR 環境變數被設定, 執行時期的設定中也沒有 'editor-cmd' 選項"
-
-#: ../svn/util.c:182 ../svn/util.c:343
-#, c-format
-msgid "Can't get working directory"
-msgstr "無法取得工作目錄"
-
-#: ../svn/util.c:193 ../svn/util.c:354 ../svn/util.c:379
-#, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "無法更改工作複本至 '%s'"
-
-#: ../svn/util.c:201 ../svn/util.c:523
-#, c-format
-msgid "Can't restore working directory"
-msgstr "無法還原工作目錄"
-
-#: ../svn/util.c:208 ../svn/util.c:451
-#, c-format
-msgid "system('%s') returned %d"
-msgstr "system('%s') 傳回 %d"
-
-#: ../svn/util.c:248
-msgid "The SVN_MERGE environment variable is empty or consists solely of whitespace. Expected a shell command.\n"
-msgstr ""
-
-#: ../svn/util.c:254
-#, fuzzy
-msgid "The environment variable SVN_MERGE and the merge-tool-cmd run-time configuration option were not set.\n"
-msgstr "沒有一個 SVN_EDITOR, VISUAL 或 EDITOR 環境變數被設定, 執行時期的設定中也沒有 'editor-cmd' 選項"
-
-#: ../svn/util.c:284
-#, c-format
-msgid "The external merge tool exited with exit code %d"
-msgstr ""
-
-#: ../svn/util.c:406
-#, c-format
-msgid "Can't write to '%s'"
-msgstr "無法寫入至 '%s'"
-
-#: ../svn/util.c:492
-msgid "Error normalizing edited contents to internal format"
-msgstr ""
-
-#: ../svn/util.c:565
-msgid "Log message contains a zero byte"
-msgstr "紀錄訊息中有一個零位元組"
-
-#: ../svn/util.c:628
-msgid "Your commit message was left in a temporary file:"
-msgstr "你的送交訊息遺留在暫存檔中:"
-
-# as-is
-#: ../svn/util.c:680
-msgid "--This line, and those below, will be ignored--"
-msgstr "--This line, and those below, will be ignored--"
-
-#: ../svn/util.c:714
-msgid "Error normalizing log message to internal format"
-msgstr ""
-
-#: ../svn/util.c:801
-msgid "Cannot invoke editor to get log message when non-interactive"
-msgstr "非互動操作, 無法叫用文字編輯器來取得送交訊息"
-
-#: ../svn/util.c:814
-msgid "Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options"
-msgstr "無法使用外部編輯器取得紀錄訊息; 請試著設定 $SVN_EDITOR 環境變數, 或是使用--message (-m) 或 --file (-F) 選項"
-
-#: ../svn/util.c:850
-#, fuzzy
-msgid ""
-"\n"
-"Log message unchanged or not specified\n"
-"(a)bort, (c)ontinue, (e)dit:\n"
-msgstr ""
-"\n"
-"紀錄訊息未更動, 或是未指定\n"
-"a)中斷, c)繼續, e)編輯\n"
-
-#: ../svn/util.c:903
-#, fuzzy
-msgid "Use --force to override this restriction (local modifications may be lost)"
-msgstr "請用 --force 來撤銷限制"
-
-#: ../svn/util.c:1050 ../svn/util.c:1083
-msgid "none"
-msgstr ""
-
-#: ../svn/util.c:1051
-msgid "file"
-msgstr ""
-
-#: ../svn/util.c:1052
-msgid "dir"
-msgstr ""
-
-#: ../svn/util.c:1084
-#, fuzzy
-msgid "update"
-msgstr "有問題的日期"
-
-#: ../svn/util.c:1085
-#, fuzzy
-msgid "switch"
-msgstr "無效的切換"
-
-#: ../svn/util.c:1086
-msgid "merge"
-msgstr ""
-
-# as-is
-#: ../svn/util.c:1204
-#, fuzzy
-msgid "(invalid date)"
-msgstr "(no date)"
-
-#: ../svnadmin/main.c:103 ../svndumpfilter/main.c:72
-#, c-format
-msgid "Can't open stdio file"
-msgstr "無法啟動標準輸出入檔案"
-
-#: ../svnadmin/main.c:132
-msgid "Repository argument required"
-msgstr "需有檔案庫引數"
-
-#: ../svnadmin/main.c:137
-#, c-format
-msgid "'%s' is an URL when it should be a path"
-msgstr "'%s' 是 URL, 但是應該是路徑"
-
-#: ../svnadmin/main.c:253 ../svnrdump/svnrdump.c:77
-msgid "specify revision number ARG (or X:Y range)"
-msgstr "指定修訂版編號 ARG (或 X:Y 範圍)"
-
-#: ../svnadmin/main.c:256
-msgid "dump incrementally"
-msgstr "以差異增量進行傾印"
-
-#: ../svnadmin/main.c:259
-msgid "use deltas in dump output"
-msgstr "於傾印檔輸出中使用檔案差異"
-
-#: ../svnadmin/main.c:262
-msgid "bypass the repository hook system"
-msgstr "略過檔案庫掛勾系統"
-
-#: ../svnadmin/main.c:265 ../svnrdump/svnrdump.c:78
-msgid "no progress (only errors) to stderr"
-msgstr "不顯示進度 (僅錯誤) 至標準錯誤輸出"
-
-#: ../svnadmin/main.c:268
-msgid "ignore any repos UUID found in the stream"
-msgstr "忽略所有串流中的檔案庫 UUID"
-
-#: ../svnadmin/main.c:271
-msgid "set repos UUID to that found in stream, if any"
-msgstr "如果有的話, 以串流中的數值來設定檔案庫的 UUID"
-
-#: ../svnadmin/main.c:274
-msgid "type of repository: 'fsfs' (default) or 'bdb'"
-msgstr "檔案庫類型: 'fsfs' (預設) 或 'bdb'"
-
-#: ../svnadmin/main.c:277
-msgid "load at specified directory in repository"
-msgstr "於檔案庫指定的目錄進行載入"
-
-#: ../svnadmin/main.c:280
-msgid "disable fsync at transaction commit [Berkeley DB]"
-msgstr "關閉異動送交的 fsync [Berkeley DB]"
-
-#: ../svnadmin/main.c:283
-msgid "disable automatic log file removal [Berkeley DB]"
-msgstr "關閉紀錄檔自動移除 [Berkeley DB]"
-
-#: ../svnadmin/main.c:289
-msgid ""
-"remove redundant Berkeley DB log files\n"
-" from source repository [Berkeley DB]"
-msgstr ""
-"自來源檔案庫\n"
-" 移除多餘的紀錄檔 [Berkeley DB]"
-
-#: ../svnadmin/main.c:293
-msgid "call pre-commit hook before committing revisions"
-msgstr "送交修訂版前叫用 pre-commit 掛勾"
-
-#: ../svnadmin/main.c:296
-msgid "call post-commit hook after committing revisions"
-msgstr "送交修訂版後叫用 post-commit 掛勾"
-
-#: ../svnadmin/main.c:299
-#, fuzzy
-msgid "call hook before changing revision property"
-msgstr "送交修訂版前叫用 pre-commit 掛勾"
-
-#: ../svnadmin/main.c:302
-#, fuzzy
-msgid "call hook after changing revision property"
-msgstr "送交修訂版後叫用 post-commit 掛勾"
-
-# XXX: This doesn't look right. Wait for a while.
-#: ../svnadmin/main.c:305
-msgid ""
-"wait instead of exit if the repository is in\n"
-" use by another process"
-msgstr "如果檔案庫被其它行程所用, 等待而不逕自結束"
-
-#: ../svnadmin/main.c:309
-msgid ""
-"use format compatible with Subversion versions\n"
-" earlier than 1.4"
-msgstr ""
-
-#: ../svnadmin/main.c:313
-msgid ""
-"use format compatible with Subversion versions\n"
-" earlier than 1.5"
-msgstr ""
-
-#: ../svnadmin/main.c:317
-msgid ""
-"use format compatible with Subversion versions\n"
-" earlier than 1.6"
-msgstr ""
-
-#: ../svnadmin/main.c:321
-msgid ""
-"use format compatible with Subversion versions\n"
-" earlier than 1.7"
-msgstr ""
-
-#: ../svnadmin/main.c:334
-msgid ""
-"usage: svnadmin crashtest REPOS_PATH\n"
-"\n"
-"Open the repository at REPOS_PATH, then abort, thus simulating\n"
-"a process that crashes while holding an open repository handle.\n"
-msgstr ""
-"用法: svnadmin crashtest REPOS_PATH\n"
-"\n"
-"開啟位於 REPOS_PATH 的檔案庫, 然後中止, 用以模擬\n"
-"行程在取得開啟的檔案庫代號後當掉的狀況.\n"
-
-#: ../svnadmin/main.c:340
-msgid ""
-"usage: svnadmin create REPOS_PATH\n"
-"\n"
-"Create a new, empty repository at REPOS_PATH.\n"
-msgstr ""
-"用法: svnadmin create REPOS_PATH\n"
-"\n"
-"於 REPOS_PATH 建立一個新的, 空的 Subversion 檔案庫.\n"
-
-#: ../svnadmin/main.c:348
-msgid ""
-"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
-"\n"
-"Run over the requested revision range, performing predecessor delti-\n"
-"fication on the paths changed in those revisions. Deltification in\n"
-"essence compresses the repository by only storing the differences or\n"
-"delta from the preceding revision. If no revisions are specified,\n"
-"this will simply deltify the HEAD revision.\n"
-msgstr ""
-"用法: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
-"\n"
-"在指定的修訂版範圍中, 對其中變動的路徑作 deltification. 藉由僅儲存\n"
-"與前一修訂版的差異, deltification 本質上可壓縮檔案庫. 如果沒有指定\n"
-"修訂版的話, 則直接對 HEAD 修訂版進行.\n"
-
-#: ../svnadmin/main.c:357
-#, fuzzy
-msgid ""
-"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
-"\n"
-"Dump the contents of filesystem to stdout in a 'dumpfile'\n"
-"portable format, sending feedback to stderr. Dump revisions\n"
-"LOWER rev through UPPER rev. If no revisions are given, dump all\n"
-"revision trees. If only LOWER is given, dump that one revision tree.\n"
-"If --incremental is passed, the first revision dumped will describe\n"
-"only the paths changed in that revision; otherwise it will describe\n"
-"every path present in the repository as of that revision. (In either\n"
-"case, the second and subsequent revisions, if any, describe only paths\n"
-"changed in those revisions.)\n"
-msgstr ""
-"用法: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
-"\n"
-"將檔案系統的內容, 以一種可攜式 '傾印檔' 格式輸出到標準輸出, 並將訊息\n"
-"回報輸出到標準錯誤. 將 LOWER 與 UPPER 之間修訂版內容傾印出來. 如果沒\n"
-"有指定修訂版的話, 傾印所有的修訂版樹. 如果只有指定 LOWER 的話, 只傾印\n"
-"一個修訂版樹. 如果使用了 --incremental 選項, 那麼第一個傾印的修訂版會\n"
-"是與前一個修訂版的差異, 而非平常的全文輸出.\n"
-
-#: ../svnadmin/main.c:370
-msgid ""
-"usage: svnadmin help [SUBCOMMAND...]\n"
-"\n"
-"Describe the usage of this program or its subcommands.\n"
-msgstr ""
-"用法: svnadmin help [SUBCOMMAND...]\n"
-"\n"
-"顯示本程式或其子命令的用法.\n"
-
-#: ../svnadmin/main.c:375
-msgid ""
-"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
-"\n"
-"Makes a hot copy of a repository.\n"
-msgstr ""
-"用法: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
-"\n"
-"產生檔案庫的即時複本.\n"
-
-#: ../svnadmin/main.c:380
-msgid ""
-"usage: svnadmin list-dblogs REPOS_PATH\n"
-"\n"
-"List all Berkeley DB log files.\n"
-"\n"
-"WARNING: Modifying or deleting logfiles which are still in use\n"
-"will cause your repository to be corrupted.\n"
-msgstr ""
-"用法: svnadmin list-dblogs REPOS_PATH\n"
-"\n"
-"列出所有的 Berkeley DB 紀錄檔.\n"
-"\n"
-"警告: 修改或刪除仍在使用中的記錄檔將導致檔案庫損毀.\n"
-
-#: ../svnadmin/main.c:387
-msgid ""
-"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
-"\n"
-"List unused Berkeley DB log files.\n"
-"\n"
-msgstr ""
-"用法: svnadmin list-unused-dblogs REPOS_PATH\n"
-"\n"
-"列出無用的 Berkeley DB 紀錄檔.\n"
-"\n"
-
-#: ../svnadmin/main.c:392
-msgid ""
-"usage: svnadmin load REPOS_PATH\n"
-"\n"
-"Read a 'dumpfile'-formatted stream from stdin, committing\n"
-"new revisions into the repository's filesystem. If the repository\n"
-"was previously empty, its UUID will, by default, be changed to the\n"
-"one specified in the stream. Progress feedback is sent to stdout.\n"
-msgstr ""
-"用法: svnadmin load REPOS_PATH\n"
-"\n"
-"從標準輸入讀取 '傾印檔' 格式的串流, 將新的修訂版送交至檔案庫的檔案\n"
-"系統中. 如果檔案庫原先是空的, 預設會將其 UUID 以串流中的數值代之. \n"
-"進度回報會送至標準輸出.\n"
-
-#: ../svnadmin/main.c:402
-msgid ""
-"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
-"\n"
-"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n"
-"if not provided, is the root of the repository).\n"
-msgstr ""
-
-#: ../svnadmin/main.c:408
-msgid ""
-"usage: svnadmin lstxns REPOS_PATH\n"
-"\n"
-"Print the names of all uncommitted transactions.\n"
-msgstr ""
-"用法: svnadmin lstxns REPOS_PATH\n"
-"\n"
-"顯示所有未處理異動的名稱.\n"
-
-#: ../svnadmin/main.c:413
-msgid ""
-"usage: svnadmin pack REPOS_PATH\n"
-"\n"
-"Possibly compact the repository into a more efficient storage model.\n"
-"This may not apply to all repositories, in which case, exit.\n"
-msgstr ""
-
-#: ../svnadmin/main.c:419
-#, fuzzy
-msgid ""
-"usage: svnadmin recover REPOS_PATH\n"
-"\n"
-"Run the recovery procedure on a repository. Do this if you've\n"
-"been getting errors indicating that recovery ought to be run.\n"
-"Berkeley DB recovery requires exclusive access and will\n"
-"exit if the repository is in use by another process.\n"
-msgstr ""
-"用法: svnadmin recover REPOS_PATH\n"
-"\n"
-"對檔案庫進行 Berkeley DB 修復程序. 如果你遇到要求進行修復的\n"
-"錯誤訊息, 請執行本命令. 修復需要獨佔的存取權, 如果檔案庫被其\n"
-"它行程所佔用, 它會馬上結束\n"
-
-#: ../svnadmin/main.c:427
-msgid ""
-"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
-"\n"
-"Unconditionally remove lock from each LOCKED_PATH.\n"
-msgstr ""
-"用法: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
-"\n"
-"無條件自每個 LOCKED_PATH 移去鎖定.\n"
-
-#: ../svnadmin/main.c:432
-msgid ""
-"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
-"\n"
-"Delete the named transaction(s).\n"
-msgstr ""
-"用法: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
-"\n"
-"自檔案庫刪除具名異動.\n"
-
-#: ../svnadmin/main.c:437
-#, fuzzy
-msgid ""
-"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
-"\n"
-"Set the log-message on revision REVISION to the contents of FILE. Use\n"
-"--bypass-hooks to avoid triggering the revision-property-related hooks\n"
-"(for example, if you do not want an email notification sent\n"
-"from your post-revprop-change hook, or because the modification of\n"
-"revision properties has not been enabled in the pre-revprop-change\n"
-"hook).\n"
-"\n"
-"NOTE: Revision properties are not versioned, so this command will\n"
-"overwrite the previous log message.\n"
-msgstr ""
-"用法: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
-"\n"
-"將修訂版 REVISION 的紀錄訊息設定為 FILE 的內容. 使用 --bypass-hooks\n"
-"以迴避修訂版性質相關的掛勾 (舉個例子, 像是你不想要 post-revprop-change\n"
-"掛勾寄出通知郵件, 或是修訂版性質修改並未在 pre-revprop-change 掛勾中\n"
-"啟動).\n"
-"\n"
-"注意: 修訂版性質並未納入版本控管, 所以這個命令會永遠蓋寫掉先前的\n"
-"紀錄訊息.\n"
-
-#: ../svnadmin/main.c:449
-#, fuzzy
-msgid ""
-"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
-"\n"
-"Set the property NAME on revision REVISION to the contents of FILE. Use\n"
-"--use-pre-revprop-change-hook/--use-post-revprop-change-hook to trigger\n"
-"the revision property-related hooks (for example, if you want an email\n"
-"notification sent from your post-revprop-change hook).\n"
-"\n"
-"NOTE: Revision properties are not versioned, so this command will\n"
-"overwrite the previous value of the property.\n"
-msgstr ""
-"用法: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
-"\n"
-"將修訂版 REVISION 的紀錄訊息設定為 FILE 的內容. 使用 --bypass-hooks\n"
-"以迴避修訂版性質相關的掛勾 (舉個例子, 像是你不想要 post-revprop-change\n"
-"掛勾寄出通知郵件, 或是修訂版性質修改並未在 pre-revprop-change 掛勾中\n"
-"啟動).\n"
-"\n"
-"注意: 修訂版性質並未納入版本控管, 所以這個命令會永遠蓋寫掉先前的\n"
-"紀錄訊息.\n"
-
-#: ../svnadmin/main.c:460
-msgid ""
-"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
-"\n"
-"Reset the repository UUID for the repository located at REPOS_PATH. If\n"
-"NEW_UUID is provided, use that as the new repository UUID; otherwise,\n"
-"generate a brand new UUID for the repository.\n"
-msgstr ""
-
-#: ../svnadmin/main.c:467
-msgid ""
-"usage: svnadmin upgrade REPOS_PATH\n"
-"\n"
-"Upgrade the repository located at REPOS_PATH to the latest supported\n"
-"schema version.\n"
-"\n"
-"This functionality is provided as a convenience for repository\n"
-"administrators who wish to make use of new Subversion functionality\n"
-"without having to undertake a potentially costly full repository dump\n"
-"and load operation. As such, the upgrade performs only the minimum\n"
-"amount of work needed to accomplish this while still maintaining the\n"
-"integrity of the repository. It does not guarantee the most optimized\n"
-"repository state as a dump and subsequent load would.\n"
-msgstr ""
-
-#: ../svnadmin/main.c:480
-msgid ""
-"usage: svnadmin verify REPOS_PATH\n"
-"\n"
-"Verifies the data stored in the repository.\n"
-msgstr ""
-"用法: svnadmin verify REPOS_PATH\n"
-"\n"
-"校驗儲存於檔案庫的資料.\n"
-
-#: ../svnadmin/main.c:539
-msgid "Invalid revision specifier"
-msgstr "提供了無效的版本號碼"
-
-#: ../svnadmin/main.c:543
-#, c-format
-msgid "Revisions must not be greater than the youngest revision (%ld)"
-msgstr "修訂版不可大於最年輕的修訂版號 (%ld)"
-
-#: ../svnadmin/main.c:630 ../svnadmin/main.c:885
-msgid "First revision cannot be higher than second"
-msgstr "第一個修訂版不可高於第二個"
-
-#: ../svnadmin/main.c:639
-#, c-format
-msgid "Deltifying revision %ld..."
-msgstr "正在 deltify 修訂版 %ld..."
-
-#: ../svnadmin/main.c:643 ../svnadmin/main.c:694 ../svnadmin/main.c:710
-#, c-format
-msgid "done.\n"
-msgstr "完成.\n"
-
-#: ../svnadmin/main.c:687
-#, c-format
-msgid "Packing revisions in shard %s..."
-msgstr ""
-
-#: ../svnadmin/main.c:703
-#, c-format
-msgid "Packing revprops in shard %s..."
-msgstr ""
-
-#: ../svnadmin/main.c:792
-#, c-format
-msgid ""
-"Repository lock acquired.\n"
-"Please wait; recovering the repository may take some time...\n"
-msgstr ""
-"已取得檔案庫鎖定.\n"
-"請稍待; 修復檔案庫也許得花費一些時間...\n"
-
-#: ../svnadmin/main.c:799
-#, fuzzy, c-format
-msgid ""
-"Repository lock acquired.\n"
-"Please wait; upgrading the repository may take some time...\n"
-msgstr ""
-"已取得檔案庫鎖定.\n"
-"請稍待; 修復檔案庫也許得花費一些時間...\n"
-
-#: ../svnadmin/main.c:908
-#, fuzzy
-msgid ""
-"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
-"Type 'svnadmin --version' to see the program version and FS modules.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"一般用法: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"請使用 'svnadmin help <subcommand>' 以取得特定子命令的求助資訊.\n"
-"\n"
-"可用的子命令:\n"
-
-#: ../svnadmin/main.c:915 ../svnlook/main.c:1993 ../svnserve/main.c:266
-msgid ""
-"The following repository back-end (FS) modules are available:\n"
-"\n"
-msgstr ""
-"可使用以下的檔案庫後端 (FS) 模組:\n"
-"\n"
-
-#: ../svnadmin/main.c:1013 ../svnadmin/main.c:1517
-msgid ""
-"Failed to get exclusive repository access; perhaps another process\n"
-"such as httpd, svnserve or svn has it open?"
-msgstr ""
-"無法取得獨佔存取權; 也許其它像是 httpd, svnserve 或 svn 的行程讓它\n"
-"保持開啟的狀態?"
-
-#: ../svnadmin/main.c:1018 ../svnadmin/main.c:1522
-#, c-format
-msgid "Waiting on repository lock; perhaps another process has it open?\n"
-msgstr "等待檔案庫鎖定中; 也許其它的行讓它保持開啟的狀態?\n"
-
-#: ../svnadmin/main.c:1026
-#, c-format
-msgid ""
-"\n"
-"Recovery completed.\n"
-msgstr ""
-"\n"
-"修復完成.\n"
-
-#: ../svnadmin/main.c:1033
-#, c-format
-msgid "The latest repos revision is %ld.\n"
-msgstr "最新的檔案庫修訂版為 %ld.\n"
-
-#: ../svnadmin/main.c:1142
-#, c-format
-msgid "Transaction '%s' removed.\n"
-msgstr "異動 '%s' 被移除.\n"
-
-#: ../svnadmin/main.c:1211 ../svnadmin/main.c:1261
-#, c-format
-msgid "Missing revision"
-msgstr "遺漏修訂版"
-
-#: ../svnadmin/main.c:1214 ../svnadmin/main.c:1264
-#, c-format
-msgid "Only one revision allowed"
-msgstr "僅允許一個修訂版"
-
-#: ../svnadmin/main.c:1220
-#, fuzzy, c-format
-msgid "Exactly one property name and one file argument required"
-msgstr "必須提供恰好一個的檔案引數"
-
-#: ../svnadmin/main.c:1270
-#, c-format
-msgid "Exactly one file argument required"
-msgstr "必須提供恰好一個的檔案引數"
-
-#: ../svnadmin/main.c:1395 ../svnlook/main.c:2058
-#, c-format
-msgid "UUID Token: %s\n"
-msgstr "UUID 符記: %s\n"
-
-# this points to filename according to sunny256
-#: ../svnadmin/main.c:1396 ../svnlook/main.c:2059
-#, c-format
-msgid "Owner: %s\n"
-msgstr "擁有者: %s\n"
-
-#: ../svnadmin/main.c:1397 ../svnlook/main.c:2060
-#, c-format
-msgid "Created: %s\n"
-msgstr "建立於: %s\n"
-
-#: ../svnadmin/main.c:1398 ../svnlook/main.c:2061
-#, c-format
-msgid "Expires: %s\n"
-msgstr "過期: %s\n"
-
-#: ../svnadmin/main.c:1400
-#, fuzzy, c-format
-msgid ""
-"Comment (%i line):\n"
-"%s\n"
-"\n"
-msgid_plural ""
-"Comment (%i lines):\n"
-"%s\n"
-"\n"
-msgstr[0] ""
-"註解 (%i 行):\n"
-"%s\n"
-"\n"
-msgstr[1] ""
-"註解 (%i 行):\n"
-"%s\n"
-"\n"
-
-#: ../svnadmin/main.c:1446
-#, fuzzy
-msgid "No paths to unlock provided"
-msgstr "未提供鎖定符記"
-
-#: ../svnadmin/main.c:1464
-#, c-format
-msgid "Path '%s' isn't locked.\n"
-msgstr "路徑 '%s' 未被鎖定.\n"
-
-#: ../svnadmin/main.c:1476
-#, c-format
-msgid "Removed lock on '%s'.\n"
-msgstr "移除 '%s' 的鎖定.\n"
-
-#: ../svnadmin/main.c:1532
-msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere"
-msgstr ""
-
-#: ../svnadmin/main.c:1539
-msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere"
-msgstr ""
-
-#: ../svnadmin/main.c:1545
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Upgrade completed.\n"
-msgstr "更新完成.\n"
-
-#: ../svnadmin/main.c:1638
-msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "遇到了多個修訂版引數; 請試著將 '-r M -r N' 改為 '-r M:N'"
-
-#: ../svnadmin/main.c:1770
-#, c-format
-msgid "subcommand argument required\n"
-msgstr "必須提供子命令引數\n"
-
-#: ../svnadmin/main.c:1843
-#, fuzzy, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svnadmin help %s' for usage.\n"
-msgstr ""
-"子命令 '%s' 不接受選項 '%s'\n"
-"請使用 'svnadmin help %s' 以了解用法.\n"
-
-#: ../svnadmin/main.c:1876
-#, fuzzy
-msgid "Try 'svnadmin help' for more info"
-msgstr "請使用 'svnversion --help' 以了解用法.\n"
-
-# as-is
-#: ../svndumpfilter/main.c:345
-msgid "This is an empty revision for padding."
-msgstr "This is an empty revision for padding."
-
-#: ../svndumpfil
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment