[prev in list] [next in list] [prev in thread] [next in thread]
List: subversion-cvs
Subject:
From: blair () tigris ! org
Date: 2008-07-30 15:04:13
Message-ID: 200807301504.m6UF4DCx014085 () svn2 ! sjc ! collab ! net
[Download RAW message or body]
Author: blair
Date: Wed Jul 30 08:04:13 2008
New Revision: 32332
Log:
On the file externals branch.
* branches/file-externals:
Merge r31974 through r32331 from trunk.
Added:
branches/file-externals/subversion/include/private/svn_cmdline_private.h
- copied unchanged from r32331, \
trunk/subversion/include/private/svn_cmdline_private.h \
branches/file-externals/subversion/tests/cmdline/svndumpfilter_tests_data/greek_tree.dump
- copied unchanged from r32331, \
trunk/subversion/tests/cmdline/svndumpfilter_tests_data/greek_tree.dump \
branches/file-externals/www/faq.ja.html
- copied unchanged from r32331, trunk/www/faq.ja.html
Modified:
branches/file-externals/ (props changed)
branches/file-externals/CHANGES
branches/file-externals/COMMITTERS
branches/file-externals/build.conf
branches/file-externals/build/ac-macros/apache.m4
branches/file-externals/build/generator/gen_vcnet_vcproj.py
branches/file-externals/build/generator/gen_win.py
branches/file-externals/build/win32/make_dist.py
branches/file-externals/configure.ac
branches/file-externals/contrib/client-side/emacs/psvn.el
branches/file-externals/notes/tree-conflicts/design-overview.txt (contents, \
props changed) branches/file-externals/notes/tree-conflicts/detection.txt
branches/file-externals/notes/tree-conflicts/requirements.txt (props changed)
branches/file-externals/notes/tree-conflicts/resolution.txt
branches/file-externals/subversion/bindings/javahl/native/CopySources.cpp
branches/file-externals/subversion/bindings/javahl/native/EnumMapper.cpp
branches/file-externals/subversion/bindings/javahl/native/Pool.h
branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
branches/file-externals/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
branches/file-externals/subversion/bindings/swig/include/svn_containers.swg
branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
branches/file-externals/subversion/bindings/swig/python/tests/client.py
branches/file-externals/subversion/bindings/swig/svn_ra.i
branches/file-externals/subversion/include/private/svn_auth_private.h (contents, \
props changed) branches/file-externals/subversion/include/svn_auth.h
branches/file-externals/subversion/include/svn_auth_dso.h
branches/file-externals/subversion/include/svn_client.h
branches/file-externals/subversion/include/svn_cmdline.h
branches/file-externals/subversion/include/svn_config.h
branches/file-externals/subversion/include/svn_delta.h
branches/file-externals/subversion/include/svn_fs.h
branches/file-externals/subversion/include/svn_repos.h
branches/file-externals/subversion/include/svn_wc.h
branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
branches/file-externals/subversion/libsvn_auth_kwallet/kwallet.cpp (props \
changed) branches/file-externals/subversion/libsvn_client/cat.c
branches/file-externals/subversion/libsvn_client/client.h
branches/file-externals/subversion/libsvn_client/copy.c
branches/file-externals/subversion/libsvn_client/export.c
branches/file-externals/subversion/libsvn_client/merge.c
branches/file-externals/subversion/libsvn_client/mergeinfo.c
branches/file-externals/subversion/libsvn_client/prop_commands.c
branches/file-externals/subversion/libsvn_client/revisions.c
branches/file-externals/subversion/libsvn_client/url.c
branches/file-externals/subversion/libsvn_client/util.c
branches/file-externals/subversion/libsvn_fs_base/fs.c
branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c
branches/file-externals/subversion/libsvn_ra/ra_loader.c
branches/file-externals/subversion/libsvn_ra_neon/log.c
branches/file-externals/subversion/libsvn_ra_neon/session.c
branches/file-externals/subversion/libsvn_ra_serf/auth.c
branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c
branches/file-externals/subversion/libsvn_ra_serf/util.c
branches/file-externals/subversion/libsvn_repos/fs-wrap.c
branches/file-externals/subversion/libsvn_repos/hooks.c
branches/file-externals/subversion/libsvn_repos/log.c
branches/file-externals/subversion/libsvn_repos/repos.c
branches/file-externals/subversion/libsvn_repos/repos.h
branches/file-externals/subversion/libsvn_repos/rev_hunt.c
branches/file-externals/subversion/libsvn_subr/cache-memcache.c
branches/file-externals/subversion/libsvn_subr/cmdline.c
branches/file-externals/subversion/libsvn_subr/config_file.c
branches/file-externals/subversion/libsvn_subr/io.c
branches/file-externals/subversion/libsvn_subr/mergeinfo.c
branches/file-externals/subversion/libsvn_subr/prompt.c
branches/file-externals/subversion/libsvn_subr/simple_providers.c
branches/file-externals/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c
branches/file-externals/subversion/libsvn_subr/username_providers.c
branches/file-externals/subversion/libsvn_wc/adm_files.c
branches/file-externals/subversion/libsvn_wc/props.c
branches/file-externals/subversion/libsvn_wc/props.h
branches/file-externals/subversion/po/de.po
branches/file-externals/subversion/po/fr.po
branches/file-externals/subversion/po/ko.po
branches/file-externals/subversion/po/nb.po
branches/file-externals/subversion/po/pl.po
branches/file-externals/subversion/po/zh_CN.po
branches/file-externals/subversion/svn/cl.h
branches/file-externals/subversion/svn/main.c
branches/file-externals/subversion/svn/propget-cmd.c
branches/file-externals/subversion/svn/props.c
branches/file-externals/subversion/svn/util.c
branches/file-externals/subversion/svndumpfilter/main.c
branches/file-externals/subversion/svnlook/main.c
branches/file-externals/subversion/svnsync/main.c
branches/file-externals/subversion/tests/cmdline/basic_tests.py
branches/file-externals/subversion/tests/cmdline/cat_tests.py
branches/file-externals/subversion/tests/cmdline/commit_tests.py
branches/file-externals/subversion/tests/cmdline/copy_tests.py
branches/file-externals/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
branches/file-externals/subversion/tests/cmdline/log_tests.py
branches/file-externals/subversion/tests/cmdline/merge_tests.py
branches/file-externals/subversion/tests/cmdline/svndumpfilter_tests.py
branches/file-externals/subversion/tests/cmdline/svnlook_tests.py
branches/file-externals/tools/dev/check-license.py
branches/file-externals/tools/dev/contribulyze.py
branches/file-externals/tools/dev/graph-dav-servers.py
branches/file-externals/tools/dist/write-announcement.py
branches/file-externals/tools/hook-scripts/mailer/mailer.py
branches/file-externals/tools/server-side/svn_server_log_parse.py (contents, \
props changed) branches/file-externals/tools/server-side/test_svn_server_log_parse.py \
(props changed) branches/file-externals/www/development.html (props changed)
branches/file-externals/www/faq.html
branches/file-externals/www/getting.html
branches/file-externals/www/hacking.html
branches/file-externals/www/images/svn-dav-securityspace-survey.png
branches/file-externals/www/index.html
branches/file-externals/www/issue-tracker.html (props changed)
branches/file-externals/www/links.html
branches/file-externals/www/merge-tracking/design.html
branches/file-externals/www/project_tools.html
branches/file-externals/www/release-history.html
branches/file-externals/www/roadmap.html
branches/file-externals/www/svn-dav-securityspace-survey.html
branches/file-externals/www/tasks.html (props changed)
Merged:
/trunk:r31974-32331
/branches/issue-3220-dev:r32136-32152
Modified: branches/file-externals/CHANGES
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/CHANGES?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/CHANGES Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/CHANGES Wed Jul 30 08:04:13 2008 (r32332)
@@ -20,28 +20,59 @@ http://svn.collab.net/repos/svn/tags/1.6
* Bindings
+Version 1.5.2
+(24 Jul 2008, from /branches/1.5.x)
+http://svn.collab.net/repos/svn/tags/1.5.2
+
+ User-visible changes:
+
+ Developer-visible changes:
+
+
Version 1.5.1
-(?? ??? 2008, from /branches/1.5.x)
+(24 Jul 2008, from /branches/1.5.x)
http://svn.collab.net/repos/svn/tags/1.5.1
User-visible changes:
- * fixed: crash on invalid dates in 'log' and 'blame' (issue #2721)
* mergeinfo on switched subtrees should elide in repos (issue #3188)
- * fixed: 'svn status --xml' reporting invalid XML (issue #2887)
- * fixed: 'svn merge' range notification bug (r30746, -47)
- * fixed: can not replace branch with neon/serf (issue #2939)
- * fixed: 'file not found' error when merging to a broken symlink (r31159, -79)
- * fix a crash and endless loop for credentials in ra_serf (r31619)
* Add support for --config-dir to svnmerge.py (r31727)
+ * improve performance of bdb post-commit deltification (r31820, -59)
+ * return faster when there is nothing to be merged (r30748)
+ * don't commit an add of a missing item (issue #3198)
+ * don't create unneeded self-referential mergeinfo (issue #3157)
+ * support 'http-library' (if --enable-runtime-module-search) (r31425, -722)
+ * support Berkeley DB 4.7 (r32017, -29)
+ * fixed: make serf usable with root-level authz (r31464)
+ * fixed: 'svndumpfilter' partial-path matching bug (r31833)
+ * fixed: crash on invalid dates in 'log' and 'blame' (issue #2721)
+ * fixed: 'svn status --xml' outputting invalid XML (issue #2887)
+ * fixed: 'svn merge' prints incorrect range (r30746, -47)
+ * fixed: using neon/serf, can not replace branch (issue #2939)
+ * fixed: 'file not found' error when merging to a broken symlink (r31159, -79)
+ * fixed: using serf, crash or endless loop fetching authn data (r31619)
* fixed: ArrayIndexOutOfBoundsException in JavaHL bindings (r31719, -806)
- * improve performance of bdb post-commit deltification (r31820 -59)
- * don't clobber LDFLAGS in configure when given '--with-zlib' (r31825)
- * don't drive the merge editor when there is nothing to be merged (r30748)
- * fixed: auth cache reading password from wrong username entry (issue #2242)
+ * fixed: authn password lookup used wrong username (issue #2242)
+ * fixed: unbounded memory usage in wc-to-wc copy and move (r31868)
+ * fixed: subtree merges broken for non-intersecting ranges (issue #3199)
+ * fixed: invalid XML from 'svn log --xml' against pre-1.2 servers (r31875)
+ * fixed: 'svnlook diff' ignores --diff-copy-from for properties (issue #3248)
+ * fixed: 'svnlook diff' doesn't report that binary files differ (issue #3249)
+ * fixed: bogus results from commits to subtrees added by merge (issue #3240)
+ * fixed: non-existent subtree in destination breaks the merge (issue #3067)
+ * fixed: serf merge bug too complex to describe here (r32056)
+ * fixed: 'svn log -g' correctness and speed (issue #3220, issue #3235)
+ * fixed: merge chokes on renamed subtrees (issue #3174)
Developer-visible changes:
- * fixed: crash when when svn_ra_open3() is passed a bogus URL (r31223)
* export svn_path_is_url() to the bindings (r31603)
+ * don't clobber LDFLAGS in configure when given '--with-zlib' (r31825)
+ * make libsvn_ra depend on libsvn_delta unconditionally (r31852)
+ * correctly set the peg revision for copy in JavaHL (r31994)
+ * 'svn mergeinfo' handles wc paths (r31023, -873, -874, -929, -930, -038)
+ * fixed: crash when when svn_ra_open3() is passed a bogus URL (r31223)
+ * fixed: JavaHL compilation on Windows (r31737)
+ * fixed: crash in calling apr_pstrcat (affects TortoiseSVN) (r32080)
+
Version 1.5.0
(19 Jun 2008, from /branches/1.5.x)
Modified: branches/file-externals/COMMITTERS
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/COMMITTERS?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/COMMITTERS Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/COMMITTERS Wed Jul 30 08:04:13 2008 (r32332)
@@ -114,6 +114,8 @@ Commit access for specific areas:
stylesen Senthil Kumaran S <senthil@collab.net> (tests)
rhansen Richard Hansen <rhansen@bbn.com> (svnstsw)
larrys Larry Shatzer, Jr. <larrys@gmail.com> (svn-keyword-check.pl)
+ nmiyo MIYOKAWA, Nobuyoshi <n-miyo@tempus.org> (faq: ja)
+ kmradke Kevin Radke <kmradke@gmail.com> (add-needs-lock.py)
Translation of message files:
@@ -128,7 +130,7 @@ Commit access for specific areas:
jihuang June-Yen Huang <jihuang@iis.sinica.edu.tw> (po: zh_TW)
marcosc Marcos Chaves <marcos.nospam@gmail.com> (po: pt_BR)
pynoos Hojin Choi <hojin.choi@gmail.com> (po: ko)
- blueboh Jeong Seolin <blueboh@ahnlab.com> (po: ko)
+ blueboh Jeong Seolin <blueboh@gmail.com> (po: ko)
cauchy Dongsheng Song <songdongsheng@live.cn> (po: zh_CN)
hynnet YingNing Huang <hyn@bao.hynnet.com> (po: zh_CN)
lark Wang Jian <lark@linux.net.cn> (po: zh_CN)
Modified: branches/file-externals/build.conf
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/build.conf?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/build.conf Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/build.conf Wed Jul 30 08:04:13 2008 (r32332)
@@ -343,7 +343,8 @@ install = fsmod-lib
path = subversion/libsvn_subr
libs = aprutil apriconv apr xml zlib apr_memcache
msvc-libs = advapi32.lib shfolder.lib ole32.lib
-msvc-export = svn_auth.h svn_base64.h svn_cmdline.h svn_compat.h svn_config.h \
svn_ctype.h svn_dso.h svn_error.h svn_hash.h svn_io.h svn_md5.h svn_nls.h svn_opt.h \
svn_mergeinfo.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h svn_sorts.h \
svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h svn_utf.h svn_version.h \
svn_xml.h private\svn_atomic.h private\svn_log.h private\svn_mergeinfo_private.h \
svn_iter.h private\svn_opt_private.h svn_cache.h private\svn_utf_private.h \
+msvc-export = svn_auth.h svn_base64.h svn_cache.h svn_cmdline.h svn_compat.h \
svn_config.h svn_ctype.h svn_dso.h svn_error.h svn_hash.h svn_io.h svn_iter.h \
svn_md5.h svn_mergeinfo.h svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h \
svn_quoprint.h svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h \
svn_utf.h svn_version.h svn_xml.h private\svn_atomic.h private\svn_cmdline_private.h \
private\svn_log.h private\svn_mergeinfo_private.h private\svn_opt_private.h \
private\svn_utf_private.h +
# Working copy management lib
[libsvn_wc]
description = Subversion Working Copy Library
Modified: branches/file-externals/build/ac-macros/apache.m4
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/build/ac-macros/apache.m4?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/build/ac-macros/apache.m4 Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/build/ac-macros/apache.m4 Wed Jul 30 08:04:13 \
2008 (r32332) @@ -85,7 +85,7 @@ if test -n "$APXS" && test "$APXS" != "n
AC_MSG_ERROR([unknown APR version])
;;
esac
- AC_EGREP_CPP([apache_minor_version="$apache_minor_version_wanted_regex"],
+ AC_EGREP_CPP([apache_minor_version= *$apache_minor_version_wanted_regex],
[
#include "$APXS_INCLUDE/ap_release.h"
apache_minor_version=AP_SERVER_MINORVERSION_NUMBER],
Modified: branches/file-externals/build/generator/gen_vcnet_vcproj.py
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/build/generator/gen_vcnet_vcproj.py?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/build/generator/gen_vcnet_vcproj.py Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/build/generator/gen_vcnet_vcproj.py Wed Jul 30 08:04:13 \
2008 (r32332) @@ -36,7 +36,9 @@ class Generator(gen_win.WinGeneratorBase
def write_project(self, target, fname):
"Write a Project (.vcproj)"
- if isinstance(target, gen_base.TargetExe):
+ if isinstance(target, gen_base.TargetProject):
+ config_type=10
+ elif isinstance(target, gen_base.TargetExe):
#EXE
config_type=1
elif isinstance(target, gen_base.TargetJava):
Modified: branches/file-externals/build/generator/gen_win.py
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/build/generator/gen_win.py?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/build/generator/gen_win.py Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/build/generator/gen_win.py Wed Jul 30 08:04:13 \
2008 (r32332) @@ -142,7 +142,7 @@ class GeneratorBase(gen_base.GeneratorBa
def _find_bdb(self):
"Find the Berkeley DB library and version"
- for ver in ("46", "45", "44", "43", "42", "41", "40"):
+ for ver in ("47", "46", "45", "44", "43", "42", "41", "40"):
lib = "libdb" + ver
path = os.path.join(self.bdb_path, "lib")
if os.path.exists(os.path.join(path, lib + ".lib")):
Modified: branches/file-externals/build/win32/make_dist.py
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/build/win32/make_dist.py?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/build/win32/make_dist.py Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/build/win32/make_dist.py Wed Jul 30 08:04:13 \
2008 (r32332) @@ -184,24 +184,45 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnserve/svnserve.pdb'),
File('%(blddir)s/svnversion/svnversion.exe'),
File('%(blddir)s/svnversion/svnversion.pdb'),
+ File('%(blddir)s/../contrib/client-side/svnmucc/svnmucc.exe'),
+ File('%(blddir)s/../contrib/client-side/svnmucc/svnmucc.pdb'),
+ \
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'), + \
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'), + \
File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'), + \
File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'), + \
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'), + \
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.pdb'), \
File('%(blddir)s/mod_dav_svn/mod_dav_svn.so'), \
File('%(blddir)s/mod_dav_svn/mod_dav_svn.pdb'), \
File('%(blddir)s/mod_authz_svn/mod_authz_svn.so'), \
File('%(blddir)s/mod_authz_svn/mod_authz_svn.pdb'),
- File('%(@apr)s/%(aprrel)s/libapr.dll'),
- File('%(@apr)s/%(aprrel)s/libapr.pdb'),
- File('%(@apr-iconv)s/%(aprrel)s/libapriconv.dll'),
- File('%(@apr-iconv)s/%(aprrel)s/libapriconv.pdb'),
- File('%(@apr-util)s/%(aprrel)s/libaprutil.dll'),
- File('%(@apr-util)s/%(aprrel)s/libaprutil.pdb'),
+ FileGlob('%(blddir)s/libsvn_*/libsvn_*.dll'),
+ FileGlob('%(blddir)s/libsvn_*/libsvn_*.pdb'),
+ File('%(@apr)s/%(aprrel)s/libapr-1.dll'),
+ File('%(@apr)s/%(aprrel)s/libapr-1.pdb'),
+ File('%(@apr-iconv)s/%(aprrel)s/libapriconv-1.dll'),
+ File('%(@apr-iconv)s/%(aprrel)s/libapriconv-1.pdb'),
+ File('%(@apr-util)s/%(aprrel)s/libaprutil-1.dll'),
+ File('%(@apr-util)s/%(aprrel)s/libaprutil-1.pdb'),
File('%(@berkeley-db)s/bin/libdb%(bdbver)s.dll'),
+ File('%(@sasl)s/lib/libsasl.dll'),
+ File('%(@sasl)s/lib/libsasl.pdb'),
+ File('%(@sasl)s/utils/pluginviewer.exe'),
+ File('%(@sasl)s/utils/pluginviewer.pdb'),
+ File('%(@sasl)s/utils/sasldblistusers2.exe'),
+ File('%(@sasl)s/utils/sasldblistusers2.pdb'),
+ File('%(@sasl)s/utils/saslpasswd2.exe'),
+ File('%(@sasl)s/utils/saslpasswd2.pdb'),
OptFile('%(@berkeley-db)s/bin/libdb%(bdbver)s.pdb'),
OptFile('%(@openssl)s/out32dll/libeay32.dll'),
OptFile('%(@openssl)s/out32dll/libeay32.pdb'),
OptFile('%(@openssl)s/out32dll/ssleay32.dll'),
OptFile('%(@openssl)s/out32dll/ssleay32.pdb'),
+ OptFile('%(@openssl)s/out32dll/openssl.exe'),
OptFile('%(@libintl)s/bin/intl3_svn.dll'),
OptFile('%(@libintl)s/bin/intl3_svn.pdb'),
+ FileGlob('%(@sasl)s/plugins/sasl*.dll'),
+ FileGlob('%(@sasl)s/plugins/sasl*.pdb'),
),
'doc': InstallDocs('%(srcdir)s/doc/doxygen.conf',
@@ -216,19 +237,23 @@ _disttree = {'': OptFile('%(readme)s', '
'lib': (FileGlob('%(blddir)s/libsvn_*/*.lib'),
FileGlob('%(blddir)s/libsvn_*/*.pdb')),
- 'lib/apr': File('%(@apr)s/%(aprrel)s/libapr.lib'),
- 'lib/apr-iconv': File('%(@apr-iconv)s/%(aprrel)s/libapriconv.lib'),
- 'lib/apr-util': (File('%(@apr-util)s/%(aprrel)s/libaprutil.lib'),
+ 'lib/apr': File('%(@apr)s/%(aprrel)s/libapr-1.lib'),
+ 'lib/apr-iconv': File('%(@apr-iconv)s/%(aprrel)s/libapriconv-1.lib'),
+ 'lib/apr-util': (File('%(@apr-util)s/%(aprrel)s/libaprutil-1.lib'),
File('%(@apr-util)s/%(aprxml)s/xml.lib'),
- File('%(@apr-util)s/%(aprxml)s/xml_src.pdb'),
+ File('%(@apr-util)s/%(aprxml)s/xml.pdb'),
),
'lib/neon': (File('%(@neon)s/libneon.lib'),
OptFile('%(@zlib)s/zlibstat.lib'),
),
+ 'lib/serf': (File('%(@serf)s/Release/serf.lib'),
+ ),
+
'licenses': None,
'licenses/bdb': File('%(@berkeley-db)s/LICENSE'),
'licenses/neon': File('%(@neon)s/src/COPYING.LIB'),
+ 'licenses/serf': File('%(@serf)s/LICENSE'),
'licenses/zlib': File('%(@zlib)s/README'),
'licenses/apr-util': (File('%(@apr-util)s/LICENSE'),
File('%(@apr-util)s/NOTICE'),
@@ -241,6 +266,7 @@ _disttree = {'': OptFile('%(readme)s', '
),
'licenses/openssl': File('%(@openssl)s/LICENSE'),
'licenses/svn' : File('%(srcdir)s/COPYING'),
+ 'licenses/cyrus-sasl' : File('%(@sasl)s/COPYING'),
'perl': None,
'perl/site': None,
@@ -259,10 +285,10 @@ _disttree = {'': OptFile('%(readme)s', '
),
'python/svn': FileGlob('%(bindsrc)s/swig/python/svn/*.py'),
- 'javahl': (FileGlob('%(binddir)s/java/javahl/native/libsvn*.dll'),
- FileGlob('%(binddir)s/java/javahl/native/libsvn*.pdb'),
+ 'javahl': (FileGlob('%(binddir)s/javahl/native/libsvn*.dll'),
+ FileGlob('%(binddir)s/javahl/native/libsvn*.pdb'),
InstallJar('svnjavahl.jar',
- '%(bindsrc)s/java/javahl/classes'),
+ '%(bindsrc)s/javahl/classes'),
),
'ruby': None,
@@ -278,9 +304,9 @@ _disttree = {'': OptFile('%(readme)s', '
FileGlob('%(blddir)s/libsvn_*/*.dll'),
File('%(@berkeley-db)s/bin/libdb%(bdbver)s.dll'),
OptFile('%(@libintl)s/bin/intl3_svn.dll'),
- File('%(@apr)s/%(aprrel)s/libapr.dll'),
- File('%(@apr-iconv)s/%(aprrel)s/libapriconv.dll'),
- File('%(@apr-util)s/%(aprrel)s/libaprutil.dll')),
+ File('%(@apr)s/%(aprrel)s/libapr-1.dll'),
+ File('%(@apr-iconv)s/%(aprrel)s/libapriconv-1.dll'),
+ File('%(@apr-util)s/%(aprrel)s/libaprutil-1.dll')),
'share': None,
'share/locale': InstallMoFiles('%(srcdir)s/%(svnrel)s/mo'),
Modified: branches/file-externals/configure.ac
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/configure.ac?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/configure.ac Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/configure.ac Wed Jul 30 08:04:13 2008 (r32332)
@@ -73,7 +73,7 @@ NEON_URL="http://www.webdav.org/neon/neo
dnl You can skip the neon version check only if you know what you are doing
AC_ARG_ENABLE(neon-version-check,
AS_HELP_STRING([--disable-neon-version-check],
- [do not check the Neon version]),
+ [do not check the Neon version]),
[
if test "$enableval" = "no" ; then
NEON_ALLOWED_LIST="any"
@@ -211,7 +211,7 @@ dnl Check for trang.
trang=yes
AC_ARG_WITH(trang,
AS_HELP_STRING([--with-trang=PATH],
- [Specify the command to run the trang schema converter]),
+ [Specify the command to run the trang schema converter]),
[
trang="$withval"
])
@@ -610,7 +610,7 @@ AC_FUNC_VPRINTF
dnl check for functions needed in special file handling
AC_CHECK_FUNCS(symlink readlink)
-
+
dnl Process some configuration options ----------
AC_ARG_WITH(ssl,
@@ -626,18 +626,29 @@ AS_HELP_STRING([--with-ssl],
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
- [Turn on debugging]),
+ [Turn on debugging]),
[
if test "$enableval" = "yes" ; then
enable_debugging="yes"
else
enable_debugging="no"
fi
+],
+[
+ # Neither --enable-debug nor --disable-debug was passed.
+ enable_debugging="maybe"
+
+ # We leave this as 'maybe' because setting it to 'no' would modify the
+ # CFLAGS/CXXFLAGS later (just after the --enable-maintainer-mode block),
+ # and we don't want to force that.
+ #
+ # TODO: set enable_debugging='no' here, and provide another way to disable
+ # the CFLAGS/CXXFLAGS munging.
])
AC_ARG_ENABLE(maintainer-mode,
AS_HELP_STRING([--enable-maintainer-mode],
- [Turn on debugging and very strict compile-time warnings]),
+ [Turn on debugging and very strict compile-time warnings]),
[
if test "$enableval" = "yes" ; then
if test "$enable_debugging" = "no" ; then
@@ -660,14 +671,14 @@ if test "$enable_debugging" = "yes" ; th
dnl AP_DEBUG enables specific (Apache) features for developer builds
CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
-else
- if test "$enable_debugging" = "no" ; then
+elif test "$enable_debugging" = "no" ; then
CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
dnl Compile with NDEBUG to get rid of assertions
CFLAGS="$CFLAGS -DNDEBUG"
CXXFLAGS="$CXXFLAGS -DNDEBUG"
- fi
+# elif test "$enable_debugging" = "maybe" ; then
+# # do nothing
fi
@@ -692,7 +703,7 @@ SVN_LIB_Z
MOD_ACTIVATION="-a"
AC_ARG_ENABLE(mod-activation,
AS_HELP_STRING([--disable-mod-activation],
- [Do not enable mod_dav_svn in httpd.conf]),
+ [Do not enable mod_dav_svn in httpd.conf]),
[
if test "$enableval" = "no" ; then
MOD_ACTIVATION=""
@@ -707,7 +718,7 @@ AC_SUBST(MOD_ACTIVATION)
AC_ARG_ENABLE(gprof,
AS_HELP_STRING([--enable-gprof],
- [Produce gprof profiling data in 'gmon.out' (GCC only).]),
+ [Produce gprof profiling data in 'gmon.out' (GCC only).]),
[
if test "$enableval" = "yes" ; then
dnl Probably other compilers support -pg or something similar;
Modified: branches/file-externals/contrib/client-side/emacs/psvn.el
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/contrib/client-side/emacs/psvn.el?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/contrib/client-side/emacs/psvn.el Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/contrib/client-side/emacs/psvn.el Wed Jul 30 08:04:13 \
2008 (r32332) @@ -66,6 +66,8 @@
;; ~ - svn-status-get-specific-revision
;; E - svn-status-ediff-with-revision
;; X X - svn-status-resolve-conflicts
+;; S g - svn-status-grep-files
+;; S s - svn-status-search-files
;; s - svn-status-show-process-buffer
;; h - svn-status-pop-to-partner-buffer
;; e - svn-status-toggle-edit-cmd-flag
@@ -80,6 +82,7 @@
;; * ? - svn-status-mark-unknown
;; * A - svn-status-mark-added
;; * M - svn-status-mark-modified
+;; * P - svn-status-mark-modified-properties
;; * D - svn-status-mark-deleted
;; * * - svn-status-mark-changed
;; * . - svn-status-mark-by-file-ext
@@ -708,6 +711,7 @@ This is nil if the log entry is for a ne
(defvar svn-ediff-result)
(defvar svn-status-last-diff-options nil)
(defvar svn-status-blame-file-name nil)
+(defvar svn-status-blame-revision nil)
(defvar svn-admin-last-repository-dir nil "The last repository url for various \
operations.") (defvar svn-last-cmd-ring (make-ring 30) "Ring that holds the last \
executed svn commands (for debugging purposes)") (defvar \
svn-status-cached-version-string nil) @@ -838,6 +842,21 @@ the target of the link \
gets either `svn- "Default face for highlighting a line in svn status blame mode."
:group 'psvn-faces))
+(if svn-xemacsp
+ (defface svn-log-partner-highlight-face
+ '((((type tty) (class color)) (:foreground "yellow" :weight light))
+ (((class color) (background light)) (:foreground "gold"))
+ (((class color) (background dark)) (:foreground "gold"))
+ (t (:weight bold)))
+ "Default face for highlighting the partner in svn log mode."
+ :group 'psvn-faces)
+ (defface svn-log-partner-highlight-face
+ '((((class color) (background light))
+ (:background "light goldenrod" :weight bold))
+ (t (:weight bold)))
+ "Default face for highlighting the partner in svn log mode."
+ :group 'psvn-faces))
+
(defface svn-status-blame-rev-number-face
'((((class color) (background light)) (:foreground "DarkGoldenrod"))
(((class color) (background dark)) (:foreground "LightGoldenrod"))
@@ -985,6 +1004,7 @@ To bind this to a different key, customi
(define-key svn-global-keymap (kbd "f l") 'svn-status-show-svn-log)
(define-key svn-global-keymap (kbd "f b") 'svn-status-blame)
(define-key svn-global-keymap (kbd "f a") 'svn-file-add-to-changelog)
+ (define-key svn-global-keymap (kbd "f r") 'svn-file-revert)
(define-key svn-global-keymap (kbd "c") 'svn-status-commit)
(define-key svn-global-keymap (kbd "S") 'svn-status-switch-to-status-buffer)
(define-key svn-global-keymap (kbd "o") 'svn-status-pop-to-status-buffer))
@@ -1135,9 +1155,7 @@ If there is no .svn directory, examine i
(if svn-status-verbose "-v" "")
(if svn-status-verbose
(if arg "-uv" "-v")
- (if arg "-u" ""))))
- (svn-status-edit-svn-command
- (or want-edit svn-status-edit-svn-command)))
+ (if arg "-u" "")))))
(save-excursion
(set-buffer status-buf)
(setq default-directory dir)
@@ -1145,7 +1163,10 @@ If there is no .svn directory, examine i
(setq default-directory dir
svn-status-remote (when arg t))
(set-buffer cur-buf)
- (svn-run t t 'status "status" svn-status-default-status-arguments \
status-option)))) + (if want-edit
+ (let (svn-status-edit-svn-command t)
+ (svn-run t t 'status "status" svn-status-default-status-arguments \
status-option)) + (svn-run t t 'status "status" \
svn-status-default-status-arguments status-option)))))
(defun svn-status-this-directory (arg)
"Run `svn-status' for the `default-directory'"
@@ -1810,6 +1831,9 @@ A and B must be line-info's."
(defvar svn-status-mode-branch-map ()
"Subkeymap used in `svn-status-mode' for branching commands.")
(put 'svn-status-mode-extension-map 'risky-local-variable t) ;for Emacs 20.7
+(defvar svn-status-mode-search-map ()
+ "Subkeymap used in `svn-status-mode' for search commands.")
+(put 'svn-status-mode-search-map 'risky-local-variable t) ;for Emacs 20.7
(when (not svn-status-mode-map)
(setq svn-status-mode-map (make-sparse-keymap))
@@ -1889,18 +1913,28 @@ A and B must be line-info's."
(define-key svn-status-mode-map (kbd "<down>") 'svn-status-next-line)
(define-key svn-status-mode-map (kbd "<up>") 'svn-status-previous-line)
(define-key svn-status-mode-map (kbd "C-x C-j") 'svn-status-dired-jump)
- (define-key svn-status-mode-map [down-mouse-3] 'svn-status-popup-menu)
+ (define-key svn-status-mode-map [down-mouse-3] 'svn-status-popup-menu))
+
+(when (not svn-status-mode-mark-map)
(setq svn-status-mode-mark-map (make-sparse-keymap))
(define-key svn-status-mode-map (kbd "*") svn-status-mode-mark-map)
(define-key svn-status-mode-mark-map (kbd "!") 'svn-status-unset-all-usermarks)
(define-key svn-status-mode-mark-map (kbd "?") 'svn-status-mark-unknown)
(define-key svn-status-mode-mark-map (kbd "A") 'svn-status-mark-added)
(define-key svn-status-mode-mark-map (kbd "M") 'svn-status-mark-modified)
+ (define-key svn-status-mode-mark-map (kbd "P") \
'svn-status-mark-modified-properties) (define-key svn-status-mode-mark-map (kbd "D") \
'svn-status-mark-deleted) (define-key svn-status-mode-mark-map (kbd "*") \
'svn-status-mark-changed) (define-key svn-status-mode-mark-map (kbd ".") \
'svn-status-mark-by-file-ext) (define-key svn-status-mode-mark-map (kbd "%") \
'svn-status-mark-filename-regexp) (define-key svn-status-mode-mark-map (kbd "u") \
'svn-status-show-svn-diff-for-marked-files)) +
+(when (not svn-status-mode-search-map)
+ (setq svn-status-mode-search-map (make-sparse-keymap))
+ (define-key svn-status-mode-search-map (kbd "g") 'svn-status-grep-files)
+ (define-key svn-status-mode-search-map (kbd "s") 'svn-status-search-files)
+ (define-key svn-status-mode-map (kbd "S") svn-status-mode-search-map))
+
(when (not svn-status-mode-property-map)
(setq svn-status-mode-property-map (make-sparse-keymap))
(define-key svn-status-mode-property-map (kbd "l") 'svn-status-property-list)
@@ -1972,6 +2006,10 @@ A and B must be line-info's."
["svn ediff current file" svn-status-ediff-with-revision t]
["svn resolve conflicts" svn-status-resolve-conflicts]
)
+ ("Search"
+ ["Grep marked files" svn-status-grep-files t]
+ ["Search marked files" svn-status-search-files t]
+ )
["svn cat ..." svn-status-get-specific-revision t]
["svn add" svn-status-add-file t]
["svn add recursively" svn-status-add-file-recursively t]
@@ -2043,8 +2081,9 @@ A and B must be line-info's."
["Unmark all" svn-status-unset-all-usermarks t]
"---"
["Mark/Unmark unknown" svn-status-mark-unknown t]
- ["Mark/Unmark added" svn-status-mark-added t]
["Mark/Unmark modified" svn-status-mark-modified t]
+ ["Mark/Unmark modified properties" svn-status-mark-modified-properties t]
+ ["Mark/Unmark added" svn-status-mark-added t]
["Mark/Unmark deleted" svn-status-mark-deleted t]
["Mark/Unmark modified/added/deleted" svn-status-mark-changed t]
["Mark/Unmark filename by extension" svn-status-mark-by-file-ext t]
@@ -3312,12 +3351,22 @@ If the function is called with a prefix
(defun svn-status-mark-modified (arg)
"Mark all modified files.
These are the files marked with 'M' in the `svn-status-buffer-name' buffer.
+Changed properties are considered.
If the function is called with a prefix ARG, unmark all these files."
(interactive "P")
(svn-status-apply-usermark-checked
'(lambda (info) (or (eq (svn-status-line-info->filemark info) ?M)
(eq (svn-status-line-info->filemark info)
- svn-status-file-modified-after-save-flag)))
+ svn-status-file-modified-after-save-flag)
+ (eq (svn-status-line-info->propmark info) ?M)))
+ (not arg)))
+
+(defun svn-status-mark-modified-properties (arg)
+ "Mark all files and directories with modified properties.
+If the function is called with a prefix ARG, unmark all these entries."
+ (interactive "P")
+ (svn-status-apply-usermark-checked
+ '(lambda (info) (or (eq (svn-status-line-info->propmark info) ?M)))
(not arg)))
(defun svn-status-mark-deleted (arg)
@@ -3603,7 +3652,7 @@ At the moment a list containing the last
(svn-status-message 7 "last-changed-author for '%s': %s" path \
last-changed-author) (list last-changed-author)))
-(defun svn-status-blame (revision)
+(defun svn-status-blame (revision &optional file-name)
"Run `svn blame' on the current file.
When called with a prefix argument, ask the user for the REVISION to use.
When called from a file buffer, go to the current line in the resulting blame \
output." @@ -3611,9 +3660,22 @@ When called from a file buffer, go to th
(when current-prefix-arg
(setq revision (svn-status-read-revision-string "Blame for version: " "BASE")))
(unless revision (setq revision "BASE"))
- (setq svn-status-blame-file-name (svn-status-line-info->filename \
(svn-status-get-file-information))) + (setq svn-status-blame-revision revision)
+ (setq svn-status-blame-file-name (if file-name
+ file-name
+ (svn-status-line-info->filename \
(svn-status-get-file-information)))) (svn-run t t 'blame "blame" \
svn-status-default-blame-arguments "-r" revision svn-status-blame-file-name))
+(defun svn-blame-blame-again (arg)
+ "Run svn blame again, using the revision before the change at point.
+When point is at revision 3472, run it with 3471."
+ (interactive "P")
+ (let ((rev (svn-blame-rev-at-point)))
+ (setq rev (number-to-string (- (string-to-number rev) 1)))
+ (when current-prefix-arg
+ (setq rev (svn-status-read-revision-string (format "Svn blame for rev#? ") \
rev))) + (svn-status-blame rev svn-status-blame-file-name)))
+
(defun svn-status-show-svn-diff (arg)
"Run `svn diff' on the current file.
If the current file is a directory, compare it recursively.
@@ -3649,11 +3711,11 @@ If ARG then prompt for revision to diff
(not (svn-status-some-files-marked-p))
(if arg :ask "BASE")))
-(defun svn-status-diff-show-changeset (rev &optional user-confirmation)
+(defun svn-status-diff-show-changeset (rev &optional user-confirmation rev-against)
"Show the changeset for a given log entry.
When called with a prefix argument, ask the user for the revision."
- (let* ((upper-rev rev)
- (lower-rev (number-to-string (- (string-to-number upper-rev) 1)))
+ (let* ((upper-rev (if rev-against rev-against rev))
+ (lower-rev (if rev-against rev (number-to-string (- (string-to-number \
upper-rev) 1)))) (rev-arg (concat lower-rev ":" upper-rev)))
(when user-confirmation
(setq rev-arg (read-string "Revision for changeset: " rev-arg)))
@@ -3976,6 +4038,12 @@ See `svn-status-marked-files' for what c
(svn-status-create-arg-file svn-status-temp-arg-file "" \
(svn-status-marked-files) "")
(svn-run t t 'revert "revert" "--targets" svn-status-temp-arg-file))))
+(defun svn-file-revert ()
+ "Run `svn revert' on the current file."
+ (interactive)
+ (when (y-or-n-p (format "Revert %s? " buffer-file-name))
+ (svn-run t t 'revert "revert" buffer-file-name)))
+
(defun svn-status-rm (force)
"Run `svn rm' on all selected files.
See `svn-status-marked-files' for what counts as selected.
@@ -4023,7 +4091,7 @@ When called with a negative prefix argum
(message "Running svn-update for %s" default-directory)
(svn-run t t 'update "update"
(when rev (list "-r" rev))
- (list "--non-interactive") default-directory))))
+ (list "--non-interactive") (expand-file-name default-directory)))))
(defun svn-status-commit ()
"Commit selected files.
@@ -4498,6 +4566,25 @@ When called with a prefix argument, read
(svn-process-send-string (concat string "\n") send-passwd))
;; --------------------------------------------------------------------------------
+;; Search interface
+;; --------------------------------------------------------------------------------
+
+(defun svn-status-grep-files (regexp)
+ "Run grep on selected file(s).
+See `svn-status-marked-files' for what counts as selected."
+ (interactive "sGrep files for: ")
+ (unless grep-command
+ (grep-compute-defaults))
+ (grep (format "%s %s %s" grep-command (shell-quote-argument regexp)
+ (mapconcat 'identity (svn-status-marked-file-names) " "))))
+
+(defun svn-status-search-files (search-string)
+ "Search selected file(s) for a fixed SEARCH-STRING.
+See `svn-status-marked-files' for what counts as selected."
+ (interactive "sSearch files for: ")
+ (svn-status-grep-files (regexp-quote search-string)))
+
+;; --------------------------------------------------------------------------------
;; Property List stuff
;; --------------------------------------------------------------------------------
@@ -4755,10 +4842,16 @@ When called with the prefix arg -, remov
(mapcar 'list '("native" "CRLF" "LF" "CR"))
nil t)))
-(defun svn-status-property-set-executable ()
- "Set the svn:executable property on the marked files."
- (interactive)
- (svn-status-property-set-property (svn-status-marked-files) "svn:executable" "*"))
+(defun svn-status-property-set-executable (&optional unset)
+ "Set the svn:executable property on the marked files.
+When called with a prefix argument: unset the svn:executable property."
+ (interactive "P")
+ (if unset
+ (progn
+ (svn-run nil t 'propdel (append (list "propdel" "svn:executable") \
(svn-status-marked-file-names))) + (message "Unset the svn:executable property \
for %s" (svn-status-marked-file-names)) + (svn-status-update))
+ (svn-status-property-set-property (svn-status-marked-files) "svn:executable" \
"*")))
(defun svn-status-property-set-mime-type ()
"Set the svn:mime-type property on the marked files."
@@ -5167,8 +5260,11 @@ entry for file with defun.
(define-key svn-log-view-mode-map (kbd "p") 'svn-log-view-prev)
(define-key svn-log-view-mode-map (kbd "n") 'svn-log-view-next)
(define-key svn-log-view-mode-map (kbd "~") 'svn-log-get-specific-revision)
+ (define-key svn-log-view-mode-map (kbd "f") 'svn-log-get-specific-revision)
(define-key svn-log-view-mode-map (kbd "E") 'svn-log-ediff-specific-revision)
(define-key svn-log-view-mode-map (kbd "=") 'svn-log-view-diff)
+ (define-key svn-log-view-mode-map (kbd "#") 'svn-log-mark-partner-revision)
+ (define-key svn-log-view-mode-map (kbd "x") \
'svn-log-exchange-partner-mark-with-point) (define-key svn-log-view-mode-map (kbd \
"TAB") 'svn-log-next-link) (define-key svn-log-view-mode-map [backtab] \
'svn-log-prev-link) (define-key svn-log-view-mode-map (kbd "RET") \
'svn-log-find-file-at-point) @@ -5189,6 +5285,7 @@ entry for file with defun.
["Show Changeset" svn-log-view-diff t]
["Ediff file at point" svn-log-ediff-specific-revision t]
["Find file at point" svn-log-find-file-at-point t]
+ ["Mark as diff against revision" svn-log-mark-partner-revision \
t]
["Get older revision for file at point" \
svn-log-get-specific-revision t] ["Edit log message" svn-log-edit-log-entry t]))
@@ -5235,6 +5332,50 @@ Commands:
(unless (looking-at "Changed paths:")
(beginning-of-line 1))))
+(defun svn-log-mark-partner-revision ()
+ "Mark the revision at point to be used as diff against revision."
+ (interactive)
+ (let ((start-pos)
+ (point-at-partner-rev))
+ (dolist (ov (overlays-in (point-min) (point-max)))
+ (when (overlay-get ov 'svn-log-partner-revision)
+ (setq point-at-partner-rev (and (>= (point) (overlay-start ov))
+ (<= (point) (overlay-end ov))))
+ (delete-overlay ov)))
+ (unless point-at-partner-rev
+ (save-excursion
+ (when (re-search-backward "^r[0-9]+" nil t 1)
+ (setq start-pos (point))
+ (re-search-forward "^---------------")
+ (setq overlay (make-overlay start-pos (line-beginning-position 0)))
+ (overlay-put overlay 'face 'svn-log-partner-highlight-face)
+ (overlay-put overlay 'svn-log-partner-revision t))))))
+
+(defun svn-log-exchange-partner-mark-with-point ()
+ (interactive)
+ (let ((cur-pos (point))
+ (dest-pos))
+ (dolist (ov (overlays-in (point-min) (point-max)))
+ (when (overlay-get ov 'svn-log-partner-revision)
+ (setq dest-pos (overlay-start ov))))
+ (when dest-pos
+ (svn-log-mark-partner-revision)
+ (goto-char dest-pos)
+ (forward-line 3)
+ (svn-log-view-prev)
+ (svn-log-view-next))))
+
+(defun svn-log-revision-for-diff ()
+ (let ((rev))
+ (dolist (ov (overlays-in (point-min) (point-max)))
+ (when (overlay-get ov 'svn-log-partner-revision)
+ (save-excursion
+ (unless (and (>= (point) (overlay-start ov))
+ (<= (point) (overlay-end ov)))
+ (goto-char (overlay-start ov))
+ (setq rev (svn-log-revision-at-point))))))
+ rev))
+
(defun svn-log-revision-at-point ()
(save-excursion
(end-of-line)
@@ -5293,33 +5434,50 @@ Commands:
"Show the changeset for a given log entry.
When called with a prefix argument, ask the user for the revision."
(interactive "P")
- (svn-status-diff-show-changeset (svn-log-revision-at-point) arg))
+ (svn-status-diff-show-changeset (svn-log-revision-at-point) arg \
(svn-log-revision-for-diff)))
(defun svn-log-get-specific-revision ()
"Get an older revision of the file at point via svn cat."
(interactive)
;; (message "%S" (svn-status-make-line-info (svn-log-file-name-at-point t)))
- (let ((default-directory (svn-status-base-dir)))
- (svn-status-get-specific-revision-internal
- (list (svn-status-make-line-info (svn-log-file-name-at-point t)))
- (svn-log-revision-at-point)
- nil)))
+ (let ((default-directory (svn-status-base-dir))
+ (file-name (svn-log-file-name-at-point t)))
+ (if file-name
+ (svn-status-get-specific-revision-internal
+ (list (svn-status-make-line-info file-name))
+ (svn-log-revision-at-point)
+ nil)
+ (message "No file at point"))))
-(defun svn-log-ediff-specific-revision ()
- "Call ediff for the file at point to view a changeset"
- (interactive)
+(defun svn-log-ediff-specific-revision (&optional user-confirmation)
+ "Call ediff for the file at point to view a changeset.
+When called with a prefix argument, ask the user for the revision."
+ (interactive "P")
;; (message "svn-log-ediff-specific-revision: %s" (svn-log-file-name-at-point t))
(let* ((cur-buf (current-buffer))
- (upper-rev (svn-log-revision-at-point))
- (lower-rev (number-to-string (- (string-to-number upper-rev) 1)))
+ (diff-rev (svn-log-revision-for-diff))
+ (upper-rev (if diff-rev
+ diff-rev
+ (svn-log-revision-at-point)))
+ (lower-rev (if diff-rev
+ (svn-log-revision-at-point)
+ (number-to-string (- (string-to-number upper-rev) 1))))
(file-name (svn-log-file-name-at-point t))
(default-directory (svn-status-base-dir))
- (upper-rev-file-name (when file-name
+ (upper-rev-file-name)
+ (lower-rev-file-name)
+ (rev-arg))
+ (when user-confirmation
+ (setq rev-arg (read-string "Revision for changeset: " (concat lower-rev ":" \
upper-rev))) + (setq lower-rev (car (split-string rev-arg ":")))
+ (setq upper-rev (cadr (split-string rev-arg ":"))))
+ ;;(message "lower-rev: %s, upper-rev: %s" lower-rev upper-rev)
+ (setq upper-rev-file-name (when file-name
(cdar (svn-status-get-specific-revision-internal
(list (svn-status-make-line-info file-name)) \
upper-rev nil))))
- (lower-rev-file-name (when file-name
+ (setq lower-rev-file-name (when file-name
(cdar (svn-status-get-specific-revision-internal
- (list (svn-status-make-line-info file-name)) \
lower-rev nil))))) + (list \
(svn-status-make-line-info file-name)) lower-rev nil)))) ;;(message "%S %S" \
upper-rev-file-name lower-rev-file-name) (if file-name
(let* ((ediff-after-quit-destination-buffer cur-buf)
@@ -5476,6 +5634,8 @@ Currently is the output from the svn upd
(define-key svn-blame-mode-map (kbd "r") 'svn-blame-highlight-revision)
(define-key svn-blame-mode-map (kbd "=") 'svn-blame-show-changeset)
(define-key svn-blame-mode-map (kbd "l") 'svn-blame-show-log)
+ (define-key svn-blame-mode-map (kbd "b") 'svn-blame-blame-again)
+ (define-key svn-blame-mode-map (kbd "s") 'svn-blame-show-statistics)
(define-key svn-blame-mode-map [?q] 'bury-buffer))
(easy-menu-define svn-blame-mode-menu svn-blame-mode-map
@@ -5484,6 +5644,8 @@ Currently is the output from the svn upd
["Jump to source location" svn-blame-open-source-file t]
["Show changeset" svn-blame-show-changeset t]
["Show log" svn-blame-show-log t]
+ ["Show blame again" svn-blame-blame-again t]
+ ["Show statistics" svn-blame-show-statistics t]
["Highlight by author" svn-blame-highlight-author t]
["Highlight by revision" svn-blame-highlight-revision t]))
@@ -5537,7 +5699,9 @@ The current buffer must contain a valid
(delete-region (svn-point-at-bol) (+ (svn-point-at-bol) info-end-col))
(forward-line)
(setq line (1+ line)))))
- (let* ((buf-name (format "*svn-blame: %s*" (file-relative-name \
svn-status-blame-file-name))) + (let* ((buf-name (format "*svn-blame: %s <%s>*"
+ (file-relative-name svn-status-blame-file-name)
+ svn-status-blame-revision))
(buffer (get-buffer buf-name)))
(when buffer
(kill-buffer buffer))
@@ -5612,6 +5776,29 @@ The optional prefix argument ARG determi
(overlay-put hl-ov 'face 'svn-status-blame-highlight-face))))
(forward-line)))))
+(defun svn-blame-show-statistics ()
+ "Show statistics for the current blame buffer."
+ (interactive)
+ (let ((author-map (make-hash-table :test 'equal))
+ (author-list)
+ (author))
+ (save-excursion
+ (goto-char (point-min))
+ (while (not (eobp))
+ (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
+ (when (overlay-get ov 'svn-blame-line-info)
+ (setq author (cadr (overlay-get ov 'rev-info)))
+ (svn-puthash author
+ (+ (gethash author author-map 0) 1)
+ author-map)))
+ (forward-line))
+ (maphash '(lambda (key value) (add-to-list 'author-list (list key value))) \
author-map) + (pop-to-buffer (get-buffer-create (replace-regexp-in-string \
"svn-blame:" "svn-blame-statistics:" (buffer-name)))) + (erase-buffer)
+ (dolist (line (sort author-list '(lambda (v1 v2) (> (cadr v1) (cadr v2)))))
+ (insert (format "%s: %s line%s\n" (car line) (cadr line) (if (eq (cadr line) \
1) "" "s")))) + (goto-char (point-min)))))
+
(defun svn-blame-highlight-author-field (ov)
(cadr (overlay-get ov 'rev-info)))
Modified: branches/file-externals/notes/tree-conflicts/design-overview.txt
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/notes/tree-conflicts/design-overview.txt?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/notes/tree-conflicts/design-overview.txt Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/notes/tree-conflicts/design-overview.txt Wed Jul 30 \
08:04:13 2008 (r32332) @@ -16,7 +16,7 @@ Tree conflict handling spans the followi
Purpose:
Determine whether each incoming change conflicts with the state of the WC
- receiving the change. If so, record the fact and and ensure that sufficient
+ receiving the change. If so, record the fact and ensure that sufficient
information is preserved to enable the user to resolve the conflict. Allow
the operation to continue on to process other items that are not affected by
this conflict.
Modified: branches/file-externals/notes/tree-conflicts/detection.txt
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/notes/tree-conflicts/detection.txt?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/notes/tree-conflicts/detection.txt Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/notes/tree-conflicts/detection.txt Wed Jul 30 08:04:13 \
2008 (r32332) @@ -23,38 +23,59 @@ USE CASE 1
==========
Files:
+
If 'svn update' modifies a file that has been scheduled for deletion
in the working copy, the file is a tree conflict victim.
Directories:
-If 'svn update' modifies a directory that has been scheduled for
-deletion in the working copy, the directory is a tree conflict victim.
+
+If 'svn update' modifies any item (including adding or deleting a file
+or directory) in a directory that has been scheduled for deletion in
+the working copy, each item modified by the update is a tree conflict
+victim.
+
+Our tree conflict detection will be part of the update's crawl of the
+working copy.
+
+The persistent conflict data will be stored in the metadata of the
+parent of the directory scheduled for deletion.
==========
USE CASE 2
==========
Files:
+
If 'svn update' deletes a file that has local modifications, the file
is a tree conflict victim.
Directories:
-If 'svn update' deletes a directory that has local modifications,
-the directory is a tree conflict victim.
-See the "NOTES ON DIRECTORIES" section for details on what it means
-for a directory to be "modified".
+
+If 'svn update' deletes a directory that has local modifications
+(including items scheduled to be added or deleted), each locally
+modified item is a tree conflict victim.
+
+The update crawls the to-be-deleted directory tree before actually
+deleting it. Subversion metadata and unmodified files are deleted,
+and any locally-modified files are preserved. We would like to
+piggyback our tree conflict detection code onto this existing crawl.
+
+The persistent conflict data will be stored in the metadata of the
+parent of the directory deleted by the update.
==========
USE CASE 3
==========
Files:
+
If 'svn update' deletes a file that has been scheduled for deletion in
the working copy, the file is a tree conflict victim.
Directories:
-If 'svn update' deletes a directory that has been scheduled for deletion in
-the working copy, the directory is a tree conflict victim.
+
+If 'svn update' deletes a directory that has been scheduled for
+deletion in the working copy, the directory is a tree conflict victim.
==========
USE CASE 4
@@ -65,40 +86,35 @@ merge-command baton is TRUE. A record-on
mergeinfo without touching files.
Files:
+
If 'svn merge' tries to modify a file that does not exist in the
target working copy, then the target file is a tree conflict victim.
Notes on Resolution
-------------------
-A likely cause of this case is that the source diff doesn't cover as
-many revisions as it should. The file should either be brought in by
-adding the revision that created the file to the list of revisions
-to be merged, or changes made to it on the source branch should be
-omitted from the merge range entirely.
-
-If the user does not wish to choose a source diff that avoids this
-conflict, then the user must resolve the conflict manually.
-
-If a modification to the nonexistent file is part of a larger diff
-with changes to other files that should be merged, the user will
-need to be able to manually resolve the tree-conflict while keeping
-the desired changes.
-
-Users must be able to run a second merge command to resolve the
-tree-conflict, or repeat a previous merge operation, but with
-additional revisions, without harm.
+Often, the target file has been renamed in the history of the working
+copy's branch. It would be handy if the user could run 'svn merge'
+again, specifying which file should receive the incoming diff. This is
+the "ELSEWHERE" scenario discussed in
+notes/tree-conflicts/resolution.txt.
+
+A similar situation occurs if the source diff doesn't cover as many
+revisions as it should. Either the range of the source diff should be
+extended to include the revision that created the file, or the range
+should be reduced to avoid including any revisions that modify the
+file.
However, the current plan is to disallow merges into tree-conflicted
directories. This means that users will first have to mark the
tree-conflict around the missing victim as resolved before attempting
-to merge the file again, this time including the revision that created
-the file. This may be a bit of an awkward work flow but is required to
-solve the problem this use case has in the current implementation,
-namely that missing files may accidentally be overlooked during merging.
+to merge the file again. This work flow may be awkward, but has the
+benefit of ensuring that no missing files are overlooked while
+merging.
Directories:
+
If 'svn merge' tries to modify a directory that does not exist in the
target working copy, then the target directory is a tree conflict victim.
@@ -111,12 +127,12 @@ merge-command baton is TRUE. A record-on
mergeinfo without touching files.
Files:
-If 'svn merge' deletes an existing file, the file is a tree conflict
-victim if its text is different from the corresponding file on the left
-side of the merge source.
-To account for uncommitted text modifications in the working copy,
-we should do any text comparisons against the WORKING revision.
+If 'svn merge' deletes an existing file, the file is a tree conflict
+victim if its text is different from the corresponding file on the
+left side of the merge source. The merge-left source file will be
+compared to the "WORKING revision", which includes uncommitted local
+changes.
Rationale:
@@ -132,6 +148,7 @@ file at the left side of the merge sourc
Directories:
+
If 'svn merge' deletes an existing directory, the directory is a tree
conflict victim if its content is different from the corresponding
directory on the left side of the merge source.
@@ -148,6 +165,7 @@ merge-command baton is TRUE. A record-on
mergeinfo without touching files.
Files:
+
If 'svn merge' tries to delete a file that does not exist in the
target working copy, then the target file is a tree conflict victim.
@@ -163,6 +181,7 @@ has already been moved to a different na
Notes on Resolution
-------------------
+
Some users may want to skip the tree conflict and have the result automatically
resolved if two rename operations have the same destination, or if a file is
simply deleted on both branches. But we have to mark these as tree conflicts
@@ -170,6 +189,7 @@ due to the current lack of "true rename"
feasible to detect more than the double-delete aspect of the move operation.
Directories:
+
If 'svn merge' tries to delete a directory that does not exist in the
target working copy, then the target directory is a tree conflict victim.
@@ -178,11 +198,13 @@ OBSTRUCTIONS DURING MERGE
=========================
Files:
+
If 'svn merge' fails to apply an operation to a file because the
file is obstructed (i.e. an unversioned item of the same name is
in the file's place), the obstructed file is a tree conflict victim.
Directories:
+
If 'svn merge' fails to apply an operation to a directory because the
directory is obstructed (i.e. an unversioned item of the same name is
in the directory's place), the obstructed directory is a tree conflict
@@ -246,6 +268,83 @@ is passed to merge_dir_deleted().
The last two paragraphs were taken from:
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=136794
+=======================================
+Deep tree conflict example (use case 1)
+=======================================
+
+In a working copy, a directory named B is scheduled for deletion.
+Running 'svn status' lists the entire tree rooted at B.
+
+ D A/B/E/alpha
+ D A/B/E/beta
+ D A/B/E
+ D A/B/F
+ D A/B
+
+Running 'svn status -uq' warns that the repository contains changes to
+the locally-deleted directory.
+
+ D * 1 A/B
+ Status against revision: 2
+
+Updating the working copy modifies one file, deletes another file,
+deletes a directory, and adds a file and a directory.
+
+ U A/B/E/alpha
+ D A/B/E/beta
+ A A/B/E/gamma
+ D A/B/F
+ A A/B/G
+ C A
+
+The 5 tree conflicts revealed by the update are recorded in the
+metadata of directory A. They are described by 'svn info'.
+
+ The update attempted to edit 'A/B/E/alpha'.
+ You have deleted or renamed 'A/B' locally.
+
+ The update has deleted 'A/B/E/beta'
+ (possibly as part of a rename operation).
+ You have deleted or renamed 'A/B' locally.
+
+ The update has added 'A/B/E/gamma'
+ You have deleted or renamed 'A/B' locally.
+
+ The update has deleted 'A/B/F'
+ (possibly as part of a rename operation).
+ You have deleted or renamed 'A/B' locally.
+
+ The update has added 'A/B/G'
+ You have deleted or renamed 'A/B' locally.
+
+Note: The wording of the warnings is not yet settled.
+
+What is the current state of the working copy?
+
+* F and beta are completely gone from the working copy because they
+ don't exist in the target revision.
+
+* B, E, and alpha are still scheduled for deletion.
+
+* The update's edit to alpha was applied to the "pristine copy" hidden
+ in A/B/E/.svn/text-base, for use by the diff and revert commands.
+
+* The newly-added G and gamma are not scheduled for deletion, but will
+ be deleted if the user commits the deletion of B.
+
+* Any commit of A (including any commit in a parent directory or
+ subdirectory of A) will be blocked by the tree conflicts.
+
+Except for the blocked commit (and the output of update, status, and
+info) the behavior is the same as Subversion 1.5.
+
+Technical note: In a deep tree conflict, the action target is not the
+tree conflict victim. We'll have to populate the 'path' field in the
+conflict struct, which we haven't done before. The functions that
+record tree conflict data must accept the extra path argument
+for the action. The functions that create readable tree conflict
+descriptions must use the 'path' field when describing the action.
+
=========================================
TREE CONFLICT DETECTION WITH TRUE RENAMES
=========================================
Modified: branches/file-externals/notes/tree-conflicts/resolution.txt
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/notes/tree-conflicts/resolution.txt?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/notes/tree-conflicts/resolution.txt Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/notes/tree-conflicts/resolution.txt Wed Jul 30 08:04:13 \
2008 (r32332) @@ -71,7 +71,7 @@ opposed to choosing just one and ignorin
* Recipes for the user to follow
- see the "Tree Conflict Resolution Recipes" section.
- * Enhanced facilites for merging changes from conflicting partial results
+ * Enhanced facilities for merging changes from conflicting partial results
into the desired result.
- see the "Arbitrary Merge Facility Required" section.
@@ -129,7 +129,7 @@ An incoming rename is treated here as it
incoming delete and an incoming add - separately.
In an incoming replacement, the delete is assumed to come before the add.
-(Currently, they may sometimes come the wrong way around. I have not analysed
+(Currently, they may sometimes come the wrong way around. I have not analyzed
the cases in which this can happen, nor the consequences.)
Where the ability to schedule a replacement of one node kind with another is
Modified: branches/file-externals/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/javahl/native/CopySources.cpp?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/javahl/native/CopySources.cpp Wed Jul \
30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/javahl/native/CopySources.cpp Wed Jul \
30 08:04:13 2008 (r32332) @@ -164,7 +164,7 @@ CopySources::array(Pool &pool)
static jmethodID getPegRevision = 0;
if (getPegRevision == 0)
{
- getPegRevision = env->GetMethodID(clazz, "getRevision",
+ getPegRevision = env->GetMethodID(clazz, "getPegRevision",
"()L"JAVA_PACKAGE"/Revision;");
if (JNIUtil::isJavaExceptionThrown() || getPegRevision == 0)
return NULL;
Modified: branches/file-externals/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/javahl/native/EnumMapper.cpp?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/javahl/native/EnumMapper.cpp Wed Jul \
30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/javahl/native/EnumMapper.cpp Wed Jul \
30 08:04:13 2008 (r32332) @@ -34,7 +34,7 @@
#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h"
#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h"
#include "../include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h"
-#include "../include/org_tigris_subversion_javahl_Depth.h";
+#include "../include/org_tigris_subversion_javahl_Depth.h"
/**
* Map a C commit state flag constant to the Java constant.
Modified: branches/file-externals/subversion/bindings/javahl/native/Pool.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/javahl/native/Pool.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/javahl/native/Pool.h Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/javahl/native/Pool.h Wed Jul 30 \
08:04:13 2008 (r32332) @@ -52,14 +52,14 @@ class Pool
* valid...and BOOM! Hence the private declaration.
*/
Pool(Pool &that);
- Pool &operator= (Pool &that);
+ Pool &operator=(Pool &that);
};
// The following one-line functions are best inlined by the compiler, and
// need to be implemented in the header file for that to happen.
APR_INLINE
-apr_pool_t *Pool::pool () const
+apr_pool_t *Pool::pool() const
{
return m_pool;
}
Modified: branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java Wed \
Jul 30 08:04:13 2008 (r32332) @@ -1,7 +1,7 @@
/**
* @copyright
* ====================================================================
- * Copyright (c) 2006 CollabNet. All rights reserved.
+ * Copyright (c) 2006, 2008 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -39,4 +39,23 @@ public class Path
* @return Whether Subversion can store the path in a repository.
*/
public static native boolean isValid(String path);
+
+ /**
+ * Whether a URL is valid. Implementation may behave differently
+ * than <code>svn_path_is_url()</code>.
+ *
+ * @param path The Subversion "path" to inspect.
+ * @return Whether <code>path</code> is a URL.
+ * @throws IllegalArgumentException If <code>path</code> is
+ * <code>null</code>.
+ */
+ public static boolean isURL(String path)
+ {
+ if (path == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ // Require at least "s://".
+ return (path.indexOf("://") > 0);
+ }
}
Modified: branches/file-externals/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/java \
hl/tests/org/tigris/subversion/javahl/BasicTests.java?pathrev=32332&r1=32331&r2=32332 \
==============================================================================
--- branches/file-externals/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Wed \
Jul 30 08:04:13 2008 (r32332) @@ -144,6 +144,38 @@ public class BasicTests extends \
SVNTests }
/**
+ * Tests Subversion path as URL predicate.
+ */
+ public void testPathIsURL() throws Throwable
+ {
+ try
+ {
+ Path.isURL(null);
+ fail("A null path should raise an exception");
+ }
+ catch (IllegalArgumentException expected)
+ {
+ }
+
+ // Subversion "paths" which aren't URLs.
+ String[] paths = { "/path", "c:\\path" };
+ for (int i = 0; i < paths.length; i++)
+ {
+ assertFalse("'" + paths[i] + "' should not be considered a URL",
+ Path.isURL(paths[i]));
+ }
+
+ // Subversion "paths" which are URLs.
+ paths = new String[] { "http://example.com", "svn://example.com",
+ "svn+ssh://example.com", "file:///src/svn/" };
+ for (int i = 0; i < paths.length; i++)
+ {
+ assertTrue("'" + paths[i] + "' should be considered a URL",
+ Path.isURL(paths[i]));
+ }
+ }
+
+ /**
* Tests Mergeinfo and RevisionRange classes.
* @since 1.5
*/
Modified: branches/file-externals/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/swig/include/svn_containers.swg?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/swig/include/svn_containers.swg Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/swig/include/svn_containers.swg Wed \
Jul 30 08:04:13 2008 (r32332) @@ -354,6 +354,13 @@
}
#endif
+#ifdef SWIGPERL
+%typemap(in) apr_hash_t *path_revs
+{
+ $1 = svn_swig_pl_objs_to_hash_of_revnum_t($input, _global_pool);
+}
+#endif
+
/* =======================================================================
%typemap(argout) apr_array_header_t **
*/
Modified: branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c Wed \
Jul 30 08:04:13 2008 (r32332) @@ -84,6 +84,13 @@ static void *convert_pl_obj(SV \
*value, s return *result;
}
+static void *convert_pl_revnum_t(SV *value, void *dummy, apr_pool_t *pool)
+{
+ svn_revnum_t *result = apr_palloc(pool, sizeof(svn_revnum_t));
+ *result = SvIV(value);
+ return (void *)result;
+}
+
/* perl -> c hash convertors */
static apr_hash_t *svn_swig_pl_to_hash(SV *source,
pl_element_converter_t cv,
@@ -133,6 +140,15 @@ apr_hash_t *svn_swig_pl_objs_to_hash_by_
return svn_swig_pl_objs_to_hash(source, tinfo, pool);
}
+apr_hash_t *svn_swig_pl_objs_to_hash_of_revnum_t(SV *source,
+ apr_pool_t *pool)
+{
+
+ return svn_swig_pl_to_hash(source,
+ (pl_element_converter_t)convert_pl_revnum_t,
+ NULL, pool);
+}
+
/* perl -> c array convertors */
static const
apr_array_header_t *svn_swig_pl_to_array(SV *source,
@@ -1418,6 +1434,25 @@ svn_error_t *svn_swig_pl_make_stream(svn
return SVN_NO_ERROR;
}
+svn_error_t *svn_swig_pl_ra_lock_callback(
+ void *baton,
+ const char *path,
+ svn_boolean_t do_lock,
+ const svn_lock_t *lock,
+ svn_error_t *ra_err,
+ apr_pool_t *pool)
+{
+ if (!SvOK((SV *)baton))
+ return SVN_NO_ERROR;
+
+ SVN_ERR(svn_swig_pl_callback_thunk(CALL_SV, baton, NULL, "sbSSS",
+ path, do_lock,
+ lock, _SWIG_TYPE("svn_lock_t *"),
+ ra_err, _SWIG_TYPE("svn_error_t *"),
+ pool, POOLINFO));
+ return SVN_NO_ERROR;
+}
+
SV *svn_swig_pl_from_stream(svn_stream_t *stream)
{
SV *ret;
Modified: branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h Wed \
Jul 30 08:04:13 2008 (r32332) @@ -74,6 +74,8 @@ svn_error_t \
*svn_swig_pl_callback_thunk( SV *svn_swig_pl_prophash_to_hash(apr_hash_t *hash);
SV *svn_swig_pl_convert_hash(apr_hash_t *hash, swig_type_info *tinfo);
+SV *svn_swig_pl_convert_hash_of_revnum_t(apr_hash_t *hash);
+
const apr_array_header_t *svn_swig_pl_strings_to_array(SV *source,
apr_pool_t *pool);
@@ -84,6 +86,8 @@ apr_hash_t *svn_swig_pl_objs_to_hash(SV
apr_hash_t *svn_swig_pl_objs_to_hash_by_name(SV *source,
const char *typename,
apr_pool_t *pool);
+apr_hash_t *svn_swig_pl_objs_to_hash_of_revnum_t(SV *source,
+ apr_pool_t *pool);
const apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
swig_type_info *tinfo,
apr_pool_t *pool);
@@ -243,6 +247,12 @@ void svn_swig_pl_hold_ref_in_pool(apr_po
/* md5 access class */
SV *svn_swig_pl_from_md5(unsigned char *digest);
+svn_error_t *svn_swig_pl_ra_lock_callback(void *baton,
+ const char *path,
+ svn_boolean_t do_lock,
+ const svn_lock_t *lock,
+ svn_error_t *ra_err,
+ apr_pool_t *pool);
#ifdef __cplusplus
}
Modified: branches/file-externals/subversion/bindings/swig/python/tests/client.py
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/swig/python/tests/client.py?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/swig/python/tests/client.py Wed Jul \
30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/bindings/swig/python/tests/client.py Wed Jul \
30 08:04:13 2008 (r32332) @@ -26,8 +26,10 @@ class SubversionClientTestCase(unittest.
self.client_ctx = client.svn_client_create_context()
self.assertEquals(self.client_ctx.log_msg_baton2, None)
self.assertEquals(self.client_ctx.log_msg_func2, None)
- self.client_ctx.log_msg_func2 = client.svn_swig_py_get_commit_log_func
- self.client_ctx.log_msg_baton2 = self.log_message_func
+ self.assertEquals(self.client_ctx.log_msg_baton3, None)
+ self.assertEquals(self.client_ctx.log_msg_func3, None)
+ self.client_ctx.log_msg_func3 = client.svn_swig_py_get_commit_log_func
+ self.client_ctx.log_msg_baton3 = self.log_message_func
self.log_message_func_calls = 0
self.log_message = None
self.changed_paths = None
@@ -67,16 +69,16 @@ class SubversionClientTestCase(unittest.
"""Test direct method calls to callbacks"""
# Directly invoking the msg_baton should work
- self.client_ctx.log_msg_baton2(None, None)
- b = self.client_ctx.log_msg_baton2
+ self.client_ctx.log_msg_baton3(None, None)
+ b = self.client_ctx.log_msg_baton3
b(None, None)
self.assertEqual(self.log_message_func_calls, 2)
- # You can also invoke the log_msg_func2. It'd be
- # nice if we could get log_msg_func2 function
+ # You can also invoke the log_msg_func3. It'd be
+ # nice if we could get log_msg_func3 function
# to invoke the baton function, but, in order to do that,
# we'd need to supply a value for the first parameter.
- self.client_ctx.log_msg_func2(None, self.client_ctx.log_msg_baton2)
+ self.client_ctx.log_msg_func3(None, self.client_ctx.log_msg_baton3)
def info_receiver(self, path, info, pool):
"""Squirrel away the output from 'svn info' so that the unit tests
Modified: branches/file-externals/subversion/bindings/swig/svn_ra.i
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/bindings/swig/svn_ra.i?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/bindings/swig/svn_ra.i Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/bindings/swig/svn_ra.i Wed Jul 30 08:04:13 \
2008 (r32332) @@ -95,12 +95,10 @@
svn_swig_rb_ra_file_rev_handler)
#endif
-#ifndef SWIGPERL
%callback_typemap(svn_ra_lock_callback_t lock_func, void *lock_baton,
svn_swig_py_ra_lock_callback,
- ,
+ svn_swig_pl_ra_lock_callback,
svn_swig_rb_ra_lock_callback)
-#endif
/* ----------------------------------------------------------------------- */
Modified: branches/file-externals/subversion/include/private/svn_auth_private.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/private/svn_auth_private.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/private/svn_auth_private.h Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/include/private/svn_auth_private.h Wed Jul 30 \
08:04:13 2008 (r32332) @@ -39,6 +39,7 @@ extern "C" {
/* A function that stores in *PASSWORD (potentially after decrypting it)
the user's password. It might be obtained directly from CREDS, or
from an external store, using REALMSTRING and USERNAME as keys.
+ (The behavior is undefined if REALMSTRING or USERNAME are NULL.)
If NON_INTERACTIVE is set, the user must not be involved in the
retrieval process. POOL is used for any necessary allocation. */
typedef svn_boolean_t (*svn_auth__password_get_t)
@@ -93,6 +94,38 @@ svn_auth__simple_save_creds_helper(svn_b
const char *passtype,
apr_pool_t *pool);
+/* Common implementation for ssl_client_cert_pw_file_first_credentials.
+ Uses PARAMETERS, REALMSTRING and the ssl client passphrase auth provider's
+ passphrase cache to fill the CREDENTIALS. PASSPHRASE_GET is used to obtain
+ the passphrase value. PASSTYPE identifies the type of the cached passphrase.
+ CREDENTIALS are allocated from POOL. */
+svn_error_t *
+svn_auth__ssl_client_cert_pw_file_first_creds_helper
+ (void **credentials,
+ void **iter_baton,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ svn_auth__password_get_t passphrase_get,
+ const char *passtype,
+ apr_pool_t *pool);
+
+/* Common implementation for ssl_client_cert_pw_file_save_credentials and
+ Uses PARAMETERS and REALMSTRING to save a set of CREDENTIALS to the ssl
+ client cert auth provider's passphrase cache. PASSPHRASE_SET is used to
+ store the passphrase. PASSTYPE identifies the type of the cached passphrase.
+ Allocates from POOL. */
+svn_error_t *
+svn_auth__ssl_client_cert_pw_file_save_creds_helper
+ (svn_boolean_t *saved,
+ void *credentials,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ svn_auth__password_set_t passphrase_set,
+ const char *passtype,
+ apr_pool_t *pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Copied: branches/file-externals/subversion/include/private/svn_cmdline_private.h \
(from r32331, trunk/subversion/include/private/svn_cmdline_private.h) \
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/file-externals/subversion/include/private/svn_cmdline_private.h Wed Jul \
30 08:04:13 2008 (r32332, copy of r32331, \
trunk/subversion/include/private/svn_cmdline_private.h) @@ -0,0 +1,49 @@
+/**
+ * @copyright
+ * ====================================================================
+ * Copyright (c) 2008 CollabNet. All rights reserved.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://subversion.tigris.org/license-1.html.
+ * If newer versions of this license are posted there, you may use a
+ * newer version instead, at your option.
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals. For exact contribution history, see the revision
+ * history and logs, available at http://subversion.tigris.org/.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file svn_cmdline_private.h
+ * @brief Private functions for Subversion cmdline.
+ */
+
+#ifndef SVN_CMDLINE_PRIVATE_H
+#define SVN_CMDLINE_PRIVATE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/** Write a property as an XML element into @a *outstr.
+ *
+ * If @a outstr is NULL, allocate @a *outstr in @a pool; else append to
+ * @a *outstr, allocating in @a outstr's pool
+ *
+ * @a propname is the property name. @a propval is the property value, which
+ * will be encoded if it contains unsafe bytes.
+ *
+ * @since New in 1.6.
+ */
+void
+svn_cmdline__print_xml_prop(svn_stringbuf_t **outstr,
+ const char *propname,
+ svn_string_t *propval,
+ apr_pool_t *pool);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_CMDLINE_PRIVATE_H */
Modified: branches/file-externals/subversion/include/svn_auth.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_auth.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_auth.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_auth.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -238,6 +238,11 @@ typedef struct svn_auth_cred_ssl_client_
} svn_auth_cred_ssl_client_cert_t;
+/** A function returning an SSL client certificate passphrase provider. */
+typedef void (*svn_auth_ssl_client_cert_pw_provider_func_t)
+ (svn_auth_provider_object_t **provider,
+ apr_pool_t *pool);
+
/** SSL client certificate passphrase credential type.
*
* @note The realmstring used with this credential type must be a name that
@@ -500,6 +505,38 @@ typedef svn_error_t *(*svn_auth_plaintex
void *baton,
apr_pool_t *pool);
+/** Called only by providers which save passphrase unencrypted.
+ * In this callback, clients should ask the user whether storing
+ * a passphrase for the realm identified by @a realmstring to disk
+ * in plaintext is allowed.
+ *
+ * The answer is returned in @a *may_save_plaintext.
+ * @a baton is an implementation-specific closure.
+ * All allocations should be done in @a pool.
+ *
+ * This callback is called only once per authentication realm,
+ * not once per RA session. This means that clients implementing
+ * this callback must make sure that the pool passed to any
+ * implementation of save_credentials (part of svn_auth_provider_t)
+ * survives across RA sessions.
+ *
+ * If this callback is NULL it is not called.
+ * Client developers are highly encouraged to provide this callback
+ * to ensure their users are made aware of the fact that their passphrase
+ * is going to be stored unencrypted.
+ *
+ * Clients can however set the callback to NULL and set
+ * SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT to SVN_CONFIG_FALSE or
+ * SVN_CONFIG_TRUE to enforce a certain behaviour.
+ *
+ * @since New in 1.6
+ */
+typedef svn_error_t *(*svn_auth_plaintext_passphrase_prompt_func_t)
+ (svn_boolean_t *may_save_plaintext,
+ const char *realmstring,
+ void *baton,
+ apr_pool_t *pool);
+
/** Initialize an authentication system.
*
@@ -572,6 +609,18 @@ const void * svn_auth_get_parameter(svn_
#define SVN_AUTH_PARAM_STORE_PLAINTEXT_PASSWORDS SVN_AUTH_PARAM_PREFIX \
"store-plaintext-passwords"
+/** @brief The application doesn't want any providers to save passphrase
+ * to disk. Property value is irrelevant; only property's existence
+ * matters. */
+#define SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP \
+ SVN_AUTH_PARAM_PREFIX "dont-store-ssl-client-cert-pp"
+
+/** @brief Indicates whether providers may save passphrase to disk in
+ * plaintext. Property value can be either SVN_CONFIG_TRUE,
+ * SVN_CONFIG_FALSE, or SVN_CONFIG_ASK. */
+#define SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT \
+ SVN_AUTH_PARAM_PREFIX "store-ssl-client-cert-pp-plaintext"
+
/** @brief The application doesn't want any providers to save credentials
* to disk. Property value is irrelevant; only property's existence
* matters. */
@@ -832,12 +881,29 @@ void svn_auth_get_ssl_client_cert_file_p
/** Create and return @a *provider, an authentication provider of type @c
- * svn_auth_cred_ssl_client_cert_pw_t, allocated in @a pool.
+ * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the user's
+ * ~/.subversion configuration directory.
*
- * @a *provider retrieves its credentials from the configuration
- * mechanism. The returned credential is used when a loaded client
- * certificate is protected by a passphrase.
+ * If the provider is going to save the passphrase unencrypted,
+ * it calls @a plaintext_passphrase_prompt_func before saving the
+ * passphrase.
*
+ * @a prompt_baton is passed to @a plaintext_passphrase_prompt_func.
+ *
+ * Allocate @a *provider in @a pool.
+ *
+ * @since New in 1.6.
+ */
+void svn_auth_get_ssl_client_cert_pw_file_provider2
+ (svn_auth_provider_object_t **provider,
+ svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func,
+ void *prompt_baton,
+ apr_pool_t *pool);
+
+/** Like svn_auth_get_simple_provider2, but without the ability to
+ * call the svn_auth_plaintext_passphrase_prompt_func_t callback.
+ *
+ * @deprecated Provided for backwards compatibility with the 1.5 API.
* @since New in 1.4.
*/
void svn_auth_get_ssl_client_cert_pw_file_provider
Modified: branches/file-externals/subversion/include/svn_auth_dso.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_auth_dso.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_auth_dso.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_auth_dso.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -51,6 +51,25 @@ svn_auth_get_gnome_keyring_simple_provid
/**
* Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the
+ * user's ~/.subversion configuration directory. Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_ssl_client_cert_pw_file_provider(), except
+ * that the password is stored in GNOME Keyring.
+ *
+ * @since New in 1.6
+ * @note This function actually works only on systems with
+ * libsvn_auth_gnome_keyring and GNOME Keyring installed.
+ */
+void
+svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider
+ (svn_auth_provider_object_t **provider,
+ apr_pool_t *pool);
+
+
+/**
+ * Create and return @a *provider, an authentication provider of type @c
* svn_auth_cred_simple_t that gets/sets information from the user's
* ~/.subversion configuration directory. Allocate @a *provider in
* @a pool.
Modified: branches/file-externals/subversion/include/svn_client.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_client.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_client.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_client.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -1110,7 +1110,7 @@ svn_client_checkout(svn_revnum_t *result
* their sticky ambient depth value to @a depth.
*
* If @a allow_unver_obstructions is TRUE then the update tolerates
- * existing unversioned items that obstruct added paths from @a URL. Only
+ * existing unversioned items that obstruct added paths. Only
* obstructions of the same type (file or dir) as the added item are
* tolerated. The text of obstructing files is left as-is, effectively
* treating it as a user modification after the update. Working
@@ -1207,7 +1207,7 @@ svn_client_update(svn_revnum_t *result_r
* as part of this operation.
*
* If @a allow_unver_obstructions is TRUE then the switch tolerates
- * existing unversioned items that obstruct added paths from @a URL. Only
+ * existing unversioned items that obstruct added paths. Only
* obstructions of the same type (file or dir) as the added item are
* tolerated. The text of obstructing files is left as-is, effectively
* treating it as a user modification after the switch. Working
@@ -3552,8 +3552,8 @@ svn_client_revprop_get(const char *propn
* repository.
*
* If @a depth is @c svn_depth_empty, list only the properties of
- * @a path_or_url itself. If @a depth is @c svn_depth_files, and
- * @a path_or_url is a directory, list the properties of @a path_or_url
+ * @a target itself. If @a depth is @c svn_depth_files, and
+ * @a target is a directory, list the properties of @a target
* and its file entries. If @c svn_depth_immediates, list the properties
* of its immediate file and directory entries. If @c svn_depth_infinity,
* list the properties of its file entries and recurse (with
@@ -3690,12 +3690,6 @@ svn_client_revprop_list(apr_hash_t **pro
* its immediate file children (if any) only. If @a depth is @c
* svn_depth_empty, then export exactly @a from and none of its children.
*
- * If @a recurse is TRUE, export recursively. Otherwise, export
- * just the directory represented by @a from and its immediate
- * non-directory children, but none of its child directories (if any).
- * Also, if @a recurse is FALSE, the export will behave as if
- * @a ignore_externals is TRUE.
- *
* All allocations are done in @a pool.
*
* @since New in 1.5.
@@ -4042,7 +4036,7 @@ svn_client_remove_from_changelists(const
apr_pool_t *pool);
/**
- * The callback type used by @a svn_client_get_changelist
+ * The callback type used by svn_client_get_changelists().
*
* On each invocation, @a path is a newly discovered member of the
* changelist, and @a baton is a private function closure.
Modified: branches/file-externals/subversion/include/svn_cmdline.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_cmdline.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_cmdline.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_cmdline.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -277,15 +277,55 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
void *baton,
apr_pool_t *pool);
+/** An implementation of @c svn_auth_plaintext_passphrase_prompt_func_t that
+ * prompts the user whether storing unencypted passphrase to disk is OK.
+ *
+ * @since New in 1.6.
+ */
+svn_error_t *
+svn_cmdline_auth_plaintext_passphrase_prompt(svn_boolean_t *may_save_plaintext,
+ const char *realmstring,
+ void *baton,
+ apr_pool_t *pool);
+
/** Initialize auth baton @a ab with the standard set of authentication
- * providers used by the command line client. @a non_interactive,
- * @a username, @a password, @a config_dir, and @a no_auth_cache are the
- * values of the command line options of the same names. @a cfg is the
- * @c SVN_CONFIG_CATEGORY_CONFIG configuration, and @a cancel_func and
- * @a cancel_baton control the cancellation of the prompting providers
- * that are initialized. @a pool is used for all allocations.
+ * providers used by the command line client.
+ *
+ * @a non_interactive, @a username, @a password, @a config_dir,
+ * @a no_auth_cache, and @a trust_server_cert are the values of the
+ * command line options of the corresponding names.
+ *
+ * @a cfg is the @c SVN_CONFIG_CATEGORY_CONFIG configuration, and
+ * @a cancel_func and @a cancel_baton control the cancellation of the
+ * prompting providers that are initialized.
*
+ * Use @a pool for all allocations.
+ *
+ * @since New in 1.6.
+ */
+svn_error_t *
+svn_cmdline_set_up_auth_baton(svn_auth_baton_t **ab,
+ svn_boolean_t non_interactive,
+ const char *username,
+ const char *password,
+ const char *config_dir,
+ svn_boolean_t no_auth_cache,
+ svn_boolean_t trust_server_cert,
+ svn_config_t *cfg,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
+
+/** Similar to svn_cmdline_set_up_auth_baton(), but with
+ * @a trust_server_cert always set to false.
+ *
* @since New in 1.4.
+ * @deprecated Provided for backward compatibility with the 1.5 API.
+ *
+ * @note This deprecation does not follow the usual pattern of putting
+ * a new number on end of the function's name. Instead, the new
+ * function name is distinguished from the old by a grammatical
+ * improvement: the verb "set_up" instead of the noun "setup".
*/
svn_error_t *
svn_cmdline_setup_auth_baton(svn_auth_baton_t **ab,
Modified: branches/file-externals/subversion/include/svn_config.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_config.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_config.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_config.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -77,6 +77,9 @@ typedef struct svn_config_t svn_config_t
#define SVN_CONFIG_OPTION_STORE_PASSWORDS "store-passwords"
#define SVN_CONFIG_OPTION_STORE_PLAINTEXT_PASSWORDS "store-plaintext-passwords"
#define SVN_CONFIG_OPTION_STORE_AUTH_CREDS "store-auth-creds"
+#define SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP "store-ssl-client-cert-pp"
+#define SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT \
+ "store-ssl-client-cert-pp-plaintext"
#define SVN_CONFIG_CATEGORY_CONFIG "config"
#define SVN_CONFIG_SECTION_AUTH "auth"
@@ -146,9 +149,12 @@ typedef struct svn_config_t svn_config_t
/* Default values for some options. Should be passed as default values
* to svn_config_get and friends, instead of hard-coding the defaults in
* multiple places. */
-#define SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS TRUE
-#define SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS SVN_CONFIG_ASK
-#define SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS TRUE
+#define SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS TRUE
+#define SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS SVN_CONFIG_ASK
+#define SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS TRUE
+#define SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP TRUE
+#define SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT \
+ SVN_CONFIG_ASK
/** Read configuration information from the standard sources and merge it
* into the hash @a *cfg_hash. If @a config_dir is not NULL it specifies a
Modified: branches/file-externals/subversion/include/svn_delta.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_delta.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_delta.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_delta.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -88,7 +88,7 @@ enum svn_delta_action {
/** Append the @a length bytes at @a offset in the source view to the
* target.
*
- * It must be the case that @a 0 <= @a offset < @a offset +
+ * It must be the case that 0 <= @a offset < @a offset +
* @a length <= size of source view.
*/
svn_txdelta_source,
@@ -96,7 +96,7 @@ enum svn_delta_action {
/** Append the @a length bytes at @a offset in the target view, to the
* target.
*
- * It must be the case that @a 0 <= @a offset < current position in the
+ * It must be the case that 0 <= @a offset < current position in the
* target view.
*
* However! @a offset + @a length may be *beyond* the end of the existing
@@ -105,7 +105,7 @@ enum svn_delta_action {
* it'll work out --- you're adding new bytes to the end at the
* same rate you're reading them from the middle. Thus, if your
* current target text is "abcdefgh", and you get an @c svn_txdelta_target
- * instruction whose @a offset is @a 6 and whose @a length is @a 7,
+ * instruction whose @a offset is 6 and whose @a length is 7,
* the resulting string is "abcdefghghghghg". This trick is actually
* useful in encoding long runs of consecutive characters, long runs
* of CR/LF pairs, etc.
@@ -115,7 +115,7 @@ enum svn_delta_action {
/** Append the @a length bytes at @a offset in the window's @a new string
* to the target.
*
- * It must be the case that @a 0 <= @a offset < @a offset +
+ * It must be the case that 0 <= @a offset < @a offset +
* @a length <= length of @a new. Windows MUST use new data in ascending
* order with no overlap at the moment; svn_txdelta_to_svndiff()
* depends on this.
Modified: branches/file-externals/subversion/include/svn_fs.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_fs.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_fs.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_fs.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -970,7 +970,7 @@ svn_revnum_t svn_fs_revision_root_revisi
/** The kind of change that occurred on the path. */
typedef enum
{
- /** default value */
+ /** path modified in txn */
svn_fs_path_change_modify = 0,
/** path added in txn */
Modified: branches/file-externals/subversion/include/svn_repos.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_repos.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_repos.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_repos.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -1417,8 +1417,9 @@ svn_repos_get_logs(svn_repos_t *repos,
/* Retrieving mergeinfo. */
/**
- * Fetch the mergeinfo for @a paths at @a rev, and save it to @a
- * *catalog. It will never be @c NULL but may be empty.
+ * Fetch the mergeinfo for @a paths at @a revision in @a repos, and
+ * set @a *catalog to a catalog of this mergeinfo. @a *catalog will
+ * never be @c NULL but may be empty.
*
* @a inherit indicates whether explicit, explicit or inherited, or
* only inherited mergeinfo for @a paths is fetched.
@@ -1430,14 +1431,14 @@ svn_repos_get_logs(svn_repos_t *repos,
* the @c SVN_PROP_MERGEINFO property explicitly set on it. (Note
* that inheritance is only taken into account for the elements in @a
* paths; descendants of the elements in @a paths which get their
- * mergeinfo via inheritance are not included in @a *mergeoutput.)
+ * mergeinfo via inheritance are not included in @a *catalog.)
*
* If optional @a authz_read_func is non-NULL, then use this function
* (along with optional @a authz_read_baton) to check the readability
* of each path which mergeinfo was requested for (from @a paths).
* Silently omit unreadable paths from the request for mergeinfo.
*
- * Use @a pool for temporary allocations.
+ * Use @a pool for all allocations.
*
* @since New in 1.5.
*/
Modified: branches/file-externals/subversion/include/svn_wc.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/include/svn_wc.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/include/svn_wc.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/include/svn_wc.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -1183,7 +1183,7 @@ typedef enum svn_wc_conflict_choice_t
} svn_wc_conflict_choice_t;
-/** The final result returned by @a svn_wc_conflict_resolver_func_t.
+/** The final result returned by @c svn_wc_conflict_resolver_func_t.
*
* @note Fields may be added to the end of this structure in future
* versions. Therefore, to preserve binary compatibility, users
@@ -3772,12 +3772,12 @@ svn_boolean_t svn_wc_is_entry_prop(const
/** Callback type used by @c svn_wc_canonicalize_svn_prop.
*
* If @a mime_type is non-null, it sets @a *mime_type to the value of
- * @a SVN_PROP_MIME_TYPE for the path passed to @c
+ * @c SVN_PROP_MIME_TYPE for the path passed to @c
* svn_wc_canonicalize_svn_prop (allocated from @a pool). If @a
* stream is non-null, it writes the contents of the file to @a
* stream.
*
- * (Currently, this is used if you are attempting to set the @a
+ * (Currently, this is used if you are attempting to set the @c
* SVN_PROP_EOL_STYLE property, to make sure that the value matches
* the mime type and contents.)
*/
@@ -3903,7 +3903,7 @@ svn_wc_get_diff_editor4(svn_wc_adm_acces
/**
* Similar to svn_wc_get_diff_editor4(), but with @a changelists
* passed as @c NULL, and @a depth set to @c svn_depth_infinity if @a
- * recurse is TRUE, or @a svn_depth_files if @a recurse is FALSE.
+ * recurse is TRUE, or @c svn_depth_files if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -4027,7 +4027,7 @@ svn_wc_diff4(svn_wc_adm_access_t *anchor
/**
* Similar to svn_wc_diff4(), but with @a changelists passed @c NULL,
* and @a depth set to @c svn_depth_infinity if @a recurse is TRUE, or
- * @a svn_depth_files if @a recurse is FALSE.
+ * @c svn_depth_files if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
Modified: branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Wed \
Jul 30 08:04:13 2008 (r32332) @@ -192,3 +192,60 @@ \
svn_auth_get_gnome_keyring_simple_provid
gnome_keyring_init();
}
+
+/* Get cached encrypted credentials from the ssl client cert password
+ provider's cache. */
+static svn_error_t *
+gnome_keyring_ssl_client_cert_pw_first_creds(void **credentials,
+ void **iter_baton,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ apr_pool_t *pool)
+{
+ return svn_auth__ssl_client_cert_pw_file_first_creds_helper
+ (credentials,
+ iter_baton, provider_baton,
+ parameters, realmstring,
+ gnome_keyring_password_get,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
+}
+
+/* Save encrypted credentials to the ssl client cert password provider's
+ cache. */
+static svn_error_t *
+gnome_keyring_ssl_client_cert_pw_save_creds(svn_boolean_t *saved,
+ void *credentials,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ apr_pool_t *pool)
+{
+ return svn_auth__ssl_client_cert_pw_file_save_creds_helper
+ (saved, credentials,
+ provider_baton, parameters,
+ realmstring,
+ gnome_keyring_password_set,
+ SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE,
+ pool);
+}
+
+static const svn_auth_provider_t gnome_keyring_ssl_client_cert_pw_provider = {
+ SVN_AUTH_CRED_SSL_CLIENT_CERT_PW,
+ gnome_keyring_ssl_client_cert_pw_first_creds,
+ NULL,
+ gnome_keyring_ssl_client_cert_pw_save_creds
+};
+
+/* Public API */
+void
+svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider
+ (svn_auth_provider_object_t **provider,
+ apr_pool_t *pool)
+{
+ svn_auth_provider_object_t *po = apr_pcalloc(pool, sizeof(*po));
+
+ po->vtable = &gnome_keyring_ssl_client_cert_pw_provider;
+ *provider = po;
+}
Modified: branches/file-externals/subversion/libsvn_client/cat.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/cat.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/cat.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/cat.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -41,8 +41,7 @@
/* Helper function to handle copying a potentially translated version of
local file PATH to OUTPUT. REVISION must be one of the following: BASE,
- COMMITTED, WORKING, or UNSPECIFIED. If the revision is UNSPECIFIED, it
- will default to BASE. Uses POOL for temporary allocations. */
+ COMMITTED, WORKING. Uses POOL for temporary allocations. */
static svn_error_t *
cat_local_file(const char *path,
svn_stream_t *output,
@@ -62,10 +61,7 @@ cat_local_file(const char *path,
apr_file_t *input_file;
svn_stream_t *input;
- SVN_ERR_ASSERT(revision->kind == svn_opt_revision_working ||
- revision->kind == svn_opt_revision_base ||
- revision->kind == svn_opt_revision_committed ||
- revision->kind == svn_opt_revision_unspecified);
+ SVN_ERR_ASSERT(SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(revision->kind));
SVN_ERR(svn_wc__entry_versioned(&entry, path, adm_access, FALSE, pool));
@@ -169,15 +165,23 @@ svn_client_cat2(svn_stream_t *out,
const char *url;
svn_stream_t *output = out;
+ /* ### Inconsistent default revision logic in this command. */
+ if (peg_revision->kind == svn_opt_revision_unspecified)
+ {
+ peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+ path_or_url);
+ revision = svn_cl__rev_default_to_head_or_base(revision, path_or_url);
+ }
+ else
+ {
+ peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+ path_or_url);
+ revision = svn_cl__rev_default_to_peg(revision, peg_revision);
+ }
+
if (! svn_path_is_url(path_or_url)
- && (peg_revision->kind == svn_opt_revision_base
- || peg_revision->kind == svn_opt_revision_working
- || peg_revision->kind == svn_opt_revision_committed
- || peg_revision->kind == svn_opt_revision_unspecified)
- && (revision->kind == svn_opt_revision_base
- || revision->kind == svn_opt_revision_working
- || revision->kind == svn_opt_revision_committed
- || revision->kind == svn_opt_revision_unspecified))
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(peg_revision->kind)
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(revision->kind))
{
svn_wc_adm_access_t *adm_access;
Modified: branches/file-externals/subversion/libsvn_client/client.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/client.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/client.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/client.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -115,17 +115,6 @@ svn_client__compare_revisions(svn_opt_re
svn_opt_revision_t *revision2);
-/* Return true if the revision number for REVISION can be determined
- from just the working copy, or false if it can be determined from
- just the repository.
-
- NOTE: No other kinds of revisions should be possible; but if one
- day there are, this will return true for those kinds.
- */
-svn_boolean_t
-svn_client__revision_is_local(const svn_opt_revision_t *revision);
-
-
/* Set *COPYFROM_PATH and *COPYFROM_REV to the path and revision that
served as the source of the copy from which PATH_OR_URL at REVISION
was created, or NULL and SVN_INVALID_REVNUM (respectively) if
@@ -1101,15 +1090,40 @@ svn_client__ensure_revprop_table(apr_has
apr_pool_t *pool);
-/** Return TRUE iff revision kind is dependent on the working copy.
- * Otherwise, return FALSE.
- */
+/* Return true if KIND is a revision kind that is dependent on the working
+ * copy. Otherwise, return false. */
#define SVN_CLIENT__REVKIND_NEEDS_WC(kind) \
- (((kind) == svn_opt_revision_base || \
+ ((kind) == svn_opt_revision_base || \
(kind) == svn_opt_revision_previous || \
(kind) == svn_opt_revision_working || \
(kind) == svn_opt_revision_committed) \
- ? TRUE : FALSE)
+
+/* Return true if KIND is a revision kind that the WC can supply without
+ * contacting the repository. Otherwise, return false. */
+#define SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(kind) \
+ ((kind) == svn_opt_revision_base || \
+ (kind) == svn_opt_revision_working || \
+ (kind) == svn_opt_revision_committed)
+
+/* Return REVISION unless its kind is 'unspecified' in which case return
+ * a pointer to a statically allocated revision structure of kind 'head'
+ * if PATH_OR_URL is a URL or 'base' if it is a WC path. */
+const svn_opt_revision_t *
+svn_cl__rev_default_to_head_or_base(const svn_opt_revision_t *revision,
+ const char *path_or_url);
+
+/* Return REVISION unless its kind is 'unspecified' in which case return
+ * a pointer to a statically allocated revision structure of kind 'head'
+ * if PATH_OR_URL is a URL or 'working' if it is a WC path. */
+const svn_opt_revision_t *
+svn_cl__rev_default_to_head_or_working(const svn_opt_revision_t *revision,
+ const char *path_or_url);
+
+/* Return REVISION unless its kind is 'unspecified' in which case return
+ * PEG_REVISION. */
+const svn_opt_revision_t *
+svn_cl__rev_default_to_peg(const svn_opt_revision_t *revision,
+ const svn_opt_revision_t *peg_revision);
#ifdef __cplusplus
Modified: branches/file-externals/subversion/libsvn_client/copy.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/copy.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/copy.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/copy.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -2,7 +2,7 @@
* copy.c: copy/move wrappers around wc 'copy' functionality.
*
* ====================================================================
- * Copyright (c) 2000-2007 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2008 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -801,36 +801,31 @@ repos_to_repos_copy(svn_commit_info_t **
dir = svn_path_is_child(top_url, svn_path_dirname(pair->dst, pool),
pool);
- /* Imagine a situation where the user passes --parents
- unnecessarily (that is, the destination directory already
- exists). Suppose they're copying a file when they do this.
- There are two syntaxes they might use:
-
- 1. svn copy --parents URL/src/foo.txt URL/dst/foo.txt
- 2. svn copy --parents URL/src/foo.txt URL/dst
-
- Assuming src/ and dst/ exist already, then both ways should
- create dst/foo.txt. However, the svn_path_dirname() call
- above will produce a string equivalent to top_url, which
- means the svn_path_is_child() will return NULL (quirkily,
- that's what it does when the two paths are the same). We
- must compensate for that behavior, while making sure not to
- add dst/ to the list of new_dirs to be created. */
-
- if (! dir)
- dir = svn_path_is_child(top_url, pair->dst, pool);
-
- SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
- iterpool));
-
- while (kind == svn_node_none)
- {
- svn_pool_clear(iterpool);
- APR_ARRAY_PUSH(new_dirs, const char *) = dir;
-
- svn_path_split(dir, &dir, NULL, pool);
- SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
- iterpool));
+ /* Imagine a situation where the user tries to copy an existing source
+ directory to nonexistent directory with --parents options specified:
+
+ svn copy --parents URL/src URL/dst
+
+ where src exists and dst does not. The svn_path_dirname() call above
+ will produce a string equivalent to top_url, which means
+ svn_path_is_child() will return NULL. In this case, do not try to add
+ dst to the new_dirs list since it will be added to the commit items
+ array later in this function. */
+
+ if (dir)
+ {
+ SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
+ iterpool));
+
+ while (kind == svn_node_none)
+ {
+ svn_pool_clear(iterpool);
+ APR_ARRAY_PUSH(new_dirs, const char *) = dir;
+
+ svn_path_split(dir, &dir, NULL, pool);
+ SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM,
+ &kind, iterpool));
+ }
}
}
Modified: branches/file-externals/subversion/libsvn_client/export.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/export.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/export.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/export.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -94,7 +94,7 @@ static svn_error_t *
copy_one_versioned_file(const char *from,
const char *to,
svn_wc_adm_access_t *adm_access,
- svn_opt_revision_t *revision,
+ const svn_opt_revision_t *revision,
const char *native_eol,
apr_pool_t *pool)
{
@@ -103,7 +103,7 @@ copy_one_versioned_file(const char *from
svn_subst_eol_style_t style;
apr_hash_t *props;
const char *base;
- svn_string_t *eol_style, *keywords, *executable, *externals, *special;
+ svn_string_t *eol_style, *keywords, *executable, *special;
const char *eol = NULL;
svn_boolean_t local_mod = FALSE;
apr_time_t tm;
@@ -149,8 +149,6 @@ copy_one_versioned_file(const char *from
APR_HASH_KEY_STRING);
executable = apr_hash_get(props, SVN_PROP_EXECUTABLE,
APR_HASH_KEY_STRING);
- externals = apr_hash_get(props, SVN_PROP_EXTERNALS,
- APR_HASH_KEY_STRING);
special = apr_hash_get(props, SVN_PROP_SPECIAL,
APR_HASH_KEY_STRING);
@@ -211,7 +209,7 @@ copy_one_versioned_file(const char *from
static svn_error_t *
copy_versioned_files(const char *from,
const char *to,
- svn_opt_revision_t *revision,
+ const svn_opt_revision_t *revision,
svn_boolean_t force,
svn_boolean_t ignore_externals,
svn_depth_t depth,
@@ -798,11 +796,11 @@ svn_client_export4(svn_revnum_t *result_
svn_revnum_t edit_revision = SVN_INVALID_REVNUM;
const char *url;
+ peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision, from);
+ revision = svn_cl__rev_default_to_peg(revision, peg_revision);
+
if (svn_path_is_url(from) ||
- ! (revision->kind == svn_opt_revision_base ||
- revision->kind == svn_opt_revision_committed ||
- revision->kind == svn_opt_revision_working ||
- revision->kind == svn_opt_revision_unspecified))
+ ! SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(revision->kind))
{
svn_revnum_t revnum;
svn_ra_session_t *ra_session;
@@ -946,17 +944,10 @@ svn_client_export4(svn_revnum_t *result_
}
else
{
- svn_opt_revision_t working_revision = *revision;
/* This is a working copy export. */
- if (working_revision.kind == svn_opt_revision_unspecified)
- {
- /* Default to WORKING in the case that we have
- been given a working copy path */
- working_revision.kind = svn_opt_revision_working;
- }
/* just copy the contents of the working copy into the target path. */
- SVN_ERR(copy_versioned_files(from, to, &working_revision, overwrite,
+ SVN_ERR(copy_versioned_files(from, to, revision, overwrite,
ignore_externals, depth, native_eol,
ctx, pool));
}
Modified: branches/file-externals/subversion/libsvn_client/merge.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/merge.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/merge.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/merge.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -825,12 +825,12 @@ merge_file_added(svn_wc_adm_access_t *ad
{
const svn_prop_t *prop = &APR_ARRAY_IDX(prop_changes, i, svn_prop_t);
- /* If we're merging from a foreign repository, we don't want any
- DAV wcprops related to this file (because they'll point to
- the wrong repository). So we'll strip them. (Is this a
- layering violation?) */
- if ((! merge_b->same_repos)
- && (svn_property_kind(NULL, prop->name) == svn_prop_wc_kind))
+ /* We don't want any DAV wcprops related to this file because
+ they'll point to the wrong repository (in the
+ merge-from-foreign-repository scenario) or wrong place in the
+ right repository (in the same-repos scenario). So we'll
+ strip them. (Is this a layering violation?) */
+ if (svn_property_kind(NULL, prop->name) == svn_prop_wc_kind)
continue;
apr_hash_set(new_props, prop->name, APR_HASH_KEY_STRING, prop->value);
@@ -1521,7 +1521,7 @@ notification_receiver(void *baton, const
/* Helper for the numerous times we need to allocate and initialize
a rangelist with one element.
-
+
Return a rangelist allocated in POOL with one svn_merge_range_t *
element, also allocated in POOL and defined by START, END, and
INHERITABLE. */
@@ -1564,7 +1564,7 @@ push_range(apr_array_header_t *rangelist
/* Helper for filter_merged_revisions() when operating on a subtree.
Like filter_merged_revisions(), this should only be called when
- honoring mergeinfo.
+ honoring mergeinfo.
Filter the requested ranges being merged to a subtree so that we
don't try to describe invalid subtrees to the merge report editor.
@@ -1628,7 +1628,7 @@ push_range(apr_array_header_t *rangelist
Set *CHILD_DELETED_OR_NONEXISTANT to FALSE.
Reverse Merges, i.e. REVISION1 (PEG_REV) > REVISION2
-
+
E) Part of requested range postdates subtree's existance.
PRIMARY_URL@REVISION2 exists, but PRIMARY_URL@REVISION1 doesn't
@@ -1646,14 +1646,14 @@ push_range(apr_array_header_t *rangelist
### describing ranges that postdate the subtree's existance, the
### subtree's nearest parent must also have that mergeinfo right?
### Put another way, how can all of the following ever be true?
- ###
+ ###
### i) The subtree merge source doesn't exist anymore at
### revsion X.
### ii) Mergeinfo for X is explicitly set on the subtree.
### iii) The subtree's parent has no explicit mergeinfo for X.
- ###
+ ###
### This is where Kamesh utilized his recursive guess_live_ranges
- ### function...But do we ever need to do this in practice?
+ ### function...But do we ever need to do this in practice?
F) Requested range deletes (or replaces) a subtree.
@@ -1751,6 +1751,12 @@ prepare_subtree_ranges(apr_array_header_
{
if (segments->nelts)
{
+ /* This algorithm needs the youngest location segment inside the
+ requested merge range.
+ svn_client__repos_location_segments gives the segments ordered
+ from oldest to youngest.
+ So consider the last segment as it is the youngest.
+ */
svn_location_segment_t *segment =
APR_ARRAY_IDX(segments, (segments->nelts - 1),
svn_location_segment_t *);
@@ -1818,7 +1824,7 @@ prepare_subtree_ranges(apr_array_header_
SVN_ERR(svn_rangelist_merge(
requested_rangelist, predate_intersection_rangelist,
pool));
-
+
/* Remove ranges that predate PRIMARY_URL's existance
because the source exists under a different URL due to a
rename between REVISION1:REVISION2 - see 'MERGE FAILS' in
@@ -1927,7 +1933,7 @@ filter_merged_revisions(svn_client__merg
then don't bother dealing with CHILD in a separate editor drive.
Just make child's remaining ranges exactly the same as its
nearest parent.
-
+
For deletions this will cause the editor drive to be rooted at
the subtree CHILD's nearest parent in CHILDREN_WITH_MERGEINFO
This will simply delete the subtree. For the case where neither
@@ -1998,7 +2004,7 @@ filter_merged_revisions(svn_client__merg
}
else
{
- child->remaining_ranges =
+ child->remaining_ranges =
apr_array_make(pool, 1, sizeof(svn_merge_range_t *));
}
}
@@ -3947,10 +3953,10 @@ remove_noop_merge_ranges(apr_array_heade
log_changed_revs, changed_revs, pool));
/* Our list of changed revisions should be in youngest-to-oldest order. */
- youngest_changed_rev = *(APR_ARRAY_IDX(changed_revs,
+ youngest_changed_rev = *(APR_ARRAY_IDX(changed_revs,
0, svn_revnum_t *));
- oldest_changed_rev = *(APR_ARRAY_IDX(changed_revs,
- changed_revs->nelts - 1,
+ oldest_changed_rev = *(APR_ARRAY_IDX(changed_revs,
+ changed_revs->nelts - 1,
svn_revnum_t *));
/* Now, copy from RANGES to *OPERATIVE_RANGES, filtering out ranges
@@ -3965,7 +3971,7 @@ remove_noop_merge_ranges(apr_array_heade
/* If the merge range is entirely outside the range of changed
revisions, we've no use for it. */
- if ((range_min > youngest_changed_rev)
+ if ((range_min > youngest_changed_rev)
|| (range_max < oldest_changed_rev))
continue;
@@ -4623,7 +4629,7 @@ do_file_merge(const char *url1,
else if (is_rollback && r->end != revision2)
ra_session2 = ra_session1; /* Use URL1's RA session. */
}
-
+
/* While we currently don't allow it, in theory we could be
fetching two fulltexts from two different repositories here. */
SVN_ERR(single_file_merge_get_file(&tmpfile1, ra_session1,
Modified: branches/file-externals/subversion/libsvn_client/mergeinfo.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/mergeinfo.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/mergeinfo.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/mergeinfo.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -1150,9 +1150,7 @@ location_from_path_and_rev(const char **
svn_revnum_t rev;
if (! svn_path_is_url(path_or_url)
- && (peg_revision->kind == svn_opt_revision_base
- || peg_revision->kind == svn_opt_revision_working
- || peg_revision->kind == svn_opt_revision_committed
+ && (SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(peg_revision->kind)
|| peg_revision->kind == svn_opt_revision_unspecified))
{
int adm_lock_level = SVN_WC__LEVELS_TO_LOCK_FROM_DEPTH(svn_depth_empty);
@@ -1161,17 +1159,17 @@ location_from_path_and_rev(const char **
ctx->cancel_func, ctx->cancel_baton,
subpool));
}
- SVN_ERR(svn_client__ra_session_from_path(&ra_session, &rev, url,
+ SVN_ERR(svn_client__ra_session_from_path(&ra_session, &rev, url,
path_or_url, adm_access,
- peg_revision, peg_revision,
+ peg_revision, peg_revision,
ctx, subpool));
*url = apr_pstrdup(pool, *url);
- *revision = apr_pcalloc(pool, sizeof(*revision));
+ *revision = apr_pcalloc(pool, sizeof(**revision));
(*revision)->kind = svn_opt_revision_number;
(*revision)->value.number = rev;
svn_pool_destroy(subpool);
-
+
if (adm_access)
SVN_ERR(svn_wc_adm_close(adm_access));
Modified: branches/file-externals/subversion/libsvn_client/prop_commands.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/prop_commands.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/prop_commands.c Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/prop_commands.c Wed Jul 30 \
08:04:13 2008 (r32332) @@ -874,17 +874,15 @@ svn_client_propget3(apr_hash_t **props,
SVN_ERR(error_if_wcprop_name(propname));
+ peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+ path_or_url);
+ revision = svn_cl__rev_default_to_peg(revision, peg_revision);
+
*props = apr_hash_make(pool);
if (! svn_path_is_url(path_or_url)
- && (peg_revision->kind == svn_opt_revision_base
- || peg_revision->kind == svn_opt_revision_working
- || peg_revision->kind == svn_opt_revision_committed
- || peg_revision->kind == svn_opt_revision_unspecified)
- && (revision->kind == svn_opt_revision_base
- || revision->kind == svn_opt_revision_working
- || revision->kind == svn_opt_revision_committed
- || revision->kind == svn_opt_revision_unspecified))
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(peg_revision->kind)
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(revision->kind))
{
svn_wc_adm_access_t *adm_access;
const svn_wc_entry_t *node;
@@ -1207,6 +1205,7 @@ proplist_walk_cb(const char *path,
}
+/* Note: this implementation is very similar to svn_client_propget3(). */
svn_error_t *
svn_client_proplist3(const char *path_or_url,
const svn_opt_revision_t *peg_revision,
@@ -1221,18 +1220,16 @@ svn_client_proplist3(const char *path_or
svn_wc_adm_access_t *adm_access;
const char *url;
+ peg_revision = svn_cl__rev_default_to_head_or_working(peg_revision,
+ path_or_url);
+ revision = svn_cl__rev_default_to_peg(revision, peg_revision);
+
if (depth == svn_depth_unknown)
depth = svn_depth_empty;
if (! svn_path_is_url(path_or_url)
- && (peg_revision->kind == svn_opt_revision_base
- || peg_revision->kind == svn_opt_revision_working
- || peg_revision->kind == svn_opt_revision_committed
- || peg_revision->kind == svn_opt_revision_unspecified)
- && (revision->kind == svn_opt_revision_base
- || revision->kind == svn_opt_revision_working
- || revision->kind == svn_opt_revision_committed
- || revision->kind == svn_opt_revision_unspecified))
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(peg_revision->kind)
+ && SVN_CLIENT__REVKIND_IS_LOCAL_TO_WC(revision->kind))
{
svn_boolean_t pristine;
int levels_to_lock = SVN_WC__LEVELS_TO_LOCK_FROM_DEPTH(depth);
@@ -1345,7 +1342,6 @@ proplist_receiver_cb(void *baton,
return SVN_NO_ERROR;
}
-/* Note: this implementation is very similar to svn_client_propget. */
svn_error_t *
svn_client_proplist2(apr_array_header_t **props,
const char *target,
Modified: branches/file-externals/subversion/libsvn_client/revisions.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/revisions.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/revisions.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/revisions.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -156,16 +156,3 @@ svn_client__compare_revisions(svn_opt_re
return TRUE;
}
-
-svn_boolean_t
-svn_client__revision_is_local(const svn_opt_revision_t *revision)
-{
- if ((revision->kind == svn_opt_revision_unspecified)
- || (revision->kind == svn_opt_revision_head)
- || (revision->kind == svn_opt_revision_number)
- || (revision->kind == svn_opt_revision_date))
- return FALSE;
- else
- return TRUE;
-}
-
Modified: branches/file-externals/subversion/libsvn_client/url.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/url.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/url.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/url.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -82,8 +82,8 @@ svn_client__derive_location(const char *
}
else
{
- svn_cancel_func_t cancel_func;
- void *cancel_baton;
+ svn_cancel_func_t cancel_func = NULL;
+ void *cancel_baton = NULL;
if (ctx)
{
Modified: branches/file-externals/subversion/libsvn_client/util.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/util.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_client/util.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_client/util.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -314,3 +314,37 @@ svn_client__default_walker_error_handler
{
return err;
}
+
+
+const svn_opt_revision_t *
+svn_cl__rev_default_to_head_or_base(const svn_opt_revision_t *revision,
+ const char *path_or_url)
+{
+ static svn_opt_revision_t head_rev = { svn_opt_revision_head, { 0 } };
+ static svn_opt_revision_t base_rev = { svn_opt_revision_base, { 0 } };
+
+ if (revision->kind == svn_opt_revision_unspecified)
+ return svn_path_is_url(path_or_url) ? &head_rev : &base_rev;
+ return revision;
+}
+
+const svn_opt_revision_t *
+svn_cl__rev_default_to_head_or_working(const svn_opt_revision_t *revision,
+ const char *path_or_url)
+{
+ static svn_opt_revision_t head_rev = { svn_opt_revision_head, { 0 } };
+ static svn_opt_revision_t work_rev = { svn_opt_revision_working, { 0 } };
+
+ if (revision->kind == svn_opt_revision_unspecified)
+ return svn_path_is_url(path_or_url) ? &head_rev : &work_rev;
+ return revision;
+}
+
+const svn_opt_revision_t *
+svn_cl__rev_default_to_peg(const svn_opt_revision_t *revision,
+ const svn_opt_revision_t *peg_revision)
+{
+ if (revision->kind == svn_opt_revision_unspecified)
+ return peg_revision;
+ return revision;
+}
Modified: branches/file-externals/subversion/libsvn_fs_base/fs.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_fs_base/fs.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_fs_base/fs.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_fs_base/fs.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -917,11 +917,9 @@ svn_fs_base__clean_logs(const char *live
}
-/* ### There -must- be a more elegant way to do a compile-time check
- for BDB 4.2 or later. We're doing this because apparently
- env->get_flags() and DB->get_pagesize() don't exist in earlier
- versions of BDB. */
-#ifdef DB_LOG_AUTOREMOVE
+/* DB_ENV->get_flags() and DB->get_pagesize() don't exist prior to
+ Berkeley DB 4.2. */
+#if SVN_BDB_VERSION_AT_LEAST(4, 2)
/* Open the BDB environment at PATH and compare its configuration
flags with FLAGS. If every flag in FLAGS is set in the
@@ -933,16 +931,28 @@ check_env_flags(svn_boolean_t *match,
apr_pool_t *pool)
{
bdb_env_baton_t *bdb;
+#if SVN_BDB_VERSION_AT_LEAST(4, 7)
+ int flag_state;
+#else
u_int32_t envflags;
+#endif
SVN_ERR(svn_fs_bdb__open(&bdb, path,
SVN_BDB_STANDARD_ENV_FLAGS,
0666, pool));
-
+#if SVN_BDB_VERSION_AT_LEAST(4, 7)
+ SVN_BDB_ERR(bdb, bdb->env->log_get_config(bdb->env, flags, &flag_state));
+#else
SVN_BDB_ERR(bdb, bdb->env->get_flags(bdb->env, &envflags));
+#endif
+
SVN_ERR(svn_fs_bdb__close(bdb));
+#if SVN_BDB_VERSION_AT_LEAST(4, 7)
+ if (flag_state == 0)
+#else
if (flags & envflags)
+#endif
*match = TRUE;
else
*match = FALSE;
@@ -977,7 +987,7 @@ get_db_pagesize(u_int32_t *pagesize,
return svn_fs_bdb__close(bdb);
}
-#endif /* DB_LOG_AUTOREMOVE */
+#endif /* SVN_BDB_VERSION_AT_LEAST(4, 2) */
/* Copy FILENAME from SRC_DIR to DST_DIR in byte increments of size
@@ -1084,15 +1094,22 @@ base_hotcopy(const char *src_path,
(&format, svn_path_join(src_path, FORMAT_FILE, pool), pool));
SVN_ERR(check_format(format));
- /* If using DB 4.2 or later, note whether the DB_LOG_AUTOREMOVE
+ /* If using Berkeley DB 4.2 or later, note whether the DB_LOG_AUTO_REMOVE
feature is on. If it is, we have a potential race condition:
another process might delete a logfile while we're in the middle
of copying all the logfiles. (This is not a huge deal; at worst,
the hotcopy fails with a file-not-found error.) */
-#ifdef DB_LOG_AUTOREMOVE
- SVN_ERR(check_env_flags(&log_autoremove, DB_LOG_AUTOREMOVE,
- src_path, pool));
+#if SVN_BDB_VERSION_AT_LEAST(4, 2)
+ err = check_env_flags(&log_autoremove,
+#if SVN_BDB_VERSION_AT_LEAST(4, 7)
+ DB_LOG_AUTO_REMOVE,
+ /* DB_LOG_AUTO_REMOVE was named DB_LOG_AUTOREMOVE before Berkeley DB 4.7. */
+#else
+ DB_LOG_AUTOREMOVE,
#endif
+ src_path, pool);
+#endif
+ SVN_ERR(err);
/* Copy the DB_CONFIG file. */
SVN_ERR(svn_io_dir_file_copy(src_path, dest_path, "DB_CONFIG", pool));
@@ -1100,7 +1117,7 @@ base_hotcopy(const char *src_path,
/* In order to copy the database files safely and atomically, we
must copy them in chunks which are multiples of the page-size
used by BDB. See sleepycat docs for details, or svn issue #1818. */
-#ifdef DB_LOG_AUTOREMOVE
+#if SVN_BDB_VERSION_AT_LEAST(4, 2)
SVN_ERR(get_db_pagesize(&pagesize, src_path, pool));
if (pagesize < SVN__STREAM_CHUNK_SIZE)
{
Modified: branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -2794,13 +2794,13 @@ rep_read_contents(void *baton,
/* Returns whether or not the expanded fulltext of the file is
- * cacheable based on its size SIZE. Specifically, if it will fit
+ * cachable based on its size SIZE. Specifically, if it will fit
* into a memcached value. The memcached cutoff seems to be a bit
* (header length?) under a megabyte; we round down a little to be
* safe.
*/
static svn_boolean_t
-fulltext_size_is_cacheable(svn_filesize_t size)
+fulltext_size_is_cachable(svn_filesize_t size)
{
return size < 1000000;
}
@@ -2831,7 +2831,7 @@ read_representation(svn_stream_t **conte
struct rep_read_baton *rb;
if (ffd->fulltext_cache && SVN_IS_VALID_REVNUM(rep->revision)
- && fulltext_size_is_cacheable(rep->expanded_size))
+ && fulltext_size_is_cachable(rep->expanded_size))
{
svn_string_t *fulltext;
svn_boolean_t is_cached;
Modified: branches/file-externals/subversion/libsvn_ra/ra_loader.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra/ra_loader.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra/ra_loader.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra/ra_loader.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -60,7 +60,7 @@
### instead of svn_ra_open. */
#if defined(SVN_HAVE_NEON) && defined(SVN_HAVE_SERF)
-#define MUST_CHOOSE_DAV
+#define CHOOSABLE_DAV_MODULE
#endif
@@ -393,7 +393,7 @@ svn_error_t *svn_ra_open3(svn_ra_session
const char *server_group;
apr_uri_t repos_URI;
apr_status_t apr_err;
-#ifdef MUST_CHOOSE_DAV
+#ifdef CHOOSABLE_DAV_MODULE
const char *http_library = "neon";
#endif
/* Auth caching parameters. */
@@ -401,6 +401,9 @@ svn_error_t *svn_ra_open3(svn_ra_session
svn_boolean_t store_auth_creds = SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS;
const char *store_plaintext_passwords
= SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS;
+ svn_boolean_t store_pp = SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP;
+ const char *store_pp_plaintext
+ = SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT;
if (callbacks->auth_baton)
{
@@ -447,6 +450,17 @@ svn_error_t *svn_ra_open3(svn_ra_session
SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS));
SVN_ERR(svn_config_get_bool
+ (servers, &store_pp, SVN_CONFIG_SECTION_GLOBAL,
+ SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP,
+ store_pp));
+
+ SVN_ERR(svn_config_get_yes_no_ask
+ (servers, &store_pp_plaintext,
+ SVN_CONFIG_SECTION_GLOBAL,
+ SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT,
+ SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT));
+
+ SVN_ERR(svn_config_get_bool
(servers, &store_auth_creds, SVN_CONFIG_SECTION_GLOBAL,
SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
store_auth_creds));
@@ -483,8 +497,18 @@ svn_error_t *svn_ra_open3(svn_ra_session
(servers, &store_plaintext_passwords, server_group,
SVN_CONFIG_OPTION_STORE_PLAINTEXT_PASSWORDS,
store_plaintext_passwords));
+
+ SVN_ERR(svn_config_get_bool
+ (servers, &store_pp,
+ server_group, SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP,
+ store_pp));
+
+ SVN_ERR(svn_config_get_yes_no_ask
+ (servers, &store_pp_plaintext, server_group,
+ SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT,
+ store_pp_plaintext));
}
-#ifdef MUST_CHOOSE_DAV
+#ifdef CHOOSABLE_DAV_MODULE
/* Now, which DAV-based RA method do we want to use today? */
http_library
= svn_config_get_server_setting(servers,
@@ -513,6 +537,15 @@ svn_error_t *svn_ra_open3(svn_ra_session
SVN_AUTH_PARAM_STORE_PLAINTEXT_PASSWORDS,
store_plaintext_passwords);
+ if (! store_pp)
+ svn_auth_set_parameter(callbacks->auth_baton,
+ SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP,
+ "");
+
+ svn_auth_set_parameter(callbacks->auth_baton,
+ SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT,
+ store_pp_plaintext);
+
if (! store_auth_creds)
svn_auth_set_parameter(callbacks->auth_baton,
SVN_AUTH_PARAM_NO_AUTH_CACHE, "");
@@ -527,7 +560,7 @@ svn_error_t *svn_ra_open3(svn_ra_session
{
svn_ra__init_func_t initfunc = defn->initfunc;
-#ifdef MUST_CHOOSE_DAV
+#ifdef CHOOSABLE_DAV_MODULE
if (defn->schemes == dav_schemes
&& strcmp(defn->ra_name, http_library) != 0)
continue;
Modified: branches/file-externals/subversion/libsvn_ra_neon/log.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra_neon/log.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra_neon/log.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra_neon/log.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -292,8 +292,8 @@ log_end_element(void *baton, int state,
If we've seen as many log entries as we're going to show just
error out of the XML parser so we can avoid having to parse the
- remaining XML, but set lb->err to SVN_NO_ERROR so no error will
- end up being shown to the user. */
+ remaining XML, but set a flag that we will later use to ensure
+ this error will not be shown to the user. */
if (lb->limit && (lb->nest_level == 0) && (++lb->count > lb->limit))
{
lb->limit_compat_bailout = TRUE;
Modified: branches/file-externals/subversion/libsvn_ra_neon/session.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra_neon/session.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra_neon/session.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra_neon/session.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -290,6 +290,10 @@ client_ssl_decrypt_cert(svn_ra_neon__ses
if (ne_ssl_clicert_decrypt(clicert, pw_creds->password) == 0)
{
+ error = svn_auth_save_credentials(state, pool);
+ if (error)
+ svn_error_clear(error);
+
/* Success */
ok = TRUE;
break;
Modified: branches/file-externals/subversion/libsvn_ra_serf/auth.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra_serf/auth.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra_serf/auth.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra_serf/auth.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -311,7 +311,7 @@ handle_basic_auth(svn_ra_serf__session_t
/* Use svn_auth_first_credentials if this is the first time we ask for
credentials during this session OR if the last time we asked
- session->auth_state wasn't set (eg. if the credentials provider was
+ session->auth_state wasn't set (eg. if the credentials provider was
cancelled by the user). */
if (!session->auth_state)
{
Modified: branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c Wed Jul \
30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c Wed Jul \
30 08:04:13 2008 (r32332) @@ -225,6 +225,11 @@ \
svn_ra_serf__get_location_segments(svn_r SVN_ERR(parser_ctx->error);
}
+ if (gls_ctx->inside_report)
+ err = svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+ _("Location segment report failed on '%s'@'%ld'"),
+ path, peg_revision);
+
SVN_ERR(svn_ra_serf__error_on_status(gls_ctx->status_code, handler->path));
svn_pool_destroy(gls_ctx->subpool);
Modified: branches/file-externals/subversion/libsvn_ra_serf/util.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_ra_serf/util.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_ra_serf/util.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_ra_serf/util.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -550,12 +550,12 @@ svn_ra_serf__context_run_wait(svn_boolea
{
continue;
}
+ if (sess->pending_error)
+ {
+ return sess->pending_error;
+ }
if (status)
{
- if (sess->pending_error)
- {
- return sess->pending_error;
- }
return svn_error_wrap_apr(status, "Error running context");
}
/* Debugging purposes only! */
@@ -1074,8 +1074,6 @@ svn_ra_serf__handle_xml_parser(serf_requ
XML_ParserFree(ctx->xmlp);
if (xml_status == XML_STATUS_ERROR && ctx->ignore_errors == FALSE)
{
- status = SVN_ERR_RA_DAV_REQUEST_FAILED;
-
svn_error_clear(ctx->error);
}
@@ -1184,7 +1182,7 @@ handle_response(serf_request_t *request,
ctx->session->pending_error =
svn_error_create(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
_("Premature EOF seen from server"));
- return ctx->session->pending_error->apr_err;
+ return status;
}
}
@@ -1236,7 +1234,7 @@ handle_response(serf_request_t *request,
svn_error_create(APR_EGENERAL, NULL,
_("Unspecified error message"));
}
- return ctx->session->pending_error->apr_err;
+ return APR_EGENERAL;
}
else
{
Modified: branches/file-externals/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/fs-wrap.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/fs-wrap.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/fs-wrap.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -467,7 +467,8 @@ svn_repos_fs_lock(svn_lock_t **lock,
/* Run pre-lock hook. This could throw error, preventing
svn_fs_lock() from happening. */
- SVN_ERR(svn_repos__hooks_pre_lock(repos, path, username, pool));
+ SVN_ERR(svn_repos__hooks_pre_lock(repos, path, username, comment,
+ steal_lock, pool));
/* Lock. */
SVN_ERR(svn_fs_lock(lock, repos->fs, path, token, comment, is_dav_comment,
@@ -511,7 +512,8 @@ svn_repos_fs_unlock(svn_repos_t *repos,
/* Run pre-unlock hook. This could throw error, preventing
svn_fs_unlock() from happening. */
- SVN_ERR(svn_repos__hooks_pre_unlock(repos, path, username, pool));
+ SVN_ERR(svn_repos__hooks_pre_unlock(repos, path, username, token,
+ break_lock, pool));
/* Unlock. */
SVN_ERR(svn_fs_unlock(repos->fs, path, token, break_lock, pool));
Modified: branches/file-externals/subversion/libsvn_repos/hooks.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/hooks.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/hooks.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/hooks.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -22,12 +22,6 @@
#include <apr_pools.h>
#include <apr_file_io.h>
-#ifdef AS400
-#include <apr_portable.h>
-#include <spawn.h>
-#include <fcntl.h>
-#endif
-
#include "svn_error.h"
#include "svn_path.h"
#include "svn_repos.h"
@@ -39,7 +33,6 @@
/*** Hook drivers. ***/
-#ifndef AS400
/* Helper function for run_hook_cmd(). Wait for a hook to finish
executing and return either SVN_NO_ERROR if the hook script completed
without error, or an error describing the reason for failure.
@@ -156,7 +149,6 @@ check_hook_result(const char *name, cons
return svn_error_create(SVN_ERR_REPOS_HOOK_FAILURE, err,
failure_message->data);
}
-#endif /* AS400 */
/* NAME, CMD and ARGS are the name, path to and arguments for the hook
program that is to be run. The hook's exit status will be checked,
@@ -171,7 +163,6 @@ run_hook_cmd(const char *name,
const char **args,
apr_file_t *stdin_handle,
apr_pool_t *pool)
-#ifndef AS400
{
apr_file_t *read_errhandle, *write_errhandle, *null_handle;
apr_status_t apr_err;
@@ -247,222 +238,6 @@ run_hook_cmd(const char *name,
return err;
}
-#else /* Run hooks with spawn() on OS400. */
-#define AS400_BUFFER_SIZE 256
-{
- const char **native_args;
- int fd_map[3], stderr_pipe[2], exitcode;
- svn_stringbuf_t *script_output;
- pid_t child_pid, wait_rv;
- apr_size_t args_arr_size = 0, i;
- struct inheritance xmp_inherit = {0};
-#pragma convert(0)
- /* Despite the UTF support in V5R4 a few functions still require
- * EBCDIC args. */
- char *xmp_envp[2] = {"QIBM_USE_DESCRIPTOR_STDIO=Y", NULL};
- const char *dev_null_ebcdic = SVN_NULL_DEVICE_NAME;
-#pragma convert(1208)
-
- /* Find number of elements in args array. */
- while (args[args_arr_size] != NULL)
- args_arr_size++;
-
- /* Allocate memory for the native_args string array plus one for
- * the ending null element. */
- native_args = apr_palloc(pool, sizeof(char *) * args_arr_size + 1);
-
- /* Convert UTF-8 args to EBCDIC for use by spawn(). */
- for (i = 0; args[i] != NULL; i++)
- {
- SVN_ERR(svn_utf_cstring_from_utf8_ex2((const char**)(&(native_args[i])),
- args[i], (const char *)0,
- pool));
- }
-
- /* Make the last element in the array a NULL pointer as required
- * by spawn. */
- native_args[args_arr_size] = NULL;
-
- /* Map stdin. */
- if (stdin_handle)
- {
- /* Get OS400 file descriptor of APR stdin file and map it. */
- if (apr_os_file_get(&fd_map[0], stdin_handle))
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error converting APR file to OS400 "
- "type for hook script '%s'", cmd);
- }
- }
- else
- {
- fd_map[0] = open(dev_null_ebcdic, O_RDONLY);
- if (fd_map[0] == -1)
-
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error opening /dev/null for hook "
- "script '%s'", cmd);
- }
-
-
- /* Map stdout. */
- fd_map[1] = open(dev_null_ebcdic, O_WRONLY);
- if (fd_map[1] == -1)
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error opening /dev/null for hook script '%s'",
- cmd);
-
- /* Map stderr. */
- /* Get pipe for hook's stderr. */
- if (pipe(stderr_pipe) != 0)
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Can't create stderr pipe for "
- "hook '%s'", cmd);
- }
- fd_map[2] = stderr_pipe[1];
-
- /* Spawn the hook command. */
- child_pid = spawn(native_args[0], 3, fd_map, &xmp_inherit, native_args,
- xmp_envp);
- if (child_pid == -1)
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error spawning process for hook script '%s'",
- cmd);
- }
-
- /* Close the stdout file descriptor. */
- if (close(fd_map[1]) == -1)
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error closing write end of stdout pipe to "
- "hook script '%s'", cmd);
-
- /* Close the write end of the stderr pipe so any subsequent reads
- * don't hang. */
- if (close(fd_map[2]) == -1)
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error closing write end of stderr pipe to "
- "hook script '%s'", cmd);
-
- script_output = svn_stringbuf_create("", pool);
-
- while (1)
- {
- int rc;
-
- svn_stringbuf_ensure(script_output,
- script_output->len + AS400_BUFFER_SIZE + 1);
-
- rc = read(stderr_pipe[0],
- &(script_output->data[script_output->len]),
- AS400_BUFFER_SIZE);
-
- if (rc == -1)
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error reading stderr of hook "
- "script '%s'", cmd);
- }
-
- script_output->len += rc;
-
- /* If read() returned 0 then EOF was found and we are done reading
- * stderr. */
- if (rc == 0)
- {
- script_output->data[script_output->len] = '\0';
- break;
- }
- }
-
- /* Close the read end of the stderr pipe. */
- if (close(stderr_pipe[0]) == -1)
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error closing read end of stderr "
- "pipe to hook script '%s'", cmd);
-
- /* Wait for the child process to complete. */
- wait_rv = waitpid(child_pid, &exitcode, 0);
- if (wait_rv == -1)
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Error waiting for process completion of "
- "hook script '%s'", cmd);
- }
-
-
- if (WIFEXITED(exitcode))
- {
- if (WEXITSTATUS(exitcode))
- {
- svn_error_t *err;
- const char *utf8_stderr = NULL;
- svn_stringbuf_t *failure_message = svn_stringbuf_createf(
- pool, "'%s' hook failed (exited with a non-zero exitcode "
- "of %d). ", name, exitcode);
-
- if (!svn_stringbuf_isempty(script_output))
- {
- /* OS400 scripts produce EBCDIC stderr, so convert it. */
- err = svn_utf_cstring_to_utf8_ex2(&utf8_stderr,
- script_output->data,
- (const char*)0, pool);
- if (err)
- {
- utf8_stderr = "[Error output could not be translated from "
- "the native locale to UTF-8.]";
- svn_error_clear(err);
-
- }
- }
-
- if (utf8_stderr)
- {
- svn_stringbuf_appendcstr(failure_message,
- "The following error output was "
- "produced by the hook:\n");
- svn_stringbuf_appendcstr(failure_message, utf8_stderr);
- }
- else
- {
- svn_stringbuf_appendcstr(failure_message,
- "No error output was produced by "
- "the hook.");
- }
- return svn_error_create(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- failure_message->data);
- }
- else
- /* Success! */
- return SVN_NO_ERROR;
- }
- else if (WIFSIGNALED(exitcode))
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Process '%s' failed because of an "
- "uncaught terminating signal", cmd);
- }
- else if (WIFEXCEPTION(exitcode))
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Process '%s' failed unexpectedly with "
- "OS400 exception %d", cmd,
- WEXCEPTNUMBER(exitcode));
- }
- else if (WIFSTOPPED(exitcode))
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Process '%s' stopped unexpectedly by "
- "signal %d", cmd, WSTOPSIG(exitcode));
- }
- else
- {
- return svn_error_createf(SVN_ERR_REPOS_HOOK_FAILURE, NULL,
- "Process '%s' failed unexpectedly", cmd);
- }
-}
-#endif /* AS400 */
/* Create a temporary file F that will automatically be deleted when it is
@@ -516,7 +291,7 @@ check_hook_cmd(const char *hook, svn_boo
for (extn = check_extns; *extn; ++extn)
{
const char *const hook_path =
- (**extn ? apr_pstrcat(pool, hook, *extn, 0) : hook);
+ (**extn ? apr_pstrcat(pool, hook, *extn, NULL) : hook);
svn_node_kind_t kind;
if (!(err = svn_io_check_resolved_path(hook_path, &kind, pool))
@@ -768,6 +543,8 @@ svn_error_t *
svn_repos__hooks_pre_lock(svn_repos_t *repos,
const char *path,
const char *username,
+ const char *comment,
+ svn_boolean_t steal_lock,
apr_pool_t *pool)
{
const char *hook = svn_repos_pre_lock_hook(repos, pool);
@@ -779,13 +556,15 @@ svn_repos__hooks_pre_lock(svn_repos_t *r
}
else if (hook)
{
- const char *args[5];
+ const char *args[7];
args[0] = hook;
args[1] = svn_path_local_style(svn_repos_path(repos, pool), pool);
args[2] = path;
args[3] = username;
- args[4] = NULL;
+ args[4] = comment ? comment : "";
+ args[5] = steal_lock ? "1" : "0";
+ args[6] = NULL;
SVN_ERR(run_hook_cmd(SVN_REPOS__HOOK_PRE_LOCK, hook, args, NULL, pool));
}
@@ -837,6 +616,8 @@ svn_error_t *
svn_repos__hooks_pre_unlock(svn_repos_t *repos,
const char *path,
const char *username,
+ const char *token,
+ svn_boolean_t break_lock,
apr_pool_t *pool)
{
const char *hook = svn_repos_pre_unlock_hook(repos, pool);
@@ -848,13 +629,15 @@ svn_repos__hooks_pre_unlock(svn_repos_t
}
else if (hook)
{
- const char *args[5];
+ const char *args[7];
args[0] = hook;
args[1] = svn_path_local_style(svn_repos_path(repos, pool), pool);
args[2] = path;
args[3] = username ? username : "";
- args[4] = NULL;
+ args[4] = token ? token : "";
+ args[5] = break_lock ? "1" : "0";
+ args[6] = NULL;
SVN_ERR(run_hook_cmd(SVN_REPOS__HOOK_PRE_UNLOCK, hook, args, NULL,
pool));
Modified: branches/file-externals/subversion/libsvn_repos/log.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/log.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/log.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/log.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -502,125 +502,344 @@ next_history_rev(apr_array_header_t *his
return next_rev;
}
-/* Return the combined rangelists for everyone's mergeinfo for the
- PATHS tree at REV in *RANGELIST. Perform all allocations in POOL. */
+/* Set *DELETED_MERGEINFO_CATALOG and *ADDED_MERGEINFO_CATALOG to
+ catalogs describing how mergeinfo values on paths (which are the
+ keys of those catalogs) were changed in REV. */
+/* ### TODO: This would make a *great*, useful public function,
+ ### svn_repos_fs_mergeinfo_changed()! -- cmpilato */
static svn_error_t *
-get_combined_mergeinfo(svn_mergeinfo_t *combined_mergeinfo,
- svn_fs_t *fs,
- svn_revnum_t rev,
- const apr_array_header_t *paths,
- apr_pool_t *pool)
+fs_mergeinfo_changed(svn_mergeinfo_catalog_t *deleted_mergeinfo_catalog,
+ svn_mergeinfo_catalog_t *added_mergeinfo_catalog,
+ svn_fs_t *fs,
+ svn_revnum_t rev,
+ apr_pool_t *pool)
+
{
+ apr_hash_t *changes;
svn_fs_root_t *root;
+ apr_pool_t *subpool = NULL, *iterpool;
apr_hash_index_t *hi;
- svn_mergeinfo_catalog_t tree_mergeinfo;
- apr_pool_t *subpool, *iterpool;
- apr_array_header_t *query_paths;
- int i;
- /* Revision 0 doesn't have any mergeinfo. */
- if (rev == 0)
- {
- *combined_mergeinfo = apr_hash_make(pool);
- return SVN_NO_ERROR;
- }
+ /* Initialize return variables. */
+ *deleted_mergeinfo_catalog = apr_hash_make(pool);
+ *added_mergeinfo_catalog = apr_hash_make(pool);
+
+ /* Revision 0 has no mergeinfo and no mergeinfo changes. */
+ if (rev == 0)
+ return SVN_NO_ERROR;
subpool = svn_pool_create(pool);
- iterpool = svn_pool_create(subpool);
- /* Get the mergeinfo for each tree roots in PATHS. */
+ /* We're going to use the changed-paths information for REV to
+ narrow down our search. */
SVN_ERR(svn_fs_revision_root(&root, fs, rev, subpool));
+ SVN_ERR(svn_fs_paths_changed(&changes, root, subpool));
- /* If we're looking at a previous revision, some of the paths
- might not exist, and svn_fs_get_mergeinfo expects them to! */
- query_paths = apr_array_make(pool, paths->nelts, sizeof(const char *));
- for (i = 0; i < paths->nelts; i++)
+ /* No changed paths? We're done. */
+ if (apr_hash_count(changes) == 0)
{
- const char *path = APR_ARRAY_IDX(paths, i, const char *);
- svn_node_kind_t kind;
+ svn_pool_destroy(subpool);
+ return SVN_NO_ERROR;
+ }
+
+ /* Loop over changes, looking for anything that might carry an
+ svn:mergeinfo change and is one of our paths of interest, or a
+ child or [grand]parent directory thereof. */
+ iterpool = svn_pool_create(subpool);
+ for (hi = apr_hash_first(pool, changes); hi; hi = apr_hash_next(hi))
+ {
+ const void *key;
+ void *val;
+ svn_fs_path_change_t *change;
+ const char *changed_path, *base_path = NULL;
+ svn_revnum_t base_rev = SVN_INVALID_REVNUM;
+ svn_string_t *prev_mergeinfo_value = NULL, *mergeinfo_value;
svn_pool_clear(iterpool);
- SVN_ERR(svn_fs_check_path(&kind, root, path, iterpool));
- if (kind == svn_node_none)
- {
- svn_revnum_t copy_rev;
- const char *copy_path;
- svn_fs_root_t *rev_root;
-
- /* Check to see if the node was copied, and if so, use the previous
- path to check for mergeinfo. */
- SVN_ERR(svn_fs_revision_root(&rev_root, fs, rev + 1, iterpool));
- SVN_ERR(svn_fs_copied_from(©_rev, ©_path, rev_root, path,
- subpool));
- if (copy_path != NULL)
- APR_ARRAY_PUSH(query_paths, const char *) = copy_path;
- }
- else
- APR_ARRAY_PUSH(query_paths, const char *) = path;
- }
- /* We do not need to call svn_repos_fs_get_mergeinfo() (which
- performs authz) because we are already doing authz on the changed
- paths and the log messages when we go to fill the log entry. See
- fill_log_entry() for details. */
- SVN_ERR(svn_fs_get_mergeinfo(&tree_mergeinfo, root, query_paths,
- svn_mergeinfo_inherited, TRUE, subpool));
+ /* KEY will be the path, VAL the change. */
+ apr_hash_this(hi, &key, NULL, &val);
+ changed_path = key;
+ change = val;
+
+ /* If there was no property change on this item, ignore it. */
+ if (! change->prop_mod)
+ continue;
- *combined_mergeinfo = apr_hash_make(subpool);
+ switch (change->change_kind)
+ {
- /* Merge all the mergeinfos into one mergeinfo */
- for (hi = apr_hash_first(subpool, tree_mergeinfo);
- hi; hi = apr_hash_next(hi))
- {
- svn_mergeinfo_t mergeinfo;
+ /* ### TODO: Can the add, replace, and modify cases be joined
+ ### together to all use svn_repos__prev_location()? The
+ ### difference would be the fallback case (path/rev-1 for
+ ### modifies, NULL otherwise). -- cmpilato */
+
+ /* If the path was added or replaced, see if it was created via
+ copy. If so, that will tell us where its previous location
+ was. If not, there's no previous location to examine. */
+ case svn_fs_path_change_add:
+ case svn_fs_path_change_replace:
+ {
+ const char *copyfrom_path;
+ svn_revnum_t copyfrom_rev;
+
+ SVN_ERR(svn_fs_copied_from(©from_rev, ©from_path,
+ root, changed_path, iterpool));
+ if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev))
+ {
+ base_path = apr_pstrdup(subpool, copyfrom_path);
+ base_rev = copyfrom_rev;
+ }
+ break;
+ }
- apr_hash_this(hi, NULL, NULL, (void *)&mergeinfo);
- SVN_ERR(svn_mergeinfo_merge(*combined_mergeinfo, mergeinfo, subpool));
- }
+ /* If the path was merely modified, see if its previous
+ location was affected by a copy which happened in this
+ revision before assuming it holds the same path it did the
+ previous revision. */
+ case svn_fs_path_change_modify:
+ {
+ svn_revnum_t appeared_rev;
+
+ SVN_ERR(svn_repos__prev_location(&appeared_rev, &base_path,
+ &base_rev, fs, rev,
+ changed_path, iterpool));
+
+ /* If this path isn't the result of a copy that occurred
+ in this revision, we can find the previous version of
+ it in REV - 1 at the same path. */
+ if (! (base_path && SVN_IS_VALID_REVNUM(base_rev)
+ && (appeared_rev == rev)))
+ {
+ base_path = changed_path;
+ base_rev = rev - 1;
+ }
+ break;
+ }
- *combined_mergeinfo = svn_mergeinfo_dup(*combined_mergeinfo, pool);
+ /* We don't care about any of the other cases. */
+ case svn_fs_path_change_delete:
+ case svn_fs_path_change_reset:
+ default:
+ continue;
+ }
- svn_pool_destroy(subpool);
+ /* If there was a base location, fetch its (possibly inherited)
+ mergeinfo property value. */
+ if (base_path && SVN_IS_VALID_REVNUM(base_rev))
+ {
+ svn_fs_root_t *base_root;
+ apr_array_header_t *query_paths =
+ apr_array_make(iterpool, 1, sizeof(const char *));
+ svn_mergeinfo_t base_mergeinfo;
+ svn_mergeinfo_catalog_t base_catalog;
+
+ SVN_ERR(svn_fs_revision_root(&base_root, fs, base_rev, iterpool));
+ APR_ARRAY_PUSH(query_paths, const char *) = base_path;
+ SVN_ERR(svn_fs_get_mergeinfo(&base_catalog, base_root, query_paths,
+ svn_mergeinfo_inherited, FALSE,
+ iterpool));
+ base_mergeinfo = apr_hash_get(base_catalog, base_path,
+ APR_HASH_KEY_STRING);
+ if (base_mergeinfo)
+ SVN_ERR(svn_mergeinfo_to_string(&prev_mergeinfo_value,
+ base_mergeinfo,
+ iterpool));
+ }
+ /* Now fetch the current (as of REV) mergeinfo property value. */
+ SVN_ERR(svn_fs_node_prop(&mergeinfo_value, root, changed_path,
+ SVN_PROP_MERGEINFO, iterpool));
+
+ /* If the old and new mergeinfo differ in any way, store the
+ before and after mergeinfo values in our return hashes. */
+ if ((prev_mergeinfo_value && (! mergeinfo_value))
+ || ((! prev_mergeinfo_value) && mergeinfo_value)
+ || (prev_mergeinfo_value && mergeinfo_value
+ && (! svn_string_compare(mergeinfo_value,
+ prev_mergeinfo_value))))
+ {
+ svn_mergeinfo_t prev_mergeinfo = NULL, mergeinfo = NULL;
+ svn_mergeinfo_t deleted, added;
+ const char *hash_path;
+
+ if (mergeinfo_value)
+ SVN_ERR(svn_mergeinfo_parse(&mergeinfo,
+ mergeinfo_value->data, iterpool));
+ if (prev_mergeinfo_value)
+ SVN_ERR(svn_mergeinfo_parse(&prev_mergeinfo,
+ prev_mergeinfo_value->data, iterpool));
+ SVN_ERR(svn_mergeinfo_diff(&deleted, &added, prev_mergeinfo,
+ mergeinfo, FALSE, iterpool));
+
+ /* Toss interesting stuff into our return catalogs. */
+ hash_path = apr_pstrdup(pool, changed_path);
+ apr_hash_set(*deleted_mergeinfo_catalog, hash_path,
+ APR_HASH_KEY_STRING, svn_mergeinfo_dup(deleted, pool));
+ apr_hash_set(*added_mergeinfo_catalog, hash_path,
+ APR_HASH_KEY_STRING, svn_mergeinfo_dup(added, pool));
+ }
+ }
+ /* ### UNNECESSARY ###: svn_pool_destroy(iterpool); */
+ svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
-/* Determine all the revisions which were merged into PATHS in REV. Return
- them as a new MERGEINFO. */
+
+/* Determine what (if any) mergeinfo for PATHS was modified in
+ revision REV, returning the diffs as a single combined rangelist in
+ *COMBINED_MERGEINFO. Use POOL for all allocations. */
static svn_error_t *
-get_merged_rev_mergeinfo(svn_mergeinfo_t *mergeinfo,
- svn_fs_t *fs,
- const apr_array_header_t *paths,
- svn_revnum_t rev,
- apr_pool_t *pool)
-{
- apr_hash_t *curr_mergeinfo, *prev_mergeinfo;
- apr_hash_t *deleted, *changed;
- apr_pool_t *subpool;
+get_combined_mergeinfo_changes(svn_mergeinfo_t *combined_mergeinfo,
+ svn_fs_t *fs,
+ const apr_array_header_t *paths,
+ svn_revnum_t rev,
+ apr_pool_t *pool)
+{
+ svn_mergeinfo_catalog_t added_mergeinfo_catalog, deleted_mergeinfo_catalog;
+ apr_hash_index_t *hi;
+ svn_fs_root_t *root;
+ apr_pool_t *subpool, *iterpool;
+ int i;
- /* Revision 0 is always empty. */
- if (rev == 0)
- {
- *mergeinfo = apr_hash_make(pool);
- return SVN_NO_ERROR;
- }
+ /* Initialize return value. */
+ *combined_mergeinfo = apr_hash_make(pool);
+ /* If we're asking about revision 0, there's no mergeinfo to be found. */
+ if (rev == 0)
+ return SVN_NO_ERROR;
+
+ /* No paths? No mergeinfo. */
+ if (! paths->nelts)
+ return SVN_NO_ERROR;
+
+ /* Create a work subpool and get a root for REV. */
subpool = svn_pool_create(pool);
- SVN_ERR(get_combined_mergeinfo(&curr_mergeinfo, fs, rev,
- paths, subpool));
- SVN_ERR(get_combined_mergeinfo(&prev_mergeinfo, fs, rev - 1,
- paths, subpool));
- SVN_ERR(svn_mergeinfo_diff(&deleted, &changed, prev_mergeinfo,
- curr_mergeinfo, FALSE,
- subpool));
- SVN_ERR(svn_mergeinfo_merge(changed, deleted, subpool));
+ SVN_ERR(svn_fs_revision_root(&root, fs, rev, subpool));
- *mergeinfo = svn_mergeinfo_dup(changed, pool);
- svn_pool_destroy(subpool);
+ /* Fetch the mergeinfo changes for REV. */
+ SVN_ERR(fs_mergeinfo_changed(&deleted_mergeinfo_catalog,
+ &added_mergeinfo_catalog,
+ fs, rev, subpool));
+
+ /* Check our PATHS for any changes to their inherited mergeinfo.
+ (We deal with changes to mergeinfo directly *on* the paths in the
+ following loop.) */
+ iterpool = svn_pool_create(subpool);
+ for (i = 0; i < paths->nelts; i++)
+ {
+ const char *path = APR_ARRAY_IDX(paths, i, const char *);
+ const char *prev_path;
+ svn_revnum_t appeared_rev, prev_rev;
+ svn_fs_root_t *prev_root;
+ svn_mergeinfo_catalog_t catalog;
+ svn_mergeinfo_t prev_mergeinfo, mergeinfo, deleted, added;
+ apr_array_header_t *query_paths;
+ svn_error_t *err;
+
+ svn_pool_clear(iterpool);
+ /* If this path is represented in the changed-mergeinfo hashes,
+ we'll deal with it in the loop below. */
+ if (apr_hash_get(deleted_mergeinfo_catalog, path, APR_HASH_KEY_STRING))
+ continue;
+
+ /* Figure out what path/rev to compare against. Ignore
+ not-found errors returned by the filesystem. */
+ err = svn_repos__prev_location(&appeared_rev, &prev_path, &prev_rev,
+ fs, rev, path, iterpool);
+ if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
+ {
+ svn_error_clear(err);
+ err = SVN_NO_ERROR;
+ continue;
+ }
+ SVN_ERR(err);
+
+ /* If this path isn't the result of a copy that occurred in this
+ revision, we can find the previous version of it in REV - 1
+ at the same path. */
+ if (! (prev_path && SVN_IS_VALID_REVNUM(prev_rev)
+ && (appeared_rev == rev)))
+ {
+ prev_path = path;
+ prev_rev = rev - 1;
+ }
+
+ /* Fetch the previous mergeinfo (including inherited stuff) for
+ this path. Ignore not-found errors returned by the
+ filesystem. */
+ SVN_ERR(svn_fs_revision_root(&prev_root, fs, prev_rev, iterpool));
+ query_paths = apr_array_make(iterpool, 1, sizeof(const char *));
+ APR_ARRAY_PUSH(query_paths, const char *) = prev_path;
+ err = svn_fs_get_mergeinfo(&catalog, prev_root, query_paths,
+ svn_mergeinfo_inherited, FALSE, iterpool);
+ if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
+ {
+ svn_error_clear(err);
+ err = SVN_NO_ERROR;
+ continue;
+ }
+ SVN_ERR(err);
+ prev_mergeinfo = apr_hash_get(catalog, prev_path, APR_HASH_KEY_STRING);
+
+ /* Fetch the current mergeinfo (as of REV, and including
+ inherited stuff) for this path. */
+ APR_ARRAY_IDX(query_paths, 0, const char *) = path;
+ SVN_ERR(svn_fs_get_mergeinfo(&catalog, root, query_paths,
+ svn_mergeinfo_inherited, FALSE, iterpool));
+ mergeinfo = apr_hash_get(catalog, path, APR_HASH_KEY_STRING);
+
+ /* Compare, constrast, and combine the results. */
+ SVN_ERR(svn_mergeinfo_diff(&deleted, &added, prev_mergeinfo,
+ mergeinfo, FALSE, iterpool));
+ mergeinfo = deleted;
+ SVN_ERR(svn_mergeinfo_merge(mergeinfo, added, iterpool));
+ SVN_ERR(svn_mergeinfo_merge(*combined_mergeinfo,
+ svn_mergeinfo_dup(mergeinfo, pool),
+ pool));
+ }
+ svn_pool_destroy(iterpool);
+
+ /* Merge all the mergeinfos which are, or are children of, one or
+ our paths of interest into one giant delta mergeinfo. */
+ for (hi = apr_hash_first(NULL, added_mergeinfo_catalog);
+ hi; hi = apr_hash_next(hi))
+ {
+ const void *key;
+ apr_ssize_t klen;
+ void *val;
+ const char *changed_path;
+ svn_mergeinfo_t added_mergeinfo, deleted_mergeinfo;
+
+ /* The path is the key, the mergeinfo delta is the value. */
+ apr_hash_this(hi, &key, &klen, &val);
+ changed_path = key;
+ added_mergeinfo = val;
+
+ for (i = 0; i < paths->nelts; i++)
+ {
+ const char *path = APR_ARRAY_IDX(paths, i, const char *);
+ if (! svn_path_is_ancestor(path, changed_path))
+ continue;
+ deleted_mergeinfo =
+ apr_hash_get(deleted_mergeinfo_catalog, key, klen);
+ SVN_ERR(svn_mergeinfo_merge(*combined_mergeinfo,
+ svn_mergeinfo_dup(deleted_mergeinfo,
+ pool),
+ pool));
+ SVN_ERR(svn_mergeinfo_merge(*combined_mergeinfo,
+ svn_mergeinfo_dup(added_mergeinfo,
+ pool),
+ pool));
+ break;
+ }
+ }
+ svn_pool_clear(subpool);
return SVN_NO_ERROR;
}
+
/* Fill LOG_ENTRY with history information in FS at REV. */
static svn_error_t *
fill_log_entry(svn_log_entry_t *log_entry,
@@ -1234,8 +1453,8 @@ do_logs(svn_fs_t *fs,
struct path_info *);
APR_ARRAY_PUSH(cur_paths, const char *) = info->path->data;
}
- SVN_ERR(get_merged_rev_mergeinfo(&mergeinfo, fs, cur_paths,
- current, iterpool));
+ SVN_ERR(get_combined_mergeinfo_changes(&mergeinfo, fs, cur_paths,
+ current, iterpool));
has_children = (apr_hash_count(mergeinfo) > 0);
}
Modified: branches/file-externals/subversion/libsvn_repos/repos.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/repos.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/repos.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/repos.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -537,6 +537,8 @@ PREWRITTEN_HOOKS_TEXT
"# [1] REPOS-PATH (the path to this repository)" NL
"# [2] PATH (the path in the repository about to be locked)" NL
"# [3] USER (the user creating the lock)" NL
+"# [4] COMMENT (the comment of the lock)" NL
+"# [5] STEAL-LOCK (1 if the user is trying to steal the lock, else 0)" NL
"#" NL
"# The default working directory for the invocation is undefined, so" NL
"# the program should set one explicitly if it cares." NL
@@ -618,6 +620,8 @@ PREWRITTEN_HOOKS_TEXT
"# [1] REPOS-PATH (the path to this repository)" NL
"# [2] PATH (the path in the repository about to be unlocked)" NL
"# [3] USER (the user destroying the lock)" NL
+"# [4] TOKEN (the lock token to be destroyed)" NL
+"# [5] BREAK-UNLOCK (1 if the user is breaking the lock, else 0)" NL
"#" NL
"# The default working directory for the invocation is undefined, so" NL
"# the program should set one explicitly if it cares." NL
Modified: branches/file-externals/subversion/libsvn_repos/repos.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/repos.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/repos.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/repos.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -220,11 +220,17 @@ svn_repos__hooks_post_revprop_change(svn
/* Run the pre-lock hook for REPOS. Use POOL for any temporary
allocations. If the hook fails, return SVN_ERR_REPOS_HOOK_FAILURE.
- PATH is the path being locked, USERNAME is the person doing it. */
+ PATH is the path being locked, USERNAME is the person doing it,
+ COMMENT is the comment of the lock, and is treated as an empty
+ string when NULL is given. STEAL-LOCK is a flag if the user is
+ stealing the lock. */
+
svn_error_t *
svn_repos__hooks_pre_lock(svn_repos_t *repos,
const char *path,
const char *username,
+ const char *comment,
+ svn_boolean_t steal_lock,
apr_pool_t *pool);
/* Run the post-lock hook for REPOS. Use POOL for any temporary
@@ -241,11 +247,15 @@ svn_repos__hooks_post_lock(svn_repos_t *
/* Run the pre-unlock hook for REPOS. Use POOL for any temporary
allocations. If the hook fails, return SVN_ERR_REPOS_HOOK_FAILURE.
- PATH is the path being unlocked, USERNAME is the person doing it. */
+ PATH is the path being unlocked, USERNAME is the person doing it,
+ TOKEN is the lock token to be unlocked which should not be NULL,
+ and BREAK-LOCK is a flag if the user is breaking the lock. */
svn_error_t *
svn_repos__hooks_pre_unlock(svn_repos_t *repos,
const char *path,
const char *username,
+ const char *token,
+ svn_boolean_t break_lock,
apr_pool_t *pool);
/* Run the post-unlock hook for REPOS. Use POOL for any temporary
@@ -273,6 +283,28 @@ svn_repos__compare_files(svn_boolean_t *
const char *path2,
apr_pool_t *pool);
+/* Set *PREV_PATH and *PREV_REV to the path and revision which
+ represent the location at which PATH in FS was located immediately
+ prior to REVISION iff there was a copy operation (to PATH or one of
+ its parent directories) between that previous location and
+ PATH@REVISION, and set *APPEARED_REV to the first revision in which
+ PATH@REVISION appeared at PATH as a result of that copy operation.
+
+ If there was no such copy operation in that portion
+ of PATH's history, set *PREV_PATH to NULL, and set *PREV_REV and
+ *APPEARED_REV to SVN_INVALID_REVNUM.
+
+ NOTE: Any of PREV_PATH, PREV_REV, and APPEARED_REV may be NULL to
+ if that information is of no interest to the caller. */
+svn_error_t *
+svn_repos__prev_location(svn_revnum_t *appeared_rev,
+ const char **prev_path,
+ svn_revnum_t *prev_rev,
+ svn_fs_t *fs,
+ svn_revnum_t revision,
+ const char *path,
+ apr_pool_t *pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: branches/file-externals/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_repos/rev_hunt.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_repos/rev_hunt.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_repos/rev_hunt.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -598,32 +598,26 @@ check_ancestry_of_peg_path(svn_boolean_t
}
-/* Set *PREV_PATH and *PREV_REV to the path and revision which
- represent the location at which PATH in FS was located immediately
- prior to REVISION iff there was a copy operation (to PATH or one of
- its parent directories) between that previous location and
- PATH@REVISION, and set *APPEARED_REV to the first revision in which
- PATH@REVISION appeared at PATH as a result of that copy operation.
-
- If there was no such copy operation in that portion
- of PATH's history, set *PREV_PATH to NULL, and set *PREV_REV and
- *APPEARED_REV to SVN_INVALID_REVNUM. */
-static svn_error_t *
-prev_location(svn_revnum_t *appeared_rev,
- const char **prev_path,
- svn_revnum_t *prev_rev,
- svn_fs_t *fs,
- svn_revnum_t revision,
- const char *path,
- apr_pool_t *pool)
+svn_error_t *
+svn_repos__prev_location(svn_revnum_t *appeared_rev,
+ const char **prev_path,
+ svn_revnum_t *prev_rev,
+ svn_fs_t *fs,
+ svn_revnum_t revision,
+ const char *path,
+ apr_pool_t *pool)
{
svn_fs_root_t *root, *copy_root;
const char *copy_path, *copy_src_path, *remainder = "";
svn_revnum_t copy_src_rev;
/* Initialize return variables. */
- *appeared_rev = *prev_rev = SVN_INVALID_REVNUM;
- *prev_path = NULL;
+ if (appeared_rev)
+ *appeared_rev = SVN_INVALID_REVNUM;
+ if (prev_rev)
+ *prev_rev = SVN_INVALID_REVNUM;
+ if (prev_path)
+ *prev_path = NULL;
/* Ask about the most recent copy which affected PATH@REVISION. If
there was no such copy, we're done. */
@@ -649,9 +643,12 @@ prev_location(svn_revnum_t *appeared_rev
copy_root, copy_path, pool));
if (! strcmp(copy_path, path) == 0)
remainder = svn_path_is_child(copy_path, path, pool);
- *prev_path = svn_path_join(copy_src_path, remainder, pool);
- *appeared_rev = svn_fs_revision_root_revision(copy_root);
- *prev_rev = copy_src_rev;
+ if (prev_path)
+ *prev_path = svn_path_join(copy_src_path, remainder, pool);
+ if (appeared_rev)
+ *appeared_rev = svn_fs_revision_root_revision(copy_root);
+ if (prev_rev)
+ *prev_rev = copy_src_rev;
return SVN_NO_ERROR;
}
@@ -737,8 +734,8 @@ svn_repos_trace_node_locations(svn_fs_t
/* Find the target of the innermost copy relevant to path@revision.
The copy may be of path itself, or of a parent directory. */
- SVN_ERR(prev_location(&appeared_rev, &prev_path, &prev_rev, fs,
- revision, path, currpool));
+ SVN_ERR(svn_repos__prev_location(&appeared_rev, &prev_path, &prev_rev,
+ fs, revision, path, currpool));
if (! prev_path)
break;
@@ -924,8 +921,8 @@ svn_repos_node_location_segments(svn_rep
segment->range_start = end_rev;
segment->path = cur_path + 1;
- SVN_ERR(prev_location(&appeared_rev, &prev_path, &prev_rev, fs,
- current_rev, cur_path, subpool));
+ SVN_ERR(svn_repos__prev_location(&appeared_rev, &prev_path, &prev_rev,
+ fs, current_rev, cur_path, subpool));
/* If there are no previous locations for this thing (meaning,
it originated at the current path), then we simply need to
Modified: branches/file-externals/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/cache-memcache.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/cache-memcache.c Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/cache-memcache.c Wed Jul 30 \
08:04:13 2008 (r32332) @@ -73,7 +73,7 @@ struct svn_memcache_t {
/* Returns a memcache key for the given key KEY for CACHE, allocated
in POOL. */
-const char *
+static const char *
build_key(memcache_t *cache,
const void *raw_key,
apr_pool_t *pool)
@@ -120,7 +120,7 @@ build_key(memcache_t *cache,
}
-svn_error_t *
+static svn_error_t *
memcache_get(void **value_p,
svn_boolean_t *found,
void *cache_void,
@@ -171,7 +171,7 @@ memcache_get(void **value_p,
}
-svn_error_t *
+static svn_error_t *
memcache_set(void *cache_void,
const void *key,
void *value,
@@ -207,7 +207,7 @@ memcache_set(void *cache_void,
}
-svn_error_t *
+static svn_error_t *
memcache_iter(svn_boolean_t *completed,
void *cache_void,
svn_iter_apr_hash_cb_t user_cb,
Modified: branches/file-externals/subversion/libsvn_subr/cmdline.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/cmdline.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/cmdline.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/cmdline.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -43,8 +43,12 @@
#include "svn_auth.h"
#include "svn_version.h"
#include "utf_impl.h"
+#include "svn_xml.h"
+#include "svn_base64.h"
#include "svn_config.h"
+#include "private/svn_cmdline_private.h"
+
#include "svn_private_config.h"
#include "win32_crashrpt.h"
@@ -355,11 +359,33 @@ svn_cmdline_handle_exit_error(svn_error_
}
#if defined(SVN_HAVE_KWALLET) || defined(SVN_HAVE_GNOME_KEYRING)
-/* Dynamically load authentication simple provider. */
+
+/* Set *PROVIDER according to PROVIDER_NAME and PROVIDER_TYPE,
+ * allocating it in POOL.
+ *
+ * Valid PROVIDER_NAME values are: "gnome_keyring" and "kwallet"
+ * (they correspond to the loadable libraries named, e.g.,
+ * "libsvn_auth_gnome_keyring-1.so.0", etc.)
+ *
+ * Valid PROVIDER_TYPE values are: "simple" and "ssl_client_cert_pw"
+ * (they correspond to function names found in the loaded library,
+ * such as "svn_auth_get_gnome_keyring_simple_provider", etc).
+ *
+ * What actually happens is we load the library and invoke the
+ * appropriate provider function to supply *PROVIDER, like so:
+ *
+ * svn_auth_get_<name>_<type>_provider(PROVIDER, POOL);
+ *
+ * If the library load fails, return an error (with the effect on
+ * *PROVIDER undefined). But if the symbol is simply not found in the
+ * library, or if the PROVIDER_TYPE is unrecognized, set *PROVIDER to
+ * NULL and return success.
+ */
static svn_error_t *
-get_auth_simple_provider(svn_auth_provider_object_t **provider,
- const char *provider_name,
- apr_pool_t *pool)
+get_auth_provider(svn_auth_provider_object_t **provider,
+ const char *provider_name,
+ const char *provider_type,
+ apr_pool_t *pool)
{
apr_dso_handle_t *dso;
apr_dso_handle_sym_t symbol;
@@ -371,33 +397,79 @@ get_auth_simple_provider(svn_auth_provid
provider_name,
SVN_VER_MAJOR);
funcname = apr_psprintf(pool,
- "svn_auth_get_%s_simple_provider",
- provider_name);
+ "svn_auth_get_%s_%s_provider",
+ provider_name, provider_type);
SVN_ERR(svn_dso_load(&dso, libname));
if (dso)
{
if (! apr_dso_sym(&symbol, dso, funcname))
{
- svn_auth_simple_provider_func_t func;
- func = (svn_auth_simple_provider_func_t) symbol;
- func(provider, pool);
+ if (strcmp(provider_type, "simple") == 0)
+ {
+ svn_auth_simple_provider_func_t func;
+ func = (svn_auth_simple_provider_func_t) symbol;
+ func(provider, pool);
+ }
+ else if (strcmp(provider_type, "ssl_client_cert_pw") == 0)
+ {
+ svn_auth_ssl_client_cert_pw_provider_func_t func;
+ func = (svn_auth_ssl_client_cert_pw_provider_func_t) symbol;
+ func(provider, pool);
+ }
}
}
return SVN_NO_ERROR;
}
#endif
+
+/* This implements 'svn_auth_ssl_server_trust_prompt_func_t'.
+
+ Don't actually prompt. Instead, set *CRED_P to valid credentials
+ iff FAILURES is empty or is exactly SVN_AUTH_SSL_UNKNOWNCA. If
+ there are any other failure bits, then set *CRED_P to null (that
+ is, reject the cert).
+
+ Ignore MAY_SAVE; we don't save certs we never prompted for.
+
+ Ignore BATON, REALM, and CERT_INFO,
+
+ Ignore any further films by George Lucas. */
+static svn_error_t *
+ssl_trust_unknown_server_cert
+ (svn_auth_cred_ssl_server_trust_t **cred_p,
+ void *baton,
+ const char *realm,
+ apr_uint32_t failures,
+ const svn_auth_ssl_server_cert_info_t *cert_info,
+ svn_boolean_t may_save,
+ apr_pool_t *pool)
+{
+ *cred_p = NULL;
+
+ if (failures == 0 || failures == SVN_AUTH_SSL_UNKNOWNCA)
+ {
+ *cred_p = apr_pcalloc(pool, sizeof(**cred_p));
+ (*cred_p)->may_save = FALSE;
+ (*cred_p)->accepted_failures = failures;
+ }
+
+ return SVN_NO_ERROR;
+}
+
+
svn_error_t *
-svn_cmdline_setup_auth_baton(svn_auth_baton_t **ab,
- svn_boolean_t non_interactive,
- const char *auth_username,
- const char *auth_password,
- const char *config_dir,
- svn_boolean_t no_auth_cache,
- svn_config_t *cfg,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool)
+svn_cmdline_set_up_auth_baton(svn_auth_baton_t **ab,
+ svn_boolean_t non_interactive,
+ const char *auth_username,
+ const char *auth_password,
+ const char *config_dir,
+ svn_boolean_t no_auth_cache,
+ svn_boolean_t trust_server_cert,
+ svn_config_t *cfg,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool)
{
svn_boolean_t store_password_val = TRUE;
svn_boolean_t store_auth_creds_val = TRUE;
@@ -458,12 +530,20 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
if (apr_strnatcmp(password_store, "gnome-keyring") == 0)
{
#ifdef SVN_HAVE_GNOME_KEYRING
- SVN_ERR(get_auth_simple_provider(&provider, "gnome_keyring", pool));
+ SVN_ERR(get_auth_provider(&provider, "gnome_keyring", "simple",
+ pool));
if (provider)
{
APR_ARRAY_PUSH(providers,
svn_auth_provider_object_t *) = provider;
}
+ SVN_ERR(get_auth_provider(&provider, "gnome_keyring",
+ "ssl_client_cert_pw", pool));
+ if (provider)
+ {
+ APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *)
+ = provider;
+ }
#endif
continue;
}
@@ -471,7 +551,7 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
if (apr_strnatcmp(password_store, "kwallet") == 0)
{
#ifdef SVN_HAVE_KWALLET
- SVN_ERR(get_auth_simple_provider(&provider, "kwallet", pool));
+ SVN_ERR(get_auth_provider(&provider, "kwallet", "simple", pool));
if (provider)
{
APR_ARRAY_PUSH(providers,
@@ -488,10 +568,8 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
if (non_interactive == FALSE)
{
- /* This provider is odd in that it isn't a prompting provider in
- the classic sense. That is, it doesn't need to prompt in
- order to get creds, but it *does* need to prompt the user
- regarding the *cache storage* of creds. */
+ /* This provider doesn't prompt the user in order to get creds;
+ it prompts the user regarding the caching of creds. */
svn_auth_get_simple_provider2(&provider,
svn_cmdline_auth_plaintext_prompt,
pb, pool);
@@ -513,7 +591,20 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
- svn_auth_get_ssl_client_cert_pw_file_provider(&provider, pool);
+
+ if (non_interactive == FALSE)
+ {
+ /* This provider doesn't prompt the user in order to get creds;
+ it prompts the user regarding the caching of creds. */
+ svn_auth_get_ssl_client_cert_pw_file_provider2
+ (&provider, svn_cmdline_auth_plaintext_passphrase_prompt,
+ pb, pool);
+ }
+ else
+ {
+ svn_auth_get_ssl_client_cert_pw_file_provider2(&provider, NULL, NULL,
+ pool);
+ }
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
if (non_interactive == FALSE)
@@ -545,6 +636,13 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
(&provider, svn_cmdline_auth_ssl_client_cert_pw_prompt, pb, 2, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
}
+ else if (trust_server_cert)
+ {
+ /* Remember, only register this provider if non_interactive. */
+ svn_auth_get_ssl_server_trust_prompt_provider
+ (&provider, ssl_trust_unknown_server_cert, NULL, pool);
+ APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+ }
/* Build an authentication baton to give to libsvn_client. */
svn_auth_open(ab, providers, pool);
@@ -593,6 +691,26 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
return SVN_NO_ERROR;
}
+
+svn_error_t *
+svn_cmdline_setup_auth_baton(svn_auth_baton_t **ab,
+ svn_boolean_t non_interactive,
+ const char *auth_username,
+ const char *auth_password,
+ const char *config_dir,
+ svn_boolean_t no_auth_cache,
+ svn_config_t *cfg,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool)
+{
+ return svn_cmdline_set_up_auth_baton(ab, non_interactive,
+ auth_username, auth_password,
+ config_dir, no_auth_cache, FALSE,
+ cfg, cancel_func, cancel_baton, pool);
+}
+
+
svn_error_t *
svn_cmdline__getopt_init(apr_getopt_t **os,
int argc,
@@ -619,4 +737,44 @@ svn_cmdline__getopt_init(apr_getopt_t **
}
+void
+svn_cmdline__print_xml_prop(svn_stringbuf_t **outstr,
+ const char* propname,
+ svn_string_t *propval,
+ apr_pool_t *pool)
+{
+ const char *xml_safe;
+ const char *encoding = NULL;
+
+ if (*outstr == NULL)
+ *outstr = svn_stringbuf_create("", pool);
+
+ if (svn_xml_is_xml_safe(propval->data, propval->len))
+ {
+ svn_stringbuf_t *xml_esc = NULL;
+ svn_xml_escape_cdata_string(&xml_esc, propval, pool);
+ xml_safe = xml_esc->data;
+ }
+ else
+ {
+ const svn_string_t *base64ed = svn_base64_encode_string(propval, pool);
+ encoding = "base64";
+ xml_safe = base64ed->data;
+ }
+
+ if (encoding)
+ svn_xml_make_open_tag(outstr, pool, svn_xml_protect_pcdata,
+ "property", "name", propname,
+ "encoding", encoding, NULL);
+ else
+ svn_xml_make_open_tag(outstr, pool, svn_xml_protect_pcdata,
+ "property", "name", propname, NULL);
+
+ svn_stringbuf_appendcstr(*outstr, xml_safe);
+
+ svn_xml_make_close_tag(outstr, pool, "property");
+
+ return;
+}
+
Modified: branches/file-externals/subversion/libsvn_subr/config_file.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/config_file.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/config_file.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/config_file.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -438,6 +438,27 @@ svn_config__parse_file(svn_config_t *cfg
}
+/* Helper for ensure_auth_dirs: create SUBDIR under AUTH_DIR, iff
+ SUBDIR does not already exist, but ignore any errors. Use POOL for
+ temporary allocation. */
+static void
+ensure_auth_subdir(const char *auth_dir,
+ const char *subdir,
+ apr_pool_t *pool)
+{
+ svn_error_t *err;
+ const char *subdir_full_path;
+ svn_node_kind_t kind;
+
+ subdir_full_path = svn_path_join_many(pool, auth_dir, subdir, NULL);
+ err = svn_io_check_path(subdir_full_path, &kind, pool);
+ if (err || kind == svn_node_none)
+ {
+ svn_error_clear(err);
+ svn_error_clear(svn_io_dir_make(subdir_full_path, APR_OS_DEFAULT, pool));
+ }
+}
+
/* Helper for svn_config_ensure: see if ~/.subversion/auth/ and its
subdirs exist, try to create them, but don't throw errors on
failure. PATH is assumed to be a path to the user's private config
@@ -447,7 +468,7 @@ ensure_auth_dirs(const char *path,
apr_pool_t *pool)
{
svn_node_kind_t kind;
- const char *auth_dir, *auth_subdir;
+ const char *auth_dir;
svn_error_t *err;
/* Ensure ~/.subversion/auth/ */
@@ -470,33 +491,10 @@ ensure_auth_dirs(const char *path,
/* If a provider exists that wants to store credentials in
~/.subversion, a subdirectory for the cred_kind must exist. */
-
- auth_subdir = svn_path_join_many(pool, auth_dir,
- SVN_AUTH_CRED_SIMPLE, NULL);
- err = svn_io_check_path(auth_subdir, &kind, pool);
- if (err || kind == svn_node_none)
- {
- svn_error_clear(err);
- svn_error_clear(svn_io_dir_make(auth_subdir, APR_OS_DEFAULT, pool));
- }
-
- auth_subdir = svn_path_join_many(pool, auth_dir,
- SVN_AUTH_CRED_USERNAME, NULL);
- err = svn_io_check_path(auth_subdir, &kind, pool);
- if (err || kind == svn_node_none)
- {
- svn_error_clear(err);
- svn_error_clear(svn_io_dir_make(auth_subdir, APR_OS_DEFAULT, pool));
- }
-
- auth_subdir = svn_path_join_many(pool, auth_dir,
- SVN_AUTH_CRED_SSL_SERVER_TRUST, NULL);
- err = svn_io_check_path(auth_subdir, &kind, pool);
- if (err || kind == svn_node_none)
- {
- svn_error_clear(err);
- svn_error_clear(svn_io_dir_make(auth_subdir, APR_OS_DEFAULT, pool));
- }
+ ensure_auth_subdir(auth_dir, SVN_AUTH_CRED_SIMPLE, pool);
+ ensure_auth_subdir(auth_dir, SVN_AUTH_CRED_USERNAME, pool);
+ ensure_auth_subdir(auth_dir, SVN_AUTH_CRED_SSL_SERVER_TRUST, pool);
+ ensure_auth_subdir(auth_dir, SVN_AUTH_CRED_SSL_CLIENT_CERT_PW, pool);
}
@@ -757,7 +755,14 @@ svn_config_ensure(const char *config_dir
"### to disk in any way." NL
"### store-plaintext-passwords Specifies whether passwords may" NL
"### be cached on disk unencrypted." NL
- "###" NL
+ "### store-ssl-client-cert-pp Specifies whether passphrase used" NL
+ "### to authenticate against a client" NL
+ "### certificate may be cached to disk" NL
+ "### in any way" NL
+ "### store-ssl-client-cert-pp-plaintext" NL
+ "### Specifies whether client cert" NL
+ "### passphrases may be cached on disk" NL
+ "### unencrypted (i.e., as plaintext)." NL
"### store-auth-creds Specifies whether any auth info" NL
"### (passwords as well as server certs)"
NL
@@ -780,6 +785,28 @@ svn_config_ensure(const char *config_dir
"### this option has no effect if either 'store-passwords' or " NL
"### 'store-auth-creds' is set to 'no'." NL
"###" NL
+ "### Set store-ssl-client-cert-pp to 'no' to avoid storing ssl" NL
+ "### client certificate passphrases in the auth/ area of your" NL
+ "### config directory. It defaults to 'yes', but Subversion will" NL
+ "### never save your passphrase to disk in plaintext unless you tell"NL
+ "### it to via 'store-ssl-client-cert-pp-plaintext' (see below)." NL
+ "###" NL
+ "### Note store-ssl-client-cert-pp only prevents the saving of *new*"NL
+ "### passphrases; it doesn't invalidate existing passphrases. To do"NL
+ "### that, remove the cache files by hand as described in the" NL
+ "### Subversion book at http://svnbook.red-bean.com/nightly/en/\\" NL
+ "### svn.serverconfig.netmodel.html\\" NL
+ "### #svn.serverconfig.netmodel.credcache" NL
+ "###" NL
+ "### Set store-ssl-client-cert-pp-plaintext to 'no' to avoid storing"NL
+ "### passphrases in unencrypted form in the auth/ area of your" NL
+ "### config directory. Set it to 'yes' to allow Subversion to" NL
+ "### store unencrypted passphrases in the auth/ area. The default" NL
+ "### is 'ask', which means that Subversion will prompt before" NL
+ "### saving a passphrase to disk in unencrypted form. Note that" NL
+ "### this option has no effect if either 'store-auth-creds' or " NL
+ "### 'store-ssl-client-cert-pp' is set to 'no'." NL
+ "###" NL
"### Set store-auth-creds to 'no' to avoid storing any Subversion" NL
"### credentials in the auth/ area of your config directory." NL
"### Note that this includes SSL server certificates." NL
@@ -858,9 +885,11 @@ svn_config_ensure(const char *config_dir
"# No neon-debug-mask, so neon debugging is disabled." NL
"# ssl-authority-files = /path/to/CAcert.pem;/path/to/CAcert2.pem" NL
"#" NL
- "# Password caching parameters:" NL
+ "# Password / passphrase caching parameters:" NL
"# store-passwords = no" NL
- "# store-plaintext-passwords = no" NL;
+ "# store-plaintext-passwords = no" NL
+ "# store-ssl-client-cert-pp = no" NL
+ "# store-ssl-client-cert-pp-plaintext = no" NL;
err = svn_io_file_open(&f, path,
(APR_WRITE | APR_CREATE | APR_EXCL),
@@ -941,7 +970,7 @@ svn_config_ensure(const char *config_dir
"" NL
"### Section for configuring external helper applications." NL
"[helpers]" NL
- "### Set editor to the command used to invoke your text editor." NL
+ "### Set editor-cmd to the command used to invoke your text editor." NL
"### This will override the environment variables that Subversion" NL
"### examines by default to find this information ($EDITOR, " NL
"### et al)." NL
Modified: branches/file-externals/subversion/libsvn_subr/io.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/io.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/io.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/io.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -2392,7 +2392,9 @@ svn_io_run_diff3_2(int *exitcode,
args[i++] = svn_path_local_style(older, pool);
args[i++] = svn_path_local_style(yours, pool);
args[i++] = NULL;
+#ifndef NDEBUG
SVN_ERR_ASSERT(i == nargs);
+#endif
/* Run diff3, output the merged text into the scratch file. */
SVN_ERR(svn_io_run_cmd(dir, diff3_utf8, args,
Modified: branches/file-externals/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/mergeinfo.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/mergeinfo.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/mergeinfo.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -285,6 +285,9 @@ combine_with_lastrange(svn_merge_range_t
}
else /* ((*lastrange)->start > mrange->start) */
{
+ pushed_mrange_2 =
+ apr_palloc(pool, sizeof(*pushed_mrange_2));
+
if ((*lastrange)->end < mrange->end)
{
pushed_mrange_2->start = (*lastrange)->end;
Modified: branches/file-externals/subversion/libsvn_subr/prompt.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/prompt.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/prompt.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/prompt.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -379,16 +379,17 @@ svn_cmdline_auth_ssl_client_cert_pw_prom
return SVN_NO_ERROR;
}
-/* This implements 'svn_auth_plaintext_prompt_func_t'. */
-svn_error_t *
-svn_cmdline_auth_plaintext_prompt(svn_boolean_t *may_save_plaintext,
- const char *realmstring,
- void *baton,
- apr_pool_t *pool)
+/* This is a helper for plaintext prompt functions. */
+static svn_error_t *
+plaintext_prompt_helper(svn_boolean_t *may_save_plaintext,
+ const char *realmstring,
+ const char *prompt_string,
+ const char *prompt_text,
+ void *baton,
+ apr_pool_t *pool)
{
const char *answer = NULL;
svn_boolean_t answered = FALSE;
- const char *prompt_string = _("Store password unencrypted (yes/no)? ");
svn_cmdline_prompt_baton2_t *pb = baton;
const char *config_path = NULL;
@@ -396,27 +397,8 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
SVN_ERR(svn_config_get_user_config_path(&config_path, pb->config_dir,
SVN_CONFIG_CATEGORY_SERVERS, pool));
- SVN_ERR(svn_cmdline_fprintf(stderr, pool,
- _("-----------------------------------------------------------------------\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"
- ), realmstring));
-
- if (config_path)
- SVN_ERR(svn_cmdline_fprintf(stderr, pool,
- _("\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"
- ), config_path));
-
- SVN_ERR(svn_cmdline_fprintf(stderr, pool,
- "-----------------------------------------------------------------------\n"));
+ SVN_ERR(svn_cmdline_fprintf(stderr, pool, prompt_text, realmstring,
+ config_path));
do
{
@@ -450,6 +432,66 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
return SVN_NO_ERROR;
}
+/* This implements 'svn_auth_plaintext_prompt_func_t'. */
+svn_error_t *
+svn_cmdline_auth_plaintext_prompt(svn_boolean_t *may_save_plaintext,
+ const char *realmstring,
+ void *baton,
+ apr_pool_t *pool)
+{
+ const char *prompt_string = _("Store password unencrypted (yes/no)? ");
+ const char *prompt_text =
+ _("-----------------------------------------------------------------------\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"
+ );
+
+ SVN_ERR(plaintext_prompt_helper(may_save_plaintext, realmstring,
+ prompt_string, prompt_text, baton,
+ pool));
+ return SVN_NO_ERROR;
+}
+
+/* This implements 'svn_auth_plaintext_passphrase_prompt_func_t'. */
+svn_error_t *
+svn_cmdline_auth_plaintext_passphrase_prompt(svn_boolean_t *may_save_plaintext,
+ const char *realmstring,
+ void *baton,
+ apr_pool_t *pool)
+{
+ const char *prompt_string = _("Store passphrase unencrypted (yes/no)? ");
+ const char *prompt_text =
+ _("-----------------------------------------------------------------------\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"
+ );
+
+ SVN_ERR(plaintext_prompt_helper(may_save_plaintext, realmstring,
+ prompt_string, prompt_text, baton,
+ pool));
+ return SVN_NO_ERROR;
+}
+
/** Generic prompting. **/
Modified: branches/file-externals/subversion/libsvn_subr/simple_providers.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/simple_providers.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/simple_providers.c Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/simple_providers.c Wed Jul 30 \
08:04:13 2008 (r32332) @@ -37,10 +37,11 @@
/* File provider */
/*-----------------------------------------------------------------------*/
-/* The keys that will be stored on disk */
-#define SVN_AUTH__AUTHFILE_USERNAME_KEY "username"
-#define SVN_AUTH__AUTHFILE_PASSWORD_KEY "password"
-#define SVN_AUTH__AUTHFILE_PASSTYPE_KEY "passtype"
+/* The keys that will be stored on disk. These serve the same role as
+ similar constants in other providers. */
+#define AUTHN_USERNAME_KEY "username"
+#define AUTHN_PASSWORD_KEY "password"
+#define AUTHN_PASSTYPE_KEY "passtype"
/* Baton type for the simple provider. */
typedef struct
@@ -65,12 +66,10 @@ simple_password_get(const char **passwor
apr_pool_t *pool)
{
svn_string_t *str;
- str = apr_hash_get(creds, SVN_AUTH__AUTHFILE_USERNAME_KEY,
- APR_HASH_KEY_STRING);
- if (str && strcmp(str->data, username) == 0)
+ str = apr_hash_get(creds, AUTHN_USERNAME_KEY, APR_HASH_KEY_STRING);
+ if (str && username && strcmp(str->data, username) == 0)
{
- str = apr_hash_get(creds, SVN_AUTH__AUTHFILE_PASSWORD_KEY,
- APR_HASH_KEY_STRING);
+ str = apr_hash_get(creds, AUTHN_PASSWORD_KEY, APR_HASH_KEY_STRING);
if (str && str->data)
{
*password = str->data;
@@ -90,7 +89,7 @@ simple_password_set(apr_hash_t *creds,
svn_boolean_t non_interactive,
apr_pool_t *pool)
{
- apr_hash_set(creds, SVN_AUTH__AUTHFILE_PASSWORD_KEY, APR_HASH_KEY_STRING,
+ apr_hash_set(creds, AUTHN_PASSWORD_KEY, APR_HASH_KEY_STRING,
svn_string_create(password, pool));
return TRUE;
}
@@ -145,21 +144,19 @@ svn_auth__simple_first_creds_helper(void
svn_string_t *str;
if (! username)
{
- str = apr_hash_get(creds_hash,
- SVN_AUTH__AUTHFILE_USERNAME_KEY,
+ str = apr_hash_get(creds_hash, AUTHN_USERNAME_KEY,
APR_HASH_KEY_STRING);
if (str && str->data)
username = str->data;
}
- if (! password)
+ if (username && ! password)
{
svn_boolean_t have_passtype;
/* The password type in the auth data must match the
mangler's type, otherwise the password must be
interpreted by another provider. */
- str = apr_hash_get(creds_hash,
- SVN_AUTH__AUTHFILE_PASSTYPE_KEY,
+ str = apr_hash_get(creds_hash, AUTHN_PASSTYPE_KEY,
APR_HASH_KEY_STRING);
have_passtype = (str && str->data);
if (have_passtype && passtype
@@ -240,6 +237,9 @@ svn_auth__simple_save_creds_helper(svn_b
SVN_AUTH_PARAM_NO_AUTH_CACHE,
APR_HASH_KEY_STRING) != NULL);
+ /* Make sure we've been passed a passtype. */
+ SVN_ERR_ASSERT(passtype != NULL);
+
*saved = FALSE;
if (no_auth_cache)
@@ -251,8 +251,7 @@ svn_auth__simple_save_creds_helper(svn_b
/* Put the username into the credentials hash. */
creds_hash = apr_hash_make(pool);
- apr_hash_set(creds_hash, SVN_AUTH__AUTHFILE_USERNAME_KEY,
- APR_HASH_KEY_STRING,
+ apr_hash_set(creds_hash, AUTHN_USERNAME_KEY, APR_HASH_KEY_STRING,
svn_string_create(creds->username, pool));
/* Don't store passwords in any form if the user has told
@@ -264,10 +263,11 @@ svn_auth__simple_save_creds_helper(svn_b
/* If the password is going to be stored encrypted, go right
* ahead and store it to disk. Else determine whether saving
* in plaintext is OK. */
- if (strcmp(passtype, SVN_AUTH__WINCRYPT_PASSWORD_TYPE) == 0
- || strcmp(passtype, SVN_AUTH__KEYCHAIN_PASSWORD_TYPE) == 0
- || strcmp(passtype, SVN_AUTH__KWALLET_PASSWORD_TYPE) == 0
- || strcmp(passtype, SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE) == 0)
+ if (passtype &&
+ (strcmp(passtype, SVN_AUTH__WINCRYPT_PASSWORD_TYPE) == 0
+ || strcmp(passtype, SVN_AUTH__KEYCHAIN_PASSWORD_TYPE) == 0
+ || strcmp(passtype, SVN_AUTH__KWALLET_PASSWORD_TYPE) == 0
+ || strcmp(passtype, SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE) == 0) )
{
may_save_password = TRUE;
}
@@ -291,7 +291,7 @@ svn_auth__simple_save_creds_helper(svn_b
cached_answer = apr_hash_get(b->plaintext_answers,
realmstring,
APR_HASH_KEY_STRING);
- if (cached_answer)
+ if (cached_answer != NULL)
may_save_password = *cached_answer;
else
{
@@ -368,8 +368,7 @@ svn_auth__simple_save_creds_helper(svn_b
if (*saved && passtype)
/* Store the password type with the auth data, so that we
know which provider owns the password. */
- apr_hash_set(creds_hash, SVN_AUTH__AUTHFILE_PASSTYPE_KEY,
- APR_HASH_KEY_STRING,
+ apr_hash_set(creds_hash, AUTHN_PASSTYPE_KEY, APR_HASH_KEY_STRING,
svn_string_create(passtype, pool));
}
}
@@ -516,8 +515,7 @@ prompt_for_simple_creds(svn_auth_cred_si
svn_error_clear(err);
if (! err && creds_hash)
{
- str = apr_hash_get(creds_hash,
- SVN_AUTH__AUTHFILE_USERNAME_KEY,
+ str = apr_hash_get(creds_hash, AUTHN_USERNAME_KEY,
APR_HASH_KEY_STRING);
if (str && str->data)
def_username = str->data;
Modified: branches/file-externals/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/ssl_client_cert_pw_providers.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/ssl_client_cert_pw_providers.c Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/ssl_client_cert_pw_providers.c Wed \
Jul 30 08:04:13 2008 (r32332) @@ -28,19 +28,82 @@
#include "svn_error.h"
#include "svn_config.h"
+#include "private/svn_auth_private.h"
+
+#include "svn_private_config.h"
/*-----------------------------------------------------------------------*/
/* File provider */
/*-----------------------------------------------------------------------*/
-/* retrieve and load a password for a client certificate from servers file */
-static svn_error_t *
-ssl_client_cert_pw_file_first_credentials(void **credentials_p,
- void **iter_baton,
- void *provider_baton,
- apr_hash_t *parameters,
- const char *realmstring,
- apr_pool_t *pool)
+/* The keys that will be stored on disk. These serve the same role as
+ * similar constants in other providers.
+ *
+ * AUTHN_PASSTYPE_KEY just records the passphrase type next to the
+ * passphrase, so that anyone who is manually editing their authn
+ * files can know which provider owns the password.
+ */
+#define AUTHN_PASSPHRASE_KEY "passphrase"
+#define AUTHN_PASSTYPE_KEY "passtype"
+
+/* Baton type for the ssl client cert passphrase provider. */
+typedef struct
+{
+ svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func;
+ void *prompt_baton;
+ /* We cache the user's answer to the plaintext prompt, keyed
+ by realm, in case we'll be called multiple times for the
+ same realm. So: keys are 'const char *' realm strings, and
+ values are 'svn_boolean_t *'. */
+ apr_hash_t *plaintext_answers;
+} ssl_client_cert_pw_file_provider_baton_t;
+
+/* This implements the svn_auth__password_get_t interface.
+ Set **PASSPHRASE to the plaintext passphrase retrieved from CREDS;
+ ignore other parameters. */
+static svn_boolean_t
+simple_passphrase_get(const char **passphrase,
+ apr_hash_t *creds,
+ const char *realmstring,
+ const char *username,
+ svn_boolean_t non_interactive,
+ apr_pool_t *pool)
+{
+ svn_string_t *str;
+ str = apr_hash_get(creds, AUTHN_PASSPHRASE_KEY, APR_HASH_KEY_STRING);
+ if (str && str->data)
+ {
+ *passphrase = str->data;
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/* This implements the svn_auth__password_set_t interface.
+ Store PASSPHRASE in CREDS; ignore other parameters. */
+static svn_boolean_t
+simple_passphrase_set(apr_hash_t *creds,
+ const char *realmstring,
+ const char *username,
+ const char *passphrase,
+ svn_boolean_t non_interactive,
+ apr_pool_t *pool)
+{
+ apr_hash_set(creds, AUTHN_PASSPHRASE_KEY, APR_HASH_KEY_STRING,
+ svn_string_create(passphrase, pool));
+ return TRUE;
+}
+
+svn_error_t *
+svn_auth__ssl_client_cert_pw_file_first_creds_helper
+ (void **credentials_p,
+ void **iter_baton,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ svn_auth__password_get_t passphrase_get,
+ const char *passtype,
+ apr_pool_t *pool)
{
svn_config_t *cfg = apr_hash_get(parameters,
SVN_AUTH_PARAM_CONFIG,
@@ -48,11 +111,34 @@ ssl_client_cert_pw_file_first_credential
const char *server_group = apr_hash_get(parameters,
SVN_AUTH_PARAM_SERVER_GROUP,
APR_HASH_KEY_STRING);
-
+ svn_boolean_t non_interactive = apr_hash_get(parameters,
+ SVN_AUTH_PARAM_NON_INTERACTIVE,
+ APR_HASH_KEY_STRING) != NULL;
const char *password =
svn_config_get_server_setting(cfg, server_group,
SVN_CONFIG_OPTION_SSL_CLIENT_CERT_PASSWORD,
NULL);
+ if (! password)
+ {
+ svn_error_t *err;
+ apr_hash_t *creds_hash = NULL;
+ const char *config_dir = apr_hash_get(parameters,
+ SVN_AUTH_PARAM_CONFIG_DIR,
+ APR_HASH_KEY_STRING);
+
+ /* Try to load passphrase from the auth/ cache. */
+ err = svn_config_read_auth_data(&creds_hash,
+ SVN_AUTH_CRED_SSL_CLIENT_CERT_PW,
+ realmstring, config_dir, pool);
+ svn_error_clear(err);
+ if (! err && creds_hash)
+ {
+ if (!passphrase_get(&password, creds_hash, realmstring,
+ NULL, non_interactive, pool))
+ password = NULL;
+ }
+ }
+
if (password)
{
svn_auth_cred_ssl_client_cert_pw_t *cred
@@ -67,23 +153,268 @@ ssl_client_cert_pw_file_first_credential
}
+svn_error_t *
+svn_auth__ssl_client_cert_pw_file_save_creds_helper
+ (svn_boolean_t *saved,
+ void *credentials,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ svn_auth__password_set_t passphrase_set,
+ const char *passtype,
+ apr_pool_t *pool)
+{
+ svn_auth_cred_ssl_client_cert_pw_t *creds = credentials;
+ apr_hash_t *creds_hash = NULL;
+ const char *config_dir;
+ svn_error_t *err;
+ svn_boolean_t dont_store_passphrase =
+ apr_hash_get(parameters,
+ SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP,
+ APR_HASH_KEY_STRING) != NULL;
+ const char *store_ssl_client_cert_pp_plaintext =
+ apr_hash_get(parameters,
+ SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT,
+ APR_HASH_KEY_STRING);
+ svn_boolean_t non_interactive = apr_hash_get(parameters,
+ SVN_AUTH_PARAM_NON_INTERACTIVE,
+ APR_HASH_KEY_STRING) != NULL;
+ ssl_client_cert_pw_file_provider_baton_t *b =
+ (ssl_client_cert_pw_file_provider_baton_t *)provider_baton;
+
+ svn_boolean_t no_auth_cache =
+ (! creds->may_save) || (apr_hash_get(parameters,
+ SVN_AUTH_PARAM_NO_AUTH_CACHE,
+ APR_HASH_KEY_STRING) != NULL);
+
+ *saved = FALSE;
+
+ if (no_auth_cache)
+ return SVN_NO_ERROR;
+
+ config_dir = apr_hash_get(parameters,
+ SVN_AUTH_PARAM_CONFIG_DIR,
+ APR_HASH_KEY_STRING);
+ creds_hash = apr_hash_make(pool);
+
+ /* Don't store passphrase in any form if the user has told
+ us not to do so. */
+ if (! dont_store_passphrase)
+ {
+ svn_boolean_t may_save_passphrase = FALSE;
+
+ /* If the passphrase is going to be stored encrypted, go right
+ ahead and store it to disk. Else determine whether saving
+ in plaintext is OK. */
+ if (strcmp(passtype, SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE) == 0)
+ {
+ may_save_passphrase = TRUE;
+ }
+ else
+ {
+ if (svn_cstring_casecmp(store_ssl_client_cert_pp_plaintext,
+ SVN_CONFIG_ASK) == 0)
+ {
+ if (non_interactive)
+ {
+ /* In non-interactive mode, the default behaviour is
+ to not store the passphrase */
+ may_save_passphrase = FALSE;
+ }
+ else if (b->plaintext_passphrase_prompt_func)
+ {
+ /* We're interactive, and the client provided a
+ prompt callback. So we can ask the user.
+ Check for a cached answer before prompting.
+
+ This is a pointer-to-boolean, rather than just a
+ boolean, because we must distinguish between
+ "cached answer is no" and "no answer has been
+ cached yet". */
+ svn_boolean_t *cached_answer =
+ apr_hash_get(b->plaintext_answers, realmstring,
+ APR_HASH_KEY_STRING);
+
+ if (cached_answer != NULL)
+ {
+ may_save_passphrase = *cached_answer;
+ }
+ else
+ {
+ /* Nothing cached for this realm, prompt the user. */
+ SVN_ERR((*b->plaintext_passphrase_prompt_func)
+ (&may_save_passphrase,
+ realmstring,
+ b->prompt_baton,
+ pool));
+
+ /* Cache the user's answer in case we're called again
+ * for the same realm.
+ *
+ * XXX: Hopefully, our caller has passed us
+ * a pool that survives across RA sessions!
+ * We use that pool to cache user answers, and
+ * we may be called again for the same realm when the
+ * current RA session is reparented, or when a different
+ * RA session using the same realm is opened.
+ * If the pool does not survive until then, caching
+ * won't work, and for some reason the call to
+ * apr_hash_set() below may even end up crashing in
+ * apr_palloc().
+ *
+ * ### TODO(2489): this comment is duplicated from
+ * simple_providers.c, and refers to a kluge that
+ * is discussed in more detail here:
+ *
+ * http://subversion.tigris.org/servlets/ReadMsg?\
+ * listName=dev&msgNo=137872
+ *
+ * Today (14 July 2008) in IRC, stsp and some
+ * others appear to have decided that the original
+ * kluge is too fragile, and that a more robust
+ * solution (but one involving API revs) is
+ * needed. danielsh filed issue #3236 about
+ * this, so this comment should be redone; same
+ * goes for the comment in simple_providers.c.
+ */
+ cached_answer = apr_palloc(pool, sizeof(*cached_answer));
+ *cached_answer = may_save_passphrase;
+ apr_hash_set(b->plaintext_answers, realmstring,
+ APR_HASH_KEY_STRING, cached_answer);
+ }
+ }
+ else
+ {
+ may_save_passphrase = FALSE;
+ }
+ }
+ else if (svn_cstring_casecmp(store_ssl_client_cert_pp_plaintext,
+ SVN_CONFIG_FALSE) == 0)
+ {
+ may_save_passphrase = FALSE;
+ }
+ else if (svn_cstring_casecmp(store_ssl_client_cert_pp_plaintext,
+ SVN_CONFIG_TRUE) == 0)
+ {
+ may_save_passphrase = TRUE;
+ }
+ else
+ {
+ return svn_error_createf
+ (SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE, NULL,
+ _("Config error: invalid value '%s' for option '%s'"),
+ store_ssl_client_cert_pp_plaintext,
+ SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT);
+ }
+ }
+
+ if (may_save_passphrase)
+ {
+ *saved = passphrase_set(creds_hash, realmstring,
+ NULL, creds->password,
+ non_interactive, pool);
+
+ if (*saved && passtype)
+ {
+ apr_hash_set(creds_hash, AUTHN_PASSTYPE_KEY,
+ APR_HASH_KEY_STRING,
+ svn_string_create(passtype, pool));
+ }
+
+ /* Save credentials to disk. */
+ err = svn_config_write_auth_data(creds_hash,
+ SVN_AUTH_CRED_SSL_CLIENT_CERT_PW,
+ realmstring, config_dir, pool);
+ svn_error_clear(err);
+ *saved = ! err;
+ }
+ }
+
+ return SVN_NO_ERROR;
+}
+
+
+/* This implements the svn_auth_provider_t.first_credentials API.
+ It gets cached (unencrypted) credentials from the ssl client cert
+ password provider's cache. */
+static svn_error_t *
+ssl_client_cert_pw_file_first_credentials(void **credentials_p,
+ void **iter_baton,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ apr_pool_t *pool)
+{
+ return svn_auth__ssl_client_cert_pw_file_first_creds_helper
+ (credentials_p,
+ iter_baton,
+ provider_baton,
+ parameters,
+ realmstring,
+ simple_passphrase_get,
+ SVN_AUTH__SIMPLE_PASSWORD_TYPE,
+ pool);
+}
+
+
+/* This implements the svn_auth_provider_t.save_credentials API.
+ It saves the credentials unencrypted. */
+static svn_error_t *
+ssl_client_cert_pw_file_save_credentials(svn_boolean_t *saved,
+ void *credentials,
+ void *provider_baton,
+ apr_hash_t *parameters,
+ const char *realmstring,
+ apr_pool_t *pool)
+{
+ return svn_auth__ssl_client_cert_pw_file_save_creds_helper
+ (saved, credentials,
+ provider_baton,
+ parameters,
+ realmstring,
+ simple_passphrase_set,
+ SVN_AUTH__SIMPLE_PASSWORD_TYPE,
+ pool);
+}
+
+
static const svn_auth_provider_t ssl_client_cert_pw_file_provider = {
SVN_AUTH_CRED_SSL_CLIENT_CERT_PW,
ssl_client_cert_pw_file_first_credentials,
NULL,
- NULL
+ ssl_client_cert_pw_file_save_credentials
};
/*** Public API to SSL file providers. ***/
-void svn_auth_get_ssl_client_cert_pw_file_provider
- (svn_auth_provider_object_t **provider, apr_pool_t *pool)
+void
+svn_auth_get_ssl_client_cert_pw_file_provider2
+ (svn_auth_provider_object_t **provider,
+ svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func,
+ void *prompt_baton,
+ apr_pool_t *pool)
{
svn_auth_provider_object_t *po = apr_pcalloc(pool, sizeof(*po));
+ ssl_client_cert_pw_file_provider_baton_t *pb = apr_pcalloc(pool,
+ sizeof(*pb));
+
+ pb->plaintext_passphrase_prompt_func = plaintext_passphrase_prompt_func;
+ pb->prompt_baton = prompt_baton;
+ pb->plaintext_answers = apr_hash_make(pool);
+
po->vtable = &ssl_client_cert_pw_file_provider;
+ po->provider_baton = pb;
*provider = po;
}
+void
+svn_auth_get_ssl_client_cert_pw_file_provider
+ (svn_auth_provider_object_t **provider,
+ apr_pool_t *pool)
+{
+ svn_auth_get_ssl_client_cert_pw_file_provider2(provider, NULL, NULL, pool);
+}
+
/*-----------------------------------------------------------------------*/
/* Prompt provider */
Modified: branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c Wed \
Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c Wed \
Jul 30 08:04:13 2008 (r32332) @@ -33,9 +33,10 @@
/* File provider */
/*-----------------------------------------------------------------------*/
-/* The keys that will be stored on disk */
-#define SVN_AUTH__AUTHFILE_ASCII_CERT_KEY "ascii_cert"
-#define SVN_AUTH__AUTHFILE_FAILURES_KEY "failures"
+/* The keys that will be stored on disk. These serve the same role as
+ similar constants in other providers. */
+#define AUTHN_ASCII_CERT_KEY "ascii_cert"
+#define AUTHN_FAILURES_KEY "failures"
/* retrieve ssl server CA failure overrides (if any) from servers
@@ -75,12 +76,10 @@ ssl_server_trust_file_first_credentials(
svn_string_t *trusted_cert, *this_cert, *failstr;
apr_uint32_t last_failures = 0;
- trusted_cert = apr_hash_get(creds_hash,
- SVN_AUTH__AUTHFILE_ASCII_CERT_KEY,
+ trusted_cert = apr_hash_get(creds_hash, AUTHN_ASCII_CERT_KEY,
APR_HASH_KEY_STRING);
this_cert = svn_string_create(cert_info->ascii_cert, pool);
- failstr = apr_hash_get(creds_hash,
- SVN_AUTH__AUTHFILE_FAILURES_KEY,
+ failstr = apr_hash_get(creds_hash, AUTHN_FAILURES_KEY,
APR_HASH_KEY_STRING);
if (failstr)
@@ -140,13 +139,9 @@ ssl_server_trust_file_save_credentials(s
APR_HASH_KEY_STRING);
creds_hash = apr_hash_make(pool);
- apr_hash_set(creds_hash,
- SVN_AUTH__AUTHFILE_ASCII_CERT_KEY,
- APR_HASH_KEY_STRING,
+ apr_hash_set(creds_hash, AUTHN_ASCII_CERT_KEY, APR_HASH_KEY_STRING,
svn_string_create(cert_info->ascii_cert, pool));
- apr_hash_set(creds_hash,
- SVN_AUTH__AUTHFILE_FAILURES_KEY,
- APR_HASH_KEY_STRING,
+ apr_hash_set(creds_hash, AUTHN_FAILURES_KEY, APR_HASH_KEY_STRING,
svn_string_createf(pool, "%lu", (unsigned long)
creds->accepted_failures));
Modified: branches/file-externals/subversion/libsvn_subr/username_providers.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_subr/username_providers.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_subr/username_providers.c Wed Jul 30 \
07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/libsvn_subr/username_providers.c Wed Jul 30 \
08:04:13 2008 (r32332) @@ -34,8 +34,9 @@
/* File provider */
/*-----------------------------------------------------------------------*/
-/* The keys that will be stored on disk */
-#define SVN_CLIENT__AUTHFILE_USERNAME_KEY "username"
+/* The key that will be stored on disk. Serves the same role as similar
+ constants in other providers. */
+#define AUTHN_USERNAME_KEY "username"
@@ -72,8 +73,7 @@ username_first_creds(void **credentials,
svn_error_clear(err);
if (! err && creds_hash)
{
- svn_string_t *str = apr_hash_get(creds_hash,
- SVN_CLIENT__AUTHFILE_USERNAME_KEY,
+ svn_string_t *str = apr_hash_get(creds_hash, AUTHN_USERNAME_KEY,
APR_HASH_KEY_STRING);
if (str && str->data)
username = str->data;
@@ -124,8 +124,7 @@ username_save_creds(svn_boolean_t *saved
/* Put the credentials in a hash and save it to disk */
creds_hash = apr_hash_make(pool);
- apr_hash_set(creds_hash, SVN_CLIENT__AUTHFILE_USERNAME_KEY,
- APR_HASH_KEY_STRING,
+ apr_hash_set(creds_hash, AUTHN_USERNAME_KEY, APR_HASH_KEY_STRING,
svn_string_create(creds->username, pool));
err = svn_config_write_auth_data(creds_hash, SVN_AUTH_CRED_USERNAME,
realmstring, config_dir, pool);
Modified: branches/file-externals/subversion/libsvn_wc/adm_files.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_wc/adm_files.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_wc/adm_files.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_wc/adm_files.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -410,10 +410,10 @@ svn_wc__prop_path(const char **prop_path
if (node_kind == svn_node_dir) /* It's a working copy dir */
{
static const char * names[] = {
- SVN_WC__ADM_DIR_PROP_BASE, /* prop_path_kind_base */
- SVN_WC__ADM_DIR_PROP_REVERT, /* prop_path_kind_revert */
- SVN_WC__ADM_DIR_WCPROPS, /* prop_path_kind_wcprop */
- SVN_WC__ADM_DIR_PROPS /* prop_path_kind_working */
+ SVN_WC__ADM_DIR_PROP_BASE, /* svn_wc__props_base */
+ SVN_WC__ADM_DIR_PROP_REVERT, /* svn_wc__props_revert */
+ SVN_WC__ADM_DIR_WCPROPS, /* svn_wc__props_wcprop */
+ SVN_WC__ADM_DIR_PROPS /* svn_wc__props_working */
};
*prop_path = extend_with_adm_name
@@ -427,17 +427,17 @@ svn_wc__prop_path(const char **prop_path
else /* It's a file */
{
static const char * extensions[] = {
- SVN_WC__BASE_EXT, /* prop_path_kind_base */
- SVN_WC__REVERT_EXT, /* prop_path_kind_revert */
- SVN_WC__WORK_EXT, /* prop_path_kind_wcprop */
- SVN_WC__WORK_EXT /* prop_path_kind_working */
+ SVN_WC__BASE_EXT, /* svn_wc__props_base */
+ SVN_WC__REVERT_EXT, /* svn_wc__props_revert */
+ SVN_WC__WORK_EXT, /* svn_wc__props_wcprop */
+ SVN_WC__WORK_EXT /* svn_wc__props_working */
};
static const char * dirs[] = {
- SVN_WC__ADM_PROP_BASE, /* prop_path_kind_base */
- SVN_WC__ADM_PROP_BASE, /* prop_path_kind_revert */
- SVN_WC__ADM_WCPROPS, /* prop_path_kind_wcprop */
- SVN_WC__ADM_PROPS /* prop_path_kind_working */
+ SVN_WC__ADM_PROP_BASE, /* svn_wc__props_base */
+ SVN_WC__ADM_PROP_BASE, /* svn_wc__props_revert */
+ SVN_WC__ADM_WCPROPS, /* svn_wc__props_wcprop */
+ SVN_WC__ADM_PROPS /* svn_wc__props_working */
};
const char *base_name;
Modified: branches/file-externals/subversion/libsvn_wc/props.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_wc/props.c?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_wc/props.c Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_wc/props.c Wed Jul 30 08:04:13 \
2008 (r32332) @@ -198,7 +198,7 @@ append_prop_conflict(apr_file_t *fp,
}
-/* Look up the entry NAME within ADM_ACCESS and see if it has a `current'
+/* Look up the entry for PATH within ADM_ACCESS and see if it has a `current'
reject file describing a state of conflict. Set *REJECT_FILE to the
name of that file, or to NULL if no such file exists. */
static svn_error_t *
@@ -212,7 +212,8 @@ get_existing_prop_reject_file(const char
SVN_ERR(svn_wc__entry_versioned(&entry, path, adm_access, FALSE, pool));
*reject_file = entry->prejfile
- ? apr_pstrcat(pool, svn_wc_adm_access_path(adm_access), entry->prejfile)
+ ? apr_pstrcat(pool, svn_wc_adm_access_path(adm_access),
+ entry->prejfile, NULL)
: NULL;
return SVN_NO_ERROR;
}
@@ -337,6 +338,49 @@ svn_wc__load_props(apr_hash_t **base_pro
/*---------------------------------------------------------------------*/
/*** Installing new properties. ***/
+
+/* Extend LOG_ACCUM with log commands to write the properties PROPS into
+ * the admin file specified by WC_PROP_KIND. ADM_ACCESS and PATH specify
+ * the WC item with which this file should be associated. */
+static svn_error_t *
+install_props_file(svn_stringbuf_t **log_accum,
+ svn_wc_adm_access_t *adm_access,
+ const char *path,
+ apr_hash_t *props,
+ svn_wc__props_kind_t wc_prop_kind,
+ apr_pool_t *pool)
+{
+ svn_node_kind_t node_kind;
+ const char *propfile_path;
+ const char *propfile_tmp_path;
+
+ if (! svn_path_is_child(svn_wc_adm_access_path(adm_access), path, NULL))
+ node_kind = svn_node_dir;
+ else
+ node_kind = svn_node_file;
+
+ SVN_ERR(svn_wc__prop_path(&propfile_path, path,
+ node_kind, wc_prop_kind, FALSE, pool));
+
+ /* Write the property hash into a temporary file. */
+ SVN_ERR(svn_wc__prop_path(&propfile_tmp_path, path,
+ node_kind, wc_prop_kind, TRUE, pool));
+ SVN_ERR(save_prop_file(propfile_tmp_path, props,
+ FALSE, pool));
+
+ /* Write a log entry to move tmp file to real file. */
+ SVN_ERR(svn_wc__loggy_move(log_accum, NULL, adm_access,
+ propfile_tmp_path,
+ propfile_path,
+ FALSE, pool));
+
+ /* Make the props file read-only */
+ SVN_ERR(svn_wc__loggy_set_readonly(log_accum, adm_access,
+ propfile_path, pool));
+
+ return SVN_NO_ERROR;
+}
+
svn_error_t *
svn_wc__install_props(svn_stringbuf_t **log_accum,
svn_wc_adm_access_t *adm_access,
@@ -346,7 +390,6 @@ svn_wc__install_props(svn_stringbuf_t **
svn_boolean_t write_base_props,
apr_pool_t *pool)
{
- const char *working_propfile_path, *working_prop_tmp_path;
apr_array_header_t *prop_diffs;
const svn_wc_entry_t *entry;
svn_wc_entry_t tmp_entry;
@@ -359,7 +402,7 @@ svn_wc__install_props(svn_stringbuf_t **
else
kind = svn_node_file;
- /* Check if the props are modified. */
+ /* Check if the props are modified, and update the entry. */
SVN_ERR(svn_prop_diffs(&prop_diffs, working_props, base_props, pool));
tmp_entry.has_prop_mods = (prop_diffs->nelts > 0);
tmp_entry.has_props = (apr_hash_count(working_props) > 0);
@@ -379,35 +422,20 @@ svn_wc__install_props(svn_stringbuf_t **
else
entry = NULL;
- /* Write our property hashes into temporary files. Notice that the
- paths computed are ABSOLUTE pathnames, which is what our disk
- routines require. */
- SVN_ERR(svn_wc__prop_path(&working_propfile_path, path,
- kind, svn_wc__props_working, FALSE, pool));
+ /* Save the working properties file if it differs from base. */
if (tmp_entry.has_prop_mods)
{
- SVN_ERR(svn_wc__prop_path(&working_prop_tmp_path, path,
- kind, svn_wc__props_working, TRUE, pool));
-
- /* Write the working prop hash to path/.svn/tmp/props/name or
- path/.svn/tmp/dir-props */
- SVN_ERR(save_prop_file(working_prop_tmp_path, working_props,
- FALSE, pool));
-
- /* Write log entry to move working tmp copy to real working area. */
- SVN_ERR(svn_wc__loggy_move(log_accum, NULL,
- adm_access,
- working_prop_tmp_path,
- working_propfile_path,
- FALSE, pool));
-
- /* Make props read-only */
- SVN_ERR(svn_wc__loggy_set_readonly(log_accum, adm_access,
- working_propfile_path, pool));
+ SVN_ERR(install_props_file(log_accum, adm_access, path, working_props,
+ svn_wc__props_working, pool));
}
else
{
/* No property modifications, remove the file instead. */
+ const char *working_propfile_path;
+
+ SVN_ERR(svn_wc__prop_path(&working_propfile_path, path,
+ kind, svn_wc__props_working, FALSE, pool));
+
if (! has_propcaching || (entry && entry->has_prop_mods))
SVN_ERR(svn_wc__loggy_remove(log_accum, adm_access,
working_propfile_path, pool));
@@ -416,28 +444,18 @@ svn_wc__install_props(svn_stringbuf_t **
/* Repeat the above steps for the base properties if required. */
if (write_base_props)
{
- const char *base_propfile_path, *base_prop_tmp_path;
-
- SVN_ERR(svn_wc__prop_path(&base_propfile_path, path,
- kind, svn_wc__props_base, FALSE, pool));
-
if (apr_hash_count(base_props) > 0)
{
- SVN_ERR(svn_wc__prop_path(&base_prop_tmp_path, path,
- kind, svn_wc__props_base, TRUE, pool));
-
- SVN_ERR(save_prop_file(base_prop_tmp_path, base_props, FALSE, pool));
-
- SVN_ERR(svn_wc__loggy_move(log_accum, NULL, adm_access,
- base_prop_tmp_path,
- base_propfile_path,
- FALSE, pool));
-
- SVN_ERR(svn_wc__loggy_set_readonly(log_accum, adm_access,
- base_propfile_path, pool));
+ SVN_ERR(install_props_file(log_accum, adm_access, path, base_props,
+ svn_wc__props_base, pool));
}
else
{
+ const char *base_propfile_path;
+
+ SVN_ERR(svn_wc__prop_path(&base_propfile_path, path,
+ kind, svn_wc__props_base, FALSE, pool));
+
if (! has_propcaching || (entry && entry->has_props))
SVN_ERR(svn_wc__loggy_remove(log_accum, adm_access,
base_propfile_path, pool));
@@ -1186,6 +1204,27 @@ set_prop_merge_state(svn_wc_notify_state
}
+/* Create a temporary file in the same directory as PATH. Fill it with
+ * the data in VAL. Set *NEW_PATH to its path.
+ * Allocate the file metadata in POOL in such a way that the file will be
+ * deleted when the pool is cleared. */
+static svn_error_t *
+write_tmp_file(const char **new_path,
+ const char *path, const svn_string_t *val,
+ apr_pool_t *pool)
+{
+ apr_file_t *new_file;
+
+ SVN_ERR(svn_io_open_unique_file2(&new_file, new_path,
+ path, ".tmp",
+ svn_io_file_del_on_pool_cleanup,
+ pool));
+ SVN_ERR(svn_io_file_write_full(new_file, val->data,
+ val->len, NULL, pool));
+ SVN_ERR(svn_io_file_close(new_file, pool));
+ return SVN_NO_ERROR;
+}
+
/* Helper function for the three apply_* functions below, used when
* merging properties together.
@@ -1226,8 +1265,6 @@ maybe_generate_propconflict(svn_boolean_
{
svn_wc_conflict_result_t *result = NULL;
svn_string_t *mime_propval = NULL;
- apr_file_t *working_file, *base_file, *new_file, *merged_file;
- const char *working_path, *base_path, *new_path, *merged_path;
apr_pool_t *filepool = svn_pool_create(pool);
svn_wc_conflict_description_t *cdesc;
@@ -1242,28 +1279,10 @@ maybe_generate_propconflict(svn_boolean_
/* Create a tmpfile for each of the string_t's we've got. */
if (working_val)
- {
- SVN_ERR(svn_io_open_unique_file2(&working_file, &working_path,
- path, ".tmp",
- svn_io_file_del_on_pool_cleanup,
- filepool));
- SVN_ERR(svn_io_file_write_full(working_file, working_val->data,
- working_val->len, NULL, filepool));
- SVN_ERR(svn_io_file_close(working_file, filepool));
- cdesc->my_file = working_path;
- }
+ SVN_ERR(write_tmp_file(&cdesc->my_file, path, working_val, filepool));
if (new_val)
- {
- SVN_ERR(svn_io_open_unique_file2(&new_file, &new_path,
- path, ".tmp",
- svn_io_file_del_on_pool_cleanup,
- filepool));
- SVN_ERR(svn_io_file_write_full(new_file, new_val->data,
- new_val->len, NULL, filepool));
- SVN_ERR(svn_io_file_close(new_file, filepool));
- cdesc->their_file = new_path;
- }
+ SVN_ERR(write_tmp_file(&cdesc->their_file, path, new_val, filepool));
if (!base_val && !old_val)
{
@@ -1283,15 +1302,8 @@ maybe_generate_propconflict(svn_boolean_
conflict-callback can still attempt a 3-way merge. */
const svn_string_t *the_val = base_val ? base_val : old_val;
- SVN_ERR(svn_io_open_unique_file2(&base_file, &base_path,
- path, ".tmp",
- svn_io_file_del_on_pool_cleanup,
- filepool));
- SVN_ERR(svn_io_file_write_full(base_file,
- the_val->data,
- the_val->len, NULL, filepool));
- SVN_ERR(svn_io_file_close(base_file, filepool));
- cdesc->base_file = base_path;
+
+ SVN_ERR(write_tmp_file(&cdesc->base_file, path, the_val, filepool));
}
else /* base and old are both non-NULL */
@@ -1324,23 +1336,17 @@ maybe_generate_propconflict(svn_boolean_
the_val = base_val;
}
- SVN_ERR(svn_io_open_unique_file2(&base_file, &base_path,
- path, ".tmp",
- svn_io_file_del_on_pool_cleanup,
- filepool));
- SVN_ERR(svn_io_file_write_full(base_file, the_val->data,
- the_val->len, NULL, filepool));
- SVN_ERR(svn_io_file_close(base_file, filepool));
- cdesc->base_file = base_path;
+ SVN_ERR(write_tmp_file(&cdesc->base_file, path, the_val, filepool));
if (working_val && new_val)
{
+ apr_file_t *merged_file;
svn_stream_t *mergestream;
svn_diff_t *diff;
svn_diff_file_options_t *options =
svn_diff_file_options_create(filepool);
- SVN_ERR(svn_io_open_unique_file2(&merged_file, &merged_path,
+ SVN_ERR(svn_io_open_unique_file2(&merged_file, &cdesc->merged_file,
path, ".tmp",
svn_io_file_del_on_pool_cleanup,
filepool));
@@ -1352,8 +1358,6 @@ maybe_generate_propconflict(svn_boolean_
(mergestream, diff, the_val, working_val, new_val,
NULL, NULL, NULL, NULL, FALSE, FALSE, filepool));
svn_stream_close(mergestream);
-
- cdesc->merged_file = merged_path;
}
}
Modified: branches/file-externals/subversion/libsvn_wc/props.h
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_wc/props.h?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/libsvn_wc/props.h Wed Jul 30 07:46:23 \
2008 (r32331)
+++ branches/file-externals/subversion/libsvn_wc/props.h Wed Jul 30 08:04:13 \
2008 (r32332) @@ -119,7 +119,8 @@ svn_boolean_t svn_wc__has_magic_property
/* Extend LOG_ACCUM with log entries to install PROPS and, if WRITE_BASE_PROPS
is true, BASE_PROPS for the PATH in ADM_ACCESS, updating the wc entry
- to reflect the changes. Use POOL for temporary allocations. */
+ to reflect the changes. BASE_PROPS must be supplied even if
+ WRITE_BASE_PROPS is false. Use POOL for temporary allocations. */
svn_error_t *svn_wc__install_props(svn_stringbuf_t **log_accum,
svn_wc_adm_access_t *adm_access,
const char *path,
Modified: branches/file-externals/subversion/po/de.po
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/po/de.po?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/po/de.po Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/po/de.po Wed Jul 30 08:04:13 2008 (r32332)
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.6\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2008-05-26 21:34+0200\n"
-"PO-Revision-Date: 2008-05-26 21:58+0200\n"
+"POT-Creation-Date: 2008-07-22 10:40+0200\n"
+"PO-Revision-Date: 2008-07-23 21:32+0200\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: German <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -89,945 +89,946 @@ msgstr ""
# Original: "do no interactive prompting"
# Infinitiv: "Keine interaktiven Rückfragen ausgeben"
# Indikativ: "Gibt keine interaktiven Rückfragen aus"
-#: ../include/svn_error_codes.h:156
+#: ../include/svn_error_codes.h:158
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "Falscher Elternpool an svn_make_pool() übergeben"
-#: ../include/svn_error_codes.h:160
+#: ../include/svn_error_codes.h:162
msgid "Bogus filename"
msgstr "Ungültiger Dateiname"
-#: ../include/svn_error_codes.h:164
+#: ../include/svn_error_codes.h:166
msgid "Bogus URL"
msgstr "Ungültige URL"
-#: ../include/svn_error_codes.h:168
+#: ../include/svn_error_codes.h:170
msgid "Bogus date"
msgstr "Ungültiges Datum"
-#: ../include/svn_error_codes.h:172
+#: ../include/svn_error_codes.h:174
msgid "Bogus mime-type"
msgstr "Ungültiger Mime-Typ"
-#: ../include/svn_error_codes.h:176
-#, fuzzy
-msgid "Bogus server specification"
-msgstr "Es wurde keine Revision angegeben"
-
-#: ../include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:184
msgid "Wrong or unexpected property value"
msgstr "Falscher oder unerwarteter Eigenschaftswert"
-#: ../include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:188
msgid "Version file format not correct"
msgstr "Format der Versionsdatei nicht korrekt"
-#: ../include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:192
msgid "Path is not an immediate child of the specified directory"
msgstr "Pfad ist kein direktes Kind des spezifizierten Verzeichnisses"
-#: ../include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:196
msgid "Bogus UUID"
msgstr "Ungültige UUID"
-#: ../include/svn_error_codes.h:204
+#: ../include/svn_error_codes.h:201 ../include/svn_error_codes.h:789
+msgid "Invalid configuration value"
+msgstr "Ungültiger Konfigurationswert"
+
+#: ../include/svn_error_codes.h:205
+msgid "Bogus server specification"
+msgstr "Falsche Serverangabe"
+
+#: ../include/svn_error_codes.h:211
msgid "No such XML tag attribute"
msgstr "Kein solche Eigenschaft des XML Tags"
-#: ../include/svn_error_codes.h:208
+#: ../include/svn_error_codes.h:215
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> fehlt die Herkunft"
-#: ../include/svn_error_codes.h:212
+#: ../include/svn_error_codes.h:219
msgid "Unrecognized binary data encoding; can't decode"
msgstr "Unbekannte binäre Datenkodierung, kann nicht entschlüsseln"
-#: ../include/svn_error_codes.h:216
+#: ../include/svn_error_codes.h:223
msgid "XML data was not well-formed"
msgstr "XML Daten nicht wohlgeformt"
-#: ../include/svn_error_codes.h:220
+#: ../include/svn_error_codes.h:227
msgid "Data cannot be safely XML-escaped"
msgstr "Daten können nicht sicher in XML eingebettet werden"
-#: ../include/svn_error_codes.h:226
+#: ../include/svn_error_codes.h:233
msgid "Inconsistent line ending style"
msgstr "Stil für Zeilenende ist inkonsistent"
-#: ../include/svn_error_codes.h:230
+#: ../include/svn_error_codes.h:237
msgid "Unrecognized line ending style"
msgstr "Stil für Zeilenende nicht erkannt"
-#: ../include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:242
msgid "Line endings other than expected"
msgstr "Zeilenende anders als erwartet"
-#: ../include/svn_error_codes.h:239
+#: ../include/svn_error_codes.h:246
msgid "Ran out of unique names"
msgstr "Eindeutige Namen ausgegangen"
-#: ../include/svn_error_codes.h:244
+#: ../include/svn_error_codes.h:251
msgid "Framing error in pipe protocol"
msgstr "Rahmenfehler im Pipe -Protokoll"
-#: ../include/svn_error_codes.h:249
+#: ../include/svn_error_codes.h:256
msgid "Read error in pipe"
msgstr "Lesefehler in Pipe "
-#: ../include/svn_error_codes.h:253 ../libsvn_subr/cmdline.c:312
-#: ../libsvn_subr/cmdline.c:329 ../svn/util.c:885
+#: ../include/svn_error_codes.h:260 ../libsvn_subr/cmdline.c:316
+#: ../libsvn_subr/cmdline.c:333 ../svn/util.c:889 ../svnlook/main.c:1691
#, c-format
msgid "Write error"
msgstr "Schreibfehler"
-#: ../include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:266
msgid "Unexpected EOF on stream"
msgstr "Unerwartetes EOF im Datenstrom"
-#: ../include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:270
msgid "Malformed stream data"
msgstr "Fehlerhafter Datenstrom"
-#: ../include/svn_error_codes.h:267
+#: ../include/svn_error_codes.h:274
msgid "Unrecognized stream data"
msgstr "Unbekannter Datenstrom"
-#: ../include/svn_error_codes.h:273
+#: ../include/svn_error_codes.h:280
msgid "Unknown svn_node_kind"
msgstr "Unbekannter svn_node_kind"
-#: ../include/svn_error_codes.h:277
+#: ../include/svn_error_codes.h:284
msgid "Unexpected node kind found"
msgstr "Unerwarteter Knotentyp gefunden"
-#: ../include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:290
msgid "Can't find an entry"
msgstr "Kann keinen Eintrag finden"
-#: ../include/svn_error_codes.h:289
+#: ../include/svn_error_codes.h:296
msgid "Entry already exists"
msgstr "Eintrag existiert bereits"
-#: ../include/svn_error_codes.h:293
+#: ../include/svn_error_codes.h:300
msgid "Entry has no revision"
msgstr "Eintrag hat keine Revision"
-#: ../include/svn_error_codes.h:297
+#: ../include/svn_error_codes.h:304
msgid "Entry has no URL"
msgstr "Eintrag hat keine URL"
-#: ../include/svn_error_codes.h:301
+#: ../include/svn_error_codes.h:308
msgid "Entry has an invalid attribute"
msgstr "Eintrag hat ein ungültiges Attribut"
-#: ../include/svn_error_codes.h:307
+#: ../include/svn_error_codes.h:314
msgid "Obstructed update"
msgstr "Aktualisierung behindert"
-#: ../include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:319
msgid "Mismatch popping the WC unwind stack"
msgstr "Fehler beim Abrufen des Abwicklungsstapels der Arbeitskopie"
-#: ../include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:324
msgid "Attempt to pop empty WC unwind stack"
msgstr "Versuch, leeren Abwicklungsstapel abzurufen"
-#: ../include/svn_error_codes.h:322
+#: ../include/svn_error_codes.h:329
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Versuch, mit nicht leerem Abwicklungsstapel zu entsperren"
-#: ../include/svn_error_codes.h:326
+#: ../include/svn_error_codes.h:333
msgid "Attempted to lock an already-locked dir"
msgstr "Versuch, ein bereits gesperrtes Verzeichnis erneut zu sperren"
-#: ../include/svn_error_codes.h:330
+#: ../include/svn_error_codes.h:337
msgid "Working copy not locked; this is probably a bug, please report"
msgstr ""
"Arbeitskopie nicht gesperrt. Dies ist wahrscheinlich ein Fehler. Bitte "
"melden."
-#: ../include/svn_error_codes.h:335
+#: ../include/svn_error_codes.h:342
msgid "Invalid lock"
msgstr "Ungültige Sperre"
-#: ../include/svn_error_codes.h:339
+#: ../include/svn_error_codes.h:346
msgid "Path is not a working copy directory"
msgstr "Pfad ist kein Verzeichnis in einer Arbeitskopie"
-#: ../include/svn_error_codes.h:343
+#: ../include/svn_error_codes.h:350
msgid "Path is not a working copy file"
msgstr "Pfad ist keine Datei in einer Arbeitskopie"
-#: ../include/svn_error_codes.h:347
+#: ../include/svn_error_codes.h:354
msgid "Problem running log"
msgstr "Problem während der Ausführung des Logs"
-#: ../include/svn_error_codes.h:351
+#: ../include/svn_error_codes.h:358
msgid "Can't find a working copy path"
msgstr "Kann keinen Pfad einer Arbeitskopie finden"
-#: ../include/svn_error_codes.h:355
+#: ../include/svn_error_codes.h:362
msgid "Working copy is not up-to-date"
msgstr "Arbeitskopie ist nicht aktuell"
-#: ../include/svn_error_codes.h:359
+#: ../include/svn_error_codes.h:366
msgid "Left locally modified or unversioned files"
msgstr "Lokal veränderte oder nicht versionierte Dateien zurück gelassen"
-#: ../include/svn_error_codes.h:363
+#: ../include/svn_error_codes.h:370
msgid "Unmergeable scheduling requested on an entry"
msgstr "Nicht zusammenführbare Planungsanforderung für einen Eintrag"
-#: ../include/svn_error_codes.h:367
+#: ../include/svn_error_codes.h:374
msgid "Found a working copy path"
msgstr "Pfad einer Arbeitskopie gefunden"
-#: ../include/svn_error_codes.h:371
+#: ../include/svn_error_codes.h:378
msgid "A conflict in the working copy obstructs the current operation"
msgstr "Ein Konflikt in der Arbeitskopie behindert die aktuelle Operation"
-#: ../include/svn_error_codes.h:375
+#: ../include/svn_error_codes.h:382
msgid "Working copy is corrupt"
msgstr "Arbeitskopie ist beschädigt"
-#: ../include/svn_error_codes.h:379
+#: ../include/svn_error_codes.h:386
msgid "Working copy text base is corrupt"
msgstr "Textbasis der Arbeitskopie ist beschädigt"
-#: ../include/svn_error_codes.h:383
+#: ../include/svn_error_codes.h:390
msgid "Cannot change node kind"
msgstr "Kann Knotentyp nicht ändern"
-#: ../include/svn_error_codes.h:387
+#: ../include/svn_error_codes.h:394
msgid "Invalid operation on the current working directory"
msgstr "Ungültige Operation auf dem aktuellen Arbeitsverzeichnis"
-#: ../include/svn_error_codes.h:391
+#: ../include/svn_error_codes.h:398
msgid "Problem on first log entry in a working copy"
msgstr "Problem mit dem ersten Log-Eintrag in einer Arbeitskopie"
-#: ../include/svn_error_codes.h:395
+#: ../include/svn_error_codes.h:402
msgid "Unsupported working copy format"
msgstr "Nicht unterstütztes Format der Arbeitskopie"
-#: ../include/svn_error_codes.h:399
+#: ../include/svn_error_codes.h:406
msgid "Path syntax not supported in this context"
msgstr "Pfadsyntax wird in diesem Zusammenhang nicht unterstützt"
-#: ../include/svn_error_codes.h:404
+#: ../include/svn_error_codes.h:411
msgid "Invalid schedule"
msgstr "Ungültiger Plan"
-#: ../include/svn_error_codes.h:409
+#: ../include/svn_error_codes.h:416
msgid "Invalid relocation"
msgstr "Ungültiges Umplatzieren"
-#: ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:421
msgid "Invalid switch"
msgstr "Ungültiges Wechseln"
-#: ../include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:426
msgid "Changelist doesn't match"
msgstr "Änderungsliste passt nicht"
-#: ../include/svn_error_codes.h:424
+#: ../include/svn_error_codes.h:431
msgid "Conflict resolution failed"
-msgstr "Konfliktauflösung fehlgeschlagen"
+msgstr "Konfliktauflösung schlug fehl"
-#: ../include/svn_error_codes.h:428
+#: ../include/svn_error_codes.h:435
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "Pfad von copyfrom konnte in der Arbeitskopie nicht gefunden werden"
-#: ../include/svn_error_codes.h:433
+#: ../include/svn_error_codes.h:440
msgid "Moving a path from one changelist to another"
msgstr "Verschieben eines Pfades von einer Änderungsliste in eine andere"
-#: ../include/svn_error_codes.h:440
+#: ../include/svn_error_codes.h:447
msgid "General filesystem error"
msgstr "Allgemeiner Dateisystemfehler"
-#: ../include/svn_error_codes.h:444
+#: ../include/svn_error_codes.h:451
msgid "Error closing filesystem"
msgstr "Fehler beim Schließen des Dateisystems"
-#: ../include/svn_error_codes.h:448
+#: ../include/svn_error_codes.h:455
msgid "Filesystem is already open"
msgstr "Dateisystem ist bereits geöffnet"
-#: ../include/svn_error_codes.h:452
+#: ../include/svn_error_codes.h:459
msgid "Filesystem is not open"
msgstr "Dateisystem ist nicht geöffnet"
-#: ../include/svn_error_codes.h:456
+#: ../include/svn_error_codes.h:463
msgid "Filesystem is corrupt"
msgstr "Dateisystem ist beschädigt"
-#: ../include/svn_error_codes.h:460
+#: ../include/svn_error_codes.h:467
msgid "Invalid filesystem path syntax"
msgstr "Ungültige Pfadsyntax des Dateisystems"
-#: ../include/svn_error_codes.h:464
+#: ../include/svn_error_codes.h:471
msgid "Invalid filesystem revision number"
msgstr "Ungültige Revisionsnummer des Dateisystems"
-#: ../include/svn_error_codes.h:468
+#: ../include/svn_error_codes.h:475
msgid "Invalid filesystem transaction name"
msgstr "Ungültiger Transaktionsname des Dateisystems"
-#: ../include/svn_error_codes.h:472
+#: ../include/svn_error_codes.h:479
msgid "Filesystem directory has no such entry"
msgstr "Verzeichnis des Dateisystems hat keinen solchen Eintrag"
-#: ../include/svn_error_codes.h:476
+#: ../include/svn_error_codes.h:483
msgid "Filesystem has no such representation"
msgstr "Dateisystem hat keine solche Darstellung"
-#: ../include/svn_error_codes.h:480
+#: ../include/svn_error_codes.h:487
msgid "Filesystem has no such string"
msgstr "Dateisystem hat keinen solchen String"
-#: ../include/svn_error_codes.h:484
+#: ../include/svn_error_codes.h:491
msgid "Filesystem has no such copy"
msgstr "Dateisystem hat keine solche Kopie"
-#: ../include/svn_error_codes.h:488
+#: ../include/svn_error_codes.h:495
msgid "The specified transaction is not mutable"
msgstr "Die spezifizierte Transaktion ist nicht veränderlich"
-#: ../include/svn_error_codes.h:492
+#: ../include/svn_error_codes.h:499
msgid "Filesystem has no item"
msgstr "Dateisystem hat keinen Eintrag"
-#: ../include/svn_error_codes.h:496
+#: ../include/svn_error_codes.h:503
msgid "Filesystem has no such node-rev-id"
msgstr "Dateisystem hat keine solche Knotenrevisions-Id"
-#: ../include/svn_error_codes.h:500
+#: ../include/svn_error_codes.h:507
msgid "String does not represent a node or node-rev-id"
msgstr "Zeichenkette stellt keinen Knoten oder keine Knotenrevisions-Id dar"
-#: ../include/svn_error_codes.h:504
+#: ../include/svn_error_codes.h:511
msgid "Name does not refer to a filesystem directory"
msgstr "Name bezeichnet kein Verzeichnis des Dateisystems"
-#: ../include/svn_error_codes.h:508
+#: ../include/svn_error_codes.h:515
msgid "Name does not refer to a filesystem file"
msgstr "Name bezeichnet keine Datei des Dateisystems"
-#: ../include/svn_error_codes.h:512
+#: ../include/svn_error_codes.h:519
msgid "Name is not a single path component"
msgstr "Name ist keine einzelne Pfadkomponente"
-#: ../include/svn_error_codes.h:516
+#: ../include/svn_error_codes.h:523
msgid "Attempt to change immutable filesystem node"
msgstr "Versuch, einen nicht-veränderlichen Knoten des Dateisystems zu ändern"
-#: ../include/svn_error_codes.h:520
+#: ../include/svn_error_codes.h:527
msgid "Item already exists in filesystem"
msgstr "Objekt existiert bereits im Dateisystem"
-#: ../include/svn_error_codes.h:524
+#: ../include/svn_error_codes.h:531
msgid "Attempt to remove or recreate fs root dir"
msgstr ""
"Versuch, Basisverzeichnis des Dateisystems zu entfernen oder neu zu erstellen"
-#: ../include/svn_error_codes.h:528
+#: ../include/svn_error_codes.h:535
msgid "Object is not a transaction root"
msgstr "Objekt ist keine Transaktionsbasis"
-#: ../include/svn_error_codes.h:532
+#: ../include/svn_error_codes.h:539
msgid "Object is not a revision root"
msgstr "Objekt ist keine Revisionsbasis"
-#: ../include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:543
msgid "Merge conflict during commit"
msgstr "Konflikt beim Zusammenführen während der Übertragung"
-#: ../include/svn_error_codes.h:540
+#: ../include/svn_error_codes.h:547
msgid "A representation vanished or changed between reads"
msgstr ""
"Eine Darstellung ist zwischen Lesezugriffen verschwunden oder hat sich "
"verändert"
-#: ../include/svn_error_codes.h:544
+#: ../include/svn_error_codes.h:551
msgid "Tried to change an immutable representation"
msgstr "Versuchte, eine nicht-veränderliche Darstellung zu ändern"
-#: ../include/svn_error_codes.h:548
+#: ../include/svn_error_codes.h:555
msgid "Malformed skeleton data"
msgstr "Fehlerhafte Schablonendaten"
-#: ../include/svn_error_codes.h:552
+#: ../include/svn_error_codes.h:559
msgid "Transaction is out of date"
msgstr "Transaktion ist veraltet"
-#: ../include/svn_error_codes.h:556
+#: ../include/svn_error_codes.h:563
msgid "Berkeley DB error"
msgstr "Berkeley-DB-Fehler"
-#: ../include/svn_error_codes.h:560
+#: ../include/svn_error_codes.h:567
msgid "Berkeley DB deadlock error"
msgstr "Deadlock-Fehler der Berkeley Datenbank"
-#: ../include/svn_error_codes.h:564
+#: ../include/svn_error_codes.h:571
msgid "Transaction is dead"
msgstr "Transaktion ist tot"
-#: ../include/svn_error_codes.h:568
+#: ../include/svn_error_codes.h:575
msgid "Transaction is not dead"
msgstr "Transaktion ist nicht tot"
-#: ../include/svn_error_codes.h:573
+#: ../include/svn_error_codes.h:580
msgid "Unknown FS type"
msgstr "Unbekannter Dateisystemtyp"
-#: ../include/svn_error_codes.h:578
+#: ../include/svn_error_codes.h:585
msgid "No user associated with filesystem"
msgstr "Kein Benutzer mit dem Dateisystem verbunden"
-#: ../include/svn_error_codes.h:583
+#: ../include/svn_error_codes.h:590
msgid "Path is already locked"
msgstr "Pfad ist bereits gesperrt"
-#: ../include/svn_error_codes.h:588 ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:595 ../include/svn_error_codes.h:746
msgid "Path is not locked"
msgstr "Pfad ist nicht gesperrt"
-#: ../include/svn_error_codes.h:593
+#: ../include/svn_error_codes.h:600
msgid "Lock token is incorrect"
msgstr "Sperrmarke ist fehlerhaft"
-#: ../include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:605
msgid "No lock token provided"
msgstr "Keine Sperrmarke angegeben"
-#: ../include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:610
msgid "Username does not match lock owner"
msgstr "Benutzername und Sperreigner stimmen nicht überein"
-#: ../include/svn_error_codes.h:608
+#: ../include/svn_error_codes.h:615
msgid "Filesystem has no such lock"
msgstr "Dateisystem hat keine solche Sperre"
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:620
msgid "Lock has expired"
msgstr "Sperre ist abgelaufen"
-#: ../include/svn_error_codes.h:618 ../include/svn_error_codes.h:726
+#: ../include/svn_error_codes.h:625 ../include/svn_error_codes.h:733
msgid "Item is out of date"
msgstr "Eintrag ist veraltet"
-#: ../include/svn_error_codes.h:630
+#: ../include/svn_error_codes.h:637
msgid "Unsupported FS format"
msgstr "Nicht unterstütztes Dateisystemformat"
-#: ../include/svn_error_codes.h:635
+#: ../include/svn_error_codes.h:642
msgid "Representation is being written"
msgstr "Darstellung wird geschrieben"
-#: ../include/svn_error_codes.h:640
+#: ../include/svn_error_codes.h:647
msgid "The generated transaction name is too long"
msgstr "Der erzeugte Transaktionsname ist zu lang"
-#: ../include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:652
msgid "Filesystem has no such node origin record"
msgstr "Dateisystem hat keinen solchen Knotenursprungseintrag"
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:657
msgid "Filesystem upgrade is not supported"
msgstr "Dateisystemaktualisierung wird nicht unterstützt"
-#: ../include/svn_error_codes.h:656
+#: ../include/svn_error_codes.h:663
msgid "The repository is locked, perhaps for db recovery"
msgstr ""
"Das Projektarchiv ist gesperrt, möglicherweise zum Retten der Datenbank"
-#: ../include/svn_error_codes.h:660
+#: ../include/svn_error_codes.h:667
msgid "A repository hook failed"
msgstr "Eine Aktion im Projektarchiv schlug fehl"
-#: ../include/svn_error_codes.h:664
+#: ../include/svn_error_codes.h:671
msgid "Incorrect arguments supplied"
msgstr "Inkorrekte Parameter übergeben"
-#: ../include/svn_error_codes.h:668
+#: ../include/svn_error_codes.h:675
msgid "A report cannot be generated because no data was supplied"
msgstr "Es kann kein Report erzeugt werden, da keine Daten geliefert wurden"
-#: ../include/svn_error_codes.h:672
+#: ../include/svn_error_codes.h:679
msgid "Bogus revision report"
msgstr "Ungültiger Revisionsreport"
-#: ../include/svn_error_codes.h:681
+#: ../include/svn_error_codes.h:688
msgid "Unsupported repository version"
msgstr "Nicht unterstützte Version des Projektarchivs"
-#: ../include/svn_error_codes.h:685
+#: ../include/svn_error_codes.h:692
msgid "Disabled repository feature"
msgstr "Deaktiviertes Merkmal des Projektarchivs"
-#: ../include/svn_error_codes.h:689
+#: ../include/svn_error_codes.h:696
msgid "Error running post-commit hook"
-msgstr "Fehler beim Ausführen der post-commit Aktion"
+msgstr "Fehler beim Ausführen der Aktion post-commit "
-#: ../include/svn_error_codes.h:694
+#: ../include/svn_error_codes.h:701
msgid "Error running post-lock hook"
-msgstr "Fehler beim Ausführen der post-lock Aktion"
+msgstr "Fehler beim Ausführen der Aktion post-lock "
-#: ../include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:706
msgid "Error running post-unlock hook"
-msgstr "Fehler beim Ausführen der post-unlock Aktion"
+msgstr "Fehler beim Ausführen der Aktion post-unlock "
-#: ../include/svn_error_codes.h:704
+#: ../include/svn_error_codes.h:711
msgid "Repository upgrade is not supported"
msgstr "Projektarchivaktualisierung wird nicht unterstützt"
-#: ../include/svn_error_codes.h:710
+#: ../include/svn_error_codes.h:717
msgid "Bad URL passed to RA layer"
msgstr "Ungültige URL an die ZM-Schicht übergeben"
-#: ../include/svn_error_codes.h:714
+#: ../include/svn_error_codes.h:721
msgid "Authorization failed"
-msgstr "Autorisierung fehlgeschlagen"
+msgstr "Autorisierung schlug fehl"
-#: ../include/svn_error_codes.h:718
+#: ../include/svn_error_codes.h:725
msgid "Unknown authorization method"
msgstr "Unbekannte Autorisierungsmethode"
-#: ../include/svn_error_codes.h:722
+#: ../include/svn_error_codes.h:729
msgid "Repository access method not implemented"
msgstr "Zugriffsmethode zum Projektarchiv nicht implementiert"
-#: ../include/svn_error_codes.h:730
+#: ../include/svn_error_codes.h:737
msgid "Repository has no UUID"
msgstr "Projektarchiv hat keine UUID"
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:741
msgid "Unsupported RA plugin ABI version"
msgstr "Nicht unterstützte ABI-Version des ZM-Plugins"
-#: ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:751
msgid "Server can only replay from the root of a repository"
msgstr "Der Server kann nur von der Basis des Projektarchivs fortfahren"
-#: ../include/svn_error_codes.h:749
+#: ../include/svn_error_codes.h:756
msgid "Repository UUID does not match expected UUID"
msgstr "Die UUID des Projektarchivs entspricht nicht der erwarteten UUID"
-#: ../include/svn_error_codes.h:755
+#: ../include/svn_error_codes.h:762
msgid "RA layer failed to init socket layer"
msgstr "ZM-Schicht konnte die Verbindungsschicht nicht initialisieren"
-#: ../include/svn_error_codes.h:759
+#: ../include/svn_error_codes.h:766
msgid "RA layer failed to create HTTP request"
msgstr "ZM-Schicht konnte keine HTTP-Anforderung erzeugen"
-#: ../include/svn_error_codes.h:763
+#: ../include/svn_error_codes.h:770
msgid "RA layer request failed"
msgstr "ZM-Schicht Anforderung gescheitert"
-#: ../include/svn_error_codes.h:767
+#: ../include/svn_error_codes.h:774
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "ZM-Schicht hat die angeforderte OPTIONS-Information nicht erhalten"
-#: ../include/svn_error_codes.h:771
+#: ../include/svn_error_codes.h:778
msgid "RA layer failed to fetch properties"
msgstr "ZM-Schicht konnte keine Eigenschaften bestimmen"
-#: ../include/svn_error_codes.h:775
+#: ../include/svn_error_codes.h:782
msgid "RA layer file already exists"
msgstr "ZM-Schichtdatei existiert bereits"
-#: ../include/svn_error_codes.h:779
-msgid "Invalid configuration value"
-msgstr "Ungültiger Konfigurationswert"
-
-#: ../include/svn_error_codes.h:786
+#: ../include/svn_error_codes.h:796
msgid "HTTP Path Not Found"
msgstr "HTTP Pfad nicht gefunden"
-#: ../include/svn_error_codes.h:790
+#: ../include/svn_error_codes.h:800
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Konnte WebDAV PROPPATCH nicht ausführen"
-#: ../include/svn_error_codes.h:795 ../include/svn_error_codes.h:836
+#: ../include/svn_error_codes.h:805 ../include/svn_error_codes.h:846
#: ../libsvn_ra_svn/marshal.c:651 ../libsvn_ra_svn/marshal.c:769
#: ../libsvn_ra_svn/marshal.c:796
msgid "Malformed network data"
msgstr "Fehlerhafte Netzwerkdaten"
-#: ../include/svn_error_codes.h:800
+#: ../include/svn_error_codes.h:810
msgid "Unable to extract data from response header"
msgstr "Kann keine Daten aus dem Antwortkopf extrahieren"
-#: ../include/svn_error_codes.h:805
+#: ../include/svn_error_codes.h:815
msgid "Repository has been moved"
msgstr "Projektarchiv wurde verschoben"
-#: ../include/svn_error_codes.h:811 ../include/svn_error_codes.h:840
+#: ../include/svn_error_codes.h:821 ../include/svn_error_codes.h:850
msgid "Couldn't find a repository"
msgstr "Konnte Projektarchiv nicht finden"
-#: ../include/svn_error_codes.h:815
+#: ../include/svn_error_codes.h:825
msgid "Couldn't open a repository"
msgstr "Konnte Projektarchiv nicht öffnen"
-#: ../include/svn_error_codes.h:820
+#: ../include/svn_error_codes.h:830
msgid "Special code for wrapping server errors to report to client"
msgstr "Spezieller Fehlerkode, um Serverfehler an den Client zu melden"
-#: ../include/svn_error_codes.h:824
+#: ../include/svn_error_codes.h:834
msgid "Unknown svn protocol command"
-msgstr "Unbekanntes svn Protokollkommando"
+msgstr "Unbekanntes svn-Protokollkommando"
-#: ../include/svn_error_codes.h:828
+#: ../include/svn_error_codes.h:838
msgid "Network connection closed unexpectedly"
msgstr "Netzwerkverbindung wurde unerwartet geschlossen"
-#: ../include/svn_error_codes.h:832
+#: ../include/svn_error_codes.h:842
msgid "Network read/write error"
msgstr "Netzwerk-Lese-/-Schreibfehler"
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:854
msgid "Client/server version mismatch"
msgstr "Client- und Serverversion stimmen nicht überein"
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:859
msgid "Cannot negotiate authentication mechanism"
msgstr "Kann Anmeldungsmechanismus nicht aushandeln"
-#: ../include/svn_error_codes.h:855
+#: ../include/svn_error_codes.h:865
msgid "Initialization of SSPI library failed"
msgstr "Initialisierung der SSPI-Bibliothek schlug fehl"
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:869
msgid "Server SSL certificate untrusted"
msgstr "Server-SSL-Zertifikat ist nicht vertrauenswürdig"
-#: ../include/svn_error_codes.h:867
+#: ../include/svn_error_codes.h:877
msgid "Credential data unavailable"
msgstr "Beglaubigungsdaten nicht verfügbar"
-#: ../include/svn_error_codes.h:871
+#: ../include/svn_error_codes.h:881
msgid "No authentication provider available"
msgstr "Kein Anbieter für Anmeldung verfügbar"
-#: ../include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:885
msgid "All authentication providers exhausted"
msgstr "Alle Anmeldemöglichkeiten erschöpft"
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:889
msgid "Credentials not saved"
msgstr "Beglaubigungsdaten nicht gespeichert"
-#: ../include/svn_error_codes.h:884
+#: ../include/svn_error_codes.h:894
msgid "Authentication failed"
-msgstr "Authentifizierung fehlgeschlagen"
+msgstr "Authentifizierung schlug fehl"
-#: ../include/svn_error_codes.h:890
+#: ../include/svn_error_codes.h:900
msgid "Read access denied for root of edit"
msgstr "Lesezugriff verweigert für Basis dieser Änderung"
-#: ../include/svn_error_codes.h:895
+#: ../include/svn_error_codes.h:905
msgid "Item is not readable"
msgstr "Eintrag ist nicht lesbar"
-#: ../include/svn_error_codes.h:900
+#: ../include/svn_error_codes.h:910
msgid "Item is partially readable"
msgstr "Eintrag ist nur teilweise lesbar"
-#: ../include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:914
msgid "Invalid authz configuration"
msgstr "Ungültige authz Komfigturation"
-#: ../include/svn_error_codes.h:909
+#: ../include/svn_error_codes.h:919
msgid "Item is not writable"
msgstr "Eintrag ist nicht schreibbar"
-#: ../include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:925
msgid "Svndiff data has invalid header"
msgstr "Svndiff-Daten enthalten ungültigen Kopf"
-#: ../include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:929
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-Daten enthalten defektes Fenster"
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:933
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen"
-#: ../include/svn_error_codes.h:927
+#: ../include/svn_error_codes.h:937
msgid "Svndiff data contains invalid instruction"
msgstr "Svndiff-Daten enthalten ungültige Anweisung"
-#: ../include/svn_error_codes.h:931
+#: ../include/svn_error_codes.h:941
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-Daten enden unerwartet"
-#: ../include/svn_error_codes.h:935
+#: ../include/svn_error_codes.h:945
msgid "Svndiff compressed data is invalid"
msgstr "Komprimierte svndiff-Daten sind ungültig"
-#: ../include/svn_error_codes.h:941
+#: ../include/svn_error_codes.h:951
msgid "Diff data source modified unexpectedly"
msgstr "Diff-Datenquellen wurden unerwarteterweise verändert"
-#: ../include/svn_error_codes.h:947
+#: ../include/svn_error_codes.h:957
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache besitzt keinen Pfad zu einem SVN Dateisystem"
-#: ../include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:961
msgid "Apache got a malformed URI"
msgstr "Apache hat eine fehlerhafte URI erhalten"
-#: ../include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:965
msgid "Activity not found"
msgstr "Aktivität nicht gefunden"
-#: ../include/svn_error_codes.h:959
+#: ../include/svn_error_codes.h:969
msgid "Baseline incorrect"
msgstr " Baseline nicht korrekt"
-#: ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:973
msgid "Input/output error"
msgstr "Eingabe/Ausgabe Fehler"
-#: ../include/svn_error_codes.h:969
+#: ../include/svn_error_codes.h:979
msgid "A path under version control is needed for this operation"
msgstr "Für diese Operation wird ein Pfad unter Versionskontrolle benötigt"
-#: ../include/svn_error_codes.h:973
+#: ../include/svn_error_codes.h:983
msgid "Repository access is needed for this operation"
msgstr "Für diese Operation wird Zugang zum Projektarchiv benötigt"
-#: ../include/svn_error_codes.h:977
+#: ../include/svn_error_codes.h:987
msgid "Bogus revision information given"
msgstr "Falsche Revisionsinformation angegeben"
-#: ../include/svn_error_codes.h:981
+#: ../include/svn_error_codes.h:991
msgid "Attempting to commit to a URL more than once"
msgstr "Versuch, mehrfach zu einer URL zu übertragen"
-#: ../include/svn_error_codes.h:985
+#: ../include/svn_error_codes.h:995
msgid "Operation does not apply to binary file"
msgstr "Operation ist nicht auf einer Binärdatei ausführbar"
-#: ../include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1001
msgid "Format of an svn:externals property was invalid"
msgstr "Format einer svn:externals Eigenschaft war ungültig"
-#: ../include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1005
msgid "Attempting restricted operation for modified resource"
msgstr ""
"Versuch, eine beschränkte Operation für veränderte Ressource auszuführen"
-#: ../include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1009
msgid "Operation does not apply to directory"
msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1013
msgid "Revision range is not allowed"
msgstr "Revisionsbereich nicht erlaubt"
-#: ../include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1017
msgid "Inter-repository relocation not allowed"
msgstr "Umplatzieren innerhalb des Projektarchivs nicht erlaubt"
-#: ../include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1021
msgid "Author name cannot contain a newline"
msgstr "Autorenname darf keinen Zeilenumbruch enthalten"
-#: ../include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1025
msgid "Bad property name"
msgstr "Fehlerhafter Eigenschaftsname"
-#: ../include/svn_error_codes.h:1020
+#: ../include/svn_error_codes.h:1030
msgid "Two versioned resources are unrelated"
msgstr "Zwei versionierte Ressourcen sind nicht verwandt"
-#: ../include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1035
msgid "Path has no lock token"
msgstr "Pfad hat keine Sperrmarke"
-#: ../include/svn_error_codes.h:1030
+#: ../include/svn_error_codes.h:1040
msgid "Operation does not support multiple sources"
msgstr "Die Operation unterstützt nicht mehrere Quellen"
-#: ../include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1045
msgid "No versioned parent directories"
msgstr "Keine versionierten Elternverzeichnisse"
-#: ../include/svn_error_codes.h:1040
+#: ../include/svn_error_codes.h:1050
msgid "Working copy and merge source not ready for reintegration"
msgstr ""
"Arbeitskopie und Zusammnführungsquelle sind für eine Reintegration nicht "
"bereit"
-#: ../include/svn_error_codes.h:1046
-#, fuzzy
+#: ../include/svn_error_codes.h:1056
msgid "A problem occurred; see other errors for details"
msgstr ""
-"Ein Problem ist aufgetreten, für Details siehe folgende Fehlermeldungen"
+"Ein Problem ist aufgetreten, für Details siehe andere Fehlermeldungen"
-#: ../include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1060
msgid "Failure loading plugin"
msgstr "Fehler beim Laden eines Plugins"
-#: ../include/svn_error_codes.h:1054
+#: ../include/svn_error_codes.h:1064
msgid "Malformed file"
msgstr "Fehlerhafte Datei"
-#: ../include/svn_error_codes.h:1058
+#: ../include/svn_error_codes.h:1068
msgid "Incomplete data"
msgstr "Unvollständige Daten"
-#: ../include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1072
msgid "Incorrect parameters given"
msgstr "Inkorrekte Parameter übergeben"
-#: ../include/svn_error_codes.h:1066
+#: ../include/svn_error_codes.h:1076
msgid "Tried a versioning operation on an unversioned resource"
msgstr ""
"Versuchte, eine Versionsoperation auf nicht versionierter Ressource "
"auszuführen"
-#: ../include/svn_error_codes.h:1070
+#: ../include/svn_error_codes.h:1080
msgid "Test failed"
-msgstr "Test fehlgeschlagen"
+msgstr "Test schlug fehl"
-#: ../include/svn_error_codes.h:1074
+#: ../include/svn_error_codes.h:1084
msgid "Trying to use an unsupported feature"
msgstr "Versuch, ein nicht unterstütztes Merkmal zu benutzen"
-#: ../include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1088
msgid "Unexpected or unknown property kind"
msgstr "Unerwartete oder unbekannte Eigenschaftsart"
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1092
msgid "Illegal target for the requested operation"
msgstr "Ungültiges Ziel für die angeforderte Operation"
-#: ../include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1096
msgid "MD5 checksum is missing"
msgstr "MD5 Prüfsumme fehlt"
-#: ../include/svn_error_codes.h:1090
+#: ../include/svn_error_codes.h:1100
msgid "Directory needs to be empty but is not"
msgstr "Das Verzeichnis muss leer sein, ist es aber nicht"
-#: ../include/svn_error_codes.h:1094
+#: ../include/svn_error_codes.h:1104
msgid "Error calling external program"
msgstr "Fehler beim Aufrufen eines externen Programmes"
-#: ../include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1108
msgid "Python exception has been set with the error"
msgstr "Eine Python-Ausnahme wurde mit dem Fehler gesetzt"
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1112
msgid "A checksum mismatch occurred"
msgstr "Ein Prüfsummenfehler ist aufgetreten"
-#: ../include/svn_error_codes.h:1106
+#: ../include/svn_error_codes.h:1116
msgid "The operation was interrupted"
msgstr "Die Operation wurde unterbrochen"
-#: ../include/svn_error_codes.h:1110
+#: ../include/svn_error_codes.h:1120
msgid "The specified diff option is not supported"
msgstr "Die angegebene Vergleichsoption wird nicht unterstützt"
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1124
msgid "Property not found"
msgstr "Eigenschaft nicht gefunden"
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1128
msgid "No auth file path available"
msgstr "Kein Pfad für die Anmeldedatei verfügbar"
-#: ../include/svn_error_codes.h:1123
+#: ../include/svn_error_codes.h:1133
msgid "Incompatible library version"
msgstr "Inkompatible Bibliotheksversion"
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1138
msgid "Mergeinfo parse error"
msgstr "Einlesefehler für Zusammenführungsinformationen"
-#: ../include/svn_error_codes.h:1133
+#: ../include/svn_error_codes.h:1143
msgid "Cease invocation of this API"
msgstr "Einstellen der Benutzung dieser API"
-#: ../include/svn_error_codes.h:1138
+#: ../include/svn_error_codes.h:1148
msgid "Error parsing revision number"
msgstr "Fehler beim Einlesen der Revisionsnummer"
-#: ../include/svn_error_codes.h:1143
+#: ../include/svn_error_codes.h:1153
msgid "Iteration terminated before completion"
msgstr "Iteration brach vor der Fertigstellung ab"
-#: ../include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1158
msgid "Unknown changelist"
msgstr "Unbekannte Änderungsliste"
-#: ../include/svn_error_codes.h:1153
+#: ../include/svn_error_codes.h:1163
msgid "Reserved directory name in command line arguments"
msgstr "Kommandozeilenparameter enthalten reservierten Verzeichnisnamen"
-#: ../include/svn_error_codes.h:1158
+#: ../include/svn_error_codes.h:1168
msgid "Inquiry about unknown capability"
msgstr "Nachfrage nach unbekannter Eigenschaft"
-#: ../include/svn_error_codes.h:1163
-#, fuzzy
+#: ../include/svn_error_codes.h:1173
msgid "Test skipped"
-msgstr "Test fehlgeschlagen"
+msgstr "Test übersprungen"
-#: ../include/svn_error_codes.h:1168
+#: ../include/svn_error_codes.h:1178
msgid "apr memcache library not available"
-msgstr ""
+msgstr "Die apr-memcache-Bibliothek ist nicht verfügbar"
-#: ../include/svn_error_codes.h:1174
+#: ../include/svn_error_codes.h:1184
msgid "Error parsing arguments"
msgstr "Fehler beim Einlesen der Parameter"
-#: ../include/svn_error_codes.h:1178
+#: ../include/svn_error_codes.h:1188
msgid "Not enough arguments provided"
msgstr "Nicht genügend Parameter angegeben"
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1192
msgid "Mutually exclusive arguments specified"
msgstr "Die Parameter schließen sich gegenseitig aus"
-#: ../include/svn_error_codes.h:1186
+#: ../include/svn_error_codes.h:1196
msgid "Attempted command in administrative dir"
msgstr "Ausführen einer Operation in einem Verwaltungsverzeichnis versucht"
-#: ../include/svn_error_codes.h:1190
+#: ../include/svn_error_codes.h:1200
msgid "The log message file is under version control"
msgstr "Die Datei für die Logmeldung ist unter Versionskontrolle"
-#: ../include/svn_error_codes.h:1194
+#: ../include/svn_error_codes.h:1204
msgid "The log message is a pathname"
msgstr "Die Logmeldung ist ein Pfadname"
-#: ../include/svn_error_codes.h:1198
+#: ../include/svn_error_codes.h:1208
msgid "Committing in directory scheduled for addition"
msgstr "Übertragung in einem Verzeichnis, das zum Hinzufügen vorgesehen ist"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1212
msgid "No external editor available"
msgstr "Kein externer Editor verfügbar"
-#: ../include/svn_error_codes.h:1206
+#: ../include/svn_error_codes.h:1216
msgid "Something is wrong with the log message's contents"
msgstr "Mit dem Inhalt der Logmeldung stimmt etwas nicht"
-#: ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1220
msgid "A log message was given where none was necessary"
msgstr "Eine Logmeldung wurde angegeben wo keine nötig ist"
-#: ../include/svn_error_codes.h:1214
+#: ../include/svn_error_codes.h:1224
msgid "No external merge tool available"
msgstr "Kein externes Werkzeug zum Zusammenführen verfügbar"
+#: ../include/svn_error_codes.h:1230
+msgid "Assertion failure"
+msgstr "Assert-Anweisung schlug fehl"
+
#: ../libsvn_client/add.c:349 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
@@ -1065,41 +1066,41 @@ msgstr "(lokal)"
msgid "URL '%s' refers to a directory"
msgstr "URL %s verweist auf auf ein Verzeichnis"
-#: ../libsvn_client/checkout.c:91 ../libsvn_client/export.c:943
+#: ../libsvn_client/checkout.c:90 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "Die URL %s existiert nicht"
-#: ../libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:94
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "Die URL %s verweist auf eine Datei, nicht auf ein Verzeichnis"
-#: ../libsvn_client/checkout.c:167
+#: ../libsvn_client/checkout.c:166
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr " %s ist bereits eine Arbeitskopie für eine andere URL"
-#: ../libsvn_client/checkout.c:171
+#: ../libsvn_client/checkout.c:170
msgid "; run 'svn update' to complete it"
msgstr "; vervollständigen Sie diese mit svn update ."
-#: ../libsvn_client/checkout.c:181
+#: ../libsvn_client/checkout.c:180
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr " %s existiert bereits und ist kein Verzeichnis"
#: ../libsvn_client/cmdline.c:72
-#, fuzzy, c-format
+#, c-format
msgid "Improper relative URL '%s'"
-msgstr "Eigenschaften zu %s :\n"
+msgstr "Fehlerhafte relative URL %s "
#: ../libsvn_client/cmdline.c:130
#, c-format
msgid "All non-relative targets must have the same root URL"
-msgstr ""
+msgstr "Alle nicht-relativen Ziele müssen die selbe Wurzel-URL haben"
-#: ../libsvn_client/cmdline.c:263 ../libsvn_subr/opt.c:1008
+#: ../libsvn_client/cmdline.c:249 ../libsvn_subr/opt.c:986
#, c-format
msgid "'%s' ends in a reserved name"
msgstr " %s endet mit einem reservierten Namen"
@@ -1119,15 +1120,15 @@ msgstr "Neuer Eintragsname erforderlich,
msgid "'%s' does not exist"
msgstr " %s ist nicht vorhanden"
-#: ../libsvn_client/commit.c:635 ../libsvn_client/copy.c:513
-#: ../svnlook/main.c:1271
+#: ../libsvn_client/commit.c:635 ../libsvn_client/copy.c:512
+#: ../svnlook/main.c:1315
#, c-format
msgid "Path '%s' does not exist"
msgstr "Pfad %s existiert nicht"
-#: ../libsvn_client/commit.c:772 ../libsvn_client/copy.c:522
-#: ../libsvn_client/copy.c:933 ../libsvn_client/copy.c:1176
-#: ../libsvn_client/copy.c:1605
+#: ../libsvn_client/commit.c:772 ../libsvn_client/copy.c:521
+#: ../libsvn_client/copy.c:927 ../libsvn_client/copy.c:1170
+#: ../libsvn_client/copy.c:1599
#, c-format
msgid "Path '%s' already exists"
msgstr "Pfad %s existiert bereits"
@@ -1137,9 +1138,9 @@ msgstr "Pfad %s existiert bereits"
msgid "'%s' is a reserved name and cannot be imported"
msgstr " %s ist ein reservierter Name und kann nicht importiert werden "
-#: ../libsvn_client/commit.c:920 ../libsvn_client/copy.c:1345
+#: ../libsvn_client/commit.c:920 ../libsvn_client/copy.c:1339
msgid "Commit failed (details follow):"
-msgstr "Übertragen fehlgeschlagen (Details folgen):"
+msgstr "Übertragen schlug fehl (Details folgen):"
#: ../libsvn_client/commit.c:928
msgid "Commit succeeded, but other errors follow:"
@@ -1199,11 +1200,10 @@ msgstr ""
"Übertragenes Objekt %s ist als Kopie markiert, besitzt aber keine Quell-URL"
#: ../libsvn_client/commit_util.c:451
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is scheduled for addition, but is missing"
msgstr ""
-" %s ist zum Hinzufügen innerhalb einer nicht versionierten Struktur "
-"vorgesehen"
+" %s ist zum Hinzufügen vorgesehen, fehlt aber"
#: ../libsvn_client/commit_util.c:706
#, c-format
@@ -1251,19 +1251,19 @@ msgstr ""
"Übertragenes Objekt %s ist als Kopie markiert, hat aber eine ungültige "
"Revision"
-#: ../libsvn_client/commit_util.c:1871
+#: ../libsvn_client/commit_util.c:1869
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:538 ../libsvn_client/copy.c:1621
+#: ../libsvn_client/copy.c:537 ../libsvn_client/copy.c:1615
#: ../libsvn_client/update.c:140
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Pfad %s ist kein Verzeichnis"
-#: ../libsvn_client/copy.c:779
+#: ../libsvn_client/copy.c:778
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1272,71 +1272,71 @@ msgstr ""
"Quelle und Ziel scheinen sich nicht im selben Projektarchiv zu befinden "
"(Quelle: %s ; Ziel: %s )"
-#: ../libsvn_client/copy.c:914
+#: ../libsvn_client/copy.c:908
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kann URL %s nicht auf sich selbst verschieben"
-#: ../libsvn_client/copy.c:923 ../libsvn_client/prop_commands.c:250
+#: ../libsvn_client/copy.c:917 ../libsvn_client/prop_commands.c:250
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Pfad %s existiert nicht in Revision %ld"
-#: ../libsvn_client/copy.c:1444
+#: ../libsvn_client/copy.c:1438
#, c-format
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"
-#: ../libsvn_client/copy.c:1592
+#: ../libsvn_client/copy.c:1586
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Pfad %s wurde in Revision %ld nicht gefunden"
-#: ../libsvn_client/copy.c:1597
+#: ../libsvn_client/copy.c:1591
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Pfad %s wurde in der HEAD-Revision nicht gefunden"
-#: ../libsvn_client/copy.c:1647
+#: ../libsvn_client/copy.c:1641
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Eintrag für %s existiert (die Arbeitsdatei fehlt jedoch)"
-#: ../libsvn_client/copy.c:1738 ../libsvn_client/diff.c:1749
+#: ../libsvn_client/copy.c:1732 ../libsvn_client/diff.c:1747
#: ../libsvn_client/log.c:335
msgid "Revision type requires a working copy path, not a URL"
msgstr "Revisionstyp erfordert einen Arbeitskopiepfad, keine URL"
-#: ../libsvn_client/copy.c:1783
+#: ../libsvn_client/copy.c:1777
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:1826
+#: ../libsvn_client/copy.c:1820
#, 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:1846
+#: ../libsvn_client/copy.c:1840
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kann %s nicht auf sich selbst verschieben"
-#: ../libsvn_client/copy.c:1855
+#: ../libsvn_client/copy.c:1849
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:1918
+#: ../libsvn_client/copy.c:1912
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr " %s hat keine zugehörige URL"
-#: ../libsvn_client/copy.c:2289 ../svn/move-cmd.c:61
+#: ../libsvn_client/copy.c:2283 ../svn/move-cmd.c:61
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"Andere Revisionen (als HEAD) sind bei Verschiebeoperationen nicht zugelassen"
@@ -1347,9 +1347,9 @@ msgid "'%s' is in the way of the resourc
msgstr ""
" %s ist der Ressource, die sich unter Versionskontrolle befindet, im Weg"
-#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:3009
+#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:3000
#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
-#: ../libsvn_wc/entries.c:3005 ../libsvn_wc/update_editor.c:2394
+#: ../libsvn_wc/entries.c:3003 ../libsvn_wc/update_editor.c:2392
#, c-format
msgid "'%s' is not under version control"
msgstr " %s ist nicht unter Versionskontrolle"
@@ -1410,8 +1410,8 @@ msgstr "%s\t(Arbeitskopie)"
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:904 ../libsvn_client/merge.c:3759
-#: ../libsvn_client/merge.c:5148
+#: ../libsvn_client/diff.c:904 ../libsvn_client/merge.c:4208
+#: ../libsvn_client/merge.c:5652
msgid "Not all required revisions are specified"
msgstr "Es sind nicht alle erforderlichen Revisionen angegeben"
@@ -1434,7 +1434,7 @@ msgstr ""
"svn_client_diff4 wurde in einer Art aufgerufen, die noch nicht unterstützt "
"wird"
-#: ../libsvn_client/diff.c:1142
+#: ../libsvn_client/diff.c:1141
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1442,12 +1442,12 @@ msgstr ""
"Derzeit werden nur Vergleiche zwischen der Textbasis und den Arbeitsdateien "
"eines Pfades unterstützt"
-#: ../libsvn_client/diff.c:1287 ../libsvn_client/switch.c:126
+#: ../libsvn_client/diff.c:1285 ../libsvn_client/switch.c:126
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Verzeichnis %s hat keine URL"
-#: ../libsvn_client/diff.c:1498
+#: ../libsvn_client/diff.c:1496
msgid "Summarizing diff can only compare repository to repository"
msgstr ""
"Zusammenfassender Vergleich kann nur ein Projektarchiv mit einem "
@@ -1474,49 +1474,49 @@ msgid "'%s' already exists"
msgstr " %s existiert bereits"
#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
-#: ../libsvn_wc/update_editor.c:2078 ../libsvn_wc/update_editor.c:2746
+#: ../libsvn_wc/update_editor.c:2076 ../libsvn_wc/update_editor.c:2744
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Prüfsummenfehler für %s ; erwartet: %s , tatsächlich: %s "
-#: ../libsvn_client/externals.c:315
+#: ../libsvn_client/externals.c:314
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "Die URL %s beginnt nicht mit einem Schema"
-#: ../libsvn_client/externals.c:364
+#: ../libsvn_client/externals.c:363
#, c-format
-msgid "Illegal parent directory URL '%s'."
-msgstr "Illegale URL des übergeordneten Verzeichnisses %s ."
+msgid "Illegal parent directory URL '%s'"
+msgstr "Illegale URL des übergeordneten Verzeichnisses %s "
-#: ../libsvn_client/externals.c:394
+#: ../libsvn_client/externals.c:393
#, c-format
-msgid "Illegal repository root URL '%s'."
-msgstr "Illegale Projektarchiv-Wurzel-URL %s ."
+msgid "Illegal repository root URL '%s'"
+msgstr "Illegale Projektarchivwurzel-URL %s "
-#: ../libsvn_client/externals.c:436
+#: ../libsvn_client/externals.c:435
#, c-format
-msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'."
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
msgstr ""
"Die externe relative URL %s darf keinen Verweis auf übergeordnete Pfade "
-"haben, d.h. .. ."
+"haben, d.h. .. "
-#: ../libsvn_client/externals.c:468
+#: ../libsvn_client/externals.c:467
#, c-format
-msgid "Unrecognized format for the relative external URL '%s'."
-msgstr "Unbekanntes Format für die relative externe URL %s ."
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "Unbekanntes Format für die relative externe URL %s "
-#: ../libsvn_client/externals.c:690
+#: ../libsvn_client/externals.c:689
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "Durchlauf von %s fand keine äußere Tiefe"
-#: ../libsvn_client/externals.c:821
-#, fuzzy, c-format
+#: ../libsvn_client/externals.c:820
+#, c-format
msgid "'%s' is not a URL"
-msgstr "Pfad %s ist keine URL"
+msgstr " %s ist keine URL"
-#: ../libsvn_client/info.c:420
+#: ../libsvn_client/info.c:405
#, c-format
msgid ""
"Server does not support retrieving information about the repository root"
@@ -1524,8 +1524,8 @@ msgstr ""
"Server unterstützt die Abfrage von Informationen über die "
"Projektarchivwurzel nicht"
-#: ../libsvn_client/info.c:427 ../libsvn_client/info.c:442
-#: ../libsvn_client/info.c:452
+#: ../libsvn_client/info.c:412 ../libsvn_client/info.c:427
+#: ../libsvn_client/info.c:437
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL %s existiert nicht in Revision %ld"
@@ -1535,36 +1535,36 @@ msgstr "URL %s existiert nicht in Re
msgid "URL '%s' non-existent in that revision"
msgstr "URL %s existiert nicht in dieser Revision"
-#: ../libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:203
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"Kein gemeinsamer Vorgänger gefunden. Kann nicht mit disjunkten Pfaden "
"arbeiten"
-#: ../libsvn_client/locking_commands.c:261 ../libsvn_client/merge.c:5165
-#: ../libsvn_client/merge.c:5171 ../libsvn_client/merge.c:5742
-#: ../libsvn_client/merge.c:5898 ../libsvn_client/ra.c:397
+#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:5669
+#: ../libsvn_client/merge.c:5675 ../libsvn_client/merge.c:6246
+#: ../libsvn_client/merge.c:6402 ../libsvn_client/ra.c:397
#: ../libsvn_client/ra.c:434 ../libsvn_client/ra.c:637
#, c-format
msgid "'%s' has no URL"
msgstr " %s hat keine URL"
-#: ../libsvn_client/locking_commands.c:285
+#: ../libsvn_client/locking_commands.c:289
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Unmöglich über mehrere Projektarchive zu (ent)sperren"
-#: ../libsvn_client/locking_commands.c:326
+#: ../libsvn_client/locking_commands.c:330
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr " %s ist in dieser Arbeitskopie nicht gesperrt"
-#: ../libsvn_client/locking_commands.c:374
+#: ../libsvn_client/locking_commands.c:378
#, c-format
msgid "'%s' is not locked"
msgstr " %s ist nicht gesperrt"
-#: ../libsvn_client/locking_commands.c:407 ../libsvn_fs/fs-loader.c:1035
-#: ../libsvn_ra/ra_loader.c:1248
+#: ../libsvn_client/locking_commands.c:411 ../libsvn_fs/fs-loader.c:1035
+#: ../libsvn_ra/ra_loader.c:1287
msgid "Lock comment contains illegal characters"
msgstr "Sperrkommentar enthält illegale Zeichen"
@@ -1587,17 +1587,17 @@ msgstr "Eintrag %s hat keine URL"
msgid "No commits in repository"
msgstr "Keine Übertragungen im Projektarchiv"
-#: ../libsvn_client/merge.c:150
+#: ../libsvn_client/merge.c:162
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "Die URLs haben kein Schema ( %s und %s )"
-#: ../libsvn_client/merge.c:156 ../libsvn_client/merge.c:162
+#: ../libsvn_client/merge.c:168 ../libsvn_client/merge.c:174
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL hat kein Schema: %s "
-#: ../libsvn_client/merge.c:169
+#: ../libsvn_client/merge.c:181
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr ""
@@ -1608,21 +1608,21 @@ msgstr ""
#. 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:743
+#: ../libsvn_client/merge.c:755
msgid ".working"
msgstr ".working"
-#: ../libsvn_client/merge.c:745
+#: ../libsvn_client/merge.c:757
#, c-format
msgid ".merge-left.r%ld"
msgstr ".merge-links.r%ld"
-#: ../libsvn_client/merge.c:748
+#: ../libsvn_client/merge.c:760
#, c-format
msgid ".merge-right.r%ld"
msgstr ".merge-rechts.r%ld"
-#: ../libsvn_client/merge.c:1754
+#: ../libsvn_client/merge.c:2170
msgid ""
"Cannot reverse-merge a range from a path's own future history; try updating "
"first"
@@ -1630,7 +1630,7 @@ 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:2247
+#: ../libsvn_client/merge.c:2677
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1643,56 +1643,56 @@ 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:4863
+#: ../libsvn_client/merge.c:5367
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:4870 ../libsvn_client/merge.c:5086
+#: ../libsvn_client/merge.c:5374 ../libsvn_client/merge.c:5590
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:5392
+#: ../libsvn_client/merge.c:5896
msgid "Cannot reintegrate into a working copy with a switched subtree"
msgstr ""
"Kann nicht zurück in eine Arbeitskopie mit umgestelltem Unterbaum integrieren"
-#: ../libsvn_client/merge.c:5397
+#: ../libsvn_client/merge.c:5901
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"
-#: ../libsvn_client/merge.c:5402
+#: ../libsvn_client/merge.c:5906
msgid "Cannot reintegrate into a working copy that has local modifications"
msgstr ""
"Kann nicht zurück in eine Arbeitskopie integrieren, die lokale Änderungen hat"
-#: ../libsvn_client/merge.c:5408
+#: ../libsvn_client/merge.c:5912
msgid "Cannot determine revision of working copy"
msgstr "Die Revision der Arbeitskopie kann nicht bestimmt werden"
-#: ../libsvn_client/merge.c:5412
+#: ../libsvn_client/merge.c:5916
msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
msgstr ""
"Kann nicht zurück in eine Arbeitskopie mit verschiedenen Revisionen "
"integrieren, versuchen Sie erst zu aktualisieren"
-#: ../libsvn_client/merge.c:5479
+#: ../libsvn_client/merge.c:5983
#, c-format
msgid "At least one revision (r%ld) not yet merged from '%s'"
msgstr "Zumindest eine Revision (r%ld) aus %s wurde nicht zusammengeführt"
-#: ../libsvn_client/merge.c:5637 ../libsvn_client/merge.c:5801
+#: ../libsvn_client/merge.c:6141 ../libsvn_client/merge.c:6305
#, 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:5760
+#: ../libsvn_client/merge.c:6264
#, c-format
msgid "'%s' must be from the same repository as '%s'"
msgstr " %s muss aus dem selben Projektarchiv wie %s stammen"
@@ -1748,6 +1748,8 @@ msgid ""
"revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone "
"else deleted it?)"
msgstr ""
+"Revisionseigenschaft %s in r%ld fehlt unerwarteterweise im Projektarchiv "
+"(eventuell hat jemand anderer sie gelöscht?)"
#: ../libsvn_client/prop_commands.c:517
#, c-format
@@ -1755,6 +1757,8 @@ msgid ""
"revprop '%s' in r%ld has unexpected value in repository (maybe someone else "
"changed it?)"
msgstr ""
+"Revisionseigenschaft %s in r%ld hat einen unerwarteten Wert im Projektarchiv "
+"(eventuell hat jemand anderer sie geändert?)"
#: ../libsvn_client/prop_commands.c:525
#, c-format
@@ -1762,6 +1766,8 @@ msgid ""
"revprop '%s' in r%ld is unexpectedly present in repository (maybe someone "
"else set it?)"
msgstr ""
+"Revisionseigenschaft %s in r%ld ist unerwarteterweise im Projektarchiv "
+"vorhanden (eventuell hat jemand anderer sie gesetzt?)"
#: ../libsvn_client/prop_commands.c:714
#, c-format
@@ -1816,7 +1822,7 @@ msgid "Unrecognized revision type reques
msgstr "Unbekannter Revisionstyp für %s angefragt"
#: ../libsvn_client/switch.c:144 ../libsvn_ra_local/ra_plugin.c:196
-#: ../libsvn_ra_local/ra_plugin.c:271 ../libsvn_wc/update_editor.c:3266
+#: ../libsvn_ra_local/ra_plugin.c:271 ../libsvn_wc/update_editor.c:3264
#, c-format
msgid ""
"'%s'\n"
@@ -1834,11 +1840,11 @@ msgstr "Die URL %s ist kein Kind der
#: ../libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
-msgstr "Kompression der svndiff-Daten fehlgeschlagen"
+msgstr "Kompression der svndiff-Daten schlug fehl"
#: ../libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
-msgstr "Dekompression der svndiff-Daten fehlgeschlagen"
+msgstr "Dekompression der svndiff-Daten schlug fehl"
#: ../libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
@@ -2053,29 +2059,29 @@ msgstr ""
msgid "storing node-origins record"
msgstr "Speichere Knotenherkunftdatensatz"
-#: ../libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/nodes-table.c:96
msgid "allocating new node ID (getting 'next-key')"
msgstr "Allokiere neue Knoten-ID (hole next-key )"
-#: ../libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:114
msgid "bumping next node ID key"
msgstr "Erzeuge nächste Knoten-ID"
-#: ../libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:150
#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr "Nachfolger ID %s (für %s ) existiert bereits in Dateisystem %s "
-#: ../libsvn_fs_base/bdb/nodes-table.c:178
+#: ../libsvn_fs_base/bdb/nodes-table.c:176
msgid "deleting entry from 'nodes' table"
msgstr "Lösche Eintrag aus nodes Tabelle"
#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:216
msgid "reading node revision"
msgstr "Lese Knotenrevision"
-#: ../libsvn_fs_base/bdb/nodes-table.c:251
+#: ../libsvn_fs_base/bdb/nodes-table.c:249
msgid "storing node revision"
msgstr "Speichere Knotenrevision"
@@ -2204,7 +2210,7 @@ msgstr "Versuchte, einen Knoten mit ille
#: ../libsvn_fs_base/dag.c:861 ../libsvn_fs_base/dag.c:894
#, c-format
msgid "Delete failed: directory has no entry '%s'"
-msgstr "Löschen fehlgeschlagen: Verzeichnis hat keinen Eintrag %s "
+msgstr "Löschen schlug fehl: Verzeichnis hat keinen Eintrag %s "
#: ../libsvn_fs_base/dag.c:943
#, c-format
@@ -2379,7 +2385,7 @@ msgstr ""
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Erwartetes Dateisystemformat %d ; gefunden %d "
-#: ../libsvn_fs_base/fs.c:1166
+#: ../libsvn_fs_base/fs.c:1183
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2390,7 +2396,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:1185
+#: ../libsvn_fs_base/fs.c:1202
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2402,11 +2408,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:1232
+#: ../libsvn_fs_base/fs.c:1249
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul zum Zugriff auf ein Berkeley-DB-Projektarchiv."
-#: ../libsvn_fs_base/fs.c:1267
+#: ../libsvn_fs_base/fs.c:1284
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für bdb"
@@ -2506,7 +2512,7 @@ msgstr "Versuch, Deltas von %s gegen
#: ../libsvn_fs_base/reps-strings.c:1486
#, c-format
msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "Berechnung der MD5-Summe für %s fehlgeschlagen"
+msgstr "Berechnung der MD5-Summe für %s schlug fehl"
#: ../libsvn_fs_base/revs-txns.c:68
#, c-format
@@ -2518,68 +2524,68 @@ msgstr "Transaktion ist nicht tot: %s
msgid "Transaction is dead: '%s'"
msgstr "Transaktion ist tot: %s "
-#: ../libsvn_fs_base/revs-txns.c:1007
+#: ../libsvn_fs_base/revs-txns.c:1006
msgid "Transaction aborted, but cleanup failed"
-msgstr "Transaktion abgebrochen, aber Aufräumen fehlgeschlagen"
+msgstr "Transaktion abgebrochen, aber Aufräumen schlug fehl"
-#: ../libsvn_fs_base/tree.c:767 ../libsvn_fs_fs/tree.c:694
+#: ../libsvn_fs_base/tree.c:766 ../libsvn_fs_fs/tree.c:691
#, c-format
msgid "Failure opening '%s'"
msgstr "Fehler beim Öffnen von %s "
-#: ../libsvn_fs_base/tree.c:1399 ../libsvn_fs_fs/tree.c:1129
+#: ../libsvn_fs_base/tree.c:1398 ../libsvn_fs_fs/tree.c:1126
msgid "Cannot compare property value between two different filesystems"
msgstr ""
"Kann Eigenschaftswert nicht zwischen verschiedenen Dateisystemen vergleichen"
-#: ../libsvn_fs_base/tree.c:1733
+#: ../libsvn_fs_base/tree.c:1743
msgid "Corrupt DB: faulty predecessor count"
msgstr "DB beschädigt: Fehlerhafte Vorgängeranzahl"
-#: ../libsvn_fs_base/tree.c:1788 ../libsvn_fs_fs/tree.c:1165
+#: ../libsvn_fs_base/tree.c:1798 ../libsvn_fs_fs/tree.c:1162
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Unerwarteter unveränderlicher Knoten bei %s "
-#: ../libsvn_fs_base/tree.c:1809 ../libsvn_fs_fs/tree.c:1188
+#: ../libsvn_fs_base/tree.c:1819 ../libsvn_fs_fs/tree.c:1185
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt bei %s "
-#: ../libsvn_fs_base/tree.c:1862 ../libsvn_fs_base/tree.c:2614
-#: ../libsvn_fs_fs/tree.c:1239 ../libsvn_fs_fs/tree.c:1778
+#: ../libsvn_fs_base/tree.c:1872 ../libsvn_fs_base/tree.c:2624
+#: ../libsvn_fs_fs/tree.c:1236 ../libsvn_fs_fs/tree.c:1775
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Fehlerhaftes Zusammenführen: Vorgänger, Quelle und Ziel nicht im gleichen "
"Dateisystem"
-#: ../libsvn_fs_base/tree.c:1878 ../libsvn_fs_fs/tree.c:1255
+#: ../libsvn_fs_base/tree.c:1888 ../libsvn_fs_fs/tree.c:1252
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Fehlerhaftes Zusammenführen: Ziel %s hat die gleiche ID %s wie der "
"Vorgänger."
-#: ../libsvn_fs_base/tree.c:2421
+#: ../libsvn_fs_base/tree.c:2431
#, c-format
msgid "Transaction '%s' out-of-date with respect to revision '%s'"
msgstr "Transaktion %s ist in Bezug auf Revision %s veraltet"
-#: ../libsvn_fs_base/tree.c:2799 ../libsvn_fs_fs/tree.c:1916
+#: ../libsvn_fs_base/tree.c:2809 ../libsvn_fs_fs/tree.c:1913
msgid "The root directory cannot be deleted"
msgstr "Das Basisverzeichnis kann nicht gelöscht werden"
-#: ../libsvn_fs_base/tree.c:3020 ../libsvn_fs_fs/tree.c:1999
+#: ../libsvn_fs_base/tree.c:3030 ../libsvn_fs_fs/tree.c:1996
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr ""
"Kann nicht zwischen zwei verschiedenen Dateisystemen ( %s und %s ) kopieren"
-#: ../libsvn_fs_base/tree.c:3029 ../libsvn_fs_fs/tree.c:2005
+#: ../libsvn_fs_base/tree.c:3039 ../libsvn_fs_fs/tree.c:2002
msgid "Copy from mutable tree not currently supported"
msgstr "Kopieren eines veränderlichen Baumes wird derzeit nicht unterstützt"
-#: ../libsvn_fs_base/tree.c:3526 ../libsvn_fs_fs/tree.c:2455
+#: ../libsvn_fs_base/tree.c:3536 ../libsvn_fs_fs/tree.c:2452
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2590,26 +2596,26 @@ msgstr ""
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: ../libsvn_fs_base/tree.c:3781 ../libsvn_fs_fs/tree.c:2691
+#: ../libsvn_fs_base/tree.c:3791 ../libsvn_fs_fs/tree.c:2688
msgid "Cannot compare file contents between two different filesystems"
msgstr ""
"Kann Dateiinhalte nicht zwischen verschiedenen Dateisystemen vergleichen"
-#: ../libsvn_fs_base/tree.c:3790 ../libsvn_fs_base/tree.c:3795
-#: ../libsvn_fs_fs/tree.c:2700 ../libsvn_fs_fs/tree.c:2705
+#: ../libsvn_fs_base/tree.c:3800 ../libsvn_fs_base/tree.c:3805
+#: ../libsvn_fs_fs/tree.c:2697 ../libsvn_fs_fs/tree.c:2702
#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr " %s ist keine Datei"
-#: ../libsvn_fs_base/tree.c:4800 ../libsvn_fs_base/tree.c:4988
+#: ../libsvn_fs_base/tree.c:4810 ../libsvn_fs_base/tree.c:4998
#, c-format
msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
msgstr ""
"Knotenrevision %s behauptet, Zusammenführungsinformationen zu haben, hat "
"aber keine"
-#: ../libsvn_fs_base/tree.c:4824
+#: ../libsvn_fs_base/tree.c:4834
#, c-format
msgid ""
"Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not "
@@ -2620,9 +2626,9 @@ msgstr ""
#: ../libsvn_fs_fs/caching.c:70
msgid "Bad ID in cache"
-msgstr ""
+msgstr "Fehlerhafte ID im Zwischenspeicher"
-#: ../libsvn_fs_fs/dag.c:432 ../libsvn_ra_serf/serf.c:1033
+#: ../libsvn_fs_fs/dag.c:432 ../libsvn_ra_serf/serf.c:975
msgid "Can't get entries of non-directory"
msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen"
@@ -2643,7 +2649,7 @@ msgstr ""
"Kann Zusammenführungsinformationszähler für Datei-Knotenrevision %%s nicht "
"auf %%%s (> 1) erhöhen"
-#: ../libsvn_fs_fs/dag.c:1048
+#: ../libsvn_fs_fs/dag.c:1045
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2654,36 +2660,36 @@ msgstr ""
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: ../libsvn_fs_fs/dag.c:1145
+#: ../libsvn_fs_fs/dag.c:1142
msgid "Empty noderev in cache"
-msgstr ""
+msgstr "Leere Knotenrevision im Zwischenspeicher"
-#: ../libsvn_fs_fs/dag.c:1155
+#: ../libsvn_fs_fs/dag.c:1152
msgid "Kindless noderev in cache"
-msgstr ""
+msgstr "Nutzlose Knotenrevision im Zwischenspeicher"
-#: ../libsvn_fs_fs/dag.c:1162
-#, fuzzy, c-format
+#: ../libsvn_fs_fs/dag.c:1159
+#, c-format
msgid "Unknown kind for noderev in cache: '%c'"
-msgstr "Unbekannter Knotentyp für Darstellung %s "
+msgstr "Unbekannte Art der Knotenrevision im Zwischenspeicher: %c "
-#: ../libsvn_fs_fs/dag.c:1169
+#: ../libsvn_fs_fs/dag.c:1166
msgid "Unterminated ID in cache"
-msgstr ""
+msgstr "Nicht abgeschlossene ID im Zwischenspeicher"
-#: ../libsvn_fs_fs/dag.c:1174
+#: ../libsvn_fs_fs/dag.c:1171
#, c-format
msgid "Bogus ID '%s' in cache"
-msgstr ""
+msgstr "Fehlerhafte ID %s im Zwischenspeicher"
-#: ../libsvn_fs_fs/dag.c:1181
+#: ../libsvn_fs_fs/dag.c:1178
msgid "No created path"
-msgstr ""
+msgstr "Kein erzeugter Pfad"
-#: ../libsvn_fs_fs/dag.c:1207
-#, fuzzy, c-format
+#: ../libsvn_fs_fs/dag.c:1204
+#, c-format
msgid "Unknown node type in cache: '%c'"
-msgstr " %s hat einen unbekannten Knotentyp"
+msgstr "Unbekannter Knotentyp im Zwischenspeicher: %c "
#: ../libsvn_fs_fs/err.c:52
#, c-format
@@ -2820,8 +2826,8 @@ msgid "Invalid revision number '%ld'"
msgstr "Ungültige Revisionsnummer %ld "
#: ../libsvn_fs_fs/fs_fs.c:1509 ../libsvn_fs_fs/fs_fs.c:2190
-#: ../libsvn_fs_fs/fs_fs.c:2268 ../libsvn_repos/log.c:1370
-#: ../libsvn_repos/log.c:1374
+#: ../libsvn_fs_fs/fs_fs.c:2268 ../libsvn_repos/log.c:1575
+#: ../libsvn_repos/log.c:1579
#, c-format
msgid "No such revision %ld"
msgstr "Keine Revision %ld"
@@ -2952,7 +2958,7 @@ msgstr " next-id Datei beschädigt"
#: ../libsvn_fs_fs/fs_fs.c:4227
msgid "Transaction cleanup failed"
-msgstr "Aufräumen der Transaktion fehlgeschlagen"
+msgstr "Aufräumen der Transaktion schlug fehl"
#: ../libsvn_fs_fs/fs_fs.c:4335
msgid "Invalid change type"
@@ -2967,7 +2973,7 @@ msgstr "Kann Textinhalt im Verzeichnis n
msgid "Corrupt current file"
msgstr "Aktuelle Datei beschädigt"
-#: ../libsvn_fs_fs/fs_fs.c:5061 ../libsvn_subr/io.c:2833 ../svn/util.c:379
+#: ../libsvn_fs_fs/fs_fs.c:5061 ../libsvn_subr/io.c:2834 ../svn/util.c:379
#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
@@ -2990,20 +2996,21 @@ msgstr "Wiederherstellung fand einen Nic
msgid "Recovery encountered a deltified directory representation"
msgstr "Wiederherstellung fand eine deltifizierte Verzeichnisrepräsentation"
+# FIXME: rev ==> revision
#: ../libsvn_fs_fs/fs_fs.c:5862
-#, fuzzy, c-format
+#, c-format
msgid "Expected current rev to be <= %ld but found %ld"
-msgstr "Erwartete, dass %s ein Verzeichnis ist, es ist aber eine Datei"
+msgstr "Erwartete, dass aktuelle Revision <= %ld gilt, fand aber %ld"
#: ../libsvn_fs_fs/fs_fs.c:5915
#, c-format
msgid "Revision %ld has a revs file but no revprops file"
-msgstr ""
+msgstr "Revision %ld hat eine Revisions-Datei aber keine \
Revisionseigenschafts-Datei"
#: ../libsvn_fs_fs/fs_fs.c:5920
#, c-format
msgid "Revision %ld has a non-file where its revprops file should be"
-msgstr ""
+msgstr "Revision %ld hat eine Nicht-Datei, wo seine Revisionseigenschafts-Datei sein \
sollte"
#: ../libsvn_fs_fs/fs_fs.c:6099
#, c-format
@@ -3036,23 +3043,23 @@ msgstr "Pfad %s existiert nicht in H
#: ../libsvn_fs_fs/lock.c:717
#, c-format
msgid "Lock failed: newer version of '%s' exists"
-msgstr "Sperren fehlgeschlagen: eine neuere Version von %s existiert"
+msgstr "Sperren schlug fehl: eine neuere Version von %s existiert"
-#: ../libsvn_fs_fs/tree.c:3436
+#: ../libsvn_fs_fs/tree.c:3433
#, c-format
msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
msgstr ""
"Knotenrevision # %s behauptet, Zusammenführungsinformationen zu haben, hat "
"aber keine"
-#: ../libsvn_fs_fs/tree.c:3559
+#: ../libsvn_fs_fs/tree.c:3556
#, c-format
msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
msgstr ""
"Knotenrevision %s@%ld behauptet, Zusammenführungsinformationen zu haben, "
"hat aber keine"
-#: ../libsvn_fs_fs/tree.c:3682
+#: ../libsvn_fs_fs/tree.c:3679
#, c-format
msgid ""
"Querying mergeinfo requires version %d of the FSFS filesystem schema; "
@@ -3091,38 +3098,38 @@ msgstr ""
"Version des ZM %s stimmt nicht überein: gefunden %d.%d.%d%s, erwartet %d.%"
"d.%d%s"
-#: ../libsvn_ra/ra_loader.c:463 ../libsvn_ra_serf/serf.c:506
+#: ../libsvn_ra/ra_loader.c:477 ../libsvn_ra_serf/serf.c:506
#: ../libsvn_ra_serf/serf.c:624
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Illegale Projektarchiv-URL %s "
-#: ../libsvn_ra/ra_loader.c:498
+#: ../libsvn_ra/ra_loader.c:522
#, c-format
msgid "Invalid config: unknown HTTP library '%s'"
msgstr "Ungültige Konfiguration: Unbekannte HTTP-Bibliothek %s "
-#: ../libsvn_ra/ra_loader.c:553
+#: ../libsvn_ra/ra_loader.c:586
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Unbekanntes URL-Schema für %s "
-#: ../libsvn_ra/ra_loader.c:575
+#: ../libsvn_ra/ra_loader.c:608
#, c-format
msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
msgstr "UUID des Projektarchivs %s entspricht nicht der erwarteten UUID %s "
-#: ../libsvn_ra/ra_loader.c:631
+#: ../libsvn_ra/ra_loader.c:664
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr " %s ist nicht im selben Projektarchiv wie %s "
-#: ../libsvn_ra/ra_loader.c:1407
+#: ../libsvn_ra/ra_loader.c:1446
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - behandelt Schema %s \n"
-#: ../libsvn_ra/ra_loader.c:1493
+#: ../libsvn_ra/ra_loader.c:1532
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Unbekanntes URL-Schema %s "
@@ -3146,10 +3153,10 @@ msgstr "Kann keine ra_local-Verbindung z
#: ../libsvn_ra_local/ra_plugin.c:492
#, c-format
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
-msgstr "URL %s ist kein Kind der Projektarchiv-Wurzel-URL %s der Sitzung"
+msgstr "URL %s ist kein Kind der Projektarchivwurzel-URL %s der Sitzung"
-#: ../libsvn_ra_local/ra_plugin.c:1398 ../libsvn_ra_neon/session.c:921
-#: ../libsvn_ra_serf/serf.c:299 ../libsvn_ra_svn/client.c:2274
+#: ../libsvn_ra_local/ra_plugin.c:1398 ../libsvn_ra_neon/session.c:925
+#: ../libsvn_ra_serf/serf.c:299 ../libsvn_ra_svn/client.c:2277
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Es ist nichts über die Eigenschaft %s bekannt"
@@ -3164,17 +3171,17 @@ msgstr "Nicht unterstützte Zugriffsmodu
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "Lokale URL %s enthält keinen file:// Präfix"
-#: ../libsvn_ra_local/split_url.c:55
+#: ../libsvn_ra_local/split_url.c:63
#, 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_ra_local/split_url.c:117
+#: ../libsvn_ra_local/split_url.c:126
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "Lokale URL %s enthält einen nicht unterstützten Rechnernamen"
-#: ../libsvn_ra_local/split_url.c:127 ../libsvn_ra_local/split_url.c:134
+#: ../libsvn_ra_local/split_url.c:136 ../libsvn_ra_local/split_url.c:143
#, c-format
msgid "Unable to open repository '%s'"
msgstr "Projektarchiv %s kann nicht geöffnet werden"
@@ -3199,13 +3206,13 @@ msgid "The CHECKOUT response did not con
msgstr "Die CHECKOUT-Antwort enthielt keinen Location: Kopf"
#: ../libsvn_ra_neon/commit.c:515 ../libsvn_ra_neon/props.c:210
-#: ../libsvn_ra_neon/util.c:520 ../libsvn_ra_serf/commit.c:1359
-#: ../libsvn_ra_serf/commit.c:1749 ../libsvn_ra_serf/update.c:2162
+#: ../libsvn_ra_neon/util.c:520 ../libsvn_ra_serf/commit.c:1368
+#: ../libsvn_ra_serf/commit.c:1769 ../libsvn_ra_serf/update.c:2162
#, c-format
msgid "Unable to parse URL '%s'"
msgstr "Konnte die URL %s nicht zerlegen"
-#: ../libsvn_ra_neon/commit.c:1045 ../libsvn_ra_serf/commit.c:1599
+#: ../libsvn_ra_neon/commit.c:1045 ../libsvn_ra_serf/commit.c:1619
#, c-format
msgid "File '%s' already exists"
msgstr "Datei %s existiert bereits"
@@ -3227,7 +3234,7 @@ msgstr "Konnte content-type nicht au
msgid "Could not save file"
msgstr "Konnte Datei nicht sichern"
-#: ../libsvn_ra_neon/fetch.c:764 ../libsvn_ra_svn/client.c:975
+#: ../libsvn_ra_neon/fetch.c:764 ../libsvn_ra_svn/client.c:978
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -3243,13 +3250,13 @@ msgid "Server response missing the expec
msgstr ""
"Die Serverantwort enthält die erwartete Eigenschaft deadprop-count nicht"
-#: ../libsvn_ra_neon/fetch.c:1177 ../libsvn_ra_serf/commit.c:2125
+#: ../libsvn_ra_neon/fetch.c:1177 ../libsvn_ra_serf/commit.c:2145
msgid ""
"DAV request failed; it's possible that the repository's pre-revprop-change "
"hook either failed or is non-existent"
msgstr ""
-"DAV Anfrage fehlgeschlagen; möglicherweise ist entweder die pre-revprop-"
-"change Aktion gescheitert oder sie fehlt"
+"DAV-Anfrage schlug fehl; möglicherweise ist entweder die Aktion pre-revprop-"
+"change gescheitert oder sie fehlt"
# FIXME: collect messages!
#: ../libsvn_ra_neon/fetch.c:1422
@@ -3342,7 +3349,7 @@ msgstr "Fehler beim Schreiben nach %s
msgid "Unknown XML encoding: '%s'"
msgstr "Unbekannte XML Kodierung: %s "
-#: ../libsvn_ra_neon/fetch.c:2418
+#: ../libsvn_ra_neon/fetch.c:2417
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr ""
@@ -3358,7 +3365,7 @@ msgstr " get-file-revs REPORT nicht i
#: ../libsvn_ra_neon/file_revs.c:378
msgid "The file-revs report didn't contain any revisions"
-msgstr "Der get-file-revs Befehl gab keine Revisionen zurück"
+msgstr "Der Report file-revs enthielt keine Revisionen"
#: ../libsvn_ra_neon/get_dated_rev.c:147
msgid "Server does not support date-based operations"
@@ -3369,7 +3376,7 @@ msgid "Invalid server response to dated-
msgstr "Ungültige Antwort des Servers auf datierte Revisionsanfrage"
#: ../libsvn_ra_neon/get_location_segments.c:118
-#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1600
+#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1603
msgid "Expected valid revision range"
msgstr "Erwartete einen gültigen Revisionsbereich"
@@ -3413,7 +3420,7 @@ msgstr "Ungültiger Timeout-Wert"
msgid "Failed to parse URI '%s'"
msgstr "Konnte URI %s nicht zerlegen"
-#: ../libsvn_ra_neon/lock.c:400 ../libsvn_ra_serf/locks.c:714
+#: ../libsvn_ra_neon/lock.c:400 ../libsvn_ra_serf/locks.c:732
#, c-format
msgid "'%s' is not locked in the repository"
msgstr " %s ist im Projektarchiv nicht gesperrt"
@@ -3428,7 +3435,7 @@ msgid "Missing name attr in revprop elem
msgstr "Fehlendes Namensattribut in Element revprop "
#: ../libsvn_ra_neon/log.c:444 ../libsvn_ra_serf/log.c:547
-#: ../libsvn_ra_svn/client.c:1316
+#: ../libsvn_ra_svn/client.c:1319
msgid "Server does not support custom revprops via log"
msgstr ""
"Server unterstützt benutzerdefinierte Revisionseigenschaften mittels log "
@@ -3523,10 +3530,10 @@ msgstr ""
msgid "'%s' was not present on the baseline resource"
msgstr " %s existierte nicht für die Baseline-Ressource"
-#: ../libsvn_ra_neon/props.c:1153 ../libsvn_ra_serf/commit.c:837
+#: ../libsvn_ra_neon/props.c:1153 ../libsvn_ra_serf/commit.c:846
msgid "At least one property change failed; repository is unchanged"
msgstr ""
-"Mindestens eine Eigenschaftsänderung ist fehlgeschlagen; Projektarchiv nicht "
+"Mindestens eine Eigenschaftsänderung schlug fehl; Projektarchiv nicht "
"geändert"
#: ../libsvn_ra_neon/replay.c:272
@@ -3558,96 +3565,97 @@ msgstr "Fehler beim Schreiben in Datenst
msgid "Got cdata content for a prop delete"
msgstr "Fand cdata-Inhalt für eine Eigenschaftslöschung"
-#: ../libsvn_ra_neon/session.c:328
+#: ../libsvn_ra_neon/session.c:332
#, c-format
msgid "PIN for token \"%s\" in slot \"%s\""
msgstr "PIN für Token %s in Slot %s "
-#: ../libsvn_ra_neon/session.c:529 ../libsvn_ra_serf/serf.c:430
+#: ../libsvn_ra_neon/session.c:533 ../libsvn_ra_serf/serf.c:430
msgid "Invalid URL: illegal character in proxy port number"
msgstr "Ungültige URL: Illegales Zeichen in Proxy Portnummer"
-#: ../libsvn_ra_neon/session.c:533 ../libsvn_ra_serf/serf.c:434
+#: ../libsvn_ra_neon/session.c:537 ../libsvn_ra_serf/serf.c:434
msgid "Invalid URL: negative proxy port number"
msgstr "Ungültige URL: Negative Proxy Portnummer"
-#: ../libsvn_ra_neon/session.c:536 ../libsvn_ra_serf/serf.c:437
+#: ../libsvn_ra_neon/session.c:540 ../libsvn_ra_serf/serf.c:437
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_neon/session.c:550
+#: ../libsvn_ra_neon/session.c:554
msgid "Invalid config: illegal character in timeout value"
msgstr "Ungültige Konfiguration: Illegales Zeichen im Timeout-Wert"
-#: ../libsvn_ra_neon/session.c:554
+#: ../libsvn_ra_neon/session.c:558
msgid "Invalid config: negative timeout value"
msgstr "Ungültige Konfiguration: Negativer Timeout-Wert"
-#: ../libsvn_ra_neon/session.c:567
+#: ../libsvn_ra_neon/session.c:571
msgid "Invalid config: illegal character in debug mask value"
msgstr "Ungültige Konfiguration: Illegales Zeichen in Debugmaske"
-#: ../libsvn_ra_neon/session.c:592
+#: ../libsvn_ra_neon/session.c:596
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr "Ungültige Konfiguration: Unbekannter HTTP-Autorisationstyp %s "
-#: ../libsvn_ra_neon/session.c:653
+#: ../libsvn_ra_neon/session.c:657
msgid "Module for accessing a repository via WebDAV protocol using Neon."
msgstr ""
"Modul zum Zugriff auf ein Projektarchiv über das Protokoll WebDAV mittels "
"Neon."
# FIXME: "can't happen" according to source code!
-#: ../libsvn_ra_neon/session.c:808
+#: ../libsvn_ra_neon/session.c:812
#, c-format
msgid "OPTIONS request (for capabilities) got HTTP response code %d"
msgstr "OPTIONS-Anfrage (für Eigenschaften) führte zu HTTP-Antwort-Code %d"
-#: ../libsvn_ra_neon/session.c:904 ../libsvn_ra_serf/serf.c:282
+#: ../libsvn_ra_neon/session.c:908 ../libsvn_ra_serf/serf.c:282
#, 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_neon/session.c:928 ../libsvn_ra_serf/serf.c:306
+#: ../libsvn_ra_neon/session.c:932 ../libsvn_ra_serf/serf.c:306
#, c-format
msgid "Attempt to fetch capability '%s' resulted in '%s'"
msgstr "Der Versuch, die Eigenschaft %s abzufragen, führte zu %s "
-#: ../libsvn_ra_neon/session.c:951 ../libsvn_ra_serf/locks.c:548
-msgid "Malformed URL for repository"
-msgstr "Fehlerhafte URL für Projektarchiv"
+#: ../libsvn_ra_neon/session.c:955
+#, c-format
+msgid "Malformed URL '%s': scheme or host or path is missing"
+msgstr "Fehlerhafte URL %s : Schema, Rechner oder Pfad fehlt"
-#: ../libsvn_ra_neon/session.c:1001
+#: ../libsvn_ra_neon/session.c:1006
msgid "Network socket initialization failed"
-msgstr "Initialisierung der Netzwerkverbindung fehlgeschlagen"
+msgstr "Initialisierung der Netzwerkverbindung schlug fehl"
-#: ../libsvn_ra_neon/session.c:1020
+#: ../libsvn_ra_neon/session.c:1025
msgid "SSL is not supported"
msgstr "SSL wird nicht unterstützt"
-#: ../libsvn_ra_neon/session.c:1187 ../libsvn_ra_serf/util.c:211
+#: ../libsvn_ra_neon/session.c:1192 ../libsvn_ra_serf/util.c:211
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr ""
"Ungültige Konfiguration: Zertifikatsdatei %s kann nicht geladen werden"
-#: ../libsvn_ra_neon/session.c:1215
+#: ../libsvn_ra_neon/session.c:1220
#, c-format
msgid "Invalid config: unable to load PKCS#11 provider '%s'"
msgstr ""
"Ungültige Konfiguration: PKCS#11-Anbieter %s kann nicht geladen werden"
-#: ../libsvn_ra_neon/session.c:1337 ../libsvn_ra_serf/serf.c:1187
+#: ../libsvn_ra_neon/session.c:1341 ../libsvn_ra_serf/serf.c:1118
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_neon/session.c:1412
+#: ../libsvn_ra_neon/session.c:1416
#, c-format
msgid "Unsupported RA loader version (%d) for ra_neon"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_neon"
@@ -3670,18 +3678,18 @@ msgstr "Fehler beim Setzen der Eigenscha
msgid "%s of '%s'"
msgstr "%s von %s "
-#: ../libsvn_ra_neon/util.c:546 ../libsvn_ra_serf/util.c:1473
+#: ../libsvn_ra_neon/util.c:546 ../libsvn_ra_serf/util.c:1486
#, c-format
msgid "'%s' path not found"
msgstr " %s Pfad nicht gefunden"
-#: ../libsvn_ra_neon/util.c:555 ../libsvn_ra_serf/util.c:1467
+#: ../libsvn_ra_neon/util.c:555 ../libsvn_ra_serf/util.c:1480
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr ""
"Das Projektarchiv wurde permanent nach %s verschoben; bitte umplatzieren"
-#: ../libsvn_ra_neon/util.c:557 ../libsvn_ra_serf/util.c:1469
+#: ../libsvn_ra_neon/util.c:557 ../libsvn_ra_serf/util.c:1482
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr ""
@@ -3698,13 +3706,13 @@ msgstr ""
"Anfrage %s für %s zurückgeliefert"
#: ../libsvn_ra_neon/util.c:577
-#, fuzzy, c-format
+#, c-format
msgid "authorization failed: %s"
-msgstr "Autorisierung fehlgeschlagen"
+msgstr "Autorisierung schlug fehl: %s"
#: ../libsvn_ra_neon/util.c:579
msgid "authorization failed"
-msgstr "Autorisierung fehlgeschlagen"
+msgstr "Autorisierung schlug fehl"
#: ../libsvn_ra_neon/util.c:584
msgid "could not connect to server"
@@ -3729,46 +3737,31 @@ msgstr "Fehler beim Lesen der Antwort au
msgid "The %s request returned invalid XML in the response: %s (%s)"
msgstr "Die Anfrage %s gab in der Antwort ungültiges XML zurück: %s (%s)"
-#: ../libsvn_ra_serf/auth.c:275 ../libsvn_ra_serf/auth.c:281
-msgid "Missing 'realm' attribute in Authorization header."
-msgstr "Fehlendes Attribut realm in Autorisations-Header."
-
-#: ../libsvn_ra_serf/blame.c:470 ../libsvn_ra_serf/commit.c:1150
-#: ../libsvn_ra_serf/property.c:892 ../libsvn_ra_serf/serf.c:677
-#: ../libsvn_ra_serf/update.c:1134 ../libsvn_ra_serf/update.c:1679
-msgid "The OPTIONS response did not include the requested checked-in value"
-msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert checked-in "
+#: ../libsvn_ra_serf/auth.c:287 ../libsvn_ra_serf/auth.c:293
+msgid "Missing 'realm' attribute in Authorization header"
+msgstr "Fehlendes Attribut realm in Autorisations-Header"
-#: ../libsvn_ra_serf/blame.c:499 ../libsvn_ra_serf/commit.c:1379
-#: ../libsvn_ra_serf/commit.c:1769 ../libsvn_ra_serf/property.c:906
-#: ../libsvn_ra_serf/serf.c:799 ../libsvn_ra_serf/serf.c:1087
-msgid ""
-"The OPTIONS response did not include the requested baseline-collection value"
-msgstr ""
-"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert baseline-"
-"collection "
-
-#: ../libsvn_ra_serf/commit.c:408 ../libsvn_ra_serf/commit.c:422
+#: ../libsvn_ra_serf/commit.c:408 ../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:500 ../libsvn_repos/commit.c:388
+#: ../libsvn_ra_serf/commit.c:509 ../libsvn_repos/commit.c:388
#, c-format
msgid "Path '%s' not present"
msgstr "Pfad %s existiert nicht"
-#: ../libsvn_ra_serf/commit.c:585 ../libsvn_ra_serf/commit.c:599
+#: ../libsvn_ra_serf/commit.c:594 ../libsvn_ra_serf/commit.c:608
#, 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:1042
+#: ../libsvn_ra_serf/commit.c:1051
#, c-format
msgid "Failed writing updated file"
msgstr "Fehler beim Schreiben der aktualisierten Datei"
-#: ../libsvn_ra_serf/commit.c:1094
+#: ../libsvn_ra_serf/commit.c:1103
msgid ""
"The OPTIONS response did not include the requested activity-collection-set "
"value"
@@ -3776,30 +3769,53 @@ msgstr ""
"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert activity-"
"collection-set "
-#: ../libsvn_ra_serf/commit.c:1122
+#: ../libsvn_ra_serf/commit.c:1131
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s von %s : %d %s (%s://%s)"
-#: ../libsvn_ra_serf/commit.c:1405
+#: ../libsvn_ra_serf/commit.c:1159 ../libsvn_ra_serf/property.c:893
+#: ../libsvn_ra_serf/update.c:1134 ../libsvn_ra_serf/update.c:1679
+msgid "The OPTIONS response did not include the requested checked-in value"
+msgstr "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert checked-in "
+
+#: ../libsvn_ra_serf/commit.c:1388 ../libsvn_ra_serf/commit.c:1789
+#: ../libsvn_ra_serf/property.c:907
+msgid ""
+"The OPTIONS response did not include the requested baseline-collection value"
+msgstr ""
+"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert baseline-"
+"collection "
+
+#: ../libsvn_ra_serf/commit.c:1414
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Hinzufügen eines Verzeichnisses schlug fehl: %s auf %s (%d)"
+#: ../libsvn_ra_serf/getlocationsegments.c:230
+#, c-format
+msgid "Location segment report failed on '%s'@'%ld'"
+msgstr "Ortssegmentreport schlug auf %s @ %ld fehl"
+
#: ../libsvn_ra_serf/locks.c:378 ../libsvn_ra_serf/locks.c:417
#, c-format
msgid "Lock request failed: %d %s"
msgstr "Sperranforderung gescheitert: %d %s"
-#: ../libsvn_ra_serf/locks.c:640
-msgid "Lock request failed"
-msgstr "Sperranforderung gescheitert"
+#: ../libsvn_ra_serf/locks.c:548
+msgid "Malformed URL for repository"
+msgstr "Fehlerhafte URL für Projektarchiv"
-#: ../libsvn_ra_serf/locks.c:754
+#: ../libsvn_ra_serf/locks.c:772
#, c-format
msgid "Unlock request failed: %d %s"
msgstr "Sperrfreigabe gescheitert: %d %s"
+#: ../libsvn_ra_serf/property.c:921
+msgid "The OPTIONS response did not include the requested version-name value"
+msgstr ""
+"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert version-name "
+
#: ../libsvn_ra_serf/replay.c:195 ../libsvn_ra_serf/update.c:1231
msgid "Missing revision attr in target-revision element"
msgstr "Fehlendes Revisionsattribut in Element target-revision "
@@ -3843,32 +3859,17 @@ msgstr ""
msgid "Could not lookup hostname `%s'"
msgstr "Konnte Rechnernamen %s nicht nachschlagen"
-#: ../libsvn_ra_serf/serf.c:661 ../libsvn_ra_serf/update.c:2221
-#: ../libsvn_ra_serf/util.c:1412
-msgid ""
-"The OPTIONS response did not include the requested version-controlled-"
-"configuration value"
-msgstr ""
-"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert version-"
-"controlled-configuration "
-
-#: ../libsvn_ra_serf/serf.c:694
-msgid "The OPTIONS response did not include the requested version-name value"
-msgstr ""
-"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert version-name "
-
-#: ../libsvn_ra_serf/serf.c:863
+#: ../libsvn_ra_serf/serf.c:805
msgid "The OPTIONS response did not include the requested resourcetype value"
msgstr ""
"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert resourcetype "
-#: ../libsvn_ra_serf/serf.c:1027
-#, fuzzy
+#: ../libsvn_ra_serf/serf.c:969
msgid "The PROPFIND response did not include the requested resourcetype value"
msgstr ""
-"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert resourcetype "
+"Die PROPFIND-Antwort enthielt nicht den angeforderten Wert resourcetype "
-#: ../libsvn_ra_serf/serf.c:1252
+#: ../libsvn_ra_serf/serf.c:1186
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_serf"
@@ -3878,16 +3879,24 @@ msgstr "Nicht unterstützte Zugriffsmodu
msgid "GET request failed: %d %s"
msgstr "GET-Anfrage schlug fehl: %d %s"
-#: ../libsvn_ra_serf/update.c:2301
+#: ../libsvn_ra_serf/update.c:2221 ../libsvn_ra_serf/util.c:1416
+msgid ""
+"The OPTIONS response did not include the requested version-controlled-"
+"configuration value"
+msgstr ""
+"Die OPTIONS-Antwort enthielt nicht den angeforderten Wert version-"
+"controlled-configuration "
+
+#: ../libsvn_ra_serf/update.c:2304
#, c-format
msgid "Error retrieving REPORT (%d)"
-msgstr "Fehler beim Holen des REPORT (%d)"
+msgstr "Fehler beim Holen von REPORT (%d)"
-#: ../libsvn_ra_serf/util.c:1186
+#: ../libsvn_ra_serf/util.c:1184
msgid "Premature EOF seen from server"
msgstr "Vorzeitiges EOF vom Server"
-#: ../libsvn_ra_serf/util.c:1237
+#: ../libsvn_ra_serf/util.c:1235
msgid "Unspecified error message"
msgstr "Nicht spezifizierte Fehlermeldung"
@@ -3910,55 +3919,55 @@ msgstr "Eigenschafts-Diff Element ist ke
msgid "Unrecognized node kind '%s' from server"
msgstr "Unbekannter Knotentyp %s vom Server"
-#: ../libsvn_ra_svn/client.c:383
+#: ../libsvn_ra_svn/client.c:386
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Undefiniertes Tunnelschema %s "
-#: ../libsvn_ra_svn/client.c:400
+#: ../libsvn_ra_svn/client.c:403
#, 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:411
+#: ../libsvn_ra_svn/client.c:414
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kann Anweisung %s nicht zerlegen"
-#: ../libsvn_ra_svn/client.c:442
+#: ../libsvn_ra_svn/client.c:445
#, c-format
msgid "Error in child process: %s"
msgstr "Fehler in Kindprozess: %s"
-#: ../libsvn_ra_svn/client.c:466
+#: ../libsvn_ra_svn/client.c:469
#, c-format
msgid "Can't create tunnel"
msgstr "Kann Tunnel nicht erzeugen"
-#: ../libsvn_ra_svn/client.c:504
+#: ../libsvn_ra_svn/client.c:507
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Illegale svn Projektarchiv URL %s "
-#: ../libsvn_ra_svn/client.c:565
+#: ../libsvn_ra_svn/client.c:568
#, c-format
msgid "Server requires minimum version %d"
msgstr "Server erfordert mindestens Version %d"
-#: ../libsvn_ra_svn/client.c:569
+#: ../libsvn_ra_svn/client.c:572
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Server unterstützt nur Versionen bis zu %d"
-#: ../libsvn_ra_svn/client.c:577
+#: ../libsvn_ra_svn/client.c:580
msgid "Server does not support edit pipelining"
msgstr "Server unterstützt edit pipelining nicht"
-#: ../libsvn_ra_svn/client.c:615
+#: ../libsvn_ra_svn/client.c:618
msgid "Impossibly long repository root from server"
msgstr "Unmöglich lange Projektarchivbasis vom Server"
-#: ../libsvn_ra_svn/client.c:627
+#: ../libsvn_ra_svn/client.c:630
msgid ""
"Module for accessing a repository using the svn network protocol.\n"
" - with Cyrus SASL authentication"
@@ -3966,131 +3975,131 @@ msgstr ""
"Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll.\n"
" - mit Cyrus-SASL-Authentifizierung"
-#: ../libsvn_ra_svn/client.c:631
+#: ../libsvn_ra_svn/client.c:634
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:792
+#: ../libsvn_ra_svn/client.c:795
msgid "Server did not send repository root"
msgstr "Server gab keine Projektarchivbasis zurück"
-#: ../libsvn_ra_svn/client.c:865
+#: ../libsvn_ra_svn/client.c:868
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:953
+#: ../libsvn_ra_svn/client.c:956
msgid "Non-string as part of file contents"
msgstr "Ein Teil des Dateiinhaltes ist keine Zeichenkette"
-#: ../libsvn_ra_svn/client.c:1054
+#: ../libsvn_ra_svn/client.c:1057
msgid "Dirlist element not a list"
msgstr "Verzeichniseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1113
+#: ../libsvn_ra_svn/client.c:1116
msgid "Mergeinfo element is not a list"
msgstr "Zusammenführungsinfo-Element ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1305
+#: ../libsvn_ra_svn/client.c:1308
msgid "Log entry not a list"
msgstr "Logeintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1340
+#: ../libsvn_ra_svn/client.c:1343
msgid "Changed-path entry not a list"
msgstr "Eintrag für geänderte Pfade ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1465
+#: ../libsvn_ra_svn/client.c:1468
msgid "'stat' not implemented"
msgstr " stat nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1522
+#: ../libsvn_ra_svn/client.c:1525
msgid "'get-locations' not implemented"
msgstr " get-locations nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1534
+#: ../libsvn_ra_svn/client.c:1537
msgid "Location entry not a list"
msgstr "Ortseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1579
+#: ../libsvn_ra_svn/client.c:1582
msgid "'get-location-segments' not implemented"
msgstr " get-location-segments nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1591
+#: ../libsvn_ra_svn/client.c:1594
msgid "Location segment entry not a list"
msgstr "Ortssegmenteintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1653
+#: ../libsvn_ra_svn/client.c:1656
msgid "'get-file-revs' not implemented"
msgstr " get-file-revs nicht implementiert"
-#: ../libsvn_ra_svn/client.c:1666
+#: ../libsvn_ra_svn/client.c:1669
msgid "Revision entry not a list"
msgstr "Revisionseintrag ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1683 ../libsvn_ra_svn/client.c:1708
+#: ../libsvn_ra_svn/client.c:1686 ../libsvn_ra_svn/client.c:1711
msgid "Text delta chunk not a string"
msgstr "Text-Deltastück ist kein String"
-#: ../libsvn_ra_svn/client.c:1720
+#: ../libsvn_ra_svn/client.c:1723
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:1768
+#: ../libsvn_ra_svn/client.c:1771
msgid "Server doesn't support the lock command"
msgstr "Server unterstützt das Kommando lock nicht"
-#: ../libsvn_ra_svn/client.c:1832
+#: ../libsvn_ra_svn/client.c:1835
msgid "Server doesn't support the unlock command"
msgstr "Server unterstützt das Kommando unlock nicht"
-#: ../libsvn_ra_svn/client.c:1929
+#: ../libsvn_ra_svn/client.c:1932
msgid "Lock response not a list"
msgstr "Antwort beim Sperren ist keine Liste"
-#: ../libsvn_ra_svn/client.c:1943
+#: ../libsvn_ra_svn/client.c:1946
msgid "Unknown status for lock command"
msgstr "Unbekannter Status für Sperrbefehl"
-#: ../libsvn_ra_svn/client.c:1965
+#: ../libsvn_ra_svn/client.c:1968
msgid "Didn't receive end marker for lock responses"
msgstr "Keine Endemarke für Sperrantworten erhalten"
-#: ../libsvn_ra_svn/client.c:2052
+#: ../libsvn_ra_svn/client.c:2055
msgid "Unlock response not a list"
msgstr "Antwort beim Entsperren ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2066
+#: ../libsvn_ra_svn/client.c:2069
msgid "Unknown status for unlock command"
msgstr "Unbekannter Status für Entsperrbefehl"
-#: ../libsvn_ra_svn/client.c:2087
+#: ../libsvn_ra_svn/client.c:2090
msgid "Didn't receive end marker for unlock responses"
msgstr "Keine Endemarke für Entsperrantworten erhalten"
-#: ../libsvn_ra_svn/client.c:2111 ../libsvn_ra_svn/client.c:2139
+#: ../libsvn_ra_svn/client.c:2114 ../libsvn_ra_svn/client.c:2142
msgid "Server doesn't support the get-lock command"
msgstr "Server unterstützt das Kommando get-lock nicht"
-#: ../libsvn_ra_svn/client.c:2152
+#: ../libsvn_ra_svn/client.c:2155
msgid "Lock element not a list"
msgstr "Sperrelement ist keine Liste"
-#: ../libsvn_ra_svn/client.c:2175
+#: ../libsvn_ra_svn/client.c:2178
msgid "Server doesn't support the replay command"
msgstr "Server unterstützt das Kommando replay nicht"
-#: ../libsvn_ra_svn/client.c:2207
+#: ../libsvn_ra_svn/client.c:2210
msgid "Server doesn't support the replay-range command"
msgstr "Server unterstützt das Kommando replay-range nicht"
-#: ../libsvn_ra_svn/client.c:2225
+#: ../libsvn_ra_svn/client.c:2228
#, c-format
msgid "Expected 'revprops', found '%s'"
msgstr "Erwartete revprops , fand %s "
-#: ../libsvn_ra_svn/client.c:2338
+#: ../libsvn_ra_svn/client.c:2341
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_svn"
@@ -4285,11 +4294,11 @@ msgstr "* Revision %ld verifiziert.\n"
msgid "Unexpected node kind %d for '%s'"
msgstr "Unerwartete Knotenart %d für %s "
-#: ../libsvn_repos/fs-wrap.c:58 ../libsvn_repos/load.c:1351
+#: ../libsvn_repos/fs-wrap.c:59 ../libsvn_repos/load.c:1351
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Übertragen erfolgreich, aber die post-commit -Aktion schlug fehl"
-#: ../libsvn_repos/fs-wrap.c:165
+#: ../libsvn_repos/fs-wrap.c:166
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -4298,41 +4307,49 @@ 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:282
+#: ../libsvn_repos/fs-wrap.c:180
+msgid "Cannot accept log message because it is not encoded in UTF-8"
+msgstr "Kann Logmeldung nicht akzeptieren, da sie nicht in UTF-8 kodiert ist"
+
+#: ../libsvn_repos/fs-wrap.c:190
+msgid "Cannot accept non-LF line endings in log message"
+msgstr "Kann nicht- LF (LF = Unix-artige) Zeilenumbrüche in Logmeldung nicht \
akzeptieren" +
+#: ../libsvn_repos/fs-wrap.c:305
#, 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:486
+#: ../libsvn_repos/fs-wrap.c:510
#, 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:500
+#: ../libsvn_repos/fs-wrap.c:525
msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "Entsperren erfolgreich, aber die post-unlock Aktion schlug fehl"
+msgstr "Entsperren erfolgreich, aber die Aktion post-unlock schlug fehl"
-#: ../libsvn_repos/hooks.c:87
+#: ../libsvn_repos/hooks.c:80
#, c-format
msgid "'%s' hook succeeded, but error output could not be read"
msgstr ""
" %s -Aktion war erfolgreich, aber die Fehlerausgabe konnte nicht gelesen "
"werden"
-#: ../libsvn_repos/hooks.c:102
+#: ../libsvn_repos/hooks.c:95
msgid "[Error output could not be translated from the native locale to UTF-8.]"
msgstr ""
"[Fehlerausgabe konnte nicht mit der aktuellen Locale-Einstellung nicht nach "
"UTF-8 konvertiert werden.]"
-#: ../libsvn_repos/hooks.c:107
+#: ../libsvn_repos/hooks.c:100
msgid "[Error output could not be read.]"
msgstr "[Fehlerausgabe konnte nicht gelesen werden.]"
# FIXME: two spaces at end?
-#: ../libsvn_repos/hooks.c:116
+#: ../libsvn_repos/hooks.c:109
#, c-format
msgid ""
"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
@@ -4341,93 +4358,93 @@ msgstr ""
"Aktion %s schlug fehl (wurde nicht sauber beendet: apr_exit_why_e war %d, "
"Exit-Code war %d). "
-#: ../libsvn_repos/hooks.c:125
+#: ../libsvn_repos/hooks.c:118
msgid "Commit"
msgstr "Übertragen"
-#: ../libsvn_repos/hooks.c:127
+#: ../libsvn_repos/hooks.c:120
msgid "Revprop change"
msgstr "Ändern einer Revisionseigenschaft"
-#: ../libsvn_repos/hooks.c:129
+#: ../libsvn_repos/hooks.c:122
msgid "Lock"
msgstr "Sperren"
-#: ../libsvn_repos/hooks.c:131
+#: ../libsvn_repos/hooks.c:124
msgid "Unlock"
msgstr "Entsperren"
-#: ../libsvn_repos/hooks.c:136
+#: ../libsvn_repos/hooks.c:129
#, c-format
msgid "%s hook failed (exit code %d)"
msgstr "Aktion %s schlug fehl (Exit-Code %d)"
-#: ../libsvn_repos/hooks.c:140
+#: ../libsvn_repos/hooks.c:133
#, c-format
msgid "%s blocked by %s hook (exit code %d)"
msgstr "%s wird durch Aktion %s behindert (Exit-Code %d)"
-#: ../libsvn_repos/hooks.c:147
+#: ../libsvn_repos/hooks.c:140
msgid " with output:\n"
msgstr " mit Ausgabe:\n"
-#: ../libsvn_repos/hooks.c:153
+#: ../libsvn_repos/hooks.c:146
msgid " with no output."
msgstr " ohne Ausgabe."
-#: ../libsvn_repos/hooks.c:185
+#: ../libsvn_repos/hooks.c:176
#, c-format
msgid "Can't create pipe for hook '%s'"
msgstr "Kann Pipe für Aktion %s nicht anlegen"
# CHECKME: non-inherited = losgelöst???
-#: ../libsvn_repos/hooks.c:197
+#: ../libsvn_repos/hooks.c:188
#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "Kann nicht Pipe-Lese-Handle nicht erbbar für Aktion %s machen"
+msgstr "Kann Pipe-Lese-Handle für Aktion %s nicht nicht-erbbar machen"
-#: ../libsvn_repos/hooks.c:203
+#: ../libsvn_repos/hooks.c:194
#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "Kann nicht Pipe-Schreib-Handle nicht erbbar für Aktion %s machen"
+msgstr "Kann Pipe-Schreib-Handle für Aktion %s nicht nicht-erbbar machen"
-#: ../libsvn_repos/hooks.c:212
+#: ../libsvn_repos/hooks.c:203
#, c-format
msgid "Can't create null stdout for hook '%s'"
msgstr "Kann leere Standardausgabe für Aktion %s nicht anlegen"
-#: ../libsvn_repos/hooks.c:224
+#: ../libsvn_repos/hooks.c:215
#, c-format
msgid "Error closing write end of stderr pipe"
msgstr "Fehler beim Schließen des Schreib-Endes der Standardfehlerausgabe"
-#: ../libsvn_repos/hooks.c:229
+#: ../libsvn_repos/hooks.c:220
#, c-format
msgid "Failed to start '%s' hook"
-msgstr "Konnte %s Aktion nicht starten"
+msgstr "Konnte Aktion %s nicht starten"
-#: ../libsvn_repos/hooks.c:242
+#: ../libsvn_repos/hooks.c:233
#, c-format
msgid "Error closing read end of stderr pipe"
msgstr "Fehler beim Schließen des Lese-Endes der Standardfehlerausgabe"
-#: ../libsvn_repos/hooks.c:246
+#: ../libsvn_repos/hooks.c:237
#, c-format
msgid "Error closing null file"
msgstr "Fehler beim Schließen der leeren Standardausgabe"
-#: ../libsvn_repos/hooks.c:548
+#: ../libsvn_repos/hooks.c:323
#, c-format
msgid "Failed to run '%s' hook; broken symlink"
-msgstr "Ausführen der %s Aktion gescheitert; defekter Symlink "
+msgstr "Ausführen der Aktion %s gescheitert; defekter Symlink "
-#: ../libsvn_repos/hooks.c:699
+#: ../libsvn_repos/hooks.c:483
msgid ""
"Repository has not been enabled to accept revision propchanges;\n"
"ask the administrator to create a pre-revprop-change hook"
msgstr ""
"Das Projektarchiv lässt keine Änderungen an Revisionseigenschaften zu.\n"
-"Bitten Sie den Administrator darum, eine pre-revprop-change Aktion\n"
+"Bitten Sie den Administrator darum, eine Aktion pre-revprop-change \n"
"einzurichten."
#: ../libsvn_repos/load.c:122
@@ -4646,52 +4663,52 @@ msgstr "Erzeuge Aktion pre-commit "
msgid "Creating pre-revprop-change hook"
msgstr "Erzeuge Aktion pre-revprop-change "
-#: ../libsvn_repos/repos.c:735
+#: ../libsvn_repos/repos.c:738
msgid "Creating post-commit hook"
msgstr "Erzeuge Aktion post-commit "
-#: ../libsvn_repos/repos.c:921
+#: ../libsvn_repos/repos.c:924
msgid "Creating post-revprop-change hook"
msgstr "Erzeuge Aktion post-revprop-change "
-#: ../libsvn_repos/repos.c:931
+#: ../libsvn_repos/repos.c:934
msgid "Creating conf directory"
msgstr "Erzeuge Konfigurationsverzeichnis"
-#: ../libsvn_repos/repos.c:986
+#: ../libsvn_repos/repos.c:989
msgid "Creating svnserve.conf file"
msgstr "Erzeuge Datei svnserve.conf "
-#: ../libsvn_repos/repos.c:1004
+#: ../libsvn_repos/repos.c:1007
msgid "Creating passwd file"
msgstr "Erzeuge Datei passwd "
-#: ../libsvn_repos/repos.c:1046
+#: ../libsvn_repos/repos.c:1049
msgid "Creating authz file"
msgstr "Erzeuge Datei authz "
-#: ../libsvn_repos/repos.c:1081
+#: ../libsvn_repos/repos.c:1084
msgid "Could not create top-level directory"
msgstr "Konnte oberstes Verzeichnis nicht erzeugen"
-#: ../libsvn_repos/repos.c:1093
+#: ../libsvn_repos/repos.c:1096
msgid "Creating DAV sandbox dir"
msgstr "Erzeuge Verzeichnis für DAV-Sandkasten"
-#: ../libsvn_repos/repos.c:1164
+#: ../libsvn_repos/repos.c:1167
msgid "Error opening db lockfile"
msgstr "Fehler beim Öffnen der Datenbank-Sperrdatei"
-#: ../libsvn_repos/repos.c:1201
+#: ../libsvn_repos/repos.c:1204
msgid "Repository creation failed"
-msgstr "Anlegen des Projektarchivs fehlgeschlagen"
+msgstr "Anlegen des Projektarchivs schlug fehl"
-#: ../libsvn_repos/repos.c:1282
+#: ../libsvn_repos/repos.c:1285
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Erwartetes Format des Projektarchivs %d oder %d ; gefunden %d "
-#: ../libsvn_repos/repos.c:1505
+#: ../libsvn_repos/repos.c:1508
#, c-format
msgid "unknown capability '%s'"
msgstr "unbekannte Eigenschaft %s "
@@ -4715,87 +4732,93 @@ msgstr "Ungültige Endrevision %ld"
msgid "Unreadable path encountered; access denied"
msgstr "Nichtlesbarer Pfad angetroffen; Zugriff verweigert"
-#: ../libsvn_repos/rev_hunt.c:1122
+#: ../libsvn_repos/rev_hunt.c:1118
#, c-format
msgid "'%s' is not a file in revision %ld"
msgstr " %s ist in Revision %ld keine Datei"
#: ../libsvn_subr/cache-inprocess.c:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't lock cache mutex"
-msgstr "Kann FS Mutex nicht anlegen"
+msgstr "Kann Zwischenspeicher-Mutex nicht sperren"
#: ../libsvn_subr/cache-inprocess.c:197
-#, fuzzy, c-format
+#, c-format
msgid "Can't unlock cache mutex"
-msgstr "Kann FS Mutex nicht anlegen"
+msgstr "Kann Zwischenspeicher-Mutex nicht entsperren"
#: ../libsvn_subr/cache-inprocess.c:449
-#, fuzzy, c-format
+#, c-format
msgid "Can't create cache mutex"
-msgstr "Kann Verbindung nicht erzeugen"
+msgstr "Kann Zwischenspeicher-Mutex nicht anlegen"
+# memcached is an APR library
#: ../libsvn_subr/cache-memcache.c:153
#, c-format
msgid "Unknown memcached error while reading"
-msgstr ""
+msgstr "Unbekannter memcached -Fehler beim Lesen"
#: ../libsvn_subr/cache-memcache.c:203
#, c-format
msgid "Unknown memcached error while writing"
-msgstr ""
+msgstr "Unbekannter memcached -Fehler beim Schreiben"
#: ../libsvn_subr/cache-memcache.c:218
-#, fuzzy
-msgid "Can't iterate a memcached cache."
-msgstr "Kann nicht in den gelösten Status wechseln"
+msgid "Can't iterate a memcached cache"
+msgstr "Kann keinen memcached -Zwischenspeicher durchlaufen"
#: ../libsvn_subr/cache-memcache.c:281
-#, fuzzy, c-format
+#, c-format
msgid "Error parsing memcache server '%s'"
-msgstr "Fehler beim Zerlegen von %s "
+msgstr "Fehler beim Abfragen des memcache -Servers %s "
#: ../libsvn_subr/cache-memcache.c:289
#, c-format
msgid "Scope not allowed in memcache server '%s'"
-msgstr ""
+msgstr "Bereich ist im memcache -Server %s nicht erlaubt"
#: ../libsvn_subr/cache-memcache.c:297
#, c-format
msgid "Must specify host and port for memcache server '%s'"
-msgstr ""
+msgstr "Der Rechner und Port muss für den memcache -Server %s festgelegt \
werden"
#: ../libsvn_subr/cache-memcache.c:316
#, c-format
msgid "Unknown error creating memcache server"
-msgstr ""
+msgstr "Unbekannter Fehler beim Erzeugen eines memcache -Servers"
#: ../libsvn_subr/cache-memcache.c:324
#, c-format
msgid "Unknown error adding server to memcache"
-msgstr ""
+msgstr "Unbekannter Fehler beim Hinzufügen des Servers zu memcache "
#: ../libsvn_subr/cache-memcache.c:394
#, c-format
msgid "Unknown error creating apr_memcache_t"
-msgstr ""
+msgstr "Unbekannter Fehler beim Anlegen von apr_memcache_t"
+
+# password store: kwallet, ...
+#: ../libsvn_subr/cmdline.c:564
+#, c-format
+msgid "Invalid config: unknown password store '%s'"
+msgstr "Ungültige Konfiguration: Unbekannte Passwortverwaltung %s "
-#: ../libsvn_subr/cmdline.c:605
+#: ../libsvn_subr/cmdline.c:735
#, c-format
msgid "Error initializing command line arguments"
msgstr "Fehler beim Initialisieren der Kommandozeilenparameter"
-#: ../libsvn_subr/config.c:633
+#: ../libsvn_subr/config.c:647
#, c-format
-msgid "Config error: invalid boolean value '%s'"
-msgstr "Konfigurationsfehler: Ungültiger logischer Wert %s "
+msgid "Config error: invalid boolean value '%s' for '[%s] %s'"
+msgstr "Konfigurationsfehler: Ungültiger logischer Wert %s für [%s] %s "
-#: ../libsvn_subr/config.c:675 ../libsvn_subr/simple_providers.c:352
-#, fuzzy, c-format
-msgid "Config error: invalid value '%s' for option '%s'"
-msgstr "Konfigurationsfehler: Ungültiger logischer Wert %s "
+#: ../libsvn_subr/config.c:654
+#, c-format
+msgid "Config error: invalid boolean value '%s' for '%s'"
+msgstr "Konfigurationsfehler: Ungültiger logischer Wert %s für %s "
-#: ../libsvn_subr/config.c:913
+#: ../libsvn_subr/config.c:946
#, c-format
msgid "Config error: invalid integer value '%s'"
msgstr "Konfigurationsfehler: Ungültige Ganzzahl %s "
@@ -4857,6 +4880,16 @@ msgstr "Kann Fehlermeldung von APR nicht
msgid "%swarning: %s\n"
msgstr "%swarnung: %s\n"
+#: ../libsvn_subr/error.c:491
+#, c-format
+msgid "In file '%s' line %d: assertion failed (%s)"
+msgstr "In Datei %s , Zeile %d: Assert-Anweisung schlug fehl (%s)"
+
+#: ../libsvn_subr/error.c:495
+#, c-format
+msgid "In file '%s' line %d: internal malfunction"
+msgstr "In Datei %s , Zeile %d: interne Fehlfunktion"
+
#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
@@ -4921,14 +4954,14 @@ msgstr "Ziel %s ist kein Verzeichnis
msgid "Destination '%s' already exists"
msgstr "Ziel %s existiert bereits"
-#: ../libsvn_subr/io.c:932 ../libsvn_subr/io.c:1884 ../libsvn_subr/io.c:1935
-#: ../libsvn_subr/io.c:1987
+#: ../libsvn_subr/io.c:932 ../libsvn_subr/io.c:1883 ../libsvn_subr/io.c:1934
+#: ../libsvn_subr/io.c:1986
#, c-format
msgid "Can't read directory '%s'"
msgstr "Kann Verzeichnis %s nicht lesen"
-#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1889 ../libsvn_subr/io.c:1940
-#: ../libsvn_subr/io.c:1992 ../libsvn_subr/io.c:3155
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3156
#, c-format
msgid "Error closing directory '%s'"
msgstr "Fehler beim Schließen von Verzeichnis %s "
@@ -4984,76 +5017,76 @@ msgstr "Fehler beim Ermitteln der Prozes
msgid "Can't get shared lock on file '%s'"
msgstr "Kann keine gemeinsame Sperre für Datei %s erhalten"
-#: ../libsvn_subr/io.c:1576
+#: ../libsvn_subr/io.c:1575
#, c-format
msgid "Can't flush file '%s'"
msgstr "Kann Datei %s nicht leeren"
-#: ../libsvn_subr/io.c:1577
+#: ../libsvn_subr/io.c:1576
#, c-format
msgid "Can't flush stream"
msgstr "Kann Datenstrom nicht leeren"
-#: ../libsvn_subr/io.c:1589 ../libsvn_subr/io.c:1606
+#: ../libsvn_subr/io.c:1588 ../libsvn_subr/io.c:1605
#, c-format
msgid "Can't flush file to disk"
msgstr "Kann Datei nicht auf Festplatte leeren"
-#: ../libsvn_subr/io.c:1628 ../libsvn_subr/prompt.c:100 ../svnserve/main.c:591
+#: ../libsvn_subr/io.c:1627 ../libsvn_subr/prompt.c:100 ../svnserve/main.c:591
#, c-format
msgid "Can't open stdin"
msgstr "Kann Standardeingabe nicht öffnen"
-#: ../libsvn_subr/io.c:1649
+#: ../libsvn_subr/io.c:1648
msgid "Reading from stdin is disallowed"
msgstr "Lesen von der Standardeingabe ist nicht erlaubt"
-#: ../libsvn_subr/io.c:1663
+#: ../libsvn_subr/io.c:1662
#, c-format
msgid "Can't get file name"
msgstr "Kann keinen Dateinamen holen"
-#: ../libsvn_subr/io.c:1732
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "Kann Datei %s nicht löschen"
-#: ../libsvn_subr/io.c:1811 ../libsvn_subr/io.c:3006 ../libsvn_subr/io.c:3092
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3007 ../libsvn_subr/io.c:3093
#, c-format
msgid "Can't open directory '%s'"
msgstr "Kann Verzeichnis %s nicht öffnen"
-#: ../libsvn_subr/io.c:1865 ../libsvn_subr/io.c:1895
+#: ../libsvn_subr/io.c:1864 ../libsvn_subr/io.c:1894
#, c-format
msgid "Can't remove '%s'"
msgstr "Kann %s nicht löschen"
-#: ../libsvn_subr/io.c:1875
+#: ../libsvn_subr/io.c:1874
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Kann Verzeichnis %s nicht zurückspulen"
-#: ../libsvn_subr/io.c:2056
+#: ../libsvn_subr/io.c:2055
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Kann Attribute von Prozess %s nicht erzeugen"
-#: ../libsvn_subr/io.c:2062
+#: ../libsvn_subr/io.c:2061
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Kann Kommandotyp von Prozess %s nicht setzen "
-#: ../libsvn_subr/io.c:2074
+#: ../libsvn_subr/io.c:2073
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Kann Verzeichnis von Prozess %s nicht setzen"
-#: ../libsvn_subr/io.c:2087
+#: ../libsvn_subr/io.c:2086
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Kann Eingabe des Kindprozesses %s nicht setzen"
-#: ../libsvn_subr/io.c:2094
+#: ../libsvn_subr/io.c:2093
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Kann Ausgabe des Kindprozesses %s nicht setzen"
@@ -5061,48 +5094,49 @@ 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:2101
+#: ../libsvn_subr/io.c:2100
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Kann Fehlerausgabe des Kindprozesses %s nicht setzen"
-#: ../libsvn_subr/io.c:2108
+#: ../libsvn_subr/io.c:2107
#, 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:2114
+#: ../libsvn_subr/io.c:2113
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Kann die Fehlerbehandlung des Prozesses %s nicht setzen"
-#: ../libsvn_subr/io.c:2137
+#: ../libsvn_subr/io.c:2136
#, c-format
msgid "Can't start process '%s'"
msgstr "Kann Prozess %s nicht starten"
-#: ../libsvn_subr/io.c:2161
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Fehler beim Warten auf Prozess %s "
-#: ../libsvn_subr/io.c:2169
+# CHECKME: Isn't "exitwhy" an internal detail?
+#: ../libsvn_subr/io.c:2168
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
-msgstr "Prozess %s fehlgeschlagen (Grund %d)"
+msgstr "Prozess %s schlug fehl (Grund %d)"
-#: ../libsvn_subr/io.c:2176
+#: ../libsvn_subr/io.c:2175
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Prozess %s hat Fehlerwert %d zurückgegeben"
-#: ../libsvn_subr/io.c:2287
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr " %s hat %d zurückgegeben"
-#: ../libsvn_subr/io.c:2410
+#: ../libsvn_subr/io.c:2411
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -5117,121 +5151,121 @@ msgstr ""
"%s\n"
"%s"
-#: ../libsvn_subr/io.c:2537
+#: ../libsvn_subr/io.c:2538
#, 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:2627
+#: ../libsvn_subr/io.c:2628
#, c-format
msgid "Can't open file '%s'"
msgstr "Kann Datei %s nicht öffnen"
-#: ../libsvn_subr/io.c:2663
+#: ../libsvn_subr/io.c:2664
#, c-format
msgid "Can't close file '%s'"
msgstr "Kann Datei %s nicht schließen"
-#: ../libsvn_subr/io.c:2664
+#: ../libsvn_subr/io.c:2665
#, c-format
msgid "Can't close stream"
msgstr "Kann Datenstrom nicht schließen"
-#: ../libsvn_subr/io.c:2674 ../libsvn_subr/io.c:2698 ../libsvn_subr/io.c:2711
+#: ../libsvn_subr/io.c:2675 ../libsvn_subr/io.c:2699 ../libsvn_subr/io.c:2712
#, c-format
msgid "Can't read file '%s'"
msgstr "Kann Datei %s nicht lesen"
-#: ../libsvn_subr/io.c:2675 ../libsvn_subr/io.c:2699 ../libsvn_subr/io.c:2712
+#: ../libsvn_subr/io.c:2676 ../libsvn_subr/io.c:2700 ../libsvn_subr/io.c:2713
#, c-format
msgid "Can't read stream"
msgstr "Kann nicht aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:2686
+#: ../libsvn_subr/io.c:2687
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Kann keine Attributinformationen aus Datei %s lesen"
-#: ../libsvn_subr/io.c:2687
+#: ../libsvn_subr/io.c:2688
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Kann keine Attributinformationen aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:2723
+#: ../libsvn_subr/io.c:2724
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Kann Positionszeiger in Datei %s nicht setzen"
-#: ../libsvn_subr/io.c:2724
+#: ../libsvn_subr/io.c:2725
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Kann Positionszeiger in Datenstrom nicht setzen"
-#: ../libsvn_subr/io.c:2735 ../libsvn_subr/io.c:2769
+#: ../libsvn_subr/io.c:2736 ../libsvn_subr/io.c:2770
#, c-format
msgid "Can't write to file '%s'"
msgstr "Kann nicht in Datei %s schreiben"
-#: ../libsvn_subr/io.c:2736 ../libsvn_subr/io.c:2770
+#: ../libsvn_subr/io.c:2737 ../libsvn_subr/io.c:2771
#, c-format
msgid "Can't write to stream"
msgstr "Kann nicht in Datenstrom schreiben"
-#: ../libsvn_subr/io.c:2810
+#: ../libsvn_subr/io.c:2811
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Kann Längenzeile nicht aus Datei %s lesen"
-#: ../libsvn_subr/io.c:2814
+#: ../libsvn_subr/io.c:2815
msgid "Can't read length line in stream"
msgstr "Kann Längenzeile nicht aus Datenstrom lesen"
-#: ../libsvn_subr/io.c:2861
+#: ../libsvn_subr/io.c:2862
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Kann %s nicht nach %s verschieben"
-#: ../libsvn_subr/io.c:2940
+#: ../libsvn_subr/io.c:2941
#, c-format
msgid "Can't create directory '%s'"
msgstr "Kann Verzeichnis %s nicht anlegen"
-#: ../libsvn_subr/io.c:2951 ../libsvn_wc/copy.c:543
+#: ../libsvn_subr/io.c:2952 ../libsvn_wc/copy.c:543
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Kann Verzeichnis %s nicht verstecken"
-#: ../libsvn_subr/io.c:3024
+#: ../libsvn_subr/io.c:3025
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Kann Verzeichnis %s nicht entfernen"
-#: ../libsvn_subr/io.c:3042
+#: ../libsvn_subr/io.c:3043
#, c-format
msgid "Can't read directory"
msgstr "Kann Verzeichnis nicht lesen"
-#: ../libsvn_subr/io.c:3111
+#: ../libsvn_subr/io.c:3112
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Kann Verzeichniseintrag in %s nicht lesen"
-#: ../libsvn_subr/io.c:3236
+#: ../libsvn_subr/io.c:3237
#, c-format
msgid "Can't check directory '%s'"
msgstr "Kann Verzeichnis %s nicht prüfen"
-#: ../libsvn_subr/io.c:3258
+#: ../libsvn_subr/io.c:3259
#, c-format
msgid "Version %d is not non-negative"
msgstr "Version %d ist nicht positiv"
-#: ../libsvn_subr/io.c:3308
+#: ../libsvn_subr/io.c:3309
#, c-format
msgid "Reading '%s'"
msgstr "Lese %s "
-#: ../libsvn_subr/io.c:3324
+#: ../libsvn_subr/io.c:3325
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Die erste Zeile von %s enthält eine Nicht-Ziffer"
@@ -5247,7 +5281,7 @@ msgid "Negative revision number found pa
msgstr "Negative Revisionsnummer beim Einlesen von %s gefunden"
#: ../libsvn_subr/mergeinfo.c:85
-msgid "No pathname preceeding ':'"
+msgid "No pathname preceding ':'"
msgstr "Vor : steht kein Pfadname"
#: ../libsvn_subr/mergeinfo.c:401
@@ -5354,38 +5388,38 @@ msgstr ""
" %s : unbekannter Befehl.\n"
"\n"
-#: ../libsvn_subr/opt.c:866
+#: ../libsvn_subr/opt.c:860
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Syntaxfehler bei der Analyse der Revision %s "
-#: ../libsvn_subr/opt.c:1089
+#: ../libsvn_subr/opt.c:1064
msgid "Revision property pair is empty"
msgstr "Revisionseigenschaftspaar ist leer"
-#: ../libsvn_subr/opt.c:1109 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:180
+#: ../libsvn_subr/opt.c:1084 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:182
#: ../svn/propset-cmd.c:64
#, c-format
msgid "'%s' is not a valid Subversion property name"
msgstr " %s ist kein gültiger Subversion-Eigenschaftsname"
-#: ../libsvn_subr/opt.c:1131
+#: ../libsvn_subr/opt.c:1143
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL %s ist nicht korrekt URI-kodiert"
-#: ../libsvn_subr/opt.c:1137
+#: ../libsvn_subr/opt.c:1149
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL %s enthält ein .. Element"
-#: ../libsvn_subr/opt.c:1170
+#: ../libsvn_subr/opt.c:1182
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Fehler beim Ermitteln der Groß-/Kleinschreibung von %s "
# FIXME: Datum ist nicht übersetzbar (Aug 3 2006 statt 3. August 2006)
-#: ../libsvn_subr/opt.c:1199
+#: ../libsvn_subr/opt.c:1211
#, c-format
msgid ""
"%s, version %s\n"
@@ -5396,7 +5430,7 @@ msgstr ""
" übersetzt %s, %s\n"
"\n"
-#: ../libsvn_subr/opt.c:1202
+#: ../libsvn_subr/opt.c:1214
msgid ""
"Copyright (C) 2000-2008 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -5410,7 +5444,7 @@ msgstr ""
"entwickelt wurde.\n"
"\n"
-#: ../libsvn_subr/opt.c:1255 ../libsvn_subr/opt.c:1322
+#: ../libsvn_subr/opt.c:1267 ../libsvn_subr/opt.c:1334
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Geben Sie %s help für weitere Hilfe ein.\n"
@@ -5425,12 +5459,12 @@ msgstr "Konnte den absoluten Pfad von
msgid "'%s' is neither a file nor a directory name"
msgstr " %s ist weder ein Datei- noch ein Verzeichnisname"
-#: ../libsvn_subr/path.c:1347
+#: ../libsvn_subr/path.c:1360
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Kann die Zeichencodierung des Pfades nicht ermitteln"
-#: ../libsvn_subr/path.c:1461
+#: ../libsvn_subr/path.c:1474
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Ungültiges Steuerzeichen 0x%02x in Pfad %s "
@@ -5516,11 +5550,26 @@ msgstr "Client Zertifikatsdatei: "
msgid "Passphrase for '%s': "
msgstr "Passphrase für %s : "
-#: ../libsvn_subr/prompt.c:391
+#: ../libsvn_subr/prompt.c:417
+msgid "yes"
+msgstr "ja"
+
+#: ../libsvn_subr/prompt.c:422
+msgid "no"
+msgstr "nein"
+
+#: ../libsvn_subr/prompt.c:428
+msgid "Please type 'yes' or 'no': "
+msgstr "Bitte geben Sie ja oder nein ein: "
+
+#: ../libsvn_subr/prompt.c:442
msgid "Store password unencrypted (yes/no)? "
-msgstr ""
+msgstr "Passwort unverschlüsselt speichern (ja/nein)? "
-#: ../libsvn_subr/prompt.c:399
+# CHECKME: See
+# http://dict.leo.org/forum/viewUnsolvedquery.php?idThread=34212&idForum=2&lp=ende&lang=de
+# CHECKME: Remove ":", it's no proper sentence with it
+#: ../libsvn_subr/prompt.c:444
#, c-format
msgid ""
"-----------------------------------------------------------------------\n"
@@ -5537,20 +5586,67 @@ msgid ""
"'%s'.\n"
"-----------------------------------------------------------------------\n"
msgstr ""
+"-----------------------------------------------------------------------\n"
+"ACHTUNG! Ihr Password für den Anmeldungstext (realm)\n"
+"\n"
+" %s\n"
+"\n"
+"kann auf der Platte nur unverschlüsselt gespeichert werden! Es wird\n"
+"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n"
+"Passwörter verschlüsselt speichern kann. Siehe die Dokumentation für\n"
+"Details.\n"
+"\n"
+"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n"
+"den Wert der Option store-plaintext-passwords in\n"
+" %s \n"
+"entweder auf ja oder nein setzen.\n"
+"-----------------------------------------------------------------------\n"
-#: ../libsvn_subr/prompt.c:428
-msgid "yes"
-msgstr ""
+#: ../libsvn_subr/prompt.c:472
+msgid "Store passphrase unencrypted (yes/no)? "
+msgstr "Passphrase unverschlüsselt speichern (ja/nein)? "
-#: ../libsvn_subr/prompt.c:433
-msgid "no"
+# FIXME: s/passphrase/passphrases/
+#: ../libsvn_subr/prompt.c:474
+#, c-format
+msgid ""
+"-----------------------------------------------------------------------\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 ""
+"-----------------------------------------------------------------------\n"
+"ACHTUNG! Ihre Passphrase für das Klient-Zertifikat:\n"
+"\n"
+" %s\n"
+"\n"
+"kann auf der Platte nur unverschlüsselt gespeichert werden! Es wird\n"
+"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n"
+"Passphrasen verschlüsselt speichern kann. Siehe die Dokumentation für\n"
+"Details.\n"
+"\n"
+"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n"
+"den Wert der Option store-ssl-client-cert-pp-plaintext in\n"
+" %s \n"
+"entweder auf ja oder nein setzen.\n"
+"-----------------------------------------------------------------------\n"
-#: ../libsvn_subr/prompt.c:439
-msgid "Please type 'yes' or 'no': "
-msgstr ""
+#: ../libsvn_subr/simple_providers.c:353
+#: ../libsvn_subr/ssl_client_cert_pw_providers.c:305
+#, c-format
+msgid "Config error: invalid value '%s' for option '%s'"
+msgstr "Konfigurationsfehler: Ungültiger Wert %s für Option %s "
-#: ../libsvn_subr/subst.c:1744 ../libsvn_wc/props.c:2443
+#: ../libsvn_subr/subst.c:1744 ../libsvn_wc/props.c:2430
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Datei %s hat inkonsistente Zeilenenden"
@@ -5651,9 +5747,9 @@ msgid "MIME type '%s' does not contain '
msgstr "MIME-Typ %s enthält keinen / "
#: ../libsvn_subr/validate.c:67
-#, fuzzy, c-format
+#, c-format
msgid "MIME type '%s' contains invalid character '%c'"
-msgstr "MIME-Typ %s endet mit einem nicht-alphanumerischen Zeichen"
+msgstr "MIME-Typ %s enthält ein ungültiges Zeichen %c "
#: ../libsvn_subr/version.c:74
#, c-format
@@ -5668,7 +5764,7 @@ msgstr "Fehlerhaftes XML: %s in Zeile %l
#: ../libsvn_wc/adm_crawler.c:678
msgid "Error aborting report"
-msgstr "Fehler beim Abbrechen des Berichts"
+msgstr "Fehler beim Abbrechen des Reports"
#: ../libsvn_wc/adm_crawler.c:1103
#, c-format
@@ -5806,18 +5902,18 @@ msgstr ""
msgid "File '%s' has local modifications"
msgstr "Die Datei %s hat lokale Änderungen"
-#: ../libsvn_wc/adm_ops.c:2715
+#: ../libsvn_wc/adm_ops.c:2716
msgid "Invalid 'conflict_result' argument"
msgstr "Ungültiger Parameter conflict_result "
-#: ../libsvn_wc/adm_ops.c:3014
+#: ../libsvn_wc/adm_ops.c:3005
#, c-format
msgid "'%s' is a directory, and thus cannot be a member of a changelist"
msgstr ""
" %s ist ein Vrzeichnis and kann deswegen nicht Element einer Änderungsliste "
"sein"
-#: ../libsvn_wc/adm_ops.c:3034
+#: ../libsvn_wc/adm_ops.c:3025
#, c-format
msgid "Removing '%s' from changelist '%s'."
msgstr "Entferne %s aus Änderungsliste %s ."
@@ -5900,7 +5996,7 @@ msgstr "Eintrag %s hat eine ungülti
#: ../libsvn_wc/entries.c:1011
#, c-format
msgid "XML parser failed in '%s'"
-msgstr "XML Parser in %s fehlgeschlagen"
+msgstr "XML-Parser schlug in %s fehl"
#: ../libsvn_wc/entries.c:1070
msgid "Missing default entry"
@@ -6020,27 +6116,27 @@ msgstr "Eintrag %s ist bereits unter
msgid "Entry '%s' has illegal schedule"
msgstr "Eintrag %s hat einen ungültigen Plan"
-#: ../libsvn_wc/entries.c:2697
+#: ../libsvn_wc/entries.c:2696
#, c-format
msgid "No such entry: '%s'"
msgstr "Kein Eintrag: %s "
-#: ../libsvn_wc/entries.c:2831
+#: ../libsvn_wc/entries.c:2829
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Fehler beim Schreiben der Eintragsdatei für %s "
-#: ../libsvn_wc/entries.c:2874
+#: ../libsvn_wc/entries.c:2872
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Verzeichnis %s hat keinen THIS_DIR Eintrag"
-#: ../libsvn_wc/entries.c:3021
+#: ../libsvn_wc/entries.c:3019
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr " %s hat einen nicht erkannten Knotentyp"
-#: ../libsvn_wc/entries.c:3058
+#: ../libsvn_wc/entries.c:3056
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Unerwartetes %s gefunden: Pfad wird als fehlend markiert"
@@ -6090,17 +6186,17 @@ msgstr "Kann %s nicht sperren"
msgid "Working copy '%s' is not locked"
msgstr "Arbeitskopie %s ist nicht gesperrt"
-#: ../libsvn_wc/lock.c:1426
+#: ../libsvn_wc/lock.c:1427
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "Schreibsperre gestohlen in %s "
-#: ../libsvn_wc/lock.c:1434
+#: ../libsvn_wc/lock.c:1435
#, c-format
msgid "No write-lock in '%s'"
msgstr "Keine Schreibsperre in %s "
-#: ../libsvn_wc/lock.c:1456
+#: ../libsvn_wc/lock.c:1457
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr "Sperrdatei %s ist keine reguläre Datei"
@@ -6138,7 +6234,7 @@ msgstr "Fehlendes dest Attribut für
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Fehlendes timestamp Attribut für %s "
-#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:507
+#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:508
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Fehler beim Ermitteln der letzten Änderungszeit von %s "
@@ -6260,24 +6356,24 @@ msgstr "Kann %s nicht analysieren"
msgid "Can't write property hash to '%s'"
msgstr "Kann Eigenschafts-Hashwert nicht nach %s schreiben"
-#: ../libsvn_wc/props.c:583
+#: ../libsvn_wc/props.c:584
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Fehlendes Zeilenende in Datei wcprops für %s "
# FIXME: duplicated message (differs only in ".")
-#: ../libsvn_wc/props.c:1394
+#: ../libsvn_wc/props.c:1381
msgid "Conflict callback violated API: returned no results."
msgstr ""
"Konflikt-Aktion verletzte die API: keine Ergebnisse wurden zurückgeliefert."
-#: ../libsvn_wc/props.c:1434
+#: ../libsvn_wc/props.c:1421
msgid "Conflict callback violated API: returned no merged file."
msgstr ""
"Konflikt-Aktion verletzte die API: keine zusammengeführte Datei wurde "
"zurückgeliefert."
-#: ../libsvn_wc/props.c:1528
+#: ../libsvn_wc/props.c:1515
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -6286,7 +6382,7 @@ msgstr ""
"Versuch, eine neue Eigenschaft %s mit dem Wert %s anzulegen,\n"
"aber die Eigenschaft existiert bereits mit dem Wert %s ."
-#: ../libsvn_wc/props.c:1543
+#: ../libsvn_wc/props.c:1530
#, c-format
msgid ""
"Trying to create property '%s' with value '%s',\n"
@@ -6295,7 +6391,7 @@ msgstr ""
"Versuch, die Eigenschaft %s mit dem Wert %s anzulegen,\n"
"aber die Eigenschaft wurde lokal bereits gelöscht."
-#: ../libsvn_wc/props.c:1617
+#: ../libsvn_wc/props.c:1604
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -6304,7 +6400,7 @@ msgstr ""
"Versuch, die Eigenschaft %s mit dem Wert %s zu löschen,\n"
"aber der Wert wurde von %s in %s geändert."
-#: ../libsvn_wc/props.c:1638
+#: ../libsvn_wc/props.c:1625
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -6313,7 +6409,7 @@ msgstr ""
"Versuch, die Eigenschaft %s mit dem Wert %s zu löschen,\n"
"aber der lokale Wert ist %s ."
-#: ../libsvn_wc/props.c:1725
+#: ../libsvn_wc/props.c:1712
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6322,17 +6418,16 @@ msgstr ""
"Versuch, die Eigenschaft %s von %s in %s zu ändern,\n"
"aber die Eigenschaft wurde lokal von %s in %s geändert."
-# FIXME: Missing full stop
-#: ../libsvn_wc/props.c:1733
+#: ../libsvn_wc/props.c:1720
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
-"but property has been locally added with value '%s'"
+"but property has been locally added with value '%s'."
msgstr ""
"Versuch, die Eigenschaft %s von %s in %s zu ändern,\n"
"aber die Eigenschaft wurde lokal mit dem Wert %s hinzugefügt."
-#: ../libsvn_wc/props.c:1754
+#: ../libsvn_wc/props.c:1741
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6341,7 +6436,7 @@ msgstr ""
"Versuch, die Eigenschaft %s von %s in %s zu ändern,\n"
"aber die Eigenschaft wurde lokal gelöscht."
-#: ../libsvn_wc/props.c:1787
+#: ../libsvn_wc/props.c:1774
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6350,7 +6445,7 @@ msgstr ""
"Versuch, die Eigenschaft %s von %s in %s zu ändern,\n"
"aber die Eigenschaft existiert nicht."
-#: ../libsvn_wc/props.c:1825
+#: ../libsvn_wc/props.c:1812
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6359,52 +6454,52 @@ msgstr ""
"Versuch, die Eigenschaft %s von %s in %s zu ändern,\n"
"aber die Eigenschaft existiert bereits mit dem Wert %s ."
-#: ../libsvn_wc/props.c:2130 ../libsvn_wc/props.c:2158
-#: ../libsvn_wc/props.c:2303 ../libsvn_wc/props.c:2526
+#: ../libsvn_wc/props.c:2117 ../libsvn_wc/props.c:2145
+#: ../libsvn_wc/props.c:2290 ../libsvn_wc/props.c:2513
msgid "Failed to load properties from disk"
msgstr "Konnte Eigenschaften nicht vom Datenträger laden"
-#: ../libsvn_wc/props.c:2186
+#: ../libsvn_wc/props.c:2173
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Kann Eigenschafts-Hashwert nicht nach %s schreiben"
-#: ../libsvn_wc/props.c:2298 ../libsvn_wc/props.c:2470
+#: ../libsvn_wc/props.c:2285 ../libsvn_wc/props.c:2457
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Eigenschaft %s ist eine Eintragseigenschaft"
-#: ../libsvn_wc/props.c:2342
+#: ../libsvn_wc/props.c:2329
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Kann %s nicht für ein Verzeichnis setzen ( %s )"
-#: ../libsvn_wc/props.c:2350
+#: ../libsvn_wc/props.c:2337
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Kann %s nicht für eine Datei setzen ( %s )"
-#: ../libsvn_wc/props.c:2356
+#: ../libsvn_wc/props.c:2343
#, c-format
msgid "'%s' is not a file or directory"
msgstr " %s ist weder eine Datei noch ein Verzeichnis"
-#: ../libsvn_wc/props.c:2424
+#: ../libsvn_wc/props.c:2411
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Datei %s hat die MIME-Typ Eigenschaft binär "
-#: ../libsvn_wc/props.c:2619
+#: ../libsvn_wc/props.c:2606
#, c-format
msgid "Unrecognized line ending style for '%s'"
msgstr "Stil für Zeilenende für %s nicht erkannt"
-#: ../libsvn_wc/props.c:3216 ../libsvn_wc/props.c:3283
+#: ../libsvn_wc/props.c:3203 ../libsvn_wc/props.c:3270
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Fehler beim Analysieren der %s Eigenschaft für %s : %s "
-#: ../libsvn_wc/props.c:3333
+#: ../libsvn_wc/props.c:3320
#, c-format
msgid ""
"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
@@ -6456,17 +6551,17 @@ msgstr "Relocate kann nur den Projektarc
msgid "No '.' entry in: '%s'"
msgstr "Kein . Eintrag in: %s "
-#: ../libsvn_wc/update_editor.c:986
+#: ../libsvn_wc/update_editor.c:984
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Pfad %s ist nicht in der Arbeitskopie enthalten"
-#: ../libsvn_wc/update_editor.c:1098
+#: ../libsvn_wc/update_editor.c:1096
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Werde lokal verändertes Verzeichnis %s nicht löschen"
-#: ../libsvn_wc/update_editor.c:1270
+#: ../libsvn_wc/update_editor.c:1268
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -6475,7 +6570,7 @@ msgstr ""
"Konnte Verzeichnis %s nicht hinzufügen: ein nicht-Verzeichnisobjekt mit "
"demselben Namen existiert bereits"
-#: ../libsvn_wc/update_editor.c:1303
+#: ../libsvn_wc/update_editor.c:1301
#, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -6484,7 +6579,7 @@ msgstr ""
"Verzeichnis %s konnte nicht hinzugefügt werden: ein nicht versioniertes "
"Verzeichnis mit demselben Namen existiert bereits"
-#: ../libsvn_wc/update_editor.c:1325
+#: ../libsvn_wc/update_editor.c:1323
#, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -6493,7 +6588,7 @@ msgstr ""
"Konnte Verzeichnis %s nicht hinzufügen: ein versioniertes Verzeichnis mit "
"demselben Namen existiert bereits"
-#: ../libsvn_wc/update_editor.c:1336
+#: ../libsvn_wc/update_editor.c:1334
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -6502,7 +6597,7 @@ msgstr ""
"Konnte Verzeichnis %s nicht hinzufügen, da es denselben Namen wie das\n"
"Administrationsverzeichnis trägt"
-#: ../libsvn_wc/update_editor.c:1369
+#: ../libsvn_wc/update_editor.c:1367
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
@@ -6510,11 +6605,11 @@ msgstr ""
"nicht\n"
"unterstützt"
-#: ../libsvn_wc/update_editor.c:1663
+#: ../libsvn_wc/update_editor.c:1661
msgid "Couldn't do property merge"
msgstr "Konnte Eigenschaften nicht zusammenführen"
-#: ../libsvn_wc/update_editor.c:1736
+#: ../libsvn_wc/update_editor.c:1734
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -6524,11 +6619,11 @@ msgstr ""
"wurde\n"
"bereits zur Übertragung eingeplant"
-#: ../libsvn_wc/update_editor.c:1809
+#: ../libsvn_wc/update_editor.c:1807
msgid "Bad copyfrom arguments received"
msgstr "Falsche Parameter kopieren von erhalten"
-#: ../libsvn_wc/update_editor.c:1848
+#: ../libsvn_wc/update_editor.c:1846
#, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -6538,7 +6633,7 @@ msgstr ""
"bereits zur Übertragung mit Historie eingeplant"
# CHECKME: demselb... oder dem selb...
-#: ../libsvn_wc/update_editor.c:1860
+#: ../libsvn_wc/update_editor.c:1858
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
@@ -6546,46 +6641,46 @@ msgstr ""
"Konnte die Datei %s nicht hinzufügen: ein nicht-Dateiobjekt mit demselben\n"
"Namen existiert bereits"
-#: ../libsvn_wc/update_editor.c:1875
+#: ../libsvn_wc/update_editor.c:1873
#, c-format
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"
-#: ../libsvn_wc/update_editor.c:1933
+#: ../libsvn_wc/update_editor.c:1931
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Datei %s im Verzeichnis %s ist keine versionierte Ressource"
-#: ../libsvn_wc/update_editor.c:2087
+#: ../libsvn_wc/update_editor.c:2085
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Prüfsummenfehler für %s ; erwartet: %s , tatsächlich: %s "
-#: ../libsvn_wc/update_editor.c:2825
+#: ../libsvn_wc/update_editor.c:2823
msgid "Destination directory of add-with-history is missing a URL"
msgstr "Dem Zielverzeichnis von add-with-history fehlt eine URL"
-#: ../libsvn_wc/update_editor.c:2840
+#: ../libsvn_wc/update_editor.c:2838
msgid "Destination URLs are broken"
msgstr "Ziel-URLs sind kaputt"
-#: ../libsvn_wc/update_editor.c:3097
+#: ../libsvn_wc/update_editor.c:3095
msgid "No fetch_func supplied to update_editor"
msgstr "Keine Angabe von fetch_func für update_editor"
-#: ../libsvn_wc/update_editor.c:3338
+#: ../libsvn_wc/update_editor.c:3336
#, c-format
msgid "Shallowing of working copy depths is not yet supported"
msgstr "Das Verringern der Arbeitskopietiefen wird nicht unterstützt"
-#: ../libsvn_wc/update_editor.c:3739
+#: ../libsvn_wc/update_editor.c:3737
#, c-format
msgid "'%s' has no ancestry information"
msgstr " %s hat keine Informationen über seine Vorgänger"
-#: ../libsvn_wc/update_editor.c:3893
+#: ../libsvn_wc/update_editor.c:3891
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Die Quell-URL %s hat eine andere Projektarchiv-Basis als %s "
@@ -6623,6 +6718,18 @@ msgstr "Überspringe Binärdatei: %s
msgid "'%s' does not appear to be a URL"
msgstr " %s scheint keine URL zu sein"
+#: ../svn/conflict-callbacks.c:143
+msgid "||||||| ORIGINAL"
+msgstr "||||||| ORIGINAL"
+
+#: ../svn/conflict-callbacks.c:144
+msgid "<<<<<<< MINE (select with 'mc')"
+msgstr "<<<<<<< EIGENE (Auswahl mit mc )"
+
+#: ../svn/conflict-callbacks.c:145
+msgid ">>>>>>> THEIRS (select with 'tc')"
+msgstr ">>>>>>> FREMDE (Auswahl mit tc )"
+
#: ../svn/conflict-callbacks.c:170
msgid "No editor found."
msgstr "Kein Editor gefunden."
@@ -6649,22 +6756,21 @@ msgid "Error running merge tool."
msgstr "Fehler beim Ausführen des Zusammenführungsprogramms."
#: ../svn/conflict-callbacks.c:286
-msgid "No editor found, leaving all conflicts."
-msgstr "Kein Editor gefunden, behalte alle Konflikte bei."
+msgid "No editor found; leaving all conflicts."
+msgstr "Kein Editor gefunden; behalte alle Konflikte bei."
#: ../svn/conflict-callbacks.c:295
-msgid "Error running editor, leaving all conflicts."
-msgstr "Fehler beim Ausführen des Editors, behalte alle Konflikte bei."
+msgid "Error running editor; leaving all conflicts."
+msgstr "Fehler beim Ausführen des Editors; behalte alle Konflikte bei."
#: ../svn/conflict-callbacks.c:327
-msgid "No merge tool found, leaving all conflicts."
-msgstr "Kein Programm zum Zusammenführen gefunden, behalte alle Konflikte bei."
+msgid "No merge tool found; leaving all conflicts."
+msgstr "Kein Programm zum Zusammenführen gefunden; behalte alle Konflikte bei."
-# FIXME: Comma!
#: ../svn/conflict-callbacks.c:336
-msgid "Error running merge tool leaving all conflicts."
+msgid "Error running merge tool; leaving all conflicts."
msgstr ""
-"Fehler beim Ausführen des Zusammenführungsprogramms, behalte alle Konflikte "
+"Fehler beim Ausführen des Zusammenführungsprogramms; behalte alle Konflikte "
"bei."
# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf)
@@ -6695,6 +6801,7 @@ 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!
#: ../svn/conflict-callbacks.c:430
msgid "Select: (p) postpone"
msgstr "Auswahl: (p) zurückstellen"
@@ -6712,20 +6819,23 @@ msgid ""
",\n"
" (mc) mine-conflict, (tc) theirs-conflict"
msgstr ""
+",\n"
+" (mc) eigene konfliktbehaftete Datei, (tc) fremde konfliktbehaftete "
+"Datei"
#: ../svn/conflict-callbacks.c:455
msgid ""
",\n"
" (mf) mine-full, (tf) theirs-full"
msgstr ""
+",\n"
+" (mf) volle eigene Datei, (tf) volle fremde Datei"
#: ../svn/conflict-callbacks.c:462
-#, fuzzy
msgid "(s) show all options: "
-msgstr ""
-"\n"
-"Gültige Optionen:\n"
+msgstr " (s) alle Optionen anzeigen: "
+# CHECKME: translate mine-conflict, ... or not (sometimes used as option!)?
#: ../svn/conflict-callbacks.c:470
#, c-format
msgid ""
@@ -6747,13 +6857,33 @@ msgid ""
" (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"
+# CHECKME: proper English?
#: ../svn/conflict-callbacks.c:505 ../svn/conflict-callbacks.c:529
#, c-format
msgid ""
"Invalid option; cannot choose based on conflicts in a binary file.\n"
"\n"
msgstr ""
+"Ungültige Option; Auswahl anhand von Konflikten ist in einer Binärdatei nicht \
möglich.\n" +"\n"
#: ../svn/conflict-callbacks.c:513 ../svn/conflict-callbacks.c:537
#, c-format
@@ -6761,13 +6891,18 @@ 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: "for binary files" for consistency with "for properties"
#: ../svn/conflict-callbacks.c:566
#, c-format
msgid ""
"Invalid option; cannot display conflicts for a binary file.\n"
"\n"
msgstr ""
+"Ungültige Option; Anzeige von Konflikten ist für Binärdateien nicht möglich.\n"
+"\n"
#: ../svn/conflict-callbacks.c:574
#, c-format
@@ -6775,6 +6910,8 @@ msgid ""
"Invalid option; cannot display conflicts for properties.\n"
"\n"
msgstr ""
+"Ungültige Option; Anzeige von Konflikten ist für Eigenschaften nicht möglich.\n"
+"\n"
#: ../svn/conflict-callbacks.c:582
#, c-format
@@ -6782,6 +6919,8 @@ msgid ""
"Invalid option; original files not available.\n"
"\n"
msgstr ""
+"Ungültige Option; Originaldateien nicht verfügbar.\n"
+"\n"
#: ../svn/conflict-callbacks.c:594
#, c-format
@@ -6826,6 +6965,13 @@ msgid ""
" (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"
#: ../svn/copy-cmd.c:126 ../svn/delete-cmd.c:65 ../svn/mkdir-cmd.c:66
#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:215
@@ -6858,7 +7004,7 @@ msgstr "Option --new ist nur in Verb
#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr ""
-"Ziellisten für Vergleich dürfen nicht gleichzeitig Arbeitskopien und URLs "
+"Ziellisten für Vergleiche dürfen nicht gleichzeitig Arbeitskopien und URLs "
"enthalten"
#: ../svn/export-cmd.c:88
@@ -6906,7 +7052,7 @@ msgstr ""
"Subversion ist ein Programm zur Versionskontrolle.\n"
"Für weitere Informationen, siehe: http://subversion.tigris.org/\n"
-#: ../svn/help-cmd.c:65 ../svnsync/main.c:1811
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1818
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -7194,41 +7340,42 @@ msgstr "Nach einer URL können nur relat
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "Kann nicht mit Option with-revprop zuweisen ( = entfernen)"
-#: ../svn/main.c:113
+#: ../svn/main.c:114
msgid "force operation to run"
msgstr "Durchführung des Befehls erzwingen"
-#: ../svn/main.c:115
+#: ../svn/main.c:116
msgid "force validity of log message source"
msgstr "Gültigkeit der Quelle für die Logmeldung erzwingen"
-#: ../svn/main.c:116 ../svn/main.c:117 ../svnadmin/main.c:233
-#: ../svnadmin/main.c:236 ../svndumpfilter/main.c:876
-#: ../svndumpfilter/main.c:879 ../svnlook/main.c:92 ../svnlook/main.c:104
-#: ../svnsync/main.c:138 ../svnsync/main.c:140
+#: ../svn/main.c:117 ../svn/main.c:118 ../svnadmin/main.c:233
+#: ../svnadmin/main.c:236 ../svndumpfilter/main.c:877
+#: ../svndumpfilter/main.c:880 ../svnlook/main.c:96 ../svnlook/main.c:108
+#: ../svnsync/main.c:144 ../svnsync/main.c:146
msgid "show help on a subcommand"
msgstr "zeige Hilfe zu einem Unterbefehl"
-#: ../svn/main.c:118
+#: ../svn/main.c:119
msgid "specify log message ARG"
msgstr "PAR als Logmeldung verwenden"
-#: ../svn/main.c:119
+#: ../svn/main.c:120
msgid "print nothing, or only summary information"
msgstr "nichts oder nur Zusammenfassungen ausgeben"
-#: ../svn/main.c:120
+#: ../svn/main.c:121
msgid "descend recursively, same as --depth=infinity"
-msgstr "rekursiv absteigen, das gleiche wie\n"
+msgstr ""
+"rekursiv absteigen, das gleiche wie\n"
" --depth=infinity"
-#: ../svn/main.c:121
+#: ../svn/main.c:122
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr ""
"veraltet; versuchen Sie --depth=files oder\n"
" --depth=immediates"
-#: ../svn/main.c:123
+#: ../svn/main.c:124
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -7237,7 +7384,7 @@ msgstr ""
" -r PAR-1:PAR). Falls PAR negativ ist,\n"
" gleichbedeutend zu -r PAR:PAR-1"
-#: ../svn/main.c:127
+#: ../svn/main.c:128
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -7261,43 +7408,43 @@ msgstr ""
" oder vor BASE\n"
" PREV letzte Revision vor COMMITTED"
-#: ../svn/main.c:137
+#: ../svn/main.c:138
msgid "read log message from file ARG"
msgstr "Logmeldung aus Datei PAR lesen"
-#: ../svn/main.c:139
+#: ../svn/main.c:140
msgid "give output suitable for concatenation"
msgstr "Ausgabe für Verkettung formatieren"
-#: ../svn/main.c:142
+#: ../svn/main.c:143
msgid "treat value as being in charset encoding ARG"
-msgstr "Wert behandeln, als sei er in der Zeichenkodierung\n"
+msgstr ""
+"Wert behandeln, als sei er in der Zeichenkodierung\n"
" PAR"
-#: ../svn/main.c:144 ../svnadmin/main.c:239 ../svndumpfilter/main.c:882
-#: ../svnlook/main.c:134 ../svnserve/main.c:204 ../svnsync/main.c:136
+#: ../svn/main.c:145 ../svnadmin/main.c:239 ../svndumpfilter/main.c:883
+#: ../svnlook/main.c:138 ../svnserve/main.c:204 ../svnsync/main.c:142
#: ../svnversion/main.c:127
msgid "show program version information"
msgstr "Zeige Versionsinformationen des Programms"
-#: ../svn/main.c:145
+#: ../svn/main.c:146
msgid "print extra information"
msgstr "zusätzliche Informationen ausgeben"
-#: ../svn/main.c:146
+#: ../svn/main.c:147
msgid "display update information"
msgstr "Aktualisierungsinformation ausgeben"
-#: ../svn/main.c:147
+#: ../svn/main.c:148
msgid "specify a username ARG"
msgstr "Benutzername PAR angeben"
-#: ../svn/main.c:148
+#: ../svn/main.c:149
msgid "specify a password ARG"
msgstr "Passwort PAR angeben"
-# FIXME: Missing full stop in "Ignore changes in EOL style"
-#: ../svn/main.c:151
+#: ../svn/main.c:152
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed "
@@ -7316,7 +7463,7 @@ msgid ""
" -w (--ignore-all-space):\n"
" Ignore all white space.\n"
" --ignore-eol-style:\n"
-" Ignore changes in EOL style\n"
+" Ignore changes in EOL style.\n"
" -p (--show-c-function):\n"
" Show C function name in diff output."
msgstr ""
@@ -7340,13 +7487,13 @@ msgstr ""
" -p (--show-c-function):\n"
" Zeigt C-Funktionsname in Diff-Ausgabe."
-#: ../svn/main.c:184
+#: ../svn/main.c:185
msgid "pass contents of file ARG as additional args"
msgstr ""
"Inhalt der Datei PAR als zusätzliche Parameter\n"
" übergeben"
-#: ../svn/main.c:186
+#: ../svn/main.c:187
msgid ""
"limit operation by depth ARG ('empty', 'files',\n"
" 'immediates', or 'infinity')"
@@ -7354,7 +7501,7 @@ msgstr ""
"begrenzt Operation durch Tiefe PAR ( empty ,\n"
" files , immediates oder infinity )"
-#: ../svn/main.c:190
+#: ../svn/main.c:191
msgid ""
"set new working copy depth to ARG ('empty',\n"
" 'files', 'immediates', or 'infinity')"
@@ -7362,102 +7509,113 @@ msgstr ""
"setzt neue Tiefe der Arbeitskopie auf PAR ( empty ,\n"
" files , immediates oder infinity )"
-#: ../svn/main.c:193
+#: ../svn/main.c:194 ../svnlook/main.c:141
msgid "output in XML"
msgstr "Ausgabe in XML"
-#: ../svn/main.c:194
+#: ../svn/main.c:195
msgid "use strict semantics"
msgstr "Strikte Semantik anwenden"
-#: ../svn/main.c:196
+#: ../svn/main.c:197
msgid "do not cross copies while traversing history"
msgstr "Log-Ausgabe endet bei Kopieroperationen"
-#: ../svn/main.c:198
+#: ../svn/main.c:199
msgid "disregard default and svn:ignore property ignores"
-msgstr "globale ignore - und svn:ignore -Einstellungen\n"
+msgstr ""
+"globale ignore - und svn:ignore -Einstellungen\n"
" nicht beachten"
-#: ../svn/main.c:200 ../svnsync/main.c:116
+#: ../svn/main.c:201 ../svnsync/main.c:118
msgid "do not cache authentication tokens"
msgstr "Anmeldeinformationen nicht zwischenspeichern"
-#: ../svn/main.c:202 ../svnsync/main.c:114
+#: ../svn/main.c:203 ../svnsync/main.c:128
+msgid ""
+"accept unknown SSL server certificates without\n"
+" prompting (but only with '--non-interactive')"
+msgstr ""
+"akzeptiere unbekannte SSL-Server-Zertifikate ohne\n"
+" Nachfrage (aber nur mit --non-interactive )"
+
+#: ../svn/main.c:207 ../svnsync/main.c:116
msgid "do no interactive prompting"
msgstr "keine interaktiven Rückfragen ausgeben"
-#: ../svn/main.c:204
+#: ../svn/main.c:209
msgid "try operation but make no changes"
msgstr "Operation testen, aber keine Änderungen durchführen"
-#: ../svn/main.c:206 ../svnlook/main.c:113
+#: ../svn/main.c:211 ../svnlook/main.c:117
msgid "do not print differences for deleted files"
msgstr "keine Unterschiede für gelöschte Dateien ausgeben"
-#: ../svn/main.c:208
+#: ../svn/main.c:213
msgid "notice ancestry when calculating differences"
-msgstr "beim Berechnen von Differenzen Vorgänger\n"
+msgstr ""
+"beim Berechnen von Differenzen Vorgänger\n"
" berücksichtigen"
-#: ../svn/main.c:210
+#: ../svn/main.c:215
msgid "ignore ancestry when calculating merges"
msgstr "beim Zusammenführen Vorgänger ignorieren"
-#: ../svn/main.c:212
+#: ../svn/main.c:217
msgid "ignore externals definitions"
msgstr " svn:externals -Definitionen ignorieren"
-#: ../svn/main.c:214
+#: ../svn/main.c:219
msgid "use ARG as diff command"
msgstr "PAR als Vergleichsprogramm verwenden"
-#: ../svn/main.c:215
+#: ../svn/main.c:220
msgid "use ARG as merge command"
msgstr "PAR als Konflikteditor verwenden"
-#: ../svn/main.c:216
+#: ../svn/main.c:221
msgid "use ARG as external editor"
msgstr "PAR als externen Editor verwenden"
-#: ../svn/main.c:219
+#: ../svn/main.c:224
msgid "mark revisions as merged (use with -r)"
msgstr ""
"Revisionen als zusammengeführt markieren (mit -r\n"
" verwenden)"
-#: ../svn/main.c:220
+#: ../svn/main.c:225
msgid "use ARG as the older target"
msgstr "PAR als älteres Ziel verwenden"
-#: ../svn/main.c:221
+#: ../svn/main.c:226
msgid "use ARG as the newer target"
msgstr "PAR als neueres Ziel verwenden"
-#: ../svn/main.c:223
+#: ../svn/main.c:228
msgid "operate on a revision property (use with -r)"
-msgstr "auf einer Revisionseigenschaft arbeiten (mit -r\n"
+msgstr ""
+"auf einer Revisionseigenschaft arbeiten (mit -r\n"
" verwenden)"
-#: ../svn/main.c:224
+#: ../svn/main.c:229
msgid "relocate via URL-rewriting"
msgstr "durch Umschreiben der URL umplatzieren"
-#: ../svn/main.c:226 ../svnadmin/main.c:275 ../svnsync/main.c:134
+#: ../svn/main.c:231 ../svnadmin/main.c:275 ../svnsync/main.c:140
msgid "read user configuration files from directory ARG"
msgstr ""
"Benutzerkonfigurationsdateien aus dem Verzeichnis\n"
" PAR lesen"
-#: ../svn/main.c:227
+#: ../svn/main.c:232
msgid "enable automatic properties"
msgstr "automatische Eigenschaften einschalten"
-#: ../svn/main.c:228
+#: ../svn/main.c:233
msgid "disable automatic properties"
msgstr "automatische Eigenschaften ausschalten"
-#: ../svn/main.c:230
+#: ../svn/main.c:235
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -7469,24 +7627,24 @@ msgstr ""
" svn:eol-style native .\n"
" PAR kann LF , CR oder CRLF sein."
-#: ../svn/main.c:237
+#: ../svn/main.c:242
msgid "maximum number of log entries"
msgstr "maximale Anzahl Logeinträge"
-#: ../svn/main.c:238
+#: ../svn/main.c:243
msgid "don't unlock the targets"
msgstr "Ziele nicht freigeben"
-#: ../svn/main.c:239
+#: ../svn/main.c:244
msgid "show a summary of the results"
msgstr "Zeige eine Zusammenfassung der Ergebnisse"
# CHECKME
-#: ../svn/main.c:240
+#: ../svn/main.c:245
msgid "remove changelist association"
msgstr "Bezug zur Änderungsliste entfernen"
-#: ../svn/main.c:242
+#: ../svn/main.c:247
msgid ""
"operate only on members of changelist ARG\n"
" [aliases: --cl]"
@@ -7494,19 +7652,19 @@ msgstr ""
"nur auf Elementen der Änderungsliste PAR operieren\n"
" [äquivalent: --cl]"
-#: ../svn/main.c:246
+#: ../svn/main.c:251
msgid "don't delete changelists after commit"
msgstr "Änderungslisten nach Übertragung nicht löschen"
-#: ../svn/main.c:247
+#: ../svn/main.c:252
msgid "keep path in working copy"
msgstr "Pfad in Arbeitskopie beibehalten"
-#: ../svn/main.c:249
+#: ../svn/main.c:254
msgid "retrieve all revision properties"
msgstr "alle Revisionseigenschaften abfragen"
-#: ../svn/main.c:251
+#: ../svn/main.c:256
msgid ""
"set revision property ARG in new revision\n"
" using the name[=value] format"
@@ -7514,41 +7672,45 @@ msgstr ""
"Revisionseigenschaft PAR in neuer Revision\n"
" unter Verwendung des Formats name[=Wert] setzen"
-#: ../svn/main.c:254
+#: ../svn/main.c:259
msgid "make intermediate directories"
msgstr "Zwischenverzeichnisse erzeugen"
-#: ../svn/main.c:256
+#: ../svn/main.c:261
msgid ""
"use/display additional information from merge\n"
" history"
msgstr ""
-"verwende/zeige zusätzliche Informationen aus\n"
+"verwende/zeige zusätzliche Informationen aus der\n"
" Zusammenführungsgeschichte an"
-#: ../svn/main.c:260
+#: ../svn/main.c:265
msgid ""
"specify automatic conflict resolution action\n"
-" ('"
+" ('postpone', 'base', 'mine-conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full',\n"
+" 'edit', 'launch')"
msgstr ""
"automatische Konfliktauflösungsaktion angeben\n"
-" ( "
+" ( postpone , base , mine-conflict ,\n"
+" theirs-conflict , mine-full , theirs-full \
,\n" +" edit , launch )"
#: ../svn/main.c:273
msgid ""
"specify which collection of revisions to display\n"
-" ('"
+" ('merged', 'eligible')"
msgstr ""
"anzuzeigende Revisionen angeben\n"
-" ( "
+" ( merged , eligible )"
-#: ../svn/main.c:278
+#: ../svn/main.c:277
msgid "lump-merge all of source URL's unmerged changes"
msgstr ""
"komplettes Rückführen aller nicht zusammengeführten\n"
" Änderungen der Quell-URL"
-#: ../svn/main.c:325
+#: ../svn/main.c:324
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -7559,11 +7721,11 @@ msgstr ""
"Das tatsächliche Hinzufügen findet erst beim nächsten Übertragen statt.\n"
"Aufruf: add PFAD...\n"
-#: ../svn/main.c:330
+#: ../svn/main.c:329
msgid "add intermediate parents"
msgstr "direkte Eltern hinzufügen"
-#: ../svn/main.c:333
+#: ../svn/main.c:332
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -7579,7 +7741,7 @@ msgstr ""
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut "
"wird.\n"
-#: ../svn/main.c:342
+#: ../svn/main.c:341
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -7593,7 +7755,7 @@ msgstr ""
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut "
"wird.\n"
-#: ../svn/main.c:350
+#: ../svn/main.c:349
msgid ""
"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME TARGET...\n"
@@ -7601,10 +7763,10 @@ msgid ""
msgstr ""
"Verknüpft Änderungsliste CLNAME (oder löst diese Verknüpfung)\n"
"mit den angegebenen Dateien.\n"
-"Verwendung: 1. changelist CLNAME ZIEL...\n"
-" 2. changelist --remove ZIEL...\n"
+"Aufruf: 1. changelist CLNAME ZIEL...\n"
+" 2. changelist --remove ZIEL...\n"
-#: ../svn/main.c:356
+#: ../svn/main.c:355
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -7627,6 +7789,9 @@ msgid ""
" 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 ""
"Checkt eine Arbeitskopie aus einem Projektarchiv aus.\n"
"Aufruf: checkout URL[@REV]... [PFAD]\n"
@@ -7648,8 +7813,11 @@ msgstr ""
" werden können. Bei Dateien werden alle Unterschiede im Inhalt wie lokale\n"
" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n"
" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n"
+"\n"
+" Siehe auch svn help update für eine Liste möglicher Buchstaben,\n"
+" die die durchgeführte Aktion beschreiben.\n"
-#: ../svn/main.c:380
+#: ../svn/main.c:382
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -7659,7 +7827,7 @@ msgstr ""
"nimmt unvollständige Operationen wieder auf, usw.\n"
"Aufruf: cleanup [PFAD...]\n"
-#: ../svn/main.c:387
+#: ../svn/main.c:389
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -7679,7 +7847,7 @@ msgstr ""
"diese\n"
" nach einer erfolgreichen Übertragung entsperrt.\n"
-#: ../svn/main.c:395
+#: ../svn/main.c:397
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -7699,7 +7867,7 @@ msgstr ""
" gesperrte Objekte enthalten, werden diese nach einer erfolgreichen\n"
" Übertragung entsperrt.\n"
-#: ../svn/main.c:408
+#: ../svn/main.c:410
msgid ""
"Duplicate something in working copy or repository, remembering\n"
"history.\n"
@@ -7745,7 +7913,7 @@ msgstr ""
"standardmäßig nicht in der Lage sein, Zusammenführungsinformationen\n"
"von der Quelle der Kopie in das Ziel weiterzureichen.\n"
-#: ../svn/main.c:430
+#: ../svn/main.c:432
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -7777,7 +7945,7 @@ msgstr ""
" 2. Jede URL wird mittels einer sofortigen Übertragung aus dem\n"
" Projektarchiv entfernt.\n"
-#: ../svn/main.c:446
+#: ../svn/main.c:448
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -7840,7 +8008,7 @@ msgstr ""
"Arbeitskopie\n"
" anzuzeigen.\n"
-#: ../svn/main.c:474
+#: ../svn/main.c:476
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -7879,7 +8047,7 @@ msgstr ""
"\n"
" BASREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n"
-#: ../svn/main.c:495
+#: ../svn/main.c:497
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -7887,7 +8055,7 @@ msgstr ""
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
"Aufruf: help [UNTERBEFEHL...]\n"
-#: ../svn/main.c:501
+#: ../svn/main.c:503
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -7914,13 +8082,12 @@ msgstr ""
"ignoriert,\n"
" falls --force angegeben wird.\n"
-# FIXME: missing . after "(default: '.')" ??
-#: ../svn/main.c:515
+#: ../svn/main.c:517
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
"\n"
-" Print information about each TARGET (default: '.')\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 ""
@@ -7936,7 +8103,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/main.c:525
+#: ../svn/main.c:527
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -7976,7 +8143,7 @@ msgstr ""
" Größe (in Bytes)\n"
" Datum und Zeit der letzten Übertragung\n"
-#: ../svn/main.c:546
+#: ../svn/main.c:548
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -7990,22 +8157,23 @@ msgstr ""
"\n"
" Benutze --force, um eine bereits vorhandene Sperre zu stehlen.\n"
-#: ../svn/main.c:552
+#: ../svn/main.c:554
msgid "read lock comment from file ARG"
msgstr "Sperrkommentar aus Datei PAR lesen"
-#: ../svn/main.c:553
+#: ../svn/main.c:555
msgid "specify lock comment ARG"
msgstr "PAR als Sperrkommentar verwenden"
-#: ../svn/main.c:554
+#: ../svn/main.c:556
msgid "force validity of lock comment source"
-msgstr "Gültigkeit der Quelle für die Sperrmeldung\n"
+msgstr ""
+"Gültigkeit der Quelle für die Sperrmeldung\n"
" erzwingen"
# FIXME: behaviour oder behavior?
# www.example.com is a reserved URL, let's not translate it.
-#: ../svn/main.c:557
+#: ../svn/main.c:559
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -8066,16 +8234,16 @@ msgstr ""
" svn log http://www.example.com/repo/projekt/foo.c\n"
" svn log http://www.example.com/repo/projekt foo.c bar.c\n"
-#: ../svn/main.c:586
+#: ../svn/main.c:588
msgid "retrieve revision property ARG"
msgstr "Revisionseigenschaft PAR abfragen"
-#: ../svn/main.c:587
-msgid "the change made by ARG"
-msgstr "die von PAR durchgeführte Änderung"
+#: ../svn/main.c:589
+msgid "the change made in revision ARG"
+msgstr "die in Revision PAR durchgeführte Änderung"
# FIXME: WCPATH oder WC_PATH?
-#: ../svn/main.c:590
+#: ../svn/main.c:592
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -8151,19 +8319,28 @@ msgstr ""
" dazu, die Quellen als nicht zueinander bezogen zu betrachten und die\n"
" Zusammenführung nicht aufzuzeichnen.\n"
-#: ../svn/main.c:628
+#: ../svn/main.c:630
msgid ""
"Display merge-related information.\n"
-"usage: mergeinfo SOURCE-URL[@REV] [TARGET[@REV]]\n"
+"usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
"\n"
" Display information related to merges (or potential merges) between\n"
-" SOURCE-URL and TARGET (default: '.'). If the --show-revs option\n"
+" SOURCE and TARGET (default: '.'). If the --show-revs option\n"
" is not provided, display revisions which have been merged from\n"
-" SOURCE-URL to TARGET; otherwise, display the type of information\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"
-#: ../svn/main.c:639
+#: ../svn/main.c:641
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -8196,7 +8373,7 @@ msgstr ""
" In beiden Fällen müssen alle Zwischenverzeichnisse bereits existieren,\n"
" es sei denn, die Option --parents wurde angegeben.\n"
-#: ../svn/main.c:656
+#: ../svn/main.c:658
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -8227,7 +8404,7 @@ msgstr ""
" URL -> URL: Vollständig serverseitiges Verschieben.\n"
" Alle QUELLEn müssen vom selben Typ sein.\n"
-#: ../svn/main.c:672
+#: ../svn/main.c:674
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -8247,7 +8424,7 @@ msgstr ""
# FIXME: s/prop/properties/
# "on repos revision"?
-#: ../svn/main.c:683
+#: ../svn/main.c:685
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -8257,7 +8434,7 @@ msgid ""
" 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 property setting.\n"
+"See 'svn help propset' for more on setting properties.\n"
msgstr ""
"Ändert eine Eigenschaft mit einem externen Editor.\n"
"Aufruf: 1. propedit PROPNAME ZIEL...\n"
@@ -8271,7 +8448,7 @@ msgstr ""
"\n"
"Siehe svn help propset für Weiteres zum Setzen von Eigenschaften.\n"
-#: ../svn/main.c:696
+#: ../svn/main.c:698
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -8306,7 +8483,7 @@ msgstr ""
"Formatierungen\n"
" abzuschalten (z.B. um Binäreigenschaften in Dateien umzuleiten).\n"
-#: ../svn/main.c:714
+#: ../svn/main.c:716
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -8328,16 +8505,15 @@ msgstr ""
" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n"
# FIXME: propchange?
-#: ../svn/main.c:725
-#, fuzzy
+#: ../svn/main.c:727
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. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-" TARGET only determines which repository to access.\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"
@@ -8398,18 +8574,19 @@ msgstr ""
"Aufruf: 1. propset PROPNAME PROPWERT PFAD...\n"
" 2. propset PROPNAME --revprop -r REV PROPWERT [ZIEL]\n"
"\n"
-" 1. Erstellt eine versionierte, lokale Eigenschaft in der Arbeitskopie.\n"
-" 2. Erstellt eine nicht versionierte Eigenschaft in einer Revision des\n"
-" Projektarchivs.\n"
-" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n"
+" 1. Ändert eine versionierte Datei- oder Verzeichniseigenschaft in der\n"
+" Arbeitskopie.\n"
+" 2. Ändert eine nicht versionierte Eigenschaft in einer Revision des\n"
+" Projektarchivs. (ZIEL legt nur das Projektarchiv fest, auf das\n"
+" zugegriffen wird.)\n"
"\n"
" Der Wert kann mit der Option --file statt PROPWERT angegeben werden.\n"
"\n"
" Hinweis: svn erkennt die folgenden speziellen, versionierten "
"Eigenschaften,\n"
-" wird aber jede gewünschte Eigenschaft speichern:\n"
+" wird aber jede gesetzte Eigenschaft speichern:\n"
" svn:ignore - Eine durch Zeilenumbruch getrennte Liste von zu\n"
-" ignorierenden Dateimustern.\n"
+" ignorierenden glob -Dateimustern.\n"
" svn:keywords - Schlüsselworte, die expandiert werden sollen.\n"
" Gültige Schlüsselworte sind:\n"
" URL, HeadURL - Die URL für die Head-Version des Objektes.\n"
@@ -8421,7 +8598,8 @@ msgstr ""
" Id - Eine komprimierte Zusammenfassung der vier\n"
" genannten Schlüsselworte.\n"
" svn:executable - Falls vorhanden, wird die Datei ausführbar gemacht.\n"
-" svn:eol-style - Einer von 'native', LF , CR , CRLF .\n"
+" Verwenden Sie svn propdel svn:executable PFAD... zum Entfernen.\n"
+" svn:eol-style - Eins aus native , LF , CR , CRLF .\n"
" svn:mime-type - Der MIME-Typ der Datei. Verwendet, um festzustellen, "
"ob\n"
" die Datei zusammengeführt werden kann und wie sie von Apache "
@@ -8431,46 +8609,65 @@ msgstr ""
"angesehen.\n"
" svn:externals - Eine durch Zeilenumbruch getrennte Liste von\n"
" Modulnamen, die jeder aus einem relativen Verzeichnispfad, optionalen\n"
-" Revisionsmarkern und einer URL bestehen. Zum Beispiel:\n"
-" foo http://beispiel.org/repos/zig\n"
-" foo/bar -r 1234 http://beispiel.org/repos/zag\n"
+" Revisionsmarkern und einer URL bestehen. Die Reihenfolge der drei\n"
+" Elemente führt zu verschiedenem Verhalten. Subversion 1.4 und älter\n"
+" unterstützt nur die folgenden Formate und die URLs können keine\n"
+" Peg-Revisionen haben:\n"
+" foo http://example.org/repos/zig\n"
+" foo/bar -r 1234 http://example.org/repos/zag\n"
+" Subversion 1.5 und neuer unterstützt die obigen Formate und die\n"
+" folgenden, wobei die URLs Peg-Revisionen enthalten dürfen:\n"
+" http://example.com/repos/zig foo\n"
+" -r 1234 http://example.com/repos/zig foo/bar\n"
+" Relative URLs werden in Subversion 1.5 und neuer für alle obigen\n"
+" Formate unterstützt und werden durch eine URL gekennzeichnet, die\n"
+" mit einem der folgenden Zeichenketten startet und\n"
+" ../ auf das übergeordnete Verzeichnis des extrahierten Externals\n"
+" ^/ auf die Wurzel des Projektarchivs\n"
+" // auf das Schema\n"
+" / auf die Wurzel des Servers\n"
+" verweist.\n"
+" Das mehrdeutige Format relativer_Pfad relativer_Pfad wird als\n"
+" relative_URL relativer_Pfad mit Peg-Revisionsunterstützung gedeutet.\n"
" svn:needs-lock - Wenn vorhanden, soll die Datei gesperrt werden, bevor "
"sie\n"
" verändert wird. Setzt den Schreibschutz der Arbeitsdatei, wenn sie "
"nicht\n"
-" gesperrt ist.\n"
-" Die Eigenschaften svn:keywords, svn:executable, svn:eol-style, svn:mime-"
-"type\n"
+" gesperrt ist. Verwenden Sie svn propdel svn:needs-lock PFAD... zum\n"
+" Entfernen.\n"
+"\n"
+" Die Eigenschaften svn:keywords, svn:executable, svn:eol-style, svn:mime-type\n"
" und svn:needs-lock können nicht für Verzeichnisse gesetzt werden.\n"
-" Ein nicht-rekursiver Versuch wird scheitern, und ein rekursiver Versuch "
-"wird\n"
+" Ein nicht-rekursiver Versuch wird scheitern und ein rekursiver Versuch wird\n"
" die Eigenschaft nur für die Dateien in dem Verzeichnis setzen.\n"
-#: ../svn/main.c:785
+#: ../svn/main.c:787
msgid "read property value from file ARG"
msgstr "Lies Eigenschaftswert aus Datei PAR"
-#: ../svn/main.c:788
+#: ../svn/main.c:790
msgid ""
"Resolve conflicts on working copy files or directories.\n"
-"usage: resolve [PATH...]\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 [PFAD...]\n"
+"Aufruf: resolve --accept=PAR [PFAD...]\n"
"\n"
" Bemerkung: Die Option --accept wird zurzeit benötigt.\n"
-#: ../svn/main.c:793
+#: ../svn/main.c:795
msgid ""
"specify automatic conflict resolution source\n"
-" ('"
+" ('base', 'working', 'mine-conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full')"
msgstr ""
-"Angabe der Quelle für automatische Konfliktauflösung\n"
-" ( "
+"automatische Konfliktauflösungsaktion angeben\n"
+" ( base , working , mine-conflict ,\n"
+" theirs-conflict , mine-full , theirs-full )"
-#: ../svn/main.c:804
+#: ../svn/main.c:802
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -8486,11 +8683,12 @@ msgstr ""
"\n"
" Hinweis: Dieser Unterbefehl löst weder inhaltlich die Konflikte auf, noch\n"
" entfernt er Konfliktmarken. Er löscht hauptsächlich die zum Konflikt\n"
-" gehörenden Dateien und ermöglicht es somit, dass das Verzeichnis PFAD wieder\n"
+" gehörenden Dateien und ermöglicht es somit, dass das Verzeichnis PFAD "
+"wieder\n"
" übertragen werden kann. Dies wird zugunsten von svn resolve --accept\n"
" working missbilligt.\n"
-#: ../svn/main.c:814
+#: ../svn/main.c:812
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -8507,7 +8705,7 @@ msgstr ""
"wieder\n"
" herstellen.\n"
-#: ../svn/main.c:822
+#: ../svn/main.c:820
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -8603,7 +8801,8 @@ msgstr ""
" I Ignored - ignoriert\n"
" M Modified - verändert\n"
" R Replaced - ersetzt\n"
-" X Objekt ist nicht versioniert, wird aber von einem svn:externals -\n"
+" X Objekt ist nicht versioniert, wird aber von einem svn:"
+"externals -\n"
" Verweis verwendet\n"
" ? Objekt ist nicht unter Versionskontrolle\n"
" ! Objekt fehlt (durch nicht-svn-Befehl entfernt) oder unvollständig\n"
@@ -8665,14 +8864,14 @@ msgstr ""
" 965 687 joe wc/zig.c\n"
" Status gegenüber Revision: 981\n"
-#: ../svn/main.c:898
+#: ../svn/main.c:896
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL[@PEGREV] [PATH]\n"
" 2. switch --relocate FROM TO [PATH...]\n"
"\n"
" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\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"
@@ -8698,6 +8897,9 @@ msgid ""
" 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"
+" See also 'svn help update' for a list of possible characters\n"
+" reporting the action taken.\n"
msgstr ""
"Aktualisiert die Arbeitskopie auf eine andere URL.\n"
"Aufruf: 1. switch URL[@PEGREV] [PFAD]\n"
@@ -8738,8 +8940,11 @@ msgstr ""
"Hostnamenänderung),\n"
" während Ihre Arbeitskopie immer noch das selbe Verzeichnis im selben\n"
" Projektarchiv widerspiegelt.\n"
+"\n"
+" Siehe auch svn help update für eine Liste möglicher Buchstaben,\n"
+" die die durchgeführte Aktion beschreiben.\n"
-#: ../svn/main.c:932
+#: ../svn/main.c:933
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -8751,15 +8956,14 @@ msgstr ""
"\n"
" Benutzen Sie --force, um die Freigabe zu erzwingen.\n"
-# FIXME: s/If no revision given/If no revision is given/
# Parts of the text (--force and --set-depth) are shared with the
# switch help. Keep it consistent.
-#: ../svn/main.c:939
+#: ../svn/main.c:940
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
"\n"
-" If no revision given, bring working copy up-to-date with HEAD rev.\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 start with a character reporting the\n"
@@ -8842,43 +9046,43 @@ msgstr ""
"geschachtelt);\n"
" eine Verzeichnistiefe kann nicht reduziert werden.\n"
-#: ../svn/main.c:1019 ../svnadmin/main.c:78 ../svnlook/main.c:329
-#: ../svnsync/main.c:184
+#: ../svn/main.c:1020 ../svnadmin/main.c:78 ../svnlook/main.c:341
+#: ../svnsync/main.c:191
msgid "Caught signal"
msgstr "Abbruchsignal empfangen"
-#: ../svn/main.c:1142 ../svnlook/main.c:2083
+#: ../svn/main.c:1143 ../svnlook/main.c:2193
msgid "Non-numeric limit argument given"
msgstr "Nicht-numerische Bereichsgrenze angegeben"
-#: ../svn/main.c:1148 ../svnlook/main.c:2089
+#: ../svn/main.c:1149 ../svnlook/main.c:2199
msgid "Argument to --limit must be positive"
msgstr "Parameter für --limit muss positiv sein"
-#: ../svn/main.c:1172 ../svn/main.c:1413
+#: ../svn/main.c:1173 ../svn/main.c:1417
msgid "Can't specify -c with --old"
msgstr "-c kann nicht mit --old verwendet werden"
-#: ../svn/main.c:1191
+#: ../svn/main.c:1192
#, c-format
msgid "Non-numeric change argument (%s) given to -c"
msgstr "Nicht-numerischer Parameter (%s) an -c übergeben"
-#: ../svn/main.c:1199
+#: ../svn/main.c:1200
msgid "There is no change 0"
msgstr "Es gibt keine Änderung 0"
-#: ../svn/main.c:1234 ../svnadmin/main.c:1473
+#: ../svn/main.c:1235 ../svnadmin/main.c:1473
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfehler in Revisionsparameter %s "
-#: ../svn/main.c:1307 ../svn/main.c:1326
+#: ../svn/main.c:1308 ../svn/main.c:1327
#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Fehler beim Konvertieren der Tiefe aus Locale nach UTF-8"
-#: ../svn/main.c:1315 ../svn/main.c:1334
+#: ../svn/main.c:1316 ../svn/main.c:1335
#, c-format
msgid ""
"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
@@ -8886,33 +9090,33 @@ msgstr ""
" %s ist keine gültige Tiefe; versuchen Sie empty , files , immediates \
" "oder infinity "
-#: ../svn/main.c:1441
+#: ../svn/main.c:1445
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfehler im native-eol Parameter %s "
-#: ../svn/main.c:1487
+#: ../svn/main.c:1491
#, c-format
msgid "'%s' is not a valid --accept value"
msgstr " %s ist kein gültiger Wert für --accept"
-#: ../svn/main.c:1496
+#: ../svn/main.c:1500
#, c-format
msgid "'%s' is not a valid --show-revs value"
msgstr " %s ist kein gültiger Wert für --show-revs"
-#: ../svn/main.c:1558 ../svndumpfilter/main.c:1314 ../svnlook/main.c:2161
+#: ../svn/main.c:1562 ../svndumpfilter/main.c:1315 ../svnlook/main.c:2271
#, c-format
msgid "Subcommand argument required\n"
msgstr "Unterbefehl benötigt einen Parameter\n"
-#: ../svn/main.c:1577 ../svnadmin/main.c:1605 ../svndumpfilter/main.c:1333
-#: ../svnlook/main.c:2180
+#: ../svn/main.c:1581 ../svnadmin/main.c:1605 ../svndumpfilter/main.c:1334
+#: ../svnlook/main.c:2290
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Unbekannter Befehl: %s \n"
-#: ../svn/main.c:1611
+#: ../svn/main.c:1615
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8921,7 +9125,7 @@ msgstr ""
"Unterbefehl %s akzeptiert die Option %s nicht\n"
"Geben Sie svn help %s für Hilfe ein.\n"
-#: ../svn/main.c:1625
+#: ../svn/main.c:1629
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -8929,27 +9133,31 @@ msgstr ""
"Mehrere Revisionsparameter gefunden; bitte nicht zweimal -c oder "
"gleichzeitig -r und -c angeben"
-#: ../svn/main.c:1639
+#: ../svn/main.c:1643
msgid "-r and -c can't be used with --reintegrate"
msgstr "-r und -c können nicht mit --reintegrate verwendet werden"
-#: ../svn/main.c:1648
+#: ../svn/main.c:1652
msgid "--depth and --set-depth are mutually exclusive"
msgstr "--depth und --set-depth schließen sich gegenseitig aus"
-#: ../svn/main.c:1698
+#: ../svn/main.c:1661 ../svnsync/main.c:2001
+msgid "--trust-server-cert requires --non-interactive"
+msgstr "--trust-server-cert erfordert --non-interactive"
+
+#: ../svn/main.c:1711
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/main.c:1705
+#: ../svn/main.c:1718
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/main.c:1725
+#: ../svn/main.c:1738
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8957,7 +9165,7 @@ msgstr ""
"Die Logmeldung ist ein Pfad (war -F gemeint?); geben Sie --force-log an, "
"um sie zu verwenden"
-#: ../svn/main.c:1732
+#: ../svn/main.c:1745
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8965,38 +9173,38 @@ msgstr ""
"Der Sperrkommentar ist ein Pfad (war -F gemeint?); geben Sie --force-log "
"an, um ihn zu verwenden"
-#: ../svn/main.c:1743
+#: ../svn/main.c:1756
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate und --depth schließen sich gegenseitig aus"
-#: ../svn/main.c:1820
+#: ../svn/main.c:1833
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props und --no-auto-props schließen sich gegenseitig aus"
-#: ../svn/main.c:1834
+#: ../svn/main.c:1847
msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
msgstr ""
"--reintegrate kann nicht mit --ignore-ancestry oder --record-only verwendet "
"werden"
-#: ../svn/main.c:1842
+#: ../svn/main.c:1855
msgid "--reintegrate cannot be used with --ignore-ancestry"
msgstr "--reintegrate kann nicht mit --ignore-ancestry verwendet werden"
-#: ../svn/main.c:1850
+#: ../svn/main.c:1863
msgid "--reintegrate cannot be used with --record-only"
msgstr "--reintegrate kann nicht mit --record-only verwendet werden"
-#: ../svn/main.c:1963 ../svn/main.c:1969
+#: ../svn/main.c:1977 ../svn/main.c:1983
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s ist mit --non-interactive nicht kompatibel"
-#: ../svn/main.c:1996
+#: ../svn/main.c:2010
msgid "Try 'svn help' for more info"
msgstr "Versuchen Sie svn help für weitere Informationen"
-#: ../svn/main.c:2006
+#: ../svn/main.c:2020
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -9038,12 +9246,6 @@ msgstr "--force kann nicht mit --reinteg
msgid "Not enough arguments given"
msgstr "Nicht genügend Parameter angegeben"
-#: ../svn/mergeinfo-cmd.c:81 ../svnsync/main.c:700 ../svnsync/main.c:703
-#: ../svnsync/main.c:1630 ../svnsync/main.c:1780
-#, c-format
-msgid "Path '%s' is not a URL"
-msgstr "Pfad %s ist keine URL"
-
#: ../svn/mkdir-cmd.c:86
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Versuchen Sie svn add oder svn add --non-recursive ."
@@ -9076,7 +9278,7 @@ msgstr "Rückgängig gemacht: %s \n"
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr ""
-"Wiederherstellen von %s fehlgeschlagen -- Versuchen Sie statt dessen zu "
+"Wiederherstellen von %s schlug fehl -- Versuchen Sie statt dessen zu "
"aktualisieren.\n"
#: ../svn/notify.c:157
@@ -9205,7 +9407,7 @@ msgstr "Lösche %s\n"
msgid "Replacing %s\n"
msgstr "Ersetze %s\n"
-#: ../svn/notify.c:384 ../svnsync/main.c:909
+#: ../svn/notify.c:384 ../svnsync/main.c:916
#, c-format
msgid "Transmitting file data "
msgstr "Übertrage Daten "
@@ -9364,7 +9566,7 @@ msgstr "Eigenschaften zu %s :\n"
msgid "Unversioned properties on revision %ld:\n"
msgstr "Nicht versionierte Eigenschaft in Revision %ld:\n"
-#: ../svn/props.c:54
+#: ../svn/props.c:56
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -9372,15 +9574,15 @@ msgstr ""
"Die Revision muss als Zahl, Datum oder HEAD angegeben werden, wenn auf "
"eine Revisionseigenschaft zugegriffen wird"
-#: ../svn/props.c:61
+#: ../svn/props.c:63
msgid "Wrong number of targets specified"
msgstr "Falsche Anzahl Ziele angegeben"
-#: ../svn/props.c:70
+#: ../svn/props.c:72
msgid "Either a URL or versioned item is required"
msgstr "Eine URL oder ein versioniertes Objekt muss angegeben werden"
-#: ../svn/props.c:217
+#: ../svn/props.c:179
#, c-format
msgid ""
"To turn off the %s property, use 'svn propdel';\n"
@@ -9542,11 +9744,11 @@ msgstr "Ihre Logmeldung wurde in einer T
msgid "--This line, and those below, will be ignored--"
msgstr "-- Diese und die folgenden Zeilen werden ignoriert --"
-#: ../svn/util.c:660
+#: ../svn/util.c:669
msgid "Error normalizing log message to internal format"
msgstr "Fehler beim Normalisieren der Logmeldung ins interne Format"
-#: ../svn/util.c:675
+#: ../svn/util.c:679
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -9555,11 +9757,11 @@ msgstr ""
"OS400 nicht unterstützt. Verwenden Sie die Option --message (-m) oder --file "
"(-F)"
-#: ../svn/util.c:761
+#: ../svn/util.c:765
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "Kann den Editor für Logmeldungen nur im interaktiven Modus aufrufen"
-#: ../svn/util.c:774
+#: ../svn/util.c:778
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) "
@@ -9569,25 +9771,23 @@ msgstr ""
"Sie entweder die $SVN_EDITOR Umgebungsvariable oder verwenden Sie die --"
"message (-m) oder --file (-F) Optionen"
-# CHECKME: " :"?
-#: ../svn/util.c:810
+#: ../svn/util.c:814
msgid ""
"\n"
"Log message unchanged or not specified\n"
-"(a)bort, (c)ontinue, (e)dit :\n"
+"(a)bort, (c)ontinue, (e)dit:\n"
msgstr ""
"\n"
"Logmeldung unverändert oder nicht angegeben\n"
-"A)bbrechen, Weitermac)hen, E)ditieren :\n"
+"(A)bbrechen, Weiterma(c)hen, (E)ditieren:\n"
-#: ../svn/util.c:863
+#: ../svn/util.c:867
msgid "Use --force to override this restriction"
msgstr "Benutzen Sie --force , um diese Einschränkung aufzuheben"
-#: ../svn/util.c:1112
-#, fuzzy
+#: ../svn/util.c:1116
msgid "(invalid date)"
-msgstr "(kein Datum)"
+msgstr "(ungültiges Datum)"
#: ../svnadmin/main.c:95 ../svndumpfilter/main.c:66
#, c-format
@@ -9657,11 +9857,11 @@ msgstr ""
#: ../svnadmin/main.c:282
msgid "call pre-commit hook before committing revisions"
-msgstr "die pre-commit Aktion nach dem Übertragen von Revisionen aufrufen"
+msgstr "die Aktion pre-commit nach dem Übertragen von Revisionen aufrufen"
#: ../svnadmin/main.c:285
msgid "call post-commit hook after committing revisions"
-msgstr "die post-commit Aktion nach dem Übertragen von Revisionen aufrufen"
+msgstr "die Aktion post-commit nach dem Übertragen von Revisionen aufrufen"
#: ../svnadmin/main.c:288
msgid "call hook before changing revision property"
@@ -10020,7 +10220,7 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnadmin/main.c:717 ../svnlook/main.c:1759 ../svnserve/main.c:250
+#: ../svnadmin/main.c:717 ../svnlook/main.c:1865 ../svnserve/main.c:250
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -10093,22 +10293,22 @@ msgstr "Genau ein Eigenschaftsname und e
msgid "Exactly one file argument required"
msgstr "Genau ein Dateiparameter benötigt"
-#: ../svnadmin/main.c:1200 ../svnlook/main.c:1824
+#: ../svnadmin/main.c:1200 ../svnlook/main.c:1930
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID Marke: %s\n"
-#: ../svnadmin/main.c:1201 ../svnlook/main.c:1825
+#: ../svnadmin/main.c:1201 ../svnlook/main.c:1931
#, c-format
msgid "Owner: %s\n"
msgstr "Eigentümer: %s\n"
-#: ../svnadmin/main.c:1202 ../svnlook/main.c:1826
+#: ../svnadmin/main.c:1202 ../svnlook/main.c:1932
#, c-format
msgid "Created: %s\n"
msgstr "Erstellt: %s\n"
-#: ../svnadmin/main.c:1203 ../svnlook/main.c:1827
+#: ../svnadmin/main.c:1203 ../svnlook/main.c:1933
#, c-format
msgid "Expires: %s\n"
msgstr "Läuft ab: %s\n"
@@ -10210,73 +10410,73 @@ msgstr ""
msgid "Try 'svnadmin help' for more info"
msgstr "Geben Sie svnadmin help für weitere Hilfe ein"
-#: ../svndumpfilter/main.c:329
+#: ../svndumpfilter/main.c:330
msgid "This is an empty revision for padding."
msgstr "Dies ist eine leere Revision zum Auffüllen"
-#: ../svndumpfilter/main.c:399
+#: ../svndumpfilter/main.c:400
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Revision %ld als %ld übertragen.\n"
-#: ../svndumpfilter/main.c:422
+#: ../svndumpfilter/main.c:423
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Revision: %ld übersprungen\n"
-#: ../svndumpfilter/main.c:521
+#: ../svndumpfilter/main.c:522
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "Ungültiger Quellpfad einer Kopie: %s "
-#: ../svndumpfilter/main.c:565
+#: ../svndumpfilter/main.c:566
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Keine gültige Quellrevision im gefilterten Datenstrom"
-#: ../svndumpfilter/main.c:677
+#: ../svndumpfilter/main.c:678
#, 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/main.c:697
+#: ../svndumpfilter/main.c:698
#, c-format
msgid "No valid revision range 'start' in filtered stream"
msgstr "Kein gültiger Revisionsbereich start im gefilterten Datenstrom"
-#: ../svndumpfilter/main.c:704
+#: ../svndumpfilter/main.c:705
#, c-format
msgid "No valid revision range 'end' in filtered stream"
msgstr "Kein gültiger Revisionsbereich end im gefilterten Datenstrom"
-#: ../svndumpfilter/main.c:750
+#: ../svndumpfilter/main.c:751
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr ""
"Delta Eigenschaftsblock erkannt - wird von svndumpfilter nicht unterstützt"
-#: ../svndumpfilter/main.c:884
+#: ../svndumpfilter/main.c:885
msgid "Do not display filtering statistics."
msgstr "Filterstatistik nicht anzeigen."
-#: ../svndumpfilter/main.c:886
+#: ../svndumpfilter/main.c:887
msgid "Remove revisions emptied by filtering."
msgstr "Durch das Filtern geleerte Revisionen entfernen."
-#: ../svndumpfilter/main.c:888
+#: ../svndumpfilter/main.c:889
msgid "Renumber revisions left after filtering."
msgstr "Revisionen nach dem Filtern neu nummerieren."
-#: ../svndumpfilter/main.c:891
+#: ../svndumpfilter/main.c:892
msgid "Skip missing merge sources."
msgstr "Fehlende Zusammenführungsquellen übersprungen."
-#: ../svndumpfilter/main.c:893
+#: ../svndumpfilter/main.c:894
msgid "Don't filter revision properties."
msgstr "Revisionseigenschaften nicht filtern."
-#: ../svndumpfilter/main.c:904
+#: ../svndumpfilter/main.c:905
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -10284,7 +10484,7 @@ msgstr ""
"Knoten mit den angegebenen Präfixen aus dem Datenstrom ausfiltern.\n"
"Aufruf: svndumpfilter exclude PFAD_PRÄFIX ...\n"
-#: ../svndumpfilter/main.c:911
+#: ../svndumpfilter/main.c:912
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -10293,7 +10493,7 @@ msgstr ""
"ausfiltern.\n"
"Aufruf: svndumpfilter include PFAD_PRÄFIX ...\n"
-#: ../svndumpfilter/main.c:918
+#: ../svndumpfilter/main.c:919
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -10301,7 +10501,7 @@ msgstr ""
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
"Aufruf: svndumpfilter help [UNTERBEFEHL...]\n"
-#: ../svndumpfilter/main.c:992
+#: ../svndumpfilter/main.c:993
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -10316,27 +10516,27 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svndumpfilter/main.c:1047
+#: ../svndumpfilter/main.c:1048
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Präfixe ausschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/main.c:1049
+#: ../svndumpfilter/main.c:1050
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Präfixe ausschließen:\n"
-#: ../svndumpfilter/main.c:1051
+#: ../svndumpfilter/main.c:1052
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Präfixe einschließen (und leere Revisionen verwerfen):\n"
-#: ../svndumpfilter/main.c:1053
+#: ../svndumpfilter/main.c:1054
#, c-format
msgid "Including prefixes:\n"
msgstr "Präfixe einschließen:\n"
-#: ../svndumpfilter/main.c:1080
+#: ../svndumpfilter/main.c:1081
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -10345,21 +10545,21 @@ msgstr ""
"%d Revision(en) verworfen.\n"
"\n"
-#: ../svndumpfilter/main.c:1086
+#: ../svndumpfilter/main.c:1087
msgid "Revisions renumbered as follows:\n"
msgstr "Revisionen folgendermaßen neu nummeriert:\n"
-#: ../svndumpfilter/main.c:1113
+#: ../svndumpfilter/main.c:1114
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (verworfen)\n"
-#: ../svndumpfilter/main.c:1128
+#: ../svndumpfilter/main.c:1129
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "%d Knoten verworfen:\n"
-#: ../svndumpfilter/main.c:1352
+#: ../svndumpfilter/main.c:1353
#, c-format
msgid ""
"\n"
@@ -10368,7 +10568,7 @@ msgstr ""
"\n"
"Fehler: keine Präfixe angegeben.\n"
-#: ../svndumpfilter/main.c:1396
+#: ../svndumpfilter/main.c:1397
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10377,56 +10577,57 @@ msgstr ""
"Unterbefehl %s akzeptiert die Option %s nicht\n"
"Geben Sie svndumpfilter help %s für Hilfe ein.\n"
-#: ../svndumpfilter/main.c:1414
+#: ../svndumpfilter/main.c:1415
msgid "Try 'svndumpfilter help' for more info"
msgstr "Versuchen Sie svndumpfilter help für weitere Informationen"
-#: ../svnlook/main.c:95
+#: ../svnlook/main.c:99
msgid "show details for copies"
msgstr "Zeige Details für Kopien"
-#: ../svnlook/main.c:98
+#: ../svnlook/main.c:102
msgid "print differences against the copy source"
msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus"
-#: ../svnlook/main.c:101
+#: ../svnlook/main.c:105
msgid "show full paths instead of indenting them"
msgstr "Zeige vollständige Pfade anstatt sie einzurücken"
-#: ../svnlook/main.c:107
+#: ../svnlook/main.c:111
msgid "maximum number of history entries"
msgstr "Maximale Anzahl von Logeinträgen"
-#: ../svnlook/main.c:110
+#: ../svnlook/main.c:114
msgid "do not print differences for added files"
msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben"
-#: ../svnlook/main.c:116
+#: ../svnlook/main.c:120
msgid "operate on single directory only"
msgstr "Nicht rekursiv hinabsteigen"
-#: ../svnlook/main.c:119
+#: ../svnlook/main.c:123
msgid "specify revision number ARG"
msgstr "Revisionsnummer PAR angegeben"
-#: ../svnlook/main.c:122
+#: ../svnlook/main.c:126
msgid "operate on a revision property (use with -r or -t)"
-msgstr "auf einer Revisionseigenschaft arbeiten (mit -r\n"
+msgstr ""
+"auf einer Revisionseigenschaft arbeiten (mit -r\n"
" oder -t verwenden)"
-#: ../svnlook/main.c:125
+#: ../svnlook/main.c:129
msgid "show node revision ids for each path"
msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus"
-#: ../svnlook/main.c:128
+#: ../svnlook/main.c:132
msgid "specify transaction name ARG"
msgstr "Transaktionsname PAR angeben"
-#: ../svnlook/main.c:131
+#: ../svnlook/main.c:135
msgid "be verbose"
msgstr "ausführliche Meldungen"
-#: ../svnlook/main.c:138
+#: ../svnlook/main.c:145
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed "
@@ -10465,7 +10666,7 @@ msgstr ""
" --ignore-eol-style:\n"
" Ignoriert Änderungen im EOL-Stil"
-#: ../svnlook/main.c:177
+#: ../svnlook/main.c:184
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -10475,7 +10676,7 @@ msgstr ""
"\n"
"Gibt den Autor aus.\n"
-#: ../svnlook/main.c:182
+#: ../svnlook/main.c:189
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -10486,7 +10687,7 @@ msgstr ""
"Gibt den Inhalt einer Datei aus. Ein vorangestellter / im DATEI_PFAD ist\n"
"optional.\n"
-#: ../svnlook/main.c:187
+#: ../svnlook/main.c:194
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -10496,7 +10697,7 @@ msgstr ""
"\n"
"Gibt die geänderten Pfade aus.\n"
-#: ../svnlook/main.c:192
+#: ../svnlook/main.c:199
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -10506,7 +10707,7 @@ msgstr ""
"\n"
"Gibt das Datum aus.\n"
-#: ../svnlook/main.c:197
+#: ../svnlook/main.c:204
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -10517,7 +10718,7 @@ msgstr ""
"Gibt Unterschiede von geänderten Dateien oder Eigenschaften im GNU-Stil "
"aus.\n"
-#: ../svnlook/main.c:203
+#: ../svnlook/main.c:210
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -10529,7 +10730,7 @@ msgstr ""
"Gibt diejenigen Pfade aus, die (durch Eigenschaftsmodifikationen) selbst\n"
"bzw. deren Dateien geändert wurden.\n"
-#: ../svnlook/main.c:209
+#: ../svnlook/main.c:216
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -10539,7 +10740,7 @@ msgstr ""
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: ../svnlook/main.c:214
+#: ../svnlook/main.c:221
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -10552,7 +10753,7 @@ msgstr ""
"(oder\n"
"über das Basisverzeichnis, falls kein Pfad angegeben wurde.)\n"
-#: ../svnlook/main.c:220
+#: ../svnlook/main.c:227
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -10562,7 +10763,7 @@ msgstr ""
"\n"
"Gibt den Autor, das Datum, die Größe der Logmeldung und die Logmeldung aus.\n"
-#: ../svnlook/main.c:225
+#: ../svnlook/main.c:232
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -10573,7 +10774,7 @@ msgstr ""
"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe "
"diese.\n"
-#: ../svnlook/main.c:230
+#: ../svnlook/main.c:237
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -10583,33 +10784,37 @@ msgstr ""
"\n"
"Gibt die Logmeldung aus.\n"
-#: ../svnlook/main.c:235
+#: ../svnlook/main.c:242
msgid ""
-"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
+"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
+" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
"\n"
"Print the raw value of a property on a path in the repository.\n"
-"With --revprop, prints the raw value of a revision property.\n"
+"With --revprop, print the raw value of a revision property.\n"
msgstr ""
-"Aufruf: svnlook propget ARCHIV_PFAD PROPNAME [PFAD_IN_PROJ]\n"
+"Aufruf: 1. svnlook propget ARCHIV_PFAD PROPNAME PFAD_IN_PROJ\n"
+" 2. svnlook propget --revprop ARCHIV_PFAD PROPNAME\n"
"\n"
"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n"
"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n"
-#: ../svnlook/main.c:241
+#: ../svnlook/main.c:250
msgid ""
-"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
+"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
+" 2. svnlook proplist --revprop REPOS_PATH\n"
"\n"
"List the properties of a path in the repository, or\n"
"with the --revprop option, revision properties.\n"
"With -v, show the property values too.\n"
msgstr ""
-"Aufruf: svnlook proplist ARCHIV_PFAD PFAD_IN_PROJ\n"
+"Aufruf: 1. svnlook proplist ARCHIV_PFAD PFAD_IN_PROJ\n"
+" 2. svnlook proplist --revprop ARCHIV_PFAD\n"
"\n"
"Gibt die Eigenschaften eines Pfades im Projektarchiv aus.\n"
"Mit --revprop werden Revisionseigenschaften ausgegeben.\n"
"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n"
-#: ../svnlook/main.c:248
+#: ../svnlook/main.c:259
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -10622,7 +10827,7 @@ msgstr ""
"Basis des Baumes), wobei optional die IDs der Knotenrevisionen ausgegeben "
"werden.\n"
-#: ../svnlook/main.c:254
+#: ../svnlook/main.c:265
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -10632,7 +10837,7 @@ msgstr ""
"\n"
"Gibt die UUID des Projektarchivs aus.\n"
-#: ../svnlook/main.c:259
+#: ../svnlook/main.c:270
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -10642,43 +10847,43 @@ msgstr ""
"\n"
"Gibt die neueste Revisionsnummer aus.\n"
-#: ../svnlook/main.c:780
+#: ../svnlook/main.c:792
#, c-format
msgid "Added: %s\n"
msgstr "Hinzugefügt: %s\n"
-#: ../svnlook/main.c:782
+#: ../svnlook/main.c:794
#, c-format
msgid "Deleted: %s\n"
msgstr "Gelöscht: %s\n"
-#: ../svnlook/main.c:784
+#: ../svnlook/main.c:796
#, c-format
msgid "Modified: %s\n"
msgstr "Modifiziert: %s\n"
-#: ../svnlook/main.c:870
+#: ../svnlook/main.c:882
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Kopiert: %s (von Rev %ld, %s)\n"
-#: ../svnlook/main.c:938
+#: ../svnlook/main.c:950
msgid "Added"
msgstr "Hinzugefügt"
-#: ../svnlook/main.c:939
+#: ../svnlook/main.c:951
msgid "Deleted"
msgstr "Gelöscht"
-#: ../svnlook/main.c:940
+#: ../svnlook/main.c:952
msgid "Modified"
msgstr "Geändert"
-#: ../svnlook/main.c:941
+#: ../svnlook/main.c:953
msgid "Index"
msgstr "Index"
-#: ../svnlook/main.c:952
+#: ../svnlook/main.c:965
msgid ""
"(Binary files differ)\n"
"\n"
@@ -10686,27 +10891,27 @@ msgstr ""
"(Binärdateien sind unterschiedlich)\n"
"\n"
-#: ../svnlook/main.c:1091
+#: ../svnlook/main.c:1135
msgid "unknown"
msgstr "unbekannt"
-#: ../svnlook/main.c:1238 ../svnlook/main.c:1331 ../svnlook/main.c:1360
+#: ../svnlook/main.c:1282 ../svnlook/main.c:1375 ../svnlook/main.c:1404
#, 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/main.c:1268
+#: ../svnlook/main.c:1312
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr " %s ist eine URL, sollte vermutlich ein Pfad sein"
-#: ../svnlook/main.c:1295
+#: ../svnlook/main.c:1339
#, c-format
msgid "Path '%s' is not a file"
msgstr "Pfad %s ist keine Datei"
-#: ../svnlook/main.c:1444
+#: ../svnlook/main.c:1488
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -10715,7 +10920,7 @@ msgstr ""
"REVISION PFAD <ID>\n"
"-------- ---------\n"
-#: ../svnlook/main.c:1449
+#: ../svnlook/main.c:1493
#, c-format
msgid ""
"REVISION PATH\n"
@@ -10724,27 +10929,27 @@ msgstr ""
"REVISION PFAD\n"
"-------- ----\n"
-#: ../svnlook/main.c:1498
+#: ../svnlook/main.c:1542
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Eigenschaft %s wurde in Revision %ld nicht gefunden"
-#: ../svnlook/main.c:1505
+#: ../svnlook/main.c:1549
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Eigenschaft %s wurde in Pfad %s in Revision %ld nicht gefunden"
-#: ../svnlook/main.c:1510
+#: ../svnlook/main.c:1554
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Eigenschaft %s wurde in Pfad %s in Transaktion %s nicht gefunden"
-#: ../svnlook/main.c:1688 ../svnlook/main.c:1903
+#: ../svnlook/main.c:1794 ../svnlook/main.c:2009
#, c-format
msgid "Missing repository path argument"
msgstr "Fehlende Option für Pfad des Projektarchivs"
-#: ../svnlook/main.c:1749
+#: ../svnlook/main.c:1855
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -10767,11 +10972,11 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnlook/main.c:1805
+#: ../svnlook/main.c:1911
msgid "Missing path argument"
msgstr "Fehlender Pfad Parameter"
-#: ../svnlook/main.c:1830
+#: ../svnlook/main.c:1936
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -10780,7 +10985,7 @@ msgstr ""
"Kommentar (%i Zeilen):\n"
"%s\n"
-#: ../svnlook/main.c:1831
+#: ../svnlook/main.c:1937
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -10789,42 +10994,42 @@ msgstr ""
"Kommentar (%i Zeile):\n"
"%s\n"
-#: ../svnlook/main.c:1877
+#: ../svnlook/main.c:1983
#, c-format
msgid "Missing propname argument"
msgstr "Fehlender PROPNAME Parameter"
-#: ../svnlook/main.c:1878
+#: ../svnlook/main.c:1984
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Eigenschaftsname und Pfad im Projektarchiv nicht angegeben"
-#: ../svnlook/main.c:1884
+#: ../svnlook/main.c:1990
msgid "Missing propname or repository path argument"
msgstr "Eigenschaftsname oder Pfad im Projektarchiv nicht angegeben"
-#: ../svnlook/main.c:2043
+#: ../svnlook/main.c:2149
msgid "Invalid revision number supplied"
msgstr "Ungültige Revisionsnummer angegeben"
-#: ../svnlook/main.c:2131
+#: ../svnlook/main.c:2241
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Die Parameter --transaction (-t) und --revision (-r) können nicht\n"
"gleichzeitig angegeben werden"
-#: ../svnlook/main.c:2213
+#: ../svnlook/main.c:2323
#, c-format
msgid "Repository argument required\n"
msgstr "Projektarchiv Parameter erforderlich\n"
-#: ../svnlook/main.c:2222
+#: ../svnlook/main.c:2332
#, 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/main.c:2273
+#: ../svnlook/main.c:2383
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10833,7 +11038,7 @@ msgstr ""
"Unterbefehl %s akzeptiert die Option %s nicht\n"
"Geben Sie svnlook help %s ein, um Hilfe zu erhalten.\n"
-#: ../svnlook/main.c:2316
+#: ../svnlook/main.c:2426
msgid "Try 'svnlook help' for more info"
msgstr "Versuchen Sie svnlook help für weitere Informationen"
@@ -10863,14 +11068,12 @@ msgid "tunnel mode"
msgstr "Tunnelmodus"
#: ../svnserve/main.c:146
-#, fuzzy
msgid "listen-once mode (useful for debugging)"
-msgstr "Einmal zuhören (nützlich zum Debuggen)"
+msgstr " listen-once -Modus (nützlich zum Debuggen)"
#: ../svnserve/main.c:149
-#, fuzzy
msgid "Windows service mode (Service Control Manager)"
-msgstr "Konnte nicht mit dem Service Control Manager verbinden"
+msgstr "Windows-Service-Modus (Service Control Manager)"
#: ../svnserve/main.c:151
msgid "root of directory to serve"
@@ -10886,68 +11089,79 @@ msgstr ""
msgid "read configuration from file ARG"
msgstr "Konfiguration aus Datei PAR lesen"
+# CHECKME
#: ../svnserve/main.c:158
msgid ""
"listen port\n"
" [mode: daemon, service, listen-once]"
msgstr ""
+"abzuhörender Port\n"
+" [Modus: daemon, service, listen-once]"
#: ../svnserve/main.c:162
msgid ""
"listen port\n"
" [mode: daemon, listen-once]"
msgstr ""
+"abzuhörender Port\n"
+" [Modus: daemon, listen-once]"
#: ../svnserve/main.c:168
msgid ""
"listen hostname or IP address\n"
" [mode: daemon, service, listen-once]"
msgstr ""
+"abzuhörender Rechnername oder IP-Adresse\n"
+" [Modus: daemon, service, listen-once]"
#: ../svnserve/main.c:172
-#, fuzzy
msgid ""
"listen hostname or IP address\n"
" [mode: daemon, listen-once]"
-msgstr "Horche auf Hostnamen oder IP-Adresse (als Daemon)"
+msgstr ""
+"abzuhörender Rechnername oder IP-Adresse\n"
+" [Modus: daemon, listen-once]"
#. ### Making the assumption here that WIN32 never has fork and so
#. * ### this option never exists when --service exists.
#: ../svnserve/main.c:179
-#, fuzzy
msgid "use threads instead of fork [mode: daemon]"
-msgstr "Verwende Threads anstelle Fork "
+msgstr "Verwende Threads anstelle von fork [Modus: daemon]"
#: ../svnserve/main.c:183
-#, fuzzy
msgid ""
"run in foreground (useful for debugging)\n"
" [mode: daemon]"
-msgstr "Im Vordergrund starten (nützlich zum Debuggen)"
+msgstr ""
+"Im Vordergrund starten (nützlich zum Debuggen)\n"
+" [Modus: daemon]"
#: ../svnserve/main.c:187
-#, fuzzy
msgid "svnserve log file"
-msgstr "Erzeuge Datei svnserve.conf "
+msgstr "Protokolldatei von svnserve"
#: ../svnserve/main.c:190
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once, service]"
msgstr ""
+"Schreibe Server-Prozess-ID in Datei PAR\n"
+" [Modus: daemon, listen-once, service]"
#: ../svnserve/main.c:194
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once]"
msgstr ""
+"Schreibe Server-Prozess-ID in Datei PAR\n"
+" [Modus: daemon, listen-once]"
#: ../svnserve/main.c:199
-#, fuzzy
msgid ""
"tunnel username (default is current uid's name)\n"
" [mode: tunnel]"
-msgstr "Benutzername tunneln (Vorgabe ist der Name der aktuellen UID)"
+msgstr "Tunnel-Benutzername (Vorgabe ist der Name zur aktuellen UID)\n"
+" [Modus: tunnel]"
#: ../svnserve/main.c:202 ../svnversion/main.c:125
msgid "display this help"
@@ -10959,24 +11173,22 @@ msgid "Type '%s --help' for usage.\n"
msgstr "Geben Sie %s --help für weitere Hilfe ein.\n"
#: ../svnserve/main.c:225
-#, fuzzy
msgid ""
"usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
"\n"
"Valid options:\n"
msgstr ""
-"Aufruf: svnserve [Optionen]\n"
+"Aufruf: svnserve [-d | -i | -t | -X | --service] [Optionen]\n"
"\n"
"Gültige Optionen:\n"
#: ../svnserve/main.c:231
-#, fuzzy
msgid ""
"usage: svnserve [-d | -i | -t | -X] [options]\n"
"\n"
"Valid options:\n"
msgstr ""
-"Aufruf: svnserve [Optionen]\n"
+"Aufruf: svnserve [-d | -i | -t | -X] [Optionen]\n"
"\n"
"Gültige Optionen:\n"
@@ -10994,9 +11206,8 @@ msgid "svnserve: Root path '%s' does not
msgstr "svnserve: Wurzelpfad %s existiert nicht oder ist kein Verzeichnis.\n"
#: ../svnserve/main.c:551
-#, fuzzy
msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n"
-msgstr "Sie müssen genau einen der Parameter -d, -i, -t oder -X angeben.\n"
+msgstr "Sie müssen genau einen der Parameter -d, -i, -t, --service oder -X \
angeben.\n"
#: ../svnserve/main.c:554
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
@@ -11092,7 +11303,7 @@ msgstr ""
"Der Dienst konnte nicht gestartet werden; ein interner Fehler trat beim "
"Starten des Dienstes auf"
-#: ../svnsync/main.c:65
+#: ../svnsync/main.c:67
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -11122,7 +11333,7 @@ msgstr ""
"Anders ausgedrückt stellt das Zielprojektarchiv einen Spiegel des\n"
"Quellprojektarchivs dar, auf den nur lesend zugegriffen werden darf.\n"
-#: ../svnsync/main.c:80
+#: ../svnsync/main.c:82
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
@@ -11134,7 +11345,7 @@ msgstr ""
"Überträgt alle laufenden Revisionen von der Quelle, mit der es\n"
"initialisiert wurde, zum Ziel.\n"
-#: ../svnsync/main.c:86
+#: ../svnsync/main.c:88
msgid ""
"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
@@ -11166,7 +11377,7 @@ msgstr ""
"wurden. Sie können HEAD für eine Revision verwenden, im Sinne von die\n"
"letzte übertragene Revision .\n"
-#: ../svnsync/main.c:102
+#: ../svnsync/main.c:104
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -11176,11 +11387,11 @@ msgstr ""
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: ../svnsync/main.c:112
+#: ../svnsync/main.c:114
msgid "print as little as possible"
msgstr "So wenig wie möglich ausgeben"
-#: ../svnsync/main.c:118
+#: ../svnsync/main.c:120
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
@@ -11188,7 +11399,7 @@ msgstr ""
"gibt einen Benutzernamen PAR an (veraltet;\n"
" siehe --source-username und --sync-username)"
-#: ../svnsync/main.c:122
+#: ../svnsync/main.c:124
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -11196,76 +11407,82 @@ msgstr ""
"gibt ein Passwort PAR an (veraltet;\n"
" siehe --source-password und --sync-password)"
-#: ../svnsync/main.c:126
+#: ../svnsync/main.c:132
msgid "connect to source repository with username ARG"
msgstr "verbindet mit dem Quellprojektarchiv mit dem Benutzernamen PAR"
-#: ../svnsync/main.c:128
+#: ../svnsync/main.c:134
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/main.c:130
+#: ../svnsync/main.c:136
msgid "connect to sync repository with username ARG"
msgstr "verbindet mit synchronisiertem Projektarchiv mit Benutzernamen PAR"
-#: ../svnsync/main.c:132
+#: ../svnsync/main.c:138
msgid "connect to sync repository with password ARG"
msgstr "verbindet mit synchronisiertem Projektarchiv mit Passwort PAR"
-#: ../svnsync/main.c:222
+#: ../svnsync/main.c:229
#, c-format
msgid "Can't get local hostname"
msgstr "Kann den lokalen Hostnamen nicht bekommen"
-#: ../svnsync/main.c:245
+#: ../svnsync/main.c:252
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
"Konnte Sperre für Zielprojektarchiv nicht erhalten, die zurzeit von\n"
" %s gehalten wird\n"
-#: ../svnsync/main.c:361
+#: ../svnsync/main.c:368
#, 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/main.c:499
+#: ../svnsync/main.c:506
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr ""
"Kopierte Eigenschaften für Revision %ld (%s* Eigenschaften übergangen).\n"
-#: ../svnsync/main.c:504
+#: ../svnsync/main.c:511
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Eigenschaften für Revision %ld kopiert.\n"
-#: ../svnsync/main.c:606
+#: ../svnsync/main.c:613
msgid "Cannot initialize a repository with content in it"
msgstr "Kann kein Projektarchiv mit Inhalt initialisieren"
# CHECKME
-#: ../svnsync/main.c:617
+#: ../svnsync/main.c:624
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Das Zielprojektarchiv synchronisiert bereits von %s "
-#: ../svnsync/main.c:1211
+#: ../svnsync/main.c:707 ../svnsync/main.c:710 ../svnsync/main.c:1637
+#: ../svnsync/main.c:1787
+#, c-format
+msgid "Path '%s' is not a URL"
+msgstr "Pfad %s ist keine URL"
+
+#: ../svnsync/main.c:1218
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Revision %ld übertragen.\n"
-#: ../svnsync/main.c:1251
+#: ../svnsync/main.c:1258
msgid "Destination repository has not been initialized"
msgstr "Zielprojektarchiv wurde noch nicht initialisiert"
-#: ../svnsync/main.c:1427
+#: ../svnsync/main.c:1434
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "Übertragung erzeugte Revision %ld, sollte aber %ld erzeugen"
-#: ../svnsync/main.c:1533
+#: ../svnsync/main.c:1540
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -11276,7 +11493,7 @@ msgstr ""
"und Ziel-HEAD (%ld) sind inkonsistent. Haben Sie in das Ziel ohne Verwendung "
"von svnsync übertragen?"
-#: ../svnsync/main.c:1570
+#: ../svnsync/main.c:1577
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -11285,7 +11502,7 @@ msgstr ""
"Ziel-HEAD (%ld) ist nicht die zuletzt zusammengeführte Revision (%ld). Haben "
"Sie in das Ziel ohne Verwendung von svnsync übertragen?"
-#: ../svnsync/main.c:1673 ../svnsync/main.c:1678
+#: ../svnsync/main.c:1680 ../svnsync/main.c:1685
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -11293,17 +11510,17 @@ msgstr ""
"Kann keine Revisionseigenschaften für eine Revision (%ld) kopieren, die noch "
"nicht synchronisiert wurde"
-#: ../svnsync/main.c:1730
+#: ../svnsync/main.c:1737
#, c-format
msgid "'%s' is not a valid revision range"
msgstr " %s ist kein gültiger Revisionsbereich"
-#: ../svnsync/main.c:1744 ../svnsync/main.c:1764
+#: ../svnsync/main.c:1751 ../svnsync/main.c:1771
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Ungültige Revisionsnummer (%ld)"
-#: ../svnsync/main.c:1804
+#: ../svnsync/main.c:1811
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -11319,7 +11536,7 @@ msgstr ""
"\n"
"Verfügbare Unterbefehle:\n"
-#: ../svnsync/main.c:1966
+#: ../svnsync/main.c:1977
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -11327,7 +11544,7 @@ msgstr ""
"Man kann nicht --username oder --password mit einem von --source-username, --"
"source-password, --sync-username oder --sync-password verwenden.\n"
-#: ../svnsync/main.c:2046
+#: ../svnsync/main.c:2066
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -11336,7 +11553,7 @@ msgstr ""
"Unterbefehl %s akzeptiert die Option %s nicht\n"
"Geben Sie svnsync help %s für Hilfe ein.\n"
-#: ../svnsync/main.c:2118
+#: ../svnsync/main.c:2140
msgid "Try 'svnsync help' for more info"
msgstr "Versuchen Sie svnsync help für weitere Informationen"
@@ -11427,633 +11644,3 @@ msgstr "exportiert%s"
msgid "'%s' not versioned, and not exported\n"
msgstr " %s nicht versioniert und nicht exportiert\n"
-#~ msgid "A problem occurred; see later errors for details"
-#~ msgstr ""
-#~ "Ein Problem ist aufgetreten, für Details siehe folgende Fehlermeldungen"
-
-#~ msgid ""
-#~ "The OPTIONS response did not include the requested baseline-relative-path "
-#~ "value"
-#~ msgstr ""
-#~ "Die OPTIONS-Antwort enthielt nicht den angeforderten Wert baseline-"
-#~ "relative-path "
-
-#~ msgid "Connection closed unexpectedly"
-#~ msgstr "Netzwerkverbindung wurde unerwartet geschlossen"
-
-#~ msgid "MIME type '%s' ends with non-alphanumeric character"
-#~ msgstr "MIME-Typ %s endet mit einem nicht-alphanumerischen Zeichen"
-
-#~ msgid ", (mf) mine-full, (tf) theirs-full"
-#~ msgstr ", (mf) volle eigene Datei, (tf) volle fremde Datei"
-
-#~ msgid "(h) help for more options: "
-#~ msgstr "(h) Hilfe für weitere Optionen: "
-
-# FIXME: no separate "(l) launch" message?
-#~ msgid ""
-#~ " (p) postpone - mark the conflict to be resolved later\n"
-#~ " (df) diff-full - show all changes made to merged file\n"
-#~ " (e) edit - change merged file in an editor\n"
-#~ " (r) resolved - accept merged version of file\n"
-#~ " (mf) mine-full - accept my version of entire file (ignore their "
-#~ "changes)\n"
-#~ " (tf) theirs-full - accept their version of entire file (lose my "
-#~ "changes)\n"
-#~ " (l) launch - launch external tool to resolve conflict\n"
-#~ " (h) help - show this list\n"
-#~ "\n"
-#~ msgstr ""
-#~ " (p) zurückstellen - den Konflikt erst später auflösen\n"
-#~ " (df) voller Diff - alle Änderungen in der zusammengeführten "
-#~ "Datei anzeigen\n"
-#~ " (e) editieren - zusammengeführte Datei in einem Editor "
-#~ "ändern\n"
-#~ " (r) aufgelöst - akzeptieren der zusammengeführten Version der "
-#~ "Datei\n"
-#~ " (mf) volle eigene Datei - die eigene Version der kompletten Datei "
-#~ "akzeptieren\n"
-#~ " (ignorieren fremder Änderungen)\n"
-#~ " (tf) volle fremde Datei - die fremde Version der kompletten Datei "
-#~ "akzeptieren\n"
-#~ " (verlieren eigener Änderungen)\n"
-#~ " (l) starten - Starten eines externen Programms zur "
-#~ "Konfliktauflösung\n"
-#~ " (h) Hilfe - diese Liste anzeigen\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Sorry, '(mc) mine for conflicts' is not yet implemented; see\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3049\n"
-#~ "\n"
-#~ msgstr ""
-#~ " (mc) eigene für Konflikte ist noch nicht implementiert; vergleiche\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3049\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Sorry, '(tc) theirs for conflicts' is not yet implemented; see\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3049\n"
-#~ "\n"
-#~ msgstr ""
-#~ " (tc) fremde für Konflikte ist noch nicht implementiert; vergleiche\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3049\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Sorry, '(dc) diff of conflicts' is not yet implemented; see\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3048\n"
-#~ "\n"
-#~ msgstr ""
-#~ " (dc) Diff der Konflikte ist noch nicht implementiert; vergleiche\n"
-#~ "http://subversion.tigris.org/issues/show_bug.cgi?id=3048\n"
-#~ "\n"
-
-#~ 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 list\n"
-#~ "\n"
-#~ msgstr ""
-#~ " (p) zurückstellen - den Konflikt erst später auflösen\n"
-#~ " (mf) volle eigene Datei - bereits existierendes Element akzeptieren\n"
-#~ " (ignorieren der fremden Hinzufügung)\n"
-#~ " (tf) volle fremde Datei - das eingehende Element akzeptieren\n"
-#~ " (überschreiben des bereits existierendes "
-#~ "Elements)\n"
-#~ " (h) Hilfe - diese Liste anzeigen\n"
-#~ "\n"
-
-msgid ""
-"specify automatic conflict resolution action\n"
-" ('postpone', 'base', 'mine-full', 'theirs-"
-"full',\n"
-" 'edit', 'launch')"
-msgstr ""
-"automatische Konfliktauflösungsaktion angeben\n"
-" ( postpone , base , mine-full , theirs-"
-"full ,\n"
-" edit , launch )"
-
-msgid ""
-"specify which collection of revisions to display\n"
-" ('merged', 'eligible')"
-msgstr ""
-"anzuzeigende Revisionen angeben\n"
-" ( merged , eligible )"
-
-#~ msgid ""
-#~ "Query merge-related information.\n"
-#~ "usage: mergeinfo SOURCE-URL[@REV] [TARGET[@REV]]\n"
-#~ "\n"
-#~ " Query information related to merges (or potential merges) between\n"
-#~ " SOURCE-URL and TARGET. If the --show-revs option is not provided,\n"
-#~ " display revisions which have been merged from SOURCE-URL to TARGET.\n"
-#~ " Otherwise, display the type of information specified by the\n"
-#~ " --show-revs option.\n"
-#~ msgstr ""
-#~ "Abfrage zu Zusammenführungen relevanter Informationen.\n"
-#~ "Aufruf: mergeinfo QUELL-URL[@REV] [ZIEL[@REV]]\n"
-#~ "\n"
-#~ " Fragt Informationen zu Zusammenführungen (oder potentiellen\n"
-#~ " Zusammenführungen) zwischen QUELL-URL und ZIEL ab. Falls die Option\n"
-#~ " --show-revs nicht angegeben wurde, werden Revisionen, die von\n"
-#~ " QUELL-URL nach ZIEL zusammengeführt wurden, angezeigt. Andernfalls\n"
-#~ " wird die Art der Information angezeigt, die durch die Option\n"
-#~ " --show-revs spezifiziert wurde.\n"
-
-# FIXME: propchange?
-# supportS the following formats
-#~ 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. Creates a versioned, local propchange in working copy.\n"
-#~ " 2. Creates an unversioned, remote propchange on repos 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 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"
-#~ " 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 relative directory path, optional\n"
-#~ " revision flags and an URL. The ordering of the three elements\n"
-#~ " implements different behavior. Subversion 1.4 and earlier only\n"
-#~ " support the following formats and the URLs cannot have peg\n"
-#~ " revisions:\n"
-#~ " foo http://example.com/repos/zig\n"
-#~ " foo/bar -r 1234 http://example.com/repos/zag\n"
-#~ " Subversion 1.5 and greater support the above formats and the\n"
-#~ " following formats where the URLs may have peg revisions:\n"
-#~ " http://example.com/repos/zig foo\n"
-#~ " -r 1234 http://example.com/repos/zig foo/bar\n"
-#~ " Relative URLs are supported in Subversion 1.5 and greater for\n"
-#~ " all above formats and 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"
-#~ " 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 ""
-#~ "Setzt den Wert einer Eigenschaft von Dateien, Verzeichnissen oder "
-#~ "Revisionen\n"
-#~ "Aufruf: 1. propset PROPNAME PROPWERT PFAD...\n"
-#~ " 2. propset PROPNAME --revprop -r REV PROPWERT [ZIEL]\n"
-#~ "\n"
-#~ " 1. Erstellt eine versionierte, lokale Eigenschaft in der Arbeitskopie.\n"
-#~ " 2. Erstellt eine nicht versionierte, entfernte Eigenschaft in einer\n"
-#~ " Revision des Projektarchivs.\n"
-#~ " ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n"
-#~ "\n"
-#~ " Der Wert kann mit der Option --file statt PROPWERT angegeben werden.\n"
-#~ "\n"
-#~ " Hinweis: svn erkennt die folgenden speziellen, versionierten "
-#~ "Eigenschaften,\n"
-#~ " wird aber jede gesetzte Eigenschaft speichern:\n"
-#~ " svn:ignore - Eine durch Zeilenumbruch getrennte Liste von zu\n"
-#~ " ignorierenden Dateimustern.\n"
-#~ " svn:keywords - Schlüsselworte, die expandiert werden sollen.\n"
-#~ " Gültige Schlüsselworte sind:\n"
-#~ " URL, HeadURL - Die URL für die Head-Version des "
-#~ "Objektes.\n"
-#~ " Author, LastChangedBy - Die letzte Person, die die Datei geändert "
-#~ "hat.\n"
-#~ " Date, LastChangedDate - Datum/Zeit der letzten Änderung.\n"
-#~ " Rev, Revision, - Die letzte Revision, in der das Objekt\n"
-#~ " LastChangedRevision geändert wurde.\n"
-#~ " Id - Eine komprimierte Zusammenfassung der "
-#~ "vier\n"
-#~ " genannten Schlüsselworte.\n"
-#~ " svn:executable - Falls vorhanden, mache die Datei ausführbar.\n"
-#~ " svn:eol-style - Eins aus native , LF , CR , CRLF .\n"
-#~ " svn:mime-type - Der MIME-Typ der Datei. Verwendet, um festzustellen, "
-#~ "ob\n"
-#~ " die Datei zusammengeführt werden kann und wie sie von Apache "
-#~ "übertragen\n"
-#~ " werden soll. Dateien ohne MIME-Typ oder deren MIME-Typ mit text/ \n"
-#~ " beginnt, werden als Text behandelt. Alles andere wird als binär "
-#~ "angesehen.\n"
-#~ " svn:externals - Eine durch Zeilenumbruch getrennte Liste von\n"
-#~ " Modulnamen, die jeder aus einem relativen Verzeichnispfad, "
-#~ "optionalen\n"
-#~ " Revisionsmarkern und einer URL bestehen. Die Reihenfolge dieser "
-#~ "drei\n"
-#~ " Elemente führt zu verschiedenen Ergebnissen. Subversion 1.4 und "
-#~ "älter\n"
-#~ " unterstützt nur die folgenden Formate und die URLs können keine\n"
-#~ " Peg-Revisionen haben:\n"
-#~ " foo http://example.org/repos/zig\n"
-#~ " foo/bar -r 1234 http://example.org/repos/zag\n"
-#~ " Subversion 1.5 und neuer unterstützt die obigen Formate und die\n"
-#~ " folgenden, wobei die URLs Peg-Revisionen enthalten dürfen:\n"
-#~ " http://example.com/repos/zig foo\n"
-#~ " -r 1234 http://example.com/repos/zig foo/bar\n"
-#~ " Relative URLs werden in Subversion 1.5 und neuer für alle obigen\n"
-#~ " Formate unterstützt und werden durch eine URL gekennzeichnet, die\n"
-#~ " mit einem der folgenden Zeichenketten startet und\n"
-#~ " ../ auf das übergeordnete Verzeichnis des extrahierten "
-#~ "Externals\n"
-#~ " ^/ auf die Wurzel des Projektarchivs\n"
-#~ " // auf das Schema\n"
-#~ " / auf die Wurzel des Servers\n"
-#~ " verweist.\n"
-#~ " Das mehrdeutige Format relativer_Pfad relativer_Pfad wird als\n"
-#~ " relative_URL relativer_Pfad mit Peg-Revisionsunterstützung "
-#~ "gedeutet.\n"
-#~ " svn:needs-lock - Wenn vorhanden, soll die Datei gesperrt werden, "
-#~ "bevor sie\n"
-#~ " verändert wird. Setzt den Schreibschutz der Arbeitsdatei, wenn sie "
-#~ "nicht\n"
-#~ " gesperrt ist. Verwenden Sie svn propdel svn:needs-lock PFAD... \n"
-#~ " zum Löschen.\n"
-#~ "\n"
-#~ " Die Eigenschaften svn:keywords, svn:executable, svn:eol-style, svn:mime-"
-#~ "type\n"
-#~ " und svn:needs-lock können nicht für Verzeichnisse gesetzt werden.\n"
-#~ " Ein nicht-rekursiver Versuch wird scheitern und ein rekursiver Versuch "
-#~ "wird\n"
-#~ " die Eigenschaft nur für die Dateien in dem Verzeichnis setzen.\n"
-
-#~ msgid "listen port (for daemon mode)"
-#~ msgstr "Horche auf Port (als Daemon)"
-
-#~ msgid "listen hostname or IP address (for daemon mode)"
-#~ msgstr "Horche auf Hostnamen oder IP-Adresse (als Daemon)"
-
-#~ msgid "run in foreground (useful for debugging)"
-#~ msgstr "Im Vordergrund starten (nützlich zum Debuggen)"
-
-#~ msgid "tunnel username (default is current uid's name)"
-#~ msgstr "Benutzername tunneln (Vorgabe ist der Name der aktuellen UID)"
-
-#~ msgid "use threads instead of fork"
-#~ msgstr "Verwende Threads anstelle Fork "
-
-#~ msgid "listen once (useful for debugging)"
-#~ msgstr "Einmal zuhören (nützlich zum Debuggen)"
-
-#~ msgid "write server process ID to file ARG"
-#~ msgstr "Server-Prozess-ID in Datei PAR schreiben"
-
-#~ msgid "run as a windows service (SCM only)"
-#~ msgstr "Als Windows-Dienst starten (nur SCM)"
-
-#~ msgid ""
-#~ "usage: svnserve [options]\n"
-#~ "\n"
-#~ "Valid options:\n"
-#~ msgstr ""
-#~ "Aufruf: svnserve [Optionen]\n"
-#~ "\n"
-#~ "Gültige Optionen:\n"
-
-#, fuzzy
-#~ msgid " Reverted %s:r%s%s"
-#~ msgstr " Zusammengeführt %s:r%s%s"
-
-#~ msgid "Please upgrade the server to 0.19 or later"
-#~ msgstr "Bitte aktualisieren Sie den Server auf Version 0.19 oder neuer"
-
-#~ msgid "Can't create socket"
-#~ msgstr "Kann Verbindung nicht erzeugen"
-
-#, fuzzy
-#~ msgid "Revision properties not a list"
-#~ msgstr "Revisionseintrag ist keine Liste"
-
-#, fuzzy
-#~ msgid " Source path: %s\n"
-#~ msgstr "Ungültiger Quellpfad einer Kopie: %s "
-
-#, fuzzy
-#~ msgid " Merged ranges: "
-#~ msgstr " Zusammengeführt %s:r%s%s"
-
-#~ msgid "Bad encoding option: prop value not stored as UTF8"
-#~ msgstr ""
-#~ "Fehlerhafte Kodierung: Eigenschaftswert ist nicht als UTF8 gespeichert"
-
-#~ msgid "SQLite error"
-#~ msgstr "SQLite-Fehler"
-
-#~ msgid "Item is out-of-date"
-#~ msgstr "Eintrag ist veraltet"
-
-#~ msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-#~ msgstr ""
-#~ "Der Revisionsaktion %c für Revision %ld von %s fehlt eine "
-#~ "Vorgängerrevision"
-
-#~ msgid "Path '%s' is missing"
-#~ msgstr "Pfad %s fehlt"
-
-#~ msgid "Destination does not exist: '%s'"
-#~ msgstr "Ziel existiert nicht: %s "
-
-#~ msgid "'%s' is neither a file nor a directory"
-#~ msgstr " %s ist weder eine Datei noch ein Verzeichnis"
-
-#~ msgid "%s\\ No newline at end of file%s"
-#~ msgstr "%s\\ Kein Zeilenvorschub am Ende der Datei%s"
-
-#~ msgid "Reference to non-existent revision %ld in filesystem '%s'"
-#~ msgstr ""
-#~ "Verweis auf eine nicht existierende Revision %ld im Dateisystem %s "
-
-#~ msgid "File not found: transaction '%s', path '%s'"
-#~ msgstr "Datei nicht gefunden: Transaktion %s , Pfad %s "
-
-#~ msgid "File not found: revision %ld, path '%s'"
-#~ msgstr "Datei nicht gefunden: Revision %ld, Pfad %s "
-
-#~ msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-#~ msgstr ""
-#~ "Datei existiert bereits: Dateisystem %s , Transaktion %s , Pfad %s "
-
-#~ msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-#~ msgstr "Datei existiert bereits: Dateisystem %s , Revision %ld, Pfad %s "
-
-#~ msgid "Root object must be a transaction root"
-#~ msgstr "Basisobjekt muss eine Transaktionsbasis sein"
-
-#~ msgid "Can't grab FSFS repository mutex"
-#~ msgstr "Kann FSFS Projektarchiv Mutex nicht greifen"
-
-#~ msgid "Can't ungrab FSFS repository mutex"
-#~ msgstr "Kann FSFS-Projektarchiv-Mutex nicht loslassen"
-
-#~ msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-#~ msgstr ""
-#~ "Datei ist nicht veränderlich: Dateisystem %s , Revision %ld, Pfad %s "
-
-#~ msgid "'%s' is not a directory in filesystem '%s'"
-#~ msgstr " %s ist kein Verzeichnis im Dateisystem %s "
-
-#~ msgid "'%s' is not a file in filesystem '%s'"
-#~ msgstr " %s ist keine Datei im Dateisystem %s "
-
-#~ msgid "No lock on path '%s' in filesystem '%s'"
-#~ msgstr "Keine Sperre für Pfad %s in Dateisystem %s "
-
-#~ msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-#~ msgstr "Sperre ist abgelaufen: Sperrmarke %s in Dateisystem %s "
-
-#~ msgid "No username is currently associated with filesystem '%s'"
-#~ msgstr "Derzeit ist kein Benutzername mit dem Dateisystem %s verbunden"
-
-#~ msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-#~ msgstr ""
-#~ "Benutzer %s versucht eine Sperre, die %s gehört, im Dateisystem %s \
"
-#~ "zu verwenden."
-
-#~ msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-#~ msgstr ""
-#~ "Pfad %s ist bereits durch Benutzer %s im Dateisystem %s gesperrt"
-
-#~ msgid "'DAV:version-name' was not present on the baseline resource"
-#~ msgstr " DAV:version-name ist nicht in der Grundlinienressource enthalten"
-
-#~ msgid "Unsupported RA loader version (%d) for ra_dav"
-#~ msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_dav"
-
-#~ msgid "%s request failed on '%s'"
-#~ msgstr "%s Anfrage fehlgeschlagen auf %s "
-
-#~ msgid "File doesn't exist on HEAD"
-#~ msgstr "Datei existiert nicht in HEAD"
-
-# CHECKME: serf nicht mit Sklave übersetzen? Was ist das überhaupt, ein \
Programmiermodell?
-#~ msgid "Access repository via WebDAV protocol through serf."
-#~ msgstr ""
-#~ "Auf ein Projektarchiv über das WebDAV-Protokoll mittels serf zugreifen."
-
-#~ msgid "Non-string as part of text delta"
-#~ msgstr "Ein Teil des Text-Delta ist keine Zeichenkette"
-
-#~ msgid "Out of date: '%s' in transaction '%s'"
-#~ msgstr "Veraltet: %s in Transaktion %s "
-
-#~ msgid "Can't stat directory '%s'"
-#~ msgstr "Kann Status von Verzeichnis %s nicht ermitteln"
-
-#~ msgid "'%s' is not currently a member of changelist '%s'."
-#~ msgstr " %s ist zurzeit nicht in der Änderungsliste %s enthalten."
-
-#~ msgid ""
-#~ "Cannot copy or move '%s': it's not in the repository yet; try committing "
-#~ "first"
-#~ msgstr ""
-#~ "Kann %s nicht kopieren oder verschieben, da es sich noch nicht im\n"
-#~ "Projektarchiv befindet, versuchen Sie es zuerst zu übertragen"
-
-#~ msgid "Error checking existence of '%s'"
-#~ msgstr "Fehler beim Prüfen auf Vorhandensein von %s "
-
-#~ msgid "Can't find entry '%s' in '%s'"
-#~ msgstr "Kann Eintrag %s in %s nicht finden"
-
-#~ msgid ""
-#~ "This client is too old to work with working copy '%s'; please get a newer "
-#~ "Subversion client"
-#~ msgstr ""
-#~ "Der Client ist zu alt, um mit der Arbeitskopie %s zusammen zu "
-#~ "arbeiten;\n"
-#~ "bitte besorgen Sie einen neueren Subversion-Client"
-
-#~ msgid "Error writing log file for '%s'"
-#~ msgstr "Fehler beim Schreiben der Logdatei für %s "
-
-#~ msgid ""
-#~ "Multiple revision arguments encountered; can't specify -r and -c, or try "
-#~ "'-r N:M' instead of '-r N -r M'"
-#~ msgstr ""
-#~ "Mehrere Revisionsparameter gefunden; bitte nicht -r und -c angeben oder -"
-#~ "r N:M statt -r N -r M verwenden"
-
-#~ msgid ""
-#~ "usage: svnadmin lslocks REPOS_PATH\n"
-#~ "\n"
-#~ "Print descriptions of all locks.\n"
-#~ msgstr ""
-#~ "Aufruf: svnadmin lslockx ARCHIV_PFAD\n"
-#~ "\n"
-#~ "Gibt die Beschreibungen aller Sperren aus.\n"
-
-#~ msgid "Invalid revision number"
-#~ msgstr "Ungültige Revisionsnummer"
-
-#~ msgid "'%s' is not under version control or doesn't exist"
-#~ msgstr " %s ist nicht unter Versionskontrolle oder existiert nicht"
-
-#~ msgid "No support for repos <--> working copy moves"
-#~ msgstr ""
-#~ "Verschieben von Arbeitskopie <--> Projektarchiv wird nicht unterstützt"
-
-#~ msgid "Cannot read entry for '%s'"
-#~ msgstr "Kann Eintrag für %s nicht lesen"
-
-#~ msgid "Lock comment has illegal characters"
-#~ msgstr "Sperrkommentar enthält illegale Zeichen"
-
-#, fuzzy
-#~ msgid "Can't get user name"
-#~ msgstr "Kann keinen Dateinamen holen"
-
-#~ msgid "Unhandled SASL interaction"
-#~ msgstr "Nicht behandelte SASL-Interaktion"
-
-#~ msgid " arg"
-#~ msgstr " par"
-
-#~ msgid "'%s' has unsupported special file type '%s'"
-#~ msgstr " %s hat nicht unterstützten speziellen Dateityp %s "
-
-#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-#~ msgstr "Prüfsummenfehler für %s ; erwartet: %s , tatsächlich: %s "
-
-#~ msgid "No entry for '%s'"
-#~ msgstr "Kein Eintrag für %s "
-
-#~ msgid "Cannot revert: '%s' is not under version control"
-#~ msgstr "Kann nicht zurücksetzen: %s ist nicht unter Versionskontrolle"
-
-#~ msgid "Cannot copy or move '%s': it's not under version control"
-#~ msgstr ""
-#~ "Kann %s nicht kopieren oder verschieben, da es sich nicht unter\n"
-#~ "Versionskontrolle befindet"
-
-#~ msgid "descend recursively"
-#~ msgstr "Rekursiv hinabsteigen"
-
-#~ msgid ""
-#~ "usage: svnsync copy-revprops DEST_URL REV\n"
-#~ "\n"
-#~ "Copy all revision properties for revision REV from source to\n"
-#~ "destination.\n"
-#~ msgstr ""
-#~ "Aufruf: svnsync copy-revprops ZIEL_URL REV\n"
-#~ "\n"
-#~ "Kopiert alle Revisionseigenschaften der Revision REV von der Quelle zum "
-#~ "Ziel.\n"
-
-# FIXME: muss noch in libsvn_ra/ra_loader.c:699 als übersetzbar markiert werden
-# (Franzosen verwenden "* ra_%s : %s\n")
-# svn --help gibt aus: "* ra_dav: Modul"
-#~ msgid "* ra_%s: %s\n"
-#~ msgstr "* ra_%s: %s\n"
-
-#~ msgid "Could not create a request (%s '%s')"
-#~ msgstr "Konnte keine Anfrage (%s %s ) erzeugen"
-
-#~ msgid "Could not create a CHECKOUT request (%s)"
-#~ msgstr "Konnte keine CHECKOUT-Anfrage (%s) erzeugen"
-
-#~ msgid "Could not create a DELETE request (%s)"
-#~ msgstr "Konnte keine DELETE Anfrage (%s) erzeugen"
-
-#~ msgid "Could not create a PUT request (%s)"
-#~ msgstr "Konnte keine PUT Anfrage (%s) erzeugen"
-
-#~ msgid "applying log message to %s"
-#~ msgstr "wende Logmeldung auf %s an"
-
-#, fuzzy
-#~ msgid "Could not create a GET request for '%s'"
-#~ msgstr "Konnte keine Anfrage (%s %s ) erzeugen"
-
-#~ msgid "Unlock request failed"
-#~ msgstr "Sperrfreigabe gescheitert"
-
-#~ msgid "Error spooling the %s request response to disk"
-#~ msgstr "Fehler beim Spulen der Antwort auf die %s Anfrage auf Festplatte"
-
-#~ msgid "Error opening local file"
-#~ msgstr "Fehler beim Öffnen einer lokalen Datei"
-
-#~ msgid "Failed to add directory '%s': object of the same name already exists"
-#~ msgstr ""
-#~ "Konnte Verzeichnis %s nicht hinzufügen: ein Objekt mit demselben Namen\n"
-#~ "existiert bereits"
-
-#~ msgid ""
-#~ "Failed to add directory '%s': object of the same name is already "
-#~ "scheduled for addition"
-#~ msgstr ""
-#~ "Konnte Verzeichnis %s nicht hinzufügen: ein Objekt mit demselben Namen "
-#~ "ist\n"
-#~ "bereits zur Übertragung eingeplant"
-
-# FIXME: s/and/which/
-#~ msgid ""
-#~ "Path '%s' is in conflict, and must be resolved before the remainder of "
-#~ "the requested merge can be applied"
-#~ msgstr ""
-#~ "Pfad %s hat einen Konflikt der aufgelöst werden muss, bevor der Rest "
-#~ "der Zusammenführung angewandt werden kann"
-
-#~ msgid ""
-#~ "Unable to determine merge source for '%s', please provide an explicit "
-#~ "source"
-#~ msgstr ""
-#~ "Kann die Quelle der Zusammenführung für %s nicht bestimmen, bitte geben "
-#~ "Sie eine explizite Quelle an"
-
-#~ msgid "Merge Tracking schema format not set"
-#~ msgstr "Schema-Format der Zusammenführungsverfolgung ist nicht gesetzt"
-
-#~ msgid "Merge Tracking schema format %d not recognized"
-#~ msgstr "Schema-Format %d der Zusammenführungsverfolgung wurde nicht erkannt"
-
-#~ msgid "The following error output was produced by the hook:\n"
-#~ msgstr "Die folgende Fehlerausgabe wurde von der Aktion erzeugt:\n"
-
-#~ msgid "No error output was produced by the hook."
-#~ msgstr "Keine Fehlerausgabe wurde von der Aktion erzeugt."
-
-#~ msgid "."
-#~ msgstr "."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid ""
-#~ "'%s' hook failed with error output:\n"
-#~ "%s"
-#~ msgstr ""
-#~ " %s Aktion scheiterte mit dem Fehler:\n"
-#~ "%s"
Modified: branches/file-externals/subversion/po/fr.po
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/po/fr.po?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/po/fr.po Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/po/fr.po Wed Jul 30 08:04:13 2008 (r32332)
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.6\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2008-06-27 12:54+0200\n"
-"PO-Revision-Date: 2008-06-27 13:32+0200\n"
+"POT-Creation-Date: 2008-07-17 15:16+0200\n"
+"PO-Revision-Date: 2008-07-17 15:31+0200\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: French <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -128,939 +128,943 @@ msgstr ""
# REPOS_PATH: CHEMIN_DÉPÔT
# SUBCOMMAND: SOUS_COMMANDE
#
-#: ../include/svn_error_codes.h:156
+#: ../include/svn_error_codes.h:158
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "Pool parent invalide passé svn_make_pool()"
-#: ../include/svn_error_codes.h:160
+#: ../include/svn_error_codes.h:162
msgid "Bogus filename"
msgstr "Nom de fichier invalide"
-#: ../include/svn_error_codes.h:164
+#: ../include/svn_error_codes.h:166
msgid "Bogus URL"
msgstr "URL invalide"
-#: ../include/svn_error_codes.h:168
+#: ../include/svn_error_codes.h:170
msgid "Bogus date"
msgstr "Date invalide"
-#: ../include/svn_error_codes.h:172
+#: ../include/svn_error_codes.h:174
msgid "Bogus mime-type"
msgstr "Type mime invalide"
-#: ../include/svn_error_codes.h:182
+#: ../include/svn_error_codes.h:184
msgid "Wrong or unexpected property value"
msgstr "Valeur de propriété invalide ou inattendue"
-#: ../include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:188
msgid "Version file format not correct"
msgstr "Format du fichier de version invalide"
-#: ../include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:192
msgid "Path is not an immediate child of the specified directory"
msgstr "Le chemin n'est pas un descendant direct du répertoire spécifié"
-#: ../include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:196
msgid "Bogus UUID"
msgstr "UUID invalide"
-#: ../include/svn_error_codes.h:199 ../include/svn_error_codes.h:787
+#: ../include/svn_error_codes.h:201 ../include/svn_error_codes.h:789
msgid "Invalid configuration value"
msgstr "Valeur de configuration invalide"
-#: ../include/svn_error_codes.h:203
+#: ../include/svn_error_codes.h:205
msgid "Bogus server specification"
msgstr "Spécification du serveur erronée"
-#: ../include/svn_error_codes.h:209
+#: ../include/svn_error_codes.h:211
msgid "No such XML tag attribute"
msgstr "Attribut d'étiquette XML invalide"
-#: ../include/svn_error_codes.h:213
+#: ../include/svn_error_codes.h:215
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> n'a pas d'ancêtre"
-#: ../include/svn_error_codes.h:217
+#: ../include/svn_error_codes.h:219
msgid "Unrecognized binary data encoding; can't decode"
msgstr "Encodage binaire non reconnu ; décodage impossible"
-#: ../include/svn_error_codes.h:221
+#: ../include/svn_error_codes.h:223
msgid "XML data was not well-formed"
msgstr "Données XML malformées"
-#: ../include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:227
msgid "Data cannot be safely XML-escaped"
msgstr "Une donnée ne peut être protégée sûrement dans du XML"
-#: ../include/svn_error_codes.h:231
+#: ../include/svn_error_codes.h:233
msgid "Inconsistent line ending style"
msgstr "Style de fin de ligne inconsistant"
-#: ../include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:237
msgid "Unrecognized line ending style"
msgstr "Style de fin de ligne non reconnu"
-#: ../include/svn_error_codes.h:240
+#: ../include/svn_error_codes.h:242
msgid "Line endings other than expected"
msgstr "Fins de lignes différentes de ce qui est attendu"
-#: ../include/svn_error_codes.h:244
+#: ../include/svn_error_codes.h:246
msgid "Ran out of unique names"
msgstr "Plus de noms uniques disponibles"
-#: ../include/svn_error_codes.h:249
+#: ../include/svn_error_codes.h:251
msgid "Framing error in pipe protocol"
msgstr "Erreur de fenêtrage (framing) dans le protocole de pipeline (pipe)"
-#: ../include/svn_error_codes.h:254
+#: ../include/svn_error_codes.h:256
msgid "Read error in pipe"
msgstr "Erreur de lecture sur un pipeline (pipe)"
-#: ../include/svn_error_codes.h:258 ../libsvn_subr/cmdline.c:312
-#: ../libsvn_subr/cmdline.c:329 ../svn/util.c:885
+#: ../include/svn_error_codes.h:260 ../libsvn_subr/cmdline.c:316
+#: ../libsvn_subr/cmdline.c:333 ../svn/util.c:885 ../svnlook/main.c:1685
#, c-format
msgid "Write error"
msgstr "Erreur d'écriture"
-#: ../include/svn_error_codes.h:264
+#: ../include/svn_error_codes.h:266
msgid "Unexpected EOF on stream"
msgstr "Fin de fichier (EOF) inattendue sur le flux"
-#: ../include/svn_error_codes.h:268
+#: ../include/svn_error_codes.h:270
msgid "Malformed stream data"
msgstr "Flux de données malformé"
-#: ../include/svn_error_codes.h:272
+#: ../include/svn_error_codes.h:274
msgid "Unrecognized stream data"
msgstr "Flux de données non reconnu"
-#: ../include/svn_error_codes.h:278
+#: ../include/svn_error_codes.h:280
msgid "Unknown svn_node_kind"
msgstr "svn_node_kind inconnu"
-#: ../include/svn_error_codes.h:282
+#: ../include/svn_error_codes.h:284
msgid "Unexpected node kind found"
msgstr "Type de nœud inattendu"
-#: ../include/svn_error_codes.h:288
+#: ../include/svn_error_codes.h:290
msgid "Can't find an entry"
msgstr "Entrée non trouvée"
-#: ../include/svn_error_codes.h:294
+#: ../include/svn_error_codes.h:296
msgid "Entry already exists"
msgstr "L'entrée existe déj "
-#: ../include/svn_error_codes.h:298
+#: ../include/svn_error_codes.h:300
msgid "Entry has no revision"
msgstr "L'entrée n'a pas de révision"
-#: ../include/svn_error_codes.h:302
+#: ../include/svn_error_codes.h:304
msgid "Entry has no URL"
msgstr "L'entrée n'a pas d'URL"
-#: ../include/svn_error_codes.h:306
+#: ../include/svn_error_codes.h:308
msgid "Entry has an invalid attribute"
msgstr "L'entrée a un attribut invalide"
-#: ../include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:314
msgid "Obstructed update"
msgstr "Actualisation bloquée"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:319
msgid "Mismatch popping the WC unwind stack"
msgstr "Mismatch popping the WC unwind stack"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:322
+#: ../include/svn_error_codes.h:324
msgid "Attempt to pop empty WC unwind stack"
msgstr "Attempt to pop empty WC unwind stack"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:327
+#: ../include/svn_error_codes.h:329
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Attempt to unlock with non-empty unwind stack"
-#: ../include/svn_error_codes.h:331
+#: ../include/svn_error_codes.h:333
msgid "Attempted to lock an already-locked dir"
msgstr "Tentative de verrouiller un répertoire déj verrouillé"
-#: ../include/svn_error_codes.h:335
+#: ../include/svn_error_codes.h:337
msgid "Working copy not locked; this is probably a bug, please report"
msgstr "Copie de travail non verrouillée ; probablement un bug rapporter"
-#: ../include/svn_error_codes.h:340
+#: ../include/svn_error_codes.h:342
msgid "Invalid lock"
msgstr "Verrou invalide"
-#: ../include/svn_error_codes.h:344
+#: ../include/svn_error_codes.h:346
msgid "Path is not a working copy directory"
msgstr "Le chemin n'est pas un répertoire d'une copie de travail"
-#: ../include/svn_error_codes.h:348
+#: ../include/svn_error_codes.h:350
msgid "Path is not a working copy file"
msgstr "Le chemin n'est pas un fichier d'une copie de travail"
-#: ../include/svn_error_codes.h:352
+#: ../include/svn_error_codes.h:354
msgid "Problem running log"
msgstr "Problème dans le journal"
-#: ../include/svn_error_codes.h:356
+#: ../include/svn_error_codes.h:358
msgid "Can't find a working copy path"
msgstr "Chemin d'une copie de travail non trouvé"
-#: ../include/svn_error_codes.h:360
+#: ../include/svn_error_codes.h:362
msgid "Working copy is not up-to-date"
msgstr "La copie de travail n'est pas jour"
-#: ../include/svn_error_codes.h:364
+#: ../include/svn_error_codes.h:366
msgid "Left locally modified or unversioned files"
msgstr "Il reste des fichiers localement modifiés ou non versionnés"
-#: ../include/svn_error_codes.h:368
+#: ../include/svn_error_codes.h:370
msgid "Unmergeable scheduling requested on an entry"
msgstr "Programmation d'opérations conflituelles sur une entrée"
-#: ../include/svn_error_codes.h:372
+#: ../include/svn_error_codes.h:374
msgid "Found a working copy path"
msgstr "Trouvé un chemin dans une copie de travail"
-#: ../include/svn_error_codes.h:376
+#: ../include/svn_error_codes.h:378
msgid "A conflict in the working copy obstructs the current operation"
msgstr "Un conflit dans la copie de travail bloque l'opération courante"
-#: ../include/svn_error_codes.h:380
+#: ../include/svn_error_codes.h:382
msgid "Working copy is corrupt"
msgstr "La copie de travail est corrompue"
-#: ../include/svn_error_codes.h:384
+#: ../include/svn_error_codes.h:386
msgid "Working copy text base is corrupt"
msgstr "Le texte de référence de la copie de travail est corrompu"
-#: ../include/svn_error_codes.h:388
+#: ../include/svn_error_codes.h:390
msgid "Cannot change node kind"
msgstr "Type de nœud non modifiable"
-#: ../include/svn_error_codes.h:392
+#: ../include/svn_error_codes.h:394
msgid "Invalid operation on the current working directory"
msgstr "Opération invalide sur le répertoire courant"
-#: ../include/svn_error_codes.h:396
+#: ../include/svn_error_codes.h:398
msgid "Problem on first log entry in a working copy"
msgstr "Problème rencontré avec la première entrée du journal de la copie de \
travail"
-#: ../include/svn_error_codes.h:400
+#: ../include/svn_error_codes.h:402
msgid "Unsupported working copy format"
msgstr "Format de copie de travail non reconnu"
-#: ../include/svn_error_codes.h:404
+#: ../include/svn_error_codes.h:406
msgid "Path syntax not supported in this context"
msgstr "Syntaxe avec chemin non acceptée dans ce contexte"
-#: ../include/svn_error_codes.h:409
+#: ../include/svn_error_codes.h:411
msgid "Invalid schedule"
msgstr "Programmation invalide"
-#: ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:416
msgid "Invalid relocation"
msgstr "Relocalisation invalide"
-#: ../include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:421
msgid "Invalid switch"
msgstr "Ré-aiguillage invalide"
-#: ../include/svn_error_codes.h:424
+#: ../include/svn_error_codes.h:426
msgid "Changelist doesn't match"
msgstr "La liste de changements ne correspond pas"
-#: ../include/svn_error_codes.h:429
+#: ../include/svn_error_codes.h:431
msgid "Conflict resolution failed"
msgstr "Échec de la résolution de conflit"
-#: ../include/svn_error_codes.h:433
+#: ../include/svn_error_codes.h:435
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "Échec de la localisatio du chemin source 'copyfrom' dans la copie de \
travail"
-#: ../include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:440
msgid "Moving a path from one changelist to another"
msgstr "Déplacement d'un chemin d'une liste de changements (changelist) une \
autre"
-#: ../include/svn_error_codes.h:445
+#: ../include/svn_error_codes.h:447
msgid "General filesystem error"
msgstr "Erreur générale du système de fichiers"
-#: ../include/svn_error_codes.h:449
+#: ../include/svn_error_codes.h:451
msgid "Error closing filesystem"
msgstr "Erreur la fermeture du système de fichiers"
-#: ../include/svn_error_codes.h:453
+#: ../include/svn_error_codes.h:455
msgid "Filesystem is already open"
msgstr "Système de fichier déj ouvert"
-#: ../include/svn_error_codes.h:457
+#: ../include/svn_error_codes.h:459
msgid "Filesystem is not open"
msgstr "Système de fichier non ouvert"
-#: ../include/svn_error_codes.h:461
+#: ../include/svn_error_codes.h:463
msgid "Filesystem is corrupt"
msgstr "Système de fichier corrompu"
-#: ../include/svn_error_codes.h:465
+#: ../include/svn_error_codes.h:467
msgid "Invalid filesystem path syntax"
msgstr "Syntaxe du chemin dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:469
+#: ../include/svn_error_codes.h:471
msgid "Invalid filesystem revision number"
msgstr "Numéro de révision dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:473
+#: ../include/svn_error_codes.h:475
msgid "Invalid filesystem transaction name"
msgstr "Nom de transaction dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:477
+#: ../include/svn_error_codes.h:479
msgid "Filesystem directory has no such entry"
msgstr "Le répertoire dans le système de fichiers ne contient pas cette entrée"
-#: ../include/svn_error_codes.h:481
+#: ../include/svn_error_codes.h:483
msgid "Filesystem has no such representation"
msgstr "Le système de fichiers ne contient pas cette représentation"
-#: ../include/svn_error_codes.h:485
+#: ../include/svn_error_codes.h:487
msgid "Filesystem has no such string"
msgstr "Le système de fichiers n'a pas cette chaîne (string)"
-#: ../include/svn_error_codes.h:489
+#: ../include/svn_error_codes.h:491
msgid "Filesystem has no such copy"
msgstr "Le système de fichiers n'a pas cette copie"
-#: ../include/svn_error_codes.h:493
+#: ../include/svn_error_codes.h:495
msgid "The specified transaction is not mutable"
msgstr "La transaction spécifiée n'est pas modifiable"
-#: ../include/svn_error_codes.h:497
+#: ../include/svn_error_codes.h:499
msgid "Filesystem has no item"
msgstr "Le système de fichiers ne contient pas cet élément"
-#: ../include/svn_error_codes.h:501
+#: ../include/svn_error_codes.h:503
msgid "Filesystem has no such node-rev-id"
msgstr "Le système de fichiers ne contient pas cet identificateur de révision de \
nœud (node-rev-id)"
-#: ../include/svn_error_codes.h:505
+#: ../include/svn_error_codes.h:507
msgid "String does not represent a node or node-rev-id"
msgstr "La chaîne ne représente ni un nœud ni un identificateur de révision de \
nœud (node-rev-id)"
-#: ../include/svn_error_codes.h:509
+#: ../include/svn_error_codes.h:511
msgid "Name does not refer to a filesystem directory"
msgstr "Le nom ne réfère pas un répertoire du système de fichiers"
-#: ../include/svn_error_codes.h:513
+#: ../include/svn_error_codes.h:515
msgid "Name does not refer to a filesystem file"
msgstr "Le nom ne réfère pas un fichier du système de fichiers"
-#: ../include/svn_error_codes.h:517
+#: ../include/svn_error_codes.h:519
msgid "Name is not a single path component"
msgstr "Le nom n'est pas un composant simple de chemin"
-#: ../include/svn_error_codes.h:521
+#: ../include/svn_error_codes.h:523
msgid "Attempt to change immutable filesystem node"
msgstr "Tentative de changement d'un nœud non-modifiable du système de fichiers"
-#: ../include/svn_error_codes.h:525
+#: ../include/svn_error_codes.h:527
msgid "Item already exists in filesystem"
msgstr "L'élément exite déj dans le système de fichiers"
-#: ../include/svn_error_codes.h:529
+#: ../include/svn_error_codes.h:531
msgid "Attempt to remove or recreate fs root dir"
msgstr "Tentative de suppression ou de recréation du répertoire racine du système \
de fichiers"
-#: ../include/svn_error_codes.h:533
+#: ../include/svn_error_codes.h:535
msgid "Object is not a transaction root"
msgstr "L'objet n'est pas une racine de transaction"
-#: ../include/svn_error_codes.h:537
+#: ../include/svn_error_codes.h:539
msgid "Object is not a revision root"
msgstr "L'objet n'est pas une racine de révision"
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:543
msgid "Merge conflict during commit"
msgstr "Fusion conflictuelle lors d'une propagation (commit)"
-#: ../include/svn_error_codes.h:545
+#: ../include/svn_error_codes.h:547
msgid "A representation vanished or changed between reads"
msgstr "Une représentation a disparu ou changé entre deux lectures"
-#: ../include/svn_error_codes.h:549
+#: ../include/svn_error_codes.h:551
msgid "Tried to change an immutable representation"
msgstr "Tentative de changement d'une représentation non-modifiable"
-#: ../include/svn_error_codes.h:553
+#: ../include/svn_error_codes.h:555
msgid "Malformed skeleton data"
msgstr "Données de squelette mal formées"
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:559
msgid "Transaction is out of date"
msgstr "La transaction est obsolète"
-#: ../include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:563
msgid "Berkeley DB error"
msgstr "Erreur de la base Berkeley"
-#: ../include/svn_error_codes.h:565
+#: ../include/svn_error_codes.h:567
msgid "Berkeley DB deadlock error"
msgstr "Erreur (étreinte fatale - deadlock) dans la base Berkeley"
-#: ../include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:571
msgid "Transaction is dead"
msgstr "Transaction morte"
-#: ../include/svn_error_codes.h:573
+#: ../include/svn_error_codes.h:575
msgid "Transaction is not dead"
msgstr "La transaction n'est pas morte"
-#: ../include/svn_error_codes.h:578
+#: ../include/svn_error_codes.h:580
msgid "Unknown FS type"
msgstr "Type de stockage de dépôt (FS) inconnu"
-#: ../include/svn_error_codes.h:583
+#: ../include/svn_error_codes.h:585
msgid "No user associated with filesystem"
msgstr "Aucun utilisateur associé au système de fichier"
-#: ../include/svn_error_codes.h:588
+#: ../include/svn_error_codes.h:590
msgid "Path is already locked"
msgstr "Chemin déj verrouillé"
-#: ../include/svn_error_codes.h:593 ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:595 ../include/svn_error_codes.h:746
msgid "Path is not locked"
msgstr "Le chemin n'est pas verrouillé"
-#: ../include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:600
msgid "Lock token is incorrect"
msgstr "Nom de verrou incorrect"
-#: ../include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:605
msgid "No lock token provided"
msgstr "Aucun nom de verrou fourni"
-#: ../include/svn_error_codes.h:608
+#: ../include/svn_error_codes.h:610
msgid "Username does not match lock owner"
msgstr "Le nom d'utilisateur ne correspond pas au propriétaire du verrou"
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:615
msgid "Filesystem has no such lock"
msgstr "Le système de fichiers n'a pas ce verrou"
-#: ../include/svn_error_codes.h:618
+#: ../include/svn_error_codes.h:620
msgid "Lock has expired"
msgstr "Verrou expiré"
-#: ../include/svn_error_codes.h:623 ../include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:625 ../include/svn_error_codes.h:733
msgid "Item is out of date"
msgstr "Élément obsolète"
-#: ../include/svn_error_codes.h:635
+#: ../include/svn_error_codes.h:637
msgid "Unsupported FS format"
msgstr "Format de stockage de dépôt (FS) non supporté"
-#: ../include/svn_error_codes.h:640
+#: ../include/svn_error_codes.h:642
msgid "Representation is being written"
msgstr "La représentation est en cours d'écriture"
-#: ../include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:647
msgid "The generated transaction name is too long"
msgstr "La nom généré pour la transaction est trop long"
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:652
msgid "Filesystem has no such node origin record"
msgstr "Le système de fichiers n'a pas d'enregistrement d'origine du nœud"
-#: ../include/svn_error_codes.h:655
+#: ../include/svn_error_codes.h:657
msgid "Filesystem upgrade is not supported"
msgstr "Mise jour (upgrade) du système de fichier non supportée"
-#: ../include/svn_error_codes.h:661
+#: ../include/svn_error_codes.h:663
msgid "The repository is locked, perhaps for db recovery"
msgstr "Dépôt verrouillé, peut-être un rétablissement (recovery) de base"
-#: ../include/svn_error_codes.h:665
+#: ../include/svn_error_codes.h:667
msgid "A repository hook failed"
msgstr "Échec d'une procédure automatique du dépôt"
-#: ../include/svn_error_codes.h:669
+#: ../include/svn_error_codes.h:671
msgid "Incorrect arguments supplied"
msgstr "Arguments fournis incorrects"
-#: ../include/svn_error_codes.h:673
+#: ../include/svn_error_codes.h:675
msgid "A report cannot be generated because no data was supplied"
msgstr "Un rapport ne peut être généré car aucune donnée n'a été fournie"
-#: ../include/svn_error_codes.h:677
+#: ../include/svn_error_codes.h:679
msgid "Bogus revision report"
msgstr "Rapport de révision invalide"
-#: ../include/svn_error_codes.h:686
+#: ../include/svn_error_codes.h:688
msgid "Unsupported repository version"
msgstr "Version de dépot non supportée"
-#: ../include/svn_error_codes.h:690
+#: ../include/svn_error_codes.h:692
msgid "Disabled repository feature"
msgstr "Fonction du dépôt désactivée"
-#: ../include/svn_error_codes.h:694
+#: ../include/svn_error_codes.h:696
msgid "Error running post-commit hook"
msgstr "Erreur de la procédure d'après propagation (post-commit hook)"
-#: ../include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:701
msgid "Error running post-lock hook"
msgstr "Erreur de la procédure d'après verrouillage (post-lock hook)"
-#: ../include/svn_error_codes.h:704
+#: ../include/svn_error_codes.h:706
msgid "Error running post-unlock hook"
msgstr "Erreur de la procédure de d'après déverrouillage (post-unlock hook)"
-#: ../include/svn_error_codes.h:709
+#: ../include/svn_error_codes.h:711
msgid "Repository upgrade is not supported"
msgstr "Mise jour du dépôt (upgrade) non supportée"
-#: ../include/svn_error_codes.h:715
+#: ../include/svn_error_codes.h:717
msgid "Bad URL passed to RA layer"
msgstr "Mauvaise URL fournie la couche RA"
-#: ../include/svn_error_codes.h:719
+#: ../include/svn_error_codes.h:721
msgid "Authorization failed"
msgstr "Autorisation refusée"
-#: ../include/svn_error_codes.h:723
+#: ../include/svn_error_codes.h:725
msgid "Unknown authorization method"
msgstr "Méthode d'autorisation inconnue"
-#: ../include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:729
msgid "Repository access method not implemented"
msgstr "Méthode d'accès au dépôt non implémentée"
-#: ../include/svn_error_codes.h:735
+#: ../include/svn_error_codes.h:737
msgid "Repository has no UUID"
msgstr "Le dépôt n'a pas d'identifiant unique (UUID)"
-#: ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:741
msgid "Unsupported RA plugin ABI version"
msgstr "Version du plugin RA (accès dépôt) ABI non supportée"
-#: ../include/svn_error_codes.h:749
+#: ../include/svn_error_codes.h:751
msgid "Server can only replay from the root of a repository"
msgstr "Le serveur peut seulement rejouer la racine du dépôt"
-#: ../include/svn_error_codes.h:754
+#: ../include/svn_error_codes.h:756
msgid "Repository UUID does not match expected UUID"
msgstr "UUID du dépôt source différent de celui attendu"
-#: ../include/svn_error_codes.h:760
+#: ../include/svn_error_codes.h:762
msgid "RA layer failed to init socket layer"
msgstr "La couche RA n'a pu initialiser la couche socket"
-#: ../include/svn_error_codes.h:764
+#: ../include/svn_error_codes.h:766
msgid "RA layer failed to create HTTP request"
msgstr "La couche RA n'a pu créer l'en-tête HTTP"
-#: ../include/svn_error_codes.h:768
+#: ../include/svn_error_codes.h:770
msgid "RA layer request failed"
msgstr "La requête de la couche RA a échoué"
-#: ../include/svn_error_codes.h:772
+#: ../include/svn_error_codes.h:774
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "La couche RA n'a pas reçu les informations d'OPTIONS demandées"
-#: ../include/svn_error_codes.h:776
+#: ../include/svn_error_codes.h:778
msgid "RA layer failed to fetch properties"
msgstr "La couche RA n'a pu aller chercher les propriétés"
-#: ../include/svn_error_codes.h:780
+#: ../include/svn_error_codes.h:782
msgid "RA layer file already exists"
msgstr "Le fichier existe (couche RA)"
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:796
msgid "HTTP Path Not Found"
msgstr "Chemin HTTP non trouvé"
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:800
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Échec lors de l'exécution de WebDAV PROPPATCH"
-#: ../include/svn_error_codes.h:803 ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:805 ../include/svn_error_codes.h:846
#: ../libsvn_ra_svn/marshal.c:651 ../libsvn_ra_svn/marshal.c:769
#: ../libsvn_ra_svn/marshal.c:796
msgid "Malformed network data"
msgstr "Donnée du réseau malformée"
-#: ../include/svn_error_codes.h:808
+#: ../include/svn_error_codes.h:810
msgid "Unable to extract data from response header"
msgstr "Impossible d'extraire les données de l'en-tête de réponse"
-#: ../include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:815
msgid "Repository has been moved"
msgstr "Le dépôt a été déplacé"
-#: ../include/svn_error_codes.h:819 ../include/svn_error_codes.h:848
+#: ../include/svn_error_codes.h:821 ../include/svn_error_codes.h:850
msgid "Couldn't find a repository"
msgstr "Impossible de trouver le dépôt"
-#: ../include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:825
msgid "Couldn't open a repository"
msgstr "Impossible d'ouvrir le dépôt"
-#: ../include/svn_error_codes.h:828
+#: ../include/svn_error_codes.h:830
msgid "Special code for wrapping server errors to report to client"
msgstr "Code spécial pour enpaqueter les erreurs du serveur vers le client"
-#: ../include/svn_error_codes.h:832
+#: ../include/svn_error_codes.h:834
msgid "Unknown svn protocol command"
msgstr "Commande du protocole svn inconnue"
-#: ../include/svn_error_codes.h:836
+#: ../include/svn_error_codes.h:838
msgid "Network connection closed unexpectedly"
msgstr "La connection réseau a été fermée de façon inattendue"
-#: ../include/svn_error_codes.h:840
+#: ../include/svn_error_codes.h:842
msgid "Network read/write error"
msgstr "Erreur d'écriture/lecture réseau"
-#: ../include/svn_error_codes.h:852
+#: ../include/svn_error_codes.h:854
msgid "Client/server version mismatch"
msgstr "Versions client/serveur incompatibles"
-#: ../include/svn_error_codes.h:857
+#: ../include/svn_error_codes.h:859
msgid "Cannot negotiate authentication mechanism"
msgstr "Impossible de négocier de mécanisme d'authentification"
-#: ../include/svn_error_codes.h:863
+#: ../include/svn_error_codes.h:865
msgid "Initialization of SSPI library failed"
msgstr "Échec l'initialisation de la librairie SSPI"
-#: ../include/svn_error_codes.h:867
+#: ../include/svn_error_codes.h:869
msgid "Server SSL certificate untrusted"
msgstr "Certificat SSL du serveur non reconnu"
-#: ../include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:877
msgid "Credential data unavailable"
msgstr "Données d'identité (credentials) non disponibles"
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:881
msgid "No authentication provider available"
msgstr "Aucun fournisseur d'authentification disponible"
-#: ../include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:885
msgid "All authentication providers exhausted"
msgstr "Tous les fournisseurs d'authentifications sont épuisés"
-#: ../include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:889
msgid "Credentials not saved"
msgstr "Identité (credentials) non sauvegardée"
-#: ../include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:894
msgid "Authentication failed"
msgstr "Échec de l'authentification"
-#: ../include/svn_error_codes.h:898
+#: ../include/svn_error_codes.h:900
msgid "Read access denied for root of edit"
msgstr "Accès en lecture refusé pour la racine de l'édition"
-#: ../include/svn_error_codes.h:903
+#: ../include/svn_error_codes.h:905
msgid "Item is not readable"
msgstr "Éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:910
msgid "Item is partially readable"
msgstr "Certains éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:912
+#: ../include/svn_error_codes.h:914
msgid "Invalid authz configuration"
msgstr "Configuration de authz invalide"
-#: ../include/svn_error_codes.h:917
+#: ../include/svn_error_codes.h:919
msgid "Item is not writable"
msgstr "Éléments non accessibles en écriture"
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:925
msgid "Svndiff data has invalid header"
msgstr "Les données de svndiff contiennent un en-tête invalide"
-#: ../include/svn_error_codes.h:927
+#: ../include/svn_error_codes.h:929
msgid "Svndiff data contains corrupt window"
msgstr "Les données de svndiff contiennent une fenêtre corrompue"
-#: ../include/svn_error_codes.h:931
+#: ../include/svn_error_codes.h:933
msgid "Svndiff data contains backward-sliding source view"
msgstr "Les données de 'svndiff' contiennent une vue source glissant en arrière"
-#: ../include/svn_error_codes.h:935
+#: ../include/svn_error_codes.h:937
msgid "Svndiff data contains invalid instruction"
msgstr "Les données de svndiff contiennent une instruction invalide"
-#: ../include/svn_error_codes.h:939
+#: ../include/svn_error_codes.h:941
msgid "Svndiff data ends unexpectedly"
msgstr "Les données de svndiff se terminent de façon inattendue"
-#: ../include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:945
msgid "Svndiff compressed data is invalid"
msgstr "Les données compressées de svndiff sont invalides"
-#: ../include/svn_error_codes.h:949
+#: ../include/svn_error_codes.h:951
msgid "Diff data source modified unexpectedly"
msgstr "Modification des données sources de diff inattendue"
-#: ../include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:957
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache n'a pas de chemin vers un système de fichier SVN"
-#: ../include/svn_error_codes.h:959
+#: ../include/svn_error_codes.h:961
msgid "Apache got a malformed URI"
msgstr "Apache a reçu une URI malformé"
-#: ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:965
msgid "Activity not found"
msgstr "Activité non trouvée"
-#: ../include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:969
msgid "Baseline incorrect"
msgstr "Ligne de base (baseline) incorrecte"
-#: ../include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:973
msgid "Input/output error"
msgstr "Erreur d'entrée/sortie"
-#: ../include/svn_error_codes.h:977
+#: ../include/svn_error_codes.h:979
msgid "A path under version control is needed for this operation"
msgstr "Un objet sous gestionnaire de version est nécessaire cette opération"
-#: ../include/svn_error_codes.h:981
+#: ../include/svn_error_codes.h:983
msgid "Repository access is needed for this operation"
msgstr "L'accès au dépôt est nécessaire pour cette opération"
-#: ../include/svn_error_codes.h:985
+#: ../include/svn_error_codes.h:987
msgid "Bogus revision information given"
msgstr "Fausse information de révision donnée"
-#: ../include/svn_error_codes.h:989
+#: ../include/svn_error_codes.h:991
msgid "Attempting to commit to a URL more than once"
msgstr "Tentative de propager plus d'une fois la même URL"
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:995
msgid "Operation does not apply to binary file"
msgstr "Opération non applicable un fichier binaire"
-#: ../include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1001
msgid "Format of an svn:externals property was invalid"
msgstr "Format de la propriété svn:externals invalide"
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1005
msgid "Attempting restricted operation for modified resource"
msgstr "Tentative d'une opération protégée sur une ressource modifiée"
-#: ../include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1009
msgid "Operation does not apply to directory"
msgstr "Opération non applicable sur un répertoire"
-#: ../include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1013
msgid "Revision range is not allowed"
msgstr "Intervalle de révision non permise"
-#: ../include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1017
msgid "Inter-repository relocation not allowed"
msgstr "Relocalisation entre dépôts différents non permise"
-#: ../include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1021
msgid "Author name cannot contain a newline"
msgstr "Le nom d'auteur ne peut contenir un saut de ligne"
-#: ../include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1025
msgid "Bad property name"
msgstr "Mauvais nom de propriété"
-#: ../include/svn_error_codes.h:1028
+#: ../include/svn_error_codes.h:1030
msgid "Two versioned resources are unrelated"
msgstr "Les deux ressources versionnées ne sont pas apparentées"
-#: ../include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1035
msgid "Path has no lock token"
msgstr "Chemin sans verrou"
-#: ../include/svn_error_codes.h:1038
+#: ../include/svn_error_codes.h:1040
msgid "Operation does not support multiple sources"
msgstr "Opération ne supportant pas des sources multiples"
-#: ../include/svn_error_codes.h:1043
+#: ../include/svn_error_codes.h:1045
msgid "No versioned parent directories"
msgstr "Pas de répertoire parent versionné"
-#: ../include/svn_error_codes.h:1048
+#: ../include/svn_error_codes.h:1050
msgid "Working copy and merge source not ready for reintegration"
msgstr "Copie de travail et source du merge non prêt pour une réintégration"
-#: ../include/svn_error_codes.h:1054
+#: ../include/svn_error_codes.h:1056
msgid "A problem occurred; see other errors for details"
msgstr "Une erreur est survenue ; voir les autres erreurs pour plus de détails"
-#: ../include/svn_error_codes.h:1058
+#: ../include/svn_error_codes.h:1060
msgid "Failure loading plugin"
msgstr "Erreur lors du chargement du plugin"
-#: ../include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1064
msgid "Malformed file"
msgstr "Fichier malformé"
-#: ../include/svn_error_codes.h:1066
+#: ../include/svn_error_codes.h:1068
msgid "Incomplete data"
msgstr "Données incomplètes"
-#: ../include/svn_error_codes.h:1070
+#: ../include/svn_error_codes.h:1072
msgid "Incorrect parameters given"
msgstr "Paramètres fournis incorrects"
-#: ../include/svn_error_codes.h:1074
+#: ../include/svn_error_codes.h:1076
msgid "Tried a versioning operation on an unversioned resource"
msgstr "Essai d'une opération sur une ressource non versionnée"
-#: ../include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1080
msgid "Test failed"
msgstr "Test échoué"
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1084
msgid "Trying to use an unsupported feature"
msgstr "Tentative d'utilisation d'une fonction non supportée"
-#: ../include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1088
msgid "Unexpected or unknown property kind"
msgstr "Type de propriété inattendu ou inconnu"
-#: ../include/svn_error_codes.h:1090
+#: ../include/svn_error_codes.h:1092
msgid "Illegal target for the requested operation"
msgstr "Cible illégale pour l'opération demandée"
-#: ../include/svn_error_codes.h:1094
+#: ../include/svn_error_codes.h:1096
msgid "MD5 checksum is missing"
msgstr "Somme de contrôle MD5 manquante"
-#: ../include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1100
msgid "Directory needs to be empty but is not"
msgstr "Un répertoire doit être vide mais ne l'est pas"
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1104
msgid "Error calling external program"
msgstr "Erreur lors de l'appel d'un programme externe"
-#: ../include/svn_error_codes.h:1106
+#: ../include/svn_error_codes.h:1108
msgid "Python exception has been set with the error"
msgstr "L'exception de Python a été levée avec l'erreur"
-#: ../include/svn_error_codes.h:1110
+#: ../include/svn_error_codes.h:1112
msgid "A checksum mismatch occurred"
msgstr "Sommes de contrôle différentes"
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1116
msgid "The operation was interrupted"
msgstr "Opération interrompue"
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1120
msgid "The specified diff option is not supported"
msgstr "L'option fournie diff n'est pas supportée"
-#: ../include/svn_error_codes.h:1122
+#: ../include/svn_error_codes.h:1124
msgid "Property not found"
msgstr "Propriété non trouvée"
-#: ../include/svn_error_codes.h:1126
+#: ../include/svn_error_codes.h:1128
msgid "No auth file path available"
msgstr "Pas de chemin de fichier d'authentification (auth file) disponible"
-#: ../include/svn_error_codes.h:1131
+#: ../include/svn_error_codes.h:1133
msgid "Incompatible library version"
msgstr "Version de librairie incompatible"
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1138
msgid "Mergeinfo parse error"
msgstr "Mergeinfo : erreur de syntaxe"
-#: ../include/svn_error_codes.h:1141
+#: ../include/svn_error_codes.h:1143
msgid "Cease invocation of this API"
msgstr "Cesse l'invocation de cette API"
-#: ../include/svn_error_codes.h:1146
+#: ../include/svn_error_codes.h:1148
msgid "Error parsing revision number"
msgstr "Erreur de syntaxe sur le numéro révision"
-#: ../include/svn_error_codes.h:1151
+#: ../include/svn_error_codes.h:1153
msgid "Iteration terminated before completion"
msgstr "Itérations arrêtées avant la fin"
-#: ../include/svn_error_codes.h:1156
+#: ../include/svn_error_codes.h:1158
msgid "Unknown changelist"
msgstr "Liste de changements inconnue"
-#: ../include/svn_error_codes.h:1161
+#: ../include/svn_error_codes.h:1163
msgid "Reserved directory name in command line arguments"
msgstr "Nom de répertoire réservé en argument de la ligne de commande"
-#: ../include/svn_error_codes.h:1166
+#: ../include/svn_error_codes.h:1168
msgid "Inquiry about unknown capability"
msgstr "Demande concernant une capacité inconnue"
-#: ../include/svn_error_codes.h:1171
+#: ../include/svn_error_codes.h:1173
msgid "Test skipped"
msgstr "Test ignoré"
-#: ../include/svn_error_codes.h:1176
+#: ../include/svn_error_codes.h:1178
msgid "apr memcache library not available"
msgstr "La librairie APR memcache non disponible"
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1184
msgid "Error parsing arguments"
msgstr "Erreur lors de l'analyse des arguments"
-#: ../include/svn_error_codes.h:1186
+#: ../include/svn_error_codes.h:1188
msgid "Not enough arguments provided"
msgstr "Nombre d'arguments insuffisant"
-#: ../include/svn_error_codes.h:1190
+#: ../include/svn_error_codes.h:1192
msgid "Mutually exclusive arguments specified"
msgstr "Arguments mutuellement exclusifs fournis"
-#: ../include/svn_error_codes.h:1194
+#: ../include/svn_error_codes.h:1196
msgid "Attempted command in administrative dir"
msgstr "Commande essayée sur un répertoire d'administration"
-#: ../include/svn_error_codes.h:1198
+#: ../include/svn_error_codes.h:1200
msgid "The log message file is under version control"
msgstr "Le fichier pour l'entrée du journal est sous gestionnaire de version"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1204
msgid "The log message is a pathname"
msgstr "L'entrée du journal est un chemin de fichier"
-#: ../include/svn_error_codes.h:1206
+#: ../include/svn_error_codes.h:1208
msgid "Committing in directory scheduled for addition"
msgstr "Propagation dans un répertoire qui doit être ajouté"
-#: ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1212
msgid "No external editor available"
msgstr "Pas d'éditeur externe disponible"
-#: ../include/svn_error_codes.h:1214
+#: ../include/svn_error_codes.h:1216
msgid "Something is wrong with the log message's contents"
msgstr "Quelque chose ne va pas dans l'entrée du journal"
-#: ../include/svn_error_codes.h:1218
+#: ../include/svn_error_codes.h:1220
msgid "A log message was given where none was necessary"
msgstr "Message de journal fourni alors qu'aucun n'était nécessaire"
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1224
msgid "No external merge tool available"
msgstr "Aucun éditeur externe de fusion disponible"
+#: ../include/svn_error_codes.h:1230
+msgid "Assertion failure"
+msgstr "Échec de la vérification"
+
#: ../libsvn_client/add.c:349 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
@@ -1098,36 +1102,26 @@ msgstr "(local)"
msgid "URL '%s' refers to a directory"
msgstr "L'URL '%s' référence un répertoire"
-#: ../libsvn_client/checkout.c:66
-#, c-format
-msgid "svn_client__checkout_internal() must be passed a non-NULL path"
-msgstr "svn_client__checkout_internal() prend un chemin non-NULL"
-
-#: ../libsvn_client/checkout.c:70
-#, c-format
-msgid "svn_client__checkout_internal() must be passed a non-NULL url"
-msgstr "svn_client__checkout_internal() prend une URL non-NULL"
-
-#: ../libsvn_client/checkout.c:96 ../libsvn_client/export.c:943
+#: ../libsvn_client/checkout.c:90 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "L'URL '%s' n'existe pas"
-#: ../libsvn_client/checkout.c:100
+#: ../libsvn_client/checkout.c:94
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "L'URL '%s' désigne un fichier et non un répertoire"
-#: ../libsvn_client/checkout.c:172
+#: ../libsvn_client/checkout.c:166
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' est déj une copie de travail pour une autre URL"
-#: ../libsvn_client/checkout.c:176
+#: ../libsvn_client/checkout.c:170
msgid "; run 'svn update' to complete it"
msgstr "; lancer 'svn update' pour le finir."
-#: ../libsvn_client/checkout.c:186
+#: ../libsvn_client/checkout.c:180
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' existe déj et n'est pas un répertoire"
@@ -1163,7 +1157,7 @@ msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
#: ../libsvn_client/commit.c:635 ../libsvn_client/copy.c:512
-#: ../svnlook/main.c:1271
+#: ../svnlook/main.c:1309
#, c-format
msgid "Path '%s' does not exist"
msgstr "Le chemin '%s' n'existe pas"
@@ -1279,7 +1273,7 @@ msgstr "'%s' et '%s' réfèrent la m
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "L'élément de propagation '%s' marqué pour copie avec une révision \
invalide"
-#: ../libsvn_client/commit_util.c:1871
+#: ../libsvn_client/commit_util.c:1869
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Les propriétés standards ne peuvent être définies explicitement comme \
des propriétés de révision"
@@ -1324,7 +1318,7 @@ msgstr "Chemin '%s' non trouvé la r
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "L'entrée pour '%s' existe (mais la copie locale manque)"
-#: ../libsvn_client/copy.c:1737 ../libsvn_client/diff.c:1749
+#: ../libsvn_client/copy.c:1737 ../libsvn_client/diff.c:1747
#: ../libsvn_client/log.c:335
msgid "Revision type requires a working copy path, not a URL"
msgstr "Type de révision qui requiert un chemin dans une copie locale, pas une URL"
@@ -1363,7 +1357,7 @@ msgstr "'%s' obstrue le chemin de la res
#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:3000
#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
-#: ../libsvn_wc/entries.c:3005 ../libsvn_wc/update_editor.c:2394
+#: ../libsvn_wc/entries.c:3003 ../libsvn_wc/update_editor.c:2392
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' n'est pas versionné"
@@ -1424,8 +1418,8 @@ msgstr "%s\t(copie de travail)"
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Impossible d'afficher : fichier considéré comme binaire.%s"
-#: ../libsvn_client/diff.c:904 ../libsvn_client/merge.c:3827
-#: ../libsvn_client/merge.c:5268
+#: ../libsvn_client/diff.c:904 ../libsvn_client/merge.c:4208
+#: ../libsvn_client/merge.c:5652
msgid "Not all required revisions are specified"
msgstr "Toutes les révisions requises ne sont pas précisées"
@@ -1442,16 +1436,16 @@ msgstr "'%s' n'existe pas dans le dépô
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "Désolé, appel de svn_client_diff4 de manière non encore supportée"
-#: ../libsvn_client/diff.c:1142
+#: ../libsvn_client/diff.c:1141
msgid "Only diffs between a path's text-base and its working files are supported at \
this time" msgstr "Seules les différences entre des copies de référence et leurs \
fichiers de travail sont supportées pour l'instant"
-#: ../libsvn_client/diff.c:1287 ../libsvn_client/switch.c:126
+#: ../libsvn_client/diff.c:1285 ../libsvn_client/switch.c:126
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Le répertoire '%s' n'a pas d'URL associée"
-#: ../libsvn_client/diff.c:1498
+#: ../libsvn_client/diff.c:1496
msgid "Summarizing diff can only compare repository to repository"
msgstr "Le diff résumé compare seulement un dépôt un autre"
@@ -1475,7 +1469,7 @@ msgid "'%s' already exists"
msgstr "'%s' existe déj "
#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
-#: ../libsvn_wc/update_editor.c:2078 ../libsvn_wc/update_editor.c:2746
+#: ../libsvn_wc/update_editor.c:2076 ../libsvn_wc/update_editor.c:2744
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Sommes de contrôle différentes pour '%s' ; '%s' attendu, '%s' obtenu"
@@ -1505,17 +1499,12 @@ msgstr "L'URL relative externe '%s' ne p
msgid "Unrecognized format for the relative external URL '%s'"
msgstr "Format d'URL relative externe non reconnu '%s'"
-#: ../libsvn_client/externals.c:512
-#, c-format
-msgid "handle_external_item_change() must be passed at least one non-NULL old or new \
external item"
-msgstr "handle_external_item_change() prend au moins un élément externe ancien ou \
nouveau non-NULL"
-
-#: ../libsvn_client/externals.c:693
+#: ../libsvn_client/externals.c:689
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "Traversée de '%s' sans profondeur dans le contexte"
-#: ../libsvn_client/externals.c:824
+#: ../libsvn_client/externals.c:820
#, c-format
msgid "'%s' is not a URL"
msgstr "'%s' n'est pas une URL"
@@ -1540,9 +1529,9 @@ msgstr "L'URL '%s' n'existe pas cette
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "Aucun parent commun trouvé, impossible de travailler avec des arguments \
disjoints"
-#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:5285
-#: ../libsvn_client/merge.c:5291 ../libsvn_client/merge.c:5862
-#: ../libsvn_client/merge.c:6018 ../libsvn_client/ra.c:397
+#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:5669
+#: ../libsvn_client/merge.c:5675 ../libsvn_client/merge.c:6246
+#: ../libsvn_client/merge.c:6402 ../libsvn_client/ra.c:397
#: ../libsvn_client/ra.c:434 ../libsvn_client/ra.c:637
#, c-format
msgid "'%s' has no URL"
@@ -1563,7 +1552,7 @@ msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
#: ../libsvn_client/locking_commands.c:411 ../libsvn_fs/fs-loader.c:1035
-#: ../libsvn_ra/ra_loader.c:1254
+#: ../libsvn_ra/ra_loader.c:1287
msgid "Lock comment contains illegal characters"
msgstr "Le commentaire du verrou (lock) contient des caractères incorrects"
@@ -1617,11 +1606,11 @@ msgstr ".fusion-gauche.r%ld"
msgid ".merge-right.r%ld"
msgstr ".fusion-droit.r%ld"
-#: ../libsvn_client/merge.c:1766
+#: ../libsvn_client/merge.c:2170
msgid "Cannot reverse-merge a range from a path's own future history; try updating \
first" msgstr "Impossible de fusionner un intervalle inversé partir du futur du \
chemin considéré ; essayer une mise jour d'abord"
-#: ../libsvn_client/merge.c:2258
+#: ../libsvn_client/merge.c:2677
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1634,45 +1623,45 @@ msgstr ""
"résoudre tous les conflits et ré-exécuter la fusion (merge) pour \n"
"appliquer les révisions non-fusionnées restantes"
-#: ../libsvn_client/merge.c:4983
+#: ../libsvn_client/merge.c:5367
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "L'utilisation de deux URLs n'est pas compatible avec la modification des \
informations de fusion 'mergeinfo'"
-#: ../libsvn_client/merge.c:4990 ../libsvn_client/merge.c:5206
+#: ../libsvn_client/merge.c:5374 ../libsvn_client/merge.c:5590
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "La fusion partir d'un autre dépôt n'est pas compatible avec la \
modification des informations de fusion 'mergeinfo'"
-#: ../libsvn_client/merge.c:5512
+#: ../libsvn_client/merge.c:5896
msgid "Cannot reintegrate into a working copy with a switched subtree"
msgstr "Impossible de réintégrer dans une copie de travail avec un sous-arbre \
ré-aiguillé"
-#: ../libsvn_client/merge.c:5517
+#: ../libsvn_client/merge.c:5901
msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
msgstr "Impossible de reintégrer dans une copie de travail de profondeur partielle"
-#: ../libsvn_client/merge.c:5522
+#: ../libsvn_client/merge.c:5906
msgid "Cannot reintegrate into a working copy that has local modifications"
msgstr "Impossible de réintégrer dans une copie de travail avec des modifications \
locales"
-#: ../libsvn_client/merge.c:5528
+#: ../libsvn_client/merge.c:5912
msgid "Cannot determine revision of working copy"
msgstr "Impossible de déterminer la révision de la copie de travail"
-#: ../libsvn_client/merge.c:5532
+#: ../libsvn_client/merge.c:5916
msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
msgstr "Impossible de reintégrer dans un copie de travail avec des révisions \
multiples ; Faire une mise jour (update) d'abord"
-#: ../libsvn_client/merge.c:5599
+#: ../libsvn_client/merge.c:5983
#, c-format
msgid "At least one revision (r%ld) not yet merged from '%s'"
msgstr "Au moins une révision (r%ld) non encore fusionnée partir de '%s'"
-#: ../libsvn_client/merge.c:5757 ../libsvn_client/merge.c:5921
+#: ../libsvn_client/merge.c:6141 ../libsvn_client/merge.c:6305
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "'%s@%ld' doit un ancêtre de '%s@%ld'"
-#: ../libsvn_client/merge.c:5880
+#: ../libsvn_client/merge.c:6264
#, c-format
msgid "'%s' must be from the same repository as '%s'"
msgstr "'%s' doit être dans le même dépôt que '%s'"
@@ -1777,7 +1766,7 @@ msgid "Unrecognized revision type reques
msgstr "Type de révision demandé inconnu pour '%s'"
#: ../libsvn_client/switch.c:144 ../libsvn_ra_local/ra_plugin.c:196
-#: ../libsvn_ra_local/ra_plugin.c:271 ../libsvn_wc/update_editor.c:3266
+#: ../libsvn_ra_local/ra_plugin.c:271 ../libsvn_wc/update_editor.c:3264
#, c-format
msgid ""
"'%s'\n"
@@ -2000,29 +1989,29 @@ msgstr "Le nœud origine pour '%s' exist
msgid "storing node-origins record"
msgstr "sauvegarde des enregistrements d'origines de nœud"
-#: ../libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/nodes-table.c:96
msgid "allocating new node ID (getting 'next-key')"
msgstr "allouant un nouvel identifiant de nœud ('next-key')"
-#: ../libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:114
msgid "bumping next node ID key"
msgstr "incrémentant le prochain identifiant de nœud"
-#: ../libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:150
#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr "L'identifiant suivant '%s' (pour '%s') existe déj dans le système de \
fichiers '%s'"
-#: ../libsvn_fs_base/bdb/nodes-table.c:178
+#: ../libsvn_fs_base/bdb/nodes-table.c:176
msgid "deleting entry from 'nodes' table"
msgstr "effaçant l'entrée de la table des nœuds"
#. Handle any other error conditions.
-#: ../libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:216
msgid "reading node revision"
msgstr "lisant la révision du nœud"
-#: ../libsvn_fs_base/bdb/nodes-table.c:251
+#: ../libsvn_fs_base/bdb/nodes-table.c:249
msgid "storing node revision"
msgstr "sauvegardant la révision du nœud"
@@ -2310,7 +2299,7 @@ msgstr "Le module '%s' nécessite la ver
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Format de stockage attendu '%d' ; format trouvé '%d'"
-#: ../libsvn_fs_base/fs.c:1166
+#: ../libsvn_fs_base/fs.c:1183
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2321,7 +2310,7 @@ msgstr ""
"interfère peut-être avec la copie chaud (hotcopy).\n"
"Si le problème persiste, essayer de la désactiver dans DB_CONFIG"
-#: ../libsvn_fs_base/fs.c:1185
+#: ../libsvn_fs_base/fs.c:1202
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2332,11 +2321,11 @@ msgstr ""
"L'option DB_LOG_AUTOREMOVE interfère peut être avec la copie chaud.\n"
"Si le problème persiste, essayer de la désactiver dans DB_CONFIG"
-#: ../libsvn_fs_base/fs.c:1232
+#: ../libsvn_fs_base/fs.c:1249
msgid "Module for working with a Berkeley DB repository."
msgstr "Module destiné travailler avec un dépôt Berkeley DB."
-#: ../libsvn_fs_base/fs.c:1267
+#: ../libsvn_fs_base/fs.c:1284
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Version %d du chargeur FS non supportée pour bdb"
@@ -2440,62 +2429,62 @@ msgstr "La transaction n'est pas morte :
msgid "Transaction is dead: '%s'"
msgstr "Transaction morte : '%s'"
-#: ../libsvn_fs_base/revs-txns.c:1007
+#: ../libsvn_fs_base/revs-txns.c:1006
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaction interrompue, mais échec du nettoyage (cleanup)"
-#: ../libsvn_fs_base/tree.c:767 ../libsvn_fs_fs/tree.c:694
+#: ../libsvn_fs_base/tree.c:766 ../libsvn_fs_fs/tree.c:691
#, c-format
msgid "Failure opening '%s'"
msgstr "Échec l'ouverture de '%s'"
-#: ../libsvn_fs_base/tree.c:1399 ../libsvn_fs_fs/tree.c:1129
+#: ../libsvn_fs_base/tree.c:1398 ../libsvn_fs_fs/tree.c:1126
msgid "Cannot compare property value between two different filesystems"
msgstr "Impossible de comparer des propriétés entre deux systèmes de fichiers \
différents"
-#: ../libsvn_fs_base/tree.c:1744
+#: ../libsvn_fs_base/tree.c:1743
msgid "Corrupt DB: faulty predecessor count"
msgstr "Base de données corrompue : nombre de prédécesseurs incorrect"
-#: ../libsvn_fs_base/tree.c:1799 ../libsvn_fs_fs/tree.c:1165
+#: ../libsvn_fs_base/tree.c:1798 ../libsvn_fs_fs/tree.c:1162
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Nœud non-modifiable inattendu '%s'"
-#: ../libsvn_fs_base/tree.c:1820 ../libsvn_fs_fs/tree.c:1188
+#: ../libsvn_fs_base/tree.c:1819 ../libsvn_fs_fs/tree.c:1185
#, c-format
msgid "Conflict at '%s'"
msgstr "Conflit sur '%s'"
-#: ../libsvn_fs_base/tree.c:1873 ../libsvn_fs_base/tree.c:2625
-#: ../libsvn_fs_fs/tree.c:1239 ../libsvn_fs_fs/tree.c:1778
+#: ../libsvn_fs_base/tree.c:1872 ../libsvn_fs_base/tree.c:2624
+#: ../libsvn_fs_fs/tree.c:1236 ../libsvn_fs_fs/tree.c:1775
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "Mauvaise fusion (merge) ; parent, source et cible pas tous dans le même FS"
-#: ../libsvn_fs_base/tree.c:1889 ../libsvn_fs_fs/tree.c:1255
+#: ../libsvn_fs_base/tree.c:1888 ../libsvn_fs_fs/tree.c:1252
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "Mauvaise fusion (merge) ; la cible '%s' a l'id '%s', comme le parent"
-#: ../libsvn_fs_base/tree.c:2432
+#: ../libsvn_fs_base/tree.c:2431
#, c-format
msgid "Transaction '%s' out-of-date with respect to revision '%s'"
msgstr "Transaction '%s' obsolète par rapport la révision '%s'"
-#: ../libsvn_fs_base/tree.c:2810 ../libsvn_fs_fs/tree.c:1916
+#: ../libsvn_fs_base/tree.c:2809 ../libsvn_fs_fs/tree.c:1913
msgid "The root directory cannot be deleted"
msgstr "Le répertoire racine ne peut être effacé"
-#: ../libsvn_fs_base/tree.c:3031 ../libsvn_fs_fs/tree.c:1999
+#: ../libsvn_fs_base/tree.c:3030 ../libsvn_fs_fs/tree.c:1996
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Impossible de copier d'un système de fichiers l'autre ('%s' et '%s')"
-#: ../libsvn_fs_base/tree.c:3040 ../libsvn_fs_fs/tree.c:2005
+#: ../libsvn_fs_base/tree.c:3039 ../libsvn_fs_fs/tree.c:2002
msgid "Copy from mutable tree not currently supported"
msgstr "Copie partir d'un arbre modifiable non supportée"
-#: ../libsvn_fs_base/tree.c:3537 ../libsvn_fs_fs/tree.c:2455
+#: ../libsvn_fs_base/tree.c:3536 ../libsvn_fs_fs/tree.c:2452
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2506,23 +2495,23 @@ msgstr ""
" attendu : %s\n"
" obtenu : %s\n"
-#: ../libsvn_fs_base/tree.c:3792 ../libsvn_fs_fs/tree.c:2691
+#: ../libsvn_fs_base/tree.c:3791 ../libsvn_fs_fs/tree.c:2688
msgid "Cannot compare file contents between two different filesystems"
msgstr "Impossible de comparer le contenu de fichiers dans des système de fichiers \
différents"
-#: ../libsvn_fs_base/tree.c:3801 ../libsvn_fs_base/tree.c:3806
-#: ../libsvn_fs_fs/tree.c:2700 ../libsvn_fs_fs/tree.c:2705
+#: ../libsvn_fs_base/tree.c:3800 ../libsvn_fs_base/tree.c:3805
+#: ../libsvn_fs_fs/tree.c:2697 ../libsvn_fs_fs/tree.c:2702
#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' n'est pas un fichier"
-#: ../libsvn_fs_base/tree.c:4811 ../libsvn_fs_base/tree.c:4999
+#: ../libsvn_fs_base/tree.c:4810 ../libsvn_fs_base/tree.c:4998
#, c-format
msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
msgstr "La révision du nœud '%s' déclare une information de fusion mais n'en a \
pas"
-#: ../libsvn_fs_base/tree.c:4835
+#: ../libsvn_fs_base/tree.c:4834
#, c-format
msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not \
a directory" msgstr "La révision du nœud '%s' déclare être une tête \
d'information de fusion mais n'est pas un répertoire" @@ -2545,7 +2534,7 @@ msgstr \
"Impossible d'incrémenter le com msgid "Can't increment mergeinfo count on *file* \
node-revision %%s to %%%s (> 1)" msgstr "Impossible d'incrémenter le compteur \
d'informations du fusion sur le *fichier* de la révision de nœud %%s %%%s (> 1)" \
-#: ../libsvn_fs_fs/dag.c:1048
+#: ../libsvn_fs_fs/dag.c:1045
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2556,33 +2545,33 @@ msgstr ""
" attendu : %s\n"
" obtenu : %s\n"
-#: ../libsvn_fs_fs/dag.c:1145
+#: ../libsvn_fs_fs/dag.c:1142
msgid "Empty noderev in cache"
msgstr "'noderev' vide dans le cache"
-#: ../libsvn_fs_fs/dag.c:1155
+#: ../libsvn_fs_fs/dag.c:1152
msgid "Kindless noderev in cache"
msgstr "'noderev' sans type dans le cache"
-#: ../libsvn_fs_fs/dag.c:1162
+#: ../libsvn_fs_fs/dag.c:1159
#, c-format
msgid "Unknown kind for noderev in cache: '%c'"
msgstr "Type de 'noderev' inconnu dans le cache : '%c'"
-#: ../libsvn_fs_fs/dag.c:1169
+#: ../libsvn_fs_fs/dag.c:1166
msgid "Unterminated ID in cache"
msgstr "ID non terminé dans le cache"
-#: ../libsvn_fs_fs/dag.c:1174
+#: ../libsvn_fs_fs/dag.c:1171
#, c-format
msgid "Bogus ID '%s' in cache"
msgstr "ID '%s' erroné dans le cache"
-#: ../libsvn_fs_fs/dag.c:1181
+#: ../libsvn_fs_fs/dag.c:1178
msgid "No created path"
msgstr "Pas de chemin créé"
-#: ../libsvn_fs_fs/dag.c:1207
+#: ../libsvn_fs_fs/dag.c:1204
#, c-format
msgid "Unknown node type in cache: '%c'"
msgstr "Type de nœud inconnu dans le cache '%c'"
@@ -2858,7 +2847,7 @@ msgstr "Impossible de définir le conten
msgid "Corrupt current file"
msgstr "Fichier courant corrompu"
-#: ../libsvn_fs_fs/fs_fs.c:5061 ../libsvn_subr/io.c:2833 ../svn/util.c:379
+#: ../libsvn_fs_fs/fs_fs.c:5061 ../libsvn_subr/io.c:2834 ../svn/util.c:379
#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
@@ -2925,17 +2914,17 @@ msgstr "Le chemin '%s' n'existe pas l
msgid "Lock failed: newer version of '%s' exists"
msgstr "Échec du verrouillage : il existe une version plus récente de '%s'"
-#: ../libsvn_fs_fs/tree.c:3436
+#: ../libsvn_fs_fs/tree.c:3433
#, c-format
msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
msgstr "La révision du nœud #'%s' déclare une information de fusion mais n'en a \
pas"
-#: ../libsvn_fs_fs/tree.c:3559
+#: ../libsvn_fs_fs/tree.c:3556
#, c-format
msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
msgstr "La révision du nœud '%s@%ld' déclare une information de fusion mais n'en \
a pas"
-#: ../libsvn_fs_fs/tree.c:3682
+#: ../libsvn_fs_fs/tree.c:3679
#, c-format
msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; \
filesystem '%s' uses only version %d" msgstr "La demande d'information de fusion \
(mergeinfo) requiert la version %d du schéma du système de fichier FSFS ; le \
système de fichier '%s' n'est qu' la version %d" @@ -2968,38 +2957,38 @@ msgstr \
"'%s' la révision %ld est un msgid "Mismatched RA version for '%s': found \
%d.%d.%d%s, expected %d.%d.%d%s" msgstr "Problème de version de module RA pour \
'%s': %d.%d.%d%s trouvé, %d.%d.%d%s attendu"
-#: ../libsvn_ra/ra_loader.c:463 ../libsvn_ra_serf/serf.c:506
+#: ../libsvn_ra/ra_loader.c:477 ../libsvn_ra_serf/serf.c:506
#: ../libsvn_ra_serf/serf.c:624
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "URL de dépôt svn illégale '%s'"
-#: ../libsvn_ra/ra_loader.c:498
+#: ../libsvn_ra/ra_loader.c:522
#, c-format
msgid "Invalid config: unknown HTTP library '%s'"
msgstr "Configuration invalide : librairie HTTP '%s' inconnue"
-#: ../libsvn_ra/ra_loader.c:553
+#: ../libsvn_ra/ra_loader.c:586
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Schéma d'URL non reconnu pour '%s'"
-#: ../libsvn_ra/ra_loader.c:575
+#: ../libsvn_ra/ra_loader.c:608
#, c-format
msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
msgstr "UUID du dépôt source '%s' différent de celui attendu '%s'"
-#: ../libsvn_ra/ra_loader.c:631
+#: ../libsvn_ra/ra_loader.c:664
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' n'est pas dans le même dépôt que '%s'"
-#: ../libsvn_ra/ra_loader.c:1413
+#: ../libsvn_ra/ra_loader.c:1446
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - gère le schéma d'URL '%s'\n"
-#: ../libsvn_ra/ra_loader.c:1499
+#: ../libsvn_ra/ra_loader.c:1532
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Schéma d'URL non reconnu '%s'"
@@ -3024,7 +3013,7 @@ msgstr "Impossible d'ouvrir une session
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
msgstr "l'URL '%s' n'est pas descendante de l'URL du dépôt racine '%s'"
-#: ../libsvn_ra_local/ra_plugin.c:1398 ../libsvn_ra_neon/session.c:921
+#: ../libsvn_ra_local/ra_plugin.c:1398 ../libsvn_ra_neon/session.c:925
#: ../libsvn_ra_serf/serf.c:299 ../libsvn_ra_svn/client.c:2277
#, c-format
msgid "Don't know anything about capability '%s'"
@@ -3206,7 +3195,7 @@ msgstr "Erreur d'écriture sur '%s' : fi
msgid "Unknown XML encoding: '%s'"
msgstr "Encodage XML inconnu : '%s'"
-#: ../libsvn_ra_neon/fetch.c:2418
+#: ../libsvn_ra_neon/fetch.c:2417
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "La gestion de la réponse au REPORT n'a pas clos le baton d'édition"
@@ -3390,87 +3379,87 @@ msgstr "Erreur d'écriture de flux : fin
msgid "Got cdata content for a prop delete"
msgstr "Contenu 'cdata' précisé pour l'effacement d'une propriété"
-#: ../libsvn_ra_neon/session.c:328
+#: ../libsvn_ra_neon/session.c:332
#, c-format
msgid "PIN for token \"%s\" in slot \"%s\""
msgstr "PIN du signe \"%s\" dans le créneau \"%s\""
-#: ../libsvn_ra_neon/session.c:529 ../libsvn_ra_serf/serf.c:430
+#: ../libsvn_ra_neon/session.c:533 ../libsvn_ra_serf/serf.c:430
msgid "Invalid URL: illegal character in proxy port number"
msgstr "URL invalide : caractère illégal dans le numéro de port du proxy"
-#: ../libsvn_ra_neon/session.c:533 ../libsvn_ra_serf/serf.c:434
+#: ../libsvn_ra_neon/session.c:537 ../libsvn_ra_serf/serf.c:434
msgid "Invalid URL: negative proxy port number"
msgstr "URL invalide : numéro de port du proxy négatif"
-#: ../libsvn_ra_neon/session.c:536 ../libsvn_ra_serf/serf.c:437
+#: ../libsvn_ra_neon/session.c:540 ../libsvn_ra_serf/serf.c:437
msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr "URL invalide : numéro de port du proxy supérieur au numéro de port \
maximal de TCP (65535)"
-#: ../libsvn_ra_neon/session.c:550
+#: ../libsvn_ra_neon/session.c:554
msgid "Invalid config: illegal character in timeout value"
msgstr "Configuration invalide : caractère illégal dans l'expiration (timeout)"
-#: ../libsvn_ra_neon/session.c:554
+#: ../libsvn_ra_neon/session.c:558
msgid "Invalid config: negative timeout value"
msgstr "Configuration invalide : expiration (timeout) négative"
-#: ../libsvn_ra_neon/session.c:567
+#: ../libsvn_ra_neon/session.c:571
msgid "Invalid config: illegal character in debug mask value"
msgstr "Configuration invalide : caractère illégal dans le masque de déboguage"
-#: ../libsvn_ra_neon/session.c:592
+#: ../libsvn_ra_neon/session.c:596
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr "Configuration invalide : authentification http inconnue '%s'"
-#: ../libsvn_ra_neon/session.c:653
+#: ../libsvn_ra_neon/session.c:657
msgid "Module for accessing a repository via WebDAV protocol using Neon."
msgstr "Module d'accès un dépôt via le protocole WebDAV avec Neon."
-#: ../libsvn_ra_neon/session.c:808
+#: ../libsvn_ra_neon/session.c:812
#, c-format
msgid "OPTIONS request (for capabilities) got HTTP response code %d"
msgstr "La requête OPTIONS (pour les capacités) a obtenu le code de réponse HTTP \
%d"
-#: ../libsvn_ra_neon/session.c:904 ../libsvn_ra_serf/serf.c:282
+#: ../libsvn_ra_neon/session.c:908 ../libsvn_ra_serf/serf.c:282
#, c-format
msgid "Don't know how to handle '%s' for capability '%s'"
msgstr "Ne sais pas gérer '%s' pour la capacité '%s'"
-#: ../libsvn_ra_neon/session.c:928 ../libsvn_ra_serf/serf.c:306
+#: ../libsvn_ra_neon/session.c:932 ../libsvn_ra_serf/serf.c:306
#, c-format
msgid "Attempt to fetch capability '%s' resulted in '%s'"
msgstr " la tentative de récuperer la capacité '%s' a résulté en '%s'"
-#: ../libsvn_ra_neon/session.c:951
+#: ../libsvn_ra_neon/session.c:955
#, c-format
msgid "Malformed URL '%s': scheme or host or path is missing"
msgstr "URL '%s' mal formée : schéma, hôte ou chemin manquant"
-#: ../libsvn_ra_neon/session.c:1002
+#: ../libsvn_ra_neon/session.c:1006
msgid "Network socket initialization failed"
msgstr "Échec de l'initialisation de la 'socket' réseau"
-#: ../libsvn_ra_neon/session.c:1021
+#: ../libsvn_ra_neon/session.c:1025
msgid "SSL is not supported"
msgstr "SSL n'est pas supporté"
-#: ../libsvn_ra_neon/session.c:1188 ../libsvn_ra_serf/util.c:211
+#: ../libsvn_ra_neon/session.c:1192 ../libsvn_ra_serf/util.c:211
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Configuration invalide : impossible de charger le fichier de certificat \
'%s'"
-#: ../libsvn_ra_neon/session.c:1216
+#: ../libsvn_ra_neon/session.c:1220
#, c-format
msgid "Invalid config: unable to load PKCS#11 provider '%s'"
msgstr "Configuration invalide : impossible de charger le fournisseur de PKCS#11 \
'%s'"
-#: ../libsvn_ra_neon/session.c:1337 ../libsvn_ra_serf/serf.c:1118
+#: ../libsvn_ra_neon/session.c:1341 ../libsvn_ra_serf/serf.c:1118
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "La propriété UUID n'a pas été trouvée sur la ressource ou sur un de ses \
parents"
-#: ../libsvn_ra_neon/session.c:1412
+#: ../libsvn_ra_neon/session.c:1416
#, c-format
msgid "Unsupported RA loader version (%d) for ra_neon"
msgstr "Version (%d) du chargeur RA (accès dépôt) non supportée pour ra_neon"
@@ -3493,17 +3482,17 @@ msgstr "Erreur la définition de la p
msgid "%s of '%s'"
msgstr "%s de '%s'"
-#: ../libsvn_ra_neon/util.c:546 ../libsvn_ra_serf/util.c:1488
+#: ../libsvn_ra_neon/util.c:546 ../libsvn_ra_serf/util.c:1486
#, c-format
msgid "'%s' path not found"
msgstr "Chemin '%s' non trouvé"
-#: ../libsvn_ra_neon/util.c:555 ../libsvn_ra_serf/util.c:1482
+#: ../libsvn_ra_neon/util.c:555 ../libsvn_ra_serf/util.c:1480
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr "Dépôt definitivement déplacé en '%s' ; merci de relocaliser"
-#: ../libsvn_ra_neon/util.c:557 ../libsvn_ra_serf/util.c:1484
+#: ../libsvn_ra_neon/util.c:557 ../libsvn_ra_serf/util.c:1482
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr "Dépôt temporairement déplacé en '%s' ; merci de relocaliser"
@@ -3545,7 +3534,7 @@ msgstr "Erreur en lisant un fichier temp
msgid "The %s request returned invalid XML in the response: %s (%s)"
msgstr "La requête %s a retourné du XML invalide dans la réponse : %s (%s)"
-#: ../libsvn_ra_serf/auth.c:284 ../libsvn_ra_serf/auth.c:290
+#: ../libsvn_ra_serf/auth.c:287 ../libsvn_ra_serf/auth.c:293
msgid "Missing 'realm' attribute in Authorization header"
msgstr "Attribut 'realm' manquant dans l'entête 'Authorization'"
@@ -3593,6 +3582,11 @@ msgstr "La réponse OPTIONS n'inclut
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Échec l'ajout du répertoire : %s sur %s (%d)"
+#: ../libsvn_ra_serf/getlocationsegments.c:230
+#, c-format
+msgid "Location segment report failed on '%s'@'%ld'"
+msgstr "Échec du rapport du segemnt de localisation sur '%s'@'%ld'"
+
#: ../libsvn_ra_serf/locks.c:378 ../libsvn_ra_serf/locks.c:417
#, c-format
msgid "Lock request failed: %d %s"
@@ -3670,7 +3664,7 @@ msgstr "Version %d du chargeur RA (accè
msgid "GET request failed: %d %s"
msgstr "Échec de la requête GET : %d %s"
-#: ../libsvn_ra_serf/update.c:2221 ../libsvn_ra_serf/util.c:1418
+#: ../libsvn_ra_serf/update.c:2221 ../libsvn_ra_serf/util.c:1416
msgid "The OPTIONS response did not include the requested \
version-controlled-configuration value" msgstr "La réponse OPTIONS n'inclut pas \
de valeur pour 'version-controlled-configuration'"
@@ -3679,11 +3673,11 @@ msgstr "La réponse OPTIONS n'inclut
msgid "Error retrieving REPORT (%d)"
msgstr "Erreur la récupération du REPORT (%d)"
-#: ../libsvn_ra_serf/util.c:1186
+#: ../libsvn_ra_serf/util.c:1184
msgid "Premature EOF seen from server"
msgstr "Fin de fichier (EOF) prématurée rencontrée sur le serveur"
-#: ../libsvn_ra_serf/util.c:1237
+#: ../libsvn_ra_serf/util.c:1235
msgid "Unspecified error message"
msgstr "Message d'erreur non spécifié"
@@ -4489,7 +4483,7 @@ msgstr "Révision de fin %ld invalide"
msgid "Unreadable path encountered; access denied"
msgstr "Chemin illisible rencontré, accès refusé"
-#: ../libsvn_repos/rev_hunt.c:1122
+#: ../libsvn_repos/rev_hunt.c:1121
#, c-format
msgid "'%s' is not a file in revision %ld"
msgstr "'%s' n'est pas un fichier la révision %ld"
@@ -4553,12 +4547,12 @@ msgstr "Erreur inconnue l'ajout d'un
msgid "Unknown error creating apr_memcache_t"
msgstr "Erreur inconnue en créant apr_memcache_t"
-#: ../libsvn_subr/cmdline.c:484
+#: ../libsvn_subr/cmdline.c:564
#, c-format
msgid "Invalid config: unknown password store '%s'"
msgstr "Configuration invalide : stockage de mot de passe inconnu '%s'"
-#: ../libsvn_subr/cmdline.c:617
+#: ../libsvn_subr/cmdline.c:735
#, c-format
msgid "Error initializing command line arguments"
msgstr "Erreur l'initialisation des arguments de la ligne de commande"
@@ -4634,6 +4628,16 @@ msgstr "Impossible de recoder le message
msgid "%swarning: %s\n"
msgstr "%savertissement : %s\n"
+#: ../libsvn_subr/error.c:491
+#, c-format
+msgid "In file '%s' line %d: assertion failed (%s)"
+msgstr "Fichier '%s' ligne %d : échec de la vérification (%s)"
+
+#: ../libsvn_subr/error.c:495
+#, c-format
+msgid "In file '%s' line %d: internal malfunction"
+msgstr "Fichier '%s' ligne %d : dysfonctionnement interne"
+
#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
@@ -4698,14 +4702,14 @@ msgstr "La destination '%s' n'est pas un
msgid "Destination '%s' already exists"
msgstr "La destination '%s' existe déj "
-#: ../libsvn_subr/io.c:932 ../libsvn_subr/io.c:1884 ../libsvn_subr/io.c:1935
-#: ../libsvn_subr/io.c:1987
+#: ../libsvn_subr/io.c:932 ../libsvn_subr/io.c:1883 ../libsvn_subr/io.c:1934
+#: ../libsvn_subr/io.c:1986
#, c-format
msgid "Can't read directory '%s'"
msgstr "Impossible de lire le répertoire '%s'"
-#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1889 ../libsvn_subr/io.c:1940
-#: ../libsvn_subr/io.c:1992 ../libsvn_subr/io.c:3155
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3156
#, c-format
msgid "Error closing directory '%s'"
msgstr "Erreur de fermeture du répertoire '%s'"
@@ -4760,121 +4764,121 @@ msgstr "Erreur l'obtention du UID du
msgid "Can't get shared lock on file '%s'"
msgstr "Impossible d'obtenir le verrou partagé sur le fichier '%s'"
-#: ../libsvn_subr/io.c:1576
+#: ../libsvn_subr/io.c:1575
#, c-format
msgid "Can't flush file '%s'"
msgstr "Impossible de vidanger (flush) le fichier '%s'"
-#: ../libsvn_subr/io.c:1577
+#: ../libsvn_subr/io.c:1576
#, c-format
msgid "Can't flush stream"
msgstr "Impossible de vidanger (flush) le flux"
-#: ../libsvn_subr/io.c:1589 ../libsvn_subr/io.c:1606
+#: ../libsvn_subr/io.c:1588 ../libsvn_subr/io.c:1605
#, c-format
msgid "Can't flush file to disk"
msgstr "Impossible de vidanger (flush) le fichier sur disque"
-#: ../libsvn_subr/io.c:1628 ../libsvn_subr/prompt.c:100 ../svnserve/main.c:591
+#: ../libsvn_subr/io.c:1627 ../libsvn_subr/prompt.c:100 ../svnserve/main.c:591
#, c-format
msgid "Can't open stdin"
msgstr "Impossible d'ouvrir l'entrée standard (stdin)"
-#: ../libsvn_subr/io.c:1649
+#: ../libsvn_subr/io.c:1648
msgid "Reading from stdin is disallowed"
msgstr "Lire partir de l'entrée standard n'est pas permis"
-#: ../libsvn_subr/io.c:1663
+#: ../libsvn_subr/io.c:1662
#, c-format
msgid "Can't get file name"
msgstr "Impossible d'obtenir le nom de fichier"
-#: ../libsvn_subr/io.c:1732
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "Impossible de supprimer le fichier '%s'"
-#: ../libsvn_subr/io.c:1811 ../libsvn_subr/io.c:3006 ../libsvn_subr/io.c:3092
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3007 ../libsvn_subr/io.c:3093
#, c-format
msgid "Can't open directory '%s'"
msgstr "Impossible d'ouvrir le répertoire '%s'"
-#: ../libsvn_subr/io.c:1865 ../libsvn_subr/io.c:1895
+#: ../libsvn_subr/io.c:1864 ../libsvn_subr/io.c:1894
#, c-format
msgid "Can't remove '%s'"
msgstr "Impossible de supprimer '%s'"
-#: ../libsvn_subr/io.c:1875
+#: ../libsvn_subr/io.c:1874
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Impossible de rembobiner (rewind) le répertoire '%s'"
-#: ../libsvn_subr/io.c:2056
+#: ../libsvn_subr/io.c:2055
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Impossible de créer les attributs du processus '%s'"
-#: ../libsvn_subr/io.c:2062
+#: ../libsvn_subr/io.c:2061
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Impossible de définir le type de commande (cmdtype) du processus '%s'"
-#: ../libsvn_subr/io.c:2074
+#: ../libsvn_subr/io.c:2073
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Impossible de définir le répertoire du processus '%s'"
-#: ../libsvn_subr/io.c:2087
+#: ../libsvn_subr/io.c:2086
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Impossible de définir l'entrée (input) du processus fils '%s'"
-#: ../libsvn_subr/io.c:2094
+#: ../libsvn_subr/io.c:2093
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Impossible de définir la sortie (outfile) du processus fils '%s'"
-#: ../libsvn_subr/io.c:2101
+#: ../libsvn_subr/io.c:2100
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Impossible de définir l'erreur (errfile) du processus fils '%s'"
-#: ../libsvn_subr/io.c:2108
+#: ../libsvn_subr/io.c:2107
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Impossible de définir l'erreur (errfile) pour gestion d'erreur du processus \
fils '%s'"
-#: ../libsvn_subr/io.c:2114
+#: ../libsvn_subr/io.c:2113
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Impossible de définir la gestion d'erreur du processus '%s'"
-#: ../libsvn_subr/io.c:2137
+#: ../libsvn_subr/io.c:2136
#, c-format
msgid "Can't start process '%s'"
msgstr "Impossible de démarrer le processus '%s'"
-#: ../libsvn_subr/io.c:2161
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Erreur l'attente du processus '%s'"
-#: ../libsvn_subr/io.c:2169
+#: ../libsvn_subr/io.c:2168
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Échec du processus '%s' (sortie car %d)"
-#: ../libsvn_subr/io.c:2176
+#: ../libsvn_subr/io.c:2175
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Le processus '%s' a retourné code de sortie en erreur %d"
-#: ../libsvn_subr/io.c:2287
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' a retourné %d"
-#: ../libsvn_subr/io.c:2410
+#: ../libsvn_subr/io.c:2411
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4889,121 +4893,121 @@ msgstr ""
"%s\n"
"%s"
-#: ../libsvn_subr/io.c:2537
+#: ../libsvn_subr/io.c:2538
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Impossible de détecter le type MIME de l'objet '%s' (pas un fichier)"
-#: ../libsvn_subr/io.c:2627
+#: ../libsvn_subr/io.c:2628
#, c-format
msgid "Can't open file '%s'"
msgstr "Impossible d'ouvrir le fichier '%s'"
-#: ../libsvn_subr/io.c:2663
+#: ../libsvn_subr/io.c:2664
#, c-format
msgid "Can't close file '%s'"
msgstr "Le fichier '%s' ne peut être fermé"
-#: ../libsvn_subr/io.c:2664
+#: ../libsvn_subr/io.c:2665
#, c-format
msgid "Can't close stream"
msgstr "Impossible de fermer le flux"
-#: ../libsvn_subr/io.c:2674 ../libsvn_subr/io.c:2698 ../libsvn_subr/io.c:2711
+#: ../libsvn_subr/io.c:2675 ../libsvn_subr/io.c:2699 ../libsvn_subr/io.c:2712
#, c-format
msgid "Can't read file '%s'"
msgstr "Impossible de lire le fichier '%s'"
-#: ../libsvn_subr/io.c:2675 ../libsvn_subr/io.c:2699 ../libsvn_subr/io.c:2712
+#: ../libsvn_subr/io.c:2676 ../libsvn_subr/io.c:2700 ../libsvn_subr/io.c:2713
#, c-format
msgid "Can't read stream"
msgstr "Impossible de lire le flux"
-#: ../libsvn_subr/io.c:2686
+#: ../libsvn_subr/io.c:2687
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Impossible d'obtenir les informations d'attribut du fichier '%s'"
-#: ../libsvn_subr/io.c:2687
+#: ../libsvn_subr/io.c:2688
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Impossible d'obtenir les informations d'attribut du flux"
-#: ../libsvn_subr/io.c:2723
+#: ../libsvn_subr/io.c:2724
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Impossible de fixer le pointeur de position dans le fichier '%s'"
-#: ../libsvn_subr/io.c:2724
+#: ../libsvn_subr/io.c:2725
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Impossible de fixer le pointeur de position dans le flux"
-#: ../libsvn_subr/io.c:2735 ../libsvn_subr/io.c:2769
+#: ../libsvn_subr/io.c:2736 ../libsvn_subr/io.c:2770
#, c-format
msgid "Can't write to file '%s'"
msgstr "Impossible d'écrire dans le fichier '%s'"
-#: ../libsvn_subr/io.c:2736 ../libsvn_subr/io.c:2770
+#: ../libsvn_subr/io.c:2737 ../libsvn_subr/io.c:2771
#, c-format
msgid "Can't write to stream"
msgstr "Impossible d'écrire dans le flux"
-#: ../libsvn_subr/io.c:2810
+#: ../libsvn_subr/io.c:2811
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Impossible de lire la longueur de la ligne dans le fichier '%s'"
-#: ../libsvn_subr/io.c:2814
+#: ../libsvn_subr/io.c:2815
msgid "Can't read length line in stream"
msgstr "Impossible de lire la longueur de la ligne dans le flux"
-#: ../libsvn_subr/io.c:2861
+#: ../libsvn_subr/io.c:2862
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Impossible de déplacer '%s' vers '%s'"
-#: ../libsvn_subr/io.c:2940
+#: ../libsvn_subr/io.c:2941
#, c-format
msgid "Can't create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: ../libsvn_subr/io.c:2951 ../libsvn_wc/copy.c:543
+#: ../libsvn_subr/io.c:2952 ../libsvn_wc/copy.c:543
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Impossible de cacher le répertoire '%s'"
-#: ../libsvn_subr/io.c:3024
+#: ../libsvn_subr/io.c:3025
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Impossible de supprimer le répertoire '%s'"
-#: ../libsvn_subr/io.c:3042
+#: ../libsvn_subr/io.c:3043
#, c-format
msgid "Can't read directory"
msgstr "Impossible de lire le répertoire"
-#: ../libsvn_subr/io.c:3111
+#: ../libsvn_subr/io.c:3112
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Impossible de lire l'entrée de répertoire dans '%s'"
-#: ../libsvn_subr/io.c:3236
+#: ../libsvn_subr/io.c:3237
#, c-format
msgid "Can't check directory '%s'"
msgstr "Impossible de vérifier le répertoire '%s'"
-#: ../libsvn_subr/io.c:3258
+#: ../libsvn_subr/io.c:3259
#, c-format
msgid "Version %d is not non-negative"
msgstr "La version %d est négative"
-#: ../libsvn_subr/io.c:3308
+#: ../libsvn_subr/io.c:3309
#, c-format
msgid "Reading '%s'"
msgstr "Lecture de '%s'"
-#: ../libsvn_subr/io.c:3324
+#: ../libsvn_subr/io.c:3325
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "La première ligne de '%s' contient des caractères non-numériques"
@@ -5127,7 +5131,7 @@ msgstr "Erreur de syntaxe sur la révisi
msgid "Revision property pair is empty"
msgstr "La paire de la propriété de révision est vide"
-#: ../libsvn_subr/opt.c:1084 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:180
+#: ../libsvn_subr/opt.c:1084 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:182
#: ../svn/propset-cmd.c:64
#, c-format
msgid "'%s' is not a valid Subversion property name"
@@ -5276,11 +5280,23 @@ msgstr "Fichier du certificat client : "
msgid "Passphrase for '%s': "
msgstr "Phrase de passe pour '%s' : "
-#: ../libsvn_subr/prompt.c:391
+#: ../libsvn_subr/prompt.c:417
+msgid "yes"
+msgstr "oui"
+
+#: ../libsvn_subr/prompt.c:422
+msgid "no"
+msgstr "non"
+
+#: ../libsvn_subr/prompt.c:428
+msgid "Please type 'yes' or 'no': "
+msgstr "Entrer 'oui' ou 'non' : "
+
+#: ../libsvn_subr/prompt.c:442
msgid "Store password unencrypted (yes/no)? "
msgstr "Stockage en clair du mot de passe (oui/non) ?"
-#: ../libsvn_subr/prompt.c:400
+#: ../libsvn_subr/prompt.c:444
#, c-format
msgid ""
"-----------------------------------------------------------------------\n"
@@ -5291,6 +5307,11 @@ msgid ""
"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 ""
"----------------------------------------------------------------------\n"
"ATTENTION ! Votre mot de passe pour de royaume d'authentification :\n"
@@ -5299,38 +5320,50 @@ msgstr ""
"\n"
"ne peut être sauvegardé qu'en clair ! Configurez si possible votre système\n"
"pour que Subversion chiffre les mots de passe stockés. Voir la documentation.\n"
+"\n"
+"Vous pouvez éviter ce message l'avenir en définissant la valeur de l'option\n"
+"'store-plaintext-passwords' 'yes' ou 'no' dans '%s'.\n"
+"----------------------------------------------------------------------\n"
-#: ../libsvn_subr/prompt.c:412
+#: ../libsvn_subr/prompt.c:472
+msgid "Store passphrase unencrypted (yes/no)? "
+msgstr "Stockage en clair du mot de passe (oui/non) ? "
+
+#: ../libsvn_subr/prompt.c:474
#, c-format
msgid ""
+"-----------------------------------------------------------------------\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-plaintext-passwords' option to either 'yes' or 'no' in\n"
-"'%s'.\n"
+"of the 'store-ssl-client-cert-pp-plaintext' option to either 'yes' or\n"
+"'no' in '%s'.\n"
+"-----------------------------------------------------------------------\n"
msgstr ""
+"----------------------------------------------------------------------\n"
+"ATTENTION ! Votre mot de passe pour de royaume d'authentification :\n"
"\n"
-"Vous pouvez faire disparaître l'avenir cette mise en garde en\n"
-"configurant l'option 'store-plaintext-passwords' 'yes' ou 'no' dans\n"
-"'%s'.\n"
-
-#: ../libsvn_subr/prompt.c:435
-msgid "yes"
-msgstr "oui"
-
-#: ../libsvn_subr/prompt.c:440
-msgid "no"
-msgstr "non"
-
-#: ../libsvn_subr/prompt.c:446
-msgid "Please type 'yes' or 'no': "
-msgstr "Entrer 'oui' ou 'non' : "
+" %s\n"
+"\n"
+"ne peut être sauvegardé qu'en clair ! Configurez si possible votre système\n"
+"pour que Subversion chiffre les mots de passe stockés. Voir la documentation.\n"
+"Vous pouvez éviter ce message l'avenir en définissant la valeur de l'option\n"
+"'store-ssl-client-cert-pp-plaintext' 'yes' ou 'no' dans '%s'.\n"
+"----------------------------------------------------------------------\n"
-#: ../libsvn_subr/simple_providers.c:357
+#: ../libsvn_subr/simple_providers.c:354
+#: ../libsvn_subr/ssl_client_cert_pw_providers.c:305
#, c-format
msgid "Config error: invalid value '%s' for option '%s'"
msgstr "Erreur de configuration : valeur '%s' invalide pour l'option '%s'"
-#: ../libsvn_subr/subst.c:1744 ../libsvn_wc/props.c:2443
+#: ../libsvn_subr/subst.c:1744 ../libsvn_wc/props.c:2430
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Le fichier '%s' a des sauts de ligne incohérents"
@@ -5739,27 +5772,27 @@ msgstr "L'entrée '%s' est déj sous c
msgid "Entry '%s' has illegal schedule"
msgstr "L'entrée '%s' a une programmation invalide"
-#: ../libsvn_wc/entries.c:2697
+#: ../libsvn_wc/entries.c:2696
#, c-format
msgid "No such entry: '%s'"
msgstr "Pas d'entrée : '%s'"
-#: ../libsvn_wc/entries.c:2831
+#: ../libsvn_wc/entries.c:2829
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Erreur l'écriture du fichier d'entrées pour '%s'"
-#: ../libsvn_wc/entries.c:2874
+#: ../libsvn_wc/entries.c:2872
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Le répertoire '%s' n'a pas d'entrée THIS_DIR"
-#: ../libsvn_wc/entries.c:3021
+#: ../libsvn_wc/entries.c:3019
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' possède un type de nœud non reconnu"
-#: ../libsvn_wc/entries.c:3058
+#: ../libsvn_wc/entries.c:3056
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Découverte inattendue de '%s' : chemin marqué comme manquant"
@@ -5809,17 +5842,17 @@ msgstr "Impossible de verrouiller '%s'"
msgid "Working copy '%s' is not locked"
msgstr "La copie de travail '%s' n'est pas verrouillée"
-#: ../libsvn_wc/lock.c:1426
+#: ../libsvn_wc/lock.c:1427
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "Verrou d'écriture volé sous '%s'"
-#: ../libsvn_wc/lock.c:1434
+#: ../libsvn_wc/lock.c:1435
#, c-format
msgid "No write-lock in '%s'"
msgstr "Pas de verrou d'écriture sous '%s'"
-#: ../libsvn_wc/lock.c:1456
+#: ../libsvn_wc/lock.c:1457
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr "Le fichier de verrou '%s' n'est pas un fichier normal"
@@ -5857,7 +5890,7 @@ msgstr "Attribut 'dest' manquant dans '%
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Attribut 'timestamp' manquant dans '%s'"
-#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:507
+#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:508
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Erreur en récupérant l'heure d'effet sur '%s'"
@@ -5973,20 +6006,20 @@ msgstr "Impossible d'analyser '%s'"
msgid "Can't write property hash to '%s'"
msgstr "Impossible d'écrire le hash de la propriété dans '%s'"
-#: ../libsvn_wc/props.c:583
+#: ../libsvn_wc/props.c:584
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Fin de ligne manquante dans le fichier wcprops pour '%s'"
-#: ../libsvn_wc/props.c:1394
+#: ../libsvn_wc/props.c:1381
msgid "Conflict callback violated API: returned no results."
msgstr "L'appel pour gestion de conflit viole l'API : aucun résultat retourné."
-#: ../libsvn_wc/props.c:1434
+#: ../libsvn_wc/props.c:1421
msgid "Conflict callback violated API: returned no merged file."
msgstr "L'appel de gestion de conflit viole l'API : retourne \"pas de fusion\"."
-#: ../libsvn_wc/props.c:1528
+#: ../libsvn_wc/props.c:1515
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5995,7 +6028,7 @@ msgstr ""
"Tentative de d'ajout d'une propriété '%s' de valeur '%s',\n"
"mais elle existe déj avec la valeur '%s'."
-#: ../libsvn_wc/props.c:1543
+#: ../libsvn_wc/props.c:1530
#, c-format
msgid ""
"Trying to create property '%s' with value '%s',\n"
@@ -6004,7 +6037,7 @@ msgstr ""
"Tentative de création de la propriété '%s' de valeur '%s',\n"
"mais elle a été locallement effacée."
-#: ../libsvn_wc/props.c:1617
+#: ../libsvn_wc/props.c:1604
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -6013,7 +6046,7 @@ msgstr ""
"Tentative d'effacement la propriété '%s' de valeur '%s',\n"
"mais valeur déj modifiée de '%s' en '%s'."
-#: ../libsvn_wc/props.c:1638
+#: ../libsvn_wc/props.c:1625
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -6022,7 +6055,7 @@ msgstr ""
"Tentative d'effacement de la propriété '%s' de valeur '%s',\n"
"mais elle existe déj avec la valeur '%s'."
-#: ../libsvn_wc/props.c:1725
+#: ../libsvn_wc/props.c:1712
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6031,7 +6064,7 @@ msgstr ""
"Tentative de modification de la propriété '%s' de '%s' en '%s',\n"
"mais elle a déj été modifiée de '%s' en '%s'."
-#: ../libsvn_wc/props.c:1733
+#: ../libsvn_wc/props.c:1720
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6040,7 +6073,7 @@ msgstr ""
"Tentative de modification de la propriété '%s' de '%s' '%s',\n"
"mais elle a été ajoutée localement avec la valeur '%s'."
-#: ../libsvn_wc/props.c:1754
+#: ../libsvn_wc/props.c:1741
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6049,7 +6082,7 @@ msgstr ""
"Tentative de modification de la propriété '%s' de '%s' en '%s',\n"
"mais elle a été localement effacée."
-#: ../libsvn_wc/props.c:1787
+#: ../libsvn_wc/props.c:1774
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6058,7 +6091,7 @@ msgstr ""
"Tentative de modificat de la propriété '%s' de '%s' en '%s',\n"
"mais elle n'existe pas."
-#: ../libsvn_wc/props.c:1825
+#: ../libsvn_wc/props.c:1812
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -6067,52 +6100,52 @@ msgstr ""
"Essai de modifier la propriété '%s' de '%s' '%s',\n"
"mais elle existe déj avec la valeur '%s'."
-#: ../libsvn_wc/props.c:2130 ../libsvn_wc/props.c:2158
-#: ../libsvn_wc/props.c:2303 ../libsvn_wc/props.c:2526
+#: ../libsvn_wc/props.c:2117 ../libsvn_wc/props.c:2145
+#: ../libsvn_wc/props.c:2290 ../libsvn_wc/props.c:2513
msgid "Failed to load properties from disk"
msgstr "Échec au chargement des propriétés partir du disque"
-#: ../libsvn_wc/props.c:2186
+#: ../libsvn_wc/props.c:2173
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Impossible d'écrire le hash de la propriété pour '%s'"
-#: ../libsvn_wc/props.c:2298 ../libsvn_wc/props.c:2470
+#: ../libsvn_wc/props.c:2285 ../libsvn_wc/props.c:2457
#, c-format
msgid "Property '%s' is an entry property"
msgstr "La propriété '%s' n'est pas une propriété d'entrée"
-#: ../libsvn_wc/props.c:2342
+#: ../libsvn_wc/props.c:2329
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Définition de '%s' sur un répertoire ('%s') impossible"
-#: ../libsvn_wc/props.c:2350
+#: ../libsvn_wc/props.c:2337
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Définition de '%s' sur un fichier ('%s') impossible"
-#: ../libsvn_wc/props.c:2356
+#: ../libsvn_wc/props.c:2343
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' n'est ni un fichier ni un répertoire"
-#: ../libsvn_wc/props.c:2424
+#: ../libsvn_wc/props.c:2411
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Le fichier '%s' a un type mime binaire"
-#: ../libsvn_wc/props.c:2619
+#: ../libsvn_wc/props.c:2606
#, c-format
msgid "Unrecognized line ending style for '%s'"
msgstr "Style de fin de ligne non reconnu pour '%s'"
-#: ../libsvn_wc/props.c:3216 ../libsvn_wc/props.c:3283
+#: ../libsvn_wc/props.c:3203 ../libsvn_wc/props.c:3270
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Erreur d'analyse de la propriété %s sur '%s' : '%s'"
-#: ../libsvn_wc/props.c:3333
+#: ../libsvn_wc/props.c:3320
#, c-format
msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves \
'..'" msgstr "Propriété %s invalide sur '%s' : la cible '%s' est un chemin absolu \
ou utilise '..'" @@ -6156,102 +6189,102 @@ msgstr "La relocalisation (relocate) ne
msgid "No '.' entry in: '%s'"
msgstr "Pas d'entrée '.' dans : '%s'"
-#: ../libsvn_wc/update_editor.c:986
+#: ../libsvn_wc/update_editor.c:984
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Le chemin '%s' n'est pas dans la copie de travail"
-#: ../libsvn_wc/update_editor.c:1098
+#: ../libsvn_wc/update_editor.c:1096
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Le répertoire localement modifié ne sera pas supprimé : '%s'"
-#: ../libsvn_wc/update_editor.c:1270
+#: ../libsvn_wc/update_editor.c:1268
#, c-format
msgid "Failed to add directory '%s': a non-directory object of the same name already \
exists" msgstr "Échec de l'ajout du répertoire '%s' : un objet de ce nom existe \
déj "
-#: ../libsvn_wc/update_editor.c:1303
+#: ../libsvn_wc/update_editor.c:1301
#, c-format
msgid "Failed to add directory '%s': an unversioned directory of the same name \
already exists" msgstr "Échec de l'ajout du répertoire '%s' : un répertoire non \
versionné de même nom existe déj "
-#: ../libsvn_wc/update_editor.c:1325
+#: ../libsvn_wc/update_editor.c:1323
#, c-format
msgid "Failed to add directory '%s': a versioned directory of the same name already \
exists" msgstr "Échec de l'ajout du répertoire '%s' : répertoire versionné de \
même nom existe déj "
-#: ../libsvn_wc/update_editor.c:1336
+#: ../libsvn_wc/update_editor.c:1334
#, c-format
msgid "Failed to add directory '%s': object of the same name as the administrative \
directory" msgstr "Échec l'ajout du répertoire '%s' : objet du même nom que le \
répertoire d'administration"
-#: ../libsvn_wc/update_editor.c:1369
+#: ../libsvn_wc/update_editor.c:1367
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr "Échec l'ajout du répertoire '%s' : copie en provenance (copyfrom) non \
encore supportée"
-#: ../libsvn_wc/update_editor.c:1663
+#: ../libsvn_wc/update_editor.c:1661
msgid "Couldn't do property merge"
msgstr "Fusion de propriété impossible"
-#: ../libsvn_wc/update_editor.c:1736
+#: ../libsvn_wc/update_editor.c:1734
#, c-format
msgid "Failed to mark '%s' absent: item of the same name is already scheduled for \
addition" msgstr "Échec du marquage de '%s' comme absent : un objet de même nom \
est déj en attente pour ajout"
-#: ../libsvn_wc/update_editor.c:1809
+#: ../libsvn_wc/update_editor.c:1807
msgid "Bad copyfrom arguments received"
msgstr "Mauvais arguments pour la source d'une copie"
-#: ../libsvn_wc/update_editor.c:1848
+#: ../libsvn_wc/update_editor.c:1846
#, c-format
msgid "Failed to add file '%s': a file of the same name is already scheduled for \
addition with history" msgstr "Échec de l'ajout du fichier '%s' : un fichier de \
même nom est déj en attente pour ajout"
-#: ../libsvn_wc/update_editor.c:1860
+#: ../libsvn_wc/update_editor.c:1858
#, c-format
msgid "Failed to add file '%s': a non-file object of the same name already exists"
msgstr "Échec de l'ajout du fichier '%s' : un objet de même nom existe déj "
-#: ../libsvn_wc/update_editor.c:1875
+#: ../libsvn_wc/update_editor.c:1873
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "Échec l'ajout du fichier '%s' : un objet de même nom existe déj "
-#: ../libsvn_wc/update_editor.c:1933
+#: ../libsvn_wc/update_editor.c:1931
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Le fichier '%s' du répertoire '%s' n'est pas versionné"
-#: ../libsvn_wc/update_editor.c:2087
+#: ../libsvn_wc/update_editor.c:2085
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Somme de contrôle différente pour '%s' ; stocké '%s', actuel '%s'"
-#: ../libsvn_wc/update_editor.c:2825
+#: ../libsvn_wc/update_editor.c:2823
msgid "Destination directory of add-with-history is missing a URL"
msgstr "Répertoire destination de 'add-with-history' (ajout avec historique) sans \
URL"
-#: ../libsvn_wc/update_editor.c:2840
+#: ../libsvn_wc/update_editor.c:2838
msgid "Destination URLs are broken"
msgstr "Les URLs destination sont incorrectes"
-#: ../libsvn_wc/update_editor.c:3097
+#: ../libsvn_wc/update_editor.c:3095
msgid "No fetch_func supplied to update_editor"
msgstr "Pas de 'fetch_func' fourni 'update_editor'"
-#: ../libsvn_wc/update_editor.c:3338
+#: ../libsvn_wc/update_editor.c:3336
#, c-format
msgid "Shallowing of working copy depths is not yet supported"
msgstr "La superficialisation des profondeurs d'une copie de travail n'est pas \
encore supporté"
-#: ../libsvn_wc/update_editor.c:3739
+#: ../libsvn_wc/update_editor.c:3737
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' n'a pas d'ancêtre"
-#: ../libsvn_wc/update_editor.c:3893
+#: ../libsvn_wc/update_editor.c:3891
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "L'URL source '%s' concerne un dépôt différent de '%s'"
@@ -6581,7 +6614,7 @@ msgstr ""
"Subversion est un outil pour gérer des versions.\n"
"Pour plus d'informations, voir http://subversion.tigris.org/\n"
-#: ../svn/help-cmd.c:65 ../svnsync/main.c:1811
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1818
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -6867,38 +6900,38 @@ msgstr "Ne préciser que des chemins rel
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "Impossible d'affecter l'option 'with-revprop' ('=' jeté)"
-#: ../svn/main.c:113
+#: ../svn/main.c:114
msgid "force operation to run"
msgstr "force l'exécution de l'opération"
-#: ../svn/main.c:115
+#: ../svn/main.c:116
msgid "force validity of log message source"
msgstr "valide la source de l'entrée du journal"
-#: ../svn/main.c:116 ../svn/main.c:117 ../svnadmin/main.c:233
+#: ../svn/main.c:117 ../svn/main.c:118 ../svnadmin/main.c:233
#: ../svnadmin/main.c:236 ../svndumpfilter/main.c:877
-#: ../svndumpfilter/main.c:880 ../svnlook/main.c:92 ../svnlook/main.c:104
-#: ../svnsync/main.c:138 ../svnsync/main.c:140
+#: ../svndumpfilter/main.c:880 ../svnlook/main.c:96 ../svnlook/main.c:108
+#: ../svnsync/main.c:144 ../svnsync/main.c:146
msgid "show help on a subcommand"
msgstr "affiche l'aide sur une sous-commande"
-#: ../svn/main.c:118
+#: ../svn/main.c:119
msgid "specify log message ARG"
msgstr "donne le message de propagation ARG"
-#: ../svn/main.c:119
+#: ../svn/main.c:120
msgid "print nothing, or only summary information"
msgstr "n'affiche rien, ou seulement des informations résumées"
-#: ../svn/main.c:120
+#: ../svn/main.c:121
msgid "descend recursively, same as --depth=infinity"
msgstr "descent récursivement, comme avec --depth=infinity"
-#: ../svn/main.c:121
+#: ../svn/main.c:122
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr "obsolète : essayer --depth=files ou --depth=immediates"
-#: ../svn/main.c:123
+#: ../svn/main.c:124
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -6906,7 +6939,7 @@ msgstr ""
"Le changement apporté par la révision ARG (comme -r ARG-1:ARG)\n"
" Si ARG est négatif, c'est comme -r ARG:ARG-1"
-#: ../svn/main.c:127
+#: ../svn/main.c:128
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -6926,41 +6959,41 @@ msgstr ""
" 'COMMITTED' dernière propagation ou avant BASE\n"
" 'PREV' révision juste avant COMMITTED"
-#: ../svn/main.c:137
+#: ../svn/main.c:138
msgid "read log message from file ARG"
msgstr "lit le message de propagation partir du fichier ARG"
-#: ../svn/main.c:139
+#: ../svn/main.c:140
msgid "give output suitable for concatenation"
msgstr "produit une sortie concaténable"
-#: ../svn/main.c:142
+#: ../svn/main.c:143
msgid "treat value as being in charset encoding ARG"
msgstr "interprète les caractères comme encodés en ARG"
-#: ../svn/main.c:144 ../svnadmin/main.c:239 ../svndumpfilter/main.c:883
-#: ../svnlook/main.c:134 ../svnserve/main.c:204 ../svnsync/main.c:136
+#: ../svn/main.c:145 ../svnadmin/main.c:239 ../svndumpfilter/main.c:883
+#: ../svnlook/main.c:138 ../svnserve/main.c:204 ../svnsync/main.c:142
#: ../svnversion/main.c:127
msgid "show program version information"
msgstr "affiche la version du programme"
-#: ../svn/main.c:145
+#: ../svn/main.c:146
msgid "print extra information"
msgstr "affiche plus d'informations"
-#: ../svn/main.c:146
+#: ../svn/main.c:147
msgid "display update information"
msgstr "affiche les mises jour"
-#: ../svn/main.c:147
+#: ../svn/main.c:148
msgid "specify a username ARG"
msgstr "précise le nom d'utilisateur ARG"
-#: ../svn/main.c:148
+#: ../svn/main.c:149
msgid "specify a password ARG"
msgstr "précise le mot de passe ARG"
-#: ../svn/main.c:151
+#: ../svn/main.c:152
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed along\n"
@@ -6995,11 +7028,11 @@ msgstr ""
" -p (--show-c-function) :\n"
" Affiche le nom des fonctions C dans la sortie."
-#: ../svn/main.c:184
+#: ../svn/main.c:185
msgid "pass contents of file ARG as additional args"
msgstr "passe le contenu du fichier ARG comme des arguments"
-#: ../svn/main.c:186
+#: ../svn/main.c:187
msgid ""
"limit operation by depth ARG ('empty', 'files',\n"
" 'immediates', or 'infinity')"
@@ -7007,7 +7040,7 @@ msgstr ""
"limite l'opétioan cette profondeur (depth empty/files/\n"
" immediates/infinity) en argument"
-#: ../svn/main.c:190
+#: ../svn/main.c:191
msgid ""
"set new working copy depth to ARG ('empty',\n"
" 'files', 'immediates', or 'infinity')"
@@ -7015,95 +7048,103 @@ msgstr ""
"fixe la profondeur de la copie de travail -- 'empty' (vide),\n"
" 'files' (fichiers), 'immediates' (immédiat) ou 'infinity' (infini)"
-#: ../svn/main.c:193
+#: ../svn/main.c:194 ../svnlook/main.c:141
msgid "output in XML"
msgstr "sortie XML"
-#: ../svn/main.c:194
+#: ../svn/main.c:195
msgid "use strict semantics"
msgstr "sémantique stricte"
-#: ../svn/main.c:196
+#: ../svn/main.c:197
msgid "do not cross copies while traversing history"
msgstr "arrête aux copies lors du parcours de l'historique"
-#: ../svn/main.c:198
+#: ../svn/main.c:199
msgid "disregard default and svn:ignore property ignores"
msgstr "n'ignore aucun fichier ou répertoire (propriété svn:ignore et défaut)"
-#: ../svn/main.c:200 ../svnsync/main.c:116
+#: ../svn/main.c:201 ../svnsync/main.c:118
msgid "do not cache authentication tokens"
msgstr "ne conserve pas les éléments d'authentification"
-#: ../svn/main.c:202 ../svnsync/main.c:114
+#: ../svn/main.c:203 ../svnsync/main.c:128
+msgid ""
+"accept unknown SSL server certificates without\n"
+" prompting (but only with '--non-interactive')"
+msgstr ""
+"accepte les certificats de serveurs SSL inconnus sans confirmation\n"
+" (mais seulement avec '--non-interactive')"
+
+#: ../svn/main.c:207 ../svnsync/main.c:116
msgid "do no interactive prompting"
msgstr "pas de demande interactive"
-#: ../svn/main.c:204
+#: ../svn/main.c:209
msgid "try operation but make no changes"
msgstr "essaie l'opération sans l'exécuter réellement"
-#: ../svn/main.c:206 ../svnlook/main.c:113
+#: ../svn/main.c:211 ../svnlook/main.c:117
msgid "do not print differences for deleted files"
msgstr "n'affiche pas les différences pour les fichiers supprimés"
-#: ../svn/main.c:208
+#: ../svn/main.c:213
msgid "notice ancestry when calculating differences"
msgstr "prend en compte l'héritage pour évaluer les différences"
-#: ../svn/main.c:210
+#: ../svn/main.c:215
msgid "ignore ancestry when calculating merges"
msgstr "ignore l'héritage lors d'une fusion"
-#: ../svn/main.c:212
+#: ../svn/main.c:217
msgid "ignore externals definitions"
msgstr "ignore les références externes"
-#: ../svn/main.c:214
+#: ../svn/main.c:219
msgid "use ARG as diff command"
msgstr "utilise ARG comme commande diff"
-#: ../svn/main.c:215
+#: ../svn/main.c:220
msgid "use ARG as merge command"
msgstr "utilise ARG comme commande de fusion"
-#: ../svn/main.c:216
+#: ../svn/main.c:221
msgid "use ARG as external editor"
msgstr "utilise ARG comme éditeur externe"
-#: ../svn/main.c:219
+#: ../svn/main.c:224
msgid "mark revisions as merged (use with -r)"
msgstr "note la révision comme fusionnée (utiliser avec -r)"
-#: ../svn/main.c:220
+#: ../svn/main.c:225
msgid "use ARG as the older target"
msgstr "utilise ARG comme ancienne cible"
-#: ../svn/main.c:221
+#: ../svn/main.c:226
msgid "use ARG as the newer target"
msgstr "utilise ARG comme nouvelle cible"
-#: ../svn/main.c:223
+#: ../svn/main.c:228
msgid "operate on a revision property (use with -r)"
msgstr "opère sur la propriéte de révision (utiliser avec -r)"
-#: ../svn/main.c:224
+#: ../svn/main.c:229
msgid "relocate via URL-rewriting"
msgstr "re-localise par réécriture d'URL"
-#: ../svn/main.c:226 ../svnadmin/main.c:275 ../svnsync/main.c:134
+#: ../svn/main.c:231 ../svnadmin/main.c:275 ../svnsync/main.c:140
msgid "read user configuration files from directory ARG"
msgstr "fichiers de configuration dans ce répertoire"
-#: ../svn/main.c:227
+#: ../svn/main.c:232
msgid "enable automatic properties"
msgstr "active les propriétés automatiques"
-#: ../svn/main.c:228
+#: ../svn/main.c:233
msgid "disable automatic properties"
msgstr "désactive les propriétés automatiques"
-#: ../svn/main.c:230
+#: ../svn/main.c:235
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -7114,23 +7155,23 @@ msgstr ""
" un svn:eol-style de valeur 'native'.\n"
" ARG peut être 'LF', 'CR', 'CRLF'"
-#: ../svn/main.c:237
+#: ../svn/main.c:242
msgid "maximum number of log entries"
msgstr "nombre maximum d'entrées dans le journal (log)"
-#: ../svn/main.c:238
+#: ../svn/main.c:243
msgid "don't unlock the targets"
msgstr "ne pas déverrouiller les cibles"
-#: ../svn/main.c:239
+#: ../svn/main.c:244
msgid "show a summary of the results"
msgstr "affiche un résumé du résultat"
-#: ../svn/main.c:240
+#: ../svn/main.c:245
msgid "remove changelist association"
msgstr "efface l'association une liste de changements"
-#: ../svn/main.c:242
+#: ../svn/main.c:247
msgid ""
"operate only on members of changelist ARG\n"
" [aliases: --cl]"
@@ -7138,19 +7179,19 @@ msgstr ""
"opère seulement sur les membres de la liste de changements ARG\n"
" [alias : --cl]"
-#: ../svn/main.c:246
+#: ../svn/main.c:251
msgid "don't delete changelists after commit"
msgstr "ne pas effacer les listes de changements après propagation (commit)"
-#: ../svn/main.c:247
+#: ../svn/main.c:252
msgid "keep path in working copy"
msgstr "garder le chemin dans la copie de travail"
-#: ../svn/main.c:249
+#: ../svn/main.c:254
msgid "retrieve all revision properties"
msgstr "Retrouve toutes les propriétés de révision"
-#: ../svn/main.c:251
+#: ../svn/main.c:256
msgid ""
"set revision property ARG in new revision\n"
" using the name[=value] format"
@@ -7158,11 +7199,11 @@ msgstr ""
"Défini la propriété de révision ARG pour la \n"
" nouvelle révision avec le format nom[=valeur]"
-#: ../svn/main.c:254
+#: ../svn/main.c:259
msgid "make intermediate directories"
msgstr "Crée des répertoires intermédiaires"
-#: ../svn/main.c:256
+#: ../svn/main.c:261
msgid ""
"use/display additional information from merge\n"
" history"
@@ -7170,7 +7211,7 @@ msgstr ""
"utilise/affiche des informations supplémentaire de\n"
"l'historique de fusion (merge)"
-#: ../svn/main.c:260
+#: ../svn/main.c:265
msgid ""
"specify automatic conflict resolution action\n"
" ('postpone', 'base', 'mine-conflict',\n"
@@ -7181,7 +7222,7 @@ msgstr ""
" ('postpone', 'base', 'mine-conflict', 'theirs-conflict', \n"
" 'mine-full', 'theirs-full', 'edit', 'launch')"
-#: ../svn/main.c:268
+#: ../svn/main.c:273
msgid ""
"specify which collection of revisions to display\n"
" ('merged', 'eligible')"
@@ -7189,11 +7230,11 @@ msgstr ""
"précise l'ensemble de révisions afficher\n"
" ('merged', 'eligible')"
-#: ../svn/main.c:272
+#: ../svn/main.c:277
msgid "lump-merge all of source URL's unmerged changes"
msgstr "Fusionne toutes les modifications non fusionnées des URLs sources"
-#: ../svn/main.c:319
+#: ../svn/main.c:324
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -7203,11 +7244,11 @@ msgstr ""
"prévoyant leur ajout au dépôt lors de la prochaine propagation (commit).\n"
"usage : add CHEMIN...\n"
-#: ../svn/main.c:324
+#: ../svn/main.c:329
msgid "add intermediate parents"
msgstr "ajoute les répertoires intermédiaires"
-#: ../svn/main.c:327
+#: ../svn/main.c:332
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -7222,7 +7263,7 @@ msgstr ""
"\n"
" Si précisée, REV détermine quelle révision est d'abord regardée.\n"
-#: ../svn/main.c:336
+#: ../svn/main.c:341
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -7235,7 +7276,7 @@ msgstr ""
"\n"
" Si précisée, REV détermine quelle révision est d'abord regardée.\n"
-#: ../svn/main.c:344
+#: ../svn/main.c:349
msgid ""
"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME TARGET...\n"
@@ -7245,7 +7286,7 @@ msgstr ""
"usage : 1. changelist CLNOM CIBLE...\n"
" 2. changelist --remove CIBLE...\n"
-#: ../svn/main.c:350
+#: ../svn/main.c:355
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -7297,7 +7338,7 @@ msgstr ""
" Voir aussi 'svn help update' pour la liste des caractères possible \n"
" décrivant l'action choisie.\n"
-#: ../svn/main.c:377
+#: ../svn/main.c:382
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -7307,7 +7348,7 @@ msgstr ""
"reprenant les opérations en cours, etc.\n"
"usage : cleanup [CHEMIN...]\n"
-#: ../svn/main.c:384
+#: ../svn/main.c:389
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -7325,7 +7366,7 @@ msgstr ""
" Les éléments propagés (commit) qui étaient verrouillés (locked) sont\n"
" déverrouillés (unlock) en cas de réussite.\n"
-#: ../svn/main.c:392
+#: ../svn/main.c:397
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -7344,7 +7385,7 @@ msgstr ""
" (sauf sous OS400). Les éléments propagés (commit) qui étaient verrouillés\n"
" (locked) sont déverrouillés (unlock) en cas de réussite.\n"
-#: ../svn/main.c:405
+#: ../svn/main.c:410
msgid ""
"Duplicate something in working copy or repository, remembering\n"
"history.\n"
@@ -7385,7 +7426,7 @@ msgstr ""
"dépôt. En conséquence, elles ne peuvent, par défaut, propager les \n"
"informations de suivi de fusion de la source la destination.\n"
-#: ../svn/main.c:427
+#: ../svn/main.c:432
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -7414,7 +7455,7 @@ msgstr ""
"\n"
" 2. Chaque URL est supprimée du dépôt via une propagation immédiate.\n"
-#: ../svn/main.c:443
+#: ../svn/main.c:448
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -7471,7 +7512,7 @@ msgstr ""
" Utiliser simplement 'svn diff' pour afficher les modifications locales\n"
" dans la copie de travail.\n"
-#: ../svn/main.c:471
+#: ../svn/main.c:476
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -7509,7 +7550,7 @@ msgstr ""
"\n"
" Si spécifiée, PEGREV donne la révision de la cible d'abord regardée.\n"
-#: ../svn/main.c:492
+#: ../svn/main.c:497
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -7517,7 +7558,7 @@ msgstr ""
"Décrit l'usage de ce programme ou de ses sous-commandes.\n"
"usage : help [SOUS_COMMANDE...]\n"
-#: ../svn/main.c:498
+#: ../svn/main.c:503
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -7540,7 +7581,7 @@ msgstr ""
" Les objects non versionnables tels les périphériques ou les pipes sont\n"
" ignorés si l'option '--force' est spécifiée.\n"
-#: ../svn/main.c:512
+#: ../svn/main.c:517
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -7556,7 +7597,7 @@ msgstr ""
" CIBLE peut être un chemin dans une copie de travail ou une URL.\n"
" Si REV est spécifié, cette révision est d'abord regardée.\n"
-#: ../svn/main.c:522
+#: ../svn/main.c:527
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -7593,7 +7634,7 @@ msgstr ""
" Taille (en octets)\n"
" Date et heure de la dernière propagation\n"
-#: ../svn/main.c:543
+#: ../svn/main.c:548
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -7607,19 +7648,19 @@ msgstr ""
" Utiliser --force pour voler le verrou d'un autre utilisateur ou d'une\n"
" autre copie de travail.\n"
-#: ../svn/main.c:549
+#: ../svn/main.c:554
msgid "read lock comment from file ARG"
msgstr "lit les commentaire de verrouillage partir du fichier ARG"
-#: ../svn/main.c:550
+#: ../svn/main.c:555
msgid "specify lock comment ARG"
msgstr "précise le commentaire de verrouillage ARG"
-#: ../svn/main.c:551
+#: ../svn/main.c:556
msgid "force validity of lock comment source"
msgstr "force la validité de la source du commentaire de verrouillage"
-#: ../svn/main.c:554
+#: ../svn/main.c:559
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -7676,15 +7717,15 @@ msgstr ""
" svn log http://www.exemple.fr/depot/projet/truc.c\n"
" svn log http://www.exemple.fr/depot/projet truc.c bidule.c\n"
-#: ../svn/main.c:583
+#: ../svn/main.c:588
msgid "retrieve revision property ARG"
msgstr "Retrouve la propriété de révision ARG"
-#: ../svn/main.c:584
+#: ../svn/main.c:589
msgid "the change made in revision ARG"
msgstr "Le changement fait la révision ARG"
-#: ../svn/main.c:587
+#: ../svn/main.c:592
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -7753,7 +7794,7 @@ msgstr ""
" L'option '--ignore-ancestry' permet de forcer Subversion considérer les\n"
" sources comme non parentes et de ne pas garder trace des fusions.\n"
-#: ../svn/main.c:625
+#: ../svn/main.c:630
msgid ""
"Display merge-related information.\n"
"usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
@@ -7772,7 +7813,7 @@ msgstr ""
" les révisions qui ont été fusionnées entre URL-SOURCE et CIBLE. Sinon, \n"
" affiche les informations liées selon l'option '--show-revs'.\n"
-#: ../svn/main.c:636
+#: ../svn/main.c:641
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -7801,7 +7842,7 @@ msgstr ""
" Dans les deux cas, les répertoires intermédiaires doivent déj exister,\n"
" sauf si l'option --parents est présente.\n"
-#: ../svn/main.c:653
+#: ../svn/main.c:658
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -7831,7 +7872,7 @@ msgstr ""
" URL -> URL : effectue un renommage côté serveur.\n"
" Toutes les sources doivent être du même type.\n"
-#: ../svn/main.c:669
+#: ../svn/main.c:674
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -7849,7 +7890,7 @@ msgstr ""
" 2. Supprime une propriété non versionnée d'une révision du dépôt.\n"
" CIBLE détermine uniquement quel dépôt accéder.\n"
-#: ../svn/main.c:680
+#: ../svn/main.c:685
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -7871,7 +7912,7 @@ msgstr ""
"\n"
"Voir 'svn help propset' pour plus d'informations sur définir des propriétés.\n"
-#: ../svn/main.c:693
+#: ../svn/main.c:698
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -7904,7 +7945,7 @@ msgstr ""
" Utiliser --strict pour désactiver ces améliorations esthétiques, par\n"
" exemple pour rediriger les propriétés binaires vers un fichier.\n"
-#: ../svn/main.c:711
+#: ../svn/main.c:716
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -7924,7 +7965,7 @@ msgstr ""
" 2. Liste les propriétés non versionnées d'une révision du dépôt.\n"
" CIBLE détermine uniquement quel dépôt accéder.\n"
-#: ../svn/main.c:722
+#: ../svn/main.c:727
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -8042,11 +8083,11 @@ msgstr ""
" modification non récursive sur un répertoire échouera. Une modification\n"
" récursive s'appliquera seulement aux fichiers fils du répertoire.\n"
-#: ../svn/main.c:782
+#: ../svn/main.c:787
msgid "read property value from file ARG"
msgstr "prend la valeur d'une propriété dans le fichier ARG"
-#: ../svn/main.c:785
+#: ../svn/main.c:790
msgid ""
"Resolve conflicts on working copy files or directories.\n"
"usage: resolve --accept=ARG [PATH...]\n"
@@ -8058,7 +8099,7 @@ msgstr ""
"\n"
" Note : l'option '--accept' est actuellement requise.\n"
-#: ../svn/main.c:790
+#: ../svn/main.c:795
msgid ""
"specify automatic conflict resolution source\n"
" ('base', 'working', 'mine-conflict',\n"
@@ -8068,7 +8109,7 @@ msgstr ""
" ('postpone', 'base', 'mine-conflict',\n"
" 'theirs-conflict', 'mine-full', 'theirs-full')"
-#: ../svn/main.c:797
+#: ../svn/main.c:802
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -8085,7 +8126,7 @@ msgstr ""
" supprime simplement les fichiers relatifs au conflit pour permettre une\n"
" propagation (commit) ultérieure. Lui préférer 'svn resolve --accept \
working'.\n"
-#: ../svn/main.c:807
+#: ../svn/main.c:812
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -8099,7 +8140,7 @@ msgstr ""
" Note : cette sous-commande n'a pas besoin d'accès réseau, et résout les\n"
" conflits. Elle ne restaure cependant pas les répertoires supprimés.\n"
-#: ../svn/main.c:815
+#: ../svn/main.c:820
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -8248,7 +8289,7 @@ msgstr ""
" 965 687 suzy wc/zig.c\n"
" État par rapport la révision 981\n"
-#: ../svn/main.c:891
+#: ../svn/main.c:896
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL[@PEGREV] [PATH]\n"
@@ -8314,7 +8355,7 @@ msgstr ""
" Voir aussi 'svn help update' pour la liste des caractères possibles\n"
" décrivant l'action choisie.\n"
-#: ../svn/main.c:928
+#: ../svn/main.c:933
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -8326,7 +8367,7 @@ msgstr ""
"\n"
" Utiliser --force pour casser le verrou.\n"
-#: ../svn/main.c:935
+#: ../svn/main.c:940
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -8399,74 +8440,74 @@ msgstr ""
" la copie de travail cible de l'opération. La profondeur peut seulement être\n"
" augmenté dans la version actuelle. \n"
-#: ../svn/main.c:1015 ../svnadmin/main.c:78 ../svnlook/main.c:329
-#: ../svnsync/main.c:184
+#: ../svn/main.c:1020 ../svnadmin/main.c:78 ../svnlook/main.c:341
+#: ../svnsync/main.c:191
msgid "Caught signal"
msgstr "Signal reçu"
-#: ../svn/main.c:1138 ../svnlook/main.c:2083
+#: ../svn/main.c:1143 ../svnlook/main.c:2187
msgid "Non-numeric limit argument given"
msgstr "L'argument de l'option limit doit être numérique"
-#: ../svn/main.c:1144 ../svnlook/main.c:2089
+#: ../svn/main.c:1149 ../svnlook/main.c:2193
msgid "Argument to --limit must be positive"
msgstr "L'argument de --limit doit être positif"
-#: ../svn/main.c:1168 ../svn/main.c:1409
+#: ../svn/main.c:1173 ../svn/main.c:1417
msgid "Can't specify -c with --old"
msgstr "Option -c incompatible avec --old"
-#: ../svn/main.c:1187
+#: ../svn/main.c:1192
#, c-format
msgid "Non-numeric change argument (%s) given to -c"
msgstr "Argument non numérique (%s) donné l'option -c"
-#: ../svn/main.c:1195
+#: ../svn/main.c:1200
msgid "There is no change 0"
msgstr "Il n'y a pas de changement (option -c) 0"
-#: ../svn/main.c:1230 ../svnadmin/main.c:1473
+#: ../svn/main.c:1235 ../svnadmin/main.c:1473
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Erreur de syntaxe l'argument de révision '%s'"
-#: ../svn/main.c:1303 ../svn/main.c:1322
+#: ../svn/main.c:1308 ../svn/main.c:1327
#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Erreur en convertissant la profondeur de la 'locale' vers UTF8"
-#: ../svn/main.c:1311 ../svn/main.c:1330
+#: ../svn/main.c:1316 ../svn/main.c:1335
#, c-format
msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
msgstr "'%s' n'est pas un profondeur valide ; essayer 'empty' (vide), 'files' \
(fichiers), 'immediates' (immédiat) ou 'infinity' (infini)"
-#: ../svn/main.c:1437
+#: ../svn/main.c:1445
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Erreur de syntaxe l'argument de fin de ligne native (native-eol) '%s'"
-#: ../svn/main.c:1483
+#: ../svn/main.c:1491
#, c-format
msgid "'%s' is not a valid --accept value"
msgstr "'%s' n'est pas valide pour --accept"
-#: ../svn/main.c:1492
+#: ../svn/main.c:1500
#, c-format
msgid "'%s' is not a valid --show-revs value"
msgstr "'%s' n'est pas valide pour --show-revs"
-#: ../svn/main.c:1554 ../svndumpfilter/main.c:1315 ../svnlook/main.c:2161
+#: ../svn/main.c:1562 ../svndumpfilter/main.c:1315 ../svnlook/main.c:2265
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument de la sous-commande attendu\n"
-#: ../svn/main.c:1573 ../svnadmin/main.c:1605 ../svndumpfilter/main.c:1334
-#: ../svnlook/main.c:2180
+#: ../svn/main.c:1581 ../svnadmin/main.c:1605 ../svndumpfilter/main.c:1334
+#: ../svnlook/main.c:2284
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Commande inconnue : '%s'\n"
-#: ../svn/main.c:1607
+#: ../svn/main.c:1615
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8475,64 +8516,68 @@ msgstr ""
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svn help %s' pour l'aide.\n"
-#: ../svn/main.c:1621
+#: ../svn/main.c:1629
msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c \
and -r" msgstr "Arguments de révision multiples : ne pas répéter -c, ou utiliser \
la fois -c et -r"
-#: ../svn/main.c:1635
+#: ../svn/main.c:1643
msgid "-r and -c can't be used with --reintegrate"
msgstr "-r et -c ne peuvent être utilisées avec --reintegrate"
-#: ../svn/main.c:1644
+#: ../svn/main.c:1652
msgid "--depth and --set-depth are mutually exclusive"
msgstr "--depth et --set-depth sont mutuellement exclusives"
-#: ../svn/main.c:1694
+#: ../svn/main.c:1661 ../svnsync/main.c:2001
+msgid "--trust-server-cert requires --non-interactive"
+msgstr "--trust-server-cert requiert --non-interactive"
+
+#: ../svn/main.c:1711
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr "Le fichier de l'entrée du journal est versionné; forcer avec \
'--force-log'"
-#: ../svn/main.c:1701
+#: ../svn/main.c:1718
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr "Le fichier de commentaire du verrou est versionné ; forcer avec \
'--force-log'"
-#: ../svn/main.c:1721
+#: ../svn/main.c:1738
msgid "The log message is a pathname (was -F intended?); use '--force-log' to \
override" msgstr "Le message de propagation donné est un chemin (-F était voulu ?) \
; forcer avec '--force-log'"
-#: ../svn/main.c:1728
+#: ../svn/main.c:1745
msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to \
override" msgstr "Le commentaire du verrou est un chemin de fichier (-F était voulu \
?) ; forcer avec '--force-log'"
-#: ../svn/main.c:1739
+#: ../svn/main.c:1756
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate et --depth sont mutuellement exclusives"
-#: ../svn/main.c:1816
+#: ../svn/main.c:1833
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props et --no-auto-props sont mutuellement exclusives"
-#: ../svn/main.c:1830
+#: ../svn/main.c:1847
msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
msgstr "--reintegrate ne peut être utilisé avec --ignore-ancestry ou \
--record-only"
-#: ../svn/main.c:1838
+#: ../svn/main.c:1855
msgid "--reintegrate cannot be used with --ignore-ancestry"
msgstr "--reintegrate ne peut être utilisé avec --ignore-ancestry"
-#: ../svn/main.c:1846
+#: ../svn/main.c:1863
msgid "--reintegrate cannot be used with --record-only"
msgstr "--reintegrate ne peut être utilise avec --record-only"
-#: ../svn/main.c:1959 ../svn/main.c:1965
+#: ../svn/main.c:1977 ../svn/main.c:1983
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s incompatible avec --non-interactive"
-#: ../svn/main.c:1992
+#: ../svn/main.c:2010
msgid "Try 'svn help' for more info"
msgstr "Essayer 'svn help' pour plus d'information."
-#: ../svn/main.c:2002
+#: ../svn/main.c:2020
msgid "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for \
details)\n" msgstr "svn : lancer 'svn cleanup' pour enlever les verrous (cf 'svn \
help cleanup')\n"
@@ -8725,7 +8770,7 @@ msgstr "Suppression %s\n"
msgid "Replacing %s\n"
msgstr "Remplacement %s\n"
-#: ../svn/notify.c:384 ../svnsync/main.c:909
+#: ../svn/notify.c:384 ../svnsync/main.c:916
#, c-format
msgid "Transmitting file data "
msgstr "Transmission des données "
@@ -8868,19 +8913,19 @@ msgstr "Propriétés sur '%s'\n"
msgid "Unversioned properties on revision %ld:\n"
msgstr "Propriétés non versionnées de la révision %ld :\n"
-#: ../svn/props.c:54
+#: ../svn/props.c:56
msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a \
revision property" msgstr "Préciser explicitement la révision par un numéro, une \
date ou 'HEAD' pour accéder une propriété de révision"
-#: ../svn/props.c:61
+#: ../svn/props.c:63
msgid "Wrong number of targets specified"
msgstr "Le nombre de cibles n'est pas bon"
-#: ../svn/props.c:70
+#: ../svn/props.c:72
msgid "Either a URL or versioned item is required"
msgstr "Une URL ou un objet versionné est requis"
-#: ../svn/props.c:217
+#: ../svn/props.c:179
#, c-format
msgid ""
"To turn off the %s property, use 'svn propdel';\n"
@@ -9475,7 +9520,7 @@ msgstr ""
"\n"
"Sous-commandes disponibles :\n"
-#: ../svnadmin/main.c:717 ../svnlook/main.c:1759 ../svnserve/main.c:250
+#: ../svnadmin/main.c:717 ../svnlook/main.c:1859 ../svnserve/main.c:250
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -9544,22 +9589,22 @@ msgstr "Un seul nom de propriété et ar
msgid "Exactly one file argument required"
msgstr "Un seul argument fichier attendu"
-#: ../svnadmin/main.c:1200 ../svnlook/main.c:1824
+#: ../svnadmin/main.c:1200 ../svnlook/main.c:1924
#, c-format
msgid "UUID Token: %s\n"
msgstr "Chaîne UUID : %s\n"
-#: ../svnadmin/main.c:1201 ../svnlook/main.c:1825
+#: ../svnadmin/main.c:1201 ../svnlook/main.c:1925
#, c-format
msgid "Owner: %s\n"
msgstr "Propriétaire : %s\n"
-#: ../svnadmin/main.c:1202 ../svnlook/main.c:1826
+#: ../svnadmin/main.c:1202 ../svnlook/main.c:1926
#, c-format
msgid "Created: %s\n"
msgstr "Créé : %s\n"
-#: ../svnadmin/main.c:1203 ../svnlook/main.c:1827
+#: ../svnadmin/main.c:1203 ../svnlook/main.c:1927
#, c-format
msgid "Expires: %s\n"
msgstr "Expire : %s\n"
@@ -9814,51 +9859,51 @@ msgstr ""
msgid "Try 'svndumpfilter help' for more info"
msgstr "Essayer 'svndumpfilter help' pour plus d'information"
-#: ../svnlook/main.c:95
+#: ../svnlook/main.c:99
msgid "show details for copies"
msgstr "affiche les détails concernant les copies"
-#: ../svnlook/main.c:98
+#: ../svnlook/main.c:102
msgid "print differences against the copy source"
msgstr "affiche les différences par rapport la source de la copie"
-#: ../svnlook/main.c:101
+#: ../svnlook/main.c:105
msgid "show full paths instead of indenting them"
msgstr "affiche les chemins complets au lieu de les indenter"
-#: ../svnlook/main.c:107
+#: ../svnlook/main.c:111
msgid "maximum number of history entries"
msgstr "nombre maximum d'entrées dans l'historique"
-#: ../svnlook/main.c:110
+#: ../svnlook/main.c:114
msgid "do not print differences for added files"
msgstr "n'affiche pas les différences pour les fichiers ajoutés"
-#: ../svnlook/main.c:116
+#: ../svnlook/main.c:120
msgid "operate on single directory only"
msgstr "opère sur un seul répertoire"
-#: ../svnlook/main.c:119
+#: ../svnlook/main.c:123
msgid "specify revision number ARG"
msgstr "précise le numéro de révision ARG"
-#: ../svnlook/main.c:122
+#: ../svnlook/main.c:126
msgid "operate on a revision property (use with -r or -t)"
msgstr "opère sur une propriéte de révision (utiliser avec -r ou -t)"
-#: ../svnlook/main.c:125
+#: ../svnlook/main.c:129
msgid "show node revision ids for each path"
msgstr "donne l'identifiant du nœud de révision pour chaque objet"
-#: ../svnlook/main.c:128
+#: ../svnlook/main.c:132
msgid "specify transaction name ARG"
msgstr "précise le nom de la transaction ARG"
-#: ../svnlook/main.c:131
+#: ../svnlook/main.c:135
msgid "be verbose"
msgstr "verbeux"
-#: ../svnlook/main.c:138
+#: ../svnlook/main.c:145
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed along\n"
@@ -9889,7 +9934,7 @@ msgstr ""
" --ignore-eol-style : \n"
" ignore les changements de style de fin de ligne (eol)."
-#: ../svnlook/main.c:177
+#: ../svnlook/main.c:184
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -9899,7 +9944,7 @@ msgstr ""
"\n"
"Affiche l'auteur.\n"
-#: ../svnlook/main.c:182
+#: ../svnlook/main.c:189
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -9910,7 +9955,7 @@ msgstr ""
"Affiche le contenu d'un fichier.\n"
"Le '/' de tête dans le chemin est optionnel.\n"
-#: ../svnlook/main.c:187
+#: ../svnlook/main.c:194
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -9920,7 +9965,7 @@ msgstr ""
"\n"
"Affiche les objets modifiés.\n"
-#: ../svnlook/main.c:192
+#: ../svnlook/main.c:199
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -9930,7 +9975,7 @@ msgstr ""
"\n"
"Affiche la date de dernière modification.\n"
-#: ../svnlook/main.c:197
+#: ../svnlook/main.c:204
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -9940,7 +9985,7 @@ msgstr ""
"\n"
"Affiche les différences des fichiers et propriétés modifiés au style GNU\n"
-#: ../svnlook/main.c:203
+#: ../svnlook/main.c:210
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -9952,7 +9997,7 @@ msgstr ""
"Affiche les répertoires eux-même modifiés (édition de propriétés) ou dont\n"
"les fichiers contenus ont été changés.\n"
-#: ../svnlook/main.c:209
+#: ../svnlook/main.c:216
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -9962,7 +10007,7 @@ msgstr ""
"\n"
"Affiche l'aide sur ce programme ou ses sous-commandes.\n"
-#: ../svnlook/main.c:214
+#: ../svnlook/main.c:221
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9974,7 +10019,7 @@ msgstr ""
"Affiche l'historique d'un objet dans le dépôt (ou de la racine du dépôt\n"
"si aucun objet n'est précisé).\n"
-#: ../svnlook/main.c:220
+#: ../svnlook/main.c:227
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -9984,7 +10029,7 @@ msgstr ""
"\n"
"Affiche l'auteur, la date, la taille et le contenu de l'entrée du journal.\n"
-#: ../svnlook/main.c:225
+#: ../svnlook/main.c:232
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -9994,7 +10039,7 @@ msgstr ""
"\n"
"Décrit le verrou sur le chemin dans le dépôt, s'il existe.\n"
-#: ../svnlook/main.c:230
+#: ../svnlook/main.c:237
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -10004,32 +10049,36 @@ msgstr ""
"\n"
"Affiche l'entrée du journal (log).\n"
-#: ../svnlook/main.c:235
+#: ../svnlook/main.c:242
msgid ""
-"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
+"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
+" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
"\n"
"Print the raw value of a property on a path in the repository.\n"
-"With --revprop, prints the raw value of a revision property.\n"
+"With --revprop, print the raw value of a revision property.\n"
msgstr ""
-"usage : svnlook propget CHEMIN_DÉPÔT NOM_PROP [CHEMIN_DANS_DÉPÔT]\n"
+"usage : 1. svnlook propget CHEMIN_DÉPÔT NOM_PROP CHEMIN_DANS_DÉPÔT\n"
+" 2. svnlook propget --revprop CHEMIN_DÉPÔT NOM_PROP\n"
"\n"
"Affiche la valeur brute de la propriété pour un objet du dépôt.\n"
"Avec --revprop, affiche la valeur brute d'une propriété de révision.\n"
-#: ../svnlook/main.c:241
+#: ../svnlook/main.c:250
msgid ""
-"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
+"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
+" 2. svnlook proplist --revprop REPOS_PATH\n"
"\n"
"List the properties of a path in the repository, or\n"
"with the --revprop option, revision properties.\n"
"With -v, show the property values too.\n"
msgstr ""
-"usage : svnlook proplist CHEMIN_DÉPÔT [CHEMIN_DANS_DÉPÔT]\n"
+"usage : 1. svnlook proplist CHEMIN_DÉPÔT CHEMIN_DANS_DÉPÔT\n"
+" 2. svnlook proplist --revprop CHEMIN_DÉPÔT\n"
"\n"
"Liste les propriétés d'un objet du dépôt, ou avec --revprop les propriétés\n"
-"de révision. -v donne en sus leurs valeurs.\n"
+"de révision. Avec -v, donne en sus leurs valeurs.\n"
-#: ../svnlook/main.c:248
+#: ../svnlook/main.c:259
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -10041,7 +10090,7 @@ msgstr ""
"Affiche l'arborescence partir de CHEMIN_DANS_DÉPÔT ou de la racine\n"
"du dépôt si non précisé. Montre optionnellement les nœuds de révision.\n"
-#: ../svnlook/main.c:254
+#: ../svnlook/main.c:265
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -10051,7 +10100,7 @@ msgstr ""
"\n"
"Affiche l'UUID (identifiant unique) du dépôt.\n"
-#: ../svnlook/main.c:259
+#: ../svnlook/main.c:270
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -10061,43 +10110,43 @@ msgstr ""
"\n"
"Affiche le numéro de la révision la plus récente.\n"
-#: ../svnlook/main.c:780
+#: ../svnlook/main.c:792
#, c-format
msgid "Added: %s\n"
msgstr "Ajouté : %s\n"
-#: ../svnlook/main.c:782
+#: ../svnlook/main.c:794
#, c-format
msgid "Deleted: %s\n"
msgstr "Effacé : %s\n"
-#: ../svnlook/main.c:784
+#: ../svnlook/main.c:796
#, c-format
msgid "Modified: %s\n"
msgstr "Modifié : %s\n"
-#: ../svnlook/main.c:870
+#: ../svnlook/main.c:882
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Copié : %s (de révision %ld, %s)\n"
-#: ../svnlook/main.c:938
+#: ../svnlook/main.c:950
msgid "Added"
msgstr "Ajouté"
-#: ../svnlook/main.c:939
+#: ../svnlook/main.c:951
msgid "Deleted"
msgstr "Supprimé"
-#: ../svnlook/main.c:940
+#: ../svnlook/main.c:952
msgid "Modified"
msgstr "Modifié"
-#: ../svnlook/main.c:941
+#: ../svnlook/main.c:953
msgid "Index"
msgstr "Index"
-#: ../svnlook/main.c:952
+#: ../svnlook/main.c:964
msgid ""
"(Binary files differ)\n"
"\n"
@@ -10105,26 +10154,26 @@ msgstr ""
"(les fichiers binaires diffèrent)\n"
"\n"
-#: ../svnlook/main.c:1091
+#: ../svnlook/main.c:1129
msgid "unknown"
msgstr "inconnu"
-#: ../svnlook/main.c:1238 ../svnlook/main.c:1331 ../svnlook/main.c:1360
+#: ../svnlook/main.c:1276 ../svnlook/main.c:1369 ../svnlook/main.c:1398
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "La transaction '%s' n'est pas basée sur une révision ; bizarre"
-#: ../svnlook/main.c:1268
+#: ../svnlook/main.c:1306
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' est une URL, ce devrait plutôt être un chemin local"
-#: ../svnlook/main.c:1295
+#: ../svnlook/main.c:1333
#, c-format
msgid "Path '%s' is not a file"
msgstr "Le chemin '%s' n'est pas un fichier"
-#: ../svnlook/main.c:1444
+#: ../svnlook/main.c:1482
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -10133,7 +10182,7 @@ msgstr ""
"RÉVISION CHEMIN <ID>\n"
"-------- -----------\n"
-#: ../svnlook/main.c:1449
+#: ../svnlook/main.c:1487
#, c-format
msgid ""
"REVISION PATH\n"
@@ -10142,27 +10191,27 @@ msgstr ""
"RÉVISION CHEMIN\n"
"-------- ------\n"
-#: ../svnlook/main.c:1498
+#: ../svnlook/main.c:1536
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Propriété '%s' absente la révision %ld"
-#: ../svnlook/main.c:1505
+#: ../svnlook/main.c:1543
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Propriété '%s' absente du chemin '%s' la révision %ld"
-#: ../svnlook/main.c:1510
+#: ../svnlook/main.c:1548
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Propriété '%s' absente du chemin '%s' dans la transaction %s"
-#: ../svnlook/main.c:1688 ../svnlook/main.c:1903
+#: ../svnlook/main.c:1788 ../svnlook/main.c:2003
#, c-format
msgid "Missing repository path argument"
msgstr "Chemin du dépôt manquant"
-#: ../svnlook/main.c:1749
+#: ../svnlook/main.c:1849
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -10181,11 +10230,11 @@ msgstr ""
"\n"
"Sous-commandes disponibles :\n"
-#: ../svnlook/main.c:1805
+#: ../svnlook/main.c:1905
msgid "Missing path argument"
msgstr "Chemin en argument manquant"
-#: ../svnlook/main.c:1830
+#: ../svnlook/main.c:1930
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -10194,7 +10243,7 @@ msgstr ""
"Commentaire (%i lignes) :\n"
"%s\n"
-#: ../svnlook/main.c:1831
+#: ../svnlook/main.c:1931
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -10203,39 +10252,39 @@ msgstr ""
"Commentaire (%i ligne) :\n"
"%s\n"
-#: ../svnlook/main.c:1877
+#: ../svnlook/main.c:1977
#, c-format
msgid "Missing propname argument"
msgstr "Le nom de la propriété manque"
-#: ../svnlook/main.c:1878
+#: ../svnlook/main.c:1978
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Le nom de la propriété et le chemin du dépôt manquent"
-#: ../svnlook/main.c:1884
+#: ../svnlook/main.c:1984
msgid "Missing propname or repository path argument"
msgstr "Le nom de la propriété ou le chemin du dépôt manque"
-#: ../svnlook/main.c:2043
+#: ../svnlook/main.c:2143
msgid "Invalid revision number supplied"
msgstr "Numéro de révision invalide"
-#: ../svnlook/main.c:2131
+#: ../svnlook/main.c:2235
msgid "The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "'--transaction' (-t) et '--revision' (-r) sont mutuellement exclusifs"
-#: ../svnlook/main.c:2213
+#: ../svnlook/main.c:2317
#, c-format
msgid "Repository argument required\n"
msgstr "Un dépôt est requis en argument\n"
-#: ../svnlook/main.c:2222
+#: ../svnlook/main.c:2326
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' est une URL au lieu d'un chemin local\n"
-#: ../svnlook/main.c:2273
+#: ../svnlook/main.c:2377
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10244,7 +10293,7 @@ msgstr ""
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnlook help %s' pour l'aide.\n"
-#: ../svnlook/main.c:2316
+#: ../svnlook/main.c:2420
msgid "Try 'svnlook help' for more info"
msgstr "Essayer 'svnlook help' pour plus d'information"
@@ -10499,7 +10548,7 @@ msgstr "Échec de la connexion au contr
msgid "The service failed to start; an internal error occurred while starting the \
service" msgstr "Échec au démarrage du service ; une erreur interne est \
intervenue"
-#: ../svnsync/main.c:65
+#: ../svnsync/main.c:67
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -10528,7 +10577,7 @@ msgstr ""
"du dépôt destination qu'avec 'svnsync'. Autrement dit, le dépôt\n"
"destination doit être un mirroir en lecture seule du dépôt source.\n"
-#: ../svnsync/main.c:80
+#: ../svnsync/main.c:82
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
@@ -10540,7 +10589,7 @@ msgstr ""
"Transfère toutes les révisions en attente vers la destination,\n"
" partir de la source avec laquelle elle a été initialisée.\n"
-#: ../svnsync/main.c:86
+#: ../svnsync/main.c:88
msgid ""
"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
@@ -10571,7 +10620,7 @@ msgstr ""
"la destination. Il est possible d'utiliser \"HEAD\" pour préciser \n"
"\"la dernière révision transférée\".\n"
-#: ../svnsync/main.c:102
+#: ../svnsync/main.c:104
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -10581,17 +10630,17 @@ msgstr ""
"\n"
"Décrit l'utilisation de ce programme ou de ses sous-commandes.\n"
-#: ../svnsync/main.c:112
+#: ../svnsync/main.c:114
msgid "print as little as possible"
msgstr "essaie de se taire"
-#: ../svnsync/main.c:118
+#: ../svnsync/main.c:120
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
msgstr "donne un login en argument (déprécié, cf --source-username et \
--sync-username)"
-#: ../svnsync/main.c:122
+#: ../svnsync/main.c:124
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -10599,102 +10648,102 @@ msgstr ""
"donne un mot de passe en argument\n"
" (déprécié ; cf --source-password et --sync-password)"
-#: ../svnsync/main.c:126
+#: ../svnsync/main.c:132
msgid "connect to source repository with username ARG"
msgstr "se connecte au dépôt source avec le login ARG"
-#: ../svnsync/main.c:128
+#: ../svnsync/main.c:134
msgid "connect to source repository with password ARG"
msgstr "se connecte au dépôt source avec le mot de passe ARG"
-#: ../svnsync/main.c:130
+#: ../svnsync/main.c:136
msgid "connect to sync repository with username ARG"
msgstr "se connecte au dépôt synchronisé avec le login ARG"
-#: ../svnsync/main.c:132
+#: ../svnsync/main.c:138
msgid "connect to sync repository with password ARG"
msgstr "se connecte au dépôt synchronisé avec le mot de passe ARG"
-#: ../svnsync/main.c:222
+#: ../svnsync/main.c:229
#, c-format
msgid "Can't get local hostname"
msgstr "Impossible d'obtenir le nom d'hôte"
-#: ../svnsync/main.c:245
+#: ../svnsync/main.c:252
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr "Échec a l'obtention du verrou du dépôt destination, tenu par '%s'\n"
-#: ../svnsync/main.c:361
+#: ../svnsync/main.c:368
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "La session est enracinée '%s', mais la racine du dépôt est '%s'"
-#: ../svnsync/main.c:499
+#: ../svnsync/main.c:506
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Propriétés copiées pour la révision %ld (%s* propriétés ignorées).\n"
-#: ../svnsync/main.c:504
+#: ../svnsync/main.c:511
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Propriétés copiées pour la révision %ld.\n"
-#: ../svnsync/main.c:606
+#: ../svnsync/main.c:613
msgid "Cannot initialize a repository with content in it"
msgstr "Impossible d'initialiser un dépôt non vide"
-#: ../svnsync/main.c:617
+#: ../svnsync/main.c:624
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Le dépôt destination est déj synchronisé partir de '%s'"
-#: ../svnsync/main.c:700 ../svnsync/main.c:703 ../svnsync/main.c:1630
-#: ../svnsync/main.c:1780
+#: ../svnsync/main.c:707 ../svnsync/main.c:710 ../svnsync/main.c:1637
+#: ../svnsync/main.c:1787
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Le chemin '%s' n'est pas une URL"
-#: ../svnsync/main.c:1211
+#: ../svnsync/main.c:1218
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Révision %ld propagée.\n"
-#: ../svnsync/main.c:1251
+#: ../svnsync/main.c:1258
msgid "Destination repository has not been initialized"
msgstr "Le dépôt destination n'a pas été initialisé"
-#: ../svnsync/main.c:1427
+#: ../svnsync/main.c:1434
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "La propagation (commit) a créé la révision %ld au lieu de la %ld"
-#: ../svnsync/main.c:1533
+#: ../svnsync/main.c:1540
#, 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 "La révision en cours de copie (%ld), la dernière \
révision fusionnée (%ld), et la révision de tête de la destination (%ld) sont \
incohérentes. Auriez-vous propagé vers la destination sans utiliser 'svnsync' ?"
-#: ../svnsync/main.c:1570
+#: ../svnsync/main.c:1577
#, c-format
msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you \
committed to the destination without using svnsync?" msgstr "La révisions de tête \
(HEAD) de la destination (%ld) n'est pas la même que la dernière révision \
fusionnée (%ld). Auriez-vous propagé vers la destination sans utiliser 'svnsync' ?" \
-#: ../svnsync/main.c:1673 ../svnsync/main.c:1678
+#: ../svnsync/main.c:1680 ../svnsync/main.c:1685
#, c-format
msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "Impossible de copier les propriétés de révision d'une révision (%ld) non \
encore synchronisée"
-#: ../svnsync/main.c:1730
+#: ../svnsync/main.c:1737
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' n'est pas un intervalle de révisions valide"
-#: ../svnsync/main.c:1744 ../svnsync/main.c:1764
+#: ../svnsync/main.c:1751 ../svnsync/main.c:1771
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Numéro de révision invalide (%ld)"
-#: ../svnsync/main.c:1804
+#: ../svnsync/main.c:1811
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -10708,11 +10757,11 @@ msgstr ""
"\n"
"Sous-commandes disponibles :\n"
-#: ../svnsync/main.c:1966
+#: ../svnsync/main.c:1977
msgid "Cannot use --username or --password with any of --source-username, \
--source-password, --sync-username, or --sync-password.\n" msgstr "Impossible \
d'utiliser --username ou --password pour un des --source-username, --source-password, \
--sync-username ou --sync-password.\n"
-#: ../svnsync/main.c:2046
+#: ../svnsync/main.c:2066
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10721,7 +10770,7 @@ msgstr ""
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnsync help %s' pour l'aide.\n"
-#: ../svnsync/main.c:2118
+#: ../svnsync/main.c:2140
msgid "Try 'svnsync help' for more info"
msgstr "Essayer 'svnsync help' pour plus d'information"
@@ -10802,9 +10851,3 @@ msgstr "dernière révision modifiée pl
#, c-format
msgid "exported%s"
msgstr "exporté%s"
-
-#: ../svnversion/main.c:232
-#, c-format
-msgid "'%s' not versioned, and not exported\n"
-msgstr "'%s' non versionné et non exporté\n"
-
Modified: branches/file-externals/subversion/po/ko.po
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/po/ko.po?pathrev=32332&r1=32331&r2=32332
==============================================================================
--- branches/file-externals/subversion/po/ko.po Wed Jul 30 07:46:23 2008 (r32331)
+++ branches/file-externals/subversion/po/ko.po Wed Jul 30 08:04:13 2008 (r32332)
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.6\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-05-25 20:39+0800\n"
+"POT-Creation-Date: 2008-07-26 14:14+0200\n"
"PO-Revision-Date: 2007-03-22 15:24+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Korean <dev@subversion.tigris.org>\n"
@@ -16,999 +16,1123 @@ msgstr ""
"X-Poedit-Language: Korean\n"
"X-Poedit-Country: KOREA, REPUBLIC OF\n"
-#: include/svn_error_codes.h:154
+#: ../include/svn_error_codes.h:158
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "svn_make_pool 에 잘못된 parent pool이 넘어 왔습니다"
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:162
msgid "Bogus filename"
msgstr "수상한 파일명"
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:166
msgid "Bogus URL"
msgstr "수상한 URL"
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:170
msgid "Bogus date"
msgstr "수상한 짜"
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:174
msgid "Bogus mime-type"
msgstr "수상한 MIME-type"
-#: include/svn_error_codes.h:176
+#: ../include/svn_error_codes.h:184
+msgid "Wrong or unexpected property value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:188
msgid "Version file format not correct"
msgstr "버 파일의 포맷이 바르지 않습니다"
-#: include/svn_error_codes.h:182
+#: ../include/svn_error_codes.h:192
+msgid "Path is not an immediate child of the specified directory"
+msgstr "경로는 작업사본의 직게 하위 디 리가 아닙니다."
+
+#: ../include/svn_error_codes.h:196
+msgid "Bogus UUID"
+msgstr "이상한 UUID"
+
+#: ../include/svn_error_codes.h:201 ../include/svn_error_codes.h:789
+msgid "Invalid configuration value"
+msgstr "잘못된 설 값"
+
+#: ../include/svn_error_codes.h:205
+msgid "Bogus server specification"
+msgstr "잘못된 서버 사양"
+
+#: ../include/svn_error_codes.h:211
msgid "No such XML tag attribute"
msgstr "그러한 XML 태그 값이 없습니다"
-#: include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:215
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> 는 누락된 계보(ancestry)입니다"
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:219
msgid "Unrecognized binary data encoding; can't decode"
msgstr "알 수 없는 바이너리 데이터 인코딩: 디코드 불가능"
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:223
msgid "XML data was not well-formed"
msgstr "XML 데이터는 대로 된 형식(well-formed)이 아닙니다"
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:227
msgid "Data cannot be safely XML-escaped"
msgstr "데이터를 XML 문서로 표현 수 없습니다"
-#: include/svn_error_codes.h:204
+#: ../include/svn_error_codes.h:233
msgid "Inconsistent line ending style"
msgstr "개행 형식이 일관성이 없습니다"
-#: include/svn_error_codes.h:208
+#: ../include/svn_error_codes.h:237
msgid "Unrecognized line ending style"
msgstr "개행 형식이 알 수 없는 값입니다"
-#: include/svn_error_codes.h:213
+#: ../include/svn_error_codes.h:242
msgid "Line endings other than expected"
msgstr "다른 것이 있어야 자리에 개행이 되었습니다"
-#: include/svn_error_codes.h:217
+#: ../include/svn_error_codes.h:246
msgid "Ran out of unique names"
msgstr " 파일명 생성 실패"
-#: include/svn_error_codes.h:222
+#: ../include/svn_error_codes.h:251
msgid "Framing error in pipe protocol"
msgstr "파이프 프로 콜에서 프 임 오류 발생"
-#: include/svn_error_codes.h:227
+#: ../include/svn_error_codes.h:256
msgid "Read error in pipe"
msgstr "파이프에서 읽기 오류 발생"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316 svn/util.c:758
+#: ../include/svn_error_codes.h:260 ../libsvn_subr/cmdline.c:316
+#: ../libsvn_subr/cmdline.c:333 ../svn/util.c:889 ../svnlook/main.c:1691
#, c-format
msgid "Write error"
msgstr "쓰기 오류"
-#: include/svn_error_codes.h:237
+#: ../include/svn_error_codes.h:266
msgid "Unexpected EOF on stream"
msgstr "스트림의 비 상 종료"
-#: include/svn_error_codes.h:241
+#: ../include/svn_error_codes.h:270
msgid "Malformed stream data"
msgstr "비 상 스트림 데이터"
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:274
msgid "Unrecognized stream data"
msgstr "알 수 없는 스트림 데이터"
-#: include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:280
msgid "Unknown svn_node_kind"
msgstr "알 수 없는 노드 종류"
-#: include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:284
msgid "Unexpected node kind found"
msgstr "기대하지 않은 노드 종류가 발견되었습니다"
-#: include/svn_error_codes.h:261
+#: ../include/svn_error_codes.h:290
msgid "Can't find an entry"
msgstr "항목을 찾을 수 없습니다"
-#: include/svn_error_codes.h:267
+#: ../include/svn_error_codes.h:296
msgid "Entry already exists"
msgstr "이미 존재하는 항목입니다"
-#: include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:300
msgid "Entry has no revision"
msgstr "리비 이 없는 항목입니다"
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:304
msgid "Entry has no URL"
msgstr "URL 이 없는 항목입니다"
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:308
msgid "Entry has an invalid attribute"
msgstr "잘못된 속성을 지닌 항목입니다"
-#: include/svn_error_codes.h:285
+#: ../include/svn_error_codes.h:314
msgid "Obstructed update"
msgstr "업데이트 중단됨"
-#: include/svn_error_codes.h:290
+#: ../include/svn_error_codes.h:319
msgid "Mismatch popping the WC unwind stack"
msgstr "작업사본의 탈출 스택(unwind stack) 거가 일치하지 \
않습니다"
-#: include/svn_error_codes.h:295
+#: ../include/svn_error_codes.h:324
msgid "Attempt to pop empty WC unwind stack"
msgstr "비어 있는 작업사본의 탈출 스택을 거하 했습니다"
-#: include/svn_error_codes.h:300
+#: ../include/svn_error_codes.h:329
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "비어있지 않은 탈출 스택(unwind stack)을 금 해 하 \
했습니다."
-#: include/svn_error_codes.h:304
+#: ../include/svn_error_codes.h:333
msgid "Attempted to lock an already-locked dir"
msgstr "이미 긴 디 리를 다시 그 함"
-#: include/svn_error_codes.h:308
+#: ../include/svn_error_codes.h:337
msgid "Working copy not locked; this is probably a bug, please report"
msgstr "작업 사본을 글 수 없습니다. 버그라 추 되며, 보 \
해주십시오."
-#: include/svn_error_codes.h:313
+#: ../include/svn_error_codes.h:342
msgid "Invalid lock"
msgstr "잘못된 금"
-#: include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:346
msgid "Path is not a working copy directory"
msgstr "경로는 작업사본 디 리가 아닙니다."
-#: include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:350
msgid "Path is not a working copy file"
msgstr "경로는 작업사본 파일이 아닙니다."
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:354
msgid "Problem running log"
msgstr "로그실행 중 오류"
-#: include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:358
msgid "Can't find a working copy path"
msgstr "작업사본의 경로를 찾을 수 없음"
-#: include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:362
msgid "Working copy is not up-to-date"
msgstr "작업 사본이 최 이 아닙니다."
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:366
msgid "Left locally modified or unversioned files"
msgstr "수 된체 남겨졌거나 버 관리 대상이 아닌 파일"
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:370
msgid "Unmergeable scheduling requested on an entry"
msgstr "항목에 대하여 병합 수 없는 스케쥴이 \
요청되었습니다."
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:374
msgid "Found a working copy path"
msgstr "작업 사본의 경로가 발견되었습니다."
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:378
msgid "A conflict in the working copy obstructs the current operation"
msgstr "작업사본내에 충돌이 발견되어 명 수행을 중단합니다."
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:382
msgid "Working copy is corrupt"
msgstr "작업사본이 손상되었습니다."
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:386
msgid "Working copy text base is corrupt"
msgstr "작업사본의 이스파일이 손상되었습니다."
-#: include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:390
msgid "Cannot change node kind"
msgstr "노드의 종류를 바꿀 수 없습니다."
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:394
msgid "Invalid operation on the current working directory"
msgstr "현재 작업사본에 대한 잘못된 명 입니다."
-#: include/svn_error_codes.h:369
+#: ../include/svn_error_codes.h:398
msgid "Problem on first log entry in a working copy"
msgstr "작업 사본에 첫번째 로그 엔트리 오류"
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:402
msgid "Unsupported working copy format"
msgstr "지원하지 않은 작업사본 포맷"
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:406
msgid "Path syntax not supported in this context"
msgstr "본 문맥에서는 지원되지 않는 경로 형식입니다."
-#: include/svn_error_codes.h:382
+#: ../include/svn_error_codes.h:411
msgid "Invalid schedule"
msgstr "예약이 잘못됨"
-#: include/svn_error_codes.h:387
+#: ../include/svn_error_codes.h:416
msgid "Invalid relocation"
msgstr "잘못된 URL 환"
-#: include/svn_error_codes.h:392
+#: ../include/svn_error_codes.h:421
msgid "Invalid switch"
msgstr "잘못된 환(switch)"
-#: include/svn_error_codes.h:397
-#, fuzzy
+#: ../include/svn_error_codes.h:426
msgid "Changelist doesn't match"
-msgstr "변경목록: %s\n"
+msgstr "변경 목록이 일치하지 않습니다"
+
+#: ../include/svn_error_codes.h:431
+#, fuzzy
+msgid "Conflict resolution failed"
+msgstr " 장소 생성 실패"
-#: include/svn_error_codes.h:403
+#: ../include/svn_error_codes.h:435
+msgid "Failed to locate 'copyfrom' path in working copy"
+msgstr "작업사본에서 복사원본 경로를 찾을 수 없습니다"
+
+#: ../include/svn_error_codes.h:440
+msgid "Moving a path from one changelist to another"
+msgstr ""
+
+#: ../include/svn_error_codes.h:447
msgid "General filesystem error"
msgstr "파일 시스템 일반 오류"
-#: include/svn_error_codes.h:407
+#: ../include/svn_error_codes.h:451
msgid "Error closing filesystem"
msgstr "파일 시스템 닫기 오류"
-#: include/svn_error_codes.h:411
+#: ../include/svn_error_codes.h:455
msgid "Filesystem is already open"
msgstr "파일 시스템이 이미 열 있습니다."
-#: include/svn_error_codes.h:415
+#: ../include/svn_error_codes.h:459
msgid "Filesystem is not open"
msgstr "파일 시스템이 열린 상태가 아닙니다."
-#: include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:463
msgid "Filesystem is corrupt"
msgstr "파일 시스템이 손상되었습니다."
-#: include/svn_error_codes.h:423
+#: ../include/svn_error_codes.h:467
msgid "Invalid filesystem path syntax"
msgstr " 효하지 않은 파일시스템 경로 형식입니다."
-#: include/svn_error_codes.h:427
+#: ../include/svn_error_codes.h:471
msgid "Invalid filesystem revision number"
msgstr "파일 시스템의 리비 번호가 잘못되었습니다."
-#: include/svn_error_codes.h:431
+#: ../include/svn_error_codes.h:475
msgid "Invalid filesystem transaction name"
msgstr "파일 시스템의 트랜잭션 이름이 잘못되었습니다."
-#: include/svn_error_codes.h:435
+#: ../include/svn_error_codes.h:479
msgid "Filesystem directory has no such entry"
msgstr "파일 시스템 디 리에 그런 항목이 없습니다."
-#: include/svn_error_codes.h:439
+#: ../include/svn_error_codes.h:483
msgid "Filesystem has no such representation"
msgstr "Filesystem has no such representation"
-#: include/svn_error_codes.h:443
+#: ../include/svn_error_codes.h:487
msgid "Filesystem has no such string"
msgstr "파일 시스템에 그런 문자열이 없습니다."
-#: include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:491
msgid "Filesystem has no such copy"
msgstr "파일 시스템에 그런 사본이 없습니다."
-#: include/svn_error_codes.h:451
+#: ../include/svn_error_codes.h:495
msgid "The specified transaction is not mutable"
msgstr "본 명 이 수행되면 다시 되돌릴 수 없습니다."
-#: include/svn_error_codes.h:455
+#: ../include/svn_error_codes.h:499
msgid "Filesystem has no item"
msgstr "파일 시스템에 그런 아이템이 없습니다."
-#: include/svn_error_codes.h:459
+#: ../include/svn_error_codes.h:503
msgid "Filesystem has no such node-rev-id"
msgstr "파일 시스템에 그런 node-rev-id 가 없습니다."
-#: include/svn_error_codes.h:463
+#: ../include/svn_error_codes.h:507
msgid "String does not represent a node or node-rev-id"
msgstr "문자열이 노드 혹은 node-rev-id를 뜻하지 않습니다."
-#: include/svn_error_codes.h:467
+#: ../include/svn_error_codes.h:511
msgid "Name does not refer to a filesystem directory"
msgstr "이름이 파일시스템 디 리를 참조하지 않습니다."
-#: include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:515
msgid "Name does not refer to a filesystem file"
msgstr "이름이 파일시스템 파일을 참조하지 않습니다."
-#: include/svn_error_codes.h:475
+#: ../include/svn_error_codes.h:519
msgid "Name is not a single path component"
msgstr "이름이 파일시스템 단일 경로 요소가 아닙니다."
-#: include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:523
msgid "Attempt to change immutable filesystem node"
msgstr "변경 불가능한 파일 시스템 노드에 변경을 시도합니다."
-#: include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:527
msgid "Item already exists in filesystem"
msgstr "아이템이 이미 파일 시스템에 있습니다."
-#: include/svn_error_codes.h:487
+#: ../include/svn_error_codes.h:531
msgid "Attempt to remove or recreate fs root dir"
msgstr "파일 시스템의 루트에 대하여 거 혹은 재생성을 \
시도합니다"
-#: include/svn_error_codes.h:491
+#: ../include/svn_error_codes.h:535
msgid "Object is not a transaction root"
msgstr "개체가 트랜잭션의 루트가 아닙니다"
-#: include/svn_error_codes.h:495
+#: ../include/svn_error_codes.h:539
msgid "Object is not a revision root"
msgstr "개체가 리비 의 루트가 아닙니다"
-#: include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:543
msgid "Merge conflict during commit"
msgstr "커밋도중 병합이 충돌하였습니다."
-#: include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:547
msgid "A representation vanished or changed between reads"
msgstr "읽는 도중 표현내용이 삭 되거나 변경되었습니다."
-#: include/svn_error_codes.h:507
+#: ../include/svn_error_codes.h:551
msgid "Tried to change an immutable representation"
msgstr "변경 수 없는 표현식에 대해 변경 시도합니다."
-#: include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:555
msgid "Malformed skeleton data"
msgstr "잘못된 형식의 스케 톤 데이터"
-#: include/svn_error_codes.h:515
+#: ../include/svn_error_codes.h:559
msgid "Transaction is out of date"
msgstr "트랜잭션이 기한 만료됨"
-#: include/svn_error_codes.h:519
+#: ../include/svn_error_codes.h:563
msgid "Berkeley DB error"
msgstr "버클리 DB 오류"
-#: include/svn_error_codes.h:523
+#: ../include/svn_error_codes.h:567
msgid "Berkeley DB deadlock error"
msgstr "버클리 DB 데드락 오류"
-#: include/svn_error_codes.h:527
+#: ../include/svn_error_codes.h:571
msgid "Transaction is dead"
msgstr "트랜잭션 종료됨"
-#: include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:575
msgid "Transaction is not dead"
msgstr "트랜잭션 종료되지 않음"
-#: include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:580
msgid "Unknown FS type"
msgstr "알 수 없는 파일 시스템 종류"
-#: include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:585
msgid "No user associated with filesystem"
msgstr "파일 시스템과 연관된 사용자가 없습니다."
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:590
msgid "Path is already locked"
msgstr "경로는 이미 겨 있습니다."
-#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
+#: ../include/svn_error_codes.h:595 ../include/svn_error_codes.h:746
msgid "Path is not locked"
msgstr "경로는 기지 않았습니다."
-#: include/svn_error_codes.h:556
+#: ../include/svn_error_codes.h:600
msgid "Lock token is incorrect"
msgstr " 금 큰이 잘못되었습니다."
-#: include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:605
msgid "No lock token provided"
msgstr " 금 큰이 공되지 않았습니다."
-#: include/svn_error_codes.h:566
+#: ../include/svn_error_codes.h:610
msgid "Username does not match lock owner"
msgstr "Username이 금 소 자와 일치하지 않습니다."
-#: include/svn_error_codes.h:571
+#: ../include/svn_error_codes.h:615
msgid "Filesystem has no such lock"
msgstr "파일 시스템에 그런 금이 없습니다."
-#: include/svn_error_codes.h:576
+#: ../include/svn_error_codes.h:620
msgid "Lock has expired"
msgstr " 금이 만료되었습니다."
-#: include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:625 ../include/svn_error_codes.h:733
msgid "Item is out of date"
msgstr "아이템이 오래되었습니다"
-#: include/svn_error_codes.h:586
-#, fuzzy
-msgid "SQLite error"
-msgstr "쓰기 오류"
-
-#: include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:637
msgid "Unsupported FS format"
msgstr "지원하지 않은 FS 포맷"
-#: include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:642
msgid "Representation is being written"
msgstr "표현식을 출 중입니다."
-#: include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:647
+msgid "The generated transaction name is too long"
+msgstr "생성된 트랜잭션이름이 너무 깁니다"
+
+#: ../include/svn_error_codes.h:652
+msgid "Filesystem has no such node origin record"
+msgstr "파일 시스템에 노드의 원본 코드가 없습니다."
+
+#: ../include/svn_error_codes.h:657
+msgid "Filesystem upgrade is not supported"
+msgstr "파일 시스템 업그 이드가 지원되지 않습니다"
+
+#: ../include/svn_error_codes.h:663
msgid "The repository is locked, perhaps for db recovery"
msgstr " 장소가 기어 있습니다. 아마 DB 복구중일 것입니다."
-#: include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:667
msgid "A repository hook failed"
msgstr " 장소 훅(repository hook) 실패"
-#: include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:671
msgid "Incorrect arguments supplied"
msgstr "잘못된 인자가 넘겨졌습니다."
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:675
msgid "A report cannot be generated because no data was supplied"
msgstr "데이터가 없어서 보 서를 생성 수 없습니다."
-#: include/svn_error_codes.h:625
+#: ../include/svn_error_codes.h:679
msgid "Bogus revision report"
msgstr "이상한 리비 보 "
-#: include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:688
msgid "Unsupported repository version"
msgstr "지원되지 않는 장소 버 "
-#: include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:692
msgid "Disabled repository feature"
msgstr " 한된 장소 기능"
-#: include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:696
msgid "Error running post-commit hook"
msgstr "post-commit 훅 실행중 오류"
-#: include/svn_error_codes.h:647
+#: ../include/svn_error_codes.h:701
msgid "Error running post-lock hook"
msgstr "post-lock 훅 실행중 오류"
-#: include/svn_error_codes.h:652
+#: ../include/svn_error_codes.h:706
msgid "Error running post-unlock hook"
msgstr "post-unlock 훅 실행중 오류"
-#: include/svn_error_codes.h:659
+#: ../include/svn_error_codes.h:711
+msgid "Repository upgrade is not supported"
+msgstr " 장소 업그 이드가 지원되지 않습니다"
+
+#: ../include/svn_error_codes.h:717
msgid "Bad URL passed to RA layer"
msgstr "RA 계층에 잘못된 URL이 달되었습니다."
-#: include/svn_error_codes.h:663
+#: ../include/svn_error_codes.h:721
msgid "Authorization failed"
msgstr "인증 실패"
-#: include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:725
msgid "Unknown authorization method"
msgstr "알 수 없는 인증 방식"
-#: include/svn_error_codes.h:671
+#: ../include/svn_error_codes.h:729
msgid "Repository access method not implemented"
msgstr " 장소 근 방법이 구현되지 않았습니다"
-#: include/svn_error_codes.h:675
-msgid "Item is out-of-date"
-msgstr "아이템이 오래되었습니다"
-
-#: include/svn_error_codes.h:679
+#: ../include/svn_error_codes.h:737
msgid "Repository has no UUID"
msgstr " 장소에 UUID가 없습니다"
-#: include/svn_error_codes.h:683
+#: ../include/svn_error_codes.h:741
msgid "Unsupported RA plugin ABI version"
msgstr "지원하지 않는 RA 플러긴 ABI 버 입니다."
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:751
+msgid "Server can only replay from the root of a repository"
+msgstr "서버는 장소의 루트에서만 재생가능합니다"
+
+#: ../include/svn_error_codes.h:756
+msgid "Repository UUID does not match expected UUID"
+msgstr " 장소의 UUID가 기대하는 UUID와 일치하지 않습니다"
+
+#: ../include/svn_error_codes.h:762
msgid "RA layer failed to init socket layer"
msgstr "RA 계층에서 소켓 계층 초기화에 실패하였습니다."
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:766
msgid "RA layer failed to create HTTP request"
msgstr "RA 계층에서 HTTP 요청을 생성하지 못했습니다."
-#: include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:770
msgid "RA layer request failed"
msgstr "RA 계층 요청 실패"
-#: include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:774
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 계층이 요구된 OPTIONS 보를 수 하지 않았습니다."
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:778
msgid "RA layer failed to fetch properties"
msgstr "RA 계층이 속성 추출에 실패하였습니다."
-#: include/svn_error_codes.h:715
+#: ../include/svn_error_codes.h:782
msgid "RA layer file already exists"
msgstr "RA 계층 파일이 이미 존재합니다"
-#: include/svn_error_codes.h:719
-msgid "Invalid configuration value"
-msgstr "잘못된 설 값"
-
-#: include/svn_error_codes.h:723
+#: ../include/svn_error_codes.h:796
msgid "HTTP Path Not Found"
msgstr "HTTP 경로 발견되지 않음"
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:800
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "WebDAV PROPPATCH 실행 실패"
-#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
-#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
-#: libsvn_ra_svn/marshal.c:774
+#: ../include/svn_error_codes.h:805 ../include/svn_error_codes.h:846
+#: ../libsvn_ra_svn/marshal.c:651 ../libsvn_ra_svn/marshal.c:769
+#: ../libsvn_ra_svn/marshal.c:796
msgid "Malformed network data"
msgstr "잘못된 네트워크 데이터"
-#: include/svn_error_codes.h:737
+#: ../include/svn_error_codes.h:810
msgid "Unable to extract data from response header"
msgstr "응답헤더에서 데이터를 추출 수 없습니다."
-#: include/svn_error_codes.h:742
+#: ../include/svn_error_codes.h:815
msgid "Repository has been moved"
msgstr " 장소가 이동되었습니다"
-#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
+#: ../include/svn_error_codes.h:821 ../include/svn_error_codes.h:850
msgid "Couldn't find a repository"
msgstr " 장소를 찾을 수 없음"
-#: include/svn_error_codes.h:752
+#: ../include/svn_error_codes.h:825
msgid "Couldn't open a repository"
msgstr " 장소를 열 수 없음"
-#: include/svn_error_codes.h:757
+#: ../include/svn_error_codes.h:830
msgid "Special code for wrapping server errors to report to client"
msgstr "클라이언트에 보 하기 위한 서버 에러 래핑 특수 코드"
-#: include/svn_error_codes.h:761
+#: ../include/svn_error_codes.h:834
msgid "Unknown svn protocol command"
msgstr "알 수 없는 svn 프로 콜 명 "
-#: include/svn_error_codes.h:765
+#: ../include/svn_error_codes.h:838
msgid "Network connection closed unexpectedly"
msgstr "네트워크 속이 예기치 않게 종료되었습니다."
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:842
msgid "Network read/write error"
msgstr "네트워크 읽기/쓰기 오류"
-#: include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:854
msgid "Client/server version mismatch"
msgstr "클라이언트/서버 버 불일치"
-#: include/svn_error_codes.h:786
+#: ../include/svn_error_codes.h:859
msgid "Cannot negotiate authentication mechanism"
msgstr "인증 방법 협상 불가능"
-#: include/svn_error_codes.h:795
+#: ../include/svn_error_codes.h:865
+msgid "Initialization of SSPI library failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:869
+msgid "Server SSL certificate untrusted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:877
msgid "Credential data unavailable"
msgstr "인증 보가 사용불가합니다."
-#: include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:881
msgid "No authentication provider available"
msgstr "인증 보를 얻기 위한 장치가 없습니다."
-#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
+#: ../include/svn_error_codes.h:885
msgid "All authentication providers exhausted"
msgstr "인증 보를 얻기위한 장치를 모두 사용하였습니다."
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:889
+msgid "Credentials not saved"
+msgstr "인증 보는 장되지 않았습니다"
+
+#: ../include/svn_error_codes.h:894
+msgid "Authentication failed"
+msgstr "인증에 실패하였습니다"
+
+#: ../include/svn_error_codes.h:900
msgid "Read access denied for root of edit"
msgstr "읽기 금지"
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:905
msgid "Item is not readable"
msgstr "아이템이 읽기 불가능합니다"
-#: include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:910
msgid "Item is partially readable"
msgstr "아이템이 부분 으로 읽기 가능합니다"
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:914
msgid "Invalid authz configuration"
msgstr "잘못된 authz 설 "
-#: include/svn_error_codes.h:832
+#: ../include/svn_error_codes.h:919
msgid "Item is not writable"
msgstr "아이템이 쓰기가능하지 않습니다."
-#: include/svn_error_codes.h:838
+#: ../include/svn_error_codes.h:925
msgid "Svndiff data has invalid header"
msgstr "Svndiff 데이터가 잘못된 헤더를 가지 있습니다."
-#: include/svn_error_codes.h:842
+#: ../include/svn_error_codes.h:929
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff 데이터가 손상된 윈도우를 포함하 있습니다."
-#: include/svn_error_codes.h:846
+#: ../include/svn_error_codes.h:933
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff 데이터에 뒤로 진행하는 부분이 있습니다."
-#: include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:937
msgid "Svndiff data contains invalid instruction"
msgstr "Svndiff 데이터에 잘못된 명 이 포함되어있습니다."
-#: include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:941
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff 데이터가 예기치않게 끝났습니다."
-#: include/svn_error_codes.h:858
+#: ../include/svn_error_codes.h:945
msgid "Svndiff compressed data is invalid"
msgstr "Svndiff 의 압축된 데이터가 잘못되었습니다"
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:951
msgid "Diff data source modified unexpectedly"
msgstr "Diff 데이터가 예기치않은 방식으로 수 되었습니다"
-#: include/svn_error_codes.h:870
+#: ../include/svn_error_codes.h:957
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache에 SVN 파일시스템에 대한 경로가 없습니다"
-#: include/svn_error_codes.h:874
+#: ../include/svn_error_codes.h:961
msgid "Apache got a malformed URI"
msgstr "Apache에 잘못된 URI 를 받았습니다."
-#: include/svn_error_codes.h:878
+#: ../include/svn_error_codes.h:965
msgid "Activity not found"
msgstr "명 이 발견되지 않았습니다."
-#: include/svn_error_codes.h:882
+#: ../include/svn_error_codes.h:969
msgid "Baseline incorrect"
msgstr "기준 리비 불일치"
-#: include/svn_error_codes.h:886
+#: ../include/svn_error_codes.h:973
msgid "Input/output error"
msgstr "입출 오류"
-#: include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:979
msgid "A path under version control is needed for this operation"
msgstr "버 관리대상인 경로가 본 명 어에 필요합니다"
-#: include/svn_error_codes.h:896
+#: ../include/svn_error_codes.h:983
msgid "Repository access is needed for this operation"
msgstr "본 명 에는 장소 근이 필요합니다"
-#: include/svn_error_codes.h:900
+#: ../include/svn_error_codes.h:987
msgid "Bogus revision information given"
msgstr "이상한 리비 보가 주어졌습니다."
-#: include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:991
msgid "Attempting to commit to a URL more than once"
msgstr "URL에 대한 커밋이 한 번이상 시도됩니다."
-#: include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:995
msgid "Operation does not apply to binary file"
msgstr "명 은 바이너리 파일에 용되지 않습니다"
-#: include/svn_error_codes.h:914
+#: ../include/svn_error_codes.h:1001
msgid "Format of an svn:externals property was invalid"
msgstr "svn:externals 에 대한 형식이 올바르지 않습니다"
-#: include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:1005
msgid "Attempting restricted operation for modified resource"
msgstr "수 된 자료에 대하여 한된 명 을 수행합니다."
-#: include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:1009
msgid "Operation does not apply to directory"
msgstr "디 리에는 용 수 없는 명 "
-#: include/svn_error_codes.h:926
+#: ../include/svn_error_codes.h:1013
msgid "Revision range is not allowed"
msgstr "리비 범위는 사용 불가능합니다."
-#: include/svn_error_codes.h:930
+#: ../include/svn_error_codes.h:1017
msgid "Inter-repository relocation not allowed"
msgstr " 장소를 넘어서는 'URL 환'은 불가능합니다."
-#: include/svn_error_codes.h:934
+#: ../include/svn_error_codes.h:1021
msgid "Author name cannot contain a newline"
msgstr "작성자 이름은 개행 문자를 포함 수 없습니다."
-#: include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:1025
msgid "Bad property name"
msgstr "잘못된 속성 이름"
-#: include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:1030
msgid "Two versioned resources are unrelated"
msgstr "두개의 버 관리 대상이 연관성이 없습니다."
-#: include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:1035
msgid "Path has no lock token"
msgstr "지 한 경로에 금 큰이 없습니다."
-#: include/svn_error_codes.h:953
+#: ../include/svn_error_codes.h:1040
msgid "Operation does not support multiple sources"
msgstr "명 은 복수의 원본은 지원하지 않습니다"
-#: include/svn_error_codes.h:957
+#: ../include/svn_error_codes.h:1045
msgid "No versioned parent directories"
msgstr ""
-#: include/svn_error_codes.h:963
-msgid "A problem occurred; see later errors for details"
+#: ../include/svn_error_codes.h:1050
+msgid "Working copy and merge source not ready for reintegration"
+msgstr "작업사본의 복사와 병합이 준비되지 않았습니다"
+
+#: ../include/svn_error_codes.h:1056
+msgid "A problem occurred; see other errors for details"
msgstr "문 발생함: 상세한 것은 다음 오류참 "
-#: include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:1060
msgid "Failure loading plugin"
msgstr "플러긴 로딩 실패"
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:1064
msgid "Malformed file"
msgstr "잘못된 파일"
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:1068
msgid "Incomplete data"
msgstr "불완 한 데이터"
-#: include/svn_error_codes.h:979
+#: ../include/svn_error_codes.h:1072
msgid "Incorrect parameters given"
msgstr "잘못된 인자가 넘겨짐"
-#: include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:1076
msgid "Tried a versioning operation on an unversioned resource"
msgstr "버 관리 대상이 아닌 것에 버 관 명 을 \
시도했습니다."
-#: include/svn_error_codes.h:987
+#: ../include/svn_error_codes.h:1080
msgid "Test failed"
msgstr "테스트 실패"
-#: include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1084
msgid "Trying to use an unsupported feature"
msgstr "지원하지 않는 속성을 사용하는 중"
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1088
msgid "Unexpected or unknown property kind"
msgstr "예기치 않은 혹은 알 지지 않은 속성 종류"
-#: include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1092
msgid "Illegal target for the requested operation"
msgstr "요구된 명 에 대하여 잘못된 대상"
-#: include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1096
msgid "MD5 checksum is missing"
msgstr "MD5 체크섬 누락됨"
-#: include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1100
msgid "Directory needs to be empty but is not"
msgstr "디 리가 비어있어야만 합니다"
-#: include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1104
msgid "Error calling external program"
msgstr "외부 프로그램 실행 중 오류"
-#: include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1108
msgid "Python exception has been set with the error"
msgstr "오류에 파이썬 예외가 있습니다."
-#: include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1112
msgid "A checksum mismatch occurred"
msgstr "체크섬 불일치 오류가 발생하였습니다."
-#: include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1116
msgid "The operation was interrupted"
msgstr "명 수행이 간섭으로 중단됩니다."
-#: include/svn_error_codes.h:1027
+#: ../include/svn_error_codes.h:1120
msgid "The specified diff option is not supported"
msgstr "지 한 diff 옵션은 지원되지 않는 것입니다."
-#: include/svn_error_codes.h:1031
+#: ../include/svn_error_codes.h:1124
msgid "Property not found"
msgstr "속성을 찾을 수 없습니다."
-#: include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1128
msgid "No auth file path available"
msgstr "인증 파일 경로가 효하지 않습니다."
-#: include/svn_error_codes.h:1039
-msgid "Merge info parse error"
-msgstr ""
-
-#: include/svn_error_codes.h:1044
+#: ../include/svn_error_codes.h:1133
msgid "Incompatible library version"
msgstr "호환되지 않는 라이브러리 버 "
-#: include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1138
+msgid "Mergeinfo parse error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1143
+msgid "Cease invocation of this API"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1148
+msgid "Error parsing revision number"
+msgstr "리비 번호 파싱 오류"
+
+#: ../include/svn_error_codes.h:1153
+msgid "Iteration terminated before completion"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1158
+msgid "Unknown changelist"
+msgstr "알 수 없는 변경목록"
+
+#: ../include/svn_error_codes.h:1163
+msgid "Reserved directory name in command line arguments"
+msgstr "명 행 인자에 예약된 디 리 이름"
+
+#: ../include/svn_error_codes.h:1168
+msgid "Inquiry about unknown capability"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1173
+msgid "Test skipped"
+msgstr "테스트 하지 않음"
+
+#: ../include/svn_error_codes.h:1178
+msgid "apr memcache library not available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1184
msgid "Error parsing arguments"
msgstr "인자를 분석 도중 오류 발생"
-#: include/svn_error_codes.h:1054
+#: ../include/svn_error_codes.h:1188
msgid "Not enough arguments provided"
msgstr "인자가 충분히 주어지지 않았습니다"
-#: include/svn_error_codes.h:1058
+#: ../include/svn_error_codes.h:1192
msgid "Mutually exclusive arguments specified"
msgstr "동시에 존재 수 없는 인자가 주어졌습니다."
-#: include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1196
msgid "Attempted command in administrative dir"
msgstr "관리 디 리에 명 을 수행중입니다."
-#: include/svn_error_codes.h:1066
+#: ../include/svn_error_codes.h:1200
msgid "The log message file is under version control"
msgstr "로그 메시지 파일은 버 관리 대상입니다."
-#: include/svn_error_codes.h:1070
+#: ../include/svn_error_codes.h:1204
msgid "The log message is a pathname"
msgstr "로그 메시지는 경로명입니다."
-#: include/svn_error_codes.h:1074
+#: ../include/svn_error_codes.h:1208
msgid "Committing in directory scheduled for addition"
msgstr "추가하기 위한 디 리를 커밋 중"
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1212
msgid "No external editor available"
msgstr "외부 편집기가 없습니다"
-#: include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1216
msgid "Something is wrong with the log message's contents"
msgstr "로그 메시지 내용이 이상합니다."
-#: include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1220
msgid "A log message was given where none was necessary"
msgstr "로그메시지가 필요없는 곳에 지 되었습니다."
-#: libsvn_client/add.c:346 libsvn_wc/copy.c:188
+#: ../include/svn_error_codes.h:1224
+msgid "No external merge tool available"
+msgstr "외부 병합 도구가 없습니다"
+
+#: ../include/svn_error_codes.h:1230
+msgid "Assertion failure"
+msgstr "확인 실패"
+
+#: ../libsvn_client/add.c:349 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "'%s' 디 리를 닫을 수 없습니다."
-#: libsvn_client/add.c:354
+#: ../libsvn_client/add.c:357
#, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "'%s'를 재귀 으로 추가하는 중에 오류 발생"
+msgid "Error during add of '%s'"
+msgstr "'%s'를 추가하는 중에 오류 발생"
-#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
+#: ../libsvn_client/blame.c:390
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "'%s' 바이너리 파일에 대하여 '수 한 사람 보기'를 수행 \
수 없습니다"
-#: libsvn_client/blame.c:522
+#: ../libsvn_client/blame.c:620
msgid "blame of the WORKING revision is not supported"
msgstr "작업 중인 사본에 대해서는 수 한 사람을 확인 수 \
없습니다."
-#: libsvn_client/blame.c:535
+#: ../libsvn_client/blame.c:634
msgid "Start revision must precede end revision"
msgstr "시작 버 은 종료버 보다 앞서야 합니다."
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "URL '%s' 는 디 리입니다."
-
-#: libsvn_client/blame.c:798
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "리비 명 '%c' 은 이 리비 을 필요로 합니다. (리비 \
%ld; %s)"
-
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "URL '%s' 는 디 리입니다."
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:126 ../libsvn_client/export.c:183
msgid "(local)"
msgstr "(로컬)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
+#: ../libsvn_client/cat.c:206
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "URL '%s' 는 디 리입니다."
+
+#: ../libsvn_client/checkout.c:90 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s'는 존재하지 않습니다."
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:94
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL('%s')은 파일입니다. 디 리를 지 하세요."
-#: libsvn_client/checkout.c:168
+#: ../libsvn_client/checkout.c:166
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s'는 이미 작업 사본에 있으며, 다른 URL 입니다."
-#: libsvn_client/checkout.c:172
+#: ../libsvn_client/checkout.c:170
msgid "; run 'svn update' to complete it"
msgstr "; 'svn update' 를 수행하여 완료하십시오."
-#: libsvn_client/checkout.c:182
+#: ../libsvn_client/checkout.c:180
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s'은(는) 존재하며, 디 리가 아닙니다"
-#: libsvn_client/commit.c:198
+#: ../libsvn_client/cmdline.c:72
+#, c-format
+msgid "Improper relative URL '%s'"
+msgstr " 하지 않은 상대 URL '%s'"
+
+#: ../libsvn_client/cmdline.c:130
+#, c-format
+msgid "All non-relative targets must have the same root URL"
+msgstr ""
+
+#: ../libsvn_client/cmdline.c:249 ../libsvn_subr/opt.c:986
+#, c-format
+msgid "'%s' ends in a reserved name"
+msgstr ""
+
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "경로 '%s'은 알 수 없거나 버 관리 수 없는 것입니다."
-#: libsvn_client/commit.c:512
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "파일을 임포트 때 새 항목 이름이 필요합니다."
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1008
-#: libsvn_wc/questions.c:92
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:1039
+#: ../libsvn_wc/questions.c:93
#, c-format
msgid "'%s' does not exist"
msgstr "'%s'는 존재하지 않습니다."
-#: libsvn_client/commit.c:607 libsvn_client/copy.c:289 svnlook/main.c:1216
+#: ../libsvn_client/commit.c:635 ../libsvn_client/copy.c:512
+#: ../svnlook/main.c:1315
#, c-format
msgid "Path '%s' does not exist"
msgstr "경로 '%s'는 존재하지 않습니다."
-#: libsvn_client/commit.c:741 libsvn_client/copy.c:298
-#: libsvn_client/copy.c:789 libsvn_client/copy.c:1118
-#: libsvn_client/copy.c:1550
+#: ../libsvn_client/commit.c:772 ../libsvn_client/copy.c:521
+#: ../libsvn_client/copy.c:927 ../libsvn_client/copy.c:1170
+#: ../libsvn_client/copy.c:1599
#, c-format
msgid "Path '%s' already exists"
msgstr "경로 '%s' 는 이미 존재합니다."
-#: libsvn_client/commit.c:756
+#: ../libsvn_client/commit.c:787
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' 는 예약된 이름이며, 임포트 수 없습니다."
-#: libsvn_client/commit.c:872 libsvn_client/copy.c:972
+#: ../libsvn_client/commit.c:920 ../libsvn_client/copy.c:1339
msgid "Commit failed (details follow):"
msgstr "커밋이 실패하였습니다:"
-#: libsvn_client/commit.c:880 libsvn_client/copy.c:980
+#: ../libsvn_client/commit.c:928
msgid "Commit succeeded, but other errors follow:"
msgstr "커밋이 성공하였지만, 오류가 있습니다:"
-#: libsvn_client/commit.c:887 libsvn_client/copy.c:987
+#: ../libsvn_client/commit.c:935
msgid "Error unlocking locked dirs (details follow):"
msgstr " 긴 디 리를 해 하는데 실패함 (아래에 자세히):"
-#: libsvn_client/commit.c:898
+#: ../libsvn_client/commit.c:946
msgid "Error bumping revisions post-commit (details follow):"
msgstr "커밋 후 리비 들을 갱 하는 도중 오류가 \
발생하였습니다:"
-#: libsvn_client/commit.c:909 libsvn_client/copy.c:998
+#: ../libsvn_client/commit.c:957
msgid "Error in post-commit clean-up (details follow):"
msgstr "커밋 후처리를 마무리하는 중에 오류 발생 (아래에 \
자세히):"
-#: libsvn_client/commit.c:1193
-#, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "'%s' 는 URL 입니다. URL은 커밋 대상이 수 없습니다."
-
-#: libsvn_client/commit.c:1392
+#: ../libsvn_client/commit.c:1307
msgid "Are all the targets part of the same working copy?"
msgstr "모 대상이 같은 작업 사본내에 있습니까?"
-#: libsvn_client/commit.c:1407
+#: ../libsvn_client/commit.c:1340
msgid "Cannot non-recursively commit a directory deletion"
msgstr "디 리를 삭 하는 커밋은 재귀호출이어야만 합니다."
-#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
+#: ../libsvn_client/commit.c:1386
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "'%s' 는 URL 입니다. URL은 커밋 대상이 수 없습니다."
+
+#: ../libsvn_client/commit_util.c:264 ../libsvn_client/commit_util.c:275
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "'%s'의 알 수 없는 항목입니다."
-#: libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:292
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "'%s' 항목이 예기치 못하게 특별 상태를 변경하였습니다."
-#: libsvn_client/commit_util.c:335
+#: ../libsvn_client/commit_util.c:347
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "커밋 멈춤: '%s' 이(가) 아직 충돌 상태임."
-#: libsvn_client/commit_util.c:401
+#: ../libsvn_client/commit_util.c:414
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "'%s'이(가) 작업사본의 루트가 것으로 기대하지 \
마십시오."
-#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
+#: ../libsvn_client/commit_util.c:432 ../libsvn_client/commit_util.c:1123
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 원본 URL이 \
없습니다."
-#: libsvn_client/commit_util.c:709
+#: ../libsvn_client/commit_util.c:451
+#, c-format
+msgid "'%s' is scheduled for addition, but is missing"
+msgstr "'%s'의 추가 스케쥴은 있지만, 존재하지 않습니다"
+
+#: ../libsvn_client/commit_util.c:706
+#, 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:794 ../libsvn_client/url.c:155
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "'%s' 항목은 URL이 없습니다."
-#: libsvn_client/commit_util.c:742
+#: ../libsvn_client/commit_util.c:827
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s'의 추가 스케쥴은 있지만, 상위는 버 관리 대상이 \
아닙니다."
-#: libsvn_client/commit_util.c:762
+#: ../libsvn_client/commit_util.c:847
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1019,286 +1143,328 @@ msgstr ""
"아마, 지금 버 관리되 있지 않은 (혹은 아직 버 이 없는) \
디 리\n" "안에서 대상을 커밋하 있는 중인 것 같습니다."
-#: libsvn_client/commit_util.c:803
-#, 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:907
+#: ../libsvn_client/commit_util.c:979
#, 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:1057
+#: ../libsvn_client/commit_util.c:1128
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr ""
-"커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 잘못된 리비 \
을 가지 있습니"
-"다."
+msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 잘못된 \
리비 을 가지 있습니다."
-#: libsvn_client/commit_util.c:1822
+#: ../libsvn_client/commit_util.c:1869
msgid "Standard properties can't be set explicitly as revision properties"
msgstr ""
-#: libsvn_client/copy.c:314 libsvn_client/copy.c:1566
-#: libsvn_client/update.c:105
+#: ../libsvn_client/copy.c:537 ../libsvn_client/copy.c:1615
+#: ../libsvn_client/update.c:140
#, c-format
msgid "Path '%s' is not a directory"
msgstr "경로 '%s'은(는) 디 리가 아닙니다"
-#: libsvn_client/copy.c:655
+#: ../libsvn_client/copy.c:778
#, c-format
-msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
+msgid "Source and dest appear not to be in the same repository (src: '%s'; dst: \
'%s')" msgstr "원본과 대상이 같은 장소안에 있지 않습니다. \
(원본: '%s'; 대상: '%s')"
-#: libsvn_client/copy.c:770
+#: ../libsvn_client/copy.c:908
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "URL '%s'을(를) 자기 자 으로 이동 수 없습니다."
-#: libsvn_client/copy.c:779 libsvn_client/prop_commands.c:229
+#: ../libsvn_client/copy.c:917 ../libsvn_client/prop_commands.c:250
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "경로 '%s'은(는) 리비 %ld에 없습니다."
-#: libsvn_client/copy.c:1391
+#: ../libsvn_client/copy.c:1438
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr ""
-"원본 URL '%s'은(는) 외부 장소에서 온 것이며, 작업사본과 \
연결되지 않습니다." +msgstr "원본 URL '%s'은(는) 외부 장소에서 \
온 것이며, 작업사본과 연결되지 않습니다."
-#: libsvn_client/copy.c:1537
+#: ../libsvn_client/copy.c:1586
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "경로 '%s'는 리비 %ld에 없습니다."
-#: libsvn_client/copy.c:1542
+#: ../libsvn_client/copy.c:1591
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "경로 '%s'는 head 리비 에 없습니다."
-#: libsvn_client/copy.c:1592
+#: ../libsvn_client/copy.c:1641
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "작업사본에는 없을지라도 '%s'가 이미 등록되어 있음"
-#: libsvn_client/copy.c:1687 libsvn_client/log.c:302
+#: ../libsvn_client/copy.c:1732 ../libsvn_client/diff.c:1747
+#: ../libsvn_client/log.c:335
msgid "Revision type requires a working copy path, not a URL"
msgstr "리비 형식은 URL대 작업 사본 경로를 필요로합니다."
-#: libsvn_client/copy.c:1722
+#: ../libsvn_client/copy.c:1777
msgid "Cannot mix repository and working copy sources"
msgstr " 장소에 원본 리스트의 작업 사본 경로들을 넣을 수 \
없습니다"
-#: libsvn_client/copy.c:1764
+#: ../libsvn_client/copy.c:1820
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "경로 '%s' 를 자 의 하부 디 리('%s')에 복사 수 \
없습니다."
-#: libsvn_client/copy.c:1784
+#: ../libsvn_client/copy.c:1840
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "경로 '%s'을(를) 자기 자 에게 복사 수 없습니다."
-#: libsvn_client/copy.c:1793
+#: ../libsvn_client/copy.c:1849
msgid "Moves between the working copy and the repository are not supported"
msgstr "작업 사본과 장소 간 이동은 지원하지 않습니다"
-#: libsvn_client/copy.c:1851
+#: ../libsvn_client/copy.c:1912
#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "'%s'에는 URL이 관계되어 있지 않아 보입니다."
+msgid "'%s' does not have a URL associated with it"
+msgstr "'%s'에 관계된 URL이 없습니다"
-#: libsvn_client/copy.c:2197 svn/move-cmd.c:60
+#: ../libsvn_client/copy.c:2283 ../svn/move-cmd.c:61
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "이동 명 은 리비 (HEAD 값은 외)을 명시 수 \
없습니다."
-#: libsvn_client/delete.c:62
+#: ../libsvn_client/delete.c:62
#, c-format
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s'은(는) 실 으로 버 관리 대상입니다."
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2800 libsvn_wc/entries.c:1256
-#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2970
-#: libsvn_wc/update_editor.c:2178
+#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:3000
+#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
+#: ../libsvn_wc/entries.c:3003 ../libsvn_wc/update_editor.c:2392
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' 은(는) 버 컨트롤 대상이 아닙니다."
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s'은(는) 수 되었습니다."
-#: libsvn_client/diff.c:135
-#, fuzzy, c-format
-msgid " Reverted %s:r%s%s"
-msgstr "다시 복원함 '%s'\n"
+#: ../libsvn_client/diff.c:136
+#, c-format
+msgid " Reverse-merged %s:r%s%s"
+msgstr " 역병합 %s:r%s%s"
-#: libsvn_client/diff.c:153
+#: ../libsvn_client/diff.c:155
#, c-format
msgid " Merged %s:r%s%s"
-msgstr ""
+msgstr " 병합 %s:r%s%s"
+
+#: ../libsvn_client/diff.c:165 ../libsvn_diff/diff_file.c:1204
+#: ../libsvn_diff/diff_file.c:1216
+#, c-format
+msgid "Path '%s' must be an immediate child of the directory '%s'"
+msgstr "경로 '%s'는 '%s' 디 리의 직계 하위에 있어야합니다"
-#: libsvn_client/diff.c:175
+#: ../libsvn_client/diff.c:196
#, c-format
msgid "%sProperty changes on: %s%s"
-msgstr "%s속성 변경됨: %s%s"
+msgstr "%s속성 변경: %s%s"
+
+#: ../libsvn_client/diff.c:225
+#, c-format
+msgid "Added: %s%s"
+msgstr "추가: %s%s"
+
+#: ../libsvn_client/diff.c:227
+#, c-format
+msgid "Deleted: %s%s"
+msgstr "삭 : %s%s"
-#: libsvn_client/diff.c:203
+#: ../libsvn_client/diff.c:229
#, c-format
-msgid "Name: %s%s"
-msgstr "이름: %s%s"
+msgid "Modified: %s%s"
+msgstr "수 : %s%s"
-#: libsvn_client/diff.c:322
+#: ../libsvn_client/diff.c:366
#, c-format
msgid "%s\t(revision %ld)"
-msgstr "%s\t(revision %ld)"
+msgstr "%s\t(리비 %ld)"
-#: libsvn_client/diff.c:324
+#: ../libsvn_client/diff.c:368
#, c-format
msgid "%s\t(working copy)"
-msgstr "%s\t(working copy)"
+msgstr "%s\t(작업 사본)"
-#: libsvn_client/diff.c:467
+#: ../libsvn_client/diff.c:531
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "표시 수 없음: 파일이 바이너리로 되어있음. %s"
-#. -----------------------------------------------------------------------
-#. ** Utilities. **
-#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:827 libsvn_client/merge.c:66
+#: ../libsvn_client/diff.c:904 ../libsvn_client/merge.c:4208
+#: ../libsvn_client/merge.c:5652
msgid "Not all required revisions are specified"
msgstr "필요한 리비 이 있습니다."
-#: libsvn_client/diff.c:842
+#: ../libsvn_client/diff.c:919
msgid "At least one revision must be non-local for a pegged diff"
-msgstr " 된 리비 을 위한 diff에서 어도 하나의 리비 이 \
로컬이 아닙니다." +msgstr " 된 리비 을 위한 diff에서 어도 \
하나의 리비 이 로컬이 아닙니다"
-#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
+#: ../libsvn_client/diff.c:1031 ../libsvn_client/diff.c:1043
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
-msgstr "'%s'가 장소의 리비 %ld에서 발견되지 않았습니다."
+msgstr "'%s'가 장소의 리비 %ld에서 발견되지 않았습니다"
-#: libsvn_client/diff.c:1025
-#, fuzzy
+#: ../libsvn_client/diff.c:1102
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
-msgstr "죄송합니다. svn_client_diff3 가 지원하지 않는 방법으로 \
호출되었습니다." +msgstr "죄송합니다. svn_client_diff4가 지원하지 \
않는 방법으로 호출되었습니다"
-#: libsvn_client/diff.c:1067
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr ""
-"현재는 경로의 마지막 업데이트 내용과 작업된 내용의 차이만 \
생성 수 있습니다." +#: ../libsvn_client/diff.c:1141
+msgid "Only diffs between a path's text-base and its working files are supported at \
this time" +msgstr "현재는 경로의 마지막 업데이트 내용과 작업된 \
내용의 차이만 생성 수 있습니다"
-#: libsvn_client/diff.c:1212 libsvn_client/switch.c:111
+#: ../libsvn_client/diff.c:1285 ../libsvn_client/switch.c:126
#, c-format
msgid "Directory '%s' has no URL"
msgstr "디 리 '%s'에 URL 보가 없습니다."
-#: libsvn_client/diff.c:1421
+#: ../libsvn_client/diff.c:1496
msgid "Summarizing diff can only compare repository to repository"
msgstr "요약 비교는 보관소대 보관소로만 가능합니다."
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s'는 EOL 값으로 당하지 않습니다."
-#: libsvn_client/export.c:260
+#: ../libsvn_client/export.c:261
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "대상 디 리가 존재합니다. 강 (--force)로 해야만 \
덮어쓰게 됩니다."
-#: libsvn_client/export.c:358 libsvn_client/export.c:501
+#: ../libsvn_client/export.c:407 ../libsvn_client/export.c:550
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s'은(는) 존재하며, 디 리가 아닙니다."
-#: libsvn_client/export.c:362 libsvn_client/export.c:505
+#: ../libsvn_client/export.c:411 ../libsvn_client/export.c:554
#, c-format
msgid "'%s' already exists"
msgstr "'%s'은(는) 이미 존재합니다."
-#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
+#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
+#: ../libsvn_wc/update_editor.c:2076 ../libsvn_wc/update_editor.c:2744
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "'%s'의 체크섬값이 일치하지 않습니다. 기대값:'%s', 실 \
값: '%s'"
-#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
+#: ../libsvn_client/externals.c:314
+#, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr "URL '%s'는 프로 콜로 시작하지 않습니다"
+
+#: ../libsvn_client/externals.c:363
+#, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr "잘못된 상위 디 리 URL '%s'"
+
+#: ../libsvn_client/externals.c:393
+#, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr "잘못된 장소 루트 URL '%s'"
+
+#: ../libsvn_client/externals.c:435
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:467
+#, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "상대 외부 URL '%s'의 형식을 알 수가 없습니다"
+
+#: ../libsvn_client/externals.c:689
+#, c-format
+msgid "Traversal of '%s' found no ambient depth"
+msgstr ""
+
+#: ../libsvn_client/externals.c:820
+#, c-format
+msgid "'%s' is not a URL"
+msgstr "'%s'는 URL이 아닙니다."
+
+#: ../libsvn_client/info.c:405
+#, c-format
+msgid "Server does not support retrieving information about the repository root"
+msgstr "서버가 장소 루트에 대한 보를 공하지 않습니다"
+
+#: ../libsvn_client/info.c:412 ../libsvn_client/info.c:427
+#: ../libsvn_client/info.c:437
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s'은(는) 리비 ('%ld')에 존재하지 않습니다."
-#: libsvn_client/list.c:234
+#: ../libsvn_client/list.c:235
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s'은(는) 그 리비 에서 존재하지 않습니다."
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:203
msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr ""
-"공 하는 상위 디 리가 존재하지 없습니다. 분리된 \
경로들이 지 되었습니다." +msgstr "공 하는 상위 디 리가 \
존재하지 없습니다. 분리된 경로들이 지 되었습니다."
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2521
-#: libsvn_client/merge.c:2527 libsvn_client/merge.c:2720
-#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:5669
+#: ../libsvn_client/merge.c:5675 ../libsvn_client/merge.c:6246
+#: ../libsvn_client/merge.c:6402 ../libsvn_client/ra.c:397
+#: ../libsvn_client/ra.c:434 ../libsvn_client/ra.c:637
#, c-format
msgid "'%s' has no URL"
msgstr "'%s'은(는) URL을 포함하지 않습니다."
-#: libsvn_client/locking_commands.c:284
+#: ../libsvn_client/locking_commands.c:289
msgid "Unable to lock/unlock across multiple repositories"
msgstr "복수의 장소간의 금/해 는 불가능합니다."
-#: libsvn_client/locking_commands.c:325
+#: ../libsvn_client/locking_commands.c:330
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' 은 현 작업사본에서 기지 않았습니다."
-#: libsvn_client/locking_commands.c:373
+#: ../libsvn_client/locking_commands.c:378
#, c-format
msgid "'%s' is not locked"
msgstr "'%s'는 기지 않았습니다."
-#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:993
-#: libsvn_ra/ra_loader.c:863
+#: ../libsvn_client/locking_commands.c:411 ../libsvn_fs/fs-loader.c:1035
+#: ../libsvn_ra/ra_loader.c:1287
msgid "Lock comment contains illegal characters"
msgstr " 금 설명에 잘못된 문자가 있습니다"
-#: libsvn_client/log.c:289
+#: ../libsvn_client/log.c:321
msgid "Missing required revision specification"
msgstr "필요한 리비 지 이 생략됨"
-#: libsvn_client/log.c:352 libsvn_client/status.c:286
-#: libsvn_client/update.c:119
+#: ../libsvn_client/log.c:372
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "작업 사본의 경로는 하나만 가능합니다."
+
+#: ../libsvn_client/log.c:395 ../libsvn_client/status.c:296
+#: ../libsvn_client/update.c:154
#, c-format
msgid "Entry '%s' has no URL"
msgstr "항목 '%s'는 URL이 없습니다."
-#: libsvn_client/log.c:584
+#: ../libsvn_client/log.c:645
msgid "No commits in repository"
msgstr " 장소에 커밋 없음"
-#: libsvn_client/merge.c:92
+#: ../libsvn_client/merge.c:162
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "URL에 스키마가 없음 ('%s' 과 '%s')"
-#: libsvn_client/merge.c:98 libsvn_client/merge.c:104
+#: ../libsvn_client/merge.c:168 ../libsvn_client/merge.c:174
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL에 스키마가 없음: '%s'"
-#: libsvn_client/merge.c:111
+#: ../libsvn_client/merge.c:181
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "아직 지원하지 않는 혼합형 스키마입니다. ('%s' 과 '%s')"
@@ -1306,149 +1472,177 @@ msgstr "아직 지원하지 않는 혼
#. 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:333
+#: ../libsvn_client/merge.c:755
msgid ".working"
msgstr ".working"
-#: libsvn_client/merge.c:335
+#: ../libsvn_client/merge.c:757
#, c-format
msgid ".merge-left.r%ld"
msgstr ".merge-left.r%ld"
-#: libsvn_client/merge.c:338
+#: ../libsvn_client/merge.c:760
#, c-format
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: libsvn_client/merge.c:1066
-#, fuzzy, c-format
-msgid "Path '%s' is missing"
-msgstr "디 리 '%s'가 없습니다."
-
-#: libsvn_client/merge.c:1072 libsvn_wc/util.c:282
-#, fuzzy, c-format
-msgid "Cannot find a URL for '%s'"
-msgstr "'%s'를 위한 등록 보를 찾을 수 없습니다."
+#: ../libsvn_client/merge.c:2170
+msgid "Cannot reverse-merge a range from a path's own future history; try updating \
first" +msgstr ""
-#: libsvn_client/merge.c:1488
+#: ../libsvn_client/merge.c:2677
#, c-format
msgid ""
-"Path '%s' is in conflict, and must be resolved before the remainder of the "
-"requested merge can be applied"
+"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:1852 libsvn_client/merge.c:2209
-msgid "Use of two URLs is not compatible with merge info modification"
+#: ../libsvn_client/merge.c:5367
+msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr ""
-#: libsvn_client/merge.c:2758
+#: ../libsvn_client/merge.c:5374 ../libsvn_client/merge.c:5590
+msgid "Merge from foreign repository is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:5896
+msgid "Cannot reintegrate into a working copy with a switched subtree"
+msgstr "바뀌는 서브트리의 내용을 병합 수 없습니다"
+
+#: ../libsvn_client/merge.c:5901
+msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
+msgstr "무한 깊이의 작업사본에 서브트리의 내용을 병합 수 \
없습니다" +
+#: ../libsvn_client/merge.c:5906
+msgid "Cannot reintegrate into a working copy that has local modifications"
+msgstr "작업사본이 수 되어 바뀌는 서브트리의 내용을 병합 \
수 없습니다" +
+#: ../libsvn_client/merge.c:5912
+msgid "Cannot determine revision of working copy"
+msgstr "작업사본의 리비 을 결 수 없습니다"
+
+#: ../libsvn_client/merge.c:5916
+msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:5983
#, c-format
-msgid ""
-"Unable to determine merge source for '%s', please provide an explicit source"
+msgid "At least one revision (r%ld) not yet merged from '%s'"
+msgstr "최소한 하나의 리비 (r%ld)이 '%s'(으)로부터 아직 \
병합되지 않았습니다" +
+#: ../libsvn_client/merge.c:6141 ../libsvn_client/merge.c:6305
+#, c-format
+msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr ""
-#: libsvn_client/prop_commands.c:73
+#: ../libsvn_client/merge.c:6264
+#, c-format
+msgid "'%s' must be from the same repository as '%s'"
+msgstr "'%s'는 '%s'와 동일한 장소에 있지 않습니다"
+
+#: ../libsvn_client/prop_commands.c:74
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s'은/는 장소상의 속성이며, 클라이언트에서는 근 \
불가능합니다."
-#: libsvn_client/prop_commands.c:216
+#: ../libsvn_client/prop_commands.c:237
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "속성 '%s'는 일반 인 속성이 아닙니다."
-#: libsvn_client/prop_commands.c:320
+#: ../libsvn_client/prop_commands.c:341
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "리비 속성 '%s'는 본 문맥에서 허용되지 않습니다"
-#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
+#: ../libsvn_client/prop_commands.c:348 ../libsvn_client/prop_commands.c:485
#, c-format
msgid "Bad property name: '%s'"
msgstr "잘못된 속성이름: '%s'"
-#: libsvn_client/prop_commands.c:339
+#: ../libsvn_client/prop_commands.c:358
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
-msgstr ""
-"작업 사본이 아닌 대상 '%s'에 대한 속성 설 은 BASE 리비 이 \
필요합니다." +msgstr "작업 사본이 아닌 대상 '%s'에 대한 속성 설 \
은 BASE 리비 이 필요합니다."
-#: libsvn_client/prop_commands.c:345
+#: ../libsvn_client/prop_commands.c:363
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "작업 사본이 아닌 대상 '%s'에 대한 재귀 설 은 \
지원하지 않습니다."
-#: libsvn_client/prop_commands.c:439
+#: ../libsvn_client/prop_commands.c:378
+#, c-format
+msgid "Setting property '%s' on non-local target '%s' is not supported"
+msgstr "속성 '%s'를 작업 사본이 아닌 '%s'에 설 하는 것은 \
지원하지 않습니다" +
+#: ../libsvn_client/prop_commands.c:481
msgid "Value will not be set unless forced"
msgstr "강 (--force)하지 않으면 값이 설 되지 않습니다."
-#: libsvn_client/prop_commands.c:659
+#: ../libsvn_client/prop_commands.c:508
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else \
deleted it?)" +msgstr ""
+
+#: ../libsvn_client/prop_commands.c:517
+#, c-format
+msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else \
changed it?)" +msgstr ""
+
+#: ../libsvn_client/prop_commands.c:525
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone \
else set it?)" +msgstr ""
+
+#: ../libsvn_client/prop_commands.c:714
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s'은(는) 리비 %ld에 없습니다."
-#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:949
+#: ../libsvn_client/prop_commands.c:721 ../libsvn_client/prop_commands.c:1070
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "'%s'의 노드를 알 수 없습니다."
-#: libsvn_client/ra.c:133
+#: ../libsvn_client/ra.c:135
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr "커밋 명 없이 작업사본의 속성 '%s'를 '%s'에 설 하 \
시도합니다."
-#: libsvn_client/ra.c:496
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "'%s'의 변경된 경로 보가 누락됨, 리비 %ld."
-
-#: libsvn_client/ra.c:616
-#, c-format
-msgid "Path '%s' doesn't exist in revision %ld"
-msgstr "경로 '%s'는 리비 %ld 에 존재하지 않습니다"
-
-#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
+#: ../libsvn_client/ra.c:706 ../libsvn_ra/compat.c:372
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "'%s'의 장소 위치를 찾을 수 없습니다. 리비 %ld."
-#: libsvn_client/ra.c:674
-#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "'%s' (리비 %ld)는 연관이 없는 개체입니다."
-
-#: libsvn_client/ra.c:831
+#: ../libsvn_client/ra.c:713
#, 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)가 장소내에 존재하지 않거나 \
연관되지 않는 개체"
-"를 참조하 있습니다."
+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:101
+#: ../libsvn_client/relocate.c:98
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "'%s'는 장소의 루트가 아닙니다."
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:105
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr ""
-"'%s'의 장소는 '%s'라는 uuid를 가지 있습니다만 작업사본은 \
'%s' 입니다." +msgstr "'%s'의 장소는 '%s'라는 uuid를 가지 \
있습니다만 작업사본은 '%s' 입니다."
-#: libsvn_client/revisions.c:93
+#: ../libsvn_client/revisions.c:99
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "경로 '%s'는 커밋된 리비 이 없습니다"
-#: libsvn_client/revisions.c:103
+#: ../libsvn_client/revisions.c:126
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "'%s'에 대한 인식 불가능한 리비 종류의 요청을 \
받았습니다."
-#: libsvn_client/switch.c:135 libsvn_ra_local/ra_plugin.c:108
-#: libsvn_ra_local/ra_plugin.c:597 libsvn_wc/update_editor.c:2617
+#: ../libsvn_client/switch.c:144 ../libsvn_ra_local/ra_plugin.c:196
+#: ../libsvn_ra_local/ra_plugin.c:271 ../libsvn_wc/update_editor.c:3264
#, c-format
msgid ""
"'%s'\n"
@@ -1459,398 +1653,398 @@ msgstr ""
"서로 동일하지 않은 장소 입니다.\n"
"'%s'"
-#: libsvn_client/switch.c:150
-#, fuzzy, c-format
-msgid "Destination does not exist: '%s'"
-msgstr "대상 '%s' 는 이미 존재합니다."
-
-#: libsvn_client/update.c:145 libsvn_wc/log.c:2573
+#: ../libsvn_client/util.c:216
#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s'는 작업 사본 디 리가 아닙니다"
-
-#: libsvn_client/update.c:153
-#, fuzzy, c-format
-msgid "'%s' is neither a file nor a directory"
-msgstr "'%s'는 파일이나 디 리가 아닙니다"
+msgid "URL '%s' is not a child of repository root URL '%s'"
+msgstr "'%s'는 루트 URL '%s'의 하위에 있지 않습니다"
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "svndiff 데이터 압축을 실패하였습니다"
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
msgstr "svndiff 데이터 압축 해 를 실패하였습니다"
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
msgstr "압축 해 된 데이터의 크기가 장된 원본 길이와 \
일치하지 않습니다"
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:484
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "잘못된 diff 스트림: insn %d 를 디코딩 수 없습니다."
-#: libsvn_delta/svndiff.c:488
+#: ../libsvn_delta/svndiff.c:488
#, c-format
msgid "Invalid diff stream: insn %d has non-positive length"
msgstr "잘못된 diff 스트림: insn %d 의 길이가 양수가 아닙니다"
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:492
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "잘못된 diff 스트림: insn %d이 대상뷰의 크기를 \
넘었습니다."
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "잘못된 diff 스트림: [src] insn %d이 원본뷰의 크기를 \
넘었습니다."
-#: libsvn_delta/svndiff.c:507
+#: ../libsvn_delta/svndiff.c:507
#, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "잘못된 diff 스트림: [tgt] insn %d이 뷰의 시작 위치를 \
넘었습니다."
-#: libsvn_delta/svndiff.c:514
+#: ../libsvn_delta/svndiff.c:514
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "잘못된 diff 스트림: [tgt] insn %d이 새 데이터 영역을 \
넘었습니다."
-#: libsvn_delta/svndiff.c:524
+#: ../libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "차이 이 대상 화면에 채워지지 않았습니다."
-#: libsvn_delta/svndiff.c:527
+#: ../libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "차이 이 충분한 데이터를 포함하 있지 않습니다."
-#: libsvn_delta/svndiff.c:633
+#: ../libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Svndiff 데이터가 잘못된 헤더를 가지 있습니다."
-#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
+#: ../libsvn_delta/svndiff.c:688 ../libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff 데이터가 손상된 윈도우를 포함하 있습니다."
-#: libsvn_delta/svndiff.c:697
+#: ../libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff 데이터에 뒤로 진행하는 부분이 있습니다."
-#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
-#: libsvn_delta/svndiff.c:866
+#: ../libsvn_delta/svndiff.c:746 ../libsvn_delta/svndiff.c:793
+#: ../libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "svndiff의 입 이 알 수 없는 이 로 중단되었습니다."
-#: libsvn_diff/diff_file.c:587
+#: ../libsvn_diff/diff_file.c:465
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "파일 '%s'이 diff 를 하는 동안 예기치 않게 \
변경되었습니다"
-#: libsvn_diff/diff_file.c:707
+#: ../libsvn_diff/diff_file.c:589
#, c-format
msgid "Error parsing diff options"
msgstr "diff 옵션 구문 분석 실패"
-#: libsvn_diff/diff_file.c:730
+#: ../libsvn_diff/diff_file.c:615
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "'%s'는 diff 옵션의 잘못된 인자입니다"
-#: libsvn_diff/diff_file.c:1011
-#, c-format
-msgid "%s\\ No newline at end of file%s"
-msgstr "%s\\ 파일 끝에 줄바꿈이 없습니다.%s"
-
-#: libsvn_diff/diff_file.c:1587
+#: ../libsvn_diff/diff_file.c:1798
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "mmap '%s'의 거에 실패하였습니다."
-#: libsvn_fs/fs-loader.c:104 libsvn_ra/ra_loader.c:158
-#: libsvn_ra/ra_loader.c:171
+#: ../libsvn_fs/fs-loader.c:105 ../libsvn_ra/ra_loader.c:177
+#: ../libsvn_ra/ra_loader.c:190
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "'%s'는 '%s()'를 의하지 않습니다."
-#: libsvn_fs/fs-loader.c:121
+#: ../libsvn_fs/fs-loader.c:122
#, c-format
msgid "Can't grab FS mutex"
msgstr "FS 뮤텍스를 얻을 수 없습니다."
-#: libsvn_fs/fs-loader.c:133
+#: ../libsvn_fs/fs-loader.c:134
#, c-format
msgid "Can't ungrab FS mutex"
msgstr "파일시스템 뮤텍스를 얻을 수 없습니다."
-#: libsvn_fs/fs-loader.c:154
+#: ../libsvn_fs/fs-loader.c:155
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "FS 타입 '%s'을 재 수 없습니다."
-#: libsvn_fs/fs-loader.c:187
+#: ../libsvn_fs/fs-loader.c:188
#, c-format
-msgid ""
-"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "FS 모듈 버 불일치 '%s': 발견된 것 %d.%d.%d%s, 기대되는 것 \
%d.%d.%d%s"
-#: libsvn_fs/fs-loader.c:212
+#: ../libsvn_fs/fs-loader.c:213
#, c-format
msgid "Unknown FS type '%s'"
msgstr "알수 없는 파일시스템 종류 '%s'"
-#: libsvn_fs/fs-loader.c:302
+#: ../libsvn_fs/fs-loader.c:304
#, c-format
msgid "Can't allocate FS mutex"
msgstr "FS 뮤텍스 당 불가능"
-#: libsvn_fs/fs-loader.c:999
+#: ../libsvn_fs/fs-loader.c:1017
+#, c-format
+msgid "Malformed UUID '%s'"
+msgstr "잘못된 UUID '%s'"
+
+#: ../libsvn_fs/fs-loader.c:1041
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "만료기간이 음수로 지 되었습니다."
-#: libsvn_fs_base/bdb/bdb-err.c:101
+#: ../libsvn_fs_base/bdb/bdb-err.c:101
#, c-format
msgid "Berkeley DB error for filesystem '%s' while %s:\n"
msgstr "파일시스템 %s에서 %s 중에 Berkeley DB 오류입니다:\n"
-#: libsvn_fs_base/bdb/changes-table.c:87
+#: ../libsvn_fs_base/bdb/changes-table.c:87
msgid "creating change"
msgstr "변경 내용 생성중"
-#: libsvn_fs_base/bdb/changes-table.c:113
+#: ../libsvn_fs_base/bdb/changes-table.c:113
msgid "deleting changes"
msgstr "변경 내용 삭 중"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2717
+#: ../libsvn_fs_base/bdb/changes-table.c:145 ../libsvn_fs_fs/fs_fs.c:3298
msgid "Missing required node revision ID"
msgstr "필요한 노드 리비 ID가 누락되었습니다."
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2727
+#: ../libsvn_fs_base/bdb/changes-table.c:156 ../libsvn_fs_fs/fs_fs.c:3308
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "변경 순서 오류: 삭 없는 새 노드 리비 ID"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2738
+#: ../libsvn_fs_base/bdb/changes-table.c:166 ../libsvn_fs_fs/fs_fs.c:3319
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "변경 순서 오류: 삭 된 경로상에는 추가 수 없습니다."
-#: libsvn_fs_base/bdb/changes-table.c:256
-#: libsvn_fs_base/bdb/changes-table.c:380
+#: ../libsvn_fs_base/bdb/changes-table.c:256
+#: ../libsvn_fs_base/bdb/changes-table.c:380
msgid "creating cursor for reading changes"
msgstr "변경 내용을 읽기위한 커서 생성중"
-#: libsvn_fs_base/bdb/changes-table.c:282
-#: libsvn_fs_base/bdb/changes-table.c:401
+#: ../libsvn_fs_base/bdb/changes-table.c:282
+#: ../libsvn_fs_base/bdb/changes-table.c:401
#, c-format
msgid "Error reading changes for key '%s'"
msgstr "'%s' 키의 변경사항 읽기중 오류가 발생하였습니다."
-#: libsvn_fs_base/bdb/changes-table.c:341
-#: libsvn_fs_base/bdb/changes-table.c:424
+#: ../libsvn_fs_base/bdb/changes-table.c:341
+#: ../libsvn_fs_base/bdb/changes-table.c:424
msgid "fetching changes"
msgstr "변경사항 읽는중"
-#: libsvn_fs_base/bdb/changes-table.c:354
-#: libsvn_fs_base/bdb/changes-table.c:437
+#: ../libsvn_fs_base/bdb/changes-table.c:354
+#: ../libsvn_fs_base/bdb/changes-table.c:437
msgid "closing changes cursor"
msgstr "변경사항 읽는 커서를 닫는 중"
-#: libsvn_fs_base/bdb/copies-table.c:85
+#: ../libsvn_fs_base/bdb/copies-table.c:85
msgid "storing copy record"
msgstr " 장된 사본이 손상되었습니다."
-#: libsvn_fs_base/bdb/copies-table.c:110
+#: ../libsvn_fs_base/bdb/copies-table.c:110
msgid "allocating new copy ID (getting 'next-key')"
msgstr "새로운 사본 ID 당 중 ('next-key' 얻는 중)"
-#: libsvn_fs_base/bdb/copies-table.c:128
+#: ../libsvn_fs_base/bdb/copies-table.c:128
msgid "bumping next copy key"
msgstr "다음 사본 키 생성중"
-#: libsvn_fs_base/bdb/copies-table.c:167
+#: ../libsvn_fs_base/bdb/copies-table.c:167
msgid "deleting entry from 'copies' table"
msgstr "'copies' 테이블에서 엔트리를 삭 중"
-#: libsvn_fs_base/bdb/copies-table.c:195
+#: ../libsvn_fs_base/bdb/copies-table.c:195
msgid "reading copy"
msgstr "사본 읽는 중"
-#: libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/node-origins-table.c:111
+#, 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:121
+msgid "storing node-origins record"
+msgstr "노드 원본 코드를 장중"
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:96
msgid "allocating new node ID (getting 'next-key')"
msgstr "새로운 노드 ID를 당 중 ('next-key' 얻는 중)"
-#: libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:114
msgid "bumping next node ID key"
msgstr "새로운 노드 ID 생성중"
-#: libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:150
#, 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:178
+#: ../libsvn_fs_base/bdb/nodes-table.c:176
msgid "deleting entry from 'nodes' table"
msgstr "'nodes' 테이블에서 엔트리 삭 중"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:216
msgid "reading node revision"
msgstr "노드 리비 읽는 중"
-#: libsvn_fs_base/bdb/nodes-table.c:250
+#: ../libsvn_fs_base/bdb/nodes-table.c:249
msgid "storing node revision"
msgstr "노드 리비 장 중"
-#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
+#: ../libsvn_fs_base/bdb/reps-table.c:93
+#: ../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:96
+#: ../libsvn_fs_base/bdb/reps-table.c:96
msgid "reading representation"
msgstr "표현식 읽는 중"
-#: libsvn_fs_base/bdb/reps-table.c:124
+#: ../libsvn_fs_base/bdb/reps-table.c:124
msgid "storing representation"
msgstr "표현식 장중"
-#: libsvn_fs_base/bdb/reps-table.c:154
+#: ../libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
msgstr "새로운 표현식 당중 (next-key 얻는 중)"
-#: libsvn_fs_base/bdb/reps-table.c:175
+#: ../libsvn_fs_base/bdb/reps-table.c:175
msgid "bumping next representation key"
msgstr "다음 표현식 키를 생성중"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:203
+#: ../libsvn_fs_base/bdb/reps-table.c:203
msgid "deleting representation"
msgstr "표현식 삭 중"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/rev-table.c:88
+#: ../libsvn_fs_base/bdb/rev-table.c:88
msgid "reading filesystem revision"
msgstr "파일 시스템 리비 읽는 중"
-#: libsvn_fs_base/bdb/strings-table.c:89
+#: ../libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "문자열 읽기용 커서 생성 중"
-#: libsvn_fs_base/bdb/txn-table.c:92
+#: ../libsvn_fs_base/bdb/txn-table.c:92
msgid "storing transaction record"
msgstr "트랜잭션 코드 장중"
-#: libsvn_fs_base/bdb/uuids-table.c:114
+#: ../libsvn_fs_base/bdb/uuids-table.c:114
msgid "get repository uuid"
msgstr " 장소 uuid 얻기"
-#: libsvn_fs_base/bdb/uuids-table.c:142
+#: ../libsvn_fs_base/bdb/uuids-table.c:142
msgid "set repository uuid"
msgstr " 장소 uuid 설 "
-#: libsvn_fs_base/dag.c:221
+#: ../libsvn_fs_base/dag.c:219
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일시스템('%s')의 초기 트랜잭션 id가 '0'이 \
아닙니다."
-#: libsvn_fs_base/dag.c:229
+#: ../libsvn_fs_base/dag.c:227
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일 시스템('%s')의 초기 copy id가 '0'이 \
아닙니다."
-#: libsvn_fs_base/dag.c:238
+#: ../libsvn_fs_base/dag.c:236
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일시스템('%s')의 초기 리비 번호가 '0'이 \
아닙니다."
-#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
+#: ../libsvn_fs_base/dag.c:284 ../libsvn_fs_base/dag.c:460
+#: ../libsvn_fs_fs/dag.c:381
msgid "Attempted to create entry in non-directory parent"
msgstr "디 리가 아닌 상위 노드에 생성하 하였습니다."
-#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
+#: ../libsvn_fs_base/dag.c:454 ../libsvn_fs_fs/dag.c:375
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr " 잘못된 이름('%s')으로 노드를 생성하 했습니다."
-#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
+#: ../libsvn_fs_base/dag.c:466 ../libsvn_fs_base/dag.c:701
+#: ../libsvn_fs_fs/dag.c:387
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "변경 불가능한 노드로 복 를 시도하였습니다."
-#: libsvn_fs_base/dag.c:475
+#: ../libsvn_fs_base/dag.c:473
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "이미 존재하는 디 리를 다시 생성하 하였습니다."
-#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
+#: ../libsvn_fs_base/dag.c:524 ../libsvn_fs_fs/dag.c:450
msgid "Attempted to set entry in non-directory node"
msgstr "디 리가 아닌 노드에 설 하 하였습니다."
-#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
+#: ../libsvn_fs_base/dag.c:530 ../libsvn_fs_fs/dag.c:456
msgid "Attempted to set entry in immutable node"
msgstr "변경 수 없는 노드에 대해 설 하 했습니다."
-#: libsvn_fs_base/dag.c:596
+#: ../libsvn_fs_base/dag.c:594
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "되돌릴수 없는 노드(%s) 리비 에 대해 속성리스트를 설 \
수 없습니다."
-#: libsvn_fs_base/dag.c:708
+#: ../libsvn_fs_base/dag.c:707
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "잘못된 이름 '%s'으로 하위 노드를 생성하 합니다."
-#: libsvn_fs_base/dag.c:834
+#: ../libsvn_fs_base/dag.c:833
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "디 리가 아닌 노드에서 '%s'를 삭 하 합니다."
-#: libsvn_fs_base/dag.c:840
+#: ../libsvn_fs_base/dag.c:839
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "변경 수 없는 디 리에서 '%s'를 삭 하 합니다."
-#: libsvn_fs_base/dag.c:847
+#: ../libsvn_fs_base/dag.c:846
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "잘못된 이름으로된 노드(%s)를 삭 하 합니다."
-#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
+#: ../libsvn_fs_base/dag.c:861 ../libsvn_fs_base/dag.c:894
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "삭 오류: 디 리에 그런 항목이 없습니다. : '%s'"
-#: libsvn_fs_base/dag.c:944
+#: ../libsvn_fs_base/dag.c:943
#, c-format
msgid "Attempted removal of immutable node"
msgstr "변경 수 없는 노드를 삭 하 합니다."
-#: libsvn_fs_base/dag.c:1064
+#: ../libsvn_fs_base/dag.c:1066
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "파일이 아닌 노드로부터 텍스트를 얻으 시도했습니다."
-#: libsvn_fs_base/dag.c:1099
+#: ../libsvn_fs_base/dag.c:1101
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "파일이 아닌 노드로부터 길이를 얻으 시도했습니다."
-#: libsvn_fs_base/dag.c:1125
+#: ../libsvn_fs_base/dag.c:1127
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "파일이 아닌 노드로부터 체크섬 값을 얻으 \
시도했습니다."
-#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
+#: ../libsvn_fs_base/dag.c:1158 ../libsvn_fs_base/dag.c:1212
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "파일이 아닌 노드에 텍스트 내용을 설 수 없음"
-#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
+#: ../libsvn_fs_base/dag.c:1164 ../libsvn_fs_base/dag.c:1218
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "변경 수 없는 노드의 내용을 설 하 합니다."
-#: libsvn_fs_base/dag.c:1239
+#: ../libsvn_fs_base/dag.c:1241
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1861,121 +2055,131 @@ msgstr ""
" 기대값 : %s\n"
" 실 값 : %s\n"
-#: libsvn_fs_base/dag.c:1294
+#: ../libsvn_fs_base/dag.c:1296
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "존재하지 않는 하위 노드 '%s'를 열 합니다."
-#: libsvn_fs_base/dag.c:1300
+#: ../libsvn_fs_base/dag.c:1302
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "잘못된 이름의 노드 '%s'를 열 합니다."
-#: libsvn_fs_base/err.c:41
+#: ../libsvn_fs_base/dag.c:1546
+#, c-format
+msgid "Attempted merge tracking info change on immutable node"
+msgstr "변경 수 없는 노드의 병합추 보를 변경하 \
하였습니다" +
+#: ../libsvn_fs_base/dag.c:1586
+#, c-format
+msgid "Attempted mergeinfo count change on immutable node"
+msgstr "변경 수 없는 노드의 병합 보 개수를 변경하 \
하였습니다" +
+#: ../libsvn_fs_base/dag.c:1598
+#, c-format
+msgid "Invalid value (%%%s) for node revision mergeinfo count"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:41
#, c-format
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "손상된 파일시스템 리비 %ld (파일시스템 '%s')"
-#: libsvn_fs_base/err.c:52 libsvn_fs_fs/err.c:42
+#: ../libsvn_fs_base/err.c:52 ../libsvn_fs_fs/err.c:42
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "존재하지 않는 노드 '%s'에 대한 참조, 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:62
+#: ../libsvn_fs_base/err.c:62
#, c-format
-msgid "Reference to non-existent revision %ld in filesystem '%s'"
-msgstr "리비 %ld 에 대한 파일 시스템 %s 내의 참조"
+msgid "No such revision %ld in filesystem '%s'"
+msgstr "리비 %ld는 파일시스템 '%s'에 없습니다"
-#: libsvn_fs_base/err.c:74
+#: ../libsvn_fs_base/err.c:74
#, c-format
msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr ""
-"손상된 등록 보가 '%s'를 위한 'transactions' 테이블에 있습니다. \
파일시스템 '%"
-"s'"
+msgstr "손상된 등록 보가 '%s'를 위한 'transactions' 테이블에 \
있습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:85
+#: ../libsvn_fs_base/err.c:85
#, c-format
msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr ""
-"손상된 등록 보가 '%s'를 위한 'copies' 테이블에 있습니다. 파일 \
시스템 '%s'" +msgstr "손상된 등록 보가 '%s'를 위한 'copies' \
테이블에 있습니다. 파일 시스템 '%s'"
-#: libsvn_fs_base/err.c:96
+#: ../libsvn_fs_base/err.c:96
#, c-format
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "트랜잭션 이름이 '%s'로는 존재하지 않습니다. 파일 \
시스템 '%s'"
-#: libsvn_fs_base/err.c:107
+#: ../libsvn_fs_base/err.c:107
#, c-format
msgid "Cannot modify transaction named '%s' in filesystem '%s'"
msgstr "'%s' 라는 트랜잭션은 수 수 없습니다. 파일 시스템 \
'%s'"
-#: libsvn_fs_base/err.c:118
+#: ../libsvn_fs_base/err.c:118
#, c-format
msgid "No copy with id '%s' in filesystem '%s'"
msgstr "'%s'라는 아이디의 사본이 없습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:128
+#: ../libsvn_fs_base/err.c:128
#, c-format
msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
msgstr " 큰 '%s'은/는 파일시스템 '%s'에 존재하지 않는 금을 \
가리킵니다."
-#: libsvn_fs_base/err.c:138
+#: ../libsvn_fs_base/err.c:138
#, c-format
msgid "No token given for path '%s' in filesystem '%s'"
msgstr "'%s'라는 경로에 큰이 없습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:147
+#: ../libsvn_fs_base/err.c:147
#, c-format
msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr ""
-"'%s'를 위한 'locks' 테이블에 손상된 금이 존재합니다. 파일 \
시스템 '%s'" +msgstr "'%s'를 위한 'locks' 테이블에 손상된 금이 \
존재합니다. 파일 시스템 '%s'" +
+#: ../libsvn_fs_base/err.c:157
+#, c-format
+msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
+msgstr "노드 아이디 '%s'(파일시스템 '%s')이 노드 원본 테이블에 \
없습니다"
-#: libsvn_fs_base/fs.c:81
+#: ../libsvn_fs_base/fs.c:81
#, 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:92
+#: ../libsvn_fs_base/fs.c:92
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr ""
-"잘못된 데이터 이스 버 : 컴파일당시 버 %d.%d.%d, 실행되 \
있는 버 %d.%d."
-"%d"
+msgstr "잘못된 데이터 이스 버 : 컴파일당시 버 %d.%d.%d, \
실행되 있는 버 %d.%d.%d"
-#: libsvn_fs_base/fs.c:110 libsvn_fs_fs/fs.c:53
-msgid "Filesystem object already open"
-msgstr "파일 시스템 객체는 이미 열 있습니다."
-
-#: libsvn_fs_base/fs.c:191
+#: ../libsvn_fs_base/fs.c:180
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr ""
-"DB 환경을 종료하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 \
발생하였습니"
-"다:\n"
+msgstr "DB 환경을 종료하는 중에 파일시스템 '%s' 에 Berkeley DB \
오류가 발생하였습니다:\n"
-#: libsvn_fs_base/fs.c:540
+#: ../libsvn_fs_base/fs.c:532
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr ""
-"DB 환경을 생성하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 \
발생하였습니"
-"다:\n"
+msgstr "DB 환경을 생성하는 중에 파일시스템 '%s' 에 Berkeley DB \
오류가 발생하였습니다:\n"
-#: libsvn_fs_base/fs.c:546
+#: ../libsvn_fs_base/fs.c:538
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr "DB 환경을 여는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 \
발생하였습니다:\n" +
+#: ../libsvn_fs_base/fs.c:677
+#, c-format
+msgid "The '%s' feature requires version %d of the filesystem schema; filesystem \
'%s' uses only version %d" msgstr ""
-"DB 환경을 여는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 \
발생하였습니다:\n"
-#: libsvn_fs_base/fs.c:675
+#: ../libsvn_fs_base/fs.c:699
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "예상되는 파일시스템 포맷 '%d', 발견된 포맷 '%d'"
-#: libsvn_fs_base/fs.c:1114
+#: ../libsvn_fs_base/fs.c:1183
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"
+"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"
@@ -1983,82 +2187,78 @@ msgstr ""
"만약 문 가 지속되면, DB_CONFIG 내에서 본 속성을\n"
"끄십시오."
-#: libsvn_fs_base/fs.c:1133
+#: ../libsvn_fs_base/fs.c:1202
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"
+"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 ""
-"hotcopy 도중 복원오류; DB_LOG_AUTOREMOVE 속성이 \n"
+"hotcopy 에 대한 대대 인 복원수행중 오류; DB_LOG_AUTOREMOVE 속성이 \
\n" "hotcopy 알 리즘과 간섭을 일으키는 것 같습니다.\n"
"만약 문 가 지속되면, DB_CONFIG 내에서 본 속성을\n"
"끄십시오."
-#: libsvn_fs_base/fs.c:1180
+#: ../libsvn_fs_base/fs.c:1249
msgid "Module for working with a Berkeley DB repository."
msgstr "Berkeley DB로 된 장소에 근하기 위한 모듈"
-#: libsvn_fs_base/fs.c:1214
+#: ../libsvn_fs_base/fs.c:1284
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "BDB의 지원하지 않는 FS 로더 버 (%d)"
-#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
+#: ../libsvn_fs_base/lock.c:445 ../libsvn_fs_fs/lock.c:591
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
-msgstr ""
-"'%s' 경로에 대한 금을 확인 수 없습니다; 사용자가 지 \
되지 않았습니다." +msgstr "'%s' 경로에 대한 금을 확인 수 \
없습니다; 사용자가 지 되지 않았습니다."
-#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
+#: ../libsvn_fs_base/lock.c:451 ../libsvn_fs_fs/lock.c:597
#, 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:458 libsvn_fs_fs/lock.c:629
+#: ../libsvn_fs_base/lock.c:458 ../libsvn_fs_fs/lock.c:604
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr ""
-"'%s' 경로에 대한 금을 확인 수 없습니다; 금 큰을 \
발견 수 없습니다." +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:57
+#: ../libsvn_fs_base/reps-strings.c:57
#, c-format
msgid "Unknown node kind for representation '%s'"
msgstr "'%s'의 노드 종류를 알 수 없습니다."
-#: libsvn_fs_base/reps-strings.c:108
+#: ../libsvn_fs_base/reps-strings.c:108
msgid "Representation is not of type 'delta'"
msgstr "표현식이 'delta' 형식이 아닙니다."
-#: libsvn_fs_base/reps-strings.c:378
+#: ../libsvn_fs_base/reps-strings.c:378
msgid "Svndiff source length inconsistency"
msgstr "Svndiff의 원본 길이가 일치하지 않습니다."
-#: libsvn_fs_base/reps-strings.c:505
+#: ../libsvn_fs_base/reps-strings.c:505
#, c-format
msgid "Diff version inconsistencies in representation '%s'"
msgstr "표현식 '%s'에 diff의 버 이 불일치합니다."
-#: libsvn_fs_base/reps-strings.c:531
+#: ../libsvn_fs_base/reps-strings.c:531
#, c-format
-msgid ""
-"Corruption detected whilst reading delta chain from representation '%s' to '%"
-"s'"
+msgid "Corruption detected whilst reading delta chain from representation '%s' to \
'%s'" msgstr "'%s'에서 '%s'로의 델타 체인이 읽혀지긴하였지만, \
오류도 발견되었습니다."
-#: libsvn_fs_base/reps-strings.c:779
+#: ../libsvn_fs_base/reps-strings.c:779
#, c-format
msgid "Rep contents are too large: got %s, limit is %s"
msgstr " 장소의 내용이 너무 큽니다.: 현재 %s이나 최대값은 \
%s입니다."
-#: libsvn_fs_base/reps-strings.c:795
+#: ../libsvn_fs_base/reps-strings.c:795
#, c-format
msgid "Failure reading rep '%s'"
msgstr " 장소 '%s' 읽기 실패"
-#: libsvn_fs_base/reps-strings.c:811 libsvn_fs_base/reps-strings.c:897
+#: ../libsvn_fs_base/reps-strings.c:811 ../libsvn_fs_base/reps-strings.c:897
#, c-format
msgid ""
"Checksum mismatch on rep '%s':\n"
@@ -2069,135 +2269,100 @@ msgstr ""
" 기대값: %s\n"
" 실 값: %s\n"
-#: libsvn_fs_base/reps-strings.c:911
+#: ../libsvn_fs_base/reps-strings.c:911
msgid "Null rep, but offset past zero already"
msgstr "비어있는 rep입니다만, 내용이 있는 것처럼 근합니다."
-#: libsvn_fs_base/reps-strings.c:1024 libsvn_fs_base/reps-strings.c:1220
+#: ../libsvn_fs_base/reps-strings.c:1024 ../libsvn_fs_base/reps-strings.c:1220
#, c-format
msgid "Rep '%s' is not mutable"
msgstr "표현식 '%s'는 변경 불가능합니다."
-#: libsvn_fs_base/reps-strings.c:1039
+#: ../libsvn_fs_base/reps-strings.c:1039
#, c-format
msgid "Rep '%s' both mutable and non-fulltext"
msgstr "Rep '%s'는 뮤터블함과 동시에 체텍스트가 아닙니다."
-#: libsvn_fs_base/reps-strings.c:1339
+#: ../libsvn_fs_base/reps-strings.c:1339
msgid "Failed to get new string key"
msgstr "새로운 문자열 키를 얻는데 실패하였습니다."
-#: libsvn_fs_base/reps-strings.c:1415
+#: ../libsvn_fs_base/reps-strings.c:1415
#, c-format
msgid "Attempt to deltify '%s' against itself"
msgstr "자 ('%s')에 대한 차이를 구하 하였습니다."
-#: libsvn_fs_base/reps-strings.c:1486
+#: ../libsvn_fs_base/reps-strings.c:1486
#, c-format
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "'%s'에 대한 MD5 값을 계산하는데 실패하였습니다."
-#: libsvn_fs_base/revs-txns.c:68
+#: ../libsvn_fs_base/revs-txns.c:68
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "트랜잭션 종료되지 않음: '%s'"
-#: libsvn_fs_base/revs-txns.c:71
+#: ../libsvn_fs_base/revs-txns.c:71
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "트랜잭션 종료됨: '%s'"
-#: libsvn_fs_base/revs-txns.c:1066
+#: ../libsvn_fs_base/revs-txns.c:1006
msgid "Transaction aborted, but cleanup failed"
msgstr "트랜잭션이 취소되었으나 'cleanup'도 실패하였습니다."
-#. Constructing nice error messages for roots.
-#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
-#. for PATH in ROOT.
-#. Constructing nice error messages for roots.
-#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
-#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:393 libsvn_fs_fs/tree.c:312
-#, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "파일 발견되지 않음: 트랜잭션 '%s', 경로 '%s'"
-
-#: libsvn_fs_base/tree.c:398 libsvn_fs_fs/tree.c:317
-#, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "파일 발견되지 않음: 리비 %ld, 경로 '%s'"
-
-#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:408 libsvn_fs_fs/tree.c:332
-#, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "파일이 이미 존재함: 파일시스템 '%s', 트랜잭션 '%s', 경로 \
'%s'"
-
-#: libsvn_fs_base/tree.c:413 libsvn_fs_fs/tree.c:338
-#, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "파일이 이미 존재함: 파일시스템 '%s', 리비 %ld, 경로 \
'%s'"
-
-#: libsvn_fs_base/tree.c:421 libsvn_fs_fs/tree.c:348
-msgid "Root object must be a transaction root"
-msgstr "루트 개체가 트랜잭션의 루트이어야 합니다."
-
-#: libsvn_fs_base/tree.c:790 libsvn_fs_fs/tree.c:711
+#: ../libsvn_fs_base/tree.c:766 ../libsvn_fs_fs/tree.c:691
#, c-format
msgid "Failure opening '%s'"
msgstr "열 수 없습니다. '%s'"
-#: libsvn_fs_base/tree.c:1422 libsvn_fs_fs/tree.c:1158
+#: ../libsvn_fs_base/tree.c:1398 ../libsvn_fs_fs/tree.c:1126
msgid "Cannot compare property value between two different filesystems"
msgstr "서로 다른 두개의 파일 시스템간 속성은 비교 수 \
없습니다."
-#: libsvn_fs_base/tree.c:1755
+#: ../libsvn_fs_base/tree.c:1743
msgid "Corrupt DB: faulty predecessor count"
msgstr "손상된 DB: 잘못된 predecessor count"
-#: libsvn_fs_base/tree.c:1810 libsvn_fs_fs/tree.c:1195
+#: ../libsvn_fs_base/tree.c:1798 ../libsvn_fs_fs/tree.c:1162
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "경로 '%s'에 기대하지 못한 변경 불가능한 노드를 \
발견하였습니다."
-#: libsvn_fs_base/tree.c:1831 libsvn_fs_fs/tree.c:1218
+#: ../libsvn_fs_base/tree.c:1819 ../libsvn_fs_fs/tree.c:1185
#, c-format
msgid "Conflict at '%s'"
msgstr "충돌 발생: '%s'"
-#: libsvn_fs_base/tree.c:1881 libsvn_fs_base/tree.c:2593
-#: libsvn_fs_fs/tree.c:1267 libsvn_fs_fs/tree.c:1759
+#: ../libsvn_fs_base/tree.c:1872 ../libsvn_fs_base/tree.c:2624
+#: ../libsvn_fs_fs/tree.c:1236 ../libsvn_fs_fs/tree.c:1775
msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr ""
-"병합 실패; diff 원본, 대상 그리 차이를 반영 대상이 모두 \
같은 파일시스템이"
-"어야 합니다."
+msgstr "병합 실패; diff 원본, 대상 그리 차이를 반영 대상이 \
모두 같은 파일시스템이어야 합니다."
-#: libsvn_fs_base/tree.c:1897 libsvn_fs_fs/tree.c:1283
+#: ../libsvn_fs_base/tree.c:1888 ../libsvn_fs_fs/tree.c:1252
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr ""
-"병합 실패; 차이를 반영 대상 '%s'은 '%s' id를 가지 있으며, \
이는 diff 원본"
-"과 같습니다."
+msgstr "병합 실패; 차이를 반영 대상 '%s'은 '%s' id를 가지 \
있으며, 이는 diff 원본과 같습니다."
-#: libsvn_fs_base/tree.c:2400
+#: ../libsvn_fs_base/tree.c:2431
#, c-format
-msgid "Transaction '%s' out of date with respect to revision '%s'"
+msgid "Transaction '%s' out-of-date with respect to revision '%s'"
msgstr "트랜잭션 '%s' 는 리비 '%s'의 관 에서 만료기간이 \
지났습니다."
-#: libsvn_fs_base/tree.c:2776 libsvn_fs_fs/tree.c:1898
+#: ../libsvn_fs_base/tree.c:2809 ../libsvn_fs_fs/tree.c:1913
msgid "The root directory cannot be deleted"
msgstr "루트 디 리는 거 수 없습니다."
-#: libsvn_fs_base/tree.c:2956 libsvn_fs_fs/tree.c:1970
+#: ../libsvn_fs_base/tree.c:3030 ../libsvn_fs_fs/tree.c:1996
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "서로 다른 파일시스템 간에 복사 수 없습니다 ('%s' 와 \
'%s')"
-#: libsvn_fs_base/tree.c:2965 libsvn_fs_fs/tree.c:1976
+#: ../libsvn_fs_base/tree.c:3039 ../libsvn_fs_fs/tree.c:2002
msgid "Copy from mutable tree not currently supported"
msgstr "뮤터블 트리에서의 복사는 지원하지 않습니다."
-#: libsvn_fs_base/tree.c:3460 libsvn_fs_fs/tree.c:2400
+#: ../libsvn_fs_base/tree.c:3536 ../libsvn_fs_fs/tree.c:2452
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2208,22 +2373,46 @@ msgstr ""
" 기대값 : %s\n"
" 실 값 : %s\n"
-#: libsvn_fs_base/tree.c:3713 libsvn_fs_fs/tree.c:2636
+#: ../libsvn_fs_base/tree.c:3791 ../libsvn_fs_fs/tree.c:2688
msgid "Cannot compare file contents between two different filesystems"
msgstr "서로 다른 두개의 파일 시스템간의 파일 내용은 비교 \
수 없습니다"
-#: libsvn_fs_base/tree.c:3722 libsvn_fs_base/tree.c:3727
-#: libsvn_fs_fs/tree.c:2645 libsvn_fs_fs/tree.c:2650
-#: libsvn_repos/rev_hunt.c:804
+#: ../libsvn_fs_base/tree.c:3800 ../libsvn_fs_base/tree.c:3805
+#: ../libsvn_fs_fs/tree.c:2697 ../libsvn_fs_fs/tree.c:2702
+#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr "'%s'는 파일이 아닙니다."
-#: libsvn_fs_fs/dag.c:383
+#: ../libsvn_fs_base/tree.c:4810 ../libsvn_fs_base/tree.c:4998
+#, c-format
+msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:4834
+#, 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:70
+msgid "Bad ID in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:432 ../libsvn_ra_serf/serf.c:975
msgid "Can't get entries of non-directory"
msgstr "디 리가 아니면 목록을 얻을 수 없습니다."
-#: libsvn_fs_fs/dag.c:930
+#: ../libsvn_fs_fs/dag.c:541
+#, c-format
+msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:552
+#, fuzzy, c-format
+msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)"
+msgstr "되돌릴수 없는 노드(%s) 리비 에 대해 속성리스트를 설 \
수 없습니다." +
+#: ../libsvn_fs_fs/dag.c:1045
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2234,196 +2423,245 @@ msgstr ""
" 기대값 : %s\n"
" 실 값 : %s\n"
-#: libsvn_fs_fs/err.c:52
+#: ../libsvn_fs_fs/dag.c:1142
+msgid "Empty noderev in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1152
+msgid "Kindless noderev in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1159
+#, fuzzy, c-format
+msgid "Unknown kind for noderev in cache: '%c'"
+msgstr "'%s'의 노드 종류를 알 수 없습니다."
+
+#: ../libsvn_fs_fs/dag.c:1166
+msgid "Unterminated ID in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1171
+#, c-format
+msgid "Bogus ID '%s' in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1178
+msgid "No created path"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1204
+#, fuzzy, c-format
+msgid "Unknown node type in cache: '%c'"
+msgstr "'%s'의 노드를 알 수 없습니다."
+
+#: ../libsvn_fs_fs/err.c:52
#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "손상된 금 파일 리비 '%s' (파일시스템 '%s')"
-#: libsvn_fs_fs/fs.c:88
+#: ../libsvn_fs_fs/fs.c:76
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "FSFS 공용 데이터를 얻을 수 없습니다."
-#: libsvn_fs_fs/fs.c:104
+#: ../libsvn_fs_fs/fs.c:92
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "FSFS 쓰기 금을 생성 수 없습니다"
-#: libsvn_fs_fs/fs.c:112
+#: ../libsvn_fs_fs/fs.c:100
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트용 뮤텍스를 생성 수 없습니다"
-#: libsvn_fs_fs/fs.c:118
+#: ../libsvn_fs_fs/fs.c:107
+#, fuzzy, c-format
+msgid "Can't create FSFS txn-current mutex"
+msgstr "FSFS 트랜잭션 리스트용 뮤텍스를 생성 수 없습니다"
+
+#: ../libsvn_fs_fs/fs.c:113
#, c-format
msgid "Can't store FSFS shared data"
msgstr "FSFS 공용 데이터를 장 수 없습니다"
-#: libsvn_fs_fs/fs.c:290
+#: ../libsvn_fs_fs/fs.c:307
msgid "Module for working with a plain file (FSFS) repository."
msgstr "일반 파일 기반 장소를 근하기 위한 모듈"
-#: libsvn_fs_fs/fs.c:324
+#: ../libsvn_fs_fs/fs.c:342
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "fsfs에 대한 지원하지 않는 파일시스템 로더 버 \
(%d)입니다."
-#: libsvn_fs_fs/fs_fs.c:405
+#: ../libsvn_fs_fs/fs_fs.c:412
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트를 얻을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:413
+#: ../libsvn_fs_fs/fs_fs.c:420
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트를 놓을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:439
-#, c-format
+#: ../libsvn_fs_fs/fs_fs.c:473
+#, fuzzy, c-format
+msgid "Can't grab FSFS mutex for '%s'"
+msgstr "FS 뮤텍스를 얻을 수 없습니다."
+
+#: ../libsvn_fs_fs/fs_fs.c:488
+#, fuzzy, c-format
+msgid "Can't ungrab FSFS mutex for '%s'"
+msgstr "파일시스템 뮤텍스를 얻을 수 없습니다."
+
+#: ../libsvn_fs_fs/fs_fs.c:559
+#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "모르는 트랜잭션('%s')의 금을 해 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:443
+#: ../libsvn_fs_fs/fs_fs.c:563
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr " 겨있지 않은 트랜잭션('%s')을 해 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:450
+#: ../libsvn_fs_fs/fs_fs.c:570
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "트랜잭션('%s')용 프로 타입 리비 금파일을 해 \
수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:456
+#: ../libsvn_fs_fs/fs_fs.c:576
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "트랜잭션('%s')용 프로 타입 리비 금파일을 닫을 수 \
없습니다"
-#: libsvn_fs_fs/fs_fs.c:518
+#: ../libsvn_fs_fs/fs_fs.c:638
#, 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 ""
-"이 내용이 현재 이 프로세스에 의해 쓰여지 \
있으므로,트랜잭션('%s')의 프로 "
-"타입 리비 파일에 쓸 수 없습니다"
+msgid "Cannot write to the prototype revision file of transaction '%s' because a \
previous representation is currently being written by this process" +msgstr "이 \
내용이 현재 이 프로세스에 의해 쓰여지 \
있으므로,트랜잭션('%s')의 프로 타입 리비 파일에 쓸 수 \
없습니다"
-#: libsvn_fs_fs/fs_fs.c:554
+#: ../libsvn_fs_fs/fs_fs.c:674
#, 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 ""
-"이 내용이 현재 다른 프로세스에 의해 쓰여지 \
있으므로,트랜잭션('%s')의 프로"
-" 타입 리비 파일에 쓸 수 없습니다"
+msgid "Cannot write to the prototype revision file of transaction '%s' because a \
previous representation is currently being written by another process" +msgstr "이 \
내용이 현재 다른 프로세스에 의해 쓰여지 \
있으므로,트랜잭션('%s')의 프로 타입 리비 파일에 쓸 수 \
없습니다"
-#: libsvn_fs_fs/fs_fs.c:561 libsvn_subr/io.c:1512
+#: ../libsvn_fs_fs/fs_fs.c:681 ../libsvn_subr/io.c:1545
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "파일 '%s'에 대해 배타 금기능을 걸 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:673
+#: ../libsvn_fs_fs/fs_fs.c:793
#, fuzzy, c-format
msgid "Format file '%s' contains an unexpected non-digit"
msgstr "'%s'의 첫번째 줄은 숫자가 아닌 것을 포함하 있습니다."
-#: libsvn_fs_fs/fs_fs.c:721
+#: ../libsvn_fs_fs/fs_fs.c:841
#, fuzzy, c-format
msgid "Can't read first line of format file '%s'"
msgstr "파일 '%s'의 길이 행을 읽을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:765
+#: ../libsvn_fs_fs/fs_fs.c:885
#, fuzzy, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr "'%s'는 파일이 아닙니다. 파일시스템 '%s'"
-#: libsvn_fs_fs/fs_fs.c:826
+#: ../libsvn_fs_fs/fs_fs.c:975
#, fuzzy, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr "예상되는 파일시스템 포맷 '%d', 발견된 포맷 '%d'"
-#: libsvn_fs_fs/fs_fs.c:1134 libsvn_fs_fs/fs_fs.c:1148
+#: ../libsvn_fs_fs/fs_fs.c:1446 ../libsvn_fs_fs/fs_fs.c:1460
msgid "Found malformed header in revision file"
msgstr "리비 파일내에 잘못된 형식의 헤더가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1250 libsvn_fs_fs/fs_fs.c:1264
-#: libsvn_fs_fs/fs_fs.c:1271 libsvn_fs_fs/fs_fs.c:1278
-#: libsvn_fs_fs/fs_fs.c:1286 libsvn_fs_fs/fs_fs.c:1294
+#: ../libsvn_fs_fs/fs_fs.c:1494
+#, fuzzy, c-format
+msgid "Invalid revision number '%ld'"
+msgstr "잘못된 리비 번호가 지 되었습니다."
+
+#: ../libsvn_fs_fs/fs_fs.c:1509 ../libsvn_fs_fs/fs_fs.c:2190
+#: ../libsvn_fs_fs/fs_fs.c:2268 ../libsvn_repos/log.c:1589
+#: ../libsvn_repos/log.c:1593
+#, c-format
+msgid "No such revision %ld"
+msgstr "없는 리비 %ld 입니다."
+
+#: ../libsvn_fs_fs/fs_fs.c:1602 ../libsvn_fs_fs/fs_fs.c:1616
+#: ../libsvn_fs_fs/fs_fs.c:1623 ../libsvn_fs_fs/fs_fs.c:1630
+#: ../libsvn_fs_fs/fs_fs.c:1638 ../libsvn_fs_fs/fs_fs.c:1646
msgid "Malformed text rep offset line in node-rev"
msgstr "node-rev 에 잘못된 텍스트 rep 옵셋 라인"
-#: libsvn_fs_fs/fs_fs.c:1363
+#: ../libsvn_fs_fs/fs_fs.c:1720
+#, fuzzy
+msgid "Missing id field in node-rev"
+msgstr "node-rev 내에 kind 필드가 없습니다."
+
+#: ../libsvn_fs_fs/fs_fs.c:1732
msgid "Missing kind field in node-rev"
msgstr "node-rev 내에 kind 필드가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1394
+#: ../libsvn_fs_fs/fs_fs.c:1763
msgid "Missing cpath in node-rev"
msgstr "node-rev 내에 cpath가 없습니다"
-#: libsvn_fs_fs/fs_fs.c:1421 libsvn_fs_fs/fs_fs.c:1427
+#: ../libsvn_fs_fs/fs_fs.c:1790 ../libsvn_fs_fs/fs_fs.c:1796
msgid "Malformed copyroot line in node-rev"
msgstr "node-rev 내에 copyroot 형식이 잘못되었습니다."
-#: libsvn_fs_fs/fs_fs.c:1445 libsvn_fs_fs/fs_fs.c:1451
+#: ../libsvn_fs_fs/fs_fs.c:1814 ../libsvn_fs_fs/fs_fs.c:1820
msgid "Malformed copyfrom line in node-rev"
msgstr "node-rev 내에 copyfrom 행에 오류가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1560 libsvn_fs_fs/fs_fs.c:3998
+#: ../libsvn_fs_fs/fs_fs.c:1962 ../libsvn_fs_fs/fs_fs.c:4641
msgid "Attempted to write to non-transaction"
msgstr "트랜잭션이 아닌 것에 쓰기 시도를 하였습니다."
-#: libsvn_fs_fs/fs_fs.c:1644
+#: ../libsvn_fs_fs/fs_fs.c:2049
msgid "Malformed representation header"
msgstr "보여질 내용의 헤더 형식이 잘못되었습니다."
-#: libsvn_fs_fs/fs_fs.c:1668
+#: ../libsvn_fs_fs/fs_fs.c:2074
msgid "Missing node-id in node-rev"
msgstr "node-rev 내에 node-id가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1674
+#: ../libsvn_fs_fs/fs_fs.c:2080
msgid "Corrupt node-id in node-rev"
msgstr "node-rev 내에 손상된 node-id가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1719
+#: ../libsvn_fs_fs/fs_fs.c:2125
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "리비 파일 내에 마지막 개행문자가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1731
+#: ../libsvn_fs_fs/fs_fs.c:2137
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "리비 파일 마지막 행의 길이가 64 문자를 넘습니다."
-#: libsvn_fs_fs/fs_fs.c:1746
+#: ../libsvn_fs_fs/fs_fs.c:2152
msgid "Final line in revision file missing space"
msgstr "리비 파일의 마지막 행에 스페이스가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1775 libsvn_fs_fs/fs_fs.c:1846 libsvn_repos/log.c:629
-#: libsvn_repos/log.c:633
-#, c-format
-msgid "No such revision %ld"
-msgstr "없는 리비 %ld 입니다."
-
-#: libsvn_fs_fs/fs_fs.c:1916
+#: ../libsvn_fs_fs/fs_fs.c:2341
msgid "Malformed svndiff data in representation"
msgstr "보여질 내용에 잘못된 svndiff 데이터가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:2059 libsvn_fs_fs/fs_fs.c:2072
+#: ../libsvn_fs_fs/fs_fs.c:2526 ../libsvn_fs_fs/fs_fs.c:2539
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "표시 내용의 끝부분을 넘어 읽은 svndiff 창을 읽 \
있습니다."
-#: libsvn_fs_fs/fs_fs.c:2208
+#: ../libsvn_fs_fs/fs_fs.c:2679
msgid "svndiff data requested non-existent source"
msgstr "존재하지않는 소스에 대하여 svndiff 데이터를 \
요청하였습니다."
-#: libsvn_fs_fs/fs_fs.c:2214
+#: ../libsvn_fs_fs/fs_fs.c:2685
msgid "svndiff requested position beyond end of stream"
msgstr "스트림의 마지막을 지난 위치에 대한 svndiff 요청을 \
받았습니다."
-#: libsvn_fs_fs/fs_fs.c:2237 libsvn_fs_fs/fs_fs.c:2254
+#: ../libsvn_fs_fs/fs_fs.c:2708 ../libsvn_fs_fs/fs_fs.c:2725
msgid "svndiff window length is corrupt"
msgstr "svndiff 창 길이가 손상되었습니다."
-#: libsvn_fs_fs/fs_fs.c:2302
+#: ../libsvn_fs_fs/fs_fs.c:2776
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2434,239 +2672,301 @@ msgstr ""
" 기대값: %s\n"
" 실 값: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2525 libsvn_fs_fs/fs_fs.c:2538
-#: libsvn_fs_fs/fs_fs.c:2544 libsvn_fs_fs/fs_fs.c:5121
-#: libsvn_fs_fs/fs_fs.c:5130 libsvn_fs_fs/fs_fs.c:5136
+#: ../libsvn_fs_fs/fs_fs.c:3080 ../libsvn_fs_fs/fs_fs.c:3093
+#: ../libsvn_fs_fs/fs_fs.c:3099 ../libsvn_fs_fs/fs_fs.c:5754
+#: ../libsvn_fs_fs/fs_fs.c:5763 ../libsvn_fs_fs/fs_fs.c:5769
msgid "Directory entry corrupt"
msgstr "디 리 등록 보가 손상되었습니다."
-#: libsvn_fs_fs/fs_fs.c:2883 libsvn_fs_fs/fs_fs.c:2891
-#: libsvn_fs_fs/fs_fs.c:2923 libsvn_fs_fs/fs_fs.c:2943
-#: libsvn_fs_fs/fs_fs.c:2977 libsvn_fs_fs/fs_fs.c:2982
+#: ../libsvn_fs_fs/fs_fs.c:3464 ../libsvn_fs_fs/fs_fs.c:3472
+#: ../libsvn_fs_fs/fs_fs.c:3504 ../libsvn_fs_fs/fs_fs.c:3524
+#: ../libsvn_fs_fs/fs_fs.c:3558 ../libsvn_fs_fs/fs_fs.c:3563
msgid "Invalid changes line in rev-file"
msgstr "rev-file 안에 변경된 줄 수 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2916
+#: ../libsvn_fs_fs/fs_fs.c:3497
msgid "Invalid change kind in rev file"
msgstr "rev-file 안에 종류값이 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2936
+#: ../libsvn_fs_fs/fs_fs.c:3517
msgid "Invalid text-mod flag in rev-file"
msgstr "rev-file 안에 text-mod 플래그 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2956
+#: ../libsvn_fs_fs/fs_fs.c:3537
msgid "Invalid prop-mod flag in rev-file"
msgstr "rev-file 안에 prop-mod 값 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:3140
+#: ../libsvn_fs_fs/fs_fs.c:3723
msgid "Copying from transactions not allowed"
msgstr "트랜잭션으로부터의 복사는 허용되지 않습니다."
-#: libsvn_fs_fs/fs_fs.c:3196
+#: ../libsvn_fs_fs/fs_fs.c:3894
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "'%s'에 트랜잭션 디 리를 만들 수 없습니다. 리비 \
%ld."
-#: libsvn_fs_fs/fs_fs.c:3430 libsvn_fs_fs/fs_fs.c:3437
+#: ../libsvn_fs_fs/fs_fs.c:4110 ../libsvn_fs_fs/fs_fs.c:4117
msgid "next-id file corrupt"
msgstr "next-id 파일 손상됨"
-#: libsvn_fs_fs/fs_fs.c:3524
+#: ../libsvn_fs_fs/fs_fs.c:4227
msgid "Transaction cleanup failed"
msgstr "트랜잭션이 'cleanup' 오류"
-#: libsvn_fs_fs/fs_fs.c:3692
+#: ../libsvn_fs_fs/fs_fs.c:4335
msgid "Invalid change type"
msgstr "변경 형식이 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:4017
+#: ../libsvn_fs_fs/fs_fs.c:4660
msgid "Can't set text contents of a directory"
msgstr "디 리의 텍스트 내용을 설 수 없음"
-#: libsvn_fs_fs/fs_fs.c:4101 libsvn_fs_fs/fs_fs.c:4106
-#: libsvn_fs_fs/fs_fs.c:4113
+#: ../libsvn_fs_fs/fs_fs.c:4744 ../libsvn_fs_fs/fs_fs.c:4749
+#: ../libsvn_fs_fs/fs_fs.c:4756
msgid "Corrupt current file"
msgstr "현재파일 손상됨"
-#: libsvn_fs_fs/fs_fs.c:4400 libsvn_subr/io.c:2787 svn/util.c:252
-#: svn/util.c:267 svn/util.c:291
+#: ../libsvn_fs_fs/fs_fs.c:5061 ../libsvn_subr/io.c:2834 ../svn/util.c:379
+#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
msgstr "'%s' 의 stat을 볼 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:4404
+#: ../libsvn_fs_fs/fs_fs.c:5065
#, c-format
msgid "Can't chmod '%s'"
msgstr "chmod '%s' 수 없음"
-#: libsvn_fs_fs/fs_fs.c:4553
-#, c-format
-msgid "Can't grab FSFS repository mutex"
-msgstr "FSFS 장소 뮤텍스를 얻을 수 없습니다."
-
-#: libsvn_fs_fs/fs_fs.c:4567
-#, c-format
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "FSFS 장소 뮤텍스를 반환 수 없습니다."
-
-#: libsvn_fs_fs/fs_fs.c:4687
+#: ../libsvn_fs_fs/fs_fs.c:5299
msgid "Transaction out of date"
msgstr "트랜잭션이 오래된 것임"
-#: libsvn_fs_fs/fs_fs.c:5062
+#: ../libsvn_fs_fs/fs_fs.c:5695
#, fuzzy
msgid "Recovery encountered a non-directory node"
msgstr "디 리가 아닌 노드에 설 하 하였습니다."
-#: libsvn_fs_fs/fs_fs.c:5084
+#: ../libsvn_fs_fs/fs_fs.c:5717
msgid "Recovery encountered a deltified directory representation"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:5347
+#: ../libsvn_fs_fs/fs_fs.c:5862
+#, fuzzy, c-format
+msgid "Expected current rev to be <= %ld but found %ld"
+msgstr "URL('%s')은 파일입니다. 디 리를 지 하세요."
+
+#: ../libsvn_fs_fs/fs_fs.c:5915
+#, c-format
+msgid "Revision %ld has a revs file but no revprops file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:5920
+#, c-format
+msgid "Revision %ld has a non-file where its revprops file should be"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6099
+#, 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:6210
msgid "No such transaction"
msgstr "그런 트랜잭션이 없습니다."
-#: libsvn_fs_fs/lock.c:231
+#: ../libsvn_fs_fs/lock.c:206
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr " 금/엔트리의 해시 파일 '%s'을 쓸 수 없습니다."
-#: libsvn_fs_fs/lock.c:287
+#: ../libsvn_fs_fs/lock.c:262
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr " 금/엔트리의 해시 파일 '%s'을 분석 수 없습니다."
-#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
+#: ../libsvn_fs_fs/lock.c:691 ../libsvn_fs_fs/lock.c:712
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "경로 '%s'는 HEAD 리비 에 존재하지 않습니다."
-#: libsvn_fs_fs/lock.c:742
+#: ../libsvn_fs_fs/lock.c:717
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr " 금 실패: 새로운 버 의 '%s'가 존재합니다"
-#: libsvn_fs_util/fs-util.c:96
-msgid "Filesystem object has not been opened yet"
-msgstr "파일시스템 개체가 아직 열리지 않았습니다."
-
-#: libsvn_fs_util/fs-util.c:106
-#, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "파일은 변경 수 없습니다: 파일시스템 '%s', 리비 %ld, \
경로 '%s'"
-
-#: libsvn_fs_util/fs-util.c:117
+#: ../libsvn_fs_fs/tree.c:3433
#, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "'%s'는 디 리가 아닙니다. 파일시스템 '%s'"
+msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
+msgstr ""
-#: libsvn_fs_util/fs-util.c:128
+#: ../libsvn_fs_fs/tree.c:3556
#, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "'%s'는 파일이 아닙니다. 파일시스템 '%s'"
+msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
+msgstr ""
-#: libsvn_fs_util/fs-util.c:139
+#: ../libsvn_fs_fs/tree.c:3679
#, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "'%s'에 금이 없습니다. 파일시스템 '%s'"
+msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; \
filesystem '%s' uses only version %d" +msgstr ""
-#: libsvn_fs_util/fs-util.c:150
-#, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr " 금이 만료되었습니다: 금 큰 '%s'. 파일시스템 '%s'"
+#: ../libsvn_fs_util/fs-util.c:98
+msgid "Filesystem object has not been opened yet"
+msgstr "파일시스템 개체가 아직 열리지 않았습니다."
-#: libsvn_fs_util/fs-util.c:161
-#, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "사용자가 파일시스템에 당되어 있지 않습니다. '%s'"
+#: ../libsvn_fs_util/fs-util.c:101
+msgid "Filesystem object already open"
+msgstr "파일 시스템 객체는 이미 열 있습니다."
-#: libsvn_fs_util/fs-util.c:174
+#: ../libsvn_ra/compat.c:176
#, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr ""
-"사용자 '%s' 는 사용자 '%s'의 소 로된 금을 사용하 합니다. \
파일시스템 '%s'" +msgid "Missing changed-path information for '%s' in revision \
%ld" +msgstr "'%s'의 변경된 경로 보가 누락됨, 리비 %ld."
-#: libsvn_fs_util/fs-util.c:186
+#: ../libsvn_ra/compat.c:303 ../libsvn_ra/compat.c:550
#, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "경로 '%s'는 사용자 '%s'가 이미 궜습니다. 파일시스템 \
'%s'"
-
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:102
-msgid "Merge Tracking schema format not set"
-msgstr ""
+msgid "Path '%s' doesn't exist in revision %ld"
+msgstr "경로 '%s'는 리비 %ld 에 존재하지 않습니다"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:107
+#: ../libsvn_ra/compat.c:380
#, c-format
-msgid "Merge Tracking schema format %d not recognized"
-msgstr ""
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr "'%s' (리비 %ld)는 연관이 없는 개체입니다."
-#: libsvn_ra/ra_loader.c:213
+#: ../libsvn_ra/ra_loader.c:232
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr ""
-"RA 플러그인 버 이 다릅니다. '%s': 발견된 것 %d.%d.%d%s, 예상한 \
것 %d.%d.%d%s" +msgstr "RA 플러그인 버 이 다릅니다. '%s': 발견된 것 \
%d.%d.%d%s, 예상한 것 %d.%d.%d%s" +
+#: ../libsvn_ra/ra_loader.c:477 ../libsvn_ra_serf/serf.c:506
+#: ../libsvn_ra_serf/serf.c:624
+#, fuzzy, c-format
+msgid "Illegal repository URL '%s'"
+msgstr "잘못된 svn 장소 URL '%s'"
+
+#: ../libsvn_ra/ra_loader.c:522
+#, fuzzy, c-format
+msgid "Invalid config: unknown HTTP library '%s'"
+msgstr "잘못된 설 : 알 수 없는 http 인증 형식('%s')입니다"
-#: libsvn_ra/ra_loader.c:397
+#: ../libsvn_ra/ra_loader.c:586
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "알 수 없는 URL 스키마입니다. '%s'"
-#: libsvn_ra/ra_loader.c:448
+#: ../libsvn_ra/ra_loader.c:608
+#, fuzzy, c-format
+msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
+msgstr "대상 장소의 UUID (%s)가 기대하는 UUID (%s)와 일치하지 \
않습니다." +
+#: ../libsvn_ra/ra_loader.c:664
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s'는 '%s'와 동일한 장소에 있지 않습니다"
-#: libsvn_ra/ra_loader.c:945
+#: ../libsvn_ra/ra_loader.c:1446
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - '%s' 스키마를 처리합니다.\n"
-#: libsvn_ra/ra_loader.c:1031
+#: ../libsvn_ra/ra_loader.c:1532
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "알 수 없는 URL 스키마입니다. '%s'"
-#: libsvn_ra_dav/commit.c:222
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
+#: ../libsvn_ra/util.c:60
+#, c-format
+msgid "Retrieval of mergeinfo unsupported by '%s'"
msgstr ""
-"리소스의 URL을 얻을 수 없습니다. (이 값은 임포트에 \
사용되었 ,작업사본에 없"
-"을 경우 캐시된 속성에서 얻습니다.)"
-#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
-#: libsvn_ra_serf/commit.c:435
+#. ----------------------------------------------------------------
+#. ** The RA vtable routines **
+#: ../libsvn_ra_local/ra_plugin.c:395
+msgid "Module for accessing a repository on local disk."
+msgstr "로컬 디스크에 있는 장소를 근하기 위한 모듈"
+
+#: ../libsvn_ra_local/ra_plugin.c:457
+msgid "Unable to open an ra_local session to URL"
+msgstr "URL에 대해 ra_local 세션을 열수 없습니다."
+
+#: ../libsvn_ra_local/ra_plugin.c:492
+#, 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:1398 ../libsvn_ra_neon/session.c:925
+#: ../libsvn_ra_serf/serf.c:299 ../libsvn_ra_svn/client.c:2277
#, c-format
-msgid "Your file or directory '%s' is probably out-of-date"
+msgid "Don't know anything about capability '%s'"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:1476
+#, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr "ra_local에 대한 지원하지 않는 RA 로더 버 (%d)입니다."
+
+#: ../libsvn_ra_local/split_url.c:44
+#, c-format
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr "로컬 URL '%s' 은/는 'file://' 로 시작하지 않습니다."
+
+#: ../libsvn_ra_local/split_url.c:63
+#, c-format
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr "로컬 URL '%s' 은/는 호스트 이름만 있으며 경로가 \
없습니다." +
+#: ../libsvn_ra_local/split_url.c:126
+#, c-format
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr "로컬 URL '%s' 에 지원하지 않는 호스트이름이 있습니다."
+
+#: ../libsvn_ra_local/split_url.c:136 ../libsvn_ra_local/split_url.c:143
+#, c-format
+msgid "Unable to open repository '%s'"
+msgstr " 장소 '%s' 을/를 열 수 없습니다."
+
+#: ../libsvn_ra_neon/commit.c:244
+msgid "Could not fetch the Version Resource URL (needed during an import or when it \
is missing from the local, cached props)" +msgstr "리소스의 URL을 얻을 수 \
없습니다. (이 값은 임포트에 사용되었 ,작업사본에 없을 경우 \
캐시된 속성에서 얻습니다.)" +
+#: ../libsvn_ra_neon/commit.c:497
+#, fuzzy, c-format
+msgid "File or directory '%s' is out of date; try updating"
msgstr "파일 또는 디 리 '%s'는 만료된 것입니다."
-#: libsvn_ra_dav/commit.c:467
+#: ../libsvn_ra_neon/commit.c:505
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "CHECKOUT 응답에 'Location:' 헤더가 없습니다."
-#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1432
+#: ../libsvn_ra_neon/commit.c:515 ../libsvn_ra_neon/props.c:210
+#: ../libsvn_ra_neon/util.c:520 ../libsvn_ra_serf/commit.c:1368
+#: ../libsvn_ra_serf/commit.c:1769 ../libsvn_ra_serf/update.c:2162
+#, fuzzy, c-format
+msgid "Unable to parse URL '%s'"
+msgstr "Neon이 이해 수 없는 URL 입니다: '%s'"
+
+#: ../libsvn_ra_neon/commit.c:1045 ../libsvn_ra_serf/commit.c:1619
#, c-format
msgid "File '%s' already exists"
msgstr "파일 '%s'은(는) 이미 존재합니다."
-#: libsvn_ra_dav/commit.c:1112
+#: ../libsvn_ra_neon/commit.c:1170
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "svndiff 를 임시 파일에 기록 수 없습니다."
-#: libsvn_ra_dav/fetch.c:274
+#: ../libsvn_ra_neon/fetch.c:257
msgid "Could not save the URL of the version resource"
msgstr "버 관리대상인 URL을 장 수 없습니다."
-#: libsvn_ra_dav/fetch.c:467
+#: ../libsvn_ra_neon/fetch.c:450
msgid "Could not get content-type from response"
msgstr "컨텐트 형식을 응답으로부터 얻을 수 없습니다"
-#: libsvn_ra_dav/fetch.c:560
+#: ../libsvn_ra_neon/fetch.c:543
msgid "Could not save file"
msgstr "파일을 장 수 없습니다."
-#: libsvn_ra_dav/fetch.c:781 libsvn_ra_svn/client.c:921
+#: ../libsvn_ra_neon/fetch.c:764 ../libsvn_ra_svn/client.c:978
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2677,789 +2977,930 @@ msgstr ""
" 기대값 : %s\n"
" 실 값 : %s\n"
-#: libsvn_ra_dav/fetch.c:1027
+#: ../libsvn_ra_neon/fetch.c:1010
msgid "Server response missing the expected deadprop-count property"
msgstr "서버가 기대되는 deaddrop-count 속성을 뜨리 \
응답하였습니다"
-#: libsvn_ra_dav/fetch.c:1221
-msgid "Server does not support date-based operations"
-msgstr "서버가 짜 기반 명 을 지원하지 않습니다."
+#: ../libsvn_ra_neon/fetch.c:1177 ../libsvn_ra_serf/commit.c:2145
+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 \
훅이 실패하였거나 존재하지 않을 수 있습니다."
-#: libsvn_ra_dav/fetch.c:1228
-msgid "Invalid server response to dated-rev request"
-msgstr "dated-rev 요청에 대한 서버의 응답이 올바르지 않습니다."
+#: ../libsvn_ra_neon/fetch.c:1422
+#, fuzzy, c-format
+msgid "Missing rev attr in target-revision element"
+msgstr "대상 리비 요소에서 revision 속성이 졌습니다"
-#: libsvn_ra_dav/fetch.c:1293
-msgid "Expected a valid revnum and path"
-msgstr " 상 인 리비 번호와 경로가 아닙니다"
+#: ../libsvn_ra_neon/fetch.c:1433 ../libsvn_ra_serf/update.c:1465
+#, fuzzy, c-format
+msgid "Missing name attr in absent-directory element"
+msgstr "open-directory 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:1375
-msgid "'get-locations' REPORT not implemented"
-msgstr "get-locations REPORT 는 구현되지 않았습니다."
+#: ../libsvn_ra_neon/fetch.c:1449 ../libsvn_ra_serf/update.c:1488
+#, fuzzy, c-format
+msgid "Missing name attr in absent-file element"
+msgstr "open-file 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:1551
-msgid "Incomplete lock data returned"
-msgstr "불완 한 금 데이터를 돌 받았습니다."
+#: ../libsvn_ra_neon/fetch.c:1464
+#, fuzzy, c-format
+msgid "Missing path attr in resource element"
+msgstr "%s 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:1617
+#: ../libsvn_ra_neon/fetch.c:1473
+#, fuzzy, c-format
+msgid "Missing rev attr in open-directory element"
+msgstr "open-directory 요소에서 revision 속성이 졌습니다"
+
+#: ../libsvn_ra_neon/fetch.c:1504 ../libsvn_ra_serf/replay.c:258
+#: ../libsvn_ra_serf/update.c:1294
#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "인식 수 없는 인코딩: '%s'"
+msgid "Missing name attr in open-directory element"
+msgstr "open-directory 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:1708 libsvn_ra_dav/fetch.c:1712
-#: libsvn_ra_serf/locks.c:527
-msgid "Server does not support locking features"
-msgstr "서버가 금 기능을 지원하지 않습니다."
+#: ../libsvn_ra_neon/fetch.c:1531 ../libsvn_ra_serf/replay.c:284
+#: ../libsvn_ra_serf/update.c:1329
+#, c-format
+msgid "Missing name attr in add-directory element"
+msgstr "add-directory 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:1787
-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 훅이 실패하였거나 존재하지 않을 \
수 있습니"
-"다."
+#: ../libsvn_ra_neon/fetch.c:1544
+#, fuzzy, c-format
+msgid "Missing copyfrom-rev attr in add-directory element"
+msgstr "add-directory 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/fetch.c:1621
+#, fuzzy, c-format
+msgid "Missing rev attr in open-file element"
+msgstr "open-file 요소에서 revision 속성이 졌습니다"
+
+#: ../libsvn_ra_neon/fetch.c:1628 ../libsvn_ra_serf/replay.c:319
+#: ../libsvn_ra_serf/update.c:1369
+#, c-format
+msgid "Missing name attr in open-file element"
+msgstr "open-file 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_dav/fetch.c:2520
+#: ../libsvn_ra_neon/fetch.c:1654 ../libsvn_ra_serf/replay.c:345
+#: ../libsvn_ra_serf/update.c:1404
+#, c-format
+msgid "Missing name attr in add-file element"
+msgstr "add-file 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/fetch.c:1667
+#, fuzzy, c-format
+msgid "Missing copyfrom-rev attr in add-file element"
+msgstr "add-file 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/fetch.c:1722
+#, fuzzy, c-format
+msgid "Missing name attr in set-prop element"
+msgstr "%s 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/fetch.c:1736
+#, fuzzy, c-format
+msgid "Missing name attr in remove-prop element"
+msgstr "open-file 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/fetch.c:1810 ../libsvn_ra_serf/replay.c:232
+#: ../libsvn_ra_serf/update.c:1434
+#, c-format
+msgid "Missing name attr in delete-entry element"
+msgstr "delete-entry 요소에서 name 속성이 졌습니다"
+
+#: ../libsvn_ra_neon/fetch.c:1972
#, c-format
msgid "Error writing to '%s': unexpected EOF"
msgstr "'%s'에 쓰기 오류: 예상치 못한 EOF"
-#: libsvn_ra_dav/fetch.c:2667
+#: ../libsvn_ra_neon/fetch.c:2119
#, c-format
msgid "Unknown XML encoding: '%s'"
msgstr "알 수 없는 XML 인코딩: '%s'"
-#: libsvn_ra_dav/fetch.c:2952
+#: ../libsvn_ra_neon/fetch.c:2417
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "REPORT 응답 처리가 편집기 구동을 완료하는데 \
실패하였습니다."
-#: libsvn_ra_dav/file_revs.c:275
+#: ../libsvn_ra_neon/file_revs.c:285
msgid "Failed to write full amount to stream"
msgstr "기록 내용을 모두 기록하는데 실패하였습니다"
-#: libsvn_ra_dav/file_revs.c:353
+#: ../libsvn_ra_neon/file_revs.c:371
msgid "'get-file-revs' REPORT not implemented"
msgstr "get-file-revs REPORT는 아직 구현되지 않았습니다."
-#: libsvn_ra_dav/file_revs.c:360
+#: ../libsvn_ra_neon/file_revs.c:378
msgid "The file-revs report didn't contain any revisions"
msgstr "file-revs 는 리비 보를 가지 있지 않습니다."
-#: libsvn_ra_dav/lock.c:189
+#: ../libsvn_ra_neon/get_dated_rev.c:147
+msgid "Server does not support date-based operations"
+msgstr "서버가 짜 기반 명 을 지원하지 않습니다."
+
+#: ../libsvn_ra_neon/get_dated_rev.c:154
+msgid "Invalid server response to dated-rev request"
+msgstr "dated-rev 요청에 대한 서버의 응답이 올바르지 않습니다."
+
+#: ../libsvn_ra_neon/get_location_segments.c:118
+#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1603
+#, fuzzy
+msgid "Expected valid revision range"
+msgstr " 상 인 리비 번호와 경로가 아닙니다"
+
+#: ../libsvn_ra_neon/get_location_segments.c:207
+#, fuzzy
+msgid "'get-location-segments' REPORT not implemented"
+msgstr "get-locations REPORT 는 구현되지 않았습니다."
+
+#: ../libsvn_ra_neon/get_locations.c:108
+msgid "Expected a valid revnum and path"
+msgstr " 상 인 리비 번호와 경로가 아닙니다"
+
+#: ../libsvn_ra_neon/get_locations.c:190
+msgid "'get-locations' REPORT not implemented"
+msgstr "get-locations REPORT 는 구현되지 않았습니다."
+
+#: ../libsvn_ra_neon/get_locks.c:231
+msgid "Incomplete lock data returned"
+msgstr "불완 한 금 데이터를 돌 받았습니다."
+
+#: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:354
+#: ../libsvn_ra_serf/update.c:1919
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr "인식 수 없는 인코딩: '%s'"
+
+#: ../libsvn_ra_neon/get_locks.c:388 ../libsvn_ra_neon/get_locks.c:392
+#: ../libsvn_ra_serf/locks.c:554
+msgid "Server does not support locking features"
+msgstr "서버가 금 기능을 지원하지 않습니다."
+
+#: ../libsvn_ra_neon/lock.c:189
msgid "Invalid creation date header value in response."
msgstr "응답 해더의 잘못된 생성 짜 값."
-#: libsvn_ra_dav/lock.c:213
+#: ../libsvn_ra_neon/lock.c:213
msgid "Invalid timeout value"
msgstr "잘못된 타임아웃 값"
-#: libsvn_ra_dav/lock.c:377
-msgid "Failed to parse URI"
+#: ../libsvn_ra_neon/lock.c:253 ../libsvn_ra_neon/lock.c:385
+#, fuzzy, c-format
+msgid "Failed to parse URI '%s'"
msgstr "URI를 분석하는데 실패하였습니다."
-#: libsvn_ra_dav/lock.c:392 libsvn_ra_serf/locks.c:683
+#: ../libsvn_ra_neon/lock.c:400 ../libsvn_ra_serf/locks.c:732
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "'%s'는 장소안에서 겨있지 않습니다."
-#: libsvn_ra_dav/lock.c:519
+#: ../libsvn_ra_neon/lock.c:528
msgid "Failed to fetch lock information"
msgstr " 금 보 얻기 오류"
-#: libsvn_ra_dav/merge.c:218
+#: ../libsvn_ra_neon/log.c:167 ../libsvn_ra_serf/log.c:200
+#, fuzzy, c-format
+msgid "Missing name attr in revprop element"
+msgstr "%s 요소에서 name 속성이 졌습니다."
+
+#: ../libsvn_ra_neon/log.c:444 ../libsvn_ra_serf/log.c:547
+#: ../libsvn_ra_svn/client.c:1319
+#, fuzzy
+msgid "Server does not support custom revprops via log"
+msgstr "서버가 replay 명 을 지원하지 않습니다."
+
+#: ../libsvn_ra_neon/merge.c:218
#, c-format
-msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr ""
-"프로 콜 오류: 서버에게 자동 병합을 하지 말도록 \
지시하였으나 서버에서 '%s'의 "
-"병합이 이루어졌다는 응답을 받았습니다."
+msgid "Protocol error: we told the server not to auto-merge any resources, but it \
said that '%s' was merged" +msgstr "프로 콜 오류: 서버에게 자동 \
병합을 하지 말도록 지시하였으나 서버에서 '%s'의 병합이 \
이루어졌다는 응답을 받았습니다."
-#: libsvn_ra_dav/merge.c:227
+#: ../libsvn_ra_neon/merge.c:227
#, 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)가 "
-"있습니다."
+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_dav/merge.c:242
+#: ../libsvn_ra_neon/merge.c:242
#, 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 응답이 요청한 모 속성 \
보를 포함하 있"
-"지 않습니다. (그리 , 커밋을 완료해야 필요가 있습니다.)"
+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_dav/merge.c:261
+#: ../libsvn_ra_neon/merge.c:261 ../libsvn_ra_serf/merge.c:302
#, c-format
msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
msgstr "'%s'에 대한 MERGE 응답은 대상 ('%s')에 대한 하위가 \
아닙니다."
-#: libsvn_ra_dav/merge.c:514
+#: ../libsvn_ra_neon/merge.c:515
msgid "The MERGE property response had an error status"
msgstr "MERGE 속성 응답이 오류 상태를 포함하 있습니다."
-#: libsvn_ra_dav/options.c:144
-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:144
+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_dav/props.c:592
+#: ../libsvn_ra_neon/props.c:598
#, c-format
msgid "Failed to find label '%s' for URL '%s'"
msgstr "라벨 '%s' (URL '%s')을 찾을 수 없습니다."
-#: libsvn_ra_dav/props.c:621
+#: ../libsvn_ra_neon/props.c:627
#, c-format
msgid "'%s' was not present on the resource"
msgstr "'%s'는 리소스내에 존재 하지 않습니다."
-#: libsvn_ra_dav/props.c:664
+#: ../libsvn_ra_neon/props.c:694
#, c-format
msgid "Neon was unable to parse URL '%s'"
msgstr "Neon이 이해 수 없는 URL 입니다: '%s'"
-#: libsvn_ra_dav/props.c:699
+#: ../libsvn_ra_neon/props.c:727
msgid "The path was not part of a repository"
msgstr "경로는 장소의 일부가 아닙니다."
-#: libsvn_ra_dav/props.c:706
+#: ../libsvn_ra_neon/props.c:736
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
msgstr "'%s'의 경로가 장소의 HEAD 에서 발견되지 않았습니다."
-#: libsvn_ra_dav/props.c:758 libsvn_ra_dav/props.c:813
+#: ../libsvn_ra_neon/props.c:792 ../libsvn_ra_neon/props.c:848
msgid "The VCC property was not found on the resource"
msgstr "VCC 속성이 리소스내에서 발견되지 않았습니다."
-#: libsvn_ra_dav/props.c:826
+#: ../libsvn_ra_neon/props.c:861
msgid "The relative-path property was not found on the resource"
msgstr "relative-path 속성이 리소스에서 발견되지 않았습니다."
-#: libsvn_ra_dav/props.c:947
+#: ../libsvn_ra_neon/props.c:982
msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr ""
-"'DAV:baseline-collection' 은 꺼내온(baseline) 리소스에 존재하지 \
않습니다." +msgstr "'DAV:baseline-collection' 은 꺼내온(baseline) \
리소스에 존재하지 않습니다."
-#: libsvn_ra_dav/props.c:966
-msgid "'DAV:version-name' was not present on the baseline resource"
-msgstr "'DAV:version-name' 은 꺼내온(baseline) 리소스에 존재하지 \
않습니다." +#: ../libsvn_ra_neon/props.c:1001
+#, fuzzy, c-format
+msgid "'%s' was not present on the baseline resource"
+msgstr "'%s'는 리소스내에 존재 하지 않습니다."
-#: libsvn_ra_dav/props.c:1117 libsvn_ra_serf/commit.c:723
+#: ../libsvn_ra_neon/props.c:1153 ../libsvn_ra_serf/commit.c:846
msgid "At least one property change failed; repository is unchanged"
-msgstr ""
-" 어도 하나의 속성이 변경에 실패하였습니다.: 장소는 \
변경되지 않습니다." +msgstr " 어도 하나의 속성이 변경에 \
실패하였습니다.: 장소는 변경되지 않습니다."
-#: libsvn_ra_dav/replay.c:272
+#: ../libsvn_ra_neon/replay.c:272
msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr ""
-" 행하는 add-file 혹은 open-file 없이 apply-textdelta 요소를 \
만났습니다" +msgstr " 행하는 add-file 혹은 open-file 없이 \
apply-textdelta 요소를 만났습니다"
-#: libsvn_ra_dav/replay.c:296
+#: ../libsvn_ra_neon/replay.c:296
msgid "Got close-file element without preceding add-file or open-file"
msgstr " 행하는 add-file 혹은 open-file 없이 close-file 요소를 \
만났습니다"
-#: libsvn_ra_dav/replay.c:313
+#: ../libsvn_ra_neon/replay.c:313
msgid "Got close-directory element without ever opening a directory"
msgstr "디 리를 연 이 없는데도 불구하 close-directory \
요소를 만났습니다"
-#: libsvn_ra_dav/replay.c:432 libsvn_ra_serf/replay.c:498
+#: ../libsvn_ra_neon/replay.c:432 ../libsvn_ra_serf/replay.c:537
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "쓰기 오류: 예상치 못한 EOF"
-#: libsvn_ra_dav/replay.c:439
+#: ../libsvn_ra_neon/replay.c:439
#, c-format
msgid "Got cdata content for a prop delete"
msgstr "prop delete에 대해 cdata 내용을 만났습니다"
-#: libsvn_ra_dav/session.c:454
+#: ../libsvn_ra_neon/session.c:332
+#, c-format
+msgid "PIN for token \"%s\" in slot \"%s\""
+msgstr ""
+
+#: ../libsvn_ra_neon/session.c:533 ../libsvn_ra_serf/serf.c:430
msgid "Invalid URL: illegal character in proxy port number"
msgstr "잘못된 URL: 잘못된 문자가 프록시 포트 번호에 있습니다."
-#: libsvn_ra_dav/session.c:458
+#: ../libsvn_ra_neon/session.c:537 ../libsvn_ra_serf/serf.c:434
msgid "Invalid URL: negative proxy port number"
msgstr "잘못된 URL: 포트 번호가 음수입니다."
-#: libsvn_ra_dav/session.c:461
-msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr ""
-"잘못된 URL: 프록시 포트 번호가 TCP 포트번호의 최대값인 65536를 \
넘어섭니다." +#: ../libsvn_ra_neon/session.c:540 ../libsvn_ra_serf/serf.c:437
+msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr "잘못된 URL: 프록시 포트 번호가 TCP 포트번호의 최대값인 \
65536를 넘어섭니다."
-#: libsvn_ra_dav/session.c:475
+#: ../libsvn_ra_neon/session.c:554
msgid "Invalid config: illegal character in timeout value"
msgstr "잘못된 설 : 타임아웃 값에 잘못된 문자가 있습니다."
-#: libsvn_ra_dav/session.c:479
+#: ../libsvn_ra_neon/session.c:558
msgid "Invalid config: negative timeout value"
msgstr "잘못된 설 : 타임아웃 값이 음수입니다."
-#: libsvn_ra_dav/session.c:492
+#: ../libsvn_ra_neon/session.c:571
msgid "Invalid config: illegal character in debug mask value"
msgstr "잘못된 설 : 디버그 마스크 값에 잘못된 문자가 \
있습니다."
-#: libsvn_ra_dav/session.c:517
+#: ../libsvn_ra_neon/session.c:596
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr "잘못된 설 : 알 수 없는 http 인증 형식('%s')입니다"
-#: libsvn_ra_dav/session.c:578
-msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
+#: ../libsvn_ra_neon/session.c:657
+#, fuzzy
+msgid "Module for accessing a repository via WebDAV protocol using Neon."
msgstr "WebDAV (DeltaV) 프로 콜을 통해 장소에 근하는 모듈"
-#: libsvn_ra_dav/session.c:629
-msgid "Malformed URL for repository"
-msgstr " 장소에 대한 잘못된 URL"
+#: ../libsvn_ra_neon/session.c:812
+#, c-format
+msgid "OPTIONS request (for capabilities) got HTTP response code %d"
+msgstr ""
+
+#: ../libsvn_ra_neon/session.c:908 ../libsvn_ra_serf/serf.c:282
+#, c-format
+msgid "Don't know how to handle '%s' for capability '%s'"
+msgstr ""
+
+#: ../libsvn_ra_neon/session.c:932 ../libsvn_ra_serf/serf.c:306
+#, c-format
+msgid "Attempt to fetch capability '%s' resulted in '%s'"
+msgstr ""
-#: libsvn_ra_dav/session.c:668
+#: ../libsvn_ra_neon/session.c:955
+#, c-format
+msgid "Malformed URL '%s': scheme or host or path is missing"
+msgstr ""
+
+#: ../libsvn_ra_neon/session.c:1006
msgid "Network socket initialization failed"
msgstr "네트워크 소켓 초기화 실패"
-#: libsvn_ra_dav/session.c:687
+#: ../libsvn_ra_neon/session.c:1025
msgid "SSL is not supported"
msgstr "SSL은 지원되지 않습니다."
-#: libsvn_ra_dav/session.c:825
+#: ../libsvn_ra_neon/session.c:1192 ../libsvn_ra_serf/util.c:211
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "잘못된 설 : 인증서 파일 '%s' 를 읽을 수 없습니다."
-#: libsvn_ra_dav/session.c:934
+#: ../libsvn_ra_neon/session.c:1220
+#, fuzzy, c-format
+msgid "Invalid config: unable to load PKCS#11 provider '%s'"
+msgstr "잘못된 설 : 인증서 파일 '%s' 를 읽을 수 없습니다."
+
+#: ../libsvn_ra_neon/session.c:1341 ../libsvn_ra_serf/serf.c:1118
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "UUID 속성이 대상이나 대상의 어떤 상위에서도 발견되지 \
않았습니다"
-#: libsvn_ra_dav/session.c:942
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "서버를 0.19 버 이상으로 업그 이드 하세요."
-
-#: libsvn_ra_dav/session.c:1009
-#, c-format
-msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "ra_dav의 지원하지 않는 RA 로더 버 (%d)입니다."
+#: ../libsvn_ra_neon/session.c:1416
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_neon"
+msgstr "ra_svn에 대한 지원하지 않는 RA 로더 버 (%d)입니다."
-#: libsvn_ra_dav/util.c:166
+#: ../libsvn_ra_neon/util.c:203
msgid "The request response contained at least one error"
msgstr "요청이 어도 하나의 에러를 포함하여 응답합니다"
-#: libsvn_ra_dav/util.c:186
+#: ../libsvn_ra_neon/util.c:238
msgid "The response contains a non-conforming HTTP status line"
msgstr "응답이 부 합한 HTTP 상태 라인을 포함합니다"
-#: libsvn_ra_dav/util.c:451
+#: ../libsvn_ra_neon/util.c:248
+#, fuzzy, c-format
+msgid "Error setting property '%s': "
+msgstr "'%s'에 대한 %s 속성을 분석하던 중 오류 발생: '%s'"
+
+#: ../libsvn_ra_neon/util.c:534
#, c-format
msgid "%s of '%s'"
msgstr "%s of '%s'"
-#: libsvn_ra_dav/util.c:463
+#: ../libsvn_ra_neon/util.c:546 ../libsvn_ra_serf/util.c:1486
#, c-format
msgid "'%s' path not found"
msgstr "'%s': 경로가 존재하지 않습니다."
-#: libsvn_ra_dav/util.c:472
+#: ../libsvn_ra_neon/util.c:555 ../libsvn_ra_serf/util.c:1480
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
-msgstr ""
-" 장소가 영구히 '%s'로 옮겨졌습니다. svn switch --relocate를 \
사용하여 바꾸십"
-"시오"
+msgstr " 장소가 영구히 '%s'로 옮겨졌습니다. svn switch --relocate를 \
사용하여 바꾸십시오"
-#: libsvn_ra_dav/util.c:474
+#: ../libsvn_ra_neon/util.c:557 ../libsvn_ra_serf/util.c:1482
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
-msgstr ""
-" 장소가 시 '%s'로 옮겨졌습니다. svn switch --relocate를 \
사용하여 바꾸십시"
-"오"
+msgstr " 장소가 시 '%s'로 옮겨졌습니다. svn switch --relocate를 \
사용하여 바꾸십시오"
-#: libsvn_ra_dav/util.c:482
+#: ../libsvn_ra_neon/util.c:565
#, c-format
-msgid ""
-"Server sent unexpected return value (%d %s) in response to %s request for '%"
-"s'"
-msgstr ""
-"서버가 예기치 않은 리턴 값 (%d %s) 을 %s 을/를 '%s'에 요청한 \
것에 대한 응답으"
-"로 보냈습니다"
+msgid "Server sent unexpected return value (%d %s) in response to %s request for \
'%s'" +msgstr "서버가 예기치 않은 리턴 값 (%d %s) 을 %s 을/를 '%s'에 \
요청한 것에 대한 응답으로 보냈습니다"
-#: libsvn_ra_dav/util.c:488
+#: ../libsvn_ra_neon/util.c:577
+#, fuzzy, c-format
+msgid "authorization failed: %s"
+msgstr "인증에 실패하였습니다."
+
+#: ../libsvn_ra_neon/util.c:579
msgid "authorization failed"
msgstr "인증에 실패하였습니다."
-#: libsvn_ra_dav/util.c:492
+#: ../libsvn_ra_neon/util.c:584
msgid "could not connect to server"
msgstr "서버에 속 수 없습니다."
-#: libsvn_ra_dav/util.c:496
+#: ../libsvn_ra_neon/util.c:588
msgid "timed out waiting for server"
msgstr "서버의 응답시간이 초과하였습니다."
-#: libsvn_ra_dav/util.c:829
+#: ../libsvn_ra_neon/util.c:921
#, c-format
msgid "Can't calculate the request body size"
msgstr "요청 내용의 크기를 계산 수 없습니다."
-#: libsvn_ra_dav/util.c:1156
+#: ../libsvn_ra_neon/util.c:1245
#, c-format
msgid "Error reading spooled %s request response"
msgstr "스풀링된 %s 요청에 대한 응답을 읽는데 오류가 \
발생하였습니다."
-#: libsvn_ra_dav/util.c:1166
+#: ../libsvn_ra_neon/util.c:1255
#, c-format
msgid "The %s request returned invalid XML in the response: %s (%s)"
msgstr "%s 요청의 응답으로 잘못된 XML을 반환하였습니다. : %s (%s)"
-#: libsvn_ra_dav/util.c:1198
-#, c-format
-msgid "%s request failed on '%s'"
-msgstr "%s 요청이 '%s'에 대해 실패하였습니다."
-
-#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:250
-msgid "Module for accessing a repository on local disk."
-msgstr "로컬 디스크에 있는 장소를 근하기 위한 모듈"
+#: ../libsvn_ra_serf/auth.c:287 ../libsvn_ra_serf/auth.c:293
+#, fuzzy
+msgid "Missing 'realm' attribute in Authorization header"
+msgstr "'%s'에 'timestamp' 속성이 졌습니다"
-#: libsvn_ra_local/ra_plugin.c:290
-msgid "Unable to open an ra_local session to URL"
-msgstr "URL에 대해 ra_local 세션을 열수 없습니다."
+#: ../libsvn_ra_serf/commit.c:408 ../libsvn_ra_serf/commit.c:431
+#, fuzzy, c-format
+msgid "Directory '%s' is out of date; try updating"
+msgstr "디 리 '%s'가 없습니다."
-#: libsvn_ra_local/ra_plugin.c:1443
+#: ../libsvn_ra_serf/commit.c:509 ../libsvn_repos/commit.c:388
#, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "ra_local에 대한 지원하지 않는 RA 로더 버 (%d)입니다."
+msgid "Path '%s' not present"
+msgstr "경로 '%s'는 존재하지 않습니다."
-#: libsvn_ra_local/split_url.c:44
+#: ../libsvn_ra_serf/commit.c:594 ../libsvn_ra_serf/commit.c:608
#, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "로컬 URL '%s' 은/는 'file://' 로 시작하지 않습니다."
+msgid "File '%s' is out of date; try updating"
+msgstr ""
-#: libsvn_ra_local/split_url.c:55
+#: ../libsvn_ra_serf/commit.c:1051
#, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "로컬 URL '%s' 은/는 호스트 이름만 있으며 경로가 \
없습니다." +msgid "Failed writing updated file"
+msgstr "수 된 파일을 쓰는데 실패하였습니다"
-#: libsvn_ra_local/split_url.c:117
-#, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "로컬 URL '%s' 에 지원하지 않는 호스트이름이 있습니다."
+#: ../libsvn_ra_serf/commit.c:1103
+#, fuzzy
+msgid "The OPTIONS response did not include the requested activity-collection-set \
value" +msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 \
포함하 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 \
경우 발생합니다."
-#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#: ../libsvn_ra_serf/commit.c:1131
#, c-format
-msgid "Unable to open repository '%s'"
-msgstr " 장소 '%s' 을/를 열 수 없습니다."
+msgid "%s of '%s': %d %s (%s://%s)"
+msgstr ""
-#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_ra_serf/commit.c:489 libsvn_repos/commit.c:383
-#, c-format
-msgid "Path '%s' not present"
-msgstr "경로 '%s'는 존재하지 않습니다."
+#: ../libsvn_ra_serf/commit.c:1159 ../libsvn_ra_serf/property.c:893
+#: ../libsvn_ra_serf/update.c:1134 ../libsvn_ra_serf/update.c:1679
+#, fuzzy
+msgid "The OPTIONS response did not include the requested checked-in value"
+msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 \
포함하 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 \
경우 발생합니다."
-#: libsvn_ra_serf/commit.c:920
-#, c-format
-msgid "Failed writing updated file"
-msgstr "수 된 파일을 쓰는데 실패하였습니다"
+#: ../libsvn_ra_serf/commit.c:1388 ../libsvn_ra_serf/commit.c:1789
+#: ../libsvn_ra_serf/property.c:907
+#, fuzzy
+msgid "The OPTIONS response did not include the requested baseline-collection value"
+msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 \
포함하 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 \
경우 발생합니다."
-#: libsvn_ra_serf/commit.c:1245
+#: ../libsvn_ra_serf/commit.c:1414
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "디 리 추가 실패: %s 를 %s 에 (%d)"
-#: libsvn_ra_serf/getlocations.c:289
-msgid "File doesn't exist on HEAD"
-msgstr "파일이 HEAD 리비 에 존재하지 않습니다"
+#: ../libsvn_ra_serf/getlocationsegments.c:230
+#, c-format
+msgid "Location segment report failed on '%s'@'%ld'"
+msgstr ""
-#: libsvn_ra_serf/locks.c:406
+#: ../libsvn_ra_serf/locks.c:378 ../libsvn_ra_serf/locks.c:417
#, c-format
msgid "Lock request failed: %d %s"
msgstr " 금 요청 실패: %d %s"
-#: libsvn_ra_serf/locks.c:609
-msgid "Lock request failed"
-msgstr " 금 요청 실패"
+#: ../libsvn_ra_serf/locks.c:548
+msgid "Malformed URL for repository"
+msgstr " 장소에 대한 잘못된 URL"
-#: libsvn_ra_serf/locks.c:718
+#: ../libsvn_ra_serf/locks.c:772
#, c-format
msgid "Unlock request failed: %d %s"
msgstr " 금해 요청 실패: %d %s"
-#: libsvn_ra_serf/replay.c:161
+#: ../libsvn_ra_serf/property.c:921
+#, fuzzy
+msgid "The OPTIONS response did not include the requested version-name value"
+msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 \
포함하 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 \
경우 발생합니다." +
+#: ../libsvn_ra_serf/replay.c:195 ../libsvn_ra_serf/update.c:1231
msgid "Missing revision attr in target-revision element"
msgstr "대상 리비 요소에서 revision 속성이 졌습니다"
-#: libsvn_ra_serf/replay.c:179
+#: ../libsvn_ra_serf/replay.c:213
msgid "Missing revision attr in open-root element"
msgstr "open-root 요소에서 revision 속성이 졌습니다"
-#: libsvn_ra_serf/replay.c:198
-msgid "Missing name attr in delete-entry element"
-msgstr "delete-entry 요소에서 name 속성이 졌습니다"
-
-#: libsvn_ra_serf/replay.c:204
+#: ../libsvn_ra_serf/replay.c:238
msgid "Missing revision attr in delete-entry element"
msgstr "delete-entry 요소에서 attr 리비 이 졌습니다"
-#: libsvn_ra_serf/replay.c:224
-msgid "Missing name attr in open-directory element"
-msgstr "open-directory 요소에서 name 속성이 졌습니다."
-
-#: libsvn_ra_serf/replay.c:230
+#: ../libsvn_ra_serf/replay.c:264 ../libsvn_ra_serf/update.c:1249
+#: ../libsvn_ra_serf/update.c:1285
msgid "Missing revision attr in open-directory element"
msgstr "open-directory 요소에서 revision 속성이 졌습니다"
-#: libsvn_ra_serf/replay.c:250
-msgid "Missing name attr in add-directory element"
-msgstr "add-directory 요소에서 name 속성이 졌습니다."
-
-#: libsvn_ra_serf/replay.c:285
-msgid "Missing name attr in open-file element"
-msgstr "open-file 요소에서 name 속성이 졌습니다."
-
-#: libsvn_ra_serf/replay.c:291
+#: ../libsvn_ra_serf/replay.c:325 ../libsvn_ra_serf/update.c:1378
msgid "Missing revision attr in open-file element"
msgstr "open-file 요소에서 revision 속성이 졌습니다"
-#: libsvn_ra_serf/replay.c:311
-msgid "Missing name attr in add-file element"
-msgstr "add-file 요소에서 name 속성이 졌습니다."
-
-#: libsvn_ra_serf/replay.c:378
+#: ../libsvn_ra_serf/replay.c:412 ../libsvn_ra_serf/update.c:1524
+#: ../libsvn_ra_serf/update.c:1601
#, c-format
msgid "Missing name attr in %s element"
msgstr "%s 요소에서 name 속성이 졌습니다."
-#: libsvn_ra_serf/serf.c:52
-msgid "Access repository via WebDAV protocol through serf."
-msgstr " 장소를 serf를 통해 WebDAV 프로 콜로 근합니다."
+#: ../libsvn_ra_serf/replay.c:803
+#, fuzzy, c-format
+msgid "Error retrieving replay REPORT (%d)"
+msgstr "REPORT (%d) 검색 실패"
-#: libsvn_ra_serf/serf.c:161
-#, c-format
-msgid "Could not lookup hostname: %s://%s"
+#: ../libsvn_ra_serf/serf.c:322
+#, fuzzy
+msgid "Module for accessing a repository via WebDAV protocol using serf."
+msgstr "WebDAV (DeltaV) 프로 콜을 통해 장소에 근하는 모듈"
+
+#: ../libsvn_ra_serf/serf.c:550
+#, fuzzy, c-format
+msgid "Could not lookup hostname `%s'"
msgstr "호스트명을 찾을 수 없습니다: %s://%s"
-#: libsvn_ra_serf/serf.c:737
+#: ../libsvn_ra_serf/serf.c:805
+#, fuzzy
+msgid "The OPTIONS response did not include the requested resourcetype value"
+msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 \
포함하 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 \
경우 발생합니다." +
+#: ../libsvn_ra_serf/serf.c:969
+msgid "The PROPFIND response did not include the requested resourcetype value"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:1186
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "ra_serf에 대한 지원하지 않는 RA 로더 버 (%d)입니다."
-#: libsvn_ra_serf/update.c:2146
+#: ../libsvn_ra_serf/update.c:823
+#, fuzzy, c-format
+msgid "GET request failed: %d %s"
+msgstr " 금 요청 실패: %d %s"
+
+#: ../libsvn_ra_serf/update.c:2221 ../libsvn_ra_serf/util.c:1416
+#, fuzzy
+msgid "The OPTIONS response did not include the requested \
version-controlled-configuration value" +msgstr "OPTIONS 응답이 요청한 \
activity-collection-set 에 대한 것을 포함하 있지 않습니다. 대개 \
URL이 WebDAV 가 활성화되지 않은 경우 발생합니다." +
+#: ../libsvn_ra_serf/update.c:2304
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "REPORT (%d) 검색 실패"
-#: libsvn_ra_serf/util.c:874
-msgid "Unspecified error message"
-msgstr "지 되지 않은 에러 메시지"
-
-#: libsvn_ra_serf/util.c:935
+#: ../libsvn_ra_serf/util.c:1184
msgid "Premature EOF seen from server"
msgstr "서버로부터 EOF 를 너무 빨리 받았습니다."
-#: libsvn_ra_svn/client.c:124
+#: ../libsvn_ra_serf/util.c:1235
+msgid "Unspecified error message"
+msgstr "지 되지 않은 에러 메시지"
+
+#: ../libsvn_ra_svn/client.c:133
#, c-format
msgid "Unknown hostname '%s'"
msgstr "알 수 없는 호스트: '%s'"
-#: libsvn_ra_svn/client.c:136
-#, c-format
-msgid "Can't create socket"
-msgstr "소켓을 열 수 없습니다."
-
-#: libsvn_ra_svn/client.c:140
+#: ../libsvn_ra_svn/client.c:158
#, c-format
msgid "Can't connect to host '%s'"
msgstr "호스트 '%s'에 속 수 없습니다."
-#: libsvn_ra_svn/client.c:163
+#: ../libsvn_ra_svn/client.c:181
msgid "Prop diffs element not a list"
msgstr "Prop diff 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:201
+#: ../libsvn_ra_svn/client.c:219
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "서버로부터 확인 불가능한 노드 종류 '%s'"
-#: libsvn_ra_svn/client.c:357
+#: ../libsvn_ra_svn/client.c:386
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr " 의되지 않은 터널 스킴 '%s'"
-#: libsvn_ra_svn/client.c:374
+#: ../libsvn_ra_svn/client.c:403
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "터널 스킴 %s 는 %s라는 환경 변수의 의를 필요로 \
합니다."
-#: libsvn_ra_svn/client.c:385
+#: ../libsvn_ra_svn/client.c:414
#, c-format
msgid "Can't tokenize command '%s'"
msgstr " 큰 분리 수 없는 명 '%s'"
-#: libsvn_ra_svn/client.c:416
+#: ../libsvn_ra_svn/client.c:445
#, c-format
msgid "Error in child process: %s"
msgstr "자식 프로세스 오류: %s"
-#: libsvn_ra_svn/client.c:440
+#: ../libsvn_ra_svn/client.c:469
#, c-format
msgid "Can't create tunnel"
msgstr "터널 생성 불가능"
-#: libsvn_ra_svn/client.c:478
+#: ../libsvn_ra_svn/client.c:507
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "잘못된 svn 장소 URL '%s'"
-#: libsvn_ra_svn/client.c:536
+#: ../libsvn_ra_svn/client.c:568
#, c-format
msgid "Server requires minimum version %d"
msgstr "서버는 어도 버 %d 을/를 요구합니다"
-#: libsvn_ra_svn/client.c:585
+#: ../libsvn_ra_svn/client.c:572
+#, fuzzy, c-format
+msgid "Server only supports versions up to %d"
+msgstr "서버가 unlock 명 을 지원하지 않습니다."
+
+#: ../libsvn_ra_svn/client.c:580
+#, fuzzy
+msgid "Server does not support edit pipelining"
+msgstr "서버가 짜 기반 명 을 지원하지 않습니다."
+
+#: ../libsvn_ra_svn/client.c:618
msgid "Impossibly long repository root from server"
msgstr "너무 긴 장소 루트가 지 되었습니다."
-#: libsvn_ra_svn/client.c:596
+#: ../libsvn_ra_svn/client.c:630
+#, fuzzy
+msgid ""
+"Module for accessing a repository using the svn network protocol.\n"
+" - with Cyrus SASL authentication"
+msgstr "svn 네트워크 프로 콜을 사용하여 장소에 근하는 \
모듈" +
+#: ../libsvn_ra_svn/client.c:634
msgid "Module for accessing a repository using the svn network protocol."
msgstr "svn 네트워크 프로 콜을 사용하여 장소에 근하는 \
모듈"
-#: libsvn_ra_svn/client.c:744
+#: ../libsvn_ra_svn/client.c:795
msgid "Server did not send repository root"
msgstr "서버가 장소 루트를 송하지 않았습니다."
-#: libsvn_ra_svn/client.c:817
-msgid ""
-"Server doesn't support setting arbitrary revision properties during commit"
+#: ../libsvn_ra_svn/client.c:868
+msgid "Server doesn't support setting arbitrary revision properties during commit"
msgstr ""
-#: libsvn_ra_svn/client.c:901
+#: ../libsvn_ra_svn/client.c:956
msgid "Non-string as part of file contents"
msgstr "파일 내용이 부분 으로 문자열이 아닙니다."
-#: libsvn_ra_svn/client.c:1000
+#: ../libsvn_ra_svn/client.c:1057
msgid "Dirlist element not a list"
msgstr "Dirlist 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1061
+#: ../libsvn_ra_svn/client.c:1116
#, fuzzy
-msgid "Merge info element is not a list"
+msgid "Mergeinfo element is not a list"
msgstr "Prop diff 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1220
+#: ../libsvn_ra_svn/client.c:1308
msgid "Log entry not a list"
msgstr "로그 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1233
+#: ../libsvn_ra_svn/client.c:1343
msgid "Changed-path entry not a list"
msgstr "바뀐 경로 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1309
+#: ../libsvn_ra_svn/client.c:1468
msgid "'stat' not implemented"
msgstr "'stat'는 구현되지 않았습니다"
-#: libsvn_ra_svn/client.c:1366
+#: ../libsvn_ra_svn/client.c:1525
msgid "'get-locations' not implemented"
msgstr "get-locations는 구현되지 않았습니다"
-#: libsvn_ra_svn/client.c:1378
+#: ../libsvn_ra_svn/client.c:1537
msgid "Location entry not a list"
msgstr "Location 엔트리가 리스트 구조체가 아닙니다"
-#: libsvn_ra_svn/client.c:1428
+#: ../libsvn_ra_svn/client.c:1582
+#, fuzzy
+msgid "'get-location-segments' not implemented"
+msgstr "get-locations는 구현되지 않았습니다"
+
+#: ../libsvn_ra_svn/client.c:1594
+#, fuzzy
+msgid "Location segment entry not a list"
+msgstr "Location 엔트리가 리스트 구조체가 아닙니다"
+
+#: ../libsvn_ra_svn/client.c:1656
msgid "'get-file-revs' not implemented"
msgstr "get-file-revs는 구현되지 않았습니다."
-#: libsvn_ra_svn/client.c:1441
+#: ../libsvn_ra_svn/client.c:1669
msgid "Revision entry not a list"
msgstr "리비 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1454 libsvn_ra_svn/client.c:1479
+#: ../libsvn_ra_svn/client.c:1686 ../libsvn_ra_svn/client.c:1711
msgid "Text delta chunk not a string"
msgstr "문서의 차이 조각(text delta chunk)이 문자열이 아닙니다."
-#: libsvn_ra_svn/client.c:1491
+#: ../libsvn_ra_svn/client.c:1723
msgid "The get-file-revs command didn't return any revisions"
msgstr "get-file-revs 명 이 어 한 리비 도 반환하지 \
않았습니다."
-#: libsvn_ra_svn/client.c:1539
+#: ../libsvn_ra_svn/client.c:1771
msgid "Server doesn't support the lock command"
msgstr "서버가 lock 명 을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1603
+#: ../libsvn_ra_svn/client.c:1835
msgid "Server doesn't support the unlock command"
msgstr "서버가 unlock 명 을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1700
+#: ../libsvn_ra_svn/client.c:1932
msgid "Lock response not a list"
msgstr "lock 명 의 응답이 리스트가 아닙니다"
-#: libsvn_ra_svn/client.c:1714
+#: ../libsvn_ra_svn/client.c:1946
msgid "Unknown status for lock command"
msgstr "lock 명 에 대한 알 수 없는 상태"
-#: libsvn_ra_svn/client.c:1736
+#: ../libsvn_ra_svn/client.c:1968
msgid "Didn't receive end marker for lock responses"
msgstr "lock 명 의 응답에 대한 종료 표시를 수 하지 \
않았습니다."
-#: libsvn_ra_svn/client.c:1823
+#: ../libsvn_ra_svn/client.c:2055
msgid "Unlock response not a list"
msgstr "unlock 명 의 응답이 리스트가 아닙니다"
-#: libsvn_ra_svn/client.c:1837
+#: ../libsvn_ra_svn/client.c:2069
msgid "Unknown status for unlock command"
msgstr "unlock 명 에 대한 알 수 없는 상태"
-#: libsvn_ra_svn/client.c:1858
+#: ../libsvn_ra_svn/client.c:2090
msgid "Didn't receive end marker for unlock responses"
msgstr "unlock 명 의 응답에 대한 종료 표시를 수 하지 \
않았습니다."
-#: libsvn_ra_svn/client.c:1882 libsvn_ra_svn/client.c:1910
+#: ../libsvn_ra_svn/client.c:2114 ../libsvn_ra_svn/client.c:2142
msgid "Server doesn't support the get-lock command"
msgstr "서버가 get-lock 명 을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1923
+#: ../libsvn_ra_svn/client.c:2155
msgid "Lock element not a list"
msgstr "리스트가 아닌 개체를 급니다"
-#: libsvn_ra_svn/client.c:1946
+#: ../libsvn_ra_svn/client.c:2178
msgid "Server doesn't support the replay command"
msgstr "서버가 replay 명 을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:2011
+#: ../libsvn_ra_svn/client.c:2210
+#, fuzzy
+msgid "Server doesn't support the replay-range command"
+msgstr "서버가 replay 명 을 지원하지 않습니다."
+
+#: ../libsvn_ra_svn/client.c:2228
+#, c-format
+msgid "Expected 'revprops', found '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2341
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "ra_svn에 대한 지원하지 않는 RA 로더 버 (%d)입니다."
-#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
-#: libsvn_ra_svn/internal_auth.c:60
+#: ../libsvn_ra_svn/cram.c:194 ../libsvn_ra_svn/cram.c:212
+#: ../libsvn_ra_svn/cyrus_auth.c:442 ../libsvn_ra_svn/cyrus_auth.c:497
+#: ../libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "인증시도중 예상치 못한 서버 응답"
-#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
-#: svnserve/cyrus_auth.c:114
+#: ../libsvn_ra_svn/cyrus_auth.c:171 ../svnserve/cyrus_auth.c:108
+#: ../svnserve/cyrus_auth.c:118
#, c-format
msgid "Could not initialize the SASL library"
msgstr "SASL 라이브러리를 초기화 수 없습니다"
-#: libsvn_ra_svn/cyrus_auth.c:806 libsvn_ra_svn/internal_auth.c:57
-#: libsvn_ra_svn/internal_auth.c:110
+#: ../libsvn_ra_svn/cyrus_auth.c:820 ../libsvn_ra_svn/internal_auth.c:57
+#: ../libsvn_ra_svn/internal_auth.c:108
#, c-format
msgid "Authentication error from server: %s"
msgstr "서버 인증 오류 : %s"
-#: libsvn_ra_svn/cyrus_auth.c:810
+#: ../libsvn_ra_svn/cyrus_auth.c:824
#, fuzzy
msgid "Can't get username or password"
msgstr "암호를 얻는데 실패하였습니다."
-#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
-msgid "Invalid file or dir token during edit"
-msgstr "편집 명 안에 잘못된 파일, 디 리 큰이 있습니다."
-
-#: libsvn_ra_svn/editor.c:621
-msgid "Non-string as part of text delta"
-msgstr "텍스트 조각의 일부가 문자열이 아닙니다."
-
-#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
-#, c-format
-msgid "Command 'finish-replay' invalid outside of replays"
-msgstr "'finish-replay' 명 은 replay 없이 수행 수 없습니다"
-
-#: libsvn_ra_svn/editorp.c:129
+#: ../libsvn_ra_svn/editorp.c:129
msgid "Successful edit status returned too soon"
msgstr "성공했다는 편집 상태가 너무 빨리 반환 되었습니다."
-#: libsvn_ra_svn/editorp.c:665
+#: ../libsvn_ra_svn/editorp.c:456
+msgid "Invalid file or dir token during edit"
+msgstr "편집 명 안에 잘못된 파일, 디 리 큰이 있습니다."
+
+#: ../libsvn_ra_svn/editorp.c:665
msgid "Apply-textdelta already active"
msgstr "Apply-textdelta 는 이미 활성화 되어있습니다."
-#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
+#: ../libsvn_ra_svn/editorp.c:687 ../libsvn_ra_svn/editorp.c:705
msgid "Apply-textdelta not active"
msgstr "Apply-textdelta 는 활성화 상태가 아닙니다."
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
+#: ../libsvn_ra_svn/editorp.c:800
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
+msgstr "'finish-replay' 명 은 replay 없이 수행 수 없습니다"
+
+#: ../libsvn_ra_svn/editorp.c:891 ../libsvn_ra_svn/marshal.c:932
#, c-format
msgid "Unknown command '%s'"
msgstr "알 수 없는 명 '%s'"
-#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#: ../libsvn_ra_svn/internal_auth.c:95 ../libsvn_subr/prompt.c:159
#, c-format
msgid "Can't get password"
msgstr "암호를 얻는데 실패하였습니다."
-#: libsvn_ra_svn/marshal.c:86
+#: ../libsvn_ra_svn/marshal.c:93
msgid "Capability entry is not a word"
msgstr "Capability 엔트리는 한 단어가 아닙니다."
-#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
-#: libsvn_ra_svn/streams.c:155
-msgid "Connection closed unexpectedly"
-msgstr "예상치 못하게 속이 종료되었습니다."
-
-#: libsvn_ra_svn/marshal.c:536
+#: ../libsvn_ra_svn/marshal.c:548
msgid "String length larger than maximum"
msgstr "문자열 길이가 최대값을 넘었습니다."
-#: libsvn_ra_svn/marshal.c:573
+#: ../libsvn_ra_svn/marshal.c:585
msgid "Too many nested items"
msgstr "경로의 깊이가 너무 깊습니다."
-#: libsvn_ra_svn/marshal.c:592
+#: ../libsvn_ra_svn/marshal.c:604
msgid "Number is larger than maximum"
msgstr "숫자가 최대값을 넘었습니다."
-#: libsvn_ra_svn/marshal.c:796
+#: ../libsvn_ra_svn/marshal.c:818
msgid "Proplist element not a list"
msgstr "Proplist 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/marshal.c:819
+#: ../libsvn_ra_svn/marshal.c:841
msgid "Empty error list"
msgstr "비어 있는 오류 리스트"
-#: libsvn_ra_svn/marshal.c:828
+#: ../libsvn_ra_svn/marshal.c:850
msgid "Malformed error list"
msgstr "잘못된 형식의 오류 리스트"
-#: libsvn_ra_svn/marshal.c:867
+#: ../libsvn_ra_svn/marshal.c:889
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "명 의 응답안에 알 수 없는 상태 값 '%s'"
-#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
+#: ../libsvn_ra_svn/streams.c:77 ../libsvn_ra_svn/streams.c:151
#, c-format
msgid "Can't read from connection"
msgstr "소켓으로부터 읽을 수 없습니다."
-#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
+#: ../libsvn_ra_svn/streams.c:90 ../libsvn_ra_svn/streams.c:164
#, c-format
msgid "Can't write to connection"
msgstr "소켓에 쓸 수 없습니다."
-#: libsvn_ra_svn/streams.c:144
+#: ../libsvn_ra_svn/streams.c:143
#, c-format
msgid "Can't get socket timeout"
msgstr "소켓 시간 한 값을 구 수 없습니다."
-#: libsvn_repos/commit.c:125
-#, c-format
-msgid "Out of date: '%s' in transaction '%s'"
-msgstr "시간이 오래되었습니다.: '%s' (트랜잭션 '%s')"
+#: ../libsvn_repos/commit.c:127
+#, fuzzy, c-format
+msgid "Directory '%s' is out of date"
+msgstr "디 리 '%s'에 URL 보가 없습니다."
+
+#: ../libsvn_repos/commit.c:128
+#, fuzzy, c-format
+msgid "File '%s' is out of date"
+msgstr "아이템이 오래되었습니다"
-#: libsvn_repos/commit.c:291 libsvn_repos/commit.c:436
+#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "소스 경로는 얻었으나 리비 을 얻을 수 없습니다. '%s'"
-#: libsvn_repos/commit.c:323 libsvn_repos/commit.c:467
+#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "원본 URL '%s'은(는) 외부 장소와 연결되어 있습니다."
-#: libsvn_repos/commit.c:592
+#: ../libsvn_repos/commit.c:597
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3472,23 +3913,23 @@ msgstr ""
" 기대값 : %s\n"
" 실 값 : %s\n"
-#: libsvn_repos/delta.c:180
+#: ../libsvn_repos/delta.c:188
msgid "Unable to open root of edit"
msgstr "수 하는 것의 루트를 열 수 없습니다."
-#: libsvn_repos/delta.c:231
+#: ../libsvn_repos/delta.c:239
msgid "Invalid target path"
msgstr "대상 경로가 잘못되었습니다."
-#: libsvn_repos/delta.c:257
-msgid ""
-"Invalid editor anchoring; at least one of the input paths is not a directory "
-"and there was no source entry"
+#: ../libsvn_repos/delta.c:243
+msgid "Delta depth 'exclude' not supported"
msgstr ""
-"잘못된 편집 오류; 어도 하나의 경로가 디 리가 아니거나 \
소스가 존재하지않"
-"습니다."
-#: libsvn_repos/dump.c:415
+#: ../libsvn_repos/delta.c:269
+msgid "Invalid editor anchoring; at least one of the input paths is not a directory \
and there was no source entry" +msgstr "잘못된 편집 오류; 어도 하나의 \
경로가 디 리가 아니거나 소스가 존재하지않습니다." +
+#: ../libsvn_repos/dump.c:419
#, c-format
msgid ""
"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
@@ -3496,138 +3937,163 @@ msgid ""
"WARNING: will fail.\n"
msgstr ""
"경 : 리비 %ld 안에 있는 데이터를 참조하는 중입니다. \
이것은 덤프된 버 \n"
-"경 : (%ld)보다 더 오래된 것입니다. 이 덤프를 비어 있는 \
장소안에 재하는 "
-"것은\n"
+"경 : (%ld)보다 더 오래된 것입니다. 이 덤프를 비어 있는 \
장소안에 재하는 것은\n" "경 : 실패 것입니다.\n"
-#: libsvn_repos/dump.c:932
+#: ../libsvn_repos/dump.c:960 ../libsvn_repos/dump.c:1189
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
msgstr "시작 리비 (%ld)이 끝 리비 (%ld) 보다 더 큰 값입니다."
-#: libsvn_repos/dump.c:937
+#: ../libsvn_repos/dump.c:965 ../libsvn_repos/dump.c:1194
#, c-format
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "끝 리비 %ld 는 잘못되었습니다. (가장 최 리비 은 %ld \
입니다)"
-#: libsvn_repos/dump.c:1044
+#: ../libsvn_repos/dump.c:1072
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* 덤프된 리비 %ld.\n"
-#: libsvn_repos/dump.c:1045
+#: ../libsvn_repos/dump.c:1073 ../libsvn_repos/dump.c:1227
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* 검 된 리비 %ld.\n"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1209
+#: ../libsvn_repos/dump.c:1142
+#, fuzzy, c-format
+msgid "Unexpected node kind %d for '%s'"
+msgstr "기대하지 않은 노드 종류가 발견되었습니다"
+
+#: ../libsvn_repos/fs-wrap.c:59 ../libsvn_repos/load.c:1351
msgid "Commit succeeded, but post-commit hook failed"
msgstr "커밋은 성공하였습니다만 post-commit 훅이 \
실패하였습니다."
-#: libsvn_repos/fs-wrap.c:183
+#: ../libsvn_repos/fs-wrap.c:166
#, c-format
-msgid ""
-"Storage of non-regular property '%s' is disallowed through the repository "
-"interface, and could indicate a bug in your client"
+msgid "Storage of non-regular property '%s' is disallowed through the repository \
interface, and could indicate a bug in your client" +msgstr " 상 인 속성 \
'%s'에 대한 장공간이 장소 인터페이스를 통해 근 수 \
없습니다.이는 클라이언트 버그일 수 있습니다." +
+#: ../libsvn_repos/fs-wrap.c:180
+msgid "Cannot accept log message because it is not encoded in UTF-8"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:190
+msgid "Cannot accept non-LF line endings in log message"
msgstr ""
-" 상 인 속성 '%s'에 대한 장공간이 장소 인터페이스를 \
통해 근 수 없습"
-"니다.이는 클라이언트 버그일 수 있습니다."
-#: libsvn_repos/fs-wrap.c:260
+#: ../libsvn_repos/fs-wrap.c:305
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "쓰기 금지됨: 리비 %ld에 대해서 체를 읽을 수 있는 \
권한이 없습니다."
-#: libsvn_repos/fs-wrap.c:464
+#: ../libsvn_repos/fs-wrap.c:510
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "'%s' 경로의 금을 풀수 없습니다. 인증된 사용자가 \
아닙니다."
-#: libsvn_repos/fs-wrap.c:478
+#: ../libsvn_repos/fs-wrap.c:525
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr " 금 해 는 성공하였습니다만 post-commit 훅이 \
실패하였습니다."
-#: libsvn_repos/hooks.c:87
+#: ../libsvn_repos/hooks.c:80
#, c-format
msgid "'%s' hook succeeded, but error output could not be read"
msgstr "'%s' 훅이 성공했지만, 에러 출 을 읽을 수 없습니다"
-#: libsvn_repos/hooks.c:102
+#: ../libsvn_repos/hooks.c:95
msgid "[Error output could not be translated from the native locale to UTF-8.]"
msgstr "[출 된 에러는 기본 로케일에서 UTF-8으로 변환 수 \
없습니다.]"
-#: libsvn_repos/hooks.c:107
+#: ../libsvn_repos/hooks.c:100
msgid "[Error output could not be read.]"
msgstr "[출 된 에러를 읽을 수 없습니다.]"
-#: libsvn_repos/hooks.c:116
+#: ../libsvn_repos/hooks.c:109
#, c-format
-msgid ""
-"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
-"d). "
+msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was \
%d). " +msgstr "'%s' 훅이 실패했습니다 (분명하게 나가지 \
않았습니다: apr_exit_why_e 는 %d, 종료코드는 %d)." +
+#: ../libsvn_repos/hooks.c:118
+msgid "Commit"
msgstr ""
-"'%s' 훅이 실패했습니다 (분명하게 나가지 않았습니다: \
apr_exit_why_e 는 %"
-"d, 종료코드는 %d)."
-#: libsvn_repos/hooks.c:123
-#, c-format
-msgid "'%s' hook failed (exited with a non-zero exitcode of %d). "
+#: ../libsvn_repos/hooks.c:120
+msgid "Revprop change"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:122
+msgid "Lock"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:124
+msgid "Unlock"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:129
+#, fuzzy, c-format
+msgid "%s hook failed (exit code %d)"
msgstr "'%s' 훅이 실패했습니다 ( 0이 아닌 종료코드 %d 로 \
나갔습니다)."
-#: libsvn_repos/hooks.c:130
-msgid "The following error output was produced by the hook:\n"
-msgstr "다음의 에러 출 은 훅에 의해 일어난 것입니다;\n"
-
-#: libsvn_repos/hooks.c:137
-msgid "No error output was produced by the hook."
-msgstr "훅에 의해 어떤 에러 출 도 일어나지 않았습니다."
+#: ../libsvn_repos/hooks.c:133
+#, c-format
+msgid "%s blocked by %s hook (exit code %d)"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:140
+msgid " with output:\n"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:146
+msgid " with no output."
+msgstr ""
-#: libsvn_repos/hooks.c:170
+#: ../libsvn_repos/hooks.c:176
#, c-format
msgid "Can't create pipe for hook '%s'"
msgstr "훅 '%s'에 대한 파이프를 생성 수 없습니다."
-#: libsvn_repos/hooks.c:182
+#: ../libsvn_repos/hooks.c:188
#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
msgstr "훅 '%s'에 대한 상속되지 않은 읽기 파이프를 생성 수 \
없습니다."
-#: libsvn_repos/hooks.c:188
+#: ../libsvn_repos/hooks.c:194
#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
msgstr "훅 '%s'에 대한 상속되지 않은 쓰기 파이프를 생성 수 \
없습니다."
-#: libsvn_repos/hooks.c:197
+#: ../libsvn_repos/hooks.c:203
#, c-format
msgid "Can't create null stdout for hook '%s'"
msgstr "훅 '%s'에 대해 null stdout을 생성 수 없습니다."
-#: libsvn_repos/hooks.c:209
+#: ../libsvn_repos/hooks.c:215
#, c-format
msgid "Error closing write end of stderr pipe"
msgstr "표준 에러 파이프를 닫는데 실패하였습니다"
-#: libsvn_repos/hooks.c:214
+#: ../libsvn_repos/hooks.c:220
#, c-format
msgid "Failed to start '%s' hook"
msgstr "'%s' 훅을 수행하는데 실패하였습니다."
-#: libsvn_repos/hooks.c:227
+#: ../libsvn_repos/hooks.c:233
#, c-format
msgid "Error closing read end of stderr pipe"
msgstr "표준 에러 파이프를 닫는데 오류가 발생하였습니다."
-#: libsvn_repos/hooks.c:231
+#: ../libsvn_repos/hooks.c:237
#, c-format
msgid "Error closing null file"
msgstr "null 파일 닫기 오류가 발생하였습니다"
-#: libsvn_repos/hooks.c:533
+#: ../libsvn_repos/hooks.c:323
#, c-format
msgid "Failed to run '%s' hook; broken symlink"
msgstr "'%s' 훅을 수행하는데 실패하였습니다; 심볼릭 링크가 \
깨졌습니다."
-#: libsvn_repos/hooks.c:677
+#: ../libsvn_repos/hooks.c:483
msgid ""
"Repository has not been enabled to accept revision propchanges;\n"
"ask the administrator to create a pre-revprop-change hook"
@@ -3635,97 +4101,105 @@ msgstr ""
" 장소가 리비 속성을 바꿀 수 있지 못하도록 설 \
되었습니다.\n" "pre-revprop-change 훅을 생성해달라 관리자에게 \
문의 하십시오"
-#: libsvn_repos/load.c:117
+#: ../libsvn_repos/load.c:122
msgid "Premature end of content data in dumpstream"
msgstr "덤프 스트림에서 데이터가 상 으로 끝나지 \
않았습니다."
-#: libsvn_repos/load.c:124
+#: ../libsvn_repos/load.c:129
msgid "Dumpstream data appears to be malformed"
msgstr "덤프 스트림의 포맷에 오류가 있습니다."
-#: libsvn_repos/load.c:173
+#: ../libsvn_repos/load.c:178
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr ""
-"덤프 스트림이 잘못된 형태의 헤더를 포함하 있습니다 (':' \
없이) '%.20s'에서" +msgstr "덤프 스트림이 잘못된 형태의 헤더를 \
포함하 있습니다 (':' 없이) '%.20s'에서"
-#: libsvn_repos/load.c:186
+#: ../libsvn_repos/load.c:191
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr ""
-"덤프 스트림이 잘못된 형태의 헤더를 포함하 있습니다 \
(값없이) '%.20s'에서" +msgstr "덤프 스트림이 잘못된 형태의 헤더를 \
포함하 있습니다 (값없이) '%.20s'에서"
-#: libsvn_repos/load.c:273
+#: ../libsvn_repos/load.c:363
msgid "Incomplete or unterminated property block"
msgstr "불완 한 혹은 종료되지 않은 속성 블럭"
-#: libsvn_repos/load.c:411
+#: ../libsvn_repos/load.c:501
msgid "Unexpected EOF writing contents"
msgstr "쓰기 스트림의 비 상 종료가 발생하였습니다."
-#: libsvn_repos/load.c:440
+#: ../libsvn_repos/load.c:530
msgid "Malformed dumpfile header"
msgstr "잘못된 덤프 파일 헤더"
-#: libsvn_repos/load.c:446 libsvn_repos/load.c:488
+#: ../libsvn_repos/load.c:536 ../libsvn_repos/load.c:578
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "지원되지 않는 덤프파일 버 : %d"
-#: libsvn_repos/load.c:591
+#: ../libsvn_repos/load.c:681
msgid "Unrecognized record type in stream"
msgstr "알 수 없는 코드 타입이 발견되었습니다."
-#: libsvn_repos/load.c:703
+#: ../libsvn_repos/load.c:793
msgid "Sum of subblock sizes larger than total block content length"
msgstr "하위 블럭의 크기의 합이 체 크기보다 큽니다."
-#: libsvn_repos/load.c:884
+#: ../libsvn_repos/load.c:986
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< 새로운 트랜잭션 시작, 리비 %ld에 기반함.\n"
-#: libsvn_repos/load.c:929
+#: ../libsvn_repos/load.c:1031
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr "상대 소스 리비 %ld 는 현재 장소안에서 효하지 \
않습니다."
-#: libsvn_repos/load.c:978
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
+#: ../libsvn_repos/load.c:1048
+#, fuzzy, c-format
+msgid ""
+"Copy source checksum mismatch on copy from '%s'@%ld\n"
+" to '%s' in rev based on r%ld:\n"
+" expected: %s\n"
+" actual: %s\n"
msgstr ""
-"포맷오류가 있는 덤프 스트림: 0번 리비 이 노드 코드를 \
포함하 있지 않아야"
-"합니다"
+" 이스 체크섬 불일치 오류 '%s':\n"
+" 기대값 : %s\n"
+" 실 값 : %s\n"
+
+#: ../libsvn_repos/load.c:1101
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr "포맷오류가 있는 덤프 스트림: 0번 리비 이 노드 \
코드를 포함하 있지 않아야합니다"
-#: libsvn_repos/load.c:988
+#: ../libsvn_repos/load.c:1111
#, c-format
msgid " * editing path : %s ..."
msgstr " * 경로 편집중 : %s ..."
-#: libsvn_repos/load.c:995
+#: ../libsvn_repos/load.c:1118
#, c-format
msgid " * deleting path : %s ..."
msgstr " * 경로 삭 중 : %s ..."
-#: libsvn_repos/load.c:1003
+#: ../libsvn_repos/load.c:1126
#, c-format
msgid " * adding path : %s ..."
msgstr " * 경로 추가중 : %s ..."
-#: libsvn_repos/load.c:1012
+#: ../libsvn_repos/load.c:1135
#, c-format
msgid " * replacing path : %s ..."
msgstr " * 경로 변경중 : %s ..."
-#: libsvn_repos/load.c:1022
+#: ../libsvn_repos/load.c:1145
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "'%s'의 노드에 대해 알 수 없는 명 입니다."
-#: libsvn_repos/load.c:1156
+#: ../libsvn_repos/load.c:1298
msgid " done.\n"
msgstr " 처리되었습니다.\n"
-#: libsvn_repos/load.c:1233
+#: ../libsvn_repos/load.c:1375
#, c-format
msgid ""
"\n"
@@ -3736,7 +4210,7 @@ msgstr ""
"------- 커밋한 리비 %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1239
+#: ../libsvn_repos/load.c:1381
#, c-format
msgid ""
"\n"
@@ -3747,462 +4221,564 @@ msgstr ""
"------- 커밋한 새 리비 %ld (원본 리비 %ld에서 재됨) >>>\n"
"\n"
-#: libsvn_repos/node_tree.c:238
+#: ../libsvn_repos/node_tree.c:238
#, c-format
msgid "'%s' not found in filesystem"
msgstr "'%s'는 파일 시스템에 없습니다"
-#: libsvn_repos/replay.c:387
+#: ../libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "파일 시스템내의 '%s'는 파일이나 디 리가 아닙니다"
-#: libsvn_repos/reporter.c:228
+#: ../libsvn_repos/reporter.c:172
+#, c-format
+msgid "Invalid length (%%%s) when about to read a string"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:232
#, fuzzy, c-format
-msgid "Invalid depth (%s) for path '%s'"
+msgid "Invalid depth (%c) for path '%s'"
msgstr "원본 경로 '%s' 에 대한 잘못된 복 입니다"
-#: libsvn_repos/reporter.c:659
+#: ../libsvn_repos/reporter.c:779
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "경로 '%s'은(는) 장소에 없습니다."
-#: libsvn_repos/reporter.c:947
+#: ../libsvn_repos/reporter.c:1141
msgid "Not authorized to open root of edit operation"
msgstr "수 명 의 루트를 열 수 있는 권한을 얻지 \
못하였습니다."
-#: libsvn_repos/reporter.c:966
+#: ../libsvn_repos/reporter.c:1160
msgid "Target path does not exist"
msgstr "목 지 경로가 존재하지 않습니다."
-#: libsvn_repos/reporter.c:973
+#: ../libsvn_repos/reporter.c:1167
msgid "Cannot replace a directory from within"
msgstr "디 리를 치환 수 없습니다."
-#: libsvn_repos/reporter.c:1016
+#: ../libsvn_repos/reporter.c:1209
msgid "Invalid report for top level of working copy"
msgstr "최상위 작업사본 경로에 대한 잘못된 명 입니다."
-#: libsvn_repos/reporter.c:1031
+#: ../libsvn_repos/reporter.c:1224
msgid "Two top-level reports with no target"
msgstr "대상이 없는 두 개의 최상의 보 서"
-#: libsvn_repos/reporter.c:1064
+#: ../libsvn_repos/reporter.c:1282
#, fuzzy, c-format
msgid "Unsupported report depth '%s'"
msgstr "경로 '%s'에 지원 수 없는 노드 종류입니다"
-#: libsvn_repos/repos.c:178
+#: ../libsvn_repos/reporter.c:1326
+msgid "Depth 'exclude' not supported for link"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1405
+msgid "Request depth 'exclude' not supported"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:179
#, c-format
msgid "'%s' exists and is non-empty"
msgstr "'%s'은(는) 존재하며, 비어 있지 않습니다."
-#: libsvn_repos/repos.c:224
+#: ../libsvn_repos/repos.c:225
msgid "Creating db logs lock file"
msgstr "DB 로그의 금 파일 생성중"
-#: libsvn_repos/repos.c:242
+#: ../libsvn_repos/repos.c:243
msgid "Creating db lock file"
msgstr "DB 금 파일 생성중"
-#: libsvn_repos/repos.c:252
+#: ../libsvn_repos/repos.c:253
msgid "Creating lock dir"
msgstr " 금 파일용 디 리 생성중"
-#: libsvn_repos/repos.c:283
+#: ../libsvn_repos/repos.c:284
msgid "Creating hook directory"
msgstr "훅 디 리 생성중"
-#: libsvn_repos/repos.c:346
+#: ../libsvn_repos/repos.c:360
msgid "Creating start-commit hook"
msgstr "start-commit 훅 생성중"
-#: libsvn_repos/repos.c:425
+#: ../libsvn_repos/repos.c:439
msgid "Creating pre-commit hook"
msgstr "post-commit 훅 생성중"
-#: libsvn_repos/repos.c:501
+#: ../libsvn_repos/repos.c:515
msgid "Creating pre-revprop-change hook"
msgstr "pre-revprop-change 훅을 생성하는 중"
-#: libsvn_repos/repos.c:720
+#: ../libsvn_repos/repos.c:738
msgid "Creating post-commit hook"
msgstr "post-commit 훅 생성중"
-#: libsvn_repos/repos.c:906
+#: ../libsvn_repos/repos.c:924
msgid "Creating post-revprop-change hook"
msgstr "post-revprop-change 훅을 생성하는 중"
-#: libsvn_repos/repos.c:916
+#: ../libsvn_repos/repos.c:934
msgid "Creating conf directory"
msgstr "conf 디 리 생성중"
-#: libsvn_repos/repos.c:974
+#: ../libsvn_repos/repos.c:989
msgid "Creating svnserve.conf file"
msgstr "svnserve.conf 파일 생성하는 중"
-#: libsvn_repos/repos.c:992
+#: ../libsvn_repos/repos.c:1007
msgid "Creating passwd file"
msgstr "passwd 파일 생성하는 중"
-#: libsvn_repos/repos.c:1034
+#: ../libsvn_repos/repos.c:1049
msgid "Creating authz file"
msgstr "authz 파일 생성하는 중"
-#: libsvn_repos/repos.c:1067
+#: ../libsvn_repos/repos.c:1084
msgid "Could not create top-level directory"
msgstr "최상위 디 리를 생성 수 없습니다."
-#: libsvn_repos/repos.c:1079
+#: ../libsvn_repos/repos.c:1096
msgid "Creating DAV sandbox dir"
msgstr "DAV 샌드박스 디 리 생성하는 중"
-#: libsvn_repos/repos.c:1150
+#: ../libsvn_repos/repos.c:1167
msgid "Error opening db lockfile"
msgstr "DB 금 파일 열기 실패"
-#: libsvn_repos/repos.c:1187
+#: ../libsvn_repos/repos.c:1204
msgid "Repository creation failed"
msgstr " 장소 생성 실패"
-#: libsvn_repos/repos.c:1268
+#: ../libsvn_repos/repos.c:1285
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "예상되는 파일시스템 포맷 '%d' 또는 '%d'; 발견된 포맷 '%d'"
-#: libsvn_repos/rev_hunt.c:64
+#: ../libsvn_repos/repos.c:1508
+#, fuzzy, c-format
+msgid "unknown capability '%s'"
+msgstr "알수 없는 파일시스템 종류 '%s'"
+
+#: ../libsvn_repos/rev_hunt.c:67
#, c-format
msgid "Failed to find time on revision %ld"
msgstr "리비 %ld 에서 time을 발견 수 없습니다"
-#: libsvn_repos/rev_hunt.c:219 libsvn_repos/rev_hunt.c:321
+#: ../libsvn_repos/rev_hunt.c:222 ../libsvn_repos/rev_hunt.c:337
#, c-format
msgid "Invalid start revision %ld"
msgstr "잘못된 시작 리비 %ld"
-#: libsvn_repos/rev_hunt.c:223 libsvn_repos/rev_hunt.c:325
+#: ../libsvn_repos/rev_hunt.c:226 ../libsvn_repos/rev_hunt.c:341
#, c-format
msgid "Invalid end revision %ld"
msgstr "잘못된 끝 리비 %ld"
-#: libsvn_repos/rev_hunt.c:514
+#: ../libsvn_repos/rev_hunt.c:530
msgid "Unreadable path encountered; access denied"
msgstr "읽을 수 없는 경로 발생; 근 거부되었습니다."
-#: libsvn_subr/cmdline.c:493
+#: ../libsvn_repos/rev_hunt.c:1118
+#, fuzzy, c-format
+msgid "'%s' is not a file in revision %ld"
+msgstr "'%s'은(는) 리비 %ld에 없습니다."
+
+#: ../libsvn_subr/cache-inprocess.c:179
+#, fuzzy, c-format
+msgid "Can't lock cache mutex"
+msgstr "FS 뮤텍스 당 불가능"
+
+#: ../libsvn_subr/cache-inprocess.c:197
+#, fuzzy, c-format
+msgid "Can't unlock cache mutex"
+msgstr "FS 뮤텍스 당 불가능"
+
+#: ../libsvn_subr/cache-inprocess.c:449
+#, fuzzy, c-format
+msgid "Can't create cache mutex"
+msgstr "소켓을 열 수 없습니다."
+
+#: ../libsvn_subr/cache-memcache.c:153
+#, c-format
+msgid "Unknown memcached error while reading"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:203
+#, c-format
+msgid "Unknown memcached error while writing"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:218
+#, fuzzy
+msgid "Can't iterate a memcached cache"
+msgstr "분리된 상태를 설 수 없습니다."
+
+#: ../libsvn_subr/cache-memcache.c:281
+#, fuzzy, c-format
+msgid "Error parsing memcache server '%s'"
+msgstr "'%s'의 구문 분석 실패"
+
+#: ../libsvn_subr/cache-memcache.c:289
+#, c-format
+msgid "Scope not allowed in memcache server '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:297
+#, c-format
+msgid "Must specify host and port for memcache server '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:316
+#, c-format
+msgid "Unknown error creating memcache server"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:324
+#, c-format
+msgid "Unknown error adding server to memcache"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:394
+#, c-format
+msgid "Unknown error creating apr_memcache_t"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:564
+#, fuzzy, c-format
+msgid "Invalid config: unknown password store '%s'"
+msgstr "잘못된 설 : 알 수 없는 http 인증 형식('%s')입니다"
+
+#: ../libsvn_subr/cmdline.c:735
#, c-format
msgid "Error initializing command line arguments"
msgstr "명 행 인자 초기화 실패"
-#: libsvn_subr/config.c:633
-#, c-format
-msgid "Config error: invalid boolean value '%s'"
+#: ../libsvn_subr/config.c:647
+#, fuzzy, c-format
+msgid "Config error: invalid boolean value '%s' for '[%s] %s'"
+msgstr "구성 오류: 잘못된 부울리안 값입니다. '%s'"
+
+#: ../libsvn_subr/config.c:654
+#, fuzzy, c-format
+msgid "Config error: invalid boolean value '%s' for '%s'"
msgstr "구성 오류: 잘못된 부울리안 값입니다. '%s'"
-#: libsvn_subr/config.c:883
+#: ../libsvn_subr/config.c:946
#, c-format
msgid "Config error: invalid integer value '%s'"
msgstr "구성 오류: 잘못된 수 값입니다. '%s'"
-#: libsvn_subr/config_auth.c:94
+#: ../libsvn_subr/config_auth.c:94
msgid "Unable to open auth file for reading"
msgstr "인증 파일을 읽는데 실패하였습니다."
-#: libsvn_subr/config_auth.c:99
+#: ../libsvn_subr/config_auth.c:99
#, c-format
msgid "Error parsing '%s'"
msgstr "'%s'의 구문 분석 실패"
-#: libsvn_subr/config_auth.c:123
+#: ../libsvn_subr/config_auth.c:123
msgid "Unable to locate auth file"
msgstr "인증 파일을 지 수 없습니다"
-#: libsvn_subr/config_auth.c:134
+#: ../libsvn_subr/config_auth.c:134
msgid "Unable to open auth file for writing"
msgstr "인증 파일을 기록하는데 실패하였습니다."
-#: libsvn_subr/config_auth.c:137
+#: ../libsvn_subr/config_auth.c:137
#, c-format
msgid "Error writing hash to '%s'"
msgstr "'%s'에 해시 쓰기 오류"
-#: libsvn_subr/date.c:204
+#: ../libsvn_subr/date.c:204
#, c-format
msgid "Can't manipulate current date"
msgstr "현재 짜를 조작 수 없습니다."
-#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
+#: ../libsvn_subr/date.c:278 ../libsvn_subr/date.c:286
#, c-format
msgid "Can't calculate requested date"
msgstr "요청 시간을 계산 수 없습니다."
-#: libsvn_subr/date.c:281
+#: ../libsvn_subr/date.c:281
#, c-format
msgid "Can't expand time"
msgstr "시간을 확장 수 없음"
-#: libsvn_subr/dso.c:71
+#: ../libsvn_subr/dso.c:71
#, c-format
msgid "Can't grab DSO mutex"
msgstr "DSO 뮤텍스를 얻을 수 없습니다."
-#: libsvn_subr/dso.c:85 libsvn_subr/dso.c:107 libsvn_subr/dso.c:122
+#: ../libsvn_subr/dso.c:85 ../libsvn_subr/dso.c:107 ../libsvn_subr/dso.c:122
#, c-format
msgid "Can't ungrab DSO mutex"
msgstr "DSO 뮤텍스를 해 수 없습니다."
-#: libsvn_subr/error.c:347
+#: ../libsvn_subr/error.c:347
msgid "Can't recode error string from APR"
msgstr "APR로부터 문자열을 재조합 수 없습니다."
-#: libsvn_subr/error.c:438
+#: ../libsvn_subr/error.c:445
#, c-format
msgid "%swarning: %s\n"
msgstr "%s경 : %s\n"
-#: libsvn_subr/io.c:123
+#: ../libsvn_subr/error.c:491
+#, c-format
+msgid "In file '%s' line %d: assertion failed (%s)"
+msgstr ""
+
+#: ../libsvn_subr/error.c:495
+#, c-format
+msgid "In file '%s' line %d: internal malfunction"
+msgstr ""
+
+#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
msgstr "경로를 확인 수 없습니다. '%s'"
-#: libsvn_subr/io.c:377
+#: ../libsvn_subr/io.c:404
#, c-format
msgid "Can't open '%s'"
msgstr "열 수 없습니다. '%s'"
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
+#: ../libsvn_subr/io.c:426 ../libsvn_subr/io.c:549
#, c-format
msgid "Unable to make name for '%s'"
msgstr "이름을 만들 수 없습니다. '%s'"
-#: libsvn_subr/io.c:509
+#: ../libsvn_subr/io.c:536
#, fuzzy, c-format
msgid "Can't create symbolic link '%s'"
msgstr "디 리 '%s'을/를 생성 수 없습니다."
-#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
+#: ../libsvn_subr/io.c:553 ../libsvn_subr/io.c:607 ../libsvn_subr/io.c:635
msgid "Symbolic links are not supported on this platform"
msgstr "이 플랫폼에서는 심볼릭 링크가 지원되지 않습니다."
-#: libsvn_subr/io.c:559
+#: ../libsvn_subr/io.c:586
#, c-format
msgid "Can't read contents of link"
msgstr "링크의 내용을 읽을 수 없습니다."
-#: libsvn_subr/io.c:621
+#: ../libsvn_subr/io.c:648
#, c-format
msgid "Can't find a temporary directory"
msgstr "임시 디 리를 찾을 수 없습니다."
-#: libsvn_subr/io.c:715
+#: ../libsvn_subr/io.c:742
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "'%s'을/를 '%s' 로 복사 수 없습니다."
-#: libsvn_subr/io.c:767
+#: ../libsvn_subr/io.c:795
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "'%s'에 권한을 설 수 없습니다."
-#: libsvn_subr/io.c:789
+#: ../libsvn_subr/io.c:817
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "'%s'을/를 '%s'에 추가 수 없습니다."
-#: libsvn_subr/io.c:823
+#: ../libsvn_subr/io.c:851
#, c-format
msgid "Source '%s' is not a directory"
msgstr "원본 '%s'은 디 리가 아닙니다"
-#: libsvn_subr/io.c:829
+#: ../libsvn_subr/io.c:857
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "대상 '%s'은 디 리가 아닙니다"
-#: libsvn_subr/io.c:835
+#: ../libsvn_subr/io.c:863
#, c-format
msgid "Destination '%s' already exists"
msgstr "대상 '%s' 는 이미 존재합니다."
-#: libsvn_subr/io.c:904 libsvn_subr/io.c:1827 libsvn_subr/io.c:1878
-#: libsvn_subr/io.c:1941
+#: ../libsvn_subr/io.c:932 ../libsvn_subr/io.c:1883 ../libsvn_subr/io.c:1934
+#: ../libsvn_subr/io.c:1986
#, c-format
msgid "Can't read directory '%s'"
msgstr "디 리를 읽을 수 없습니다 '%s'"
-#: libsvn_subr/io.c:909 libsvn_subr/io.c:1832 libsvn_subr/io.c:1883
-#: libsvn_subr/io.c:1946 libsvn_subr/io.c:3111
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3156
#, c-format
msgid "Error closing directory '%s'"
msgstr "디 리를 닫을 수 없습니다. '%s'"
-#: libsvn_subr/io.c:935
+#: ../libsvn_subr/io.c:965
#, c-format
msgid "Can't make directory '%s'"
msgstr "디 리 '%s'을/를 생성 수 없습니다."
-#: libsvn_subr/io.c:1022
+#: ../libsvn_subr/io.c:1052
#, c-format
msgid "Can't set access time of '%s'"
msgstr "'%s' 에 근 시각 설 을 수 없습니다."
-#: libsvn_subr/io.c:1162
+#: ../libsvn_subr/io.c:1192
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "파일 권한을 얻을 수 없습니다. '%s' (파일 상태얻기(stat) \
오류)"
-#: libsvn_subr/io.c:1173
+#: ../libsvn_subr/io.c:1203
#, c-format
msgid "Can't open file at '%s'"
msgstr "파일 '%s' 을/를 열 수 없습니다."
-#: libsvn_subr/io.c:1177
+#: ../libsvn_subr/io.c:1207
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "파일 권한을 얻을 수 없습니다. '%s' (파일 상태얻기(stat) \
오류)"
-#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
+#: ../libsvn_subr/io.c:1246 ../libsvn_subr/io.c:1344
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "파일 '%s'에 대해 권한을 변경 수 없습니다"
-#: libsvn_subr/io.c:1351
+#: ../libsvn_subr/io.c:1384
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "파일 '%s'에 읽기 용 속성을 설 수 없습니다."
-#: libsvn_subr/io.c:1383
+#: ../libsvn_subr/io.c:1416
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "파일 '%s'에 읽기/쓰기 속성을 설 수 없습니다."
-#: libsvn_subr/io.c:1427
+#: ../libsvn_subr/io.c:1460
#, c-format
msgid "Error getting UID of process"
msgstr "프로세스의 UID를 얻을 수 없습니다."
-#: libsvn_subr/io.c:1508
+#: ../libsvn_subr/io.c:1541
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "파일 '%s' 에 대한 공 금기능을 걸 수 없습니다."
-#: libsvn_subr/io.c:1543
+#: ../libsvn_subr/io.c:1575
#, c-format
msgid "Can't flush file '%s'"
msgstr "파일을 플러시 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1544
+#: ../libsvn_subr/io.c:1576
#, c-format
msgid "Can't flush stream"
msgstr "스트림을 플러시 수 없습니다."
-#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
+#: ../libsvn_subr/io.c:1588 ../libsvn_subr/io.c:1605
#, c-format
msgid "Can't flush file to disk"
msgstr "디스크에 파일을 플러시 수 없습니다."
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#: ../libsvn_subr/io.c:1627 ../libsvn_subr/prompt.c:100 ../svnserve/main.c:591
#, c-format
msgid "Can't open stdin"
msgstr "표준입 을 열 수 없습니다."
-#: libsvn_subr/io.c:1616
+#: ../libsvn_subr/io.c:1648
#, fuzzy
msgid "Reading from stdin is disallowed"
msgstr "표준 입 으로부터 읽는 것은 현재 지원하지 않습니다."
-#: libsvn_subr/io.c:1630
+#: ../libsvn_subr/io.c:1662
#, c-format
msgid "Can't get file name"
msgstr "파일 이름을 얻을 수 없습니다."
-#: libsvn_subr/io.c:1698
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "파일을 거 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2962 libsvn_subr/io.c:3048
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3007 ../libsvn_subr/io.c:3093
#, c-format
msgid "Can't open directory '%s'"
msgstr "디 리를 열 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1808 libsvn_subr/io.c:1838
+#: ../libsvn_subr/io.c:1864 ../libsvn_subr/io.c:1894
#, c-format
msgid "Can't remove '%s'"
msgstr " 거 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1818
+#: ../libsvn_subr/io.c:1874
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "디 리를 되감을 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2010
+#: ../libsvn_subr/io.c:2055
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "프로세스 속성을 생성 수 없습니다. %s'"
-#: libsvn_subr/io.c:2016
+#: ../libsvn_subr/io.c:2061
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "'%s' cmdtype을 처리 수 없습니다."
-#: libsvn_subr/io.c:2028
+#: ../libsvn_subr/io.c:2073
#, c-format
msgid "Can't set process '%s' directory"
msgstr "프로세스에 디 리를 설 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2041
+#: ../libsvn_subr/io.c:2086
#, c-format
msgid "Can't set process '%s' child input"
msgstr "자식 프로세스의 입 파일 경로를 설 수 없습니다. \
'%s'"
-#: libsvn_subr/io.c:2048
+#: ../libsvn_subr/io.c:2093
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "자식 프로세스의 출 파일 경로를 설 수 없습니다. \
'%s'"
-#: libsvn_subr/io.c:2055
+#: ../libsvn_subr/io.c:2100
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "자식 프로세스의 오류파일 경로를 설 수 없습니다. \
'%s'"
-#: libsvn_subr/io.c:2062
+#: ../libsvn_subr/io.c:2107
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
-msgstr ""
-"오류 처리기를 위한 자식 프로세스의 오류파일 경로를 설 \
수 없습니다. '%s'" +msgstr "오류 처리기를 위한 자식 프로세스의 \
오류파일 경로를 설 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2068
+#: ../libsvn_subr/io.c:2113
#, c-format
msgid "Can't set process '%s' error handler"
msgstr " 프로세스 '%s'의 에러 핸들러를 등록 수 없습니다"
-#: libsvn_subr/io.c:2091
+#: ../libsvn_subr/io.c:2136
#, c-format
msgid "Can't start process '%s'"
msgstr "프로세스 '%s'을/를 시작 수 없습니다."
-#: libsvn_subr/io.c:2115
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "프로세스 '%s'을/를 기다리던 중 에러 발생"
-#: libsvn_subr/io.c:2123
+#: ../libsvn_subr/io.c:2168
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "프로세스 '%s' 실패함 (종료이 %d)"
-#: libsvn_subr/io.c:2130
+#: ../libsvn_subr/io.c:2175
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "프로세스 '%s' 오류 종료 코드 %d 반환함."
-#: libsvn_subr/io.c:2241
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' 가 %d 을/를 반환합니다."
-#: libsvn_subr/io.c:2364
+#: ../libsvn_subr/io.c:2411
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4217,174 +4793,208 @@ msgstr ""
"%s\n"
"%s"
-#: libsvn_subr/io.c:2491
+#: ../libsvn_subr/io.c:2538
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "non-file '%s'의 MIME 타입을 탐지 수 없습니다."
-#: libsvn_subr/io.c:2581
+#: ../libsvn_subr/io.c:2628
#, c-format
msgid "Can't open file '%s'"
msgstr "file '%s' 를 열 수 없습니다."
-#: libsvn_subr/io.c:2617
+#: ../libsvn_subr/io.c:2664
#, c-format
msgid "Can't close file '%s'"
msgstr "파일 '%s'를 닫을 수 없습니다."
-#: libsvn_subr/io.c:2618
+#: ../libsvn_subr/io.c:2665
#, c-format
msgid "Can't close stream"
msgstr "스트림을 닫을 수 없습니다."
-#: libsvn_subr/io.c:2628 libsvn_subr/io.c:2652 libsvn_subr/io.c:2665
+#: ../libsvn_subr/io.c:2675 ../libsvn_subr/io.c:2699 ../libsvn_subr/io.c:2712
#, c-format
msgid "Can't read file '%s'"
msgstr "파일 '%s'를 읽을 수 없습니다."
-#: libsvn_subr/io.c:2629 libsvn_subr/io.c:2653 libsvn_subr/io.c:2666
+#: ../libsvn_subr/io.c:2676 ../libsvn_subr/io.c:2700 ../libsvn_subr/io.c:2713
#, c-format
msgid "Can't read stream"
msgstr "스트림을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2640
+#: ../libsvn_subr/io.c:2687
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "파일 '%s' 로부터 속성 보를 얻을 수 없습니다."
-#: libsvn_subr/io.c:2641
+#: ../libsvn_subr/io.c:2688
#, c-format
msgid "Can't get attribute information from stream"
msgstr "스트림으로부터 속성 보를 얻을 수 없습니다."
-#: libsvn_subr/io.c:2677
+#: ../libsvn_subr/io.c:2724
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "파일 '%s'에 위치 포이터를 설 수 없습니다."
-#: libsvn_subr/io.c:2678
+#: ../libsvn_subr/io.c:2725
#, c-format
msgid "Can't set position pointer in stream"
msgstr "스트림에 위치 포인터를 설 수 없습니다."
-#: libsvn_subr/io.c:2689 libsvn_subr/io.c:2723
+#: ../libsvn_subr/io.c:2736 ../libsvn_subr/io.c:2770
#, c-format
msgid "Can't write to file '%s'"
msgstr "파일 '%s'에 쓸 수 없습니다."
-#: libsvn_subr/io.c:2690 libsvn_subr/io.c:2724
+#: ../libsvn_subr/io.c:2737 ../libsvn_subr/io.c:2771
#, c-format
msgid "Can't write to stream"
msgstr "스트림에 쓸 수 없습니다."
-#: libsvn_subr/io.c:2764
+#: ../libsvn_subr/io.c:2811
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "파일 '%s'의 길이 행을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2768
+#: ../libsvn_subr/io.c:2815
msgid "Can't read length line in stream"
msgstr "스트림에서 길이 행을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2815
+#: ../libsvn_subr/io.c:2862
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "'%s'을/를 '%s' 로 이동 수 없습니다."
-#: libsvn_subr/io.c:2893
+#: ../libsvn_subr/io.c:2941
#, c-format
msgid "Can't create directory '%s'"
msgstr "디 리 '%s'을/를 생성 수 없습니다."
-#: libsvn_subr/io.c:2904 libsvn_wc/copy.c:509
+#: ../libsvn_subr/io.c:2952 ../libsvn_wc/copy.c:543
#, c-format
msgid "Can't hide directory '%s'"
msgstr "디 리 '%s'을/를 숨길 수 없습니다."
-#: libsvn_subr/io.c:2916
-#, c-format
-msgid "Can't stat directory '%s'"
-msgstr "디 리 '%s'의 상태를 알 수 없습니다."
-
-#: libsvn_subr/io.c:2980
+#: ../libsvn_subr/io.c:3025
#, c-format
msgid "Can't remove directory '%s'"
msgstr "디 리 '%s'을/를 거 수 없습니다."
-#: libsvn_subr/io.c:2998
+#: ../libsvn_subr/io.c:3043
#, c-format
msgid "Can't read directory"
msgstr "디 리를 읽을 수 없습니다."
-#: libsvn_subr/io.c:3067
+#: ../libsvn_subr/io.c:3112
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "'%s'에서 디 리 엔트리를 읽을 수 없습니다."
-#: libsvn_subr/io.c:3192
+#: ../libsvn_subr/io.c:3237
#, c-format
msgid "Can't check directory '%s'"
msgstr "디 리 '%s'를 체크 수 없습니다."
-#: libsvn_subr/io.c:3214
+#: ../libsvn_subr/io.c:3259
#, c-format
msgid "Version %d is not non-negative"
msgstr "버 %d은/는 non-negative가 아닙니다."
-#: libsvn_subr/io.c:3264
+#: ../libsvn_subr/io.c:3309
#, c-format
msgid "Reading '%s'"
msgstr "'%s'을/를 읽습니다"
-#: libsvn_subr/io.c:3280
+#: ../libsvn_subr/io.c:3325
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "'%s'의 첫번째 줄은 숫자가 아닌 것을 포함하 있습니다."
-#: libsvn_subr/mergeinfo.c:69
+#: ../libsvn_subr/kitchensink.c:41
#, fuzzy, c-format
msgid "Invalid revision number found parsing '%s'"
msgstr "잘못된 리비 번호가 지 되었습니다."
-#: libsvn_subr/mergeinfo.c:146
+#: ../libsvn_subr/kitchensink.c:53
+#, fuzzy, c-format
+msgid "Negative revision number found parsing '%s'"
+msgstr "잘못된 리비 번호가 지 되었습니다."
+
+#: ../libsvn_subr/mergeinfo.c:85
+msgid "No pathname preceding ':'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:401
+#, c-format
+msgid "Parsing of overlapping revision ranges '%s' and '%s' is not supported"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:417
+#, c-format
+msgid "Unable to parse unordered revision ranges '%s' and '%s'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:456
+#, fuzzy, c-format
+msgid "Mergeinfo for '%s' maps to an empty revision range"
+msgstr "'%s'는 잘못된 리비 을 가지 있습니다"
+
+#: ../libsvn_subr/mergeinfo.c:470
#, fuzzy, c-format
msgid "Invalid character '%c' found in revision list"
msgstr "잘못된 끝 리비 %ld"
-#: libsvn_subr/mergeinfo.c:174
+#: ../libsvn_subr/mergeinfo.c:484
+#, c-format
+msgid "Unable to parse reversed revision range '%ld-%ld'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:489
+#, fuzzy, c-format
+msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions"
+msgstr "시작 리비 (%ld)이 끝 리비 (%ld) 보다 더 큰 값입니다."
+
+#: ../libsvn_subr/mergeinfo.c:529 ../libsvn_subr/mergeinfo.c:536
#, fuzzy, c-format
msgid "Invalid character '%c' found in range list"
msgstr "잘못된 끝 리비 %ld"
-#: libsvn_subr/mergeinfo.c:181
+#: ../libsvn_subr/mergeinfo.c:543
#, fuzzy
msgid "Range list parsing ended before hitting newline"
msgstr "리비 파일 내에 마지막 개행문자가 없습니다."
-#: libsvn_subr/mergeinfo.c:200
+#: ../libsvn_subr/mergeinfo.c:562
msgid "Pathname not terminated by ':'"
msgstr ""
-#: libsvn_subr/mergeinfo.c:208
+#: ../libsvn_subr/mergeinfo.c:570
#, fuzzy, c-format
msgid "Could not find end of line in range list line in '%s'"
msgstr "리비 %ld 에서 time을 발견 수 없습니다"
-#: libsvn_subr/nls.c:79
+#: ../libsvn_subr/mergeinfo.c:607
+#, fuzzy, c-format
+msgid "Could not parse mergeinfo string '%s'"
+msgstr "'%s'에 대한 GET 요청을 수 없습니다."
+
+#: ../libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "문자열을 UCS-2로 변환 수 없습니다: '%s'"
-#: libsvn_subr/nls.c:86
+#: ../libsvn_subr/nls.c:86
msgid "Can't get module file name"
msgstr "모듈 파일 이름을 얻을 수 없습니다"
-#: libsvn_subr/nls.c:101
+#: ../libsvn_subr/nls.c:101
#, 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:217 libsvn_subr/opt.c:295
+#: ../libsvn_subr/opt.c:235 ../libsvn_subr/opt.c:339
msgid ""
"\n"
"Valid options:\n"
@@ -4392,11 +5002,20 @@ msgstr ""
"\n"
"옵션:\n"
-#: libsvn_subr/opt.c:424
+#: ../libsvn_subr/opt.c:259
+#, fuzzy
+msgid ""
+"\n"
+"Global options:\n"
+msgstr ""
+"\n"
+"옵션:\n"
+
+#: ../libsvn_subr/opt.c:469
msgid " ARG"
msgstr " ARG"
-#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
+#: ../libsvn_subr/opt.c:494 ../libsvn_subr/opt.c:527
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4405,27 +5024,38 @@ msgstr ""
"\"%s\": 알 수 없는 명 입니다.\n"
"\n"
-#: libsvn_subr/opt.c:781
+#: ../libsvn_subr/opt.c:860
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "구문 오류 분석 리비 '%s'"
-#: libsvn_subr/opt.c:858
+#: ../libsvn_subr/opt.c:1064
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "리비 엔트리가 리스트 구조체가 아닙니다."
+
+#: ../libsvn_subr/opt.c:1084 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:182
+#: ../svn/propset-cmd.c:64
+#, c-format
+msgid "'%s' is not a valid Subversion property name"
+msgstr "'%s'는 올바른 subversion 속성 이름이 아닙니다"
+
+#: ../libsvn_subr/opt.c:1143
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s'는 URI 인코딩에 당하지 않습니다."
-#: libsvn_subr/opt.c:864
+#: ../libsvn_subr/opt.c:1149
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s'는 '..' 요소를 포함합니다."
-#: libsvn_subr/opt.c:893
+#: ../libsvn_subr/opt.c:1182
#, c-format
msgid "Error resolving case of '%s'"
msgstr "'%s' 사항을 해결 중 에러 발생하였습니다."
-#: libsvn_subr/opt.c:995
+#: ../libsvn_subr/opt.c:1211
#, c-format
msgid ""
"%s, version %s\n"
@@ -4436,70 +5066,69 @@ msgstr ""
" %s, %s에 컴파일 됨\n"
"\n"
-#: libsvn_subr/opt.c:998
+#: ../libsvn_subr/opt.c:1214
+#, fuzzy
msgid ""
-"Copyright (C) 2000-2007 CollabNet.\n"
+"Copyright (C) 2000-2008 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"
+"This product includes software developed by CollabNet (http://www.Collab.Net/).\n"
"\n"
msgstr ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion은 오픈 소스 소프트웨어 입니다, \
http://subversion.tigris.org/\n"
-"이 품은 CollabNet이 개발한 소프트웨어를 포함하 \
있습니다.(http://www."
-"Collab.Net/).\n"
+"이 품은 CollabNet이 개발한 소프트웨어를 포함하 \
있습니다.(http://www.Collab.Net/).\n" "\n"
-#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
+#: ../libsvn_subr/opt.c:1267 ../libsvn_subr/opt.c:1334
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "사용법은 '%s help'를 통해 볼 수 있습니다.\n"
-#: libsvn_subr/path.c:1109
+#: ../libsvn_subr/path.c:1197
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr " 대 경로를 결 수 없습니다. '%s'"
-#: libsvn_subr/path.c:1147
+#: ../libsvn_subr/path.c:1234
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s'는 파일이나 디 리가 아닙니다"
-#: libsvn_subr/path.c:1253
+#: ../libsvn_subr/path.c:1360
#, c-format
msgid "Can't determine the native path encoding"
msgstr "경로에 대한 기본 인코딩을 결 수 없습니다."
-#: libsvn_subr/path.c:1307
+#: ../libsvn_subr/path.c:1474
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "잘못된 어 문자 '0x%02x'가 경로 '%s'에 있습니다."
-#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#: ../libsvn_subr/prompt.c:118 ../libsvn_subr/prompt.c:122
#, c-format
msgid "Can't read stdin"
msgstr "표준입 에서 읽을 수 없습니다."
-#: libsvn_subr/prompt.c:178
+#: ../libsvn_subr/prompt.c:181
#, c-format
msgid "Authentication realm: %s\n"
msgstr "인증 영역(realm): %s\n"
-#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+#: ../libsvn_subr/prompt.c:207 ../libsvn_subr/prompt.c:230
msgid "Username: "
msgstr "사용자명:"
-#: libsvn_subr/prompt.c:206
+#: ../libsvn_subr/prompt.c:209
#, c-format
msgid "Password for '%s': "
msgstr "'%s'의 암호:"
-#: libsvn_subr/prompt.c:249
+#: ../libsvn_subr/prompt.c:252
#, c-format
msgid "Error validating server certificate for '%s':\n"
msgstr "'%s' 서버의 인증서 검증 실패:\n"
-#: libsvn_subr/prompt.c:255
+#: ../libsvn_subr/prompt.c:258
msgid ""
" - The certificate is not issued by a trusted authority. Use the\n"
" fingerprint to validate the certificate manually!\n"
@@ -4507,23 +5136,23 @@ msgstr ""
" - 인증서가 뢰 만한 기관에서 발급된 것이 아닙니다.\n"
" 인증서의 핑거프린트를 이용하여 수동으로 검증하십시오\n"
-#: libsvn_subr/prompt.c:262
+#: ../libsvn_subr/prompt.c:265
msgid " - The certificate hostname does not match.\n"
msgstr " - 인증서의 호스트명이 일치하지 않습니다.\n"
-#: libsvn_subr/prompt.c:268
+#: ../libsvn_subr/prompt.c:271
msgid " - The certificate is not yet valid.\n"
msgstr " - 인증서의 효기간이 아직되지 않았습니다.\n"
-#: libsvn_subr/prompt.c:274
+#: ../libsvn_subr/prompt.c:277
msgid " - The certificate has expired.\n"
msgstr " - 인증서의 효기간이 지났습니다.\n"
-#: libsvn_subr/prompt.c:280
+#: ../libsvn_subr/prompt.c:283
msgid " - The certificate has an unknown error.\n"
msgstr " - 인증서에서 알 수 없는 오류가 발생하였습니다.\n"
-#: libsvn_subr/prompt.c:285
+#: ../libsvn_subr/prompt.c:288
#, c-format
msgid ""
"Certificate information:\n"
@@ -4538,94 +5167,157 @@ msgstr ""
" - 발급자: %s\n"
" - 핑거프린트: %s\n"
-#: libsvn_subr/prompt.c:300
+#: ../libsvn_subr/prompt.c:303
msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
msgstr "(R)거부, (T)임시 승인, (P)영구 승인 중 하나를 \
택하세요:"
-#: libsvn_subr/prompt.c:304
+#: ../libsvn_subr/prompt.c:307
msgid "(R)eject or accept (t)emporarily? "
msgstr "(R)거부, (T)임시 승인"
-#: libsvn_subr/prompt.c:343
+#: ../libsvn_subr/prompt.c:346
msgid "Client certificate filename: "
msgstr "클라이언트 인증서 파일:"
-#: libsvn_subr/prompt.c:366
+#: ../libsvn_subr/prompt.c:369
#, c-format
msgid "Passphrase for '%s': "
msgstr "패스프 이즈 '%s':"
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: ../libsvn_subr/prompt.c:417
+msgid "yes"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:422
+msgid "no"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:428
+msgid "Please type 'yes' or 'no': "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:442
+msgid "Store password unencrypted (yes/no)? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:444
+#, c-format
+msgid ""
+"-----------------------------------------------------------------------\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:472
+msgid "Store passphrase unencrypted (yes/no)? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:474
+#, c-format
+msgid ""
+"-----------------------------------------------------------------------\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/simple_providers.c:353
+#: ../libsvn_subr/ssl_client_cert_pw_providers.c:305
+#, fuzzy, c-format
+msgid "Config error: invalid value '%s' for option '%s'"
+msgstr "구성 오류: 잘못된 부울리안 값입니다. '%s'"
+
+#: ../libsvn_subr/subst.c:1744 ../libsvn_wc/props.c:2430
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "파일 '%s' 은 일치하지 않는 개행문자를 포함하 \
있습니다"
-#: libsvn_subr/utf.c:194
+#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
+#: ../libsvn_subr/time.c:81
+msgid " (%a, %d %b %Y)"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:195
msgid "Can't lock charset translation mutex"
msgstr "문자변환용 뮤텍스를 글 수 없습니다."
-#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
+#: ../libsvn_subr/utf.c:213 ../libsvn_subr/utf.c:323
msgid "Can't unlock charset translation mutex"
msgstr "문자변환용 뮤텍스를 해 수 없습니다."
-#: libsvn_subr/utf.c:271
+#: ../libsvn_subr/utf.c:275
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "기본 인코딩에서 '%s'(으)로 변환 수 있는 컨버터를 만들 \
수 없습니다."
-#: libsvn_subr/utf.c:275
+#: ../libsvn_subr/utf.c:279
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "'%s'에서 기본 인코딩으로 변환 수 있는 컨버터를 만들 \
수 없습니다."
-#: libsvn_subr/utf.c:279
+#: ../libsvn_subr/utf.c:283
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "'%s'을/를 '%s'(으)로 변환 수 있는 컨버터를 만들 수 \
없습니다."
-#: libsvn_subr/utf.c:285
+#: ../libsvn_subr/utf.c:289
#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "'%i'을/를 '%i'(으)로 변환 수 있는 컨버터를 만들 수 \
없습니다."
-#: libsvn_subr/utf.c:522
+#: ../libsvn_subr/utf.c:521
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "기본 인코딩에서 '%s'(으)로 문자열을 변환 수 \
없습니다:"
-#: libsvn_subr/utf.c:526
+#: ../libsvn_subr/utf.c:525
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "'%s'에서 기본 인코딩으로 문자열을 변환 수 없습니다:"
-#: libsvn_subr/utf.c:530
+#: ../libsvn_subr/utf.c:529
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "'%s'에서 '%s'(으)로 문자열을 변환 수 없습니다:"
-#: libsvn_subr/utf.c:536
+#: ../libsvn_subr/utf.c:535
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "CCSID '%i'에서 CCSID '%i'(으)로 문자열을 변환 수 없습니다"
-#: libsvn_subr/utf.c:581
+#: ../libsvn_subr/utf.c:580
#, c-format
-msgid ""
-"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
-"UTF-8"
+msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from \
UTF-8" msgstr ""
"안 한 데이터:\n"
"\"%s\"\n"
"아스키 아닌 값(%d)이 따라 왔습니다: UTF-8과 상호 변환이 \
불가능합니다."
-#: libsvn_subr/utf.c:589
+#: ../libsvn_subr/utf.c:588
#, c-format
-msgid ""
-"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr ""
-"ASCII가 아닌 (코드 %d) 문자가 발견되었으며, UTF-8과 상호 변환이 \
불가능합니다." +msgid "Non-ASCII character (code %d) detected, and unable to \
convert to/from UTF-8" +msgstr "ASCII가 아닌 (코드 %d) 문자가 \
발견되었으며, UTF-8과 상호 변환이 불가능합니다."
-#: libsvn_subr/utf.c:631
+#: ../libsvn_subr/utf.c:630
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4638,454 +5330,421 @@ msgstr ""
"뒤에 잘못된 UTF-8 문자열이 발견되었습니다.\n"
"(hex:%s)"
-#: libsvn_subr/validate.c:48
+#: ../libsvn_subr/validate.c:50
#, c-format
msgid "MIME type '%s' has empty media type"
msgstr "MIME 타입 '%s'에 미디어 타입이 비어 있습니다."
-#: libsvn_subr/validate.c:53
+#: ../libsvn_subr/validate.c:55
#, c-format
msgid "MIME type '%s' does not contain '/'"
msgstr "MIME 타입 '%s'이 '/'를 포함하 있지 않습니다."
-#: libsvn_subr/validate.c:58
-#, c-format
-msgid "MIME type '%s' ends with non-alphanumeric character"
+#: ../libsvn_subr/validate.c:67
+#, fuzzy, c-format
+msgid "MIME type '%s' contains invalid character '%c'"
msgstr "MIME 타입 '%s'의 끝이 숫자나 알파벳이 아닙니다."
-#: libsvn_subr/version.c:74
+#: ../libsvn_subr/version.c:74
#, 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" +msgstr "'%s'의 버 이 일치하지 않습니다: 발견된 \
버 %d.%d.%d%s, 기대 버 %d.%d.%d%s"
-#: libsvn_subr/xml.c:400
-#, c-format
-msgid "Malformed XML: %s at line %d"
+#: ../libsvn_subr/xml.c:403
+#, fuzzy, c-format
+msgid "Malformed XML: %s at line %ld"
msgstr "잘못된 XML: %s (줄 번호 %d)"
-#: libsvn_wc/adm_crawler.c:635
+#: ../libsvn_wc/adm_crawler.c:678
msgid "Error aborting report"
msgstr "보 중지 실패"
-#: libsvn_wc/adm_crawler.c:1059
+#: ../libsvn_wc/adm_crawler.c:1103
#, c-format
msgid "While preparing '%s' for commit"
msgstr "커밋을 위해 '%s'를 준비 중"
-#: libsvn_wc/adm_files.c:100
+#: ../libsvn_wc/adm_files.c:100
#, c-format
msgid "'%s' is not a valid administrative directory name"
msgstr "'%s'는 올바른 관리 디 리 이름이 아닙니다"
-#: libsvn_wc/adm_files.c:260
+#: ../libsvn_wc/adm_files.c:260
msgid "Bad type indicator"
msgstr "잘못된 타입 지시자"
-#: libsvn_wc/adm_files.c:554
+#: ../libsvn_wc/adm_files.c:493
msgid "APR_APPEND not supported for adm files"
msgstr "adm 파일에는 APR_APPEND 가 지원되지 않습니다"
-#: libsvn_wc/adm_files.c:597
-msgid ""
-"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
-"again"
-msgstr ""
-"당 의 .svn/tmp 디릭 리가 누락되거나 손상되었습니다; 'svn \
cleanup' 명 을 실"
-"행한 뒤, 다시 시도하십시오"
+#: ../libsvn_wc/adm_files.c:536
+msgid "Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try \
again" +msgstr "당 의 .svn/tmp 디릭 리가 누락되거나 \
손상되었습니다; 'svn cleanup' 명 을 실행한 뒤, 다시 \
시도하십시오"
-#: libsvn_wc/adm_files.c:767 libsvn_wc/lock.c:592 libsvn_wc/lock.c:857
+#: ../libsvn_wc/adm_files.c:705 ../libsvn_wc/lock.c:606
+#: ../libsvn_wc/lock.c:872
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' 은 작업 사본이 아닙니다"
-#: libsvn_wc/adm_files.c:774 libsvn_wc/adm_files.c:842
-#: libsvn_wc/adm_files.c:904
+#: ../libsvn_wc/adm_files.c:712 ../libsvn_wc/adm_files.c:779
msgid "No such thing as 'base' working copy properties!"
msgstr "'base' 작업 사본 속성으로 그런 것은 없습니다.!"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:53
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "'%s'은 디 리가 아닙니다"
-
-#: libsvn_wc/adm_files.c:1044
+#: ../libsvn_wc/adm_files.c:868
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "리비 %ld은 존재하는 리비 %ld 과 '%s'에서 일치하지 \
않습니다"
-#: libsvn_wc/adm_files.c:1052
+#: ../libsvn_wc/adm_files.c:876
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s'은 '%s'에 존재하는 URL '%s'과 일치하지 않습니다"
-#: libsvn_wc/adm_ops.c:270
+#: ../libsvn_wc/adm_ops.c:279
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "인실 수 없는 노드 종류: '%s'"
-#: libsvn_wc/adm_ops.c:1395
-#, c-format
-msgid "'%s' not found"
-msgstr "'%s' 이 발견되지 않았습니다"
-
-#: libsvn_wc/adm_ops.c:1399
+#: ../libsvn_wc/adm_ops.c:1043 ../libsvn_wc/adm_ops.c:1409
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "경로 '%s'에 지원 수 없는 노드 종류입니다"
-#: libsvn_wc/adm_ops.c:1429
+#: ../libsvn_wc/adm_ops.c:1405
+#, c-format
+msgid "'%s' not found"
+msgstr "'%s' 이 발견되지 않았습니다"
+
+#: ../libsvn_wc/adm_ops.c:1439
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s'는 이미 버 관리 대상입니다"
-#: libsvn_wc/adm_ops.c:1441
+#: ../libsvn_wc/adm_ops.c:1451
#, c-format
-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 ""
-"'%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 "'%s'를 다른 \
타입의 노드와 교체 수 없습니다; 삭 하여 커밋하 , 상위 \
디 리를업데이트 한 뒤, '%s'를 추가하십시오 "
-#: libsvn_wc/adm_ops.c:1458
+#: ../libsvn_wc/adm_ops.c:1468
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr "'%s'를 추가하던 중, 상위 디 리의 엔트리를 발견 수 \
없습니다."
-#: libsvn_wc/adm_ops.c:1463
+#: ../libsvn_wc/adm_ops.c:1473
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "삭 가 예 된 상위 디 리에 '%s'를 추가 수 \
없습니다"
-#: libsvn_wc/adm_ops.c:1479
+#: ../libsvn_wc/adm_ops.c:1489
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "URL '%s'은(는) 상위 디 리와 다른 장소입니다."
-#: libsvn_wc/adm_ops.c:1828
+#: ../libsvn_wc/adm_ops.c:1826
+#, c-format
+msgid "Error restoring text for '%s'"
+msgstr "'%s'에 대한 텍스트 복구 오류"
+
+#: ../libsvn_wc/adm_ops.c:2030
+msgid "Cannot revert addition of current directory; please try again from the parent \
directory" +msgstr "현재 디 리의 추가를 복원 수 없습니다: \
상위 디 리에서 다시 시도하십시오." +
+#: ../libsvn_wc/adm_ops.c:2061
#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "'%s'에 대한 텍스트 복구 오류"
+msgid "Unknown or unexpected kind for path '%s'"
+msgstr "경로 '%s'에 대한 알 수 없거나 기대하지 않은 \
종류입니다."
-#: libsvn_wc/adm_ops.c:1998
+#: ../libsvn_wc/adm_ops.c:2178
+#, fuzzy
+msgid "Cannot revert"
+msgstr " 거 수 없습니다. '%s'"
+
+#: ../libsvn_wc/adm_ops.c:2205
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "'%s'를 복원 수 없습니다: 지원하지 않는 엔트리 노드 \
종류입니다"
-#: libsvn_wc/adm_ops.c:2009
+#: ../libsvn_wc/adm_ops.c:2216
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr "'%s'를 복원 수 없습니다: 작업 사본에서 지원하지 않는 \
노드 종류입니다"
-#: libsvn_wc/adm_ops.c:2056
-msgid ""
-"Cannot revert addition of current directory; please try again from the "
-"parent directory"
-msgstr ""
-"현재 디 리의 추가를 복원 수 없습니다: 상위 디 \
리에서 다시 시도하십시"
-"오."
-
-#: libsvn_wc/adm_ops.c:2078
-#, c-format
-msgid "Unknown or unexpected kind for path '%s'"
-msgstr "경로 '%s'에 대한 알 수 없거나 기대하지 않은 \
종류입니다."
-
-#: libsvn_wc/adm_ops.c:2249
+#: ../libsvn_wc/adm_ops.c:2394
#, c-format
msgid "File '%s' has local modifications"
msgstr "파일 '%s'는 로컬에서 수 되었습니다."
-#: libsvn_wc/adm_ops.c:2821
+#: ../libsvn_wc/adm_ops.c:2716
+#, fuzzy
+msgid "Invalid 'conflict_result' argument"
+msgstr "잘못된 설 값"
+
+#: ../libsvn_wc/adm_ops.c:3005
#, fuzzy, c-format
-msgid "'%s' is not currently a member of changelist '%s'."
-msgstr "경로 '%s' 은/는 이 변경 목록 '%s' 에 없습니다.\n"
+msgid "'%s' is a directory, and thus cannot be a member of a changelist"
+msgstr "경로 '%s'은/는 더 이상 변경 목록과 관계없습니다.\n"
+
+#: ../libsvn_wc/adm_ops.c:3025
+#, fuzzy, c-format
+msgid "Removing '%s' from changelist '%s'."
+msgstr "없는 변경 목록: '%s'"
-#: libsvn_wc/copy.c:197
+#: ../libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "'%s'를 재귀 으로 복사하는 중에 오류 발생"
-#: libsvn_wc/copy.c:356
+#: ../libsvn_wc/copy.c:403
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s'는 이미 존재하며 방해가 됩니다."
-#: libsvn_wc/copy.c:368
+#: ../libsvn_wc/copy.c:415
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "버 관리되 있는 항목 '%s'는 이미 존재합니다."
-#: libsvn_wc/copy.c:383
-#, c-format
-msgid ""
-"Cannot copy or move '%s': it's not in the repository yet; try committing "
-"first"
-msgstr ""
-"'%s'를 복사하거나 옮길 수 없습니다; 아직 장소에 없습니다; \
먼 커밋하십시오"
-
-#: libsvn_wc/copy.c:658
+#: ../libsvn_wc/copy.c:430 ../libsvn_wc/copy.c:692
#, c-format
-msgid ""
-"Cannot copy or move '%s': it is not in the repository yet; try committing "
-"first"
-msgstr ""
-"'%s'를 복사하거나 옮길 수 없습니다; 아직 장소에 없습니다. \
먼 커밋하십시오" +msgid "Cannot copy or move '%s': it is not in the \
repository yet; try committing first" +msgstr "'%s'를 복사하거나 옮길 수 \
없습니다; 아직 장소에 없습니다. 먼 커밋하십시오"
-#: libsvn_wc/copy.c:776
+#: ../libsvn_wc/copy.c:799
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr ""
-"'%s'에 목사 수 없습니다. 원본이 장소 '%s'에 있지 않 \
'%s'에 있습니다." +msgstr "'%s'에 목사 수 없습니다. 원본이 \
장소 '%s'에 있지 않 '%s'에 있습니다."
-#: libsvn_wc/copy.c:783
+#: ../libsvn_wc/copy.c:806
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "삭 가 예 된 상위 디 리에 '%s'를 추가 수 \
없습니다"
-#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
-#: libsvn_wc/entries.c:849
+#: ../libsvn_wc/entries.c:94 ../libsvn_wc/entries.c:368
+#: ../libsvn_wc/entries.c:604 ../libsvn_wc/entries.c:865
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "엔트리 '%s'는 효하지 않은 값 '%s'를 갖 있습니다"
-#: libsvn_wc/entries.c:114
+#: ../libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "잘못된 이스케이프 시퀀스"
-#: libsvn_wc/entries.c:121
+#: ../libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "잘못 이스케이프된 문자"
-#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
-#: libsvn_wc/entries.c:206
+#: ../libsvn_wc/entries.c:139 ../libsvn_wc/entries.c:168
+#: ../libsvn_wc/entries.c:210 ../libsvn_wc/entries.c:222
msgid "Unexpected end of entry"
msgstr "기대하지 않은 entry의 끝을 만남"
-#: libsvn_wc/entries.c:228
+#: ../libsvn_wc/entries.c:192
+#, c-format
+msgid "Entry contains non-canonical path '%s'"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:244
#, c-format
msgid "Invalid value for field '%s'"
msgstr "필드 '%s'에 잘못된 값입니다"
-#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
+#: ../libsvn_wc/entries.c:326 ../libsvn_wc/entries.c:579
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "엔트리 '%s'는 효하지 않은 노드 종류를 갖 있습니다"
-#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
+#: ../libsvn_wc/entries.c:347 ../libsvn_wc/entries.c:556
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "엔트리 '%s'에 효하지 않은 장소 루트가 있습니다."
-#: libsvn_wc/entries.c:995
+#: ../libsvn_wc/entries.c:1011
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML 파서가 '%s'에 실패했습니다"
-#: libsvn_wc/entries.c:1054
+#: ../libsvn_wc/entries.c:1070
msgid "Missing default entry"
msgstr "기본 엔트리가 졌습니다"
-#: libsvn_wc/entries.c:1059
+#: ../libsvn_wc/entries.c:1075
msgid "Default entry has no revision number"
msgstr "기본 엔트리에 리비 넘버가 없습니다"
-#: libsvn_wc/entries.c:1064
+#: ../libsvn_wc/entries.c:1080
msgid "Default entry is missing URL"
msgstr "기본 엔트리게 URL 이 없습니다"
-#: libsvn_wc/entries.c:1140
+#: ../libsvn_wc/entries.c:1156
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "'%s'의 엔트리에 잘못된 버 이 들어 있는 행이 있습니다."
-#: libsvn_wc/entries.c:1157
+#: ../libsvn_wc/entries.c:1173
msgid "Missing entry terminator"
msgstr "엔트리 종결 태그가 졌습니다"
-#: libsvn_wc/entries.c:1160
+#: ../libsvn_wc/entries.c:1176
msgid "Invalid entry terminator"
msgstr "엔트리 종결 태그가 잘못되었습니다"
-#: libsvn_wc/entries.c:1164
+#: ../libsvn_wc/entries.c:1180
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "엔트리 %d가 '%s' 엔트리 파일에서 잘 못 되었습니다:"
-#: libsvn_wc/entries.c:1287
+#: ../libsvn_wc/entries.c:1303
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "작업 사본이 손상되었습니다; '%s'는 기본 엔트리가 \
없습니다"
-#: libsvn_wc/entries.c:1304
+#: ../libsvn_wc/entries.c:1320
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr ""
-"작업 사본이 손상되었습니다; 디 리 '%s'는 효하지 않은 \
스케쥴이 있습니다" +msgstr "작업 사본이 손상되었습니다; 디 \
리 '%s'는 효하지 않은 스케쥴이 있습니다"
-#: libsvn_wc/entries.c:1338
+#: ../libsvn_wc/entries.c:1354
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr ""
-"작업 사본이 손상되었습니다; 디 리 '%s'의 '%s'는 효하지 \
않은 스케쥴이 있"
-"습니다"
+msgstr "작업 사본이 손상되었습니다; 디 리 '%s'의 '%s'는 \
효하지 않은 스케쥴이 있습니다"
-#: libsvn_wc/entries.c:1347
+#: ../libsvn_wc/entries.c:1363
#, c-format
-msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"addition) is not itself scheduled for addition"
-msgstr ""
-"작업 사본이 손상되었습니다; 디 리 '%s'의 '%s'는 (추가 \
작업이 스케쥴된) 추"
-"가가 예 된 것과 다릅니다."
+msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for \
addition) is not itself scheduled for addition" +msgstr "작업 사본이 \
손상되었습니다; 디 리 '%s'의 '%s'는 (추가 작업이 스케쥴된) \
추가가 예 된 것과 다릅니다."
-#: libsvn_wc/entries.c:1355
+#: ../libsvn_wc/entries.c:1371
#, c-format
-msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"deletion) is not itself scheduled for deletion"
-msgstr ""
-"작업 사본이 손상되었습니다; 디 리 '%s'의 '%s'는 (삭 \
작업이 스케쥴된) 삭"
-" 가 예 된 것과 다릅니다."
+msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for \
deletion) is not itself scheduled for deletion" +msgstr "작업 사본이 \
손상되었습니다; 디 리 '%s'의 '%s'는 (삭 작업이 스케쥴된) \
삭 가 예 된 것과 다릅니다."
-#: libsvn_wc/entries.c:1363
+#: ../libsvn_wc/entries.c:1379
#, c-format
-msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"replacement) has an invalid schedule"
-msgstr ""
-"작업 사본이 손상되었습니다; 디 리 '%s'의 '%s'는 (교체 \
작업이 스케쥴된) "
-"효하지 않은 스케쥴이 있습니다."
+msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for \
replacement) has an invalid schedule" +msgstr "작업 사본이 \
손상되었습니다; 디 리 '%s'의 '%s'는 (교체 작업이 스케쥴된) \
효하지 않은 스케쥴이 있습니다."
-#: libsvn_wc/entries.c:2010
+#: ../libsvn_wc/entries.c:2026
#, c-format
msgid "No default entry in directory '%s'"
msgstr "디릭 리 '%s'에 기본 엔트리가 없습니다"
-#: libsvn_wc/entries.c:2065
+#: ../libsvn_wc/entries.c:2081
#, c-format
msgid "Error writing to '%s'"
msgstr "'%s'에 쓰기 오류"
-#: libsvn_wc/entries.c:2394
+#: ../libsvn_wc/entries.c:2410
#, c-format
-msgid ""
-"Can't add '%s' to deleted directory; try undeleting its parent directory "
-"first"
-msgstr ""
-"삭 된 디 리에 '%s'를 추가 수 없습니다; 상위 디 \
리를 먼 복원하십시"
-"오"
+msgid "Can't add '%s' to deleted directory; try undeleting its parent directory \
first" +msgstr "삭 된 디 리에 '%s'를 추가 수 없습니다; 상위 \
디 리를 먼 복원하십시오"
-#: libsvn_wc/entries.c:2400
+#: ../libsvn_wc/entries.c:2416
#, c-format
-msgid ""
-"Can't replace '%s' in deleted directory; try undeleting its parent directory "
-"first"
-msgstr ""
-"삭 된 디 리에서 '%s'를 교체 수 없습니다; 상위 디 \
리를 먼 복원하십"
-"시오"
+msgid "Can't replace '%s' in deleted directory; try undeleting its parent directory \
first" +msgstr "삭 된 디 리에서 '%s'를 교체 수 없습니다; \
상위 디 리를 먼 복원하십시오"
-#: libsvn_wc/entries.c:2409
+#: ../libsvn_wc/entries.c:2425
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr "'%s'는 없는 것으로 표시되어 있어서 추가 작업을 스케쥴 \
수 없습니다"
-#: libsvn_wc/entries.c:2438
+#: ../libsvn_wc/entries.c:2454
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "'%s' 항목은 이미 관리 대상입니다."
-#: libsvn_wc/entries.c:2535
+#: ../libsvn_wc/entries.c:2551
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "'%s' 항목은 잘못된 스케쥴을 가지 있습니다."
-#: libsvn_wc/entries.c:2681
+#: ../libsvn_wc/entries.c:2696
#, c-format
msgid "No such entry: '%s'"
msgstr "없는 항목: '%s'"
-#: libsvn_wc/entries.c:2815
+#: ../libsvn_wc/entries.c:2829
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "'%s'에 대한 엔트리 파일 쓰기 오류"
-#: libsvn_wc/entries.c:2857
+#: ../libsvn_wc/entries.c:2872
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "'%s' 디 리는 THIS_DIR 항목이 없습니다."
-#: libsvn_wc/entries.c:2986
+#: ../libsvn_wc/entries.c:3019
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' 은/는 인식 불가능한 노드 종류입니다."
-#: libsvn_wc/entries.c:3023
+#: ../libsvn_wc/entries.c:3056
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "예기치 않은 발견 '%s': 경로는 'missing' 표시가 되어 \
있습니다."
-#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
+#: ../libsvn_wc/lock.c:367 ../libsvn_wc/lock.c:576
#, c-format
msgid "Working copy '%s' locked"
msgstr "작업사본 '%s'은/는 겨 있습니다."
-#: libsvn_wc/lock.c:481
+#: ../libsvn_wc/lock.c:492
#, c-format
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "경로 '%s'는 '%s'에서 끝나며, 이는 지원하지 않은 \
동작입니다."
-#: libsvn_wc/lock.c:929 libsvn_wc/lock.c:968
+#: ../libsvn_wc/lock.c:944 ../libsvn_wc/lock.c:983
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "경로가 존재하는지 확인 수 없습니다. '%s'"
-#: libsvn_wc/lock.c:939
+#: ../libsvn_wc/lock.c:954
#, c-format
msgid "Expected '%s' to be a directory but found a file"
msgstr "URL('%s')은 파일입니다. 디 리를 지 하세요."
-#: libsvn_wc/lock.c:951
+#: ../libsvn_wc/lock.c:966
#, c-format
msgid "Expected '%s' to be a file but found a directory"
msgstr "URL('%s')은 디 리입니다. 파일을 지 하세요."
-#: libsvn_wc/lock.c:975
+#: ../libsvn_wc/lock.c:990
#, c-format
msgid "Directory '%s' is missing"
msgstr "디 리 '%s'가 없습니다."
-#: libsvn_wc/lock.c:985
+#: ../libsvn_wc/lock.c:1000
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
msgstr "관리영역내의 디 리 '%s'가 누락 되어있습니다."
-#: libsvn_wc/lock.c:990
+#: ../libsvn_wc/lock.c:1005
#, c-format
msgid "Unable to lock '%s'"
msgstr " 금을 설 수 없습니다. '%s'"
-#: libsvn_wc/lock.c:995
+#: ../libsvn_wc/lock.c:1010
#, c-format
msgid "Working copy '%s' is not locked"
msgstr "작업사본 '%s'은/는 겨 있지 않습니다."
-#: libsvn_wc/lock.c:1390
+#: ../libsvn_wc/lock.c:1427
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "어떤 이 에서인지 '%s'의 쓰기 금이 거 되었습니다."
-#: libsvn_wc/lock.c:1398
+#: ../libsvn_wc/lock.c:1435
#, c-format
msgid "No write-lock in '%s'"
msgstr "'%s'에 쓰기 금이 없습니다"
-#: libsvn_wc/lock.c:1420
+#: ../libsvn_wc/lock.c:1457
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr " 그는 파일 '%s'은/는 일반 파일이 아닙니다."
-#: libsvn_wc/log.c:355
+#: ../libsvn_wc/log.c:356
msgid "Can't move source to dest"
msgstr "원본을 대상으로 이동시킬 수 없습니다."
@@ -5093,145 +5752,161 @@ msgstr "원본을 대상으로 이동시
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:518
+#: ../libsvn_wc/log.c:519
#, c-format
msgid "In directory '%s'"
msgstr "디 리 '%s'"
-#: libsvn_wc/log.c:543
+#: ../libsvn_wc/log.c:544
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "'%s'에 'left' 속성이 졌습니다"
-#: libsvn_wc/log.c:550
+#: ../libsvn_wc/log.c:551
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "'%s'에 'right' 속성이 졌습니다"
-#: libsvn_wc/log.c:618
+#: ../libsvn_wc/log.c:619
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "'%s'에 'dest' 속성이 졌습니다"
-#: libsvn_wc/log.c:699
+#: ../libsvn_wc/log.c:700
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "'%s'에 'timestamp' 속성이 졌습니다"
-#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
+#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:508
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "'%s'에 'affected time'을 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:868
+#: ../libsvn_wc/log.c:844
#, fuzzy, c-format
msgid "Error getting file size on '%s'"
msgstr "'%s'에 'affected time'을 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:886
+#: ../libsvn_wc/log.c:862
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "'%s'에 대한 엔트리 수 중 오류 발생"
-#: libsvn_wc/log.c:912
+#: ../libsvn_wc/log.c:888
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "'%s'에 대한 금해 오류"
-#: libsvn_wc/log.c:935
+#: ../libsvn_wc/log.c:911
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "'%s'의 변경사항 목록을 거하는 중 오류가 \
발생하였습니다."
-#: libsvn_wc/log.c:1067
+#: ../libsvn_wc/log.c:1089
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "'%s'에 대한 'revision' 속성이 졌습니다"
-#: libsvn_wc/log.c:1091
+#: ../libsvn_wc/log.c:1113
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "디 리 '%s'에 대한 로그 명 이 잘못된 곳에 위치해 \
있습니다"
-#: libsvn_wc/log.c:1287
-#, c-format
-msgid "Error checking existence of '%s'"
-msgstr "'%s'의 존재 여부 검하는 중 오류 발생"
-
-#: libsvn_wc/log.c:1353
+#: ../libsvn_wc/log.c:1281
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "'%s'의 text-base 교체 중 오류 발생"
-#: libsvn_wc/log.c:1358
+#: ../libsvn_wc/log.c:1286
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "'%s'의 'afftected time' 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:1381
+#: ../libsvn_wc/log.c:1309
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "'%s'에 대한 'affected time' 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:1401
+#: ../libsvn_wc/log.c:1329
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "'%s' 와 '%s' 비교중 오류 발생"
-#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
+#: ../libsvn_wc/log.c:1378 ../libsvn_wc/log.c:1427
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "'%s'의 엔트리 수 중 오류 발생"
-#: libsvn_wc/log.c:1572
+#: ../libsvn_wc/log.c:1482
msgid "Invalid 'format' attribute"
msgstr "잘못된 'format' 속성"
-#: libsvn_wc/log.c:1607
+#: ../libsvn_wc/log.c:1517
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr "'name' 속성이 진 로그 엔트리 ( 디 리 '%s'에 대한 \
엔트리 '%s' )"
-#: libsvn_wc/log.c:1678
+#: ../libsvn_wc/log.c:1588
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "'%s'의 인식 수 없는 로그 파일 요소 '%s'"
-#: libsvn_wc/log.c:1689
+#: ../libsvn_wc/log.c:1599
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "'%s'의 '%s' 명 처리 중 오류 발생"
-#: libsvn_wc/log.c:1871
+#: ../libsvn_wc/log.c:1781
msgid "Couldn't open log"
msgstr "로그를 열수 없습니다"
-#: libsvn_wc/log.c:1882
+#: ../libsvn_wc/log.c:1792
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "'%s'의 관리 로그 파일을 읽는 중 오류 발생"
-#: libsvn_wc/log.c:2524
+#: ../libsvn_wc/log.c:2445
#, c-format
msgid "Error writing log for '%s'"
msgstr "'%s'에 대한 로그 쓰기 오류"
-#: libsvn_wc/props.c:96
+#: ../libsvn_wc/log.c:2494
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "'%s'는 작업 사본 디 리가 아닙니다"
+
+#: ../libsvn_wc/merge.c:421 ../libsvn_wc/merge.c:737
+msgid "Conflict callback violated API: returned no results"
+msgstr ""
+
+#: ../libsvn_wc/merge.c:784
+msgid "Conflict callback violated API: returned no merged file"
+msgstr ""
+
+#: ../libsvn_wc/props.c:111
#, c-format
msgid "Can't parse '%s'"
msgstr "'%s'를 분석 수 없습니다"
-#: libsvn_wc/props.c:127
+#: ../libsvn_wc/props.c:142
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "'%s'에 속성 해쉬를 쓸 수 없습니다"
-#: libsvn_wc/props.c:222
+#: ../libsvn_wc/props.c:584
#, c-format
-msgid "Can't find entry '%s' in '%s'"
-msgstr "'%s'에 엔트리 '%s'를 찾을 수 없습니다"
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr "작업사본의 속성 파일 '%s'의 마지막 행이 없습니다."
-#: libsvn_wc/props.c:725
+#: ../libsvn_wc/props.c:1381
+msgid "Conflict callback violated API: returned no results."
+msgstr ""
+
+#: ../libsvn_wc/props.c:1421
+msgid "Conflict callback violated API: returned no merged file."
+msgstr ""
+
+#: ../libsvn_wc/props.c:1515
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5240,23 +5915,68 @@ msgstr ""
"새로운 속성 '%s'를 값 '%s'에 추가하 하지만,\n"
"이미 value '%s'에 속성이 존재합니다. "
-#: libsvn_wc/props.c:763
-#, c-format
+#: ../libsvn_wc/props.c:1530
+#, fuzzy, c-format
+msgid ""
+"Trying to create property '%s' with value '%s',\n"
+"but it has been locally deleted."
+msgstr ""
+"새로운 속성 '%s'를 값 '%s'에 추가하 하지만,\n"
+"이미 value '%s'에 속성이 존재합니다. "
+
+#: ../libsvn_wc/props.c:1604
+#, 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:1625
+#, fuzzy, c-format
+msgid ""
+"Trying to delete property '%s' with value '%s'\n"
+"but the local value is '%s'."
+msgstr ""
+"새로운 속성 '%s'를 값 '%s'에 추가하 하지만,\n"
+"이미 value '%s'에 속성이 존재합니다. "
+
+#: ../libsvn_wc/props.c:1712
+#, fuzzy, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
+"but property has been locally changed from '%s' to '%s'."
+msgstr ""
+"속성 '%s'를 '%s'에서 '%s'로 변경하 하지만,\n"
+"이미 값 '%s'에 속성이 존재합니다. "
+
+#: ../libsvn_wc/props.c:1720
+#, 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:1741
+#, 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:808
+#: ../libsvn_wc/props.c:1774
#, c-format
msgid ""
-"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but the property does not exist."
msgstr ""
-"새로운 속성 '%s'을/를 삭 하 하지만, 값이 '%s'에서 '%s' (으)로 \
바뀌었습니다." +"속성 '%s'를 '%s'에서 '%s'로 변경하 \
하지만,\n" +"그 속성은 존재 하지 않습니다."
-#: libsvn_wc/props.c:838
+#: ../libsvn_wc/props.c:1812
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5265,79 +5985,71 @@ msgstr ""
"속성 '%s'를 '%s'에서 '%s'로 변경하 하지만,\n"
"이미 값 '%s'에 속성이 존재합니다. "
-#: libsvn_wc/props.c:1023
-#, c-format
-msgid "Missing end of line in wcprops file for '%s'"
-msgstr "작업사본의 속성 파일 '%s'의 마지막 행이 없습니다."
-
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: ../libsvn_wc/props.c:2117 ../libsvn_wc/props.c:2145
+#: ../libsvn_wc/props.c:2290 ../libsvn_wc/props.c:2513
msgid "Failed to load properties from disk"
msgstr "디스크로 부터 속성을 로드하는 데 실패했습니다"
-#: libsvn_wc/props.c:1266
+#: ../libsvn_wc/props.c:2173
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "'%s'에 대한 속성 해쉬를 쓸 수 없습니다"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: ../libsvn_wc/props.c:2285 ../libsvn_wc/props.c:2457
#, c-format
msgid "Property '%s' is an entry property"
msgstr "속성 '%s'는 엔트리 속성입니다"
-#: libsvn_wc/props.c:1547
+#: ../libsvn_wc/props.c:2329
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "속성('%s')을 디 리('%s')에 설 수 없습니다"
-#: libsvn_wc/props.c:1555
+#: ../libsvn_wc/props.c:2337
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "속성('%s')을 파일('%s')에 설 수 없습니다"
-#: libsvn_wc/props.c:1561
+#: ../libsvn_wc/props.c:2343
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s'는 파일이나 디 리가 아닙니다"
-#: libsvn_wc/props.c:1642
+#: ../libsvn_wc/props.c:2411
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "파일 '%s'는 바이너리 MIME 타입 속성을 갖 있습니다"
-#: libsvn_wc/props.c:2508
+#: ../libsvn_wc/props.c:2606
+#, fuzzy, c-format
+msgid "Unrecognized line ending style for '%s'"
+msgstr "개행 형식이 알 수 없는 값입니다"
+
+#: ../libsvn_wc/props.c:3203 ../libsvn_wc/props.c:3270
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "'%s'에 대한 %s 속성을 분석하던 중 오류 발생: '%s'"
-#: libsvn_wc/props.c:2521
-#, c-format
-msgid ""
-"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
-"path"
-msgstr ""
-"%s'에 대한 효하지 않은 속성 %s : 대상은 '.' 이나 '..' 을 \
포함하거나 대 경"
-"로입니다"
+#: ../libsvn_wc/props.c:3320
+#, fuzzy, c-format
+msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves \
'..'" +msgstr "%s'에 대한 효하지 않은 속성 %s : 대상은 '.' 이나 \
'..' 을 포함하거나 대 경로입니다"
-#: libsvn_wc/questions.c:121
+#: ../libsvn_wc/questions.c:122
#, c-format
-msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
-msgstr ""
-"'%s'의 작업 사본 포맷은 너무 오래되었습니다(%d); 작업 사본을 \
다시 꺼내어 주십"
-"시오"
+msgid "Working copy format of '%s' is too old (%d); please check out your working \
copy again" +msgstr "'%s'의 작업 사본 포맷은 너무 \
오래되었습니다(%d); 작업 사본을 다시 꺼내어 주십시오"
-#: libsvn_wc/questions.c:129
+#: ../libsvn_wc/questions.c:133
#, c-format
msgid ""
-"This client is too old to work with working copy '%s'; please get a newer "
-"Subversion client"
+"This client is too old to work with working copy '%s'. You need\n"
+"to get a newer Subversion client, or to downgrade this working copy.\n"
+"See http://subversion.tigris.org/faq.html#working-copy-format-change\n"
+"for details."
msgstr ""
-"이 클라이언트는 너무 오래되어 작업사본 '%s'에 대해 작업을 \
수행 수 없습니"
-"다. subversion 을 업그 이드하십시오."
-#: libsvn_wc/questions.c:336
+#: ../libsvn_wc/questions.c:344
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5348,185 +6060,380 @@ msgstr ""
" 기대값: %s\n"
" 실 값: %s\n"
-#: libsvn_wc/relocate.c:78
+#: ../libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "재배치는 장소의 URL 부분만을 수 수 있습니다."
-#: libsvn_wc/update_editor.c:440
+#: ../libsvn_wc/update_editor.c:486
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "'.' 이 등록되어 있지 않습니다: '%s'"
-#: libsvn_wc/update_editor.c:963
+#: ../libsvn_wc/update_editor.c:984
+#, fuzzy, c-format
+msgid "Path '%s' is not in the working copy"
+msgstr "'%s' 은 작업 사본이 아닙니다"
+
+#: ../libsvn_wc/update_editor.c:1096
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "수 한 디 리는 지우지 않을 것입니다. '%s'"
-#: libsvn_wc/update_editor.c:1037
+#: ../libsvn_wc/update_editor.c:1268
#, c-format
-msgid "Error writing log file for '%s'"
-msgstr "'%s'에 대한 로그 파일 쓰기 오류"
+msgid "Failed to add directory '%s': a non-directory object of the same name already \
exists" +msgstr "디 리 추가 실패 '%s': 디 리가 아닌 같은 \
이름의 개체가 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1144
+#: ../libsvn_wc/update_editor.c:1301
#, 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:1177
-#, c-format
-msgid ""
-"Failed to add directory '%s': an unversioned directory of the same name "
-"already exists"
-msgstr ""
-"강 로 디 리 추가 실패 '%s': 버 관리 되지 않는 같은 \
이름의 디 리가 이"
-"미 존재합니다"
+msgid "Failed to add directory '%s': an unversioned directory of the same name \
already exists" +msgstr "강 로 디 리 추가 실패 '%s': 버 관리 \
되지 않는 같은 이름의 디 리가 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1199
+#: ../libsvn_wc/update_editor.c:1323
#, c-format
-msgid ""
-"Failed to add directory '%s': a versioned directory of the same name already "
-"exists"
-msgstr ""
-"강 로 디 리 추가 실패 '%s': 버 관리 되는 같은 이름의 \
디 리가 이미 존"
-"재합니다"
+msgid "Failed to add directory '%s': a versioned directory of the same name already \
exists" +msgstr "강 로 디 리 추가 실패 '%s': 버 관리 되는 \
같은 이름의 디 리가 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1210
+#: ../libsvn_wc/update_editor.c:1334
#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
+msgid "Failed to add directory '%s': object of the same name as the administrative \
directory" msgstr "디 리 추가 실패 '%s': 같은 이름의 개체가 \
관리용도로 사용됩니다."
-#: libsvn_wc/update_editor.c:1224
+#: ../libsvn_wc/update_editor.c:1367
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr "디 리 추가 실패 '%s': copyfrom 인자는 아직 지원되지 \
않습니다."
-#: libsvn_wc/update_editor.c:1521
+#: ../libsvn_wc/update_editor.c:1661
msgid "Couldn't do property merge"
msgstr "속성을 병합 수 없습니다"
-#: libsvn_wc/update_editor.c:1590
+#: ../libsvn_wc/update_editor.c:1734
#, c-format
-msgid ""
-"Failed to mark '%s' absent: item of the same name is already scheduled for "
-"addition"
-msgstr ""
-"'%s' 를 없는 것으로 표시 수 없습니다: 이미 같은 이름의 \
항목이 추가되도록 스"
-"케쥴되어 있습니다"
+msgid "Failed to mark '%s' absent: item of the same name is already scheduled for \
addition" +msgstr "'%s' 를 없는 것으로 표시 수 없습니다: 이미 \
같은 이름의 항목이 추가되도록 스케쥴되어 있습니다" +
+#: ../libsvn_wc/update_editor.c:1807
+#, fuzzy
+msgid "Bad copyfrom arguments received"
+msgstr "많은 인자가 주어졌습니다."
-#: libsvn_wc/update_editor.c:1690
+#: ../libsvn_wc/update_editor.c:1846
#, c-format
-msgid ""
-"Failed to add file '%s': a file of the same name is already scheduled for "
-"addition with history"
-msgstr ""
-"파일 '%s'를 추가 수 없습니다: 이미 같은 이름의 대상이 \
추가되도록 스케쥴되"
-"어 있습니다"
+msgid "Failed to add file '%s': a file of the same name is already scheduled for \
addition with history" +msgstr "파일 '%s'를 추가 수 없습니다: 이미 \
같은 이름의 대상이 추가되도록 스케쥴되어 있습니다"
-#: libsvn_wc/update_editor.c:1702
+#: ../libsvn_wc/update_editor.c:1858
#, c-format
-msgid ""
-"Failed to add file '%s': a non-file object of the same name already exists"
-msgstr ""
-"파일 '%s'를 추가 수 없습니다: 파일이 아닌 같은 이름의 \
개체가 이미 존재합니"
-"다"
+msgid "Failed to add file '%s': a non-file object of the same name already exists"
+msgstr "파일 '%s'를 추가 수 없습니다: 파일이 아닌 같은 이름의 \
개체가 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1717
+#: ../libsvn_wc/update_editor.c:1873
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "파일 '%s'를 추가 수 없습니다: 같은 이름의 대상이 이미 \
존재합니다"
-#: libsvn_wc/update_editor.c:1734
+#: ../libsvn_wc/update_editor.c:1931
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "디 리 '%s' 의 파일 '%s'는 버 관리 대상이 아닙니다"
-#: libsvn_wc/update_editor.c:1883
+#: ../libsvn_wc/update_editor.c:2085
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "'%s' 에 대한 체크섬이 일치하지 않습니다; 기록된 것:'%s', \
실 :'%s'"
-#: libsvn_wc/update_editor.c:3015
+#: ../libsvn_wc/update_editor.c:2823
+msgid "Destination directory of add-with-history is missing a URL"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:2838
+#, fuzzy
+msgid "Destination URLs are broken"
+msgstr "대상 '%s' 는 이미 존재합니다."
+
+#: ../libsvn_wc/update_editor.c:3095
+msgid "No fetch_func supplied to update_editor"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:3336
+#, fuzzy, c-format
+msgid "Shallowing of working copy depths is not yet supported"
+msgstr "작업 사본과 장소 간 이동은 지원하지 않습니다"
+
+#: ../libsvn_wc/update_editor.c:3737
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s'가 히스 리를 갖 있시 않습니다"
-#: libsvn_wc/update_editor.c:3174
+#: ../libsvn_wc/update_editor.c:3891
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "복사 원본 URL '%s'은(는) '%s'와(과) 다른 장소입니다."
-#: libsvn_wc/util.c:85
+#: ../libsvn_wc/util.c:53
+#, c-format
+msgid "'%s' is not a directory"
+msgstr "'%s'은 디 리가 아닙니다"
+
+#: ../libsvn_wc/util.c:85
msgid "Unable to make any directories"
msgstr "어떤 디 리도 만들 수 없습니다"
-#: svn/blame-cmd.c:206 svn/list-cmd.c:233
+#: ../libsvn_wc/util.c:284
+#, fuzzy, c-format
+msgid "Cannot find a URL for '%s'"
+msgstr "'%s'를 위한 등록 보를 찾을 수 없습니다."
+
+#: ../svn/blame-cmd.c:261 ../svn/list-cmd.c:234
msgid "'verbose' option invalid in XML mode"
msgstr "'verbose' 옵션은 XML 모드에서는 불가능합니다."
-#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:245
-#: svn/status-cmd.c:276
+#: ../svn/blame-cmd.c:273 ../svn/info-cmd.c:477 ../svn/list-cmd.c:246
+#: ../svn/status-cmd.c:220
msgid "'incremental' option only valid in XML mode"
msgstr "'incremental' 옵션은 XML 모드에서만 가능합니다"
-#: svn/blame-cmd.c:280
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "바이너리 파일을 무시합니다: '%s'\n"
+#: ../svn/blame-cmd.c:336
+#, c-format
+msgid "Skipping binary file: '%s'\n"
+msgstr "바이너리 파일을 무시합니다: '%s'\n"
+
+#: ../svn/checkout-cmd.c:130 ../svn/switch-cmd.c:138
+#, c-format
+msgid "'%s' does not appear to be a URL"
+msgstr "'%s' 은 URL 같아 보이지 않습니다."
+
+#: ../svn/conflict-callbacks.c:143
+msgid "||||||| ORIGINAL"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:144
+msgid "<<<<<<< MINE (select with 'mc')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:145
+msgid ">>>>>>> THEIRS (select with 'tc')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:170
+#, fuzzy
+msgid "No editor found."
+msgstr "없는 리비 %ld 입니다."
+
+#: ../svn/conflict-callbacks.c:177
+#, fuzzy
+msgid "Error running editor."
+msgstr "post-commit 훅 실행중 오류"
+
+#: ../svn/conflict-callbacks.c:187
+#, c-format
+msgid ""
+"Invalid option; there's no merged version to edit.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:209
+msgid "No merge tool found.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:216
+#, fuzzy
+msgid "Error running merge tool."
+msgstr "post-commit 훅 실행중 오류"
+
+#: ../svn/conflict-callbacks.c:286
+msgid "No editor found; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:295
+msgid "Error running editor; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:327
+msgid "No merge tool found; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:336
+msgid "Error running merge tool; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:377
+#, fuzzy, c-format
+msgid "Conflict discovered in '%s'.\n"
+msgstr "충돌한 속성 파일: %s\n"
+
+#: ../svn/conflict-callbacks.c:382
+#, fuzzy, c-format
+msgid "Conflict for property '%s' discovered on '%s'.\n"
+msgstr "속성 '%s' 를 '%s'에 설 합니다.\n"
+
+#: ../svn/conflict-callbacks.c:399
+#, c-format
+msgid "They want to delete the property, you want to change the value to '%s'.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:408
+#, 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:430
+msgid "Select: (p) postpone"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:435
+msgid ", (df) diff-full, (e) edit"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:439 ../svn/conflict-callbacks.c:452
+msgid ", (r) resolved"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:445
+msgid ""
+",\n"
+" (mc) mine-conflict, (tc) theirs-conflict"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:455
+msgid ""
+",\n"
+" (mf) mine-full, (tf) theirs-full"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:462
+msgid "(s) show all options: "
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:470
+#, 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:505 ../svn/conflict-callbacks.c:529
+#, c-format
+msgid ""
+"Invalid option; cannot choose based on conflicts in a binary file.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:513 ../svn/conflict-callbacks.c:537
+#, c-format
+msgid ""
+"Invalid option; cannot choose based on conflicts for properties.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:566
+#, c-format
+msgid ""
+"Invalid option; cannot display conflicts for a binary file.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:574
+#, c-format
+msgid ""
+"Invalid option; cannot display conflicts for properties.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:582
+#, c-format
+msgid ""
+"Invalid option; original files not available.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:594
+#, c-format
+msgid ""
+"Invalid option; there's no merged version to diff.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:619 ../svn/conflict-callbacks.c:633
+#, fuzzy, c-format
+msgid ""
+"Invalid option.\n"
+"\n"
+msgstr "잘못된 URL 환"
+
+#: ../svn/conflict-callbacks.c:663
+#, fuzzy, c-format
+msgid ""
+"Conflict discovered when trying to add '%s'.\n"
+"An object of the same name already exists.\n"
+msgstr "파일 '%s'를 추가 수 없습니다: 같은 이름의 대상이 이미 \
존재합니다"
-#: svn/changelist-cmd.c:61 svn/diff-cmd.c:136 svn/info-cmd.c:477
-#: svn/lock-cmd.c:100 svn/log-cmd.c:410 svn/propdel-cmd.c:68
-#: svn/propget-cmd.c:191 svn/proplist-cmd.c:127 svn/propset-cmd.c:102
-#: svn/revert-cmd.c:58 svn/status-cmd.c:229 svn/unlock-cmd.c:59
-#: svn/update-cmd.c:59
-#, c-format
-msgid "no such changelist '%s'"
-msgstr "없는 변경 목록: '%s'"
+#: ../svn/conflict-callbacks.c:666
+msgid "Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (h) help:"
+msgstr ""
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
+#: ../svn/conflict-callbacks.c:678
#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "'%s' 은 URL 같아 보이지 않습니다."
+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:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:65 svn/move-cmd.c:76
-#: svn/propedit-cmd.c:201
+#: ../svn/copy-cmd.c:126 ../svn/delete-cmd.c:65 ../svn/mkdir-cmd.c:66
+#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:215
#, fuzzy
-msgid ""
-"Local, non-commit operations do not take a log message or revision properties"
+msgid "Local, non-commit operations do not take a log message or revision \
properties" msgstr "사본에서만 작업하 , 커밋하지 않는 명 은 \
로그메시지를 받지 않습니다."
-#: svn/diff-cmd.c:120 svnserve/main.c:530
+#: ../svn/diff-cmd.c:171 ../svnserve/main.c:598
#, c-format
msgid "Can't open stdout"
msgstr "표준 출 (stdout)을 열 수 없습니다."
-#: svn/diff-cmd.c:122
+#: ../svn/diff-cmd.c:173
#, c-format
msgid "Can't open stderr"
msgstr "표준 에러(stderr)를 열 수 없습니다."
-#: svn/diff-cmd.c:211
+#: ../svn/diff-cmd.c:182
+#, fuzzy
+msgid "'--xml' option only valid with '--summarize' option"
+msgstr "'--new' 옵션은 '--old' 옵션하 같이 사용하여야합니다."
+
+#: ../svn/diff-cmd.c:257
msgid "'--new' option only valid with '--old' option"
msgstr "'--new' 옵션은 '--old' 옵션하 같이 사용하여야합니다."
-#: svn/diff-cmd.c:241
+#: ../svn/diff-cmd.c:287
#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr "diff 대상은 작업 사본과 URL을 동시에 포함 수 \
없습니다."
-#: svn/export-cmd.c:87
-msgid ""
-"Destination directory exists; please remove the directory or use --force to "
-"overwrite"
-msgstr ""
-"대상 디 리가 존재합니다; 디 리를 거하거나 --force \
옵션을 사용하여 덮"
-"어 쓰십시오."
+#: ../svn/export-cmd.c:88
+msgid "Destination directory exists; please remove the directory or use --force to \
overwrite" +msgstr "대상 디 리가 존재합니다; 디 리를 \
거하거나 --force 옵션을 사용하여 덮어 쓰십시오."
-#: svn/help-cmd.c:45
+#: ../svn/help-cmd.c:45
#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
@@ -5547,15 +6454,13 @@ msgstr ""
"'svn --version'를 사용하여 버 과 원격 속 모듈에 대한 보를 \
얻으십시오.\n" " 또는 'svn --version --quiet'를 사용하여 버 \
보만 얻으십시오.\n" "\n"
-"대부분의 하위 명 들은 재귀 으로 수행하면서 파일이나 디 \
리를 인자로 취합"
-"니다.\n"
-"명 들에 인자가 주어지지 않으면 현재 디 리를 포함하여 \
재귀 으로 수행하"
-"게\n"
+"대부분의 하위 명 들은 재귀 으로 수행하면서 파일이나 디 \
리를 인자로 취합니다.\n" +"명 들에 인자가 주어지지 않으면 \
현재 디 리를 포함하여 재귀 으로 수행하게\n" "됩니다.\n"
"\n"
"가능한 명 :\n"
-#: svn/help-cmd.c:58
+#: ../svn/help-cmd.c:58
msgid ""
"Subversion is a tool for version control.\n"
"For additional information, see http://subversion.tigris.org/\n"
@@ -5563,7 +6468,7 @@ msgstr ""
"Subversion은 형상관리를 위한 도구입니다.\n"
"더 상세한 보를 위해서는 http://subversion.tigris.org/ 를 \
방문하세요.\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1439
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1818
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5571,191 +6476,191 @@ msgstr ""
" 장소(repository) 근 모듈(RA) 목록:\n"
"\n"
-#: svn/import-cmd.c:82
+#: ../svn/import-cmd.c:83
msgid "Repository URL required when importing"
msgstr "임포트 때는 장소 URL이 필요합니다."
-#: svn/import-cmd.c:86
+#: ../svn/import-cmd.c:87
msgid "Too many arguments to import command"
msgstr "많은 인자가 import 명 에 주어졌습니다."
-#: svn/import-cmd.c:101
+#: ../svn/import-cmd.c:102
#, c-format
msgid "Invalid URL '%s'"
msgstr "잘못된 URL '%s'"
-#: svn/info-cmd.c:88
+#: ../svn/info-cmd.c:90
#, c-format
msgid "'%s' has invalid revision"
msgstr "'%s'는 잘못된 리비 을 가지 있습니다"
-#: svn/info-cmd.c:250 svnadmin/main.c:1134
+#: ../svn/info-cmd.c:239 ../svnadmin/main.c:1199
#, c-format
msgid "Path: %s\n"
msgstr "경로: %s\n"
-#: svn/info-cmd.c:256 svnlook/main.c:738
+#: ../svn/info-cmd.c:245
#, c-format
msgid "Name: %s\n"
msgstr "이름: %s\n"
-#: svn/info-cmd.c:260
+#: ../svn/info-cmd.c:249
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:263
+#: ../svn/info-cmd.c:252
#, c-format
msgid "Repository Root: %s\n"
msgstr " 장소 루트: %s\n"
-#: svn/info-cmd.c:267
+#: ../svn/info-cmd.c:256
#, c-format
msgid "Repository UUID: %s\n"
msgstr " 장소 UUID: %s\n"
-#: svn/info-cmd.c:271
+#: ../svn/info-cmd.c:260
#, c-format
msgid "Revision: %ld\n"
msgstr "리비 : %ld\n"
-#: svn/info-cmd.c:276
+#: ../svn/info-cmd.c:265
#, c-format
msgid "Node Kind: file\n"
msgstr "노드 종류: 파일\n"
-#: svn/info-cmd.c:280
+#: ../svn/info-cmd.c:269
#, c-format
msgid "Node Kind: directory\n"
msgstr "노드 종류: 디 리\n"
-#: svn/info-cmd.c:284
+#: ../svn/info-cmd.c:273
#, c-format
msgid "Node Kind: none\n"
msgstr "노드 종류: 없음\n"
-#: svn/info-cmd.c:289
+#: ../svn/info-cmd.c:278
#, c-format
msgid "Node Kind: unknown\n"
msgstr "노드 종류: 알 지지 않음\n"
-#: svn/info-cmd.c:298
+#: ../svn/info-cmd.c:287
#, c-format
msgid "Schedule: normal\n"
msgstr "스케쥴: 일반\n"
-#: svn/info-cmd.c:302
+#: ../svn/info-cmd.c:291
#, c-format
msgid "Schedule: add\n"
msgstr "스케쥴: 추가\n"
-#: svn/info-cmd.c:306
+#: ../svn/info-cmd.c:295
#, c-format
msgid "Schedule: delete\n"
msgstr "스케쥴: 삭 \n"
-#: svn/info-cmd.c:310
+#: ../svn/info-cmd.c:299
#, c-format
msgid "Schedule: replace\n"
msgstr "스케쥴: 치환\n"
-#: svn/info-cmd.c:326
+#: ../svn/info-cmd.c:315
#, c-format
msgid "Depth: empty\n"
msgstr ""
-#: svn/info-cmd.c:330
+#: ../svn/info-cmd.c:319
#, c-format
msgid "Depth: files\n"
msgstr ""
-#: svn/info-cmd.c:334
+#: ../svn/info-cmd.c:323
#, c-format
msgid "Depth: immediates\n"
msgstr ""
#. Other depths should never happen here.
-#: svn/info-cmd.c:345
+#: ../svn/info-cmd.c:334
#, c-format
msgid "Depth: INVALID\n"
msgstr ""
-#: svn/info-cmd.c:349
+#: ../svn/info-cmd.c:338
#, c-format
msgid "Copied From URL: %s\n"
msgstr "복사해 올 URL: %s\n"
-#: svn/info-cmd.c:353
+#: ../svn/info-cmd.c:342
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "복사해 올 리비 : %ld\n"
-#: svn/info-cmd.c:358
+#: ../svn/info-cmd.c:347
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "마지막 수 작업자: %s\n"
-#: svn/info-cmd.c:362
+#: ../svn/info-cmd.c:351
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "마지막 수 리비 : %ld\n"
-#: svn/info-cmd.c:367
+#: ../svn/info-cmd.c:356
msgid "Last Changed Date"
msgstr "마지막 수 일자"
-#: svn/info-cmd.c:373
+#: ../svn/info-cmd.c:362
msgid "Text Last Updated"
msgstr "마지막 내용 수 일자"
-#: svn/info-cmd.c:377
+#: ../svn/info-cmd.c:366
msgid "Properties Last Updated"
msgstr "마지막 속성 수 일자"
-#: svn/info-cmd.c:380
+#: ../svn/info-cmd.c:369
#, c-format
msgid "Checksum: %s\n"
msgstr "체크섬: %s\n"
-#: svn/info-cmd.c:385
+#: ../svn/info-cmd.c:374
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "충돌한 이 이스 파일: %s\n"
-#: svn/info-cmd.c:391
+#: ../svn/info-cmd.c:380
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "충돌한 이 작업 파일: %s\n"
-#: svn/info-cmd.c:396
+#: ../svn/info-cmd.c:385
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "충돌한 현재 이스 파일: %s\n"
-#: svn/info-cmd.c:401
+#: ../svn/info-cmd.c:390
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "충돌한 속성 파일: %s\n"
-#: svn/info-cmd.c:409
+#: ../svn/info-cmd.c:398
#, c-format
msgid "Lock Token: %s\n"
msgstr " 금 큰: %s\n"
-#: svn/info-cmd.c:413
+#: ../svn/info-cmd.c:402
#, c-format
msgid "Lock Owner: %s\n"
msgstr " 금 생성자: %s\n"
-#: svn/info-cmd.c:418
+#: ../svn/info-cmd.c:407
msgid "Lock Created"
msgstr " 금 생성일: "
-#: svn/info-cmd.c:422
+#: ../svn/info-cmd.c:411
msgid "Lock Expires"
msgstr " 금 만료일: "
-#: svn/info-cmd.c:431
+#: ../svn/info-cmd.c:420
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5764,7 +6669,7 @@ msgstr ""
" 금 이 (%i 행):\n"
"%s\n"
-#: svn/info-cmd.c:432
+#: ../svn/info-cmd.c:421
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5773,12 +6678,12 @@ msgstr ""
" 금 이 (%i 행):\n"
"%s\n"
-#: svn/info-cmd.c:439
+#: ../svn/info-cmd.c:428
#, c-format
msgid "Changelist: %s\n"
msgstr "변경목록: %s\n"
-#: svn/info-cmd.c:547
+#: ../svn/info-cmd.c:514
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5787,7 +6692,7 @@ msgstr ""
"%s: (버 관리 대상이 아님)\n"
"\n"
-#: svn/info-cmd.c:556
+#: ../svn/info-cmd.c:521
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5796,67 +6701,94 @@ msgstr ""
"%s: ( 효한 URL이 아님)\n"
"\n"
-#: svn/lock-cmd.c:52
+#: ../svn/list-cmd.c:90
+msgid "%b %d %H:%M"
+msgstr ""
+
+#: ../svn/list-cmd.c:95
+msgid "%b %d %Y"
+msgstr ""
+
+#: ../svn/lock-cmd.c:53
msgid "Lock comment contains a zero byte"
msgstr "Lock comment의 길이가 0 입니다."
-#: svn/log-cmd.c:162
+#: ../svn/log-cmd.c:176
msgid "(no author)"
msgstr "(작성자 불명)"
-#: svn/log-cmd.c:173
+#: ../svn/log-cmd.c:182
msgid "(no date)"
msgstr "(작성일 불명)"
-#: svn/log-cmd.c:203
+#: ../svn/log-cmd.c:212
#, c-format
msgid "Changed paths:\n"
msgstr "변경된 경로:\n"
-#: svn/log-cmd.c:218
+#: ../svn/log-cmd.c:227
#, c-format
msgid " (from %s:%ld)"
msgstr "(원본 %s:%ld)"
-#: svn/log-cmd.c:475
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "작업 사본의 경로는 하나만 가능합니다."
+#. Print the result of merge line
+#: ../svn/log-cmd.c:242
+#, c-format
+msgid "Merged via:"
+msgstr ""
+
+#: ../svn/log-cmd.c:456
+#, fuzzy
+msgid "'with-all-revprops' option only valid in XML mode"
+msgstr "'incremental' 옵션은 XML 모드에서만 가능합니다"
+
+#: ../svn/log-cmd.c:460
+#, fuzzy
+msgid "'with-revprop' option only valid in XML mode"
+msgstr "'incremental' 옵션은 XML 모드에서만 가능합니다"
-#: svn/log-cmd.c:487
+#: ../svn/log-cmd.c:531
msgid "Only relative paths can be specified after a URL"
msgstr "URL 뒤에 지 때는 상대 경로만 가능합니다."
-#: svn/main.c:60
+#: ../svn/log-cmd.c:571
+#, c-format
+msgid "cannot assign with 'with-revprop' option (drop the '=')"
+msgstr ""
+
+#: ../svn/main.c:114
msgid "force operation to run"
msgstr "강 로 실행합니다."
-#: svn/main.c:62
+#: ../svn/main.c:116
msgid "force validity of log message source"
msgstr "로그 메시지의 효성을 확인하지 않습니다."
-#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:231 svnadmin/main.c:234
-#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
+#: ../svn/main.c:117 ../svn/main.c:118 ../svnadmin/main.c:233
+#: ../svnadmin/main.c:236 ../svndumpfilter/main.c:877
+#: ../svndumpfilter/main.c:880 ../svnlook/main.c:96 ../svnlook/main.c:108
+#: ../svnsync/main.c:144 ../svnsync/main.c:146
msgid "show help on a subcommand"
msgstr "부속 명 어에 대한 도움말 보기"
-#: svn/main.c:65
+#: ../svn/main.c:119
msgid "specify log message ARG"
msgstr "커밋 로그 메시지를 지 합니다."
-#: svn/main.c:66
-msgid "print as little as possible"
-msgstr "가능한 게 출 합니다."
+#: ../svn/main.c:120
+#, fuzzy
+msgid "print nothing, or only summary information"
+msgstr "기타 보를 출 합니다."
-#: svn/main.c:67
+#: ../svn/main.c:121
msgid "descend recursively, same as --depth=infinity"
msgstr ""
-#: svn/main.c:68
+#: ../svn/main.c:122
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr ""
-#: svn/main.c:70
+#: ../svn/main.c:124
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -5864,15 +6796,14 @@ msgstr ""
"리비 ARG 에 의한 변경 (-r ARG-1:ARG 와 같음)\n"
" ARG 가 음수라면 이것은 -r ARG:ARG-1 와 \
같습니다"
-#: svn/main.c:74
+#: ../svn/main.c:128
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
" NUMBER revision number\n"
" '{' DATE '}' revision at start of the date\n"
" 'HEAD' latest in repository\n"
-" 'BASE' base rev of item's working "
-"copy\n"
+" 'BASE' base rev of item's working copy\n"
" 'COMMITTED' last commit at or before BASE\n"
" 'PREV' revision just before COMMITTED"
msgstr ""
@@ -5882,183 +6813,192 @@ msgstr ""
" '{' DATE '}' 리비 이 시작하는 시각\n"
" 'HEAD' 장소의 마지막 리비 \n"
" 'BASE' 작업 사본을 꺼내온 리비 \
\n"
-" 'COMMITTED' BASE 이 에 마지막 커밋된 \
리비"
-" \n"
+" 'COMMITTED' BASE 이 에 마지막 커밋된 \
리비 \n" " 'PREV' COMMITTED 의 직 \
리비 "
-#: svn/main.c:84
+#: ../svn/main.c:138
msgid "read log message from file ARG"
msgstr "arg에서 로그 메시지를 읽습니다."
-#: svn/main.c:86
+#: ../svn/main.c:140
msgid "give output suitable for concatenation"
msgstr "덧붙이기 쉬운 형태로 출 합니다."
-#: svn/main.c:89
+#: ../svn/main.c:143
msgid "treat value as being in charset encoding ARG"
msgstr "값을 arg에 해당하는 문자코드로 취급합니다."
-#: svn/main.c:92 svnadmin/main.c:237 svndumpfilter/main.c:786
-#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
-#: svnversion/main.c:126
+#: ../svn/main.c:145 ../svnadmin/main.c:239 ../svndumpfilter/main.c:883
+#: ../svnlook/main.c:138 ../svnserve/main.c:204 ../svnsync/main.c:142
+#: ../svnversion/main.c:127
msgid "show program version information"
msgstr "프로그램 버 보를 보여줍니다"
-#: svn/main.c:93
+#: ../svn/main.c:146
msgid "print extra information"
msgstr "기타 보를 출 합니다."
-#: svn/main.c:94
+#: ../svn/main.c:147
msgid "display update information"
msgstr "업데이트 보를 출 합니다."
-#: svn/main.c:96
+#: ../svn/main.c:148
msgid "specify a username ARG"
msgstr "arg를 속에 필요한 사용자 ID로 사용합니다."
-#: svn/main.c:98
+#: ../svn/main.c:149
msgid "specify a password ARG"
msgstr "arg를 속에 필요한 패스워드로 사용합니다."
-#: svn/main.c:101
+#: ../svn/main.c:152
+#, fuzzy
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"
+" 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"
+" 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"
+" 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"
+" Ignore changes in EOL style.\n"
+" -p (--show-c-function):\n"
+" Show C function name in diff output."
msgstr ""
"기본값: '-u'. Subversion이 외부 diff 프로그램을 실행 때\n"
" ARG가 프로그램의 인자로 넘겨집니다\n"
-" to the program. But when Subversion is using "
-"its\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"
+" 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"
+" 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"
-#: svn/main.c:130
+#: ../svn/main.c:185
msgid "pass contents of file ARG as additional args"
msgstr "arg로 주어진 파일 내용을 옵션으로 추가합니다."
-#: svn/main.c:132
+#: ../svn/main.c:187
+#, fuzzy
msgid ""
-"pass depth ('empty', 'files', 'immediates', or\n"
-" 'infinity') as ARG"
-msgstr ""
+"limit operation by depth ARG ('empty', 'files',\n"
+" 'immediates', or 'infinity')"
+msgstr "'%s'는 올바른 subversion 속성 이름이 아닙니다"
-#: svn/main.c:135
+#: ../svn/main.c:191
+#, fuzzy
+msgid ""
+"set new working copy depth to ARG ('empty',\n"
+" 'files', 'immediates', or 'infinity')"
+msgstr "'%s'는 올바른 subversion 속성 이름이 아닙니다"
+
+#: ../svn/main.c:194 ../svnlook/main.c:141
msgid "output in XML"
msgstr "XML 포맷으로 출 합니다."
-#: svn/main.c:136
+#: ../svn/main.c:195
msgid "use strict semantics"
msgstr "엄밀히 용합니다."
-#: svn/main.c:138
+#: ../svn/main.c:197
msgid "do not cross copies while traversing history"
msgstr "과거에 copy 명 이 일어난 지 까지만 로그를 \
검색합니다."
-#: svn/main.c:140
+#: ../svn/main.c:199
msgid "disregard default and svn:ignore property ignores"
msgstr "svn:ignore로 지 한 것과 디폴트로 무시하는 파일들을 \
무시하지 않습니다."
-#: svn/main.c:142 svnsync/main.c:113
+#: ../svn/main.c:201 ../svnsync/main.c:118
msgid "do not cache authentication tokens"
msgstr "인증 보를 캐시에 장하지 않습니다."
-#: svn/main.c:144 svnsync/main.c:111
+#: ../svn/main.c:203 ../svnsync/main.c:128
+msgid ""
+"accept unknown SSL server certificates without\n"
+" prompting (but only with '--non-interactive')"
+msgstr ""
+
+#: ../svn/main.c:207 ../svnsync/main.c:116
msgid "do no interactive prompting"
msgstr "대화식 사용자 입 을 기다리지 않습니다."
-#: svn/main.c:146
+#: ../svn/main.c:209
msgid "try operation but make no changes"
msgstr "실 명 은 수행하지 않 시도만 합니다."
-#: svn/main.c:148 svnlook/main.c:108
+#: ../svn/main.c:211 ../svnlook/main.c:117
msgid "do not print differences for deleted files"
msgstr "삭 된 파일에 대해서는 차이를 출 하지 않습니다."
-#: svn/main.c:150
+#: ../svn/main.c:213
msgid "notice ancestry when calculating differences"
msgstr "차이를 구 때, 모 히스 리를 참 합니다."
-#: svn/main.c:152
+#: ../svn/main.c:215
msgid "ignore ancestry when calculating merges"
msgstr "병합 때, 히스 리를 무시합니다."
-#: svn/main.c:154
+#: ../svn/main.c:217
msgid "ignore externals definitions"
msgstr "외부 모듈(svn:externals로 지 된)은 무시합니다."
-#: svn/main.c:157
+#: ../svn/main.c:219
msgid "use ARG as diff command"
msgstr "arg를 diff 명 으로 사용합니다."
-#: svn/main.c:159
+#: ../svn/main.c:220
msgid "use ARG as merge command"
msgstr "arg를 merge 명 으로 사용합니다."
-#: svn/main.c:161
+#: ../svn/main.c:221
msgid "use ARG as external editor"
msgstr "arg를 외부 편집기로 사용합니다."
-#: svn/main.c:164
+#: ../svn/main.c:224
#, fuzzy
msgid "mark revisions as merged (use with -r)"
msgstr "속성의 리비 지 합니다. (-r 옵션과 같이 사용)"
-#: svn/main.c:166
+#: ../svn/main.c:225
msgid "use ARG as the older target"
msgstr "arg를 오래된 파일로 사용합니다."
-#: svn/main.c:168
+#: ../svn/main.c:226
msgid "use ARG as the newer target"
msgstr "arg를 새 파일로 사용합니다."
-#: svn/main.c:170
+#: ../svn/main.c:228
msgid "operate on a revision property (use with -r)"
msgstr "속성의 리비 지 합니다. (-r 옵션과 같이 사용)"
-#: svn/main.c:172
+#: ../svn/main.c:229
msgid "relocate via URL-rewriting"
msgstr "URL-rewriting을 통하여 장소 URL을 변경합니다."
-#: svn/main.c:174 svnadmin/main.c:273 svnsync/main.c:131
+#: ../svn/main.c:231 ../svnadmin/main.c:275 ../svnsync/main.c:140
msgid "read user configuration files from directory ARG"
msgstr "arg로 지 된 디 리에서 사용자 구성화일을 읽습니다."
-#: svn/main.c:176
+#: ../svn/main.c:232
msgid "enable automatic properties"
msgstr "자동 속성기능을 활성화합니다."
-#: svn/main.c:178
+#: ../svn/main.c:233
msgid "disable automatic properties"
msgstr "자동 속성기능을 비활성화합니다."
-#: svn/main.c:180
+#: ../svn/main.c:235
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6068,53 +7008,81 @@ msgstr ""
"행종료문자를 표준 시스템 문자가 아닌\n"
" 파일의 svn:eol-style 속성을\n"
" 'native'로 두어 다른 것을 사용합니다.\n"
-" ARG는 'LF', 'CR', 'CRLF' 중의 하나가 수 \
있습니"
-"다."
+" ARG는 'LF', 'CR', 'CRLF' 중의 하나가 수 \
있습니다."
-#: svn/main.c:188
+#: ../svn/main.c:242
msgid "maximum number of log entries"
msgstr "로그 개수의 최대값"
-#: svn/main.c:190
+#: ../svn/main.c:243
msgid "don't unlock the targets"
msgstr "대상의 금을 해 하지 않 진행합니다."
-#: svn/main.c:192
+#: ../svn/main.c:244
msgid "show a summary of the results"
msgstr "요약된 결과 보기"
-#: svn/main.c:194
+#: ../svn/main.c:245
msgid "remove changelist association"
msgstr "변경 목록 관계를 거합니다."
-#: svn/main.c:196
-msgid "operate only on members of changelist ARG"
+#: ../svn/main.c:247
+#, fuzzy
+msgid ""
+"operate only on members of changelist ARG\n"
+" [aliases: --cl]"
msgstr "변경 목록 ARG에 있는 것에만 가능한 명 입니다."
-#: svn/main.c:198
-msgid "don't delete changelist after commit"
+#: ../svn/main.c:251
+#, fuzzy
+msgid "don't delete changelists after commit"
msgstr "커밋후에 변경 목록을 삭 하지 않습니다."
-#: svn/main.c:200
+#: ../svn/main.c:252
msgid "keep path in working copy"
msgstr "작업사본의 경로를 지합니다"
-#: svn/main.c:202
+#: ../svn/main.c:254
+#, fuzzy
+msgid "retrieve all revision properties"
+msgstr "리비 속성을 필터하지 마십시오."
+
+#: ../svn/main.c:256
msgid ""
"set revision property ARG in new revision\n"
-" using the name=value format"
+" using the name[=value] format"
msgstr ""
-#: svn/main.c:206
+#: ../svn/main.c:259
#, fuzzy
msgid "make intermediate directories"
msgstr "어떤 디 리도 만들 수 없습니다"
-#: svn/main.c:208
-msgid "use/display additional information from merge history"
+#: ../svn/main.c:261
+msgid ""
+"use/display additional information from merge\n"
+" history"
+msgstr ""
+
+#: ../svn/main.c:265
+msgid ""
+"specify automatic conflict resolution action\n"
+" ('postpone', 'base', 'mine-conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full',\n"
+" 'edit', 'launch')"
+msgstr ""
+
+#: ../svn/main.c:273
+msgid ""
+"specify which collection of revisions to display\n"
+" ('merged', 'eligible')"
msgstr ""
-#: svn/main.c:249
+#: ../svn/main.c:277
+msgid "lump-merge all of source URL's unmerged changes"
+msgstr ""
+
+#: ../svn/main.c:324
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6124,11 +7092,11 @@ msgstr ""
"추가하도록 스케쥴링 되며, 다음 커밋 때, 추가됩니다.\n"
"사용법: add PATH...\n"
-#: svn/main.c:255
+#: ../svn/main.c:329
msgid "add intermediate parents"
msgstr ""
-#: svn/main.c:258
+#: ../svn/main.c:332
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6144,7 +7112,7 @@ msgstr ""
" REV가 지 되면, 지 된 REV에서부터 찾아 보여줍니다.\n"
" \n"
-#: svn/main.c:268
+#: ../svn/main.c:341
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6158,10 +7126,10 @@ msgstr ""
" REV가 지 되면, 지 된 REV에서부터 찾아 출 합니다.\n"
" \n"
-#: svn/main.c:276
+#: ../svn/main.c:349
#, fuzzy
msgid ""
-"Associate (or deassociate) local paths with changelist CLNAME.\n"
+"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME TARGET...\n"
" 2. changelist --remove TARGET...\n"
msgstr ""
@@ -6169,7 +7137,8 @@ msgstr ""
"사용법: 1. changelist CLNAME TARGET...\n"
" 2. changelist --clear TARGET...\n"
-#: svn/main.c:283
+#: ../svn/main.c:355
+#, fuzzy
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6192,6 +7161,9 @@ msgid ""
" 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 ""
"작업사본을 장소로부터 꺼냅니다.\n"
"사용법: checkout URL[@REV]... [PATH]\n"
@@ -6204,8 +7176,7 @@ msgstr ""
" 사용됩니다.\n"
" \n"
" 현 작업 사본에 관리대상으로 추가되지 않은 파일이 존재하 \
, checkout \n"
-" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 \
오류를 내게 됩니"
-"다.\n"
+" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 \
오류를 내게 됩니다.\n" " 이 경우 --force 를 주게되면, 오류가 \
나지 않으며, 장소의 관리대상으로\n" " 취급하게 됩니다. 두 \
대응되는 대상이 같은 형식(파일 또는 디 리)이면,\n" " \
파일의 경우 장소의 내용과 다른 것이 작업사본에 있는 경우 \
장소에서 \n" @@ -6216,7 +7187,7 @@ msgstr ""
" 이 게 충돌나는 대상에 대해서는 처음 컬럼에 'E'가 \
나타나게 됩니다.\n" "\n"
-#: svn/main.c:308
+#: ../svn/main.c:382
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6226,7 +7197,7 @@ msgstr ""
"중단된 명 을 재개합니다.\n"
"사용법: cleanup [PATH...]\n"
-#: svn/main.c:315
+#: ../svn/main.c:389
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6244,7 +7215,7 @@ msgstr ""
" 긴 파일이 있거나, 긴 파일이 들어 있는 디 리는\n"
" 성공 으로 커밋이 되면 금이 해 가 됩니다.\n"
-#: svn/main.c:323
+#: ../svn/main.c:397
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6264,20 +7235,28 @@ msgstr ""
" 긴 파일이 있거나, 긴 파일이 들어 있는 디 리는\n"
" 성공 으로 커밋이 되면 금이 해 가 됩니다.\n"
-#: svn/main.c:338
+#: ../svn/main.c:410
+#, fuzzy
msgid ""
-"Duplicate something in working copy or repository, remembering history.\n"
+"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"
+"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 & tag\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[@REV]... DST\n"
@@ -6292,7 +7271,8 @@ msgstr ""
" URL -> URL: 서버상에서 바로 복사함; 브랜치 & 태그를 만들 때 \
사용됨\n" " 모 SRC들은 같은 종류의 것이어야 합니다.\n"
-#: svn/main.c:354
+#: ../svn/main.c:432
+#, fuzzy
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -6301,7 +7281,7 @@ msgid ""
" 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 --keep-local option is given.\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 option is given.\n"
"\n"
@@ -6321,12 +7301,12 @@ msgstr ""
" 2. URL로 지 된 아이템들은 장소에서 즉시 삭 됩니다.\n"
"\n"
-#: svn/main.c:372
+#: ../svn/main.c:448
+#, 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"
+" 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"
@@ -6340,9 +7320,8 @@ msgid ""
" 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"
+" 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"
@@ -6351,42 +7330,32 @@ msgid ""
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"
+" 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,M 두 리비 에서의 어떤 내용 \
변경이 있는"
-"지\n"
-" 보여줍니다. TARGET들은 모두가 작업사본 경로이거나 모두가 \
URL일 수 있습니"
-"다.\n"
+" 1. REV 리비 에 있는 TARGET들이 N,M 두 리비 에서의 어떤 내용 \
변경이 있는지\n" +" 보여줍니다. TARGET들은 모두가 작업사본 \
경로이거나 모두가 URL일 수 있습니다.\n" "\n"
" TARGET 중에 작업사본내의 경로이면서 N이 생략되면 BASE가 \
사용되 ,\n"
-" 경로가 아니면 N은 반드시 명시되어야합니다. 또한 \
작업사본내의 경로이면"
-"서,\n"
+" 경로가 아니면 N은 반드시 명시되어야합니다. 또한 \
작업사본내의 경로이면서,\n" " M이 생략되면 작업중인 \
파일이 사용되 , URL의 경우 HEAD가 사용됩니다.\n" " '-c M' \
옵션은 N = M-1 인 '-r N:M' 옵션과 같습니다.\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"
+" 2. OLDREV 리비 의 OLD-TGT와 NEWREV 리비 의 NEW-TGT의 차이를 \
보여줍니다.\n" +" PATH가 주어지면, OLD-TGT와 NEW-TGT에 대한 상대 \
경로를 구하여 차이를 보여주며,\n" " 출 은 그 경로에 대한 \
것으로 한됩니다.\n"
-" OLD-TGT와 NEW-TGT는 모두 작업 사본내의 경로나 URL[@REV]로 \
표현 수 있습"
-"니다.\n"
-" NEW-TGT가 생략되면 OLD-TGT를 사용합니다. -r N은 OLD-TGT의 \
디폴트 리비 "
-"을 N으로\n"
-" -r N:M 은 OLDREV의 디폴트 리비 을 N으로 NEW-TGT에 대해 \
M으로 처리합니"
-"다.\n"
+" OLD-TGT와 NEW-TGT는 모두 작업 사본내의 경로나 URL[@REV]로 \
표현 수 있습니다.\n" +" NEW-TGT가 생략되면 OLD-TGT를 \
사용합니다. -r N은 OLD-TGT의 디폴트 리비 을 N으로\n" +" -r N:M \
은 OLDREV의 디폴트 리비 을 N으로 NEW-TGT에 대해 M으로 \
처리합니다.\n" " -c M 은 OLDREV의 기본값을 M-1로 NEWREV의 \
기본값을 M으로 처리합니다.\n" "\n"
-" 3. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' 의 줄임 표현입"
-"니다.\n"
+" 3. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' 의 줄임 \
표현입니다.\n" "\n"
" 'svn diff' 을 사용하면 작업 중 수 된 내용을 볼 수 \
있습니다.\n"
-#: svn/main.c:402
+#: ../svn/main.c:476
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6425,7 +7394,7 @@ msgstr ""
" PEGREV가 지 경우엔, 어떤 리비 에서 대상을 먼 찾을지 \
결 합니다.\n" " \n"
-#: svn/main.c:425
+#: ../svn/main.c:497
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6433,7 +7402,8 @@ msgstr ""
"본 프로그램과 그 하위 명 들에 대한 사용법을 보여줍니다.\n"
"usage: help [SUBCOMMAND...]\n"
-#: svn/main.c:431
+#: ../svn/main.c:503
+#, fuzzy
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6443,6 +7413,8 @@ msgid ""
" 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"
@@ -6453,12 +7425,13 @@ msgstr ""
" PATH가 디 리이면, 그 내용은 URL에 모두 추가 됩니다.\n"
" \n"
-#: svn/main.c:444
+#: ../svn/main.c:517
+#, fuzzy
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
"\n"
-" Print information about each TARGET (default: '.')\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 ""
@@ -6468,7 +7441,7 @@ msgstr ""
" 각 PATH에 해당하는 보를 출 합니다. (기본값: '.').\n"
" PATH는 작업 사본 경로 혹은 URL이 수 있습니다.\n"
-#: svn/main.c:455
+#: ../svn/main.c:527
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6507,7 +7480,7 @@ msgstr ""
" 크기(바이트)\n"
" 마지막 커밋한 짜와 시각\n"
-#: svn/main.c:477
+#: ../svn/main.c:548
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6519,18 +7492,23 @@ msgstr ""
"커밋 수 없습니다.\n"
"사용법: lock TARGET...\n"
"\n"
-" --force 를 사용하면 다른 사람이나 다른 사본에서 \
궜을지라도 빼앗아옵니"
-"다.\n"
+" --force 를 사용하면 다른 사람이나 다른 사본에서 \
궜을지라도 빼앗아옵니다.\n"
-#: svn/main.c:485
+#: ../svn/main.c:554
msgid "read lock comment from file ARG"
msgstr "arg에서 금 메시지를 읽습니다."
-#: svn/main.c:486
+#: ../svn/main.c:555
msgid "specify lock comment ARG"
msgstr "arg에 금 메시지를 지 합니다."
-#: svn/main.c:489
+#: ../svn/main.c:556
+#, fuzzy
+msgid "force validity of lock comment source"
+msgstr "로그 메시지의 효성을 확인하지 않습니다."
+
+#: ../svn/main.c:559
+#, fuzzy
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6541,7 +7519,9 @@ msgid ""
"\n"
" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
" If specified, REV determines in which revision the URL is first\n"
-" looked up. The default revision range is HEAD:1.\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"
" 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"
@@ -6584,13 +7564,23 @@ msgstr ""
" 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:519
+#: ../svn/main.c:588
+#, fuzzy
+msgid "retrieve revision property ARG"
+msgstr "리비 속성을 필터하지 마십시오."
+
+#: ../svn/main.c:589
+#, fuzzy
+msgid "the change made in revision ARG"
+msgstr "노드 리비 읽는 중"
+
+#: ../svn/main.c:592
#, 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 | -r N:M] [SOURCE[@REV] [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"
@@ -6600,21 +7590,27 @@ msgid ""
" copy paths define the sources to be compared. The revisions must\n"
" be specified.\n"
"\n"
-" 3. In the third form, SOURCE can be a URL, or working copy item\n"
-" in which case the corresponding URL is used. If not specified,\n"
-" the copy source URL of SOURCE is used. If the WCPATH cannot be\n"
-" determined automatically, an error is displayed asking for an\n"
-" explicit SOURCE. This URL in revision REV is compared as it\n"
-" existed between revisions N and M. If REV is not specified, HEAD\n"
-" is assumed. The '-c M' option is equivalent to '-r N:M' where\n"
-" N = M-1. Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
-" If a revision range is not specified, it is assumed to be\n"
-" -r OLDEST_REV_OF_SOURCE_AT_URL:HEAD.\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' instances 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"
+" 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"
@@ -6629,10 +7625,8 @@ msgstr ""
" 이 경우 리비 이 반드시 지 되어야 합니다.\n"
" \n"
" \n"
-" 3. 세번째 형식에서는 SOURCE에는 특 URL, 혹은 작업중인 \
파일을 지 합니"
-"다.\n"
-" 파일인 경우 해당 URL을 구하여 비교대상으로 합니다. 그 \
URL의 리비 REV"
-"의\n"
+" 3. 세번째 형식에서는 SOURCE에는 특 URL, 혹은 작업중인 \
파일을 지 합니다.\n" +" 파일인 경우 해당 URL을 구하여 \
비교대상으로 합니다. 그 URL의 리비 REV의\n" " 내용을 리비 \
N과 M의 내용과 비교하게 됩니다. REV가 누락되면 HEAD로\n" " \
가 합니다.\n" " '-c M' 옵션은 N = M-1 인 '-r N:M' 옵션과 \
같습니다.\n" @@ -6640,11 +7634,22 @@ msgstr ""
"\n"
" WCPATH는 작업사본의 경로이며 병합되는 내용이 반영되는 \
곳입니다.\n" " WCPATH를 생략하면, SOURCE의 마지막 요소인 파일과 \
같은 이름이 현재\n"
-" 디 리안에 있다면 그 파일에 반영되며, 그 지 않는 경우 \
'.'을 가 하게 됩"
-"니다.\n"
+" 디 리안에 있다면 그 파일에 반영되며, 그 지 않는 경우 \
'.'을 가 하게 됩니다.\n" " \n"
-#: svn/main.c:553
+#: ../svn/main.c:630
+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:641
#, fuzzy
msgid ""
"Create a new directory under version control.\n"
@@ -6676,12 +7681,13 @@ msgstr ""
"\n"
" 두 경우 생성 디 리 상위의 디 리들은 존재해야만 \
합니다.\n"
-#: svn/main.c:571
+#: ../svn/main.c:658
+#, 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"
+"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"
@@ -6692,8 +7698,7 @@ msgid ""
" URL -> URL: complete server-side rename.\n"
" All the SRCs must be of the same type.\n"
msgstr ""
-"작업 사본내 혹은 장소 안의 파일이나 디 리를 \
이동하거나, 이름을 바꿉니"
-"다.\n"
+"작업 사본내 혹은 장소 안의 파일이나 디 리를 \
이동하거나, 이름을 바꿉니다.\n" "사용법: move SRC DST\n"
"복수의 원본들을 옮길 때, 반드시 디 리여야만 하는, \n"
"DST의 하위로 추가 것입니다.\n"
@@ -6702,12 +7707,11 @@ msgstr ""
" 주의: --revision 옵션은 더 이상 사용되지 않습니다.\n"
"\n"
" SRC와 DST 는 둘다 작업사본 혹은 URL이어야 합니다.\n"
-" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 \
스케쥴링하며, 로그 "
-"메시지도 복사됩니다.\n"
+" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 \
스케쥴링하며, 로그 메시지도 복사됩니다.\n" " URL -> URL: 서버 \
상에서만 이름을 바꾸며, 바로 커밋됩니다.\n" " 모 SRC들은 \
같은 종류의 것이어야 합니다.\n"
-#: svn/main.c:588
+#: ../svn/main.c:674
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6725,7 +7729,8 @@ msgstr ""
" 2. 원격지 REV 리비 의 버 관리되지 않는 속성을 \
거합니다.\n" " TARGET은 근 장소를 지 합니다.\n"
-#: svn/main.c:600
+#: ../svn/main.c:685
+#, fuzzy
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -6734,6 +7739,8 @@ msgid ""
" 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 TARGET...\n"
@@ -6743,7 +7750,7 @@ msgstr ""
" 2. 원격지의 버 관리되지 않는 속성을 편집합니다.\n"
" TARGET은 근 장소를 지 합니다.\n"
-#: svn/main.c:613
+#: ../svn/main.c:698
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6776,7 +7783,7 @@ msgstr ""
" (이 옵션은 바이너리 속성 출 을 재지 하여 파일에\n"
" 쓰로자 때 용합니다.)\n"
-#: svn/main.c:633
+#: ../svn/main.c:716
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6796,32 +7803,32 @@ msgstr ""
" 2. 원격지의 버 관리 대상이 아닌 속성을 출 .\n"
" TARGET은 근 장소를 지 합니다.\n"
-#: svn/main.c:646
+#: ../svn/main.c:727
+#, 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. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-" TARGET only determines which repository to access.\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 patterns to ignore.\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"
+" 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"
+" 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"
-" svn:executable - If present, make the file executable.\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"
@@ -6829,12 +7836,30 @@ msgid ""
" 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 relative directory path, optional\n"
-" revision flags, and an URL. For example\n"
+" revision flags and an URL. The ordering of the three elements\n"
+" implements different behavior. Subversion 1.4 and earlier only\n"
+" support the following formats and the URLs cannot have peg\n"
+" revisions:\n"
" foo http://example.com/repos/zig\n"
" foo/bar -r 1234 http://example.com/repos/zag\n"
+" Subversion 1.5 and greater support the above formats and the\n"
+" following formats where the URLs may have peg revisions:\n"
+" http://example.com/repos/zig foo\n"
+" -r 1234 http://example.com/repos/zig foo/bar\n"
+" Relative URLs are supported in Subversion 1.5 and greater for\n"
+" all above formats and 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"
" 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.\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"
@@ -6842,8 +7867,7 @@ msgid ""
msgstr ""
"파일, 디 리, 리비 의 PROPNAME 속성을 PROPVAL 값으로 설 \
합니다.\n" "사용법: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] "
-"[TARGET]\n"
+" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]\n"
"\n"
" 1. 작업 사본내에서 속성 값을 만듭니다.\n"
" 2. 장소 리비 에 버 관리하지 않는 속성을 만듭니다.\n"
@@ -6852,10 +7876,8 @@ msgstr ""
" PROVAL 값은 --file 로 지 하여 줄 수도 있습니다.\n"
" 참 : svn은 다음과 같은 특별한 '버 관리' 속성을 \
인식합니다.\n" " 이 외에도 임의의 원하는 속성을 설 수 \
있습니다.\n"
-" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 \
등에서 무시하는 "
-"목록을 지 합니다.\n"
-" svn:keywords - 본문 내에 치환 키워드 목록을 지 합니다. \
다음은 가능"
-"한 값들입니다.\n"
+" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 \
등에서 무시하는 목록을 지 합니다.\n" +" svn:keywords - 본문 \
내에 치환 키워드 목록을 지 합니다. 다음은 가능한 \
값들입니다.\n" " URL, HeadURL - 개체의 최 버 의 \
URL.\n" " Author, LastChangedBy - 최종 파일 수 작업자.\n"
" Date, LastChangedDate - 최종 파일 수 짜/시각.\n"
@@ -6863,40 +7885,54 @@ msgstr ""
" LastChangedRevision\n"
" Id - 위 네가지 키워드를 종합한 포맷.\n"
" \n"
-" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 \
파일을 실행가"
-"능 하도록 만듭니다.\n"
+" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 \
파일을 실행가능 하도록 만듭니다.\n" " svn:eol-style - 다음 중 \
하나 'native', 'LF', 'CR', 'CRLF'.\n" " svn:mime-type - 파일의 MIME \
형식을 지 합니다. \n" " 이 속성은 병합하는데 사용되며, \
Apache 웹서버가 사용합니다.\n" " 'text/' 로 시작하는 MIME \
형식은 텍스트로 취급하며,\n" " 그외의 것은 바이너리로 \
취급됩니다.\n" " svn:externals - 한 줄에 하나씩 지 하는 외부 \
모듈 리스트입니다.\n"
-" 각각은 현재 디 리에 대해 체크아웃, 업데이트시에 \
상대 디 리 경로"
-"로 만들어 지며,\n"
+" 각각은 현재 디 리에 대해 체크아웃, 업데이트시에 \
상대 디 리 경로로 만들어 지며,\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" " \n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type, svn-needs-"
-"lock\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type, svn-needs-lock\n"
" 속성들은 디 리에는 지 수 없으며, 설 시 재귀 \
으로 수행되는 명 이\n" " 아니라면, 디 리에 대해서는 \
실패하며, 재귀 일 경우 파일에 대해서만\n" " 설 됩니다.\n"
-#: svn/main.c:688
+#: ../svn/main.c:787
msgid "read property value from file ARG"
msgstr "arg에서 속성 값을 읽습니다."
-#: svn/main.c:691
+#: ../svn/main.c:790
+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:795
+msgid ""
+"specify automatic conflict resolution source\n"
+" ('base', 'working', 'mine-conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full')"
+msgstr ""
+
+#: ../svn/main.c:802
+#, 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.\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"
@@ -6905,7 +7941,7 @@ msgstr ""
" 단지 충돌 표시만을 없앨 뿐입니다. 충돌 요소들과 관 된 \
파일만\n" " 삭 하며, 다시 커밋 수 있는 상태로 \
만들어줍니다.\n"
-#: svn/main.c:701
+#: ../svn/main.c:812
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6913,21 +7949,20 @@ msgid ""
" Note: this subcommand does not require network access, and resolves\n"
" any conflicted states. However, it does not restore removed directories.\n"
msgstr ""
-"작업 사본을 받아 왔던 최초 상태로 되돌립니다. (작업한 \
내용을 모두 되돌립니"
-"다.)\n"
+"작업 사본을 받아 왔던 최초 상태로 되돌립니다. (작업한 \
내용을 모두 되돌립니다.)\n" "사용법: revert PATH...\n"
"\n"
-" 주의: 본 부속 명 은 네트워크 요청이 혀 필요하지 \
않습니다. 또한 충돌한 상"
-"황을\n"
-" 해결하지 않습니다. 그리 , 삭 된 디 리에 대해서는 \
다시 되돌 놓지 않습"
-"니다.\n"
+" 주의: 본 부속 명 은 네트워크 요청이 혀 필요하지 \
않습니다. 또한 충돌한 상황을\n" +" 해결하지 않습니다. 그리 , \
삭 된 디 리에 대해서는 다시 되돌 놓지 않습니다.\n"
-#: svn/main.c:710
+#: ../svn/main.c:820
+#, 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"
@@ -7026,8 +8061,7 @@ msgstr ""
" 네번째컬럼: 과거의 커밋로그를 포함하도록 \
스케쥴링하는지를 나타냅니다..\n" " ' ' 과거의 커밋로그 \
포함하지 않음\n" " '+' 과거의 커밋로그 포함함\n"
-" 다섯번째컬럼: 아이템이 상위 경로에 대하여 \
환(switch)되었는지를 나타냅니"
-"다.\n"
+" 다섯번째컬럼: 아이템이 상위 경로에 대하여 \
환(switch)되었는지를 나타냅니다.\n" " ' ' 기본\n"
" 'S' 환됨\n"
" 여섯번째컬럼: 장소 금 큰\n"
@@ -7069,31 +8103,42 @@ msgstr ""
" 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
-#: svn/main.c:787
+#: ../svn/main.c:896
+#, fuzzy
msgid ""
"Update the working copy to a different URL.\n"
-"usage: 1. switch URL [PATH]\n"
+"usage: 1. switch URL[@PEGREV] [PATH]\n"
" 2. switch --relocate FROM TO [PATH...]\n"
"\n"
" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\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. Currently, the depth of a working copy\n"
+" directory can only be increased (telescoped more deeply); you cannot\n"
+" make a directory more shallow.\n"
"\n"
" 2. 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"
-" 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"
+" See also 'svn help update' for a list of possible characters\n"
+" reporting the action
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic