Bring the svnsync_ra_serf branch up to date with trunk@27708:27811.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/svnsync_ra_serf@867886 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index 7b208d5..67683c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@
- Client and Server:
* fixed: "No newline at end of file" message translated (issue #2906)
+ * use compressed delta encoding for "svn blame" in svnserve (r26115)
* translation updates for Simplified Chinese
Developer-visible changes:
diff --git a/autogen.sh b/autogen.sh
index 20cad2c..c952989 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,6 +57,12 @@
fi
echo "Copying libtool helper: $ltfile"
+# An ancient helper might already be present from previous builds,
+# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
+# This would cause cp to fail and print an error message, but leave
+# behind a potentially outdated libtool helper. So, remove before
+# copying:
+rm -f build/libtool.m4
cp $ltfile build/libtool.m4
# Create the file detailing all of the build outputs for SVN.
diff --git a/build.conf b/build.conf
index 66d44ef..0f02a69 100644
--- a/build.conf
+++ b/build.conf
@@ -306,7 +306,7 @@
path = subversion/libsvn_repos
install = ramod-lib
libs = libsvn_fs libsvn_delta libsvn_subr apriconv apr
-msvc-export = svn_repos.h private\svn_repos_private.h
+msvc-export = svn_repos.h
# Low-level grab bag of utilities
[libsvn_subr]
diff --git a/contrib/client-side/emacs/dsvn.el b/contrib/client-side/emacs/dsvn.el
index 66df855..f906b0c 100644
--- a/contrib/client-side/emacs/dsvn.el
+++ b/contrib/client-side/emacs/dsvn.el
@@ -6,7 +6,7 @@
;; Mattias Engdegård <mattias@virtutech.com>
;; Maintainer: David Kågedal <david@virtutech.com>
;; Created: 27 Jan 2006
-;; Version: 1.4
+;; Version: 1.5
;; Keywords: docs
;; This program is free software; you can redistribute it and/or
@@ -180,6 +180,14 @@
(apply 'call-process svn-program nil buf nil (symbol-name command) args)
buf))
+(defun svn-run-predicate (command args)
+ "Run `svn', discarding output, returning t if it succeeded (exited with
+status zero).
+Argument COMMAND is the svn subcommand to run.
+Optional argument ARGS is a list of arguments."
+ (zerop
+ (apply 'call-process svn-program nil nil nil (symbol-name command) args)))
+
(defun svn-output-filter (proc str)
"Output filter for svn output.
Argument PROC is the process object.
@@ -201,6 +209,10 @@
"svn-status buffer describing the files that a commit operation applies to")
(make-variable-buffer-local 'svn-status-buffer)
+(defvar svn-todo-queue '()
+ "A queue of commands to run when the current command finishes.")
+(make-variable-buffer-local 'svn-todo-queue)
+
(defun svn-current-url ()
"Get the repository URL."
(with-current-buffer (svn-run-hidden 'info ())
@@ -242,6 +254,21 @@
(eq (process-status (cadr svn-running)) 'run))
(error "Can't run two svn processes from the same buffer")))
+(defun svn-run-async (command args &optional file-filter)
+ "Run subversion command COMMAND with ARGS, possibly at a later time.
+
+Optional third argument FILE-FILTER is the file filter to be in effect
+during the run."
+
+ (if (and svn-running
+ (eq (process-status (cadr svn-running)) 'run))
+ (setq svn-todo-queue
+ (nconc svn-todo-queue
+ (list (list command args file-filter))))
+ (progn
+ (set (make-local-variable 'svn-file-filter) file-filter)
+ (svn-run command args))))
+
;; This could be used to debug filter functions
(defvar svn-output-queue nil)
(defvar svn-in-output-filter nil)
@@ -268,7 +295,15 @@
(if (/= (process-exit-status proc) 0)
(set-svn-process-status 'failed)
(set-svn-process-status 'finished))
- (move-to-column goal-column))))
+ (move-to-column goal-column))
+ (when svn-todo-queue
+ (let ((cmd-info (car svn-todo-queue)))
+ (setq svn-todo-queue (cdr svn-todo-queue))
+ (let ((command (car cmd-info))
+ (args (cadr cmd-info))
+ (file-filter (caddr cmd-info)))
+ (set (make-local-variable 'svn-file-filter) file-filter)
+ (svn-run command args))))))
(defun svn-diff (arg)
"Run `svn diff'.
@@ -468,6 +503,8 @@
;; First retrieve the property names, and then the value of each.
;; We can't use proplist -v because is output is ambiguous when values
;; consist of multiple lines.
+ (unless (svn-run-predicate 'ls (list file))
+ (error "%s is not under version control" file))
(let (propnames)
(with-current-buffer (svn-run-hidden 'proplist (list file))
(goto-char (point-min))
@@ -491,7 +528,7 @@
(let ((local-file (svn-local-file-name file)))
(when (string-equal local-file "")
(setq local-file ".")
- (setq file (concat (file-name-as-directory file) ".")))
+ (setq file (file-name-as-directory file)))
(svn-check-running)
(let ((buf-name (format "*propedit %s*" local-file)))
(if (get-buffer buf-name)
@@ -563,7 +600,8 @@
)
nil ;keywords-only
nil ;case-fold
- nil ;syntax-alist
+ ;; syntax-alist: don't fontify quotes specially in any way
+ ((?\" . "."))
nil ;syntax-begin
))
(font-lock-mode))
@@ -744,18 +782,17 @@
;; non-recursively. To compensate, filter the status output through a list
;; of files and directories we are interested in.
- (make-local-variable 'svn-status-v-file-match)
- (setq svn-status-v-file-match
- (if recursive
- nil
- (mapcar (lambda (file)
- ;; trim trailing slash for directory comparison to work
- (if (equal (substring file -1) "/")
- (substring file 0 -1)
- file))
- files)))
- (let ((flag (if recursive nil '("-N"))))
- (svn-run 'status-v (append flag files))))
+ (let ((flag (if recursive nil '("-N")))
+ (file-filter
+ (if recursive
+ nil
+ (mapcar (lambda (file)
+ ;; trim trailing slash for directory comparison to work
+ (if (equal (substring file -1) "/")
+ (substring file 0 -1)
+ file))
+ files))))
+ (svn-run-async 'status-v (append flag files) file-filter)))
(defun svn-refresh-file ()
"Run `svn status' on the selected files."
@@ -850,8 +887,8 @@
(filename (match-string 6)))
(delete-region (match-beginning 0)
(match-end 0))
- (when (or (not svn-status-v-file-match)
- (member filename svn-status-v-file-match))
+ (when (or (not svn-file-filter)
+ (member filename svn-file-filter))
(svn-insert-file filename status)))))))
(defun svn-status-v-sentinel (proc reason)
@@ -1147,9 +1184,12 @@
filename)
(newline)
(add-text-properties svn-last-inserted-marker (point)
- (list 'svn-file filename
- 'svn-updated t
- 'svn-mark marked)))))
+ (append (list 'svn-file filename
+ 'svn-updated t
+ 'svn-mark marked)
+ (if marked
+ (list 'face 'svn-mark-face)
+ ()))))))
(setq svn-last-inserted-filename filename))
(defun svn-remove-line (pos)
@@ -1306,6 +1346,28 @@
"Get the property status for the file at POS."
(char-after (+ pos svn-status-flags-col 1)))
+(defface svn-mark-face
+ '((((type tty) (class color))
+ (:background "cyan" :foreground "black"))
+ (((class color) (background light))
+ (:background "yellow2"))
+ (((class color) (background dark))
+ (:background "darkblue"))
+ (t (:inverse-video t)))
+ "Face used to highlight marked files"
+ :group 'dsvn)
+
+(defun svn-highlight-line (mark)
+ (save-excursion
+ (beginning-of-line)
+ (let ((start (point)))
+ (forward-line)
+ (let ((end (point))
+ (prop (list 'face 'svn-mark-face)))
+ (if mark
+ (add-text-properties start end prop)
+ (remove-text-properties start end prop))))))
+
(defun svn-set-mark (pos mark)
"Update the mark on the status line at POS.
Set it if MARK is non-NIL, and clear it if MARK is NIL."
@@ -1314,6 +1376,7 @@
(goto-char (+ pos svn-status-mark-col))
(delete-char 1)
(insert-and-inherit (if mark "*" " "))
+ (svn-highlight-line mark)
(forward-line 1)
(put-text-property pos (point) 'svn-mark mark))))
@@ -1525,17 +1588,32 @@
(match-end 0))
(svn-insert-file filename status))))))
-(defun svn-toggle-mark ()
+(defun svn-toggle-file-mark ()
"Toggle the mark for the file under point."
- (interactive)
(let ((mark (svn-getprop (point) 'mark)))
(svn-set-mark (line-beginning-position) (not mark))))
-(defun svn-mark-forward ()
- "Set the mark for the file under point and move to next line."
+(defun svn-toggle-mark ()
+ "Toggle the mark for the file under point, or files in the dir under point."
(interactive)
(cond ((svn-getprop (point) 'file)
- (svn-set-mark (line-beginning-position) t)
+ (svn-toggle-file-mark))
+ ((svn-getprop (point) 'dir)
+ (let ((dir (svn-getprop (point) 'dir))
+ file)
+ (save-excursion
+ (forward-line 1)
+ (setq file (svn-getprop (point) 'file))
+ (while (and file
+ (svn-in-dir-p dir file))
+ (svn-toggle-file-mark)
+ (forward-line 1)
+ (setq file (svn-getprop (point) 'file))))))))
+
+(defun svn-change-mark-forward (mark)
+ "Set or clear the mark for the file under point and move to next line."
+ (cond ((svn-getprop (point) 'file)
+ (svn-set-mark (line-beginning-position) mark)
(let (pos (svn-next-file-pos))
(if pos
(svn-next-file 1)
@@ -1547,13 +1625,18 @@
(setq file (svn-getprop (point) 'file))
(while (and file
(svn-in-dir-p dir file))
- (svn-set-mark (point) t)
+ (svn-set-mark (point) mark)
(forward-line 1)
(setq file (svn-getprop (point) 'file)))
(move-to-column goal-column)))
(t
(error "No file on line"))))
+(defun svn-mark-forward ()
+ "Set the mark for the file under point and move to next line."
+ (interactive)
+ (svn-change-mark-forward t))
+
(defun svn-mark-backward ()
"Set the mark for the file under point and move to next line."
(interactive)
@@ -1563,11 +1646,7 @@
(defun svn-unmark-forward ()
"Unset the mark for the file on the previous line."
(interactive)
- (svn-set-mark (line-beginning-position) nil)
- (let (pos (svn-next-file-pos))
- (if pos
- (svn-next-file 1)
- (next-line 1))))
+ (svn-change-mark-forward nil))
(defun svn-unmark-backward ()
"Unset the mark for the file on the previous line."
@@ -1712,7 +1791,7 @@
(svn-propedit "edit properties")))
(svn-format-help-column
'((svn-mark-forward "mark and go down")
- (svn-unmark-backward "unmark and go up")
+ (svn-unmark-backward "go up and unmark")
(svn-unmark-forward "unmark and go down")
(svn-toggle-mark "toggle mark")
(svn-unmark-all "unmark all")))
@@ -1778,13 +1857,14 @@
the function is the local form of the filename and the buffer position
where the file information is."
(let* ((svn-buffers (svn-buffer-list))
- (inhibit-read-only t))
+ (inhibit-read-only t)
+ (file-path (file-truename file-name)))
(while svn-buffers
(with-current-buffer (car svn-buffers)
- (let ((dir (expand-file-name default-directory)))
- (when (and (>= (length file-name) (length dir))
- (string= dir (substring file-name 0 (length dir))))
- (let* ((local-file-name (substring file-name (length dir)))
+ (let ((dir (file-truename default-directory)))
+ (when (and (>= (length file-path) (length dir))
+ (string= dir (substring file-path 0 (length dir))))
+ (let* ((local-file-name (substring file-path (length dir)))
(file-pos (svn-file-pos local-file-name)))
(funcall function local-file-name file-pos)))))
(setq svn-buffers (cdr svn-buffers)))))
diff --git a/contrib/client-side/svnmerge/svnmerge-migrate-history.py b/contrib/client-side/svnmerge/svnmerge-migrate-history.py
index cf1d7dc..273d39b 100755
--- a/contrib/client-side/svnmerge/svnmerge-migrate-history.py
+++ b/contrib/client-side/svnmerge/svnmerge-migrate-history.py
@@ -125,9 +125,9 @@
svn.core.SVN_PROP_MERGE_INFO)
integrated_prop_val = svn.fs.node_prop(root, path, "svnmerge-integrated")
if self.verbose:
- print "Discoverd pre-existing Subversion mergeinfo of '%s'" % \
+ print "Discovered pre-existing Subversion mergeinfo of '%s'" % \
mergeinfo_prop_val
- print "Discoverd svnmerge.py mergeinfo of '%s'" % integrated_prop_val
+ print "Discovered svnmerge.py mergeinfo of '%s'" % integrated_prop_val
mergeinfo_prop_val = self.add_to_mergeinfo(integrated_prop_val,
mergeinfo_prop_val)
### LATER: We handle svnmerge-blocked by converting it into
@@ -135,8 +135,8 @@
### Subversion's core.
blocked_prop_val = svn.fs.node_prop(root, path, "svnmerge-blocked")
if self.verbose:
- print "Discoverd svnmerge.py blocked revisions of '%s'" % \
- integrated_prop_val
+ print "Discovered svnmerge.py blocked revisions of '%s'" % \
+ blocked_prop_val
mergeinfo_prop_val = self.add_to_mergeinfo(blocked_prop_val,
mergeinfo_prop_val)
@@ -183,11 +183,8 @@
if mergeinfo_prop_val:
mergeinfo = svn.core.svn_mergeinfo_parse(mergeinfo_prop_val)
to_migrate = svn.core.svn_mergeinfo_parse(svnmerge_prop_val)
- ### FIXME: The SWIG bindings may not be giving us an API that
- ### both accepts two mergeinfos and returns the merged result.
- mergeinfo = svn.core.svn_mergeinfo_merge(mergeinfo, to_migrate, True)
- mergeinfo_prop_val = \
- svn.core.svn_megeinfo_mergeinfo_to_stringbuf(mergeinfo).data
+ mergeinfo = svn.core.svn_mergeinfo_merge(mergeinfo, to_migrate)
+ mergeinfo_prop_val = svn.core.svn_mergeinfo_to_stringbuf(mergeinfo)
else:
mergeinfo_prop_val = svnmerge_prop_val
diff --git a/contrib/client-side/svnmerge/svnmerge-migrate-test.sh b/contrib/client-side/svnmerge/svnmerge-migrate-test.sh
new file mode 100755
index 0000000..06391e9
--- /dev/null
+++ b/contrib/client-side/svnmerge/svnmerge-migrate-test.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# A test harness for validation of svnmerge-migrate-history.py.
+
+SUBVERSION_PREFIX='/usr/local/subversion'
+export PATH="$SUBVERSION_PREFIX/bin:$PATH"
+export PYTHONPATH="$SUBVERSION_PREFIX/lib/svn-python"
+
+INITIAL_DIR="`pwd`"
+TMP_DIR='/tmp'
+REPOS_URL="file://$TMP_DIR/repos"
+SCRIPT_DIR=$(python -c "import os; print os.path.abspath(\"`dirname $0`\")")
+
+cd $TMP_DIR
+rm -rf repos wc
+
+echo 'Creating repository, and populating it with baseline data...'
+svnadmin create repos
+svn co $REPOS_URL wc
+mkdir wc/trunk wc/branches wc/tags
+echo 'hello world' > wc/trunk/hello-world.txt
+svn add wc/*
+svn ci -m 'Populate repos with skeletal data.' wc
+
+echo 'Creating a branch, and initializing merge tracking data...'
+svn cp wc/trunk wc/branches/B
+svn ci -m 'Create branch B.' wc
+cd wc/branches/B
+$HOME/src/subversion/contrib/client-side/svnmerge/svnmerge.py init
+svn ci -m 'Initialize svnmerge.py merge tracking info on branch B.'
+#svn merge --record-only -r4:7 $REPOS_URL/trunk ### Not working (?)
+svn ps svn:mergeinfo '/trunk:4-7' .
+svn ci -m 'Mix in Subversion 1.5 merge tracking info on branch B.'
+cd -
+
+# Run the migration script, passing on any arguments.
+$SCRIPT_DIR/svnmerge-migrate-history.py $TMP_DIR/repos -v /branches
+
+# Report the results.
+EXPECTED_MERGEINFO='/trunk:1,4-7'
+svn up wc
+svn pl -vR wc | grep $EXPECTED_MERGEINFO && echo 'PASS' || \
+ (echo 'FAIL: Unexpected mergeinfo:' && svn pl -vR wc && \
+ echo "Expected (regex): $EXPECTED_MERGEINFO") >&2 && exit 1
diff --git a/contrib/client-side/svnmerge/svnmerge.py b/contrib/client-side/svnmerge/svnmerge.py
index 7c314ab..020385f 100755
--- a/contrib/client-side/svnmerge/svnmerge.py
+++ b/contrib/client-side/svnmerge/svnmerge.py
@@ -298,7 +298,7 @@
password = " --password=" + password
else:
password = ""
- cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
+ cmd = opts["svn"] + " --non-interactive" + username + password + " " + s
if show or opts["verbose"] >= 2:
print cmd
if pretend:
diff --git a/subversion/bindings/swig/core.i b/subversion/bindings/swig/core.i
index 9d8ef08..d2837db 100644
--- a/subversion/bindings/swig/core.i
+++ b/subversion/bindings/swig/core.i
@@ -1023,7 +1023,7 @@
svn_merge_range_inheritance_t consider_inheritance,
apr_pool_t *pool)
{
- return svn_mergeinfo_merge(mergeinfo_inout, changes, consider_inheritance,
+ return svn_mergeinfo_merge(*mergeinfo_inout, changes, consider_inheritance,
pool);
}
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
index 8bba2b9..9fa6a0e 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
@@ -861,10 +861,7 @@
Py_DECREF(list);
return NULL;
}
- newrange = apr_pcalloc(pool, sizeof(svn_merge_range_t));
- newrange->start = range->start;
- newrange->end = range->end;
- newrange->inheritable = range->inheritable;
+ newrange = svn_merge_range_dup(range, pool);
APR_ARRAY_IDX(temp, targlen, svn_merge_range_t *) = newrange;
Py_DECREF(o);
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
index 4c50cb3..9556c67 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
@@ -188,6 +188,7 @@
/* helper function to convert an array of 'svn_revnum_t' to a Python list
of int objects */
+SVN_SWIG_SWIGUTIL_EXPORT
PyObject *svn_swig_py_revarray_to_list(const apr_array_header_t *revs);
/* helper function to convert a Python dictionary mapping strings to
diff --git a/subversion/bindings/swig/python/tests/ra.py b/subversion/bindings/swig/python/tests/ra.py
index 140f255..7d668b3 100644
--- a/subversion/bindings/swig/python/tests/ra.py
+++ b/subversion/bindings/swig/python/tests/ra.py
@@ -219,17 +219,23 @@
fs_revnum = fs.youngest_rev(self.fs)
- reporter, reporter_baton = ra.do_diff2(self.ra_ctx, fs_revnum, REPOS_URL + "/trunk/README.txt", 0, 0, 1, REPOS_URL + "/trunk/README.txt", e_ptr, e_baton)
-
- reporter.set_path(reporter_baton, "", fs_revnum, True, None)
-
- reporter.finish_report(reporter_baton)
-
+ sess_url = ra.get_session_url(self.ra_ctx)
+ try:
+ ra.reparent(self.ra_ctx, REPOS_URL+"/trunk")
+ reporter, reporter_baton = ra.do_diff2(self.ra_ctx, fs_revnum,
+ "README.txt", 0, 0, 1,
+ REPOS_URL+"/trunk/README.txt",
+ e_ptr, e_baton)
+ reporter.set_path(reporter_baton, "", 0, True, None)
+ reporter.finish_report(reporter_baton)
+ finally:
+ ra.reparent(self.ra_ctx, sess_url)
+
self.assertEqual("A test.\n", editor.textdeltas[0].new_data)
self.assertEqual(1, len(editor.textdeltas))
def test_get_locations(self):
- locations = ra.get_locations(self.ra_ctx, "/trunk/README.txt", 2, range(1,5))
+ locations = ra.get_locations(self.ra_ctx, "trunk/README.txt", 2, range(1,5))
self.assertEqual(locations, {
2: '/trunk/README.txt',
3: '/trunk/README.txt',
@@ -263,7 +269,7 @@
# properly. svn.ra.lock() currently fails because it is not possible
# to retrieve the username from the auth_baton yet.
self.assertRaises(core.SubversionException,
- lambda: ra.lock(self.ra_ctx, {"/": 0}, "sleutel", False, callback))
+ lambda: ra.lock(self.ra_ctx, {"": 0}, "sleutel", False, callback))
def test_get_log2(self):
# Get an interesting commmit.
diff --git a/subversion/bindings/swig/ruby/test/test_ra.rb b/subversion/bindings/swig/ruby/test/test_ra.rb
index 62adc98..0de182b 100644
--- a/subversion/bindings/swig/ruby/test/test_ra.rb
+++ b/subversion/bindings/swig/ruby/test/test_ra.rb
@@ -35,7 +35,6 @@
file = "sample.txt"
src = "sample source"
path = File.join(@wc_path, file)
- path_in_repos = "/#{file}"
ctx = make_context(log)
config = {}
path_props = {"my-prop" => "value"}
@@ -51,7 +50,7 @@
rev1 = info.revision
assert_equal(info.revision, session.dated_revision(info.date))
- content, props = session.file(path_in_repos, info.revision)
+ content, props = session.file(file, info.revision)
assert_equal(src, content)
assert_equal([
Svn::Core::PROP_ENTRY_COMMITTED_DATE,
@@ -60,8 +59,7 @@
Svn::Core::PROP_ENTRY_COMMITTED_REV,
].sort,
props.keys.sort)
-
- entries, props = session.dir("/", info.revision)
+ entries, props = session.dir("", info.revision)
assert_equal([file], entries.keys)
assert(entries[file].file?)
assert_equal([
@@ -72,9 +70,9 @@
].sort,
props.keys.sort)
- entries, props = session.dir("/", info.revision, Svn::Core::DIRENT_KIND)
+ entries, props = session.dir("", info.revision, Svn::Core::DIRENT_KIND)
assert_equal(Svn::Core::NODE_FILE, entries[file].kind)
- entries, props = session.dir("/", info.revision, 0)
+ entries, props = session.dir("", info.revision, 0)
assert_equal(Svn::Core::NODE_NONE, entries[file].kind)
ctx = make_context(log2)
@@ -114,8 +112,8 @@
infos << [rev, _path, hashed_prop_diffs]
end
assert_equal([
- [rev1, path_in_repos, {}],
- [rev2, path_in_repos, path_props],
+ [rev1, "/#{file}", {}],
+ [rev2, "/#{file}", path_props],
],
infos)
@@ -124,21 +122,21 @@
infos << [rev, _path, prop_diffs]
end
assert_equal([
- [rev1, path_in_repos, {}],
- [rev2, path_in_repos, path_props],
+ [rev1, "/#{file}", {}],
+ [rev2, "/#{file}", path_props],
],
infos)
- assert_equal({}, session.get_locks("/"))
+ assert_equal({}, session.get_locks(""))
locks = []
- session.lock({path_in_repos => rev2}) do |_path, do_lock, lock, ra_err|
+ session.lock({file => rev2}) do |_path, do_lock, lock, ra_err|
locks << [_path, do_lock, lock, ra_err]
end
- assert_equal([path_in_repos],
+ assert_equal([file],
locks.collect{|_path, *rest| _path}.sort)
- lock = locks.assoc(path_in_repos)[2]
- assert_equal([path_in_repos],
- session.get_locks("/").collect{|_path, *rest| _path})
+ lock = locks.assoc(file)[2]
+ assert_equal(["/#{file}"],
+ session.get_locks("").collect{|_path, *rest| _path})
assert_equal(lock.token, session.get_lock(file).token)
assert_equal([lock.token],
session.get_locks(file).values.collect{|l| l.token})
@@ -228,11 +226,11 @@
ctx.up(@wc_path)
editor, editor_baton = session.commit_editor(log) {}
- reporter = session.update(rev2, "/", editor, editor_baton)
+ reporter = session.update(rev2, "", editor, editor_baton)
reporter.abort_report
editor, editor_baton = session.commit_editor(log) {}
- reporter = session.update2(rev2, "/", editor)
+ reporter = session.update2(rev2, "", editor)
reporter.abort_report
end
diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
index cab2403..aa0b3d6 100644
--- a/subversion/bindings/swig/ruby/test/test_wc.rb
+++ b/subversion/bindings/swig/ruby/test/test_wc.rb
@@ -789,7 +789,7 @@
editor = access.update_editor2(0, @wc_path)
assert_equal(0, editor.target_revision)
- reporter = session.update2(rev2, @wc_path, editor)
+ reporter = session.update2(rev2, "", editor)
access.crawl_revisions(@wc_path, reporter)
assert_equal(rev2, editor.target_revision)
end
@@ -831,7 +831,7 @@
editor = dir_access.switch_editor2(rev2, @wc_path, dir1_uri)
assert_equal(rev2, editor.target_revision)
- reporter = session.switch2(rev1, @wc_path, dir1_uri, editor)
+ reporter = session.switch2(rev1, dir1, dir1_uri, editor)
dir_access.crawl_revisions(@wc_path, reporter)
assert_equal(rev1, editor.target_revision)
end
diff --git a/subversion/include/private/svn_repos_private.h b/subversion/include/private/svn_repos_private.h
deleted file mode 100644
index 342428a..0000000
--- a/subversion/include/private/svn_repos_private.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * svn_repos_private.h: Private declarations for repos functionality
- * used internally by non-libsvn_repos* modules.
- *
- * ====================================================================
- * Copyright (c) 2007 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/.
- * ====================================================================
- */
-
-#ifndef SVN_REPOS_PRIVATE_H
-#define SVN_REPOS_PRIVATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Convert @a capabilities, a hash table mapping 'const char *' keys to
- * "yes" or "no" values, to a list of all keys whose value is "yes".
- * Return the list, allocated in @a pool, and use @a pool for all
- * temporary allocation.
- */
-apr_array_header_t *
-svn_repos__capabilities_as_list(apr_hash_t *capabilities, apr_pool_t *pool);
-
-/* Set the client-reported capabilities of @a repos to @a capabilities,
- * which must be allocated in memory at least as long-lived as @a repos.
- */
-void
-svn_repos__set_capabilities(svn_repos_t *repos,
- apr_array_header_t *capabilities);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* SVN_REPOS_PRIVATE_H */
diff --git a/subversion/include/svn_auth.h b/subversion/include/svn_auth.h
index 91258b4..a98bf96 100644
--- a/subversion/include/svn_auth.h
+++ b/subversion/include/svn_auth.h
@@ -127,10 +127,10 @@
*
* Store @a credentials for future use. @a provider_baton is
* general context for the vtable, and @a parameters contains any
- * run-time data the provider may need. Set @a *saved to true if
- * the save happened, or false if not. The provider is not required
+ * run-time data the provider may need. Set @a *saved to TRUE if
+ * the save happened, or FALSE if not. The provider is not required
* to save; if it refuses or is unable to save for non-fatal
- * reasons, return false. If the provider never saves data, then
+ * reasons, return FALSE. If the provider never saves data, then
* this function pointer should simply be NULL. @a realmstring comes
* from the svn_auth_first_credentials() call.
*/
@@ -334,12 +334,12 @@
/** Set @a *cred by prompting the user, allocating @a *cred in @a pool.
* @a baton is an implementation-specific closure.
*
- * If @a realm is non-null, maybe use it in the prompt string.
+ * If @a realm is non-NULL, maybe use it in the prompt string.
*
- * If @a username is non-null, then the user might be prompted only
+ * If @a username is non-NULL, then the user might be prompted only
* for a password, but @a *cred would still be filled with both
* username and password. For example, a typical usage would be to
- * pass @a username on the first call, but then leave it null for
+ * pass @a username on the first call, but then leave it NULL for
* subsequent calls, on the theory that if credentials failed, it's
* as likely to be due to incorrect username as incorrect password.
*
@@ -361,7 +361,7 @@
/** Set @a *cred by prompting the user, allocating @a *cred in @a pool.
* @a baton is an implementation-specific closure.
*
- * If @a realm is non-null, maybe use it in the prompt string.
+ * If @a realm is non-NULL, maybe use it in the prompt string.
*
* If @a may_save is FALSE, the auth system does not allow the credentials
* to be saved (to disk). A prompt function shall not ask the user if the
diff --git a/subversion/include/svn_client.h b/subversion/include/svn_client.h
index 87b6b72..1b3a1d7 100644
--- a/subversion/include/svn_client.h
+++ b/subversion/include/svn_client.h
@@ -952,16 +952,16 @@
* If @a ignore_externals is set, don't process externals definitions
* as part of this operation.
*
- * If @a ctx->notify_func2 is non-null, invoke @a ctx->notify_func2 with
+ * If @a ctx->notify_func2 is non-NULL, invoke @a ctx->notify_func2 with
* @a ctx->notify_baton2 as the checkout progresses.
*
- * If @a allow_unver_obstructions is true then the checkout tolerates
+ * If @a allow_unver_obstructions is TRUE then the checkout tolerates
* existing unversioned items that obstruct added paths from @a URL. 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 checkout. Working
* properties of obstructing items are set equal to the base properties.
- * If @a allow_unver_obstructions is false then the checkout will abort
+ * If @a allow_unver_obstructions is FALSE then the checkout will abort
* if there are any unversioned obstructing items.
*
* If @a URL refers to a file rather than a directory, return the
@@ -987,9 +987,9 @@
/**
* Similar to svn_client_checkout3() but with @a allow_unver_obstructions
- * always set to false, and @a depth set according to @a recurse: if
- * @a recurse is true, @a depth is @c svn_depth_infinity, if @a recurse
- * is false, @a depth is @c svn_depth_files.
+ * always set to FALSE, and @a depth set according to @a recurse: if
+ * @a recurse is TRUE, @a depth is @c svn_depth_infinity, if @a recurse
+ * is FALSE, @a depth is @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -1008,7 +1008,7 @@
/**
* Similar to svn_client_checkout2(), but with @a peg_revision
* always set to @c svn_opt_revision_unspecified and
- * @a ignore_externals always set to false.
+ * @a ignore_externals always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
@@ -1060,18 +1060,18 @@
* If @a depth is @c svn_depth_unknown, take the working depth from
* @a paths and then behave as described above.
*
- * If @a allow_unver_obstructions is true then the update tolerates
+ * If @a allow_unver_obstructions is TRUE then the update tolerates
* existing unversioned items that obstruct added paths from @a URL. 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
* properties of obstructing items are set equal to the base properties.
- * If @a allow_unver_obstructions is false then the update will abort
+ * If @a allow_unver_obstructions is FALSE then the update will abort
* if there are any unversioned obstructing items.
*
- * If @a ctx->notify_func2 is non-null, invoke @a ctx->notify_func2 with
+ * If @a ctx->notify_func2 is non-NULL, invoke @a ctx->notify_func2 with
* @a ctx->notify_baton2 for each item handled by the update, and also for
- * files restored from text-base. If @a ctx->cancel_func is non-null, invoke
+ * files restored from text-base. If @a ctx->cancel_func is non-NULL, invoke
* it passing @a ctx->cancel_baton at various places during the update.
*
* Use @a pool for any temporary allocation.
@@ -1090,9 +1090,9 @@
/**
* Similar to svn_client_update3() but with @a allow_unver_obstructions
- * always set to false, and @a depth set according to @a recurse:
- * if @a recurse is true, set @a depth to @c svn_depth_infinity, if
- * @a recurse is false, set @a depth to @c svn_depth_files.
+ * always set to FALSE, and @a depth set according to @a recurse:
+ * if @a recurse is TRUE, set @a depth to @c svn_depth_infinity, if
+ * @a recurse is FALSE, set @a depth to @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -1108,7 +1108,7 @@
/**
* Similar to svn_client_update2() except that it accepts only a single
* target in @a path, returns a single revision if @a result_rev is
- * not NULL, and @a ignore_externals is always set to false.
+ * not NULL, and @a ignore_externals is always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
@@ -1151,16 +1151,16 @@
* If @a ignore_externals is set, don't process externals definitions
* as part of this operation.
*
- * If @a allow_unver_obstructions is true then the switch tolerates
+ * If @a allow_unver_obstructions is TRUE then the switch tolerates
* existing unversioned items that obstruct added paths from @a URL. 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
* properties of obstructing items are set equal to the base properties.
- * If @a allow_unver_obstructions is false then the switch will abort
+ * If @a allow_unver_obstructions is FALSE then the switch will abort
* if there are any unversioned obstructing items.
*
- * If @a ctx->notify_func2 is non-null, invoke it with @a ctx->notify_baton2
+ * If @a ctx->notify_func2 is non-NULL, invoke it with @a ctx->notify_baton2
* on paths affected by the switch. Also invoke it for files may be restored
* from the text-base because they were removed from the working copy.
*
@@ -1183,9 +1183,9 @@
/**
* Similar to svn_client_switch2() but with @a allow_unver_obstructions
- * and @a ignore_externals always set to false, and @a depth set according
- * to @a recurse: if @a recurse is true, set @a depth to
- * @c svn_depth_infinity, if @a recurse is false, set @a depth to
+ * and @a ignore_externals always set to FALSE, and @a depth set according
+ * to @a recurse: if @a recurse is TRUE, set @a depth to
+ * @c svn_depth_infinity, if @a recurse is FALSE, set @a depth to
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -1218,7 +1218,7 @@
* @a path and everything under it fully recursively.
*
* @a path's parent must be under revision control already (unless
- * @a add_parents is true), but @a path is not. If @a recursive is
+ * @a add_parents is TRUE), but @a path is not. If @a recursive is
* set, then assuming @a path is a directory, all of its contents will
* be scheduled for addition as well.
*
@@ -1229,14 +1229,14 @@
* effect of scheduling for addition unversioned files and directories
* scattered deep within a versioned tree.
*
- * If @a ctx->notify_func2 is non-null, then for each added item, call
+ * If @a ctx->notify_func2 is non-NULL, then for each added item, call
* @a ctx->notify_func2 with @a ctx->notify_baton2 and the path of the
* added item.
*
- * If @a no_ignore is false, don't add files or directories that match
+ * If @a no_ignore is FALSE, don't add files or directories that match
* ignore patterns.
*
- * If @a add_parents is true, recurse up @a path's directory and look for
+ * If @a add_parents is TRUE, recurse up @a path's directory and look for
* a versioned directory. If found, add all intermediate paths between it
* and @a path. If not found, return @c SVN_ERR_CLIENT_NO_VERSIONED_PARENTS.
*
@@ -1258,8 +1258,8 @@
/**
* Similar to svn_client_add4(), but with @a add_parents always set to
- * false and @a depth set according to @a recursive: if true, then
- * @a depth is @c svn_depth_infinity, if false, then @c svn_depth_files.
+ * FALSE and @a depth set according to @a recursive: if TRUE, then
+ * @a depth is @c svn_depth_infinity, if FALSE, then @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.3 API.
*/
@@ -1273,7 +1273,7 @@
/**
* Similar to svn_client_add3(), but with @a no_ignore always set to
- * false.
+ * FALSE.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
@@ -1285,7 +1285,7 @@
apr_pool_t *pool);
/**
- * Similar to svn_client_add2(), but with @a force always set to false.
+ * Similar to svn_client_add2(), but with @a force always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
@@ -1321,7 +1321,7 @@
* combo that this function can use to query for a commit log message
* when one is needed.
*
- * If @a ctx->notify_func2 is non-null, when the directory has been created
+ * If @a ctx->notify_func2 is non-NULL, when the directory has been created
* (successfully) in the working copy, call @a ctx->notify_func2 with
* @a ctx->notify_baton2 and the path of the new directory. Note that this is
* only called for items added to the working copy.
@@ -1389,7 +1389,7 @@
* modified and/or unversioned items. If @a force is set such items
* will be deleted.
*
- * If the paths are working copy paths and @a keep_local is true then
+ * If the paths are working copy paths and @a keep_local is TRUE then
* the paths will not be removed from the working copy, only scheduled
* for removal from the repository. Once the scheduled deletion is
* committed, they will appear as unversioned paths in the working copy.
@@ -1398,7 +1398,7 @@
* combo that this function can use to query for a commit log message
* when one is needed.
*
- * If @a ctx->notify_func2 is non-null, then for each item deleted, call
+ * If @a ctx->notify_func2 is non-NULL, then for each item deleted, call
* @a ctx->notify_func2 with @a ctx->notify_baton2 and the path of the deleted
* item.
*
@@ -1414,7 +1414,7 @@
/**
* Similar to svn_client_delete3(), but with @a keep_local always set
- * to false.
+ * to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -1463,7 +1463,7 @@
* receiving the import. The basename of @a url is the filename in the
* repository. In this case if @a url already exists, return error.
*
- * If @a ctx->notify_func2 is non-null, then call @a ctx->notify_func2 with
+ * If @a ctx->notify_func2 is non-NULL, then call @a ctx->notify_func2 with
* @a ctx->notify_baton2 as the import progresses, with any of the following
* actions: @c svn_wc_notify_commit_added,
* @c svn_wc_notify_commit_postfix_txdelta.
@@ -1501,7 +1501,7 @@
/**
* Similar to svn_client_import3(), but with @a ignore_unknown_node_types
* always set to @c FALSE, and @a depth set according to @a nonrecursive:
- * if true, then @a depth is @c svn_depth_files, else @c svn_depth_infinity.
+ * if TRUE, then @a depth is @c svn_depth_files, else @c svn_depth_infinity.
*
* @since New in 1.3.
*
@@ -1517,7 +1517,7 @@
/**
* Similar to svn_client_import2(), but with @a no_ignore always set
- * to false and using the @c svn_client_commit_info_t type for
+ * to FALSE and using the @c svn_client_commit_info_t type for
* @a commit_info_p.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
@@ -1548,7 +1548,7 @@
* that. If @a targets has zero elements, then do nothing and return
* immediately without error.
*
- * If @a ctx->notify_func2 is non-null, then call @a ctx->notify_func2 with
+ * If @a ctx->notify_func2 is non-NULL, then call @a ctx->notify_func2 with
* @a ctx->notify_baton2 as the commit progresses, with any of the following
* actions: @c svn_wc_notify_commit_modified, @c svn_wc_notify_commit_added,
* @c svn_wc_notify_commit_deleted, @c svn_wc_notify_commit_replaced,
@@ -1565,7 +1565,7 @@
* as for @c svn_depth_files, and for subdirectories of any named
* directory target commit as though for @c svn_depth_empty.
*
- * Unlock paths in the repository, unless @a keep_locks is true.
+ * Unlock paths in the repository, unless @a keep_locks is TRUE.
*
* If @a changelist_name is non-NULL, then use it as a restrictive filter
* on items that are committed; that is, don't commit anything unless
@@ -1595,8 +1595,8 @@
/**
* Similar to svn_client_commit4(), but always with NULL for
- * @a changelist_name, false for @a keep_changelist, and @a depth
- * set according to @a recurse: if @a recurse is true, use
+ * @a changelist_name, FALSE for @a keep_changelist, and @a depth
+ * set according to @a recurse: if @a recurse is TRUE, use
* @c svn_depth_infinity, else @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -1629,7 +1629,7 @@
/**
* Similar to svn_client_commit2(), but with @a keep_locks set to
- * true and @a nonrecursive instead of @a recurse.
+ * TRUE and @a nonrecursive instead of @a recurse.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
@@ -1691,8 +1691,8 @@
/**
* Like svn_client_status3(), except with @a recurse instead of @a depth.
- * If @a recurse is true, behave as if for @c svn_depth_infinity; else
- * if @a recurse is false, behave as if for @c svn_depth_immediates.
+ * If @a recurse is TRUE, behave as if for @c svn_depth_infinity; else
+ * if @a recurse is FALSE, behave as if for @c svn_depth_immediates.
*
* @since New in 1.2.
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -1714,7 +1714,7 @@
/**
* Similar to svn_client_status2(), but with @a ignore_externals
- * always set to false, taking the @c svn_wc_status_func_t type
+ * always set to FALSE, taking the @c svn_wc_status_func_t type
* instead of the @c svn_wc_status_func2_t type for @a status_func,
* and requiring @a *revision to be non-const even though it is
* treated as constant.
@@ -1782,7 +1782,7 @@
* SVN_ERR_FS_NO_SUCH_REVISION error when invoked against an empty repository
* (i.e. one not containing a revision 1).
*
- * If @a ctx->notify_func2 is non-null, then call @a ctx->notify_func2/baton2
+ * If @a ctx->notify_func2 is non-NULL, then call @a ctx->notify_func2/baton2
* with a 'skip' signal on any unversioned targets.
*
* @since New in 1.5.
@@ -1899,7 +1899,7 @@
* svn_opt_revision_working, return the error @c
* SVN_ERR_UNSUPPORTED_FEATURE. If any of the revisions of @a
* path_or_url have a binary mime-type, return the error @c
- * SVN_ERR_CLIENT_IS_BINARY_FILE, unless @a ignore_mime_type is true,
+ * SVN_ERR_CLIENT_IS_BINARY_FILE, unless @a ignore_mime_type is TRUE,
* in which case blame information will be generated regardless of the
* MIME types of the revisions.
*
@@ -1949,7 +1949,7 @@
/**
* Similar to svn_client_blame3(), but with @a diff_options set to
* default options as returned by svn_diff_file_options_parse() and
- * @a ignore_mime_type set to false.
+ * @a ignore_mime_type set to FALSE.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
*
@@ -2013,16 +2013,16 @@
* Use @a ignore_ancestry to control whether or not items being
* diffed will be checked for relatedness first. Unrelated items
* are typically transmitted to the editor as a deletion of one thing
- * and the addition of another, but if this flag is true, unrelated
+ * and the addition of another, but if this flag is TRUE, unrelated
* items will be diffed as if they were related.
*
- * If @a no_diff_deleted is true, then no diff output will be
+ * If @a no_diff_deleted is TRUE, then no diff output will be
* generated on deleted files.
*
* Generated headers are encoded using @a header_encoding.
*
* Diff output will not be generated for binary files, unless @a
- * ignore_content_type is true, in which case diffs will be shown
+ * ignore_content_type is TRUE, in which case diffs will be shown
* regardless of the content types.
*
* @a diff_options (an array of <tt>const char *</tt>) is used to pass
@@ -2055,8 +2055,8 @@
/**
* Similar to svn_client_diff4(), but with @a depth set according to
- * @a recurse: if @a recurse is true, set @a depth to @c
- * svn_depth_infinity, if @a recurse is false, set @a depth to @c
+ * @a recurse: if @a recurse is TRUE, set @a depth to @c
+ * svn_depth_infinity, if @a recurse is FALSE, set @a depth to @c
* svn_depth_empty.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -2103,7 +2103,7 @@
/**
* Similar to svn_client_diff2(), but with @a ignore_content_type
- * always set to false.
+ * always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
@@ -2151,8 +2151,8 @@
/**
* Similar to svn_client_diff_peg4(), but with @a depth set according
- * to @a recurse: if @a recurse is true, set @a depth to
- * @c svn_depth_infinity, if @a recurse is false, set @a depth to
+ * to @a recurse: if @a recurse is TRUE, set @a depth to
+ * @c svn_depth_infinity, if @a recurse is FALSE, set @a depth to
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -2198,7 +2198,7 @@
/**
* Similar to svn_client_diff_peg2(), but with @a ignore_content_type
- * always set to false.
+ * always set to FALSE.
*
* @since New in 1.1.
* @deprecated Provided for backward compatibility with the 1.1 API.
@@ -2246,8 +2246,8 @@
/**
* Similar to svn_client_diff_summarize2(), but with @a depth set
- * according to @a recurse: if @a recurse is true, set @a depth to
- * @c svn_depth_infinity, if @a recurse is false, set @a depth to
+ * according to @a recurse: if @a recurse is TRUE, set @a depth to
+ * @c svn_depth_infinity, if @a recurse is FALSE, set @a depth to
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -2300,8 +2300,8 @@
/**
* Similar to svn_client_diff_summarize_peg2(), but with @a depth set
- * according to @a recurse: if @a recurse is true, set @a depth to
- * @c svn_depth_infinity, if @a recurse is false, set @a depth to
+ * according to @a recurse: if @a recurse is TRUE, set @a depth to
+ * @c svn_depth_infinity, if @a recurse is FALSE, set @a depth to
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -2358,28 +2358,28 @@
* Use @a ignore_ancestry to control whether or not items being
* diffed will be checked for relatedness first. Unrelated items
* are typically transmitted to the editor as a deletion of one thing
- * and the addition of another, but if this flag is true, unrelated
+ * and the addition of another, but if this flag is TRUE, unrelated
* items will be diffed as if they were related.
*
* If @a force is not set and the merge involves deleting locally modified or
* unversioned items the operation will fail. If @a force is set such items
* will be deleted.
*
- * @a merge_options (an array of <tt>const char *</tt>), if non-null,
+ * @a merge_options (an array of <tt>const char *</tt>), if non-NULL,
* is used to pass additional command line arguments to the merge
* processes (internal or external). @see
* svn_diff_file_options_parse().
*
- * If @a ctx->notify_func2 is non-null, then call @a ctx->notify_func2 with @a
+ * If @a ctx->notify_func2 is non-NULL, then call @a ctx->notify_func2 with @a
* ctx->notify_baton2 once for each merged target, passing the target's local
* path.
*
- * If @a record_only is true, the merge isn't actually performed, but
+ * If @a record_only is TRUE, the merge isn't actually performed, but
* the mergeinfo for the revisions which would've been merged is
* recorded in the working copy (and must be subsequently committed
* back to the repository).
*
- * If @a dry_run is true, the merge is carried out, and full notification
+ * If @a dry_run is TRUE, the merge is carried out, and full notification
* feedback is provided, but the working copy is not modified.
*
* The authentication baton cached in @a ctx is used to communicate with the
@@ -2405,8 +2405,8 @@
/**
* Similar to svn_client_merge3(), but with @a record_only set to @c
* FALSE, and @a depth set according to @a recurse: if @a recurse is
- * true, set @a depth to @c svn_depth_infinity, if @a recurse is
- * false, set @a depth to @c svn_depth_files.
+ * TRUE, set @a depth to @c svn_depth_infinity, if @a recurse is
+ * FALSE, set @a depth to @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*
@@ -2454,7 +2454,7 @@
* @a ranges_to_merge is an array of <tt>svn_opt_revision_range_t *</tt>
* ranges. These ranges may describe additive and/or subtractive merge
* ranges, they may overlap fully or partially, and/or they may partially
- * or fully negate each other.
+ * or fully negate each other. This rangelist is not required to be sorted.
*
* All other options are handled identically to svn_client_merge3().
*
@@ -2477,8 +2477,8 @@
/**
* Similar to svn_client_merge_peg3(), but with @a record_only set to
* @c FALSE, and @a depth set according to @a recurse: if @a recurse
- * is true, set @a depth to @c svn_depth_infinity, if @a recurse is
- * false, set @a depth to @c svn_depth_files.
+ * is TRUE, set @a depth to @c svn_depth_infinity, if @a recurse is
+ * FALSE, set @a depth to @c svn_depth_files.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
*
@@ -2589,7 +2589,7 @@
/** Recursively cleanup a working copy directory @a dir, finishing any
* incomplete operations, removing lockfiles, etc.
*
- * If @a ctx->cancel_func is non-null, invoke it with @a
+ * If @a ctx->cancel_func is non-NULL, invoke it with @a
* ctx->cancel_baton at various points during the operation. If it
* returns an error (typically SVN_ERR_CANCELLED), return that error
* immediately.
@@ -2611,7 +2611,7 @@
/**
* Modify a working copy directory @a dir, changing any
* repository URLs that begin with @a from to begin with @a to instead,
- * recursing into subdirectories if @a recurse is true.
+ * recursing into subdirectories if @a recurse is TRUE.
*
* @param dir Working copy directory
* @param from Original URL
@@ -2650,7 +2650,7 @@
* properties on immediate subdirectories; else if @c svn_depth_infinity,
* revert path and everything under it fully recursively.
*
- * If @a ctx->notify_func2 is non-null, then for each item reverted,
+ * If @a ctx->notify_func2 is non-NULL, then for each item reverted,
* call @a ctx->notify_func2 with @a ctx->notify_baton2 and the path of
* the reverted item.
*
@@ -2669,10 +2669,10 @@
/**
* Similar to svn_client_revert2(), but with @a depth set according to
- * @a recurse: if @a recurse is true, @a depth is @c svn_depth_infinity,
- * else if @a recurse is false, @a depth is @c svn_depth_empty.
+ * @a recurse: if @a recurse is TRUE, @a depth is @c svn_depth_infinity,
+ * else if @a recurse is FALSE, @a depth is @c svn_depth_empty.
*
- * @note Most APIs map @a recurse==false to @a depth==svn_depth_files;
+ * @note Most APIs map @a recurse==FALSE to @a depth==svn_depth_files;
* revert is deliberately different.
*
* @deprecated Provided for backwards compatibility with the 1.0 API.
@@ -2723,7 +2723,7 @@
* just remove the conflict status (i.e. pre-1.5 behavior).
*
* If @a path is not in a state of conflict to begin with, do nothing.
- * If @a path's conflict state is removed and @a ctx->notify_func2 is non-null,
+ * If @a path's conflict state is removed and @a ctx->notify_func2 is non-NULL,
* call @a ctx->notify_func2 with @a ctx->notify_baton2 and @a path.
*
* @since New in 1.5.
@@ -2816,7 +2816,7 @@
* that this function can use to query for a commit log message when one is
* needed.
*
- * If @a ctx->notify_func2 is non-null, invoke it with @a ctx->notify_baton2
+ * If @a ctx->notify_func2 is non-NULL, invoke it with @a ctx->notify_baton2
* for each item added at the new location, passing the new, relative path of
* the added item.
*
@@ -2957,7 +2957,7 @@
* @a ctx->log_msg_func3/@a ctx->log_msg_baton3 are a callback/baton combo that
* this function can use to query for a commit log message when one is needed.
*
- * If @a ctx->notify_func2 is non-null, then for each item moved, call
+ * If @a ctx->notify_func2 is non-NULL, then for each item moved, call
* @a ctx->notify_func2 with the @a ctx->notify_baton2 twice, once to indicate
* the deletion of the moved thing, and once to indicate the addition of
* the new location of the thing.
@@ -3087,14 +3087,14 @@
* @c SVN_PROP_PREFIX), then the caller is responsible for ensuring that
* the value is UTF8-encoded and uses LF line-endings.
*
- * If @a skip_checks is true, do no validity checking. But if @a
- * skip_checks is false, and @a propname is not a valid property for @a
+ * If @a skip_checks is TRUE, do no validity checking. But if @a
+ * skip_checks is FALSE, and @a propname is not a valid property for @a
* target, return an error, either @c SVN_ERR_ILLEGAL_TARGET (if the
* property is not appropriate for @a target), or @c
* SVN_ERR_BAD_MIME_TYPE (if @a propname is "svn:mime-type", but @a
* propval is not a valid mime-type).
*
- * If @a ctx->cancel_func is non-null, invoke it passing @a
+ * If @a ctx->cancel_func is non-NULL, invoke it passing @a
* ctx->cancel_baton at various places during the operation.
*
* Use @a pool for all memory allocation.
@@ -3115,7 +3115,7 @@
/**
* Like svn_client_propset3(), but with @a base_revision_for_url
* always @c SVN_INVALID_REVNUM; @a commit_info_p always NULL; and
- * @a depth set according to @a recurse: if @a recurse is true,
+ * @a depth set according to @a recurse: if @a recurse is TRUE,
* @a depth is @c svn_depth_infinity, else @c svn_depth_empty.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -3130,7 +3130,7 @@
apr_pool_t *pool);
/**
- * Like svn_client_propset2(), but with @a skip_checks always false and a
+ * Like svn_client_propset2(), but with @a skip_checks always FALSE and a
* newly created @a ctx.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
@@ -3148,7 +3148,7 @@
* rev affected in @a *set_rev. A @a propval of @c NULL will delete the
* property.
*
- * If @a force is true, allow newlines in the author property.
+ * If @a force is TRUE, allow newlines in the author property.
*
* If @a propname is an svn-controlled property (i.e. prefixed with
* @c SVN_PROP_PREFIX), then the caller is responsible for ensuring that
@@ -3220,7 +3220,7 @@
/**
* Similar to svn_client_propget4(), but with @a depth set according
- * to @a recurse: if @a recurse is true, then @a depth is
+ * to @a recurse: if @a recurse is TRUE, then @a depth is
* @c svn_depth_infinity, else @c svn_depth_empty.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -3418,7 +3418,7 @@
*
* @a ctx is a context used for authentication in the repository case.
*
- * @a overwrite if true will cause the export to overwrite files or directories.
+ * @a overwrite if TRUE will cause the export to overwrite files or directories.
*
* If @a ignore_externals is set, don't process externals definitions
* as part of this operation.
@@ -3435,11 +3435,11 @@
* 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
+ * 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.
+ * Also, if @a recurse is FALSE, the export will behave as if
+ * @a ignore_externals is TRUE.
*
* All allocations are done in @a pool.
*
@@ -3461,8 +3461,8 @@
/**
* Similar to svn_client_export4(), but with @a depth set according to
- * @a recurse: if @a recurse is true, set @a depth to
- * @c svn_depth_infinity, if @a recurse is false, set @a depth to
+ * @a recurse: if @a recurse is TRUE, set @a depth to
+ * @c svn_depth_infinity, if @a recurse is FALSE, set @a depth to
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -3486,8 +3486,8 @@
/**
* Similar to svn_client_export3(), but with @a peg_revision
* always set to @c svn_opt_revision_unspecified, @a overwrite set to
- * the value of @a force, @a ignore_externals always false, and
- * @a recurse always true.
+ * the value of @a force, @a ignore_externals always FALSE, and
+ * @a recurse always TRUE.
*
* @since New in 1.1.
* @deprecated Provided for backward compatibility with the 1.1 API.
@@ -3554,7 +3554,7 @@
* its children. If @a path_or_url is non-existent, return
* @c SVN_ERR_FS_NOT_FOUND.
*
- * If @a fetch_locks is true, include locks when reporting directory entries.
+ * If @a fetch_locks is TRUE, include locks when reporting directory entries.
*
* Use @a pool for temporary allocations.
*
@@ -3588,7 +3588,7 @@
/**
* Similar to svn_client_list2(), but with @a recurse instead of @a depth.
- * If @a recurse is true, pass @c svn_depth_files for @a depth; else
+ * If @a recurse is TRUE, pass @c svn_depth_files for @a depth; else
* pass @c svn_depth_infinity.
*
* @since New in 1.4.
@@ -3778,7 +3778,7 @@
* belongs to @a changelist_name. Return the list of paths in @a
* *paths. If no matching paths are found, return an empty array.
*
- * If @a ctx->cancel_func is non-null, invoke it passing @a ctx->cancel_baton
+ * If @a ctx->cancel_func is non-NULL, invoke it passing @a ctx->cancel_baton
* during the recursive walk.
*
* @since New in 1.5.
@@ -3809,7 +3809,7 @@
* belongs to @a changelist_name. Call @a callback_func (with @a
* callback_baton) each time a changelist member is found.
*
- * If @a ctx->cancel_func is non-null, invoke it passing @a ctx->cancel_baton
+ * If @a ctx->cancel_func is non-NULL, invoke it passing @a ctx->cancel_baton
* during the recursive walk.
*
* @since New in 1.5.
@@ -3838,8 +3838,8 @@
* @a targets must be in the same repository.
*
* If a target is already locked in the repository, no lock will be
- * acquired unless @a steal_lock is true, in which case the locks are
- * stolen. @a comment, if non-null, is an xml-escapable description
+ * acquired unless @a steal_lock is TRUE, in which case the locks are
+ * stolen. @a comment, if non-NULL, is an xml-escapable description
* stored with each lock in the repository. Each acquired lock will
* be stored in the working copy if the targets are WC paths.
*
@@ -3867,16 +3867,16 @@
* <tt>const char *</tt> paths - either all working copy paths or all URLs.
* All @a targets must be in the same repository.
*
- * If the targets are WC paths, and @a break_lock is false, the working
+ * If the targets are WC paths, and @a break_lock is FALSE, the working
* copy must contain a locks for each target.
* If this is not the case, or the working copy lock doesn't match the
* lock token in the repository, an error will be signaled.
*
* If the targets are URLs, the locks may be broken even if @a break_lock
- * is false, but only if the lock owner is the same as the
+ * is FALSE, but only if the lock owner is the same as the
* authenticated user.
*
- * If @a break_lock is true, the locks will be broken in the
+ * If @a break_lock is TRUE, the locks will be broken in the
* repository. In both cases, the locks, if any, will be removed from
* the working copy if the targets are WC paths.
*
@@ -4070,7 +4070,7 @@
/**
* Similar to svn_client_info2() but with @a depth set according to
- * @a recurse: if @a recurse is true, @a depth is @c svn_depth_infinity,
+ * @a recurse: if @a recurse is TRUE, @a depth is @c svn_depth_infinity,
* else @c svn_depth_empty.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
@@ -4106,7 +4106,7 @@
*
* If @a path_or_url is a versioned item, set @a *url to @a
* path_or_url's entry URL. If @a path_or_url is unversioned (has
- * no entry), set @a *url to null.
+ * no entry), set @a *url to NULL.
*/
svn_error_t *
svn_client_url_from_path(const char **url,
diff --git a/subversion/include/svn_config.h b/subversion/include/svn_config.h
index 1468bf7..a498d38 100644
--- a/subversion/include/svn_config.h
+++ b/subversion/include/svn_config.h
@@ -134,8 +134,8 @@
SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 " " \
SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2
-#define SVN_CONFIG_TRUE "true"
-#define SVN_CONFIG_FALSE "false"
+#define SVN_CONFIG_TRUE "TRUE"
+#define SVN_CONFIG_FALSE "FALSE"
/** Read configuration information from the standard sources and merge it
@@ -208,7 +208,7 @@
/** Like svn_config_get(), but for boolean values.
*
* Parses the option as a boolean value. The recognized representations
- * are 'true'/'false', 'yes'/'no', 'on'/'off', '1'/'0'; case does not
+ * are 'TRUE'/'FALSE', 'yes'/'no', 'on'/'off', '1'/'0'; case does not
* matter. Returns an error if the option doesn't contain a known string.
*/
svn_error_t *svn_config_get_bool(svn_config_t *cfg, svn_boolean_t *valuep,
@@ -217,7 +217,7 @@
/** Like svn_config_set(), but for boolean values.
*
- * Sets the option to 'true'/'false', depending on @a value.
+ * Sets the option to 'TRUE'/'FALSE', depending on @a value.
*/
void svn_config_set_bool(svn_config_t *cfg,
const char *section, const char *option,
diff --git a/subversion/include/svn_dav.h b/subversion/include/svn_dav.h
index 6f5a608..194e06f 100644
--- a/subversion/include/svn_dav.h
+++ b/subversion/include/svn_dav.h
@@ -1,7 +1,7 @@
/**
* @copyright
* ====================================================================
- * Copyright (c) 2000-2004 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2007 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
@@ -149,21 +149,29 @@
*/
#define SVN_DAV_PROP_NS_DAV "http://subversion.tigris.org/xmlns/dav/"
-/* Presence of this in the DAV header response to an OPTIONS request
- indicates that the server supports @c svn_depth_t.
+
+/**
+ * @name Custom (extension) values for the DAV header.
+ * Note that although these share the SVN_DAV_PROP_NS_DAV namespace
+ * prefix, they are not properties; they are header values.
+ *
+ * @{ **/
- ### @todo This doesn't really have anything to do with properties,
- but we should re-use the SVN_DAV_PROP_NS_DAV, right? We could
- change the name of SVN_DAV_PROP_NS_DAV_SVN_DEPTH, though. */
-#define SVN_DAV_PROP_NS_DAV_SVN_DEPTH SVN_DAV_PROP_NS_DAV "svn/depth"
+/** Presence of this in a DAV header in an OPTIONS request or response
+ * indicates that the transmitter supports @c svn_depth_t. */
+#define SVN_DAV_NS_DAV_SVN_DEPTH SVN_DAV_PROP_NS_DAV "svn/depth"
-/* Presence of this in the DAV header response to an OPTIONS request
- indicates that the server knows how to handle merge-tracking information.
- ### And see above about appropriateness of properties namespace. ### */
-#define SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO SVN_DAV_PROP_NS_DAV "svn/mergeinfo"
+/** Presence of this in a DAV header in an OPTIONS request or response
+ * indicates that the transmitter knows how to handle merge-tracking
+ * information. */
+#define SVN_DAV_NS_DAV_SVN_MERGEINFO SVN_DAV_PROP_NS_DAV "svn/mergeinfo"
-#define SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS SVN_DAV_PROP_NS_DAV \
- "svn/log-revprops"
+/** Presence of this in a DAV header in an OPTIONS response indicates
+ * that the transmitter (in this case, the server) knows how to send
+ * custom revprops in log responses. */
+#define SVN_DAV_NS_DAV_SVN_LOG_REVPROPS SVN_DAV_PROP_NS_DAV "svn/log-revprops"
+
+/** @} */
/** @} */
diff --git a/subversion/include/svn_delta.h b/subversion/include/svn_delta.h
index e06c11f..64430cf 100644
--- a/subversion/include/svn_delta.h
+++ b/subversion/include/svn_delta.h
@@ -243,7 +243,7 @@
/** A typedef for a function that will set @a *window to the next
* window from a @c svn_txdelta_stream_t object. If there are no more
- * delta windows, null will be used. The returned window, if any,
+ * delta windows, NULL will be used. The returned window, if any,
* will be allocated in @a pool. @a baton is the baton specified
* when the stream was created.
*
@@ -256,7 +256,7 @@
/** A typedef for a function that will return the md5 checksum of the
* fulltext deltified by a @c svn_txdelta_stream_t object. Will
- * return null if the final null window hasn't yet been returned by
+ * return NULL if the final null window hasn't yet been returned by
* the stream. The returned value will be allocated in the same pool
* as the stream. @a baton is the baton specified when the stream was
* created.
@@ -342,7 +342,7 @@
* This is effectively a 'copy' operation, resulting in delta windows that
* make the target equivalent to the stream.
*
- * If @a digest is non-null, populate it with the md5 checksum for the
+ * If @a digest is non-NULL, populate it with the md5 checksum for the
* fulltext that was deltified (@a digest must be at least
* @c APR_MD5_DIGESTSIZE bytes long).
*
@@ -372,11 +372,11 @@
* @a *handler_baton is set to the value to pass as the @a baton argument to
* @a *handler.
*
- * If @a result_digest is non-null, it points to APR_MD5_DIGESTSIZE bytes
+ * If @a result_digest is non-NULL, it points to APR_MD5_DIGESTSIZE bytes
* of storage, and the final call to @a handler populates it with the
* MD5 digest of the resulting fulltext.
*
- * If @a error_info is non-null, it is inserted parenthetically into
+ * If @a error_info is non-NULL, it is inserted parenthetically into
* the error string for any error returned by svn_txdelta_apply() or
* @a *handler. (It is normally used to provide path information,
* since there's nothing else in the delta application's context to
@@ -855,13 +855,13 @@
* argument to @a *handler.
*
* @a base_checksum is the hex MD5 digest for the base text against
- * which the delta is being applied; it is ignored if null, and may
- * be ignored even if not null. If it is not ignored, it must match
+ * which the delta is being applied; it is ignored if NULL, and may
+ * be ignored even if not NULL. If it is not ignored, it must match
* the checksum of the base text against which svndiff data is being
* applied; if it does not, @c apply_textdelta or the @a *handler call
* which detects the mismatch will return the error
* SVN_ERR_CHECKSUM_MISMATCH (if there is no base text, there may
- * still be an error if @a base_checksum is neither null nor the hex
+ * still be an error if @a base_checksum is neither NULL nor the hex
* MD5 checksum of the empty string).
*/
svn_error_t *(*apply_textdelta)(void *file_baton,
@@ -892,7 +892,7 @@
*
* @a text_checksum is the hex MD5 digest for the fulltext that
* resulted from a delta application, see @c apply_textdelta. The
- * checksum is ignored if null. If not null, it is compared to the
+ * checksum is ignored if NULL. If not null, it is compared to the
* checksum of the new fulltext, and the error
* SVN_ERR_CHECKSUM_MISMATCH is returned if they do not match. If
* there is no new fulltext, @a text_checksum is ignored.
diff --git a/subversion/include/svn_error.h b/subversion/include/svn_error.h
index ef813ac..f7aa7b9 100644
--- a/subversion/include/svn_error.h
+++ b/subversion/include/svn_error.h
@@ -52,14 +52,14 @@
/** Put an English description of @a statcode into @a buf and return @a buf,
- * null-terminated. @a statcode is either an svn error or apr error.
+ * NULL-terminated. @a statcode is either an svn error or apr error.
*/
char *svn_strerror(apr_status_t statcode, char *buf, apr_size_t bufsize);
/** If @a err has a custom error message, return that, otherwise
* store the generic error string associated with @a err->apr_err into
- * @a buf (terminating with null) and return @a buf.
+ * @a buf (terminating with NULL) and return @a buf.
*
* @since New in 1.4.
*
diff --git a/subversion/include/svn_error_codes.h b/subversion/include/svn_error_codes.h
index 50c8a48..e16bc06 100644
--- a/subversion/include/svn_error_codes.h
+++ b/subversion/include/svn_error_codes.h
@@ -630,6 +630,11 @@
SVN_ERR_FS_CATEGORY_START + 46,
"SQLite error")
+ /** @since New in 1.5. */
+ SVN_ERRDEF(SVN_ERR_FS_NO_SUCH_NODE_ORIGIN,
+ SVN_ERR_FS_CATEGORY_START + 47,
+ "Filesystem has no such node origin record")
+
/* repos errors */
SVN_ERRDEF(SVN_ERR_REPOS_LOCKED,
diff --git a/subversion/include/svn_fs.h b/subversion/include/svn_fs.h
index 9d0aa68..3481135 100644
--- a/subversion/include/svn_fs.h
+++ b/subversion/include/svn_fs.h
@@ -129,7 +129,7 @@
* By default, this is set to a function that will crash the process.
* Dumping to @c stderr or <tt>/dev/tty</tt> is not acceptable default
* behavior for server processes, since those may both be equivalent to
- * <tt>/dev/null</tt>.
+ * <tt>/dev/NULL</tt>.
*/
void svn_fs_set_warning_func(svn_fs_t *fs,
svn_fs_warning_callback_t warning,
@@ -682,7 +682,7 @@
* conflicts encountered merging @a txn with the most recent committed
* revisions. If a conflict occurs, set @a *conflict_p to the path of
* the conflict in @a txn, with the same lifetime as @a txn;
- * otherwise, set @a *conflict_p to null.
+ * otherwise, set @a *conflict_p to NULL.
*
* If the commit succeeds, @a txn is invalid.
*
@@ -728,7 +728,7 @@
/** Set @a *name_p to the name of the transaction @a txn, as a
- * null-terminated string. Allocate the name in @a pool.
+ * NULL-terminated string. Allocate the name in @a pool.
*/
svn_error_t *svn_fs_txn_name(const char **name_p,
svn_fs_txn_t *txn,
@@ -861,7 +861,7 @@
/** If @a root is the root of a transaction, return the name of the
- * transaction, allocated in @a pool; otherwise, return null.
+ * transaction, allocated in @a pool; otherwise, return NULL.
*/
const char *svn_fs_txn_root_name(svn_fs_root_t *root,
apr_pool_t *pool);
@@ -887,7 +887,7 @@
* Here are the rules for directory entry names, and directory paths:
*
* A directory entry name is a Unicode string encoded in UTF-8, and
- * may not contain the null character (U+0000). The name should be in
+ * may not contain the NULL character (U+0000). The name should be in
* Unicode canonical decomposition and ordering. No directory entry
* may be named '.', '..', or the empty string. Given a directory
* entry name which fails to meet these requirements, a filesystem
@@ -1074,6 +1074,20 @@
const char *path,
apr_pool_t *pool);
+/** Set @a *revision to the revision in which the line of history
+ * represented by @a path under @a root originated. Use @a pool for
+ * any temporary allocations. If @a root is a transaction root, @a
+ * *revision will be set to @c SVN_INVALID_REVNUM for any nodes newly
+ * added in that transaction (brand new files or directories created
+ * using @c svn_fs_make_dir or @c svn_fs_make_file).
+ *
+ * @since New in 1.5.
+ */
+svn_error_t *svn_fs_node_origin_rev(svn_revnum_t *revision,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool);
+
/** Set @a *created_path to the path at which @a path under @a root was
* created. Use @a pool for all allocations. Callers may use this
* function in conjunction with svn_fs_node_created_rev() to perform a
@@ -1146,7 +1160,7 @@
* allocating @a *path_p in @a pool.
*
* Else if there is no copy ancestry for the node, set @a *rev_p to
- * @c SVN_INVALID_REVNUM and @a *path_p to null.
+ * @c SVN_INVALID_REVNUM and @a *path_p to NULL.
*
* If an error is returned, the values of @a *rev_p and @a *path_p are
* undefined, but otherwise, if one of them is set as described above,
@@ -1191,8 +1205,8 @@
/** Set @a *root_p and @a *path_p to the revision root and path of the
* destination of the most recent copy event that caused @a path to
- * exist where it does in @a root, or to null if no such copy exists.
- * When non-null, allocate @a *root_p and @a *path_p in @a pool.
+ * exist where it does in @a root, or to NULL if no such copy exists.
+ * When non-NULL, allocate @a *root_p and @a *path_p in @a pool.
*
* @a *path_p might be a parent of @a path, rather than @a path
* itself. However, it will always be the deepest relevant path.
@@ -1308,9 +1322,9 @@
* If an error is returned (whether for conflict or otherwise), @a target
* is left unaffected.
*
- * If @a conflict_p is non-null, then: a conflict error sets @a *conflict_p
+ * If @a conflict_p is non-NULL, then: a conflict error sets @a *conflict_p
* to the name of the node in @a target which couldn't be merged,
- * otherwise, success sets @a *conflict_p to null.
+ * otherwise, success sets @a *conflict_p to NULL.
*
* Do any necessary temporary allocation in @a pool.
*/
@@ -1346,7 +1360,7 @@
/** Set @a *entries_p to a newly allocated APR hash table containing the
* entries of the directory at @a path in @a root. The keys of the table
- * are entry names, as byte strings, excluding the final null
+ * are entry names, as byte strings, excluding the final NULL
* character; the table's values are pointers to @c svn_fs_dirent_t
* structures. Allocate the table and its contents in @a pool.
*/
@@ -1525,18 +1539,18 @@
* an empty file first.)
*
* @a base_checksum is the hex MD5 digest for the base text against
- * which the delta is to be applied; it is ignored if null, and may be
- * ignored even if not null. If it is not ignored, it must match the
+ * which the delta is to be applied; it is ignored if NULL, and may be
+ * ignored even if not NULL. If it is not ignored, it must match the
* checksum of the base text against which svndiff data is being
* applied; if not, svn_fs_apply_textdelta() or the @a *contents_p call
* which detects the mismatch will return the error
* @c SVN_ERR_CHECKSUM_MISMATCH (if there is no base text, there may
- * still be an error if @a base_checksum is neither null nor the
+ * still be an error if @a base_checksum is neither NULL nor the
* checksum of the empty string).
*
* @a result_checksum is the hex MD5 digest for the fulltext that
- * results from this delta application. It is ignored if null, but if
- * not null, it must match the checksum of the result; if it does not,
+ * results from this delta application. It is ignored if NULL, but if
+ * not NULL, it must match the checksum of the result; if it does not,
* then the @a *contents_p call which detects the mismatch will return
* the error @c SVN_ERR_CHECKSUM_MISMATCH.
*
@@ -1568,7 +1582,7 @@
* an empty file first.)
*
* @a result_checksum is the hex MD5 digest for the final fulltext
- * written to the stream. It is ignored if null, but if not null, it
+ * written to the stream. It is ignored if NULL, but if not null, it
* must match the checksum of the result; if it does not, then the @a
* *contents_p call which detects the mismatch will return the error
* @c SVN_ERR_CHECKSUM_MISMATCH.
@@ -1764,7 +1778,7 @@
* to use it. If in doubt, pass 0.
*
* If path is already locked, then return @c SVN_ERR_FS_PATH_ALREADY_LOCKED,
- * unless @a steal_lock is true, in which case "steal" the existing
+ * unless @a steal_lock is TRUE, in which case "steal" the existing
* lock, even if the FS access-context's username does not match the
* current lock's owner: delete the existing lock on @a path, and
* create a new one.
@@ -1818,7 +1832,7 @@
*
* If @a token points to a lock, but the username of @a fs's access
* context doesn't match the lock's owner, return @c
- * SVN_ERR_FS_LOCK_OWNER_MISMATCH. If @a break_lock is true, however, don't
+ * SVN_ERR_FS_LOCK_OWNER_MISMATCH. If @a break_lock is TRUE, however, don't
* return error; allow the lock to be "broken" in any case. In the latter
* case, @a token shall be @c NULL.
*
diff --git a/subversion/include/svn_hash.h b/subversion/include/svn_hash.h
index d240143..9e3248e 100644
--- a/subversion/include/svn_hash.h
+++ b/subversion/include/svn_hash.h
@@ -179,7 +179,7 @@
* If @a diff_func returns error, return that error immediately, without
* applying @a diff_func to anything else.
*
- * @a hash_a or @a hash_b or both may be null; treat a null table as though
+ * @a hash_a or @a hash_b or both may be NULL; treat a null table as though
* empty.
*
* Use @a pool for temporary allocation.
diff --git a/subversion/include/svn_io.h b/subversion/include/svn_io.h
index 00fca84..69a8182 100644
--- a/subversion/include/svn_io.h
+++ b/subversion/include/svn_io.h
@@ -66,7 +66,7 @@
/** The kind of this entry. */
svn_node_kind_t kind;
/** If @c kind is @c svn_node_file, whether this entry is a special file;
- * else false.
+ * else FALSE.
*
* @see svn_io_check_special_path().
*/
@@ -219,7 +219,7 @@
/** Copy @a src to @a dst atomically, in a "byte-for-byte" manner.
* Overwrite @a dst if it exists, else create it. Both @a src and @a dst
- * are utf8-encoded filenames. If @a copy_perms is true, set @a dst's
+ * are utf8-encoded filenames. If @a copy_perms is TRUE, set @a dst's
* permissions to match those of @a src.
*/
svn_error_t *svn_io_copy_file(const char *src,
@@ -246,7 +246,7 @@
* when any files are copied. @a src, @a dst_parent, and @a dst_basename are
* all utf8-encoded.
*
- * If @a cancel_func is non-null, invoke it with @a cancel_baton at
+ * If @a cancel_func is non-NULL, invoke it with @a cancel_baton at
* various points during the operation. If it returns any error
* (typically @c SVN_ERR_CANCELLED), return that error immediately.
*/
@@ -592,10 +592,10 @@
/** Create a stream from an APR file. For convenience, if @a file is
* @c NULL, an empty stream created by svn_stream_empty() is returned.
*
- * This function should normally be called with @a disown set to false,
+ * This function should normally be called with @a disown set to FALSE,
* in which case closing the stream will also close the underlying file.
*
- * If @a disown is true, the stream will disown the underlying file,
+ * If @a disown is TRUE, the stream will disown the underlying file,
* meaning that svn_stream_close() will not close the file.
*
* @since New in 1.4.
@@ -650,7 +650,7 @@
* Both @a read_digest and @a write_digest
* can be @c NULL, in which case the respective checksum isn't calculated.
*
- * If @a read_all is true, make sure that all data available on @a
+ * If @a read_all is TRUE, make sure that all data available on @a
* stream is read (and checksummed) when the stream is closed.
*
* Read and write operations can be mixed without interfering.
@@ -882,14 +882,14 @@
/**
* Start @a cmd with @a args, using utf8-encoded @a path as working
* directory. Connect @a cmd's stdin, stdout, and stderr to @a infile,
- * @a outfile, and @a errfile, except where they are null. Return the
+ * @a outfile, and @a errfile, except where they are NULL. Return the
* process handle for the invoked program in @a *cmd_proc.
*
* @a args is a list of utf8-encoded <tt>const char *</tt> arguments,
* terminated by @c NULL. @a args[0] is the name of the program, though it
* need not be the same as @a cmd.
*
- * If @a inherit is true, the invoked program inherits its environment from
+ * If @a inherit is TRUE, the invoked program inherits its environment from
* the caller and @a cmd, if not absolute, is searched for in PATH.
* Otherwise, the invoked program runs with an empty environment and @a cmd
* must be an absolute path.
@@ -914,11 +914,11 @@
* Wait for the process @a *cmd_proc to complete and optionally retrieve
* its exit code. @a cmd is used only in error messages.
*
- * If @a exitcode is not null, @a *exitcode will contain the exit code
- * of the process upon return, and if @a exitwhy is not null, @a
+ * If @a exitcode is not NULL, @a *exitcode will contain the exit code
+ * of the process upon return, and if @a exitwhy is not NULL, @a
* *exitwhy will indicate why the process terminated. If @a exitwhy is
- * null, and the exit reason is not @c APR_PROC_CHECK_EXIT(), or if
- * @a exitcode is null and the exit code is non-zero, then an
+ * NULL, and the exit reason is not @c APR_PROC_CHECK_EXIT(), or if
+ * @a exitcode is NULL and the exit code is non-zero, then an
* @c SVN_ERR_EXTERNAL_PROGRAM error will be returned.
*
* @since New in 1.3.
@@ -951,14 +951,14 @@
* Diff runs in utf8-encoded @a dir, and its exit status is stored in
* @a exitcode, if it is not @c NULL.
*
- * If @a label1 and/or @a label2 are not null they will be passed to the diff
+ * If @a label1 and/or @a label2 are not NULL they will be passed to the diff
* process as the arguments of "-L" options. @a label1 and @a label2 are also
* in utf8, and will be converted to native charset along with the other args.
*
* @a from is the first file passed to diff, and @a to is the second. The
* stdout of diff will be sent to @a outfile, and the stderr to @a errfile.
*
- * @a diff_cmd must be non-null.
+ * @a diff_cmd must be non-NULL.
*
* Do all allocation in @a pool.
*/
@@ -1004,7 +1004,7 @@
* `diff3' was successful, 1 means some conflicts were found, and 2
* means trouble.")
*
- * @a diff3_cmd must be non-null.
+ * @a diff3_cmd must be non-NULL.
*
* Do all allocation in @a pool.
*
diff --git a/subversion/include/svn_md5.h b/subversion/include/svn_md5.h
index fa97048..ad96551 100644
--- a/subversion/include/svn_md5.h
+++ b/subversion/include/svn_md5.h
@@ -53,8 +53,8 @@
/** Compare digests @a d1 and @a d2, each @c APR_MD5_DIGESTSIZE bytes long.
- * If neither is all zeros, and they do not match, then return false;
- * else return true.
+ * If neither is all zeros, and they do not match, then return FALSE;
+ * else return TRUE.
*/
svn_boolean_t svn_md5_digests_match(const unsigned char d1[],
const unsigned char d2[]);
diff --git a/subversion/include/svn_mergeinfo.h b/subversion/include/svn_mergeinfo.h
index f2db12a..c837b7c 100644
--- a/subversion/include/svn_mergeinfo.h
+++ b/subversion/include/svn_mergeinfo.h
@@ -34,6 +34,57 @@
extern "C" {
#endif /* __cplusplus */
+/** Overview of the @c SVN_PROP_MERGE_INFO property.
+ *
+ * Merge history is stored in the @c SVN_PROP_MERGE_INFO property of files
+ * and directories. The @c SVN_PROP_MERGE_INFO property on a path stores the
+ * complete list of changes merged to that path, either directly or via the
+ * path's parent, grand-parent, etc..
+ *
+ * Every path in a tree may have @c SVN_PROP_MERGE_INFO set, but if the
+ * @c SVN_PROP_MERGE_INFO for a path is equivalent to the
+ * @c SVN_PROP_MERGE_INFO for its parent, then the @c SVN_PROP_MERGE_INFO on
+ * the path will 'elide' (be removed) from the path as a post step to any
+ * merge, switch, or update. If a path's parent does not have any
+ * @c SVN_PROP_MERGE_INFO set, the path's mergeinfo can elide to its nearest
+ * grand-parent, great-grand-parent, etc. that has equivalent
+ * @c SVN_PROP_MERGE_INFO set on it.
+ *
+ * If a path has no @c SVN_PROP_MERGE_INFO of its own, it inherits mergeinfo
+ * from its nearest parent that has @c SVN_PROP_MERGE_INFO set. The
+ * exception to this is @c SVN_PROP_MERGE_INFO with non-ineritable revision
+ * ranges. These non-inheritable ranges apply only to the path which they
+ * are set on.
+ *
+ * The value of the @c SVN_PROP_MERGE_INFO property is a string consisting of
+ * a path, a colon, and comma separated revision list, containing one or more
+ * revision or revision ranges. Revision range start and end points are
+ * separated by "-". Revisions and revision ranges may have the optional
+ * @c SVN_MERGEINFO_NONINHERITABLE_STR suffix to signify a non-inheritable
+ * revision/revision range.
+ *
+ * @c SVN_PROP_MERGE_INFO Value Grammar:
+ *
+ * Token Definition
+ * ----- ----------
+ * revisionrange REVISION "-" REVISION
+ * revisioneelement (revisionrange | REVISION)"*"?
+ * rangelist revisioneelement (COMMA revisioneelement)*
+ * revisionline PATHNAME COLON rangelist
+ * top revisionline (NEWLINE revisionline)*
+ *
+ * The PATHNAME is the source of a merge and the rangelist the revision(s)
+ * merged to the path @c SVN_PROP_MERGE_INFO is set on directly or indirectly
+ * via inheritance. PATHNAME must always exist at the specified rangelist
+ * and thus multiple revisionlines are required to account for renames of
+ * the source pathname.
+ *
+ * Rangelists must be sorted from lowest to highest revision and cannot
+ * contain overlapping revisionlistelements. Single revisions that can be
+ * represented by a revisionrange are allowed (e.g. '5,6,7,8,9-12' or '5-12'
+ * are both acceptable).
+ */
+
/* Suffix for SVN_PROP_MERGE_INFO revision ranges indicating a given
range is non-inheritable. */
#define SVN_MERGEINFO_NONINHERITABLE_STR "*"
@@ -70,19 +121,19 @@
apr_pool_t *pool);
/** Merge hash of mergeinfo, @a changes, into existing hash @a
- * *mergeinfo. @a consider_inheritance determines how to account for
+ * mergeinfo. @a consider_inheritance determines how to account for
* the inheritability of the rangelists in @a changes and @a *mergeinfo
* when merging.
*
- * Note: @a *mergeinfo and @a changes must have rangelists that are
+ * Note: @a mergeinfo and @a changes must have rangelists that are
* sorted as said by @c svn_sort_compare_ranges(). After the merge @a
- * *mergeinfo will have rangelists that are guaranteed to be in sorted
+ * mergeinfo will have rangelists that are guaranteed to be in sorted
* order.
*
* @since New in 1.5.
*/
svn_error_t *
-svn_mergeinfo_merge(apr_hash_t **mergeinfo, apr_hash_t *changes,
+svn_mergeinfo_merge(apr_hash_t *mergeinfo, apr_hash_t *changes,
svn_merge_range_inheritance_t consider_inheritance,
apr_pool_t *pool);
@@ -224,17 +275,17 @@
*
* If either @ *range_1 or @ *range_2 is NULL, either range contains
* invalid svn_revnum_t's, or the two ranges do not intersect, then do
- * nothing and return false.
+ * nothing and return FALSE.
*
* If the two ranges can be reduced to one range, set @ *range_1 to represent
- * that range, set @ *range_2 to NULL, and return true.
+ * that range, set @ *range_2 to NULL, and return TRUE.
*
* If the two ranges cancel each other out set both @ *range_1 and
- * @ *range_2 to NULL and return true.
+ * @ *range_2 to NULL and return TRUE.
*
* If the two ranges intersect but cannot be represented by one range (because
* one range is additive and the other subtractive) then modify @ *range_1 and
- * @ *range_2 to remove the intersecting ranges and return true.
+ * @ *range_2 to remove the intersecting ranges and return TRUE.
*
* The inheritability of @ *range_1 or @ *range_2 is not taken into account.
*
diff --git a/subversion/include/svn_opt.h b/subversion/include/svn_opt.h
index 5b12b55..acb60ae 100644
--- a/subversion/include/svn_opt.h
+++ b/subversion/include/svn_opt.h
@@ -222,9 +222,9 @@
*
* ### @todo Why is @a stream a stdio file instead of an svn stream?
*
- * If @a header is non-null, print @a header followed by a newline. Then
+ * If @a header is non-NULL, print @a header followed by a newline. Then
* loop over @a cmd_table printing the usage for each command (getting
- * option usages from @a opt_table). Then if @a footer is non-null, print
+ * option usages from @a opt_table). Then if @a footer is non-NULL, print
* @a footer followed by a newline.
*
* Use @a pool for temporary allocation.
@@ -588,9 +588,9 @@
* NULL, @a global_options is a zero-terminated array of options taken
* by all subcommands.
*
- * Else, if @a print_version is true, then print version info, in
- * brief form if @a quiet is also true; if @a quiet is false, then if
- * @a version_footer is non-null, print it following the version
+ * Else, if @a print_version is TRUE, then print version info, in
+ * brief form if @a quiet is also TRUE; if @a quiet is FALSE, then if
+ * @a version_footer is non-NULL, print it following the version
* information.
*
* Else, if @a os is not @c NULL and does not contain arguments, print
diff --git a/subversion/include/svn_path.h b/subversion/include/svn_path.h
index 224826e..164cebe 100644
--- a/subversion/include/svn_path.h
+++ b/subversion/include/svn_path.h
@@ -18,7 +18,7 @@
* @file svn_path.h
* @brief A path manipulation library
*
- * All incoming and outgoing paths are non-null and in UTF-8, unless
+ * All incoming and outgoing paths are non-NULL and in UTF-8, unless
* otherwise documented.
*
* No result path ever ends with a separator, no matter whether the
@@ -145,7 +145,7 @@
apr_size_t
svn_path_component_count(const char *path);
-/** Add a @a component (a null-terminated C-string) to the
+/** Add a @a component (a NULL-terminated C-string) to the
* canonicalized @a path. @a component is allowed to contain
* directory separators.
*
@@ -171,7 +171,7 @@
/** Divide the canonicalized @a path into @a *dirpath and @a
* *base_name, allocated in @a pool.
*
- * If @a dirpath or @a base_name is null, then don't set that one.
+ * If @a dirpath or @a base_name is NULL, then don't set that one.
*
* Either @a dirpath or @a base_name may be @a path's own address, but they
* may not both be the same address, or the results are undefined.
@@ -278,28 +278,28 @@
/** Find the common prefix of the canonicalized paths in @a targets
* (an array of <tt>const char *</tt>'s), and remove redundant paths if @a
- * remove_redundancies is true.
+ * remove_redundancies is TRUE.
*
* - Set @a *pcommon to the absolute path of the path or URL common to
* all of the targets. If the targets have no common prefix, or
* are a mix of URLs and local paths, set @a *pcommon to the
* empty string.
*
- * - If @a pcondensed_targets is non-null, set @a *pcondensed_targets
+ * - If @a pcondensed_targets is non-NULL, set @a *pcondensed_targets
* to an array of targets relative to @a *pcommon, and if
- * @a remove_redundancies is true, omit any paths/URLs that are
+ * @a remove_redundancies is TRUE, omit any paths/URLs that are
* descendants of another path/URL in @a targets. If *pcommon
* is empty, @a *pcondensed_targets will contain full URLs and/or
* absolute paths; redundancies can still be removed (from both URLs
- * and paths). If @a pcondensed_targets is null, leave it alone.
+ * and paths). If @a pcondensed_targets is NULL, leave it alone.
*
* Else if there is exactly one target, then
*
* - Set @a *pcommon to that target, and
*
- * - If @a pcondensed_targets is non-null, set @a *pcondensed_targets
+ * - If @a pcondensed_targets is non-NULL, set @a *pcondensed_targets
* to an array containing zero elements. Else if
- * @a pcondensed_targets is null, leave it alone.
+ * @a pcondensed_targets is NULL, leave it alone.
*
* If there are no items in @a targets, set @a *pcommon and (if
* applicable) @a *pcondensed_targets to @c NULL.
@@ -420,8 +420,8 @@
const char *path2,
apr_pool_t *pool);
-/** Return true if @a path1 is an ancestor of @a path2 or the paths are equal
- * and false otherwise.
+/** Return TRUE if @a path1 is an ancestor of @a path2 or the paths are equal
+ * and FALSE otherwise.
*
* @since New in 1.3.
*/
@@ -453,7 +453,7 @@
* @{
*/
-/** Return true iff @a path looks like a valid absolute URL. */
+/** Return TRUE iff @a path looks like a valid absolute URL. */
svn_boolean_t svn_path_is_url(const char *path);
/** Return @c TRUE iff @a path is URI-safe, @c FALSE otherwise. */
diff --git a/subversion/include/svn_props.h b/subversion/include/svn_props.h
index ffc92b1..c213c6f 100644
--- a/subversion/include/svn_props.h
+++ b/subversion/include/svn_props.h
@@ -382,7 +382,7 @@
* happen, for instance, when the revision represents a commit to a
* foreign version control system, or possibly when two Subversion
* repositories are combined. This property can be used to record the
- * true, original date of the commit.
+ * TRUE, original date of the commit.
*/
#define SVN_PROP_REVISION_ORIG_DATE SVN_PROP_PREFIX "original-date"
diff --git a/subversion/include/svn_ra.h b/subversion/include/svn_ra.h
index 8f01233..95f68a1 100644
--- a/subversion/include/svn_ra.h
+++ b/subversion/include/svn_ra.h
@@ -71,7 +71,7 @@
* working copy properties during update-like operations. See the
* comments for @c svn_ra_get_wc_prop_func_t for @a baton, @a path, and
* @a name. The @a value is the value that will be stored for the property;
- * a null @a value means the property will be deleted.
+ * a NULL @a value means the property will be deleted.
*/
typedef svn_error_t *(*svn_ra_set_wc_prop_func_t)(void *baton,
const char *path,
@@ -151,8 +151,8 @@
* @a do_lock is TRUE when locking @a path, and FALSE
* otherwise.
*
- * @a lock is a lock for @a path or null if @a do_lock is false or @a ra_err is
- * non-null.
+ * @a lock is a lock for @a path or NULL if @a do_lock is FALSE or @a ra_err is
+ * non-NULL.
*
* @a ra_err is NULL unless the ra layer encounters a locking related
* error which it passes back for notification purposes. The caller
@@ -840,12 +840,14 @@
apr_pool_t *pool);
/**
- * Fetch the mergeinfo for @a paths at @a rev, and save it to @a
- * mergeoutput. @a mergeoutput is a mapping of @c char * target paths
- * (from @a paths) to hashes mapping merged-from paths (of @c char *)
- * to revision range lists (of @c apr_array_header_t * with @c
- * svn_merge_range_t * elements), or @c NULL if there is no merge
- * info available. Allocate the returned values in @a pool.
+ * Fetch the mergeinfo for @a paths (which are either absolute or
+ * relative-to-the-repository-root filesystem paths) at @a rev, and
+ * save it to @a mergeoutput. @a mergeoutput is a mapping of
+ * <tt>const char *</tt> target paths (from @a paths) to hashes
+ * mapping merged-from paths (<tt>const char *</tt>) to revision range lists
+ * (<tt>apr_array_header_t *</tt> with <tt>svn_merge_range_t *</tt> elements),
+ * or @c NULL if there is no merge info available. Allocate the
+ * returned values in @a pool.
*
* @a inherit indicates whether explicit, explicit or inherited, or
* only inherited mergeinfo for @a paths is retrieved.
@@ -883,7 +885,7 @@
*
* Update the target only as deeply as @a depth indicates.
*
- * If @a send_copyfrom_args is true, then ask the server to send
+ * If @a send_copyfrom_args is TRUE, then ask the server to send
* copyfrom arguments to add_file() and add_directory() when possible.
* (Note: this means that any subsequent txdeltas coming from the
* server are presumed to apply against the copied file!)
@@ -919,7 +921,7 @@
/**
* Similar to svn_ra_do_update2(), but taking @c svn_ra_reporter2_t
- * instead of @c svn_ra_reporter3_t. If @a recurse is true, pass
+ * instead of @c svn_ra_reporter3_t. If @a recurse is TRUE, pass
* @c svn_depth_infinity for @a depth, else pass @c svn_depth_files.
*
* @deprecated Provided for compatibility with the 1.4 API.
@@ -992,7 +994,7 @@
* Similar to svn_ra_do_switch2(), but taking @c svn_ra_reporter2_t
* instead of @c svn_ra_reporter3_t, and therefore only able to report
* @c svn_depth_infinity for depths. The switch itself is performed
- * according to @a recurse: if true, then use @c svn_depth_infinity
+ * according to @a recurse: if TRUE, then use @c svn_depth_infinity
* for @a depth, else use @c svn_depth_files.
*
* @deprecated Provided for compatibility with the 1.4 API.
@@ -1061,7 +1063,7 @@
* Similar to svn_ra_do_status2(), but taking @c svn_ra_reporter2_t
* instead of @c svn_ra_reporter3_t, and therefore only able to report
* @c svn_depth_infinity for depths. The status operation itself is
- * performed according to @a recurse: if true, then @a depth is
+ * performed according to @a recurse: if TRUE, then @a depth is
* @c svn_depth_infinity, else it is @c svn_depth_immediates.
*
* @deprecated Provided for compatibility with the 1.4 API.
@@ -1150,7 +1152,7 @@
* Similar to svn_ra_do_diff3(), but taking @c svn_ra_reporter2_t
* instead of @c svn_ra_reporter3_t, and therefore only able to report
* @c svn_depth_infinity for depths. Perform the diff according to
- * @a recurse: if true, then @a depth is @c svn_depth_infinity, else
+ * @a recurse: if TRUE, then @a depth is @c svn_depth_infinity, else
* it is @c svn_depth_files.
*
* @deprecated Provided for compatibility with the 1.4 API.
@@ -1194,7 +1196,7 @@
*
* If @a start or @a end is @c SVN_INVALID_REVNUM, it defaults to youngest.
*
- * If @a paths is non-null and has one or more elements, then only show
+ * If @a paths is non-NULL and has one or more elements, then only show
* revisions in which at least one of @a paths was changed (i.e., if
* file, text or props changed; if dir, props changed or an entry
* was added or deleted). Each path is an <tt>const char *</tt>, relative
@@ -1206,7 +1208,7 @@
* If @a discover_changed_paths, then each call to receiver passes a
* <tt>const apr_hash_t *</tt> for the receiver's @a changed_paths argument;
* the hash's keys are all the paths committed in that revision.
- * Otherwise, each call to receiver passes null for @a changed_paths.
+ * Otherwise, each call to receiver passes NULL for @a changed_paths.
*
* If @a strict_node_history is set, copy history will not be traversed
* (if any exists) when harvesting the revision logs for each path.
@@ -1444,7 +1446,7 @@
* which describes the lock, or it is NULL.
*
* If any path is already locked by a different user, then call @a
- * lock_func/@a lock_baton with an error. If @a steal_lock is true,
+ * lock_func/@a lock_baton with an error. If @a steal_lock is TRUE,
* then "steal" the existing lock(s) anyway, even if the RA username
* does not match the current lock's owner. Delete any lock on the
* path, and unconditionally create a new lock.
@@ -1483,7 +1485,7 @@
*
* If @a token points to a lock, but the RA username doesn't match the
* lock's owner, call @a lock_func/@a lock_baton with an error. If @a
- * break_lock is true, however, instead allow the lock to be "broken"
+ * break_lock is TRUE, however, instead allow the lock to be "broken"
* by the RA user.
*
* After successfully unlocking a path, @a lock_func is called with
@@ -1549,7 +1551,7 @@
* version.
*
* If @a send_deltas is @c TRUE, the actual text and property changes in
- * the revision will be sent, otherwise dummy text deltas and null property
+ * the revision will be sent, otherwise dummy text deltas and NULL property
* changes will be sent instead.
*
* @a pool is used for all allocation.
@@ -1595,9 +1597,9 @@
apr_pool_t *pool);
/**
- * Set @a *has to true if the server represented by @a session has
+ * Set @a *has to TRUE if the server represented by @a session has
* @a capability (one of the capabilities beginning with
- * @c "SVN_RA_CAPABILITY_"), else set @a *has to false.
+ * @c "SVN_RA_CAPABILITY_"), else set @a *has to FALSE.
*
* If @a capability isn't recognized, throw @c SVN_ERR_RA_UNKNOWN_CAPABILITY,
* with the effect on @a *has undefined.
@@ -1638,10 +1640,15 @@
#define SVN_RA_CAPABILITY_LOG_REVPROPS "log-revprops"
/* *** PLEASE READ THIS IF YOU ADD A NEW CAPABILITY ***
+ *
* RA layers generally fetch all capabilities when asked about any
* capability, to save future round trips. So if you add a new
* capability here, make sure to update the RA layers to remember
* it after any capabilities query.
+ *
+ * Also note that capability strings should not include colons,
+ * because we pass a list of client capabilities to the start-commit
+ * hook as a single, colon-separated string.
*/
/**
diff --git a/subversion/include/svn_ra_svn.h b/subversion/include/svn_ra_svn.h
index 7823316..0fe5ec0 100644
--- a/subversion/include/svn_ra_svn.h
+++ b/subversion/include/svn_ra_svn.h
@@ -377,7 +377,7 @@
/** Receive edit commands over the network and use them to drive @a editor
* with @a edit_baton. On return, @a *aborted will be set if the edit was
* aborted. The drive can be terminated with a finish-replay command only
- * if @a for_replay is true.
+ * if @a for_replay is TRUE.
*/
svn_error_t *svn_ra_svn_drive_editor2(svn_ra_svn_conn_t *conn,
apr_pool_t *pool,
diff --git a/subversion/include/svn_repos.h b/subversion/include/svn_repos.h
index 93646bf..954bb03 100644
--- a/subversion/include/svn_repos.h
+++ b/subversion/include/svn_repos.h
@@ -454,8 +454,8 @@
* The same as svn_repos_begin_report2(), but taking a boolean
* @a recurse flag, and sending FALSE for @a send_copyfrom_args.
*
- * If @a recurse is true, the editor driver will drive the editor with
- * a depth of @c svn_depth_infinity; if false, then with a depth of
+ * If @a recurse is TRUE, the editor driver will drive the editor with
+ * a depth of @c svn_depth_infinity; if FALSE, then with a depth of
* @c svn_depth_files.
*
* @note @a username is ignored, and has been removed in a revised
@@ -499,7 +499,7 @@
* A depth of @c svn_depth_unknown is not allowed, and results in an
* error.
*
- * If @a start_empty is true and @a path is a directory, then require the
+ * If @a start_empty is TRUE and @a path is a directory, then require the
* caller to explicitly provide all the children of @a path - do not assume
* that the tree also contains all the children of @a path at @a revision.
* This is for 'low confidence' client reporting.
@@ -555,7 +555,7 @@
* creation of the @a report_baton, @a link_path is an absolute filesystem
* path!
*
- * If @a start_empty is true and @a path is a directory, then require the
+ * If @a start_empty is TRUE and @a path is a directory, then require the
* caller to explicitly provide all the children of @a path - do not assume
* that the tree also contains all the children of @a link_path at
* @a revision. This is for 'low confidence' client reporting.
@@ -661,7 +661,7 @@
* will be called with the @a tgt_root's revision number, else it will
* not be called at all.
*
- * If @a authz_read_func is non-null, invoke it before any call to
+ * If @a authz_read_func is non-NULL, invoke it before any call to
*
* @a editor->open_root
* @a editor->add_directory
@@ -719,8 +719,8 @@
apr_pool_t *pool);
/**
- * Similar to svn_repos_dir_delta2(), but if @a recurse is true, pass
- * @c svn_depth_infinity for @a depth, and if @a recurse is false,
+ * Similar to svn_repos_dir_delta2(), but if @a recurse is TRUE, pass
+ * @c svn_depth_infinity for @a depth, and if @a recurse is FALSE,
* pass @c svn_depth_files for @a depth.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -755,13 +755,13 @@
* entirety, not as simple copies or deltas against a previous version.
*
* The @a editor passed to this function should be aware of the fact
- * that, if @a send_deltas is false, calls to its change_dir_prop(),
+ * that, if @a send_deltas is FALSE, calls to its change_dir_prop(),
* change_file_prop(), and apply_textdelta() functions will not
* contain meaningful data, and merely serve as indications that
* properties or textual contents were changed.
*
* If @a send_deltas is @c TRUE, the text and property deltas for changes
- * will be sent, otherwise null text deltas and empty prop changes will be
+ * will be sent, otherwise NULL text deltas and empty prop changes will be
* used.
*
* If @a authz_read_func is non-NULL, it will be used to determine if the
@@ -1167,7 +1167,7 @@
*
* If @a start or @a end is @c SVN_INVALID_REVNUM, it defaults to youngest.
*
- * If @a paths is non-null and has one or more elements, then only show
+ * If @a paths is non-NULL and has one or more elements, then only show
* revisions in which at least one of @a paths was changed (i.e., if
* file, text or props changed; if dir, props or entries changed or any node
* changed below it). Each path is a <tt>const char *</tt> representing
@@ -1179,7 +1179,7 @@
* If @a discover_changed_paths, then each call to @a receiver passes a
* hash mapping paths committed in that revision to information about them
* as the receiver's @a changed_paths argument.
- * Otherwise, each call to @a receiver passes null for @a changed_paths.
+ * Otherwise, each call to @a receiver passes NULL for @a changed_paths.
*
* If @a strict_node_history is set, copy history (if any exists) will
* not be traversed while harvesting revision logs for each path.
@@ -1536,7 +1536,7 @@
* @a rev is the revision whose property to change, @a name is the
* name of the property, and @a new_value is the new value of the
* property. @a author is the authenticated username of the person
- * changing the property value, or null if not available.
+ * changing the property value, or NULL if not available.
*
* If @a authz_read_func is non-NULL, then use it (with @a
* authz_read_baton) to validate the changed-paths associated with @a
@@ -1910,7 +1910,7 @@
* If the dumpstream contains no UUID, then @a uuid_action is
* ignored and the repository UUID is not touched.
*
- * If @a parent_dir is not null, then the parser will reparent all the
+ * If @a parent_dir is not NULL, then the parser will reparent all the
* loaded nodes, from root to @a parent_dir. The directory @a parent_dir
* must be an existing directory in the repository.
*
@@ -2092,7 +2092,7 @@
* 'copyfrom' history to exist in the repository when it encounters
* nodes that are added-with-history.
*
- * If @a parent_dir is not null, then the parser will reparent all the
+ * If @a parent_dir is not NULL, then the parser will reparent all the
* loaded nodes, from root to @a parent_dir. The directory @a parent_dir
* must be an existing directory in the repository.
*
@@ -2313,6 +2313,33 @@
apr_pool_t *pool);
+
+/** Capabilities **/
+
+/**
+ * Store in @a repos the client-reported capabilities @a capabilities,
+ * which must be allocated in memory at least as long-lived as @a repos.
+ *
+ * The elements of @a capabilities are 'const char *', a subset of
+ * the constants beginning with @c SVN_RA_CAPABILITY_.
+ * @a capabilities is not copied, so changing it later will affect
+ * what is remembered by @a repos.
+ *
+ * @note The capabilities are passed along to the start-commit hook;
+ * see that hook's template for details.
+ *
+ * @note As of Subversion 1.5, there are no error conditions defined,
+ * so this always returns SVN_NO_ERROR. In future releases it may
+ * return error, however, so callers should check.
+ *
+ * @since New in 1.5.
+ */
+svn_error_t *
+svn_repos_remember_client_capabilities(svn_repos_t *repos,
+ apr_array_header_t *capabilities);
+
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/subversion/include/svn_sorts.h b/subversion/include/svn_sorts.h
index ec17d84..30db490 100644
--- a/subversion/include/svn_sorts.h
+++ b/subversion/include/svn_sorts.h
@@ -63,7 +63,7 @@
* greater than, equal to, or less than the key of @a b as determined
* by comparing them with svn_path_compare_paths().
*
- * The key strings must be null-terminated, even though klen does not
+ * The key strings must be NULL-terminated, even though klen does not
* include the terminator.
*
* This is useful for converting a hash into a sorted
diff --git a/subversion/include/svn_string.h b/subversion/include/svn_string.h
index 9f00d5b..95e9e2c 100644
--- a/subversion/include/svn_string.h
+++ b/subversion/include/svn_string.h
@@ -49,16 +49,16 @@
*
* Note that an @c svn_string(buf)_t may contain binary data,
* which means that strlen(s->data) does not have to equal @c
- * s->len. The null terminator is provided to make it easier to
+ * s->len. The NULL terminator is provided to make it easier to
* pass @c s->data to C string interfaces.
*
*
- * 2. Non-null input:
+ * 2. Non-NULL input:
*
- * All the functions assume their input data is non-null,
+ * All the functions assume their input data is non-NULL,
* unless otherwise documented, and may seg fault if passed
- * null. The input data may *contain* null bytes, of course, just
- * the data pointer itself must not be null.
+ * NULL. The input data may *contain* null bytes, of course, just
+ * the data pointer itself must not be NULL.
*/
@@ -117,12 +117,12 @@
* @{
*/
-/** Create a new bytestring containing a C string (null-terminated). */
+/** Create a new bytestring containing a C string (NULL-terminated). */
svn_string_t *svn_string_create(const char *cstring,
apr_pool_t *pool);
/** Create a new bytestring containing a generic string of bytes
- * (NOT null-terminated) */
+ * (NOT NULL-terminated) */
svn_string_t *svn_string_ncreate(const char *bytes,
apr_size_t size,
apr_pool_t *pool);
@@ -131,7 +131,7 @@
svn_string_t *svn_string_create_from_buf(const svn_stringbuf_t *strbuf,
apr_pool_t *pool);
-/** Create a new bytestring by formatting @a cstring (null-terminated)
+/** Create a new bytestring by formatting @a cstring (NULL-terminated)
* from varargs, which are as appropriate for apr_psprintf().
*/
svn_string_t *svn_string_createf(apr_pool_t *pool,
@@ -139,7 +139,7 @@
...)
__attribute__((format(printf, 2, 3)));
-/** Create a new bytestring by formatting @a cstring (null-terminated)
+/** Create a new bytestring by formatting @a cstring (NULL-terminated)
* from a @c va_list (see svn_stringbuf_createf()).
*/
svn_string_t *svn_string_createv(apr_pool_t *pool,
@@ -147,7 +147,7 @@
va_list ap)
__attribute__((format(printf, 2, 0)));
-/** Return true if a bytestring is empty (has length zero). */
+/** Return TRUE if a bytestring is empty (has length zero). */
svn_boolean_t svn_string_isempty(const svn_string_t *str);
/** Return a duplicate of @a original_string. */
@@ -177,11 +177,11 @@
* @{
*/
-/** Create a new bytestring containing a C string (null-terminated). */
+/** Create a new bytestring containing a C string (NULL-terminated). */
svn_stringbuf_t *svn_stringbuf_create(const char *cstring,
apr_pool_t *pool);
/** Create a new bytestring containing a generic string of bytes
- * (NON-null-terminated)
+ * (NON-NULL-terminated)
*/
svn_stringbuf_t *svn_stringbuf_ncreate(const char *bytes,
apr_size_t size,
@@ -191,7 +191,7 @@
svn_stringbuf_t *svn_stringbuf_create_from_string(const svn_string_t *str,
apr_pool_t *pool);
-/** Create a new bytestring by formatting @a cstring (null-terminated)
+/** Create a new bytestring by formatting @a cstring (NULL-terminated)
* from varargs, which are as appropriate for apr_psprintf().
*/
svn_stringbuf_t *svn_stringbuf_createf(apr_pool_t *pool,
@@ -199,7 +199,7 @@
...)
__attribute__((format(printf, 2, 3)));
-/** Create a new bytestring by formatting @a cstring (null-terminated)
+/** Create a new bytestring by formatting @a cstring (NULL-terminated)
* from a @c va_list (see svn_stringbuf_createf()).
*/
svn_stringbuf_t *svn_stringbuf_createv(apr_pool_t *pool,
@@ -210,7 +210,7 @@
/** Make sure that the string @a str has at least @a minimum_size bytes of
* space available in the memory block.
*
- * (@a minimum_size should include space for the terminating null character.)
+ * (@a minimum_size should include space for the terminating NULL character.)
*/
void svn_stringbuf_ensure(svn_stringbuf_t *str,
apr_size_t minimum_size);
@@ -297,7 +297,7 @@
* (thus, it is possible that the returned array will have length
* zero).
*
- * If @a chop_whitespace is true, then remove leading and trailing
+ * If @a chop_whitespace is TRUE, then remove leading and trailing
* whitespace from the returned strings.
*/
apr_array_header_t *svn_cstring_split(const char *input,
@@ -334,6 +334,7 @@
* Return a cstring which is the concatenation of @a strings (an array
* of char *) each followed by @a separator (that is, @a separator
* will also end the resulting string). Allocate the result in @a pool.
+ * If @a strings is empty, then return the empty string.
*
* @since New in 1.2.
*/
diff --git a/subversion/include/svn_subst.h b/subversion/include/svn_subst.h
index 7582f61..ce5d8eb 100644
--- a/subversion/include/svn_subst.h
+++ b/subversion/include/svn_subst.h
@@ -61,10 +61,10 @@
*
* - @c NULL for @c svn_subst_eol_style_none, or
*
- * - a null-terminated C string containing the native eol marker
+ * - a NULL-terminated C string containing the native eol marker
* for this platform, for @c svn_subst_eol_style_native, or
*
- * - a null-terminated C string containing the eol marker indicated
+ * - a NULL-terminated C string containing the eol marker indicated
* by the property value, for @c svn_subst_eol_style_fixed.
*
* If @a *style is NULL, it is ignored.
@@ -75,7 +75,7 @@
const char *value);
/** Indicates whether the working copy and normalized versions of a file
- * with the given the parameters differ. If @a force_eol_check is true,
+ * with the given the parameters differ. If @a force_eol_check is TRUE,
* the routine also accounts for all translations required due to repairing
* fixed eol styles.
*
@@ -209,8 +209,8 @@
* Note that a translation request is *required*: one of @a eol_str or
* @a keywords must be non-@c NULL.
*
- * Recommendation: if @a expand is false, then you don't care about the
- * keyword values, so use empty strings as non-null signifiers when you
+ * Recommendation: if @a expand is FALSE, then you don't care about the
+ * keyword values, so use empty strings as non-NULL signifiers when you
* build the keywords hash.
*
* Notes:
diff --git a/subversion/include/svn_types.h b/subversion/include/svn_types.h
index d39d22c..165f73b 100644
--- a/subversion/include/svn_types.h
+++ b/subversion/include/svn_types.h
@@ -152,7 +152,7 @@
*/
#define SVN_IGNORED_REVNUM ((svn_revnum_t) -1)
-/** Convert null-terminated C string @a str to a revision number. */
+/** Convert NULL-terminated C string @a str to a revision number. */
#define SVN_STR_TO_REV(str) ((svn_revnum_t) atol(str))
/**
@@ -257,7 +257,7 @@
in any files or subdirectories not already present; those
subdirectories' this_dir entries will have depth-infinity.
Equivalent to the pre-1.5 default update behavior. */
- svn_depth_infinity = 3,
+ svn_depth_infinity = 3
} svn_depth_t;
@@ -282,7 +282,7 @@
svn_depth_from_word(const char *word);
-/* Return @c svn_depth_infinity if boolean @a recurse is true, else
+/* Return @c svn_depth_infinity if boolean @a recurse is TRUE, else
* return @c svn_depth_files.
*
* @note New code should never need to use this, it is called only
@@ -294,7 +294,7 @@
((recurse) ? svn_depth_infinity : svn_depth_files)
-/* Return @c svn_depth_infinity if boolean @a recurse is true, else
+/* Return @c svn_depth_infinity if boolean @a recurse is TRUE, else
* return @c svn_depth_immediates.
*
* @note New code should never need to use this, it is called only
@@ -306,7 +306,7 @@
((recurse) ? svn_depth_infinity : svn_depth_immediates)
-/* Return @c svn_depth_infinity if boolean @a recurse is true, else
+/* Return @c svn_depth_infinity if boolean @a recurse is TRUE, else
* return @c svn_depth_empty.
*
* @note New code should never need to use this, it is called only
@@ -594,7 +594,7 @@
/**
* Returns an @c svn_log_entry_t, allocated in @a pool with all fields
- * initialized to null values.
+ * initialized to NULL values.
*
* @note To allow for extending the @c svn_log_entry_t structure in future
* releases, this function should always be used to allocate the structure.
@@ -614,7 +614,7 @@
* information for the log message. Any of @a log_entry->author,
* @a log_entry->date, or @a log_entry->message may be @c NULL.
*
- * If @a log_entry->date is neither null nor the empty string, it was
+ * If @a log_entry->date is neither NULL nor the empty string, it was
* generated by svn_time_to_cstring() and can be converted to
* @c apr_time_t with svn_time_from_cstring().
*
@@ -734,7 +734,7 @@
apr_pool_t *pool);
-/** Return false iff @a mime_type is a textual type.
+/** Return FALSE iff @a mime_type is a textual type.
*
* All mime types that start with "text/" are textual, plus some special
* cases (for example, "image/x-xbitmap").
@@ -785,7 +785,7 @@
/**
* Returns an @c svn_lock_t, allocated in @a pool with all fields initialized
- * to null values.
+ * to NULL values.
*
* @note To allow for extending the @c svn_lock_t structure in the future
* releases, this function should always be used to allocate the structure.
@@ -816,7 +816,7 @@
*
* If the 'start' field is less than the 'end' field then 'start' is exclusive
* and 'end' inclusive of the range described. If 'start' is greater than 'end'
- * then the opposite is true. If 'start' equals 'end' the meaning of the range
+ * then the opposite is TRUE. If 'start' equals 'end' the meaning of the range
* is not defined.
*
* @since New in 1.5
@@ -843,7 +843,7 @@
svn_rangelist_equal_inheritance,
/* Inheritability of both ranges must be @c TRUE. */
- svn_rangelist_only_inheritable,
+ svn_rangelist_only_inheritable
} svn_merge_range_inheritance_t;
/**
diff --git a/subversion/include/svn_wc.h b/subversion/include/svn_wc.h
index fde2c20..c3ac07b 100644
--- a/subversion/include/svn_wc.h
+++ b/subversion/include/svn_wc.h
@@ -132,7 +132,7 @@
/**
* Return, in @a *adm_access, a pointer to a new access baton for the working
* copy administrative area associated with the directory @a path. If
- * @a write_lock is true the baton will include a write lock, otherwise the
+ * @a write_lock is TRUE the baton will include a write lock, otherwise the
* baton can only be used for read access. If @a path refers to a directory
* that is already write locked then the error @c SVN_ERR_WC_LOCKED will be
* returned. The error @c SVN_ERR_WC_NOT_DIRECTORY will be returned if
@@ -1052,7 +1052,7 @@
typedef enum svn_wc_conflict_kind_t
{
svn_wc_conflict_kind_text, /* textual conflict (on a file) */
- svn_wc_conflict_kind_property, /* property conflict (on a file or dir) */
+ svn_wc_conflict_kind_property /* property conflict (on a file or dir) */
/* ### Add future kinds here that represent "tree" conflicts. */
@@ -1137,7 +1137,7 @@
svn_wc_conflict_choose_base, /* user chooses the original version */
svn_wc_conflict_choose_theirs, /* user chooses incoming version */
svn_wc_conflict_choose_mine, /* user chooses his/her own version */
- svn_wc_conflict_choose_merged, /* user chooses the merged version */
+ svn_wc_conflict_choose_merged /* user chooses the merged version */
} svn_wc_conflict_choice_t;
@@ -1756,7 +1756,7 @@
/** Set @a *entry to an entry for @a path, allocated in the access baton
- * pool. If @a show_hidden is true, return the entry even if it's in
+ * pool. If @a show_hidden is TRUE, return the entry even if it's in
* 'deleted' or 'absent' state. If @a path is not under revision
* control, or if entry is hidden, not scheduled for re-addition,
* and @a show_hidden is @c FALSE, then set @a *entry to @c NULL.
@@ -1795,7 +1795,7 @@
*
* Entries that are in a 'deleted' or 'absent' state (and not
* scheduled for re-addition) are not returned in the hash, unless
- * @a show_hidden is true.
+ * @a show_hidden is TRUE.
*
* @par Important:
* The @a entries hash is the entries cache in @a adm_access
@@ -1909,7 +1909,7 @@
*
* Like our other entries interfaces, entries that are in a 'deleted'
* or 'absent' state (and not scheduled for re-addition) are not
- * discovered, unless @a show_hidden is true.
+ * discovered, unless @a show_hidden is TRUE.
*
* When a new directory is entered, @c SVN_WC_ENTRY_THIS_DIR will always
* be returned first.
@@ -2372,8 +2372,8 @@
*
* Assuming the target is a directory, then:
*
- * - If @a get_all is false, then only locally-modified entries will be
- * returned. If true, then all entries will be returned.
+ * - If @a get_all is FALSE, then only locally-modified entries will be
+ * returned. If TRUE, then all entries will be returned.
*
* - If @a depth is @c svn_depth_empty, a status structure will
* be returned for the target only; if @c svn_depth_files, for the
@@ -2427,8 +2427,8 @@
/**
* Like svn_wc_get_status_editor3(), but with @a ignore_patterns
* provided from the corresponding value in @a config, and @a recurse
- * instead of @a depth. If @a recurse is true, behave as if for @c
- * svn_depth_infinity; else if @a recurse is false, behave as if for
+ * instead of @a depth. If @a recurse is TRUE, behave as if for @c
+ * svn_depth_infinity; else if @a recurse is FALSE, behave as if for
* @c svn_depth_immediates.
*
* @since New in 1.2.
@@ -2579,7 +2579,7 @@
apr_pool_t *pool);
/**
- * Similar to svn_wc_delete3(), but with @a keep_local always set to false.
+ * Similar to svn_wc_delete3(), but with @a keep_local always set to FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -2633,7 +2633,7 @@
* ### responsible for "switching" a working copy directory over to a
* ### new copyfrom ancestry and scheduling it for addition. Here is
* ### the old doc string from Ben, lightly edited to bring it
- * ### up-to-date, explaining the true, secret life of this function:</pre>
+ * ### up-to-date, explaining the TRUE, secret life of this function:</pre>
*
* Given a @a path within a working copy of type KIND, follow this algorithm:
*
@@ -2759,11 +2759,11 @@
* *all* the administrative areas anywhere in the tree below @a adm_access.
*
* Normally, only administrative data is removed. However, if
- * @a destroy_wf is true, then all working file(s) and dirs are deleted
+ * @a destroy_wf is TRUE, then all working file(s) and dirs are deleted
* from disk as well. When called with @a destroy_wf, any locally
* modified files will *not* be deleted, and the special error
* @c SVN_ERR_WC_LEFT_LOCAL_MOD might be returned. (Callers only need to
- * check for this special return value if @a destroy_wf is true.)
+ * check for this special return value if @a destroy_wf is TRUE.)
*
* If @a instant_error is TRUE, then return @c
* SVN_ERR_WC_LEFT_LOCAL_MOD the instant a locally modified file is
@@ -2790,8 +2790,8 @@
/**
* Assuming @a path is under version control and in a state of conflict,
- * then take @a path *out* of this state. If @a resolve_text is true then
- * any text conflict is resolved, if @a resolve_props is true then any
+ * then take @a path *out* of this state. If @a resolve_text is TRUE then
+ * any text conflict is resolved, if @a resolve_props is TRUE then any
* property conflicts are resolved.
*
* If @a depth is @c svn_depth_empty, act only on @a path; if
@@ -2847,7 +2847,7 @@
/**
* Similar to svn_wc_resolved_conflict3(), but without automatic conflict
* resolution support, and with @a depth set according to @a recurse:
- * if @a recurse is true, @a depth is @c svn_depth_infinity, else it is
+ * if @a recurse is TRUE, @a depth is @c svn_depth_infinity, else it is
* @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -2971,7 +2971,7 @@
* the checksum for the new text base. Else, calculate the checksum
* if needed.
*
- * If @a recurse is true and @a path is a directory, then bump every
+ * If @a recurse is TRUE and @a path is a directory, then bump every
* versioned object at or under @a path. This is usually done for
* copied trees.
*
@@ -3075,12 +3075,12 @@
* sending back all the items the client might need to upgrade a
* working copy from a shallower depth to a deeper one.
*
- * If @a restore_files is true, then unexpectedly missing working files
+ * If @a restore_files is TRUE, then unexpectedly missing working files
* will be restored from the administrative directory's cache. For each
* file restored, the @a notify_func function will be called with the
* @a notify_baton and the path of the restored file. @a notify_func may
* be @c NULL if this notification is not required. If @a
- * use_commit_times is true, then set restored files' timestamps to
+ * use_commit_times is TRUE, then set restored files' timestamps to
* their last-commit-times.
*
* If @a traversal_info is non-NULL, then record pre-update traversal
@@ -3230,7 +3230,7 @@
* have their working timestamp set to the last-committed-time. If
* FALSE, the working files will be touched with the 'now' time.
*
- * If @a allow_unver_obstructions is true, then allow unversioned
+ * If @a allow_unver_obstructions is TRUE, then allow unversioned
* obstructions when adding a path.
*
* If @a depth is @c svn_depth_infinity, update fully recursively.
@@ -3273,11 +3273,11 @@
/**
* Similar to svn_wc_get_update_editor3() but with the @a
- * allow_unver_obstructions parameter always set to false, @a
+ * allow_unver_obstructions parameter always set to FALSE, @a
* conflict_func and baton set to NULL, @a fetch_func and baton set to
* NULL, @a preserved_exts set to NULL, and @a depth set according to
- * @a recurse: if @a recurse is true, pass @c svn_depth_infinity, if
- * false, pass @c svn_depth_files.
+ * @a recurse: if @a recurse is TRUE, pass @c svn_depth_infinity, if
+ * FALSE, pass @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -3370,7 +3370,7 @@
*
* @a depth behaves as for svn_wc_get_update_editor3().
*
- * If @a allow_unver_obstructions is true, then allow unversioned
+ * If @a allow_unver_obstructions is TRUE, then allow unversioned
* obstructions when adding a path.
*
* @since New in 1.5.
@@ -3397,10 +3397,10 @@
/**
* Similar to svn_wc_get_switch_editor3() but with the
- * @a allow_unver_obstructions parameter always set to false,
+ * @a allow_unver_obstructions parameter always set to FALSE,
* @a preserved_exts set to NULL, @a conflict_func and baton set to NULL,
- * and @a depth set according to @a recurse: if @a recurse is true, pass @c
- * svn_depth_infinity, if false, pass @c svn_depth_files.
+ * and @a depth set according to @a recurse: if @a recurse is TRUE, pass @c
+ * svn_depth_infinity, if FALSE, pass @c svn_depth_files.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
*/
@@ -3491,8 +3491,8 @@
* NULL, remove property @a name from @a path. @a adm_access is an
* access baton with a write lock for @a path.
*
- * If @a skip_checks is true, do no validity checking. But if @a
- * skip_checks is false, and @a name is not a valid property for @a
+ * If @a skip_checks is TRUE, do no validity checking. But if @a
+ * skip_checks is FALSE, and @a name is not a valid property for @a
* path, return an error, either @c SVN_ERR_ILLEGAL_TARGET (if the
* property is not appropriate for @a path), or @c
* SVN_ERR_BAD_MIME_TYPE (if @a name is "svn:mime-type", but @a value
@@ -3500,7 +3500,7 @@
*
* @a name may be a wc property or a regular property; but if it is an
* entry property, return the error @c SVN_ERR_BAD_PROP_KIND, even if
- * @a skip_checks is true.
+ * @a skip_checks is TRUE.
*
* Use @a pool for temporary allocation.
*
@@ -3515,7 +3515,7 @@
/**
- * Like svn_wc_prop_set2(), but with @a skip_checks always false.
+ * Like svn_wc_prop_set2(), but with @a skip_checks always FALSE.
*
* @deprecated Provided for backward compatibility with the 1.1 API.
*/
@@ -3526,7 +3526,7 @@
apr_pool_t *pool);
-/** Return true iff @a name is a 'normal' property name. 'Normal' is
+/** Return TRUE iff @a name is a 'normal' property name. 'Normal' is
* defined as a user-visible and user-tweakable property that shows up
* when you fetch a proplist.
*
@@ -3543,10 +3543,10 @@
-/** Return true iff @a name is a 'wc' property name. */
+/** Return TRUE iff @a name is a 'wc' property name. */
svn_boolean_t svn_wc_is_wc_prop(const char *name);
-/** Return true iff @a name is a 'entry' property name. */
+/** Return TRUE iff @a name is a 'entry' property name. */
svn_boolean_t svn_wc_is_entry_prop(const char *name);
/** Callback type used by @c svn_wc_canonicalize_svn_prop.
@@ -3573,7 +3573,7 @@
* If the property is not appropriate for a node of kind @a kind, or
* is otherwise invalid, throw an error. Otherwise, set @a *propval_p
* to a canonicalized version of the property value. If @a
- * skip_some_checks is true, only some validity checks are taken.
+ * skip_some_checks is TRUE, only some validity checks are taken.
*
* Some validity checks require access to the contents and MIME type
* of the target if it is a file; they will call @a prop_getter with @a
@@ -3623,11 +3623,11 @@
* @a ignore_ancestry is @c FALSE, then any discontinuous node ancestry will
* result in the diff given as a full delete followed by an add.
*
- * If @a use_text_base is true, then compare the repository against
+ * If @a use_text_base is TRUE, then compare the repository against
* the working copy's text-base files, rather than the working files.
*
* Normally, the difference from repository->working_copy is shown.
- * If @a reverse_order is true, then show working_copy->repository diffs.
+ * If @a reverse_order is TRUE, then show working_copy->repository diffs.
*
* If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
* to periodically check if the client has canceled the operation.
@@ -3649,8 +3649,8 @@
apr_pool_t *pool);
/**
* Similar to svn_wc_get_diff_editor4(), but with @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_infinity if @a recurse is TRUE, or @a svn_depth_files
+ * if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -3746,8 +3746,8 @@
/**
* Similar to svn_wc_diff4(), but with @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_infinity if @a recurse is TRUE, or @a svn_depth_files
+ * if @a recurse is FALSE.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
*/
@@ -4079,7 +4079,7 @@
* @a baton is a closure object; it should be provided by the
* implementation, and passed by the caller.
*
- * If @a root is true, then the implementation should make sure that @a url
+ * If @a root is TRUE, then the implementation should make sure that @a url
* is the repository root. Else, it can be an URL inside the repository.
* @a pool may be used for temporary allocations.
*
@@ -4114,7 +4114,7 @@
/** Change repository references at @a path that begin with @a from
* to begin with @a to instead. Perform necessary allocations in @a pool.
- * If @a recurse is true, do so. @a validator (and its baton,
+ * If @a recurse is TRUE, do so. @a validator (and its baton,
* @a validator_baton), will be called for each newly generated URL.
*
* @a adm_access is an access baton for the directory containing
@@ -4205,10 +4205,10 @@
/**
* Similar to svn_wc_revert3(), but with @a depth set according to
- * @a recursive: if @a recursive is true, @a depth is
- * @c svn_depth_infinity; if false, @a depth is @c svn_depth_empty.
+ * @a recursive: if @a recursive is TRUE, @a depth is
+ * @c svn_depth_infinity; if FALSE, @a depth is @c svn_depth_empty.
*
- * @note Most APIs map @a recurse==false to @a depth==svn_depth_files;
+ * @note Most APIs map @a recurse==FALSE to @a depth==svn_depth_files;
* revert is deliberately different.
*
* @deprecated Provided for backward compatibility with the 1.2 API.
@@ -4449,7 +4449,7 @@
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
-/** Return true iff @a str matches any of the elements of @a list, a
+/** Return TRUE iff @a str matches any of the elements of @a list, a
* list of zero or more ignore patterns.
*
* @since New in 1.5.
@@ -4501,7 +4501,7 @@
*
* Set @a (*result_p)->min_rev and @a (*result_p)->max_rev respectively to the
* lowest and highest revision numbers in the working copy. If @a committed
- * is true, summarize the last-changed revisions, else the base revisions.
+ * is TRUE, summarize the last-changed revisions, else the base revisions.
*
* Set @a (*result_p)->switched to indicate whether any item in the WC is
* switched relative to its parent. If @a trail_url is non-NULL, use it to
diff --git a/subversion/include/svn_xml.h b/subversion/include/svn_xml.h
index 35cc2d7..8d08f8f 100644
--- a/subversion/include/svn_xml.h
+++ b/subversion/include/svn_xml.h
@@ -85,7 +85,7 @@
apr_pool_t *pool);
/** Same as svn_xml_escape_cdata_stringbuf(), but @a string is a
- * null-terminated C string.
+ * NULL-terminated C string.
*/
void svn_xml_escape_cdata_cstring(svn_stringbuf_t **outstr,
const char *string,
@@ -110,7 +110,7 @@
apr_pool_t *pool);
/** Same as svn_xml_escape_attr_stringbuf(), but @a string is a
- * null-terminated C string.
+ * NULL-terminated C string.
*/
void svn_xml_escape_attr_cstring(svn_stringbuf_t **outstr,
const char *string,
@@ -230,7 +230,7 @@
*
* The hash's keys and values are <tt>char *</tt>'s.
*
- * @a atts may be null, in which case you just get an empty hash back
+ * @a atts may be NULL, in which case you just get an empty hash back
* (this makes life more convenient for some callers).
*/
apr_hash_t *svn_xml_make_att_hash(const char **atts, apr_pool_t *pool);
@@ -272,7 +272,7 @@
* If @a str is @c NULL, allocate @a *str in @a pool; else append the new
* tag to @a *str, allocating in @a str's pool
*
- * Take the tag's attributes from varargs, a null-terminated list of
+ * Take the tag's attributes from varargs, a NULL-terminated list of
* alternating <tt>char *</tt> key and <tt>char *</tt> val. Do xml-escaping
* on each val.
*
diff --git a/subversion/libsvn_client/client.h b/subversion/libsvn_client/client.h
index 2f7e67b..62d0fd2 100644
--- a/subversion/libsvn_client/client.h
+++ b/subversion/libsvn_client/client.h
@@ -24,6 +24,7 @@
#include <apr_pools.h>
#include "svn_types.h"
+#include "svn_opt.h"
#include "svn_string.h"
#include "svn_error.h"
#include "svn_ra.h"
@@ -34,6 +35,34 @@
#endif /* __cplusplus */
+
+/* Set *URL and *PEG_REVNUM (the latter is ignored if NULL) to the
+ repository URL of PATH_OR_URL. If PATH_OR_URL is a WC path and
+ PEG_REVISION->kind is svn_opt_revision_working, use the
+ corresponding entry's copyfrom info. RA_SESSION and ADM_ACCESS may
+ be NULL, regardless of whether PATH_OR_URL is a URL. Use CTX for
+ cancellation (ignored if NULL), and POOL for all allocations. */
+svn_error_t *
+svn_client__derive_location(const char **url,
+ svn_revnum_t *peg_revnum,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ const svn_ra_session_t *ra_session,
+ svn_wc_adm_access_t *adm_access,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool);
+
+/* Get the repository URL and revision number for WC entry ENTRY,
+ which is sometimes the entry's copyfrom info rather than its actual
+ URL and revision. */
+svn_error_t *
+svn_client__entry_location(const char **url,
+ svn_revnum_t *revnum,
+ const char *path_or_url,
+ enum svn_opt_revision_kind peg_rev_kind,
+ const svn_wc_entry_t *entry,
+ apr_pool_t *pool);
+
/* Set *REVNUM to the revision number identified by REVISION.
If REVISION->kind is svn_opt_revision_number, just use
@@ -226,16 +255,25 @@
apr_pool_t *pool);
/* Return the path of PATH_OR_URL relative to the repository root
- (REPOS_ROOT) in REL_PATH (URI-decoded).
+ (REPOS_ROOT) in REL_PATH (URI-decoded). If INCLUDE_LEADING_SLASH
+ is set, the returned result will have a leading slash; otherwise,
+ it will not.
The remaining parameters are used to procure the repository root.
Either REPOS_ROOT or RA_SESSION -- but not both -- may be NULL.
REPOS_ROOT or ADM_ACCESS (which may also be NULL) should be passed
- when available as an optimization (in that order of preference). */
+ when available as an optimization (in that order of preference).
+
+ CAUTION: While having a leading slash on a so-called relative path
+ might work out well for functionality that interacts with
+ mergeinfo, it results in a relative path that cannot be naively
+ svn_path_join()'d with a repository root URL to provide a full URL.
+*/
svn_error_t *
svn_client__path_relative_to_root(const char **rel_path,
const char *path_or_url,
const char *repos_root,
+ svn_boolean_t include_leading_slash,
svn_ra_session_t *ra_session,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
@@ -631,9 +669,6 @@
/* The source path or url. */
const char *src;
- /* The source path relative to the repository root */
- const char *src_rel;
-
/* The absolute path of the source. */
const char *src_abs;
@@ -660,9 +695,6 @@
/* The destination path or url */
const char *dst;
- /* The destination path relative to the repository root */
- const char *dst_rel;
-
/* The destination's parent path */
const char *dst_parent;
} svn_client__copy_pair_t;
diff --git a/subversion/libsvn_client/copy.c b/subversion/libsvn_client/copy.c
index ce71a9b..14290f3 100644
--- a/subversion/libsvn_client/copy.c
+++ b/subversion/libsvn_client/copy.c
@@ -58,37 +58,60 @@
* delete src_path
*/
+static svn_error_t *
+path_relative_to_session(const char **rel_path,
+ svn_ra_session_t *ra_session,
+ const char *full_url,
+ apr_pool_t *pool)
+{
+ const char *session_url;
+ SVN_ERR(svn_ra_get_session_url(ra_session, &session_url, pool));
+ if (strcmp(session_url, full_url) == 0)
+ *rel_path = "";
+ else
+ *rel_path = svn_path_uri_decode(svn_path_is_child(session_url,
+ full_url, pool), pool);
+ return SVN_NO_ERROR;
+}
-/* Obtain the implied mergeinfo of repository-relative path PATH in
- *IMPLIED_MERGEINFO (e.g. every revision of the node at PATH since
- it last appeared). REL_PATH corresponds to PATH, but is relative
- to RA_SESSION. */
+/* Set *IMPLIED_MERGEINFO to the implicit/implied mergeinfo associated
+ with PATH@REV (where PATH is relative to RA_SESSION's session
+ URL). */
static svn_error_t *
get_implied_mergeinfo(svn_ra_session_t *ra_session,
apr_hash_t **implied_mergeinfo,
- const char *rel_path,
const char *path,
svn_revnum_t rev,
+ svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- svn_revnum_t oldest_rev;
- svn_merge_range_t *range;
- apr_array_header_t *rangelist;
+ const char *session_url, *url, *mergeinfo_path;
+ svn_opt_revision_t peg_revision;
- *implied_mergeinfo = apr_hash_make(pool);
+ /* Translate PATH (which is relative to the session) to a full URL. */
+ SVN_ERR(svn_ra_get_session_url(ra_session, &session_url, pool));
+ url = svn_path_join(session_url, (*path == '/') ? path + 1 : path, pool);
- SVN_ERR(svn_client__oldest_rev_at_path(&oldest_rev, ra_session, rel_path,
- rev, pool));
- if (oldest_rev == SVN_INVALID_REVNUM)
- return SVN_NO_ERROR;
+ /* Calculate a mergeinfo-compliant absolute FS path. */
+ SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, url, NULL,
+ TRUE, ra_session, NULL, pool));
- range = apr_palloc(pool, sizeof(*range));
- range->start = oldest_rev - 1;
- range->end = rev;
- range->inheritable = TRUE;
- rangelist = apr_array_make(pool, 1, sizeof(range));
- APR_ARRAY_PUSH(rangelist, svn_merge_range_t *) = range;
- apr_hash_set(*implied_mergeinfo, path, APR_HASH_KEY_STRING, rangelist);
+ /* If our final URL doesn't match our session's URL, temporary
+ reparent the session to our URL. */
+ if (strcmp(url, session_url) != 0)
+ SVN_ERR(svn_ra_reparent(ra_session, url, pool));
+
+ /* Fetch the implicit mergeinfo. */
+ peg_revision.kind = svn_opt_revision_number;
+ peg_revision.value.number = rev;
+ SVN_ERR(svn_client__get_implicit_mergeinfo(implied_mergeinfo, url,
+ &peg_revision, ra_session,
+ NULL, ctx, pool));
+
+ /* If we reparented RA_SESSION above, point it back where it was
+ when we were called. */
+ if (strcmp(url, session_url) != 0)
+ SVN_ERR(svn_ra_reparent(ra_session, session_url, pool));
return SVN_NO_ERROR;
}
@@ -102,13 +125,14 @@
apr_hash_t **target_mergeinfo,
svn_wc_adm_access_t *adm_access,
const char *src_path_or_url,
- const char *src_rel_path,
svn_revnum_t src_revnum,
+ svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
apr_hash_t *src_mergeinfo = NULL;
- const svn_wc_entry_t *entry;
+ const svn_wc_entry_t *entry = NULL;
svn_boolean_t locally_added = FALSE;
+ const char *src_url;
/* If we have a schedule-add WC path (which was not copied from
elsewhere), it doesn't have any repository mergeinfo, so don't
@@ -117,37 +141,47 @@
{
SVN_ERR(svn_wc__entry_versioned(&entry, src_path_or_url, adm_access,
FALSE, pool));
- if (entry->schedule == svn_wc_schedule_add && !entry->copied)
- locally_added = TRUE;
+ if (entry->schedule == svn_wc_schedule_add && (! entry->copied))
+ {
+ locally_added = TRUE;
+ }
+ else
+ {
+ SVN_ERR(svn_client__entry_location(&src_url, &src_revnum,
+ src_path_or_url,
+ svn_opt_revision_working, entry,
+ pool));
+ }
+ }
+ else
+ {
+ src_url = src_path_or_url;
}
if (! locally_added)
{
- const char *src_path;
-
- if (adm_access)
- {
- /* ASSUMPTION: entry was obtained above. */
- svn_client__derive_mergeinfo_location(&src_path_or_url, &src_revnum,
- entry);
- }
+ const char *mergeinfo_path, *rel_path;
/* Find src path relative to the repository root. */
- SVN_ERR(svn_client__path_relative_to_root(&src_path, src_path_or_url,
- NULL, ra_session, adm_access,
- pool));
+ SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, src_url,
+ entry ? entry->repos : NULL,
+ TRUE, ra_session,
+ adm_access, pool));
- /* Obtain any implied and/or existing (explicit) mergeinfo. */
+ /* Obtain any implied mergeinfo... */
+ SVN_ERR(path_relative_to_session(&rel_path, ra_session, src_url, pool));
SVN_ERR(get_implied_mergeinfo(ra_session, target_mergeinfo,
- src_rel_path, src_path, src_revnum, pool));
+ rel_path, src_revnum, ctx, pool));
+
+ /* ... and any existing (explicit) mergeinfo. */
SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, &src_mergeinfo,
- src_path, src_revnum,
+ mergeinfo_path, src_revnum,
svn_mergeinfo_inherited, pool));
/* Combine and return all mergeinfo. */
if (src_mergeinfo)
{
- SVN_ERR(svn_mergeinfo_merge(target_mergeinfo, src_mergeinfo,
+ SVN_ERR(svn_mergeinfo_merge(*target_mergeinfo, src_mergeinfo,
svn_rangelist_equal_inheritance, pool));
}
}
@@ -175,7 +209,7 @@
/* Combine the provided mergeinfo with any mergeinfo from the WC. */
if (wc_mergeinfo)
- SVN_ERR(svn_mergeinfo_merge(&wc_mergeinfo, mergeinfo,
+ SVN_ERR(svn_mergeinfo_merge(wc_mergeinfo, mergeinfo,
svn_rangelist_equal_inheritance, pool));
else
wc_mergeinfo = mergeinfo;
@@ -215,11 +249,6 @@
"", src_access, NULL,
TRUE, TRUE, ctx, pool));
pair->src_revnum = entry->revision;
- /* ### If this API worked right, we could pass entry->repos for its
- ### REPOS_ROOT parameter as an optimization. */
- SVN_ERR(svn_client__path_relative_to_root(&pair->src_rel, pair->src,
- NULL, ra_session,
- src_access, pool));
/* ASSUMPTION: Non-numeric operative and peg revisions --
other than working or unspecified -- won't be encountered
@@ -227,9 +256,9 @@
transformed into repository URLs (as done towards the end
of the setup_copy() routine), and be handled by a
different code path. */
- SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, src_access,
- pair->src, pair->src_rel,
- pair->src_revnum, pool));
+ SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo,
+ src_access, pair->src,
+ pair->src_revnum, ctx, pool));
/* Because any local mergeinfo from the copy source will have
already been propagated to the destination, we can avoid
@@ -237,7 +266,7 @@
Now, add the implied mergeinfo to the destination. */
SVN_ERR(svn_wc__entry_versioned(&entry, pair->dst, dst_access, FALSE,
- pool));
+ pool));
return extend_wc_mergeinfo(pair->dst, entry, mergeinfo, dst_access,
ctx, pool);
@@ -1025,8 +1054,8 @@
path_driver_info_t *);
apr_hash_t *mergeinfo;
SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, NULL,
- info->src_url, info->src_path,
- info->src_revnum, pool));
+ info->src_url, info->src_revnum,
+ ctx, pool));
SVN_ERR(svn_mergeinfo__to_string(&info->mergeinfo, mergeinfo, pool));
APR_ARRAY_PUSH(paths, const char *) = info->dst_path;
@@ -1157,21 +1186,21 @@
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_node_kind_t dst_kind;
- svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
- svn_client__copy_pair_t *);
+ const char *dst_rel;
+ svn_client__copy_pair_t *pair =
+ APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
- SVN_ERR(svn_client__path_relative_to_root(&pair->src_rel, pair->src,
- NULL, ra_session, adm_access,
- pool));
+
SVN_ERR(svn_wc_entry(&entry, pair->src, adm_access, FALSE, iterpool));
pair->src_revnum = entry->revision;
- pair->dst_rel = svn_path_is_child(top_dst_url, pair->dst, pool);
- SVN_ERR(svn_ra_check_path(ra_session,
- svn_path_uri_decode(pair->dst_rel, iterpool),
- SVN_INVALID_REVNUM, &dst_kind, iterpool));
-
+ dst_rel = svn_path_uri_decode(svn_path_is_child(top_dst_url,
+ pair->dst,
+ iterpool),
+ iterpool);
+ SVN_ERR(svn_ra_check_path(ra_session, dst_rel, SVN_INVALID_REVNUM,
+ &dst_kind, iterpool));
if (dst_kind != svn_node_none)
{
return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
@@ -1299,16 +1328,15 @@
mergeinfo_prop = apr_palloc(item->outgoing_prop_changes->pool,
sizeof(svn_prop_t));
mergeinfo_prop->name = SVN_PROP_MERGE_INFO;
- SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo,
- adm_access, pair->src,
- pair->src_rel, pair->src_revnum,
- pool));
+ SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, adm_access,
+ pair->src, pair->src_revnum,
+ ctx, pool));
SVN_ERR(svn_wc_entry(&entry, pair->src, adm_access, FALSE, pool));
SVN_ERR(svn_client__parse_mergeinfo(&wc_mergeinfo, entry,
pair->src, FALSE, adm_access, ctx,
pool));
if (wc_mergeinfo)
- SVN_ERR(svn_mergeinfo_merge(&mergeinfo, wc_mergeinfo,
+ SVN_ERR(svn_mergeinfo_merge(mergeinfo, wc_mergeinfo,
svn_rangelist_equal_inheritance, pool));
SVN_ERR(svn_mergeinfo__to_string((svn_string_t **)
&mergeinfo_prop->value,
@@ -1420,10 +1448,9 @@
### *before* the notification callback is invoked by
### svn_wc_add2(), but can't occur before we add the new
### source path. */
- SVN_ERR(calculate_target_mergeinfo(ra_session, &src_mergeinfo,
- NULL, pair->src,
- pair->src_rel, src_revnum,
- pool));
+ SVN_ERR(calculate_target_mergeinfo(ra_session, &src_mergeinfo, NULL,
+ pair->src, src_revnum,
+ ctx, pool));
SVN_ERR(extend_wc_mergeinfo(pair->dst, dst_entry, src_mergeinfo,
dst_access, ctx, pool));
}
@@ -1452,13 +1479,14 @@
const char *new_text_path;
apr_hash_t *new_props;
svn_error_t *err;
+ const char *src_rel;
- SVN_ERR(svn_io_open_unique_file2
- (&fp, &new_text_path, pair->dst, ".tmp",
- svn_io_file_del_none, pool));
+ SVN_ERR(svn_io_open_unique_file2(&fp, &new_text_path, pair->dst, ".tmp",
+ svn_io_file_del_none, pool));
fstream = svn_stream_from_aprfile2(fp, FALSE, pool);
- SVN_ERR(svn_ra_get_file(ra_session, pair->src_rel, src_revnum, fstream,
+ SVN_ERR(path_relative_to_session(&src_rel, ra_session, pair->src, pool));
+ SVN_ERR(svn_ra_get_file(ra_session, src_rel, src_revnum, fstream,
&real_rev, &new_props, pool));
SVN_ERR(svn_stream_close(fstream));
@@ -1477,8 +1505,8 @@
SVN_ERR(svn_wc_entry(&dst_entry, pair->dst, adm_access, FALSE, pool));
SVN_ERR(calculate_target_mergeinfo(ra_session, &src_mergeinfo,
- NULL, pair->src, pair->src_rel,
- src_revnum, pool));
+ NULL, pair->src, src_revnum,
+ ctx, pool));
SVN_ERR(extend_wc_mergeinfo(pair->dst, dst_entry, src_mergeinfo,
adm_access, ctx, pool));
@@ -1571,16 +1599,15 @@
svn_client__copy_pair_t *);
svn_node_kind_t dst_parent_kind, dst_kind;
const char *dst_parent;
+ const char *src_rel;
svn_pool_clear(iterpool);
- pair->src_rel = svn_path_is_child(top_src_url, pair->src, pool);
- pair->src_rel = svn_path_uri_decode(pair->src_rel, pool);
-
/* Next, make sure that the path exists in the repository. */
- SVN_ERR(svn_ra_check_path(ra_session, pair->src_rel, pair->src_revnum,
- &pair->src_kind,
- pool));
+ SVN_ERR(path_relative_to_session(&src_rel, ra_session,
+ pair->src, iterpool));
+ SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
+ &pair->src_kind, pool));
if (pair->src_kind == svn_node_none)
{
if (SVN_IS_VALID_REVNUM(pair->src_revnum))
diff --git a/subversion/libsvn_client/diff.c b/subversion/libsvn_client/diff.c
index 9f42e98..c6751b5 100644
--- a/subversion/libsvn_client/diff.c
+++ b/subversion/libsvn_client/diff.c
@@ -183,10 +183,10 @@
for (i = 0; i < propchanges->nelts; i++)
{
- const svn_prop_t *propchange
- = &APR_ARRAY_IDX(propchanges, i, svn_prop_t);
-
+ const char *header_fmt;
const svn_string_t *original_value;
+ const svn_prop_t *propchange =
+ &APR_ARRAY_IDX(propchanges, i, svn_prop_t);
if (original_props)
original_value = apr_hash_get(original_props,
@@ -201,7 +201,13 @@
&& svn_string_compare(original_value, propchange->value)))
continue;
- SVN_ERR(file_printf_from_utf8(file, encoding, _("Name: %s%s"),
+ if (! original_value)
+ header_fmt = _("Added: %s%s");
+ else if (! propchange->value)
+ header_fmt = _("Deleted: %s%s");
+ else
+ header_fmt = _("Modified: %s%s");
+ SVN_ERR(file_printf_from_utf8(file, encoding, header_fmt,
propchange->name, APR_EOL_STR));
if (strcmp(propchange->name, SVN_PROP_MERGE_INFO) == 0)
diff --git a/subversion/libsvn_client/list.c b/subversion/libsvn_client/list.c
index 64ff270..ac896a5 100644
--- a/subversion/libsvn_client/list.c
+++ b/subversion/libsvn_client/list.c
@@ -141,7 +141,7 @@
SVN_ERR(svn_ra_get_repos_root(ra_session, &repos_root, pool));
SVN_ERR(svn_client__path_relative_to_root(&fs_path, url, repos_root,
- ra_session, NULL, pool));
+ TRUE, ra_session, NULL, pool));
err = svn_ra_stat(ra_session, "", rev, &dirent, pool);
diff --git a/subversion/libsvn_client/log.c b/subversion/libsvn_client/log.c
index e8a59ca..ae44f05 100644
--- a/subversion/libsvn_client/log.c
+++ b/subversion/libsvn_client/log.c
@@ -173,8 +173,8 @@
ctx, pool));
SVN_ERR(svn_client__path_relative_to_root(©from_info.target_path,
- path_or_url, NULL, ra_session,
- NULL, pool));
+ path_or_url, NULL, TRUE,
+ ra_session, NULL, pool));
}
APR_ARRAY_PUSH(targets, const char *) = path_or_url;
diff --git a/subversion/libsvn_client/merge.c b/subversion/libsvn_client/merge.c
index 2234a60..4c5ed44 100644
--- a/subversion/libsvn_client/merge.c
+++ b/subversion/libsvn_client/merge.c
@@ -1050,10 +1050,10 @@
const char *min_rel_path, *max_rel_path;
SVN_ERR(svn_client__path_relative_to_root(&min_rel_path, min_url,
- source_root_url, ra_session,
+ source_root_url, TRUE, ra_session,
NULL, pool));
SVN_ERR(svn_client__path_relative_to_root(&max_rel_path, max_url,
- source_root_url, ra_session,
+ source_root_url, TRUE, ra_session,
NULL, pool));
/* Find any mergeinfo for TARGET_URL added to the line of history
@@ -1073,8 +1073,8 @@
{
const char *mergeinfo_path;
SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, target_url,
- source_root_url, ra_session,
- NULL, pool));
+ source_root_url, TRUE,
+ ra_session, NULL, pool));
src_rangelist_for_tgt = apr_hash_get(added_mergeinfo, mergeinfo_path,
APR_HASH_KEY_STRING);
}
@@ -1829,8 +1829,8 @@
/* ...and of those ranges, determine which ones actually still
need merging. */
SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, primary_url,
- source_root_url, ra_session,
- NULL, pool));
+ source_root_url, TRUE,
+ ra_session, NULL, pool));
SVN_ERR(filter_merged_revisions(remaining_ranges, mergeinfo_path,
target_mergeinfo, requested_rangelist,
(revision1 > revision2), entry, pool));
@@ -2238,7 +2238,7 @@
pool));
/* Reparent ra_session back to URL. */
SVN_ERR(svn_ra_reparent(merge_b->ra_session1, url, pool));
- SVN_ERR(svn_client__path_relative_to_root(&rel_path, url, NULL,
+ SVN_ERR(svn_client__path_relative_to_root(&rel_path, url, NULL, TRUE,
merge_b->ra_session1,
adm_access, pool));
rangelist = apr_array_make(pool, 1, sizeof(range));
@@ -2311,7 +2311,7 @@
FALSE, pool));
if (!is_equal)
{
- SVN_ERR(svn_mergeinfo_merge(&merges, inheritable_merges,
+ SVN_ERR(svn_mergeinfo_merge(merges, inheritable_merges,
svn_rangelist_equal_inheritance,
pool));
SVN_ERR(svn_client__record_wc_mergeinfo(target_wcpath, merges,
@@ -2760,7 +2760,7 @@
SVN_ERR(svn_ra_get_repos_root(merge_b->ra_session1,
&source_root_url, pool));
SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, primary_url,
- source_root_url, NULL,
+ source_root_url, TRUE, NULL,
NULL, pool));
SVN_ERR(calculate_remaining_ranges(&remaining_ranges, source_root_url,
url1, revision1, url2, revision2,
@@ -3590,7 +3590,7 @@
apr_array_make(pool, 0, sizeof(svn_client__merge_path_t *));
SVN_ERR(svn_ra_get_repos_root(ra_session, &source_root_url, pool));
SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, primary_url,
- source_root_url, NULL,
+ source_root_url, TRUE, NULL,
NULL, pool));
SVN_ERR(get_mergeinfo_paths(children_with_mergeinfo, merge_b,
mergeinfo_path, parent_entry, adm_access,
diff --git a/subversion/libsvn_client/mergeinfo.c b/subversion/libsvn_client/mergeinfo.c
index 9b23be1..79a5330 100644
--- a/subversion/libsvn_client/mergeinfo.c
+++ b/subversion/libsvn_client/mergeinfo.c
@@ -90,36 +90,6 @@
adm_access, TRUE /* skip checks */, pool);
}
-void
-svn_client__derive_mergeinfo_location(const char **url,
- svn_revnum_t *rev,
- const svn_wc_entry_t *entry)
-{
- /* ### FIXME: dionisos sez: "We can have schedule 'normal' files
- ### with a copied parameter of TRUE and a revision number of
- ### INVALID_REVNUM. Copied directories cause this behaviour on
- ### their children. It's an implementation shortcut to model
- ### wc-side copies." */
- switch (entry->schedule)
- {
- case svn_wc_schedule_add:
- case svn_wc_schedule_replace:
- /* If we have any history, consider its mergeinfo. */
- if (entry->copyfrom_url)
- {
- *url = entry->copyfrom_url;
- *rev = entry->copyfrom_rev;
- break;
- }
-
- default:
- /* Consider the mergeinfo for the WC target. */
- *url = entry->url;
- *rev = entry->revision;
- break;
- }
-}
-
/*-----------------------------------------------------------------------*/
/*** Retrieving mergeinfo. ***/
@@ -335,20 +305,11 @@
parent if TARGET_WCPATH is missing. These limited entries do not have
a URL and without that we cannot get accurate mergeinfo for
TARGET_WCPATH. */
- if (entry->url == NULL)
- return svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
- _("Entry '%s' has no URL"),
- svn_path_local_style(target_wcpath, pool));
-
- svn_client__derive_mergeinfo_location(&url, &target_rev, entry);
+ SVN_ERR(svn_client__entry_location(&url, &target_rev, target_wcpath,
+ svn_opt_revision_working, entry, pool));
repos_rel_path = url + strlen(entry->repos);
- /* ### TODO: To handle sub-tree mergeinfo, the list will need to
- ### include the those child paths which have mergeinfo which
- ### differs from that of TARGET_WCPATH, and if those paths are
- ### directories, their children as well. */
-
if (repos_only)
*target_mergeinfo = NULL;
else
@@ -400,6 +361,87 @@
return SVN_NO_ERROR;
}
+
+svn_error_t *
+svn_client__get_implicit_mergeinfo(apr_hash_t **mergeinfo_p,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ svn_ra_session_t *ra_session,
+ svn_wc_adm_access_t *adm_access,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool)
+{
+ apr_array_header_t *segments;
+ svn_revnum_t peg_revnum = SVN_INVALID_REVNUM;
+ const char *url;
+ apr_hash_t *mergeinfo = apr_hash_make(pool);
+ apr_pool_t *sesspool = NULL; /* only used for an RA session we open */
+ svn_ra_session_t *session = ra_session;
+ int i;
+
+ /* If PATH_OR_URL is a local path (not a URL), we need to transform
+ it into a URL, open an RA session for it, and resolve the peg
+ revision. Note that if the local item is scheduled for addition
+ as a copy of something else, we'll use its copyfrom data to query
+ its history. */
+ SVN_ERR(svn_client__derive_location(&url, &peg_revnum, path_or_url,
+ peg_revision, session, adm_access,
+ ctx, pool));
+
+ if (session == NULL)
+ {
+ sesspool = svn_pool_create(pool);
+ SVN_ERR(svn_client__open_ra_session_internal(&session, url, NULL, NULL,
+ NULL, FALSE, TRUE, ctx,
+ sesspool));
+ }
+
+ /* Fetch the location segments for our URL@PEG_REVNUM. */
+ SVN_ERR(svn_client__repos_location_segments(&segments, session, "",
+ peg_revnum, peg_revnum, 0,
+ ctx, pool));
+
+ /* Translate location segments into merge sources and ranges. */
+ for (i = 0; i < segments->nelts; i++)
+ {
+ svn_location_segment_t *segment =
+ APR_ARRAY_IDX(segments, i, svn_location_segment_t *);
+ apr_array_header_t *path_ranges;
+ svn_merge_range_t *range;
+ const char *source_path;
+
+ /* No path segment? Skip it. */
+ if (! segment->path)
+ continue;
+
+ /* Prepend a leading slash to our path. */
+ source_path = apr_pstrcat(pool, "/", segment->path, NULL);
+
+ /* See if we already stored ranges for this path. If not, make
+ a new list. */
+ path_ranges = apr_hash_get(mergeinfo, source_path, APR_HASH_KEY_STRING);
+ if (! path_ranges)
+ path_ranges = apr_array_make(pool, 1, sizeof(range));
+
+ /* Build a merge range, push it onto the list of ranges, and for
+ good measure, (re)store it in the hash. */
+ range = apr_pcalloc(pool, sizeof(*range));
+ range->start = MAX(segment->range_start - 1, 0);
+ range->end = segment->range_end;
+ range->inheritable = TRUE;
+ APR_ARRAY_PUSH(path_ranges, svn_merge_range_t *) = range;
+ apr_hash_set(mergeinfo, source_path, APR_HASH_KEY_STRING, path_ranges);
+ }
+
+ /* If we opened an RA session, ensure its closure. */
+ if (sesspool)
+ svn_pool_destroy(sesspool);
+
+ *mergeinfo_p = mergeinfo;
+ return SVN_NO_ERROR;
+}
+
+
/*-----------------------------------------------------------------------*/
/*** Eliding mergeinfo. ***/
@@ -840,7 +882,8 @@
peg_revision, "", pool));
SVN_ERR(svn_ra_get_repos_root(ra_session, &repos_root, pool));
SVN_ERR(svn_client__path_relative_to_root(&repos_rel_path, path_or_url,
- repos_root, NULL, NULL, pool));
+ repos_root, TRUE, NULL,
+ NULL, pool));
SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, mergeinfo,
repos_rel_path, rev,
svn_mergeinfo_inherited, pool));
diff --git a/subversion/libsvn_client/mergeinfo.h b/subversion/libsvn_client/mergeinfo.h
index 360ac8c..8478098 100644
--- a/subversion/libsvn_client/mergeinfo.h
+++ b/subversion/libsvn_client/mergeinfo.h
@@ -127,6 +127,21 @@
svn_client_ctx_t *ctx,
apr_pool_t *pool);
+/* Set *MERGEINFO_P to a hash of mergeinfo constructed solely from the
+ natural history of PATH_OR_URL@PEG_REVISION. RA_SESSION is an RA
+ session whose session URL maps to PATH_OR_URL's URL, or NULL.
+ ADM_ACCESS is a working copy administrative access baton which can
+ be used to fetch information about PATH_OR_URL (if PATH_OR_URL is a
+ working copy path), or NULL. */
+svn_error_t *
+svn_client__get_implicit_mergeinfo(apr_hash_t **mergeinfo_p,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ svn_ra_session_t *ra_session,
+ svn_wc_adm_access_t *adm_access,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool);
+
/* Parse any mergeinfo from the WCPATH's ENTRY and store it in
MERGEINFO. If PRISTINE is true parse the pristine mergeinfo,
working otherwise. If no record of any mergeinfo exists, set
@@ -211,13 +226,5 @@
svn_client_ctx_t *ctx,
apr_pool_t *pool);
-/* Get the repository URL and revision number for which to request
- mergeinfo for a WC entry, which sometimes needs to be the entry's
- copyfrom info rather than its actual URL and revision. */
-void
-svn_client__derive_mergeinfo_location(const char **url,
- svn_revnum_t *rev,
- const svn_wc_entry_t *entry);
-
#endif /* SVN_LIBSVN_CLIENT_MERGEINFO_H */
diff --git a/subversion/libsvn_client/switch.c b/subversion/libsvn_client/switch.c
index 477e34e..bb414fa 100644
--- a/subversion/libsvn_client/switch.c
+++ b/subversion/libsvn_client/switch.c
@@ -72,7 +72,6 @@
const char *URL, *anchor, *target, *source_root, *switch_rev_url;
svn_ra_session_t *ra_session;
svn_revnum_t revnum;
- svn_node_kind_t switch_url_kind;
svn_error_t *err = SVN_NO_ERROR;
svn_wc_adm_access_t *adm_access, *dir_access;
const char *diff3_cmd;
@@ -143,26 +142,8 @@
"is not the same repository as\n"
"'%s'"), URL, source_root);
- /* Check to make sure that the switch target actually exists. */
- SVN_ERR(svn_ra_reparent(ra_session, source_root, pool));
- SVN_ERR(svn_ra_check_path(ra_session,
- svn_path_uri_decode(
- svn_path_is_child(source_root,
- switch_rev_url,
- pool),
- pool),
- revnum,
- &switch_url_kind,
- pool));
-
- if (switch_url_kind == svn_node_none)
- return svn_error_createf
- (SVN_ERR_WC_INVALID_SWITCH, NULL,
- _("Destination does not exist: '%s'"), switch_rev_url);
-
SVN_ERR(svn_ra_reparent(ra_session, URL, pool));
-
/* Fetch the switch (update) editor. If REVISION is invalid, that's
okay; the RA driver will call editor->set_target_revision() later on. */
SVN_ERR(svn_wc_get_switch_editor3(&revnum, adm_access, target,
diff --git a/subversion/libsvn_client/url.c b/subversion/libsvn_client/url.c
index b036b7d..ad5aabf 100644
--- a/subversion/libsvn_client/url.c
+++ b/subversion/libsvn_client/url.c
@@ -2,7 +2,7 @@
* url.c: converting paths to urls
*
* ====================================================================
- * Copyright (c) 2000-2004 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2007 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
@@ -20,12 +20,17 @@
#include <apr_pools.h>
+#include "svn_pools.h"
#include "svn_error.h"
+#include "svn_types.h"
+#include "svn_opt.h"
#include "svn_wc.h"
#include "svn_client.h"
#include "svn_path.h"
-#include "client.h"
+#include "private/svn_wc_private.h"
+#include "client.h"
+#include "svn_private_config.h"
@@ -34,25 +39,10 @@
const char *path_or_url,
apr_pool_t *pool)
{
- svn_wc_adm_access_t *adm_access;
- const svn_wc_entry_t *entry;
- svn_boolean_t is_url = svn_path_is_url(path_or_url);
-
- if (is_url)
- {
- *url = path_or_url;
- }
- else
- {
- SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, path_or_url,
- FALSE, 0, NULL, NULL, pool));
- SVN_ERR(svn_wc_entry(&entry, path_or_url, adm_access, FALSE, pool));
- SVN_ERR(svn_wc_adm_close(adm_access));
-
- *url = entry ? entry->url : NULL;
- }
-
- return SVN_NO_ERROR;
+ svn_opt_revision_t revision;
+ revision.kind = svn_opt_revision_unspecified;
+ return svn_client__derive_location(url, NULL, path_or_url, &revision,
+ NULL, NULL, NULL, pool);
}
@@ -68,3 +58,103 @@
return svn_client__get_repos_root(url, path_or_url, &peg_revision,
NULL, ctx, pool);
}
+
+svn_error_t *
+svn_client__derive_location(const char **url,
+ svn_revnum_t *peg_revnum,
+ const char *path_or_url,
+ const svn_opt_revision_t *peg_revision,
+ const svn_ra_session_t *ra_session,
+ svn_wc_adm_access_t *adm_access,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *pool)
+{
+ /* If PATH_OR_URL is a local path (not a URL), we need to transform
+ it into a URL. */
+ if (! svn_path_is_url(path_or_url))
+ {
+ const svn_wc_entry_t *entry;
+
+ if (adm_access)
+ {
+ SVN_ERR(svn_wc__entry_versioned(&entry, path_or_url, adm_access,
+ FALSE, pool));
+ }
+ else
+ {
+ svn_cancel_func_t cancel_func;
+ void *cancel_baton;
+
+ if (ctx)
+ {
+ cancel_func = ctx->cancel_func;
+ cancel_baton = ctx->cancel_baton;
+ }
+
+ SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, path_or_url,
+ FALSE, 0, cancel_func, cancel_baton,
+ pool));
+ SVN_ERR(svn_wc__entry_versioned(&entry, path_or_url, adm_access,
+ FALSE, pool));
+ SVN_ERR(svn_wc_adm_close(adm_access));
+ }
+
+ SVN_ERR(svn_client__entry_location(url, peg_revnum, path_or_url,
+ peg_revision->kind, entry, pool));
+ }
+ else
+ {
+ *url = path_or_url;
+ /* peg_revnum (if provided) will be set below. */
+ }
+
+ /* If we haven't resolved for ourselves a numeric peg revision, do so. */
+ if (peg_revnum && !SVN_IS_VALID_REVNUM(*peg_revnum))
+ {
+ /* Use sesspool to assure that if we opened an RA session, we
+ close it. */
+ apr_pool_t *sesspool = NULL;
+ svn_ra_session_t *session = (svn_ra_session_t *) ra_session;
+ if (session == NULL)
+ {
+ sesspool = svn_pool_create(pool);
+ SVN_ERR(svn_client__open_ra_session_internal(&session, *url, NULL,
+ NULL, NULL, FALSE,
+ TRUE, ctx, sesspool));
+ }
+ SVN_ERR(svn_client__get_revision_number(peg_revnum, NULL, session,
+ peg_revision, NULL, pool));
+ if (sesspool)
+ svn_pool_destroy(sesspool);
+ }
+
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_client__entry_location(const char **url, svn_revnum_t *revnum,
+ const char *wc_path,
+ enum svn_opt_revision_kind peg_rev_kind,
+ const svn_wc_entry_t *entry, apr_pool_t *pool)
+{
+ if (entry->copyfrom_url && peg_rev_kind == svn_opt_revision_working)
+ {
+ *url = entry->copyfrom_url;
+ if (revnum)
+ *revnum = entry->copyfrom_rev;
+ }
+ else if (entry->url)
+ {
+ *url = entry->url;
+ if (revnum)
+ *revnum = entry->revision;
+ }
+ else
+ {
+ return svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
+ _("Entry for '%s' has no URL"),
+ svn_path_local_style(wc_path, pool));
+ }
+
+ return SVN_NO_ERROR;
+}
diff --git a/subversion/libsvn_client/util.c b/subversion/libsvn_client/util.c
index 3ac918b..ce13ae1 100644
--- a/subversion/libsvn_client/util.c
+++ b/subversion/libsvn_client/util.c
@@ -23,8 +23,11 @@
#include "svn_pools.h"
#include "svn_string.h"
#include "svn_error.h"
+#include "svn_types.h"
+#include "svn_opt.h"
#include "svn_props.h"
#include "svn_path.h"
+#include "svn_wc.h"
#include "svn_client.h"
#include "private/svn_wc_private.h"
@@ -117,8 +120,7 @@
svn_client_proplist_item_dup(const svn_client_proplist_item_t *item,
apr_pool_t * pool)
{
- svn_client_proplist_item_t *new_item
- = apr_pcalloc(pool, sizeof(*new_item));
+ svn_client_proplist_item_t *new_item = apr_pcalloc(pool, sizeof(*new_item));
if (item->node_name)
new_item->node_name = svn_stringbuf_dup(item->node_name, pool);
@@ -129,11 +131,44 @@
return new_item;
}
+/* Return WC_PATH's URL and repository root in *URL and REPOS_ROOT,
+ respectively. Set *NEED_WC_CLEANUP if *ADM_ACCESS needed to be
+ acquired. */
+static svn_error_t *
+wc_path_to_repos_urls(const char **url, const char **repos_root,
+ svn_boolean_t *need_wc_cleanup,
+ svn_wc_adm_access_t **adm_access, const char *wc_path,
+ apr_pool_t *pool)
+{
+ const svn_wc_entry_t *entry;
+
+ if (! *adm_access)
+ {
+ SVN_ERR(svn_wc_adm_probe_open3(adm_access, NULL, wc_path,
+ FALSE, 0, NULL, NULL, pool));
+ *need_wc_cleanup = TRUE;
+ }
+ SVN_ERR(svn_wc__entry_versioned(&entry, wc_path, *adm_access, FALSE, pool));
+
+ SVN_ERR(svn_client__entry_location(url, NULL, wc_path,
+ svn_opt_revision_unspecified, entry,
+ pool));
+
+ /* If we weren't provided a REPOS_ROOT, we'll try to read one from
+ the entry. The entry might not hold a URL -- in that case, we'll
+ need a fallback plan. */
+ if (*repos_root == NULL)
+ *repos_root = entry->repos;
+
+ return SVN_NO_ERROR;
+}
+
svn_error_t *
svn_client__path_relative_to_root(const char **rel_path,
const char *path_or_url,
const char *repos_root,
+ svn_boolean_t include_leading_slash,
svn_ra_session_t *ra_session,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool)
@@ -146,36 +181,13 @@
/* If we have a WC path... */
if (! svn_path_is_url(path_or_url))
{
- const svn_wc_entry_t *entry;
-
- /* ...fetch its entry. */
- if (! adm_access)
- {
- SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, path_or_url,
- FALSE, 0, NULL, NULL, pool));
- need_wc_cleanup = TRUE;
- }
- if ((err = svn_wc__entry_versioned(&entry, path_or_url, adm_access,
- FALSE, pool)))
- {
- goto cleanup;
- }
-
- /* Specifically, we need the entry's URL. */
- if (! entry->url)
- {
- err = svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
- _("Entry '%s' has no URL"),
- svn_path_local_style(path_or_url, pool));
- goto cleanup;
- }
- path_or_url = entry->url;
-
- /* If we weren't provided a REPOS_ROOT, we'll try to read one
- from the entry. The entry might not hold a URL, but that's
- okay -- we've got a fallback plan. */
- if (! repos_root)
- repos_root = entry->repos;
+ /* ...fetch its entry, and attempt to get both its full URL and
+ repository root URL. If we can't get REPOS_ROOT from the WC
+ entry, we'll get it from the RA layer.*/
+ err = wc_path_to_repos_urls(&path_or_url, &repos_root, &need_wc_cleanup,
+ &adm_access, path_or_url, pool);
+ if (err)
+ goto cleanup;
}
/* If we weren't provided a REPOS_ROOT, or couldn't find one in the
@@ -186,16 +198,10 @@
goto cleanup;
}
- /* ### FIXME: It's very uncharacteristic of our APIs to return paths
- ### that have leading slashes, and results in paths that cannot
- ### be svn_path_join'd with base URLs without indexing past that
- ### slash.
- */
-
/* Check if PATH_OR_URL *is* the repository root URL. */
if (strcmp(repos_root, path_or_url) == 0)
{
- *rel_path = "/";
+ *rel_path = include_leading_slash ? "/" : "";
}
else
{
@@ -209,8 +215,9 @@
_("URL '%s' is not a child of repository "
"root URL '%s'"),
path_or_url, repos_root);
- *rel_path = apr_pstrcat(pool, "/",
- svn_path_uri_decode(rel_url, pool), NULL);
+ rel_url = svn_path_uri_decode(rel_url, pool);
+ *rel_path = include_leading_slash
+ ? apr_pstrcat(pool, "/", rel_url, NULL) : rel_url;
}
cleanup:
@@ -245,19 +252,11 @@
&& (peg_revision->kind == svn_opt_revision_working
|| peg_revision->kind == svn_opt_revision_base))
{
- const svn_wc_entry_t *entry;
- if (! adm_access)
- {
- SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, path_or_url,
- FALSE, 0, NULL, NULL, pool));
- need_wc_cleanup = TRUE;
- }
- if ((err = svn_wc__entry_versioned(&entry, path_or_url, adm_access,
- FALSE, pool)))
+ *repos_root = NULL;
+ err = wc_path_to_repos_urls(&path_or_url, repos_root, &need_wc_cleanup,
+ &adm_access, path_or_url, pool);
+ if (err)
goto cleanup;
-
- path_or_url = entry->url;
- *repos_root = entry->repos;
}
else
{
diff --git a/subversion/libsvn_fs/fs-loader.c b/subversion/libsvn_fs/fs-loader.c
index 35701bd..921d45b 100644
--- a/subversion/libsvn_fs/fs-loader.c
+++ b/subversion/libsvn_fs/fs-loader.c
@@ -755,6 +755,13 @@
}
svn_error_t *
+svn_fs_node_origin_rev(svn_revnum_t *revision, svn_fs_root_t *root,
+ const char *path, apr_pool_t *pool)
+{
+ return root->vtable->node_origin_rev(revision, root, path, pool);
+}
+
+svn_error_t *
svn_fs_node_created_path(const char **created_path, svn_fs_root_t *root,
const char *path, apr_pool_t *pool)
{
diff --git a/subversion/libsvn_fs/fs-loader.h b/subversion/libsvn_fs/fs-loader.h
index c899e2d..93791f5 100644
--- a/subversion/libsvn_fs/fs-loader.h
+++ b/subversion/libsvn_fs/fs-loader.h
@@ -226,6 +226,9 @@
svn_error_t *(*node_created_rev)(svn_revnum_t *revision,
svn_fs_root_t *root, const char *path,
apr_pool_t *pool);
+ svn_error_t *(*node_origin_rev)(svn_revnum_t *revision,
+ svn_fs_root_t *root, const char *path,
+ apr_pool_t *pool);
svn_error_t *(*node_created_path)(const char **created_path,
svn_fs_root_t *root, const char *path,
apr_pool_t *pool);
diff --git a/subversion/libsvn_fs_base/bdb/node-origins-table.c b/subversion/libsvn_fs_base/bdb/node-origins-table.c
new file mode 100644
index 0000000..b0848a5
--- /dev/null
+++ b/subversion/libsvn_fs_base/bdb/node-origins-table.c
@@ -0,0 +1,127 @@
+/* node-origins-table.c : operations on the `node-origins' table
+ *
+ * ====================================================================
+ * Copyright (c) 2007 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/.
+ * ====================================================================
+ */
+
+#include "bdb_compat.h"
+#include "../fs.h"
+#include "../err.h"
+#include "dbt.h"
+#include "../trail.h"
+#include "bdb-err.h"
+#include "../../libsvn_fs/fs-loader.h"
+#include "node-origins-table.h"
+
+#include "svn_private_config.h"
+
+
+int svn_fs_bdb__open_node_origins_table(DB **node_origins_p,
+ DB_ENV *env,
+ svn_boolean_t create)
+{
+ const u_int32_t open_flags = (create ? (DB_CREATE | DB_EXCL) : 0);
+ DB *node_origins;
+ int error;
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&node_origins, env, 0));
+ error = (node_origins->open)(SVN_BDB_OPEN_PARAMS(node_origins, NULL),
+ "node-origins", 0, DB_BTREE,
+ open_flags, 0666);
+
+ /* Create the node-origins table if it doesn't exist. */
+ if (error == ENOENT && (! create))
+ {
+ BDB_ERR(node_origins->close(node_origins, 0));
+ return svn_fs_bdb__open_node_origins_table(node_origins_p, env, TRUE);
+ }
+
+ BDB_ERR(error);
+
+ *node_origins_p = node_origins;
+ return 0;
+}
+
+svn_error_t *svn_fs_bdb__get_node_origin(const svn_fs_id_t **origin_id,
+ svn_fs_t *fs,
+ const char *node_id,
+ trail_t *trail,
+ apr_pool_t *pool)
+{
+ base_fs_data_t *bfd = fs->fsap_data;
+ DBT key, value;
+ int db_err;
+
+ svn_fs_base__trail_debug(trail, "node-origins", "get");
+ db_err = bfd->node_origins->get(bfd->node_origins, trail->db_txn,
+ svn_fs_base__str_to_dbt(&key, node_id),
+ svn_fs_base__result_dbt(&value), 0);
+ svn_fs_base__track_dbt(&value, pool);
+
+ if (db_err == DB_NOTFOUND)
+ return svn_fs_base__err_no_such_node_origin(fs, node_id);
+
+ *origin_id = svn_fs_parse_id(value.data, value.size, pool);
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *svn_fs_bdb__set_node_origin(svn_fs_t *fs,
+ const char *node_id,
+ const svn_fs_id_t *origin_id,
+ trail_t *trail,
+ apr_pool_t *pool)
+{
+ base_fs_data_t *bfd = fs->fsap_data;
+ DBT key, value;
+ int db_err;
+
+ /* Create a key from our NODE_ID. */
+ svn_fs_base__str_to_dbt(&key, node_id);
+
+ /* Ensure that we aren't about to overwrite an existing record. */
+ svn_fs_base__trail_debug(trail, "node-origins", "get");
+ db_err = bfd->node_origins->get(bfd->node_origins, trail->db_txn,
+ &key, svn_fs_base__result_dbt(&value), 0);
+ svn_fs_base__track_dbt(&value, pool);
+ if (db_err != DB_NOTFOUND)
+ return svn_error_createf
+ (SVN_ERR_FS_ALREADY_EXISTS, NULL,
+ _("Node origin for '%s' already exists in filesystem '%s'"),
+ node_id, fs->path);
+
+ /* Create a value from our ORIGIN_ID, and add this record to the table. */
+ svn_fs_base__id_to_dbt(&value, origin_id, pool);
+ svn_fs_base__trail_debug(trail, "node-origins", "put");
+ SVN_ERR(BDB_WRAP(fs, _("storing node-origins record"),
+ bfd->node_origins->put(bfd->node_origins, trail->db_txn,
+ &key, &value, 0)));
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *svn_fs_bdb__delete_node_origin(svn_fs_t *fs,
+ const char *node_id,
+ trail_t *trail,
+ apr_pool_t *pool)
+{
+ base_fs_data_t *bfd = fs->fsap_data;
+ DBT key;
+
+ svn_fs_base__str_to_dbt(&key, node_id);
+ svn_fs_base__trail_debug(trail, "node-origins", "del");
+ SVN_ERR(BDB_WRAP(fs, "deleting entry from 'node-origins' table",
+ bfd->node_origins->del(bfd->node_origins,
+ trail->db_txn, &key, 0)));
+ return SVN_NO_ERROR;
+}
diff --git a/subversion/libsvn_fs_base/bdb/node-origins-table.h b/subversion/libsvn_fs_base/bdb/node-origins-table.h
new file mode 100644
index 0000000..1d0b60e
--- /dev/null
+++ b/subversion/libsvn_fs_base/bdb/node-origins-table.h
@@ -0,0 +1,71 @@
+/* node-origins-table.h : internal interface to ops on `node-origins' table
+ *
+ * ====================================================================
+ * Copyright (c) 2007 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/.
+ * ====================================================================
+ */
+
+#ifndef SVN_LIBSVN_FS_NODE_ORIGINS_TABLE_H
+#define SVN_LIBSVN_FS_NODE_ORIGINS_TABLE_H
+
+#include "svn_fs.h"
+#include "svn_error.h"
+#include "../trail.h"
+#include "../fs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* Open a `node-origins' table in ENV. If CREATE is non-zero, create
+ one if it doesn't exist. Set *NODE_ORIGINS_P to the new table.
+ Return a Berkeley DB error code. */
+int svn_fs_bdb__open_node_origins_table(DB **node_origins_p,
+ DB_ENV *env,
+ svn_boolean_t create);
+
+/* Set *ORIGIN_ID to the node revision ID from which the history of
+ all nodes in FS whose node ID is NODE_ID springs, as determined by
+ a look in the `node-origins' table. Do this as part of TRAIL. Use
+ POOL for allocations.
+
+ If no such node revision ID is stored for NODE_ID, return
+ SVN_ERR_FS_NO_SUCH_NODE_ORIGIN. */
+svn_error_t *svn_fs_bdb__get_node_origin(const svn_fs_id_t **origin_id,
+ svn_fs_t *fs,
+ const char *node_id,
+ trail_t *trail,
+ apr_pool_t *pool);
+
+/* Store in the `node-origins' table a mapping of NODE_ID to original
+ node revision ID ORIGIN_ID for FS. Do this as part of TRAIL. Use
+ POOL for temporary allocations. */
+svn_error_t *svn_fs_bdb__set_node_origin(svn_fs_t *fs,
+ const char *node_id,
+ const svn_fs_id_t *origin_id,
+ trail_t *trail,
+ apr_pool_t *pool);
+
+/* Delete from the `node-origins' table the record for NODE_ID in FS.
+ Do this as part of TRAIL. Use POOL for temporary allocations. */
+svn_error_t *svn_fs_bdb__delete_node_origin(svn_fs_t *fs,
+ const char *node_id,
+ trail_t *trail,
+ apr_pool_t *pool);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_LIBSVN_FS_TXN_TABLE_H */
diff --git a/subversion/libsvn_fs_base/dag.c b/subversion/libsvn_fs_base/dag.c
index 3619f0f..8d3c8c3 100644
--- a/subversion/libsvn_fs_base/dag.c
+++ b/subversion/libsvn_fs_base/dag.c
@@ -962,7 +962,10 @@
txn_id, trail, pool));
/* Delete the node revision itself. */
- SVN_ERR(svn_fs_base__delete_node_revision(fs, id, trail, pool));
+ SVN_ERR(svn_fs_base__delete_node_revision(fs, id,
+ noderev->predecessor_id
+ ? FALSE : TRUE,
+ trail, pool));
return SVN_NO_ERROR;
}
diff --git a/subversion/libsvn_fs_base/err.c b/subversion/libsvn_fs_base/err.c
index 040997b..51e36c4 100644
--- a/subversion/libsvn_fs_base/err.c
+++ b/subversion/libsvn_fs_base/err.c
@@ -148,3 +148,12 @@
lock_token, fs->path);
}
+svn_error_t *
+svn_fs_base__err_no_such_node_origin(svn_fs_t *fs, const char *node_id)
+{
+ return
+ svn_error_createf
+ (SVN_ERR_FS_NO_SUCH_NODE_ORIGIN, 0,
+ _("No record in 'node-origins' table for node id '%s' in "
+ "filesystem '%s'"), node_id, fs->path);
+}
diff --git a/subversion/libsvn_fs_base/err.h b/subversion/libsvn_fs_base/err.h
index e033fcc..bdbf03b 100644
--- a/subversion/libsvn_fs_base/err.h
+++ b/subversion/libsvn_fs_base/err.h
@@ -77,6 +77,11 @@
svn_error_t *svn_fs_base__err_corrupt_lock(svn_fs_t *fs,
const char *lock_token);
+/* SVN_ERR_FS_NO_SUCH_NODE_ORIGIN: no recorded node origin for NODE_ID
+ in FS. */
+svn_error_t *svn_fs_base__err_no_such_node_origin(svn_fs_t *fs,
+ const char *node_id);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/subversion/libsvn_fs_base/fs.c b/subversion/libsvn_fs_base/fs.c
index 3455fd9..f114f8d 100644
--- a/subversion/libsvn_fs_base/fs.c
+++ b/subversion/libsvn_fs_base/fs.c
@@ -55,6 +55,7 @@
#include "bdb/uuids-table.h"
#include "bdb/locks-table.h"
#include "bdb/lock-tokens-table.h"
+#include "bdb/node-origins-table.h"
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_mergeinfo.h"
@@ -180,6 +181,7 @@
SVN_ERR(cleanup_fs_db(fs, &bfd->uuids, "uuids"));
SVN_ERR(cleanup_fs_db(fs, &bfd->locks, "locks"));
SVN_ERR(cleanup_fs_db(fs, &bfd->lock_tokens, "lock-tokens"));
+ SVN_ERR(cleanup_fs_db(fs, &bfd->node_origins, "node-origins"));
/* Finally, close the environment. */
bfd->bdb = 0;
@@ -618,6 +620,13 @@
bfd->bdb->env,
create)));
+ SVN_ERR(BDB_WRAP(fs, (create
+ ? "creating 'node-origins' table"
+ : "opening 'node-origins' table"),
+ svn_fs_bdb__open_node_origins_table(&bfd->node_origins,
+ bfd->bdb->env,
+ create)));
+
return SVN_NO_ERROR;
}
@@ -938,23 +947,33 @@
/* Copy FILENAME from SRC_DIR to DST_DIR in byte increments of size
CHUNKSIZE. The read/write buffer of size CHUNKSIZE will be
- allocated in POOL. */
+ allocated in POOL. If ALLOW_MISSING is set, we won't make a fuss
+ if FILENAME isn't found in SRC_DIR; otherwise, we will. */
static svn_error_t *
copy_db_file_safely(const char *src_dir,
const char *dst_dir,
const char *filename,
u_int32_t chunksize,
+ svn_boolean_t allow_missing,
apr_pool_t *pool)
{
apr_file_t *s = NULL, *d = NULL; /* init to null important for APR */
const char *file_src_path = svn_path_join(src_dir, filename, pool);
const char *file_dst_path = svn_path_join(dst_dir, filename, pool);
+ svn_error_t *err;
char *buf;
- /* Open source file. */
- SVN_ERR(svn_io_file_open(&s, file_src_path,
- (APR_READ | APR_LARGEFILE | APR_BINARY),
- APR_OS_DEFAULT, pool));
+ /* Open source file. If it's missing and that's allowed, there's
+ nothing more to do here. */
+ err = svn_io_file_open(&s, file_src_path,
+ (APR_READ | APR_LARGEFILE | APR_BINARY),
+ APR_OS_DEFAULT, pool);
+ if (err && APR_STATUS_IS_ENOENT(err->apr_err) && allow_missing)
+ {
+ svn_error_clear(err);
+ return SVN_NO_ERROR;
+ }
+ SVN_ERR(err);
/* Open destination file. */
SVN_ERR(svn_io_file_open(&d, file_dst_path, (APR_WRITE | APR_CREATE |
@@ -1066,25 +1085,27 @@
/* Copy the databases. */
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "nodes", pagesize, pool));
+ "nodes", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "transactions", pagesize, pool));
+ "transactions", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "revisions", pagesize, pool));
+ "revisions", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "copies", pagesize, pool));
+ "copies", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "changes", pagesize, pool));
+ "changes", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "representations", pagesize, pool));
+ "representations", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "strings", pagesize, pool));
+ "strings", pagesize, FALSE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "uuids", pagesize, pool));
+ "uuids", pagesize, TRUE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "locks", pagesize, pool));
+ "locks", pagesize, TRUE, pool));
SVN_ERR(copy_db_file_safely(src_path, dest_path,
- "lock-tokens", pagesize, pool));
+ "lock-tokens", pagesize, TRUE, pool));
+ SVN_ERR(copy_db_file_safely(src_path, dest_path,
+ "node-origins", pagesize, TRUE, pool));
{
apr_array_header_t *logfiles;
diff --git a/subversion/libsvn_fs_base/fs.h b/subversion/libsvn_fs_base/fs.h
index c05bc3d..eea2ba8 100644
--- a/subversion/libsvn_fs_base/fs.h
+++ b/subversion/libsvn_fs_base/fs.h
@@ -60,6 +60,7 @@
DB *uuids;
DB *locks;
DB *lock_tokens;
+ DB *node_origins;
/* A boolean for tracking when we have a live Berkeley DB
transaction trail alive. */
diff --git a/subversion/libsvn_fs_base/node-rev.c b/subversion/libsvn_fs_base/node-rev.c
index 4e431dd..3c68742 100644
--- a/subversion/libsvn_fs_base/node-rev.c
+++ b/subversion/libsvn_fs_base/node-rev.c
@@ -25,8 +25,10 @@
#include "err.h"
#include "node-rev.h"
#include "reps-strings.h"
+#include "id.h"
#include "bdb/nodes-table.h"
+#include "bdb/node-origins-table.h"
/* Creating completely new nodes. */
@@ -49,6 +51,10 @@
/* Store its NODE-REVISION skel. */
SVN_ERR(svn_fs_bdb__put_node_revision(fs, id, noderev, trail, pool));
+ /* Add a record in the node origins index table. */
+ SVN_ERR(svn_fs_bdb__set_node_origin(fs, svn_fs_base__id_node_id(id),
+ id, trail, pool));
+
*id_p = id;
return SVN_NO_ERROR;
}
@@ -88,11 +94,16 @@
svn_error_t *
svn_fs_base__delete_node_revision(svn_fs_t *fs,
const svn_fs_id_t *id,
+ svn_boolean_t origin_also,
trail_t *trail,
apr_pool_t *pool)
{
/* ### todo: here, we should adjust other nodes to compensate for
the missing node. */
+ if (origin_also)
+ SVN_ERR(svn_fs_bdb__delete_node_origin(fs, svn_fs_base__id_node_id(id),
+ trail, pool));
+
return svn_fs_bdb__delete_nodes_entry(fs, id, trail, pool);
}
diff --git a/subversion/libsvn_fs_base/node-rev.h b/subversion/libsvn_fs_base/node-rev.h
index ee6e4f6..ba36ec1 100644
--- a/subversion/libsvn_fs_base/node-rev.h
+++ b/subversion/libsvn_fs_base/node-rev.h
@@ -75,10 +75,16 @@
/* Delete node revision ID from FS's `nodes' table, as part of TRAIL.
+ If ORIGIN_ALSO is set, also delete the record for this ID's node ID
+ from the `node-origins' index table (which is typically only done
+ if the caller things that ID points to the only node revision ID in
+ its line of history).
+
WARNING: This does not check that the node revision is mutable!
Callers should do that check themselves. */
svn_error_t *svn_fs_base__delete_node_revision(svn_fs_t *fs,
const svn_fs_id_t *id,
+ svn_boolean_t origin_also,
trail_t *trail,
apr_pool_t *pool);
diff --git a/subversion/libsvn_fs_base/notes/structure b/subversion/libsvn_fs_base/notes/structure
index 58f7632..5c33cab 100644
--- a/subversion/libsvn_fs_base/notes/structure
+++ b/subversion/libsvn_fs_base/notes/structure
@@ -991,6 +991,10 @@
(the value is just a lock-token, which is a uuid)
+Node origins:
+
+ NODE-ID ::= NODE-REV-ID ;
+
Lexical elements
----------------
diff --git a/subversion/libsvn_fs_base/tree.c b/subversion/libsvn_fs_base/tree.c
index 9a002c4..ed10d77 100644
--- a/subversion/libsvn_fs_base/tree.c
+++ b/subversion/libsvn_fs_base/tree.c
@@ -56,6 +56,7 @@
#include "bdb/nodes-table.h"
#include "bdb/changes-table.h"
#include "bdb/copies-table.h"
+#include "bdb/node-origins-table.h"
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_mergeinfo.h"
#include "private/svn_fs_util.h"
@@ -4321,6 +4322,282 @@
}
+svn_error_t *
+svn_fs_base__get_path_kind(svn_node_kind_t *kind,
+ const char *path,
+ trail_t *trail,
+ apr_pool_t *pool)
+{
+ svn_revnum_t head_rev;
+ svn_fs_root_t *root;
+ dag_node_t *root_dir, *path_node;
+ svn_error_t *err;
+
+ /* Get HEAD revision, */
+ SVN_ERR(svn_fs_bdb__youngest_rev(&head_rev, trail->fs, trail, pool));
+
+ /* Then convert it into a root_t, */
+ SVN_ERR(svn_fs_base__dag_revision_root(&root_dir, trail->fs, head_rev,
+ trail, pool));
+ root = make_revision_root(trail->fs, head_rev, root_dir, pool);
+
+ /* And get the dag_node for path in the root_t. */
+ err = get_dag(&path_node, root, path, trail, pool);
+ if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
+ {
+ svn_error_clear(err);
+ *kind = svn_node_none;
+ return SVN_NO_ERROR;
+ }
+ else if (err)
+ return err;
+
+ *kind = svn_fs_base__dag_node_kind(path_node);
+ return SVN_NO_ERROR;
+}
+
+
+svn_error_t *
+svn_fs_base__get_path_created_rev(svn_revnum_t *rev,
+ const char *path,
+ trail_t *trail,
+ apr_pool_t *pool)
+{
+ svn_revnum_t head_rev, created_rev;
+ svn_fs_root_t *root;
+ dag_node_t *root_dir, *path_node;
+ svn_error_t *err;
+
+ /* Get HEAD revision, */
+ SVN_ERR(svn_fs_bdb__youngest_rev(&head_rev, trail->fs, trail, pool));
+
+ /* Then convert it into a root_t, */
+ SVN_ERR(svn_fs_base__dag_revision_root(&root_dir, trail->fs, head_rev,
+ trail, pool));
+ root = make_revision_root(trail->fs, head_rev, root_dir, pool);
+
+ /* And get the dag_node for path in the root_t. */
+ err = get_dag(&path_node, root, path, trail, pool);
+ if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
+ {
+ svn_error_clear(err);
+ *rev = SVN_INVALID_REVNUM;
+ return SVN_NO_ERROR;
+ }
+ else if (err)
+ return err;
+
+ /* Find the created_rev of the dag_node. */
+ SVN_ERR(svn_fs_base__dag_get_revision(&created_rev, path_node,
+ trail, pool));
+
+ *rev = created_rev;
+ return SVN_NO_ERROR;
+}
+
+
+
+/*** Finding the Origin of a Line of History ***/
+
+/* 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.
+
+ If there was no such copy operation in that portion of PATH's
+ history, set *PREV_PATH to NULL and *PREV_REV to SVN_INVALID_REVNUM.
+
+ WARNING: Do *not* call this from inside a trail. */
+static svn_error_t *
+prev_location(const char **prev_path,
+ svn_revnum_t *prev_rev,
+ svn_fs_t *fs,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool)
+{
+ const char *copy_path, *copy_src_path, *remainder = "";
+ svn_fs_root_t *copy_root;
+ svn_revnum_t copy_src_rev;
+
+ /* Ask about the most recent copy which affected PATH@REVISION. If
+ there was no such copy, we're done. */
+ SVN_ERR(base_closest_copy(©_root, ©_path, root, path, pool));
+ if (! copy_root)
+ {
+ *prev_rev = SVN_INVALID_REVNUM;
+ *prev_path = NULL;
+ return SVN_NO_ERROR;
+ }
+
+ /* Ultimately, it's not the path of the closest copy's source that
+ we care about -- it's our own path's location in the copy source
+ revision. So we'll tack the relative path that expresses the
+ difference between the copy destination and our path in the copy
+ revision onto the copy source path to determine this information.
+
+ In other words, if our path is "/branches/my-branch/foo/bar", and
+ we know that the closest relevant copy was a copy of "/trunk" to
+ "/branches/my-branch", then that relative path under the copy
+ destination is "/foo/bar". Tacking that onto the copy source
+ path tells us that our path was located at "/trunk/foo/bar"
+ before the copy.
+ */
+ SVN_ERR(base_copied_from(©_src_rev, ©_src_path,
+ 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);
+ *prev_rev = copy_src_rev;
+ return SVN_NO_ERROR;
+}
+
+
+struct id_created_rev_args {
+ svn_revnum_t revision;
+ const svn_fs_id_t *id;
+ const char *path;
+};
+
+
+static svn_error_t *
+txn_body_id_created_rev(void *baton, trail_t *trail)
+{
+ struct id_created_rev_args *args = baton;
+ dag_node_t *node;
+
+ SVN_ERR(svn_fs_base__dag_get_node(&node, trail->fs, args->id,
+ trail, trail->pool));
+ SVN_ERR(svn_fs_base__dag_get_revision(&(args->revision), node,
+ trail, trail->pool));
+ return SVN_NO_ERROR;
+}
+
+
+struct get_set_node_origin_args {
+ const svn_fs_id_t *origin_id;
+ const char *node_id;
+};
+
+
+static svn_error_t *
+txn_body_get_node_origin(void *baton, trail_t *trail)
+{
+ struct get_set_node_origin_args *args = baton;
+ return svn_fs_bdb__get_node_origin(&(args->origin_id), trail->fs,
+ args->node_id, trail, trail->pool);
+}
+
+static svn_error_t *
+txn_body_set_node_origin(void *baton, trail_t *trail)
+{
+ struct get_set_node_origin_args *args = baton;
+ return svn_fs_bdb__set_node_origin(trail->fs, args->node_id,
+ args->origin_id, trail, trail->pool);
+}
+
+static svn_error_t *
+base_node_origin_rev(svn_revnum_t *revision,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs = svn_fs_root_fs(root);
+ svn_error_t *err;
+ struct get_set_node_origin_args args;
+ const svn_fs_id_t *id, *origin_id;
+ struct id_created_rev_args icr_args;
+
+ SVN_ERR(base_node_id(&id, root, path, pool));
+ args.node_id = svn_fs_base__id_node_id(id);
+ err = svn_fs_base__retry_txn(root->fs, txn_body_get_node_origin,
+ &args, pool);
+
+ /* If we got a value for the origin node-revision-ID, that's great.
+ If we didn't, that's sad but non-fatal -- we'll just figure it
+ out the hard way, then record it so we don't have suffer again
+ the next time. */
+ if (! err)
+ {
+ origin_id = args.origin_id;
+ }
+ else if (err->apr_err == SVN_ERR_FS_NO_SUCH_NODE_ORIGIN)
+ {
+ svn_fs_root_t *curroot = root;
+ apr_pool_t *subpool = svn_pool_create(pool);
+ svn_stringbuf_t *lastpath =
+ svn_stringbuf_create(svn_fs__canonicalize_abspath(path, pool), pool);
+ svn_revnum_t lastrev = SVN_INVALID_REVNUM;
+ const svn_fs_id_t *pred_id;
+
+ svn_error_clear(err);
+ err = SVN_NO_ERROR;
+
+ /* Walk the closest-copy chain back to the first copy in our history.
+
+ NOTE: We merely *assume* that this is faster than walking the
+ predecessor chain, because we *assume* that copies of parent
+ directories happen less often than modifications to a given item. */
+ while (1)
+ {
+ svn_revnum_t currev;
+ const char *curpath = lastpath->data;
+
+ /* Get a root pointing to LASTREV. (The first time around,
+ LASTREV is invalid, but that's cool because CURROOT is
+ already initialized.) */
+ if (SVN_IS_VALID_REVNUM(lastrev))
+ SVN_ERR(svn_fs_base__revision_root(&curroot, fs,
+ lastrev, subpool));
+
+ /* Find the previous location using the closest-copy shortcut. */
+ SVN_ERR(prev_location(&curpath, &currev, fs, curroot,
+ curpath, subpool));
+ if (! curpath)
+ break;
+
+ /* Update our LASTPATH and LASTREV variables (which survive
+ SUBPOOL). */
+ svn_stringbuf_set(lastpath, curpath);
+ }
+
+ /* Walk the predecessor links back to origin. */
+ SVN_ERR(base_node_id(&pred_id, curroot, lastpath->data, pool));
+ while (1)
+ {
+ struct txn_pred_id_args pid_args;
+ svn_pool_clear(subpool);
+ pid_args.id = pred_id;
+ pid_args.pool = subpool;
+ SVN_ERR(svn_fs_base__retry_txn(fs, txn_body_pred_id,
+ &pid_args, subpool));
+ if (! pid_args.pred_id)
+ break;
+ pred_id = pid_args.pred_id;
+ }
+
+ /* Okay. PRED_ID should hold our origin ID now. Let's remember
+ this value from now on, shall we? */
+ args.origin_id = origin_id = svn_fs_base__id_copy(pred_id, pool);
+ SVN_ERR(svn_fs_base__retry_txn(root->fs, txn_body_set_node_origin,
+ &args, subpool));
+ svn_pool_destroy(subpool);
+ }
+ else
+ {
+ return err;
+ }
+
+ /* Okay. We have an origin node-revision-ID. Let's get a created
+ revision from it. */
+ icr_args.id = origin_id;
+ SVN_ERR(svn_fs_base__retry_txn(root->fs, txn_body_id_created_rev,
+ &icr_args, pool));
+ *revision = icr_args.revision;
+ return SVN_NO_ERROR;
+}
+
/* Creating root objects. */
@@ -4331,6 +4608,7 @@
base_node_history,
base_node_id,
base_node_created_rev,
+ base_node_origin_rev,
base_node_created_path,
base_delete_node,
base_copied_from,
@@ -4419,77 +4697,3 @@
return root;
}
-
-
-svn_error_t *
-svn_fs_base__get_path_kind(svn_node_kind_t *kind,
- const char *path,
- trail_t *trail,
- apr_pool_t *pool)
-{
- svn_revnum_t head_rev;
- svn_fs_root_t *root;
- dag_node_t *root_dir, *path_node;
- svn_error_t *err;
-
- /* Get HEAD revision, */
- SVN_ERR(svn_fs_bdb__youngest_rev(&head_rev, trail->fs, trail, pool));
-
- /* Then convert it into a root_t, */
- SVN_ERR(svn_fs_base__dag_revision_root(&root_dir, trail->fs, head_rev,
- trail, pool));
- root = make_revision_root(trail->fs, head_rev, root_dir, pool);
-
- /* And get the dag_node for path in the root_t. */
- err = get_dag(&path_node, root, path, trail, pool);
- if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
- {
- svn_error_clear(err);
- *kind = svn_node_none;
- return SVN_NO_ERROR;
- }
- else if (err)
- return err;
-
- *kind = svn_fs_base__dag_node_kind(path_node);
- return SVN_NO_ERROR;
-}
-
-
-svn_error_t *
-svn_fs_base__get_path_created_rev(svn_revnum_t *rev,
- const char *path,
- trail_t *trail,
- apr_pool_t *pool)
-{
- svn_revnum_t head_rev, created_rev;
- svn_fs_root_t *root;
- dag_node_t *root_dir, *path_node;
- svn_error_t *err;
-
- /* Get HEAD revision, */
- SVN_ERR(svn_fs_bdb__youngest_rev(&head_rev, trail->fs, trail, pool));
-
- /* Then convert it into a root_t, */
- SVN_ERR(svn_fs_base__dag_revision_root(&root_dir, trail->fs, head_rev,
- trail, pool));
- root = make_revision_root(trail->fs, head_rev, root_dir, pool);
-
- /* And get the dag_node for path in the root_t. */
- err = get_dag(&path_node, root, path, trail, pool);
- if (err && (err->apr_err == SVN_ERR_FS_NOT_FOUND))
- {
- svn_error_clear(err);
- *rev = SVN_INVALID_REVNUM;
- return SVN_NO_ERROR;
- }
- else if (err)
- return err;
-
- /* Find the created_rev of the dag_node. */
- SVN_ERR(svn_fs_base__dag_get_revision(&created_rev, path_node,
- trail, pool));
-
- *rev = created_rev;
- return SVN_NO_ERROR;
-}
diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c
index 475bac2..8d93243 100644
--- a/subversion/libsvn_fs_fs/fs.c
+++ b/subversion/libsvn_fs_fs/fs.c
@@ -110,6 +110,13 @@
if (status)
return svn_error_wrap_apr(status,
_("Can't create FSFS txn list mutex"));
+
+ /* ... not to mention locking the transaction-current file. */
+ status = apr_thread_mutex_create(&ffsd->txn_current_lock,
+ APR_THREAD_MUTEX_DEFAULT, common_pool);
+ if (status)
+ return svn_error_wrap_apr(status,
+ _("Can't create FSFS txn-current mutex"));
#endif
key = apr_pstrdup(common_pool, key);
diff --git a/subversion/libsvn_fs_fs/fs.h b/subversion/libsvn_fs_fs/fs.h
index f6fb4a4..2c43bb1 100644
--- a/subversion/libsvn_fs_fs/fs.h
+++ b/subversion/libsvn_fs_fs/fs.h
@@ -38,15 +38,16 @@
native filesystem directories and revision files. */
/* Names of special files in the fs_fs filesystem. */
-#define PATH_FORMAT "format" /* Contains format number */
-#define PATH_UUID "uuid" /* Contains UUID */
-#define PATH_CURRENT "current" /* Youngest revision */
-#define PATH_LOCK_FILE "write-lock" /* Revision lock file */
-#define PATH_REVS_DIR "revs" /* Directory of revisions */
-#define PATH_REVPROPS_DIR "revprops" /* Directory of revprops */
-#define PATH_TXNS_DIR "transactions" /* Directory of transactions */
-#define PATH_TXN_CURRENT "transaction-current" /* File with next txn key */
-#define PATH_LOCKS_DIR "locks" /* Directory of locks */
+#define PATH_FORMAT "format" /* Contains format number */
+#define PATH_UUID "uuid" /* Contains UUID */
+#define PATH_CURRENT "current" /* Youngest revision */
+#define PATH_LOCK_FILE "write-lock" /* Revision lock file */
+#define PATH_REVS_DIR "revs" /* Directory of revisions */
+#define PATH_REVPROPS_DIR "revprops" /* Directory of revprops */
+#define PATH_TXNS_DIR "transactions" /* Directory of transactions */
+#define PATH_TXN_CURRENT "transaction-current" /* File with next txn key */
+#define PATH_TXN_CURRENT_LOCK "txn-current-lock" /* Lock for txn-current */
+#define PATH_LOCKS_DIR "locks" /* Directory of locks */
/* Names of special files and file extensions for transactions */
#define PATH_CHANGES "changes" /* Records changes made so far */
@@ -138,6 +139,10 @@
/* A lock for intra-process synchronization when grabbing the
repository write lock. */
apr_thread_mutex_t *fs_write_lock;
+
+ /* A lock for intra-process synchronization when locking the
+ transaction-current file. */
+ apr_thread_mutex_t *txn_current_lock;
#endif
/* The common pool, under which this object is allocated, subpools
diff --git a/subversion/libsvn_fs_fs/fs_fs.c b/subversion/libsvn_fs_fs/fs_fs.c
index 0be07c1..8e1a0d8 100644
--- a/subversion/libsvn_fs_fs/fs_fs.c
+++ b/subversion/libsvn_fs_fs/fs_fs.c
@@ -145,6 +145,18 @@
}
static const char *
+path_txn_current(svn_fs_t *fs, apr_pool_t *pool)
+{
+ return svn_path_join(fs->path, PATH_TXN_CURRENT, pool);
+}
+
+static const char *
+path_txn_current_lock(svn_fs_t *fs, apr_pool_t *pool)
+{
+ return svn_path_join(fs->path, PATH_TXN_CURRENT_LOCK, pool);
+}
+
+static const char *
path_lock(svn_fs_t *fs, apr_pool_t *pool)
{
return svn_path_join(fs->path, PATH_LOCK_FILE, pool);
@@ -394,6 +406,119 @@
return err;
}
+
+/* Get a lock on empty file LOCK_FILENAME, creating it in POOL. */
+static svn_error_t *
+get_lock_on_filesystem(const char *lock_filename,
+ apr_pool_t *pool)
+{
+ svn_error_t *err = svn_io_file_lock2(lock_filename, TRUE, FALSE, pool);
+
+ if (err && APR_STATUS_IS_ENOENT(err->apr_err))
+ {
+ /* No lock file? No big deal; these are just empty files
+ anyway. Create it and try again. */
+ svn_error_clear(err);
+ err = NULL;
+
+ SVN_ERR(svn_io_file_create(lock_filename, "", pool));
+ SVN_ERR(svn_io_file_lock2(lock_filename, TRUE, FALSE, pool));
+ }
+
+ return err;
+}
+
+/* Obtain a write lock on the file LOCK_FILENAME (protecting with
+ LOCK_MUTEX if APR is threaded) in a subpool of POOL, call BODY with
+ BATON and that subpool, destroy the subpool (releasing the write
+ lock) and return what BODY returned. */
+static svn_error_t *
+with_some_lock(svn_error_t *(*body)(void *baton,
+ apr_pool_t *pool),
+ void *baton,
+ const char *lock_filename,
+#if APR_HAS_THREADS
+ apr_thread_mutex_t *lock_mutex,
+#endif
+ apr_pool_t *pool)
+{
+ apr_pool_t *subpool = svn_pool_create(pool);
+ svn_error_t *err;
+
+#if APR_HAS_THREADS
+ apr_status_t status;
+
+ /* POSIX fcntl locks are per-process, so we need to serialize locks
+ within the process. */
+ status = apr_thread_mutex_lock(lock_mutex);
+ if (status)
+ return svn_error_wrap_apr(status,
+ _("Can't grab FSFS mutex for '%s'"),
+ lock_filename);
+#endif
+
+ err = get_lock_on_filesystem(lock_filename, subpool);
+
+ if (!err)
+ err = body(baton, subpool);
+
+ svn_pool_destroy(subpool);
+
+#if APR_HAS_THREADS
+ status = apr_thread_mutex_unlock(lock_mutex);
+ if (status && !err)
+ return svn_error_wrap_apr(status,
+ _("Can't ungrab FSFS mutex for '%s'"),
+ lock_filename);
+#endif
+
+ return err;
+}
+
+svn_error_t *
+svn_fs_fs__with_write_lock(svn_fs_t *fs,
+ svn_error_t *(*body)(void *baton,
+ apr_pool_t *pool),
+ void *baton,
+ apr_pool_t *pool)
+{
+#if APR_HAS_THREADS
+ fs_fs_data_t *ffd = fs->fsap_data;
+ fs_fs_shared_data_t *ffsd = ffd->shared;
+ apr_thread_mutex_t *mutex = ffsd->fs_write_lock;
+#endif
+
+ return with_some_lock(body, baton,
+ path_lock(fs, pool),
+#if APR_HAS_THREADS
+ mutex,
+#endif
+ pool);
+}
+
+/* Run BODY (with BATON and POOL) while the transaction-current file
+ of FS is locked. */
+static svn_error_t *
+with_txn_current_lock(svn_fs_t *fs,
+ svn_error_t *(*body)(void *baton,
+ apr_pool_t *pool),
+ void *baton,
+ apr_pool_t *pool)
+{
+#if APR_HAS_THREADS
+ fs_fs_data_t *ffd = fs->fsap_data;
+ fs_fs_shared_data_t *ffsd = ffd->shared;
+ apr_thread_mutex_t *mutex = ffsd->txn_current_lock;
+#endif
+
+ return with_some_lock(body, baton,
+ path_txn_current_lock(fs, pool),
+#if APR_HAS_THREADS
+ mutex,
+#endif
+ pool);
+}
+
/* A structure used by unlock_proto_rev() and unlock_proto_rev_body(),
which see. */
struct unlock_proto_rev_baton
@@ -849,7 +974,8 @@
* For obvious reasons, this does not work *across hosts*. No one
* knows about the opened file; not the server, and not the deleting
* client. So the file vanishes, and the reader gets stale NFS file
- * handle. We have this problem with revprops files and current.
+ * handle. We have this problem with revprops files, current, and
+ * transaction-current.
*
* Wrap opens and reads of such files with SVN_RETRY_ESTALE and closes
* with SVN_IGNORE_ESTALE. Call these macros within a loop of
@@ -3183,9 +3309,7 @@
get_and_increment_txn_key_body(void *baton, apr_pool_t *pool)
{
struct get_and_increment_txn_key_baton *cb = baton;
- const char *txn_current_filename = svn_path_join(cb->fs->path,
- PATH_TXN_CURRENT,
- pool);
+ const char *txn_current_filename = path_txn_current(cb->fs, pool);
apr_file_t *txn_current_file;
const char *tmp_filename;
char next_txn_id[MAX_KEY_SIZE+3];
@@ -3262,10 +3386,10 @@
number the transaction is based off into the transaction id. */
cb.pool = pool;
cb.fs = fs;
- SVN_ERR(svn_fs_fs__with_write_lock(fs,
- get_and_increment_txn_key_body,
- &cb,
- pool));
+ SVN_ERR(with_txn_current_lock(fs,
+ get_and_increment_txn_key_body,
+ &cb,
+ pool));
*id_p = apr_psprintf(pool, "%ld-%s", rev, cb.txn_id);
txn_dir = svn_path_join_many(pool,
@@ -4679,67 +4803,6 @@
return write_current(fs, rev, new_node_id, new_copy_id, pool);
}
-/* Get a write lock in FS, creating it in POOL. */
-static svn_error_t *
-get_write_lock(svn_fs_t *fs,
- apr_pool_t *pool)
-{
- const char *lock_filename;
- svn_node_kind_t kind;
-
- lock_filename = path_lock(fs, pool);
-
- /* svn 1.1.1 and earlier deferred lock file creation to the first
- commit. So in case the repository was created by an earlier
- version of svn, check the lock file here. */
- SVN_ERR(svn_io_check_path(lock_filename, &kind, pool));
- if ((kind == svn_node_unknown) || (kind == svn_node_none))
- SVN_ERR(svn_io_file_create(lock_filename, "", pool));
-
- SVN_ERR(svn_io_file_lock2(lock_filename, TRUE, FALSE, pool));
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_fs_fs__with_write_lock(svn_fs_t *fs,
- svn_error_t *(*body)(void *baton,
- apr_pool_t *pool),
- void *baton,
- apr_pool_t *pool)
-{
- apr_pool_t *subpool = svn_pool_create(pool);
- svn_error_t *err;
-
-#if APR_HAS_THREADS
- fs_fs_data_t *ffd = fs->fsap_data;
- fs_fs_shared_data_t *ffsd = ffd->shared;
- apr_status_t status;
-
- /* POSIX fcntl locks are per-process, so we need to serialize locks
- within the process. */
- status = apr_thread_mutex_lock(ffsd->fs_write_lock);
- if (status)
- return svn_error_wrap_apr(status, _("Can't grab FSFS repository mutex"));
-#endif
-
- err = get_write_lock(fs, subpool);
-
- if (!err)
- err = body(baton, subpool);
-
- svn_pool_destroy(subpool);
-
-#if APR_HAS_THREADS
- status = apr_thread_mutex_unlock(ffsd->fs_write_lock);
- if (status && !err)
- return svn_error_wrap_apr(status,
- _("Can't ungrab FSFS repository mutex"));
-#endif
-
- return err;
-}
-
/* Verify that the user registed with FS has all the locks necessary to
permit all the changes associate with TXN_NAME.
The FS write lock is assumed to be held by the caller. */
@@ -5114,8 +5177,12 @@
/* Create the transaction-current file if the repository supports
the transaction sequence file. */
if (format >= SVN_FS_FS__MIN_TXN_CURRENT_FORMAT)
- SVN_ERR(svn_io_file_create(svn_path_join(path, PATH_TXN_CURRENT, pool),
- "0\n", pool));
+ {
+ SVN_ERR(svn_io_file_create(path_txn_current(fs, pool),
+ "0\n", pool));
+ SVN_ERR(svn_io_file_create(path_txn_current_lock(fs, pool),
+ "", pool));
+ }
/* This filesystem is ready. Stamp it with a format number. */
SVN_ERR(write_format(path_format(fs, pool),
diff --git a/subversion/libsvn_fs_fs/structure b/subversion/libsvn_fs_fs/structure
index 404f326..e6788b8 100644
--- a/subversion/libsvn_fs_fs/structure
+++ b/subversion/libsvn_fs_fs/structure
@@ -47,6 +47,7 @@
current File specifying current revision and next node/copy id
fs-type File identifying this filesystem as an FSFS filesystem
write-lock Empty file, locked to serialise writers
+ txn-current-lock Empty file, locked to serialise 'transaction-current'
uuid File containing the UUID of the repository
format File containing the format number of this filesystem
@@ -71,9 +72,9 @@
in the next transaction name, along with the revision number the
transaction is based on. This sequence number ensures that
transaction names are not reused, even if the transaction is aborted
-and a new transaction based on the same revision is begun. The
-"transaction-current" file is read and written under the fs-wide
-write-lock.
+and a new transaction based on the same revision is begun. The only
+operation that FSFS performs on this file is "get and increment";
+the "txn-current-lock" file is locked during this operation.
Filesystem formats
------------------
diff --git a/subversion/libsvn_fs_fs/tree.c b/subversion/libsvn_fs_fs/tree.c
index 0212b86..ede1abf 100644
--- a/subversion/libsvn_fs_fs/tree.c
+++ b/subversion/libsvn_fs_fs/tree.c
@@ -913,6 +913,7 @@
return SVN_NO_ERROR;
}
+
/* Set *CREATED_PATH to the path at which PATH under ROOT was created.
Return a string allocated in POOL. */
static svn_error_t *
@@ -2867,6 +2868,121 @@
}
+/* 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.
+
+ If there was no such copy operation in that portion of PATH's
+ history, set *PREV_PATH to NULL and *PREV_REV to SVN_INVALID_REVNUM. */
+static svn_error_t *
+prev_location(const char **prev_path,
+ svn_revnum_t *prev_rev,
+ svn_fs_t *fs,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool)
+{
+ const char *copy_path, *copy_src_path, *remainder = "";
+ svn_fs_root_t *copy_root;
+ svn_revnum_t copy_src_rev;
+
+ /* Ask about the most recent copy which affected PATH@REVISION. If
+ there was no such copy, we're done. */
+ SVN_ERR(fs_closest_copy(©_root, ©_path, root, path, pool));
+ if (! copy_root)
+ {
+ *prev_rev = SVN_INVALID_REVNUM;
+ *prev_path = NULL;
+ return SVN_NO_ERROR;
+ }
+
+ /* Ultimately, it's not the path of the closest copy's source that
+ we care about -- it's our own path's location in the copy source
+ revision. So we'll tack the relative path that expresses the
+ difference between the copy destination and our path in the copy
+ revision onto the copy source path to determine this information.
+
+ In other words, if our path is "/branches/my-branch/foo/bar", and
+ we know that the closest relevant copy was a copy of "/trunk" to
+ "/branches/my-branch", then that relative path under the copy
+ destination is "/foo/bar". Tacking that onto the copy source
+ path tells us that our path was located at "/trunk/foo/bar"
+ before the copy.
+ */
+ SVN_ERR(fs_copied_from(©_src_rev, ©_src_path,
+ 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);
+ *prev_rev = copy_src_rev;
+ return SVN_NO_ERROR;
+}
+
+
+static svn_error_t *
+fs_node_origin_rev(svn_revnum_t *revision,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs = svn_fs_root_fs(root);
+ svn_fs_root_t *curroot = root;
+ apr_pool_t *subpool = svn_pool_create(pool);
+ apr_pool_t *predidpool = svn_pool_create(pool);
+ svn_stringbuf_t *lastpath =
+ svn_stringbuf_create(svn_fs__canonicalize_abspath(path, pool), pool);
+ svn_revnum_t lastrev = SVN_INVALID_REVNUM;
+ dag_node_t *node;
+ const svn_fs_id_t *pred_id;
+
+ /* Walk the closest-copy chain back to the first copy in our history.
+
+ NOTE: We merely *assume* that this is faster than walking the
+ predecessor chain, because we *assume* that copies of parent
+ directories happen less often than modifications to a given item. */
+ while (1)
+ {
+ svn_revnum_t currev;
+ const char *curpath = lastpath->data;
+
+ svn_pool_clear(subpool);
+
+ /* Get a root pointing to LASTREV. (The first time around,
+ LASTREV is invalid, but that's cool because CURROOT is
+ already initialized.) */
+ if (SVN_IS_VALID_REVNUM(lastrev))
+ SVN_ERR(svn_fs_fs__revision_root(&curroot, fs, lastrev, subpool));
+
+ /* Find the previous location using the closest-copy shortcut. */
+ SVN_ERR(prev_location(&curpath, &currev, fs, curroot, curpath, subpool));
+ if (! curpath)
+ break;
+
+ /* Update our LASTPATH and LASTREV variables (which survive SUBPOOL). */
+ svn_stringbuf_set(lastpath, curpath);
+ lastrev = currev;
+ }
+
+ /* Walk the predecessor links back to origin. */
+ SVN_ERR(fs_node_id(&pred_id, curroot, lastpath->data, predidpool));
+ while (pred_id)
+ {
+ svn_pool_clear(subpool);
+ SVN_ERR(svn_fs_fs__dag_get_node(&node, fs, pred_id, subpool));
+ svn_pool_clear(predidpool);
+ SVN_ERR(svn_fs_fs__dag_get_predecessor_id(&pred_id, node, predidpool));
+ }
+
+ /* When we get here, NODE should be the first node-revision in our chain. */
+ SVN_ERR(svn_fs_fs__dag_get_revision(revision, node, pool));
+
+ svn_pool_destroy(subpool);
+ return SVN_NO_ERROR;
+}
+
+
struct history_prev_args
{
svn_fs_history_t **prev_history_p;
@@ -3144,6 +3260,7 @@
fs_node_history,
fs_node_id,
svn_fs_fs__node_created_rev,
+ fs_node_origin_rev,
fs_node_created_path,
fs_delete_node,
fs_copied_from,
diff --git a/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c b/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
index d7a3fd9..c2dd216 100644
--- a/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
+++ b/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
@@ -659,7 +659,7 @@
get_mergeinfo_for_children(sqlite3 *db,
const char *path,
svn_revnum_t rev,
- apr_hash_t **path_mergeinfo,
+ apr_hash_t *path_mergeinfo,
svn_fs_mergeinfo_filter_func_t filter_func,
void *filter_func_baton,
apr_pool_t *pool)
@@ -835,7 +835,7 @@
}
}
- err = get_mergeinfo_for_children(db, path, rev, &path_mergeinfo,
+ err = get_mergeinfo_for_children(db, path, rev, path_mergeinfo,
filter_func, filter_func_baton, pool);
MAYBE_CLEANUP;
diff --git a/subversion/libsvn_ra/compat.c b/subversion/libsvn_ra/compat.c
index 01fffa1..4c75aac 100644
--- a/subversion/libsvn_ra/compat.c
+++ b/subversion/libsvn_ra/compat.c
@@ -83,80 +83,83 @@
if (copyfrom_rev_p)
*copyfrom_rev_p = SVN_INVALID_REVNUM;
- /* See if PATH was explicitly changed in this revision. */
- change = apr_hash_get(changed_paths, path, APR_HASH_KEY_STRING);
- if (change)
+ if (changed_paths)
{
- /* If PATH was not newly added in this revision, then it may or may
- not have also been part of a moved subtree. In this case, set a
- default previous path, but still look through the parents of this
- path for a possible copy event. */
- if (change->action != 'A' && change->action != 'R')
+ /* See if PATH was explicitly changed in this revision. */
+ change = apr_hash_get(changed_paths, path, APR_HASH_KEY_STRING);
+ if (change)
{
- prev_path = path;
- }
- else
- {
- /* PATH is new in this revision. This means it cannot have been
- part of a copied subtree. */
- if (change->copyfrom_path)
- prev_path = apr_pstrdup(pool, change->copyfrom_path);
- else
- prev_path = NULL;
-
- *prev_path_p = prev_path;
- if (action_p)
- *action_p = change->action;
- if (copyfrom_rev_p)
- *copyfrom_rev_p = change->copyfrom_rev;
- return SVN_NO_ERROR;
- }
- }
-
- if (apr_hash_count(changed_paths))
- {
- /* The path was not explicitly changed in this revision. The
- fact that we're hearing about this revision implies, then,
- that the path was a child of some copied directory. We need
- to find that directory, and effectively "re-base" our path on
- that directory's copyfrom_path. */
- int i;
- apr_array_header_t *paths;
-
- /* Build a sorted list of the changed paths. */
- paths = svn_sort__hash(changed_paths,
- svn_sort_compare_items_as_paths, pool);
-
- /* Now, walk the list of paths backwards, looking a parent of
- our path that has copyfrom information. */
- for (i = paths->nelts; i > 0; i--)
- {
- svn_sort__item_t item = APR_ARRAY_IDX(paths,
- i - 1, svn_sort__item_t);
- const char *ch_path = item.key;
- int len = strlen(ch_path);
-
- /* See if our path is the child of this change path. If
- not, keep looking. */
- if (! ((strncmp(ch_path, path, len) == 0) && (path[len] == '/')))
- continue;
-
- /* Okay, our path *is* a child of this change path. If
- this change was copied, we just need to apply the
- portion of our path that is relative to this change's
- path, to the change's copyfrom path. Otherwise, this
- change isn't really interesting to us, and our search
- continues. */
- change = apr_hash_get(changed_paths, ch_path, len);
- if (change->copyfrom_path)
+ /* If PATH was not newly added in this revision, then it may or may
+ not have also been part of a moved subtree. In this case, set a
+ default previous path, but still look through the parents of this
+ path for a possible copy event. */
+ if (change->action != 'A' && change->action != 'R')
{
+ prev_path = path;
+ }
+ else
+ {
+ /* PATH is new in this revision. This means it cannot have been
+ part of a copied subtree. */
+ if (change->copyfrom_path)
+ prev_path = apr_pstrdup(pool, change->copyfrom_path);
+ else
+ prev_path = NULL;
+
+ *prev_path_p = prev_path;
if (action_p)
*action_p = change->action;
if (copyfrom_rev_p)
*copyfrom_rev_p = change->copyfrom_rev;
- prev_path = svn_path_join(change->copyfrom_path,
- path + len + 1, pool);
- break;
+ return SVN_NO_ERROR;
+ }
+ }
+
+ if (apr_hash_count(changed_paths))
+ {
+ /* The path was not explicitly changed in this revision. The
+ fact that we're hearing about this revision implies, then,
+ that the path was a child of some copied directory. We need
+ to find that directory, and effectively "re-base" our path on
+ that directory's copyfrom_path. */
+ int i;
+ apr_array_header_t *paths;
+
+ /* Build a sorted list of the changed paths. */
+ paths = svn_sort__hash(changed_paths,
+ svn_sort_compare_items_as_paths, pool);
+
+ /* Now, walk the list of paths backwards, looking a parent of
+ our path that has copyfrom information. */
+ for (i = paths->nelts; i > 0; i--)
+ {
+ svn_sort__item_t item = APR_ARRAY_IDX(paths,
+ i - 1, svn_sort__item_t);
+ const char *ch_path = item.key;
+ int len = strlen(ch_path);
+
+ /* See if our path is the child of this change path. If
+ not, keep looking. */
+ if (! ((strncmp(ch_path, path, len) == 0) && (path[len] == '/')))
+ continue;
+
+ /* Okay, our path *is* a child of this change path. If
+ this change was copied, we just need to apply the
+ portion of our path that is relative to this change's
+ path, to the change's copyfrom path. Otherwise, this
+ change isn't really interesting to us, and our search
+ continues. */
+ change = apr_hash_get(changed_paths, ch_path, len);
+ if (change->copyfrom_path)
+ {
+ if (action_p)
+ *action_p = change->action;
+ if (copyfrom_rev_p)
+ *copyfrom_rev_p = change->copyfrom_rev;
+ prev_path = svn_path_join(change->copyfrom_path,
+ path + len + 1, pool);
+ break;
+ }
}
}
}
diff --git a/subversion/libsvn_ra/ra_loader.c b/subversion/libsvn_ra/ra_loader.c
index dac95cd..1167d6b 100644
--- a/subversion/libsvn_ra/ra_loader.c
+++ b/subversion/libsvn_ra/ra_loader.c
@@ -19,6 +19,8 @@
/* ==================================================================== */
/*** Includes. ***/
+#include <assert.h>
+
#define APR_WANT_STRFUNC
#include <apr_want.h>
@@ -621,6 +623,7 @@
apr_hash_t **props,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->get_file(session, path, revision, stream,
fetched_rev, props, pool);
}
@@ -633,6 +636,7 @@
apr_hash_t **props,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->get_dir(session, dirents, fetched_rev, props,
path, revision, SVN_DIRENT_ALL, pool);
}
@@ -646,6 +650,7 @@
apr_uint32_t dirent_fields,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->get_dir(session, dirents, fetched_rev, props,
path, revision, dirent_fields, pool);
}
@@ -672,6 +677,8 @@
void *update_baton,
apr_pool_t *pool)
{
+ assert(svn_path_is_empty(update_target)
+ || svn_path_is_single_path_component(update_target));
return session->vtable->do_update(session,
reporter, report_baton,
revision_to_update_to, update_target,
@@ -691,9 +698,10 @@
apr_pool_t *pool)
{
struct reporter_3in2_baton *b = apr_palloc(pool, sizeof(*b));
+ assert(svn_path_is_empty(update_target)
+ || svn_path_is_single_path_component(update_target));
*reporter = &reporter_3in2_wrapper;
*report_baton = b;
-
return session->vtable->do_update(session,
&(b->reporter3), &(b->reporter3_baton),
revision_to_update_to, update_target,
@@ -714,6 +722,8 @@
void *switch_baton,
apr_pool_t *pool)
{
+ assert(svn_path_is_empty(switch_target)
+ || svn_path_is_single_path_component(switch_target));
return session->vtable->do_switch(session,
reporter, report_baton,
revision_to_switch_to, switch_target,
@@ -733,9 +743,10 @@
apr_pool_t *pool)
{
struct reporter_3in2_baton *b = apr_palloc(pool, sizeof(*b));
+ assert(svn_path_is_empty(switch_target)
+ || svn_path_is_single_path_component(switch_target));
*reporter = &reporter_3in2_wrapper;
*report_baton = b;
-
return session->vtable->do_switch(session,
&(b->reporter3), &(b->reporter3_baton),
revision_to_switch_to, switch_target,
@@ -754,6 +765,8 @@
void *status_baton,
apr_pool_t *pool)
{
+ assert(svn_path_is_empty(status_target)
+ || svn_path_is_single_path_component(status_target));
return session->vtable->do_status(session,
reporter, report_baton,
status_target, revision, depth,
@@ -771,9 +784,10 @@
apr_pool_t *pool)
{
struct reporter_3in2_baton *b = apr_palloc(pool, sizeof(*b));
+ assert(svn_path_is_empty(status_target)
+ || svn_path_is_single_path_component(status_target));
*reporter = &reporter_3in2_wrapper;
*report_baton = b;
-
return session->vtable->do_status(session,
&(b->reporter3), &(b->reporter3_baton),
status_target, revision,
@@ -794,6 +808,8 @@
void *diff_baton,
apr_pool_t *pool)
{
+ assert(svn_path_is_empty(diff_target)
+ || svn_path_is_single_path_component(diff_target));
return session->vtable->do_diff(session,
reporter, report_baton,
revision, diff_target,
@@ -816,9 +832,10 @@
apr_pool_t *pool)
{
struct reporter_3in2_baton *b = apr_palloc(pool, sizeof(*b));
+ assert(svn_path_is_empty(diff_target)
+ || svn_path_is_single_path_component(diff_target));
*reporter = &reporter_3in2_wrapper;
*report_baton = b;
-
return session->vtable->do_diff(session,
&(b->reporter3), &(b->reporter3_baton),
revision, diff_target,
@@ -839,6 +856,8 @@
void *diff_baton,
apr_pool_t *pool)
{
+ assert(svn_path_is_empty(diff_target)
+ || svn_path_is_single_path_component(diff_target));
return svn_ra_do_diff2(session, reporter, report_baton, revision,
diff_target, recurse, ignore_ancestry, TRUE,
versus_url, diff_editor, diff_baton, pool);
@@ -857,6 +876,12 @@
void *receiver_baton,
apr_pool_t *pool)
{
+ int i;
+ for (i = 0; i < paths->nelts; i++)
+ {
+ const char *path = APR_ARRAY_IDX(paths, i, const char *);
+ assert(*path != '/');
+ }
return session->vtable->get_log(session, paths, start, end, limit,
discover_changed_paths, strict_node_history,
include_merged_revisions, revprops,
@@ -876,6 +901,13 @@
{
svn_log_entry_receiver_t receiver2;
void *receiver2_baton;
+ int i;
+
+ for (i = 0; i < paths->nelts; i++)
+ {
+ const char *path = APR_ARRAY_IDX(paths, i, const char *);
+ assert(*path != '/');
+ }
svn_compat_wrap_log_receiver(&receiver2, &receiver2_baton,
receiver, receiver_baton,
@@ -893,6 +925,7 @@
svn_node_kind_t *kind,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->check_path(session, path, revision, kind, pool);
}
@@ -902,6 +935,7 @@
svn_dirent_t **dirent,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->stat(session, path, revision, dirent, pool);
}
@@ -926,10 +960,11 @@
apr_array_header_t *location_revisions,
apr_pool_t *pool)
{
- svn_error_t *err = session->vtable->get_locations(session, locations, path,
- peg_revision,
- location_revisions,
- pool);
+ svn_error_t *err;
+
+ assert(*path != '/');
+ err = session->vtable->get_locations(session, locations, path,
+ peg_revision, location_revisions, pool);
if (err && (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED))
{
svn_error_clear(err);
@@ -952,14 +987,12 @@
void *receiver_baton,
apr_pool_t *pool)
{
- svn_error_t *err = session->vtable->get_location_segments(session,
- path,
- peg_revision,
- start_rev,
- end_rev,
- receiver,
- receiver_baton,
- pool);
+ svn_error_t *err;
+
+ assert(*path != '/');
+ err = session->vtable->get_location_segments(session, path, peg_revision,
+ start_rev, end_rev,
+ receiver, receiver_baton, pool);
if (err && (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED))
{
svn_error_clear(err);
@@ -984,6 +1017,8 @@
svn_file_rev_handler_t handler2;
void *handler2_baton;
+ assert(*path != '/');
+
svn_compat_wrap_file_rev_handler(&handler2, &handler2_baton,
handler, handler_baton,
pool);
@@ -1001,11 +1036,13 @@
void *handler_baton,
apr_pool_t *pool)
{
+ svn_error_t *err;
- svn_error_t *err = session->vtable->get_file_revs(session, path, start, end,
- include_merged_revisions,
- handler, handler_baton,
- pool);
+ assert(*path != '/');
+
+ err = session->vtable->get_file_revs(session, path, start, end,
+ include_merged_revisions,
+ handler, handler_baton, pool);
if (err && (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED))
{
svn_error_clear(err);
@@ -1025,6 +1062,15 @@
void *lock_baton,
apr_pool_t *pool)
{
+ apr_hash_index_t *hi;
+
+ for (hi = apr_hash_first(NULL, path_revs); hi; hi = apr_hash_next(hi))
+ {
+ const void *path;
+ apr_hash_this(hi, &path, NULL, NULL);
+ assert(*((const char *)path) != '/');
+ }
+
if (comment && ! svn_xml_is_xml_safe(comment, strlen(comment)))
return svn_error_create
(SVN_ERR_XML_UNESCAPABLE_DATA, NULL,
@@ -1041,6 +1087,15 @@
void *lock_baton,
apr_pool_t *pool)
{
+ apr_hash_index_t *hi;
+
+ for (hi = apr_hash_first(NULL, path_tokens); hi; hi = apr_hash_next(hi))
+ {
+ const void *path;
+ apr_hash_this(hi, &path, NULL, NULL);
+ assert(*((const char *)path) != '/');
+ }
+
return session->vtable->unlock(session, path_tokens, break_lock,
lock_func, lock_baton, pool);
}
@@ -1050,6 +1105,7 @@
const char *path,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->get_lock(session, lock, path, pool);
}
@@ -1058,6 +1114,7 @@
const char *path,
apr_pool_t *pool)
{
+ assert(*path != '/');
return session->vtable->get_locks(session, locks, path, pool);
}
diff --git a/subversion/libsvn_ra_local/split_url.c b/subversion/libsvn_ra_local/split_url.c
index a683b49..64d5350 100644
--- a/subversion/libsvn_ra_local/split_url.c
+++ b/subversion/libsvn_ra_local/split_url.c
@@ -21,7 +21,6 @@
#include <string.h>
#include "svn_path.h"
#include "svn_private_config.h"
-#include "private/svn_repos_private.h"
svn_error_t *
@@ -138,7 +137,7 @@
{
apr_array_header_t *caps = apr_array_make(pool, 1, sizeof(const char *));
APR_ARRAY_PUSH(caps, const char *) = SVN_RA_CAPABILITY_MERGEINFO;
- svn_repos__set_capabilities(*repos, caps);
+ SVN_ERR(svn_repos_remember_client_capabilities(*repos, caps));
}
/* What remains of URL after being hacked at in the previous step is
diff --git a/subversion/libsvn_ra_neon/session.c b/subversion/libsvn_ra_neon/session.c
index d1be925..dfa4c88 100644
--- a/subversion/libsvn_ra_neon/session.c
+++ b/subversion/libsvn_ra_neon/session.c
@@ -678,17 +678,15 @@
slightly more efficiently, but that wouldn't be worth it
until we have many more capabilities. */
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_DEPTH, vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_DEPTH, vals))
apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_DEPTH,
APR_HASH_KEY_STRING, capability_yes);
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO,
- vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_MERGEINFO, vals))
apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_MERGEINFO,
APR_HASH_KEY_STRING, capability_yes);
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS,
- vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_LOG_REVPROPS, vals))
apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_LOG_REVPROPS,
APR_HASH_KEY_STRING, capability_yes);
}
@@ -708,37 +706,9 @@
rar = svn_ra_neon__request_create(ras, "OPTIONS", ras->url->data, pool);
- /*
- ### TODO:
- ###
- ### I think http://tools.ietf.org/html/rfc2774#section-3 probably
- ### says how to define a new header with which the client can
- ### express capabilities. But I haven't finished reading it yet,
- ### and in the meantime I'd like to get this code working, so I'm
- ### just going with...
- ###
- ### X-SVN-Capabilities:
- ###
- ### ...for now, despite having no reason to believe the namespace
- ### constraints for HTTP are anything like those of RFC 822 4.1,
- ### where you just put "X-" on the front and then you're home free
- ### (or at least you're only sharing namespace with all the other
- ### bozos on the Internet).
- ###
- ### The header's value is a comma-separated list of capabilities;
- ### if the header appears multiple times, its values are to be
- ### concatenated in order as per RFC-2616, 14.43.
- ###
- ### NOTE: The ../libsvn_ra_serf code sets this header too, and has
- ### shadow comments pointing back this one. Whatever we do here,
- ### we should do there as well.
- */
- ne_add_request_header(rar->ne_req, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_DEPTH);
- ne_add_request_header(rar->ne_req, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO);
- ne_add_request_header(rar->ne_req, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS);
+ ne_add_request_header(rar->ne_req, "DAV", SVN_DAV_NS_DAV_SVN_DEPTH);
+ ne_add_request_header(rar->ne_req, "DAV", SVN_DAV_NS_DAV_SVN_MERGEINFO);
+ ne_add_request_header(rar->ne_req, "DAV", SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
SVN_ERR(svn_ra_neon__request_dispatch(&http_ret_code, rar,
NULL, NULL, 200, 0, pool));
diff --git a/subversion/libsvn_ra_serf/serf.c b/subversion/libsvn_ra_serf/serf.c
index 63e9481..352d848 100644
--- a/subversion/libsvn_ra_serf/serf.c
+++ b/subversion/libsvn_ra_serf/serf.c
@@ -87,21 +87,19 @@
efficiently, but that wouldn't be worth it until we have many
more capabilities. */
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_DEPTH, vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_DEPTH, vals))
{
apr_hash_set(crb->capabilities, SVN_RA_CAPABILITY_DEPTH,
APR_HASH_KEY_STRING, capability_yes);
}
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO,
- vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_MERGEINFO, vals))
{
apr_hash_set(crb->capabilities, SVN_RA_CAPABILITY_MERGEINFO,
APR_HASH_KEY_STRING, capability_yes);
}
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS,
- vals))
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_LOG_REVPROPS, vals))
{
apr_hash_set(crb->capabilities, SVN_RA_CAPABILITY_LOG_REVPROPS,
APR_HASH_KEY_STRING, capability_yes);
@@ -148,13 +146,9 @@
void *baton,
apr_pool_t *pool)
{
- /* ### See comment at similar place in ../libsvn_ra_neon/session.c. ### */
- serf_bucket_headers_set(headers, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_DEPTH);
- serf_bucket_headers_set(headers, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO);
- serf_bucket_headers_set(headers, "X-SVN-Capabilities",
- SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS);
+ serf_bucket_headers_set(headers, "DAV", SVN_DAV_NS_DAV_SVN_DEPTH);
+ serf_bucket_headers_set(headers, "DAV", SVN_DAV_NS_DAV_SVN_MERGEINFO);
+ serf_bucket_headers_set(headers, "DAV", SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
return APR_SUCCESS;
}
diff --git a/subversion/libsvn_repos/fs-wrap.c b/subversion/libsvn_repos/fs-wrap.c
index 25dadd1..531db00 100644
--- a/subversion/libsvn_repos/fs-wrap.c
+++ b/subversion/libsvn_repos/fs-wrap.c
@@ -77,7 +77,7 @@
/* Run start-commit hooks. */
SVN_ERR(svn_repos__hooks_start_commit(repos, author ? author->data : NULL,
- repos->capabilities, pool));
+ repos->client_capabilities, pool));
/* Begin the transaction, ask for the fs to do on-the-fly lock checks. */
SVN_ERR(svn_fs_begin_txn2(txn_p, repos->fs, rev,
diff --git a/subversion/libsvn_repos/hooks.c b/subversion/libsvn_repos/hooks.c
index 2e5bea3..7b448a1 100644
--- a/subversion/libsvn_repos/hooks.c
+++ b/subversion/libsvn_repos/hooks.c
@@ -549,9 +549,11 @@
else if (hook)
{
const char *args[4];
- char *capabilities_string = svn_cstring_join(capabilities, ",", pool);
+ char *capabilities_string = svn_cstring_join(capabilities, ":", pool);
+
/* Get rid of that annoying final comma. */
- capabilities_string[strlen(capabilities_string) - 1] = '\0';
+ if (capabilities_string[0])
+ capabilities_string[strlen(capabilities_string) - 1] = '\0';
args[0] = hook;
args[1] = svn_path_local_style(svn_repos_path(repos, pool), pool);
diff --git a/subversion/libsvn_repos/log.c b/subversion/libsvn_repos/log.c
index 72da82c..1cbdf21 100644
--- a/subversion/libsvn_repos/log.c
+++ b/subversion/libsvn_repos/log.c
@@ -753,7 +753,7 @@
apr_hash_t *path_mergeinfo;
apr_hash_this(hi, NULL, NULL, (void *)&path_mergeinfo);
- SVN_ERR(svn_mergeinfo_merge(mergeinfo, path_mergeinfo,
+ SVN_ERR(svn_mergeinfo_merge(*mergeinfo, path_mergeinfo,
svn_rangelist_equal_inheritance, pool));
}
@@ -816,7 +816,7 @@
SVN_ERR(svn_mergeinfo_diff(&deleted, &changed, prev_mergeinfo,
curr_mergeinfo, svn_rangelist_ignore_inheritance,
subpool));
- SVN_ERR(svn_mergeinfo_merge(&changed, deleted,
+ SVN_ERR(svn_mergeinfo_merge(changed, deleted,
svn_rangelist_equal_inheritance, subpool));
*mergeinfo = svn_mergeinfo_dup(changed, pool);
diff --git a/subversion/libsvn_repos/repos.c b/subversion/libsvn_repos/repos.c
index a1dace9..6c44406 100644
--- a/subversion/libsvn_repos/repos.c
+++ b/subversion/libsvn_repos/repos.c
@@ -29,7 +29,6 @@
#include "svn_ra.h" /* for SVN_RA_CAPABILITY_* */
#include "svn_repos.h"
#include "svn_private_config.h" /* for SVN_TEMPLATE_ROOT_DIR */
-#include "private/svn_repos_private.h"
#include "repos.h"
@@ -307,14 +306,14 @@
"#" NL
"# [1] REPOS-PATH (the path to this repository)" NL
"# [2] USER (the authenticated user attempting to commit)" NL
-"# [3] CAPABILITIES (a comma-separated list of capabilities reported" NL
+"# [3] CAPABILITIES (a colon-separated list of capabilities reported" NL
"# by the client; see note below)" NL
"#" NL
"# Note: The CAPABILITIES parameter is new in Subversion 1.5, and 1.5" NL
"# clients will typically report at least the \"" \
SVN_RA_CAPABILITY_MERGEINFO "\" capability." NL
"# If there are other capabilities, then the list is comma-separated," NL
-"# e.g.: \"" SVN_RA_CAPABILITY_MERGEINFO ",some-other-capability\" " \
+"# e.g.: \"" SVN_RA_CAPABILITY_MERGEINFO ":some-other-capability\" " \
"(the order is undefined)." NL
"#" NL
"# The list is self-reported by the client. Therefore, you should not" NL
@@ -1696,29 +1695,11 @@
return SVN_NO_ERROR;
}
-apr_array_header_t *
-svn_repos__capabilities_as_list(apr_hash_t *capabilities, apr_pool_t *pool)
+svn_error_t *
+svn_repos_remember_client_capabilities(svn_repos_t *repos,
+ apr_array_header_t *capabilities)
{
- apr_hash_index_t *hi;
- apr_array_header_t *list = apr_array_make(pool, apr_hash_count(capabilities),
- sizeof(char *));
-
- for (hi = apr_hash_first(pool, capabilities); hi; hi = apr_hash_next(hi))
- {
- const void *key;
- void *val;
- apr_hash_this(hi, &key, NULL, &val);
- if (strcmp((const char *) val, "yes") == 0)
- APR_ARRAY_PUSH(list, const char *) = key;
- }
-
- return list;
-}
-
-void
-svn_repos__set_capabilities(svn_repos_t *repos,
- apr_array_header_t *capabilities)
-{
- repos->capabilities = capabilities;
+ repos->client_capabilities = capabilities;
+ return SVN_NO_ERROR;
}
diff --git a/subversion/libsvn_repos/repos.h b/subversion/libsvn_repos/repos.h
index 0b161af..e60b613 100644
--- a/subversion/libsvn_repos/repos.h
+++ b/subversion/libsvn_repos/repos.h
@@ -127,7 +127,7 @@
object. You'd think the capabilities here would represent the
*repository's* capabilities, but no, they represent the
client's -- we just don't have any other place to persist them. */
- apr_array_header_t *capabilities;
+ apr_array_header_t *client_capabilities;
};
diff --git a/subversion/libsvn_repos/rev_hunt.c b/subversion/libsvn_repos/rev_hunt.c
index 42f0887..fd4b990 100644
--- a/subversion/libsvn_repos/rev_hunt.c
+++ b/subversion/libsvn_repos/rev_hunt.c
@@ -835,34 +835,6 @@
}
-struct nls_history_baton_t
-{
- svn_revnum_t revision;
- svn_revnum_t end_rev;
-};
-
-/* This implements the `svn_repos_history_func_t' interface, and is
- used by svn_repos_node_location_segments() to determine, for a path
- and revision which has no prior affecting copies, the revision in
- which the path was created. It's baton is a pointer to an
- svn_revnum_t, which is clobbered by each successive REVISION. */
-static svn_error_t *
-nls_history_func(void *baton,
- const char *path,
- svn_revnum_t revision,
- apr_pool_t *pool)
-{
- struct nls_history_baton_t *b = baton;
- b->revision = revision;
- if (revision < b->end_rev)
- {
- b->revision = b->end_rev;
- return svn_error_create(SVN_ERR_CEASE_INVOCATION, NULL, NULL);
- }
- return SVN_NO_ERROR;
-}
-
-
/* Transmit SEGMENT through RECEIVER/RECEIVER_BATON iff a portion of
its revision range fits between END_REV and START_REV, possibly
cropping the range so that it fits *entirely* in that range. */
@@ -975,13 +947,12 @@
range. */
if (! prev_path)
{
- struct nls_history_baton_t nls_history_baton;
- nls_history_baton.revision = SVN_INVALID_REVNUM;
- nls_history_baton.end_rev = end_rev;
- SVN_ERR(svn_repos_history2(fs, cur_path, nls_history_func,
- &nls_history_baton, NULL, NULL,
- current_rev, 0, TRUE, subpool));
- segment->range_start = nls_history_baton.revision;
+ svn_fs_root_t *revroot;
+ SVN_ERR(svn_fs_revision_root(&revroot, fs, current_rev, subpool));
+ SVN_ERR(svn_fs_node_origin_rev(&(segment->range_start), revroot,
+ cur_path, subpool));
+ if (segment->range_start < end_rev)
+ segment->range_start = end_rev;
current_rev = SVN_INVALID_REVNUM;
}
else
@@ -1066,7 +1037,7 @@
old_path_rev->revnum - 1, subpool));
SVN_ERR(svn_mergeinfo_diff(&deleted, &changed, prev_mergeinfo, curr_mergeinfo,
svn_rangelist_ignore_inheritance, subpool));
- SVN_ERR(svn_mergeinfo_merge(&changed, deleted,
+ SVN_ERR(svn_mergeinfo_merge(changed, deleted,
svn_rangelist_equal_inheritance, subpool));
if (apr_hash_count(changed) == 0)
{
diff --git a/subversion/libsvn_subr/mergeinfo.c b/subversion/libsvn_subr/mergeinfo.c
index d8e2ec6..247a235 100644
--- a/subversion/libsvn_subr/mergeinfo.c
+++ b/subversion/libsvn_subr/mergeinfo.c
@@ -797,14 +797,14 @@
}
svn_error_t *
-svn_mergeinfo_merge(apr_hash_t **mergeinfo, apr_hash_t *changes,
+svn_mergeinfo_merge(apr_hash_t *mergeinfo, apr_hash_t *changes,
svn_merge_range_inheritance_t consider_inheritance,
apr_pool_t *pool)
{
apr_array_header_t *sorted1, *sorted2;
int i, j;
- sorted1 = svn_sort__hash(*mergeinfo, svn_sort_compare_items_as_paths, pool);
+ sorted1 = svn_sort__hash(mergeinfo, svn_sort_compare_items_as_paths, pool);
sorted2 = svn_sort__hash(changes, svn_sort_compare_items_as_paths, pool);
i = 0;
@@ -828,7 +828,7 @@
SVN_ERR(svn_rangelist_merge(&rl1, rl2,
consider_inheritance,
pool));
- apr_hash_set(*mergeinfo, elt1.key, elt1.klen, rl1);
+ apr_hash_set(mergeinfo, elt1.key, elt1.klen, rl1);
i++;
j++;
}
@@ -838,7 +838,7 @@
}
else
{
- apr_hash_set(*mergeinfo, elt2.key, elt2.klen, elt2.value);
+ apr_hash_set(mergeinfo, elt2.key, elt2.klen, elt2.value);
j++;
}
}
@@ -847,7 +847,7 @@
for (; j < sorted2->nelts; j++)
{
svn_sort__item_t elt = APR_ARRAY_IDX(sorted2, j, svn_sort__item_t);
- apr_hash_set(*mergeinfo, elt.key, elt.klen, elt.value);
+ apr_hash_set(mergeinfo, elt.key, elt.klen, elt.value);
}
return SVN_NO_ERROR;
@@ -1217,6 +1217,5 @@
{
svn_merge_range_t *new_range = apr_palloc(pool, sizeof(*new_range));
memcpy(new_range, range, sizeof(*new_range));
- new_range->inheritable = range->inheritable;
return new_range;
}
diff --git a/subversion/libsvn_wc/props.c b/subversion/libsvn_wc/props.c
index 6a7f55c..55d489d 100644
--- a/subversion/libsvn_wc/props.c
+++ b/subversion/libsvn_wc/props.c
@@ -1028,7 +1028,7 @@
apr_hash_t *mergeinfo1, *mergeinfo2;
SVN_ERR(svn_mergeinfo_parse(&mergeinfo1, prop_val1->data, pool));
SVN_ERR(svn_mergeinfo_parse(&mergeinfo2, prop_val2->data, pool));
- SVN_ERR(svn_mergeinfo_merge(&mergeinfo1, mergeinfo2,
+ SVN_ERR(svn_mergeinfo_merge(mergeinfo1, mergeinfo2,
svn_rangelist_equal_inheritance, pool));
SVN_ERR(svn_mergeinfo__to_string((svn_string_t **) output,
mergeinfo1, pool));
@@ -1052,14 +1052,14 @@
working_prop_val, pool));
SVN_ERR(diff_mergeinfo_props(&r_deleted, &r_added, from_prop_val,
to_prop_val, pool));
- SVN_ERR(svn_mergeinfo_merge(&l_deleted, r_deleted,
+ SVN_ERR(svn_mergeinfo_merge(l_deleted, r_deleted,
svn_rangelist_equal_inheritance, pool));
- SVN_ERR(svn_mergeinfo_merge(&l_added, r_added,
+ SVN_ERR(svn_mergeinfo_merge(l_added, r_added,
svn_rangelist_equal_inheritance, pool));
/* Apply the combined deltas to the base. */
SVN_ERR(svn_mergeinfo_parse(&from_mergeinfo, from_prop_val->data, pool));
- SVN_ERR(svn_mergeinfo_merge(&from_mergeinfo, l_added,
+ SVN_ERR(svn_mergeinfo_merge(from_mergeinfo, l_added,
svn_rangelist_equal_inheritance, pool));
SVN_ERR(svn_mergeinfo_remove(&from_mergeinfo, l_deleted,
from_mergeinfo, pool));
diff --git a/subversion/mod_dav_svn/repos.c b/subversion/mod_dav_svn/repos.c
index 3845c8d..3b67809 100644
--- a/subversion/mod_dav_svn/repos.c
+++ b/subversion/mod_dav_svn/repos.c
@@ -41,7 +41,6 @@
#include "svn_props.h"
#include "mod_dav_svn.h"
#include "svn_ra.h" /* for SVN_RA_CAPABILITY_* */
-#include "private/svn_repos_private.h"
#include "dav_svn.h"
@@ -1434,6 +1433,31 @@
static const char *capability_yes = "yes";
static const char *capability_no = "no";
+/* Convert CAPABILITIES, a hash table mapping 'const char *' keys to
+ * "yes" or "no" values, to a list of all keys whose value is "yes".
+ * Return the list, allocated in POOL, and use POOL for all temporary
+ * allocation.
+ */
+static apr_array_header_t *
+capabilities_as_list(apr_hash_t *capabilities, apr_pool_t *pool)
+{
+ apr_array_header_t *list = apr_array_make(pool, apr_hash_count(capabilities),
+ sizeof(char *));
+ apr_hash_index_t *hi;
+
+ for (hi = apr_hash_first(pool, capabilities); hi; hi = apr_hash_next(hi))
+ {
+ const void *key;
+ void *val;
+ apr_hash_this(hi, &key, NULL, &val);
+ if (strcmp((const char *) val, "yes") == 0)
+ APR_ARRAY_PUSH(list, const char *) = key;
+ }
+
+ return list;
+}
+
+
static dav_error *
get_resource(request_rec *r,
const char *root_path,
@@ -1632,13 +1656,13 @@
APR_HASH_KEY_STRING, capability_no);
/* Then see what we can find. */
- val = apr_table_get(r->headers_in, "X-SVN-Capabilities");
+ val = apr_table_get(r->headers_in, "DAV");
if (val)
{
apr_array_header_t *vals
= svn_cstring_split(val, ",", TRUE, r->pool);
- if (svn_cstring_match_glob_list(SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO,
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_MERGEINFO,
vals))
{
apr_hash_set(repos->capabilities, SVN_RA_CAPABILITY_MERGEINFO,
@@ -1673,9 +1697,16 @@
/* Store the capabilities of the current connection, making sure
to use the same pool repos->repos itself was created in. */
- svn_repos__set_capabilities
- (repos->repos, svn_repos__capabilities_as_list(repos->capabilities,
- r->connection->pool));
+ serr = svn_repos_remember_client_capabilities
+ (repos->repos, capabilities_as_list(repos->capabilities,
+ r->connection->pool));
+ if (serr != NULL)
+ {
+ return dav_svn__sanitize_error(serr,
+ "Error storing client capabilities "
+ "in repos object",
+ HTTP_INTERNAL_SERVER_ERROR, r);
+ }
}
/* cache the filesystem object */
diff --git a/subversion/mod_dav_svn/version.c b/subversion/mod_dav_svn/version.c
index 43bbcab..3b664c1 100644
--- a/subversion/mod_dav_svn/version.c
+++ b/subversion/mod_dav_svn/version.c
@@ -133,9 +133,9 @@
"version-control,checkout,working-resource");
apr_text_append(p, phdr,
"merge,baseline,activity,version-controlled-collection");
- apr_text_append(p, phdr, SVN_DAV_PROP_NS_DAV_SVN_MERGEINFO);
- apr_text_append(p, phdr, SVN_DAV_PROP_NS_DAV_SVN_DEPTH);
- apr_text_append(p, phdr, SVN_DAV_PROP_NS_DAV_SVN_LOG_REVPROPS);
+ apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_MERGEINFO);
+ apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_DEPTH);
+ apr_text_append(p, phdr, SVN_DAV_NS_DAV_SVN_LOG_REVPROPS);
/* ### fork-control? */
}
diff --git a/subversion/po/es.po b/subversion/po/es.po
index 95ddc11..9705d4f 100644
--- a/subversion/po/es.po
+++ b/subversion/po/es.po
@@ -40,7 +40,7 @@
msgstr ""
"Project-Id-Version: subversion 1.5\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-11-04 22:25-0300\n"
+"POT-Creation-Date: 2007-11-11 04:43-0300\n"
"PO-Revision-Date: 2007-11-05 00:17-0300\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Spanish <dev@subversion.tigris.org>\n"
@@ -49,1052 +49,1045 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: include/svn_error_codes.h:154
+#: ../include/svn_error_codes.h:154
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "'Pool' padre pasado a svn_make_pool() inválido"
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:158
msgid "Bogus filename"
msgstr "Nombre de archivo sin sentido"
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:162
msgid "Bogus URL"
msgstr "URL sin sentido"
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:166
msgid "Bogus date"
msgstr "(Fecha sin sentido)"
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:170
msgid "Bogus mime-type"
msgstr "Tipo-mime sin sentido"
-#: include/svn_error_codes.h:180
+#: ../include/svn_error_codes.h:180
msgid "Wrong or unexpected property value"
msgstr "Valor de propiedad erróneo o inesperado"
-#: include/svn_error_codes.h:184
+#: ../include/svn_error_codes.h:184
msgid "Version file format not correct"
msgstr "Formato del archivo de versión incorrecto"
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:190
msgid "No such XML tag attribute"
msgstr "No existe tal atributo de etiqueta XML"
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:194
msgid "<delta-pkg> is missing ancestry"
msgstr "A <delta-pkg> le falta información de ancestros"
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:198
msgid "Unrecognized binary data encoding; can't decode"
msgstr ""
"Codificación binaria de los datos no reconocida; no se puede decodificar"
-#: include/svn_error_codes.h:202
+#: ../include/svn_error_codes.h:202
msgid "XML data was not well-formed"
msgstr "Los datos XML no están bien formados"
-#: include/svn_error_codes.h:206
+#: ../include/svn_error_codes.h:206
msgid "Data cannot be safely XML-escaped"
msgstr "Los datos no pueden ser protegidos 'a la XML' en forma segura"
-#: include/svn_error_codes.h:212
+#: ../include/svn_error_codes.h:212
msgid "Inconsistent line ending style"
msgstr "Estilo de finales de línea inconsistente"
-#: include/svn_error_codes.h:216
+#: ../include/svn_error_codes.h:216
msgid "Unrecognized line ending style"
msgstr "Estilo de finales de línea no reconocido"
-#: include/svn_error_codes.h:221
+#: ../include/svn_error_codes.h:221
msgid "Line endings other than expected"
msgstr "Los finales de línea no son los esperados"
-#: include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:225
msgid "Ran out of unique names"
msgstr "Se acabaron los nombres únicos"
-#: include/svn_error_codes.h:230
+#: ../include/svn_error_codes.h:230
msgid "Framing error in pipe protocol"
msgstr "Error de enmarcado en protocolo de pipe"
-#: include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:235
msgid "Read error in pipe"
msgstr "Error de lectura en pipe"
-#: include/svn_error_codes.h:239 libsvn_subr/cmdline.c:308
-#: libsvn_subr/cmdline.c:325 svn/util.c:885
+#: ../include/svn_error_codes.h:239 ../libsvn_subr/cmdline.c:308
+#: ../libsvn_subr/cmdline.c:325 ../svn/util.c:885
#, c-format
msgid "Write error"
msgstr "Error de escritura"
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:245
msgid "Unexpected EOF on stream"
msgstr "Final de archivo inesperado"
-#: include/svn_error_codes.h:249
+#: ../include/svn_error_codes.h:249
msgid "Malformed stream data"
msgstr "Datos de flujo malformados"
-#: include/svn_error_codes.h:253
+#: ../include/svn_error_codes.h:253
msgid "Unrecognized stream data"
msgstr "Datos del flujo no reconocidos"
-#: include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:259
msgid "Unknown svn_node_kind"
msgstr "svn_node_kind desconocido"
-#: include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:263
msgid "Unexpected node kind found"
msgstr "Se encontró un tipo de nodo inesperado"
-#: include/svn_error_codes.h:269
+#: ../include/svn_error_codes.h:269
msgid "Can't find an entry"
msgstr "No se pudo encontrar una entrada"
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:275
msgid "Entry already exists"
msgstr "La entrada ya existe"
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:279
msgid "Entry has no revision"
msgstr "La entrada no tiene revisión"
-#: include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:283
msgid "Entry has no URL"
msgstr "La entrada no tiene URL"
-#: include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:287
msgid "Entry has an invalid attribute"
msgstr "La entrada tiene un atributo inválido"
-#: include/svn_error_codes.h:293
+#: ../include/svn_error_codes.h:293
msgid "Obstructed update"
msgstr "Actualización obstruida"
-#: include/svn_error_codes.h:298
+#: ../include/svn_error_codes.h:298
msgid "Mismatch popping the WC unwind stack"
msgstr ""
"Discordancia al obtener el último elemento de la pila de la copia de trabajo"
-#: include/svn_error_codes.h:303
+#: ../include/svn_error_codes.h:303
msgid "Attempt to pop empty WC unwind stack"
msgstr ""
"Intento de obtener el último elemento una pila vacía en la copia de trabajo"
-#: include/svn_error_codes.h:308
+#: ../include/svn_error_codes.h:308
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Intento de desbloquear con una pila no vacía"
-#: include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:312
msgid "Attempted to lock an already-locked dir"
msgstr "Se intentó poner un lock en un directorio que ya tiene uno"
-#: include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:316
msgid "Working copy not locked; this is probably a bug, please report"
msgstr ""
"Copia de trabajo no bloqueada; esto es probablemente un bug, por favor "
"comuníquelo"
-#: include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:321
msgid "Invalid lock"
msgstr "Lock inválido"
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:325
msgid "Path is not a working copy directory"
msgstr "La ruta no es un directorio con una copia de trabajo"
-#: include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:329
msgid "Path is not a working copy file"
msgstr "La ruta no es un archivo de una copia de trabajo"
-#: include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:333
msgid "Problem running log"
msgstr "Problema ejecutando log"
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:337
msgid "Can't find a working copy path"
msgstr "No se encontró una ruta con una copia de trabajo"
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:341
msgid "Working copy is not up-to-date"
msgstr "La copia de trabajo no está al día"
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:345
msgid "Left locally modified or unversioned files"
msgstr "Se dejaron archivos localmente modificados o no versionados"
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:349
msgid "Unmergeable scheduling requested on an entry"
msgstr "Se solicitó en una entrada un 'agendado' no fusionable"
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:353
msgid "Found a working copy path"
msgstr "Se encontró una ruta con una copia de trabajo"
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:357
msgid "A conflict in the working copy obstructs the current operation"
msgstr "Un conflicto en la copia de trabajo obstruye la operación actual"
-#: include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:361
msgid "Working copy is corrupt"
msgstr "La copia de trabajo está corrupta"
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:365
msgid "Working copy text base is corrupt"
msgstr "Un archivo base de la copia de trabajo está corrupto"
-#: include/svn_error_codes.h:369
+#: ../include/svn_error_codes.h:369
msgid "Cannot change node kind"
msgstr "No se pudo cambiar el tipo de nodo"
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:373
msgid "Invalid operation on the current working directory"
msgstr "Operación inválida en el directorio de trabajo actual"
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:377
msgid "Problem on first log entry in a working copy"
msgstr "Problema con la primera entrada de log en la copia de trabajo"
-#: include/svn_error_codes.h:381
+#: ../include/svn_error_codes.h:381
msgid "Unsupported working copy format"
msgstr "Formato de copia de trabajo no admitido"
-#: include/svn_error_codes.h:385
+#: ../include/svn_error_codes.h:385
msgid "Path syntax not supported in this context"
msgstr "Sintaxis de la ruta no admitida en este contexto"
-#: include/svn_error_codes.h:390
+#: ../include/svn_error_codes.h:390
msgid "Invalid schedule"
msgstr "Agendado inválido"
-#: include/svn_error_codes.h:395
+#: ../include/svn_error_codes.h:395
msgid "Invalid relocation"
msgstr "Reubicación inválida"
-#: include/svn_error_codes.h:400
+#: ../include/svn_error_codes.h:400
msgid "Invalid switch"
msgstr "Conmutado (switch) inválido"
-#: include/svn_error_codes.h:405
+#: ../include/svn_error_codes.h:405
msgid "Changelist doesn't match"
msgstr "La lista de cambios no coincide"
-#: include/svn_error_codes.h:410
+#: ../include/svn_error_codes.h:410
msgid "Conflict resolution failed"
msgstr "Falló la resolución del conflicto"
-#: include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:414
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "No se pudo encontrar la ruta 'copyfrom' en la copia de trabajo"
-#: include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:419
msgid "Moving a path from one changelist to another"
msgstr "Moviendo una ruta de una lista de cambios a otra"
-#: include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:426
msgid "General filesystem error"
msgstr "Error general del sistema de archivos"
-#: include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:430
msgid "Error closing filesystem"
msgstr "Error cerrando el sistema de archivos"
-#: include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:434
msgid "Filesystem is already open"
msgstr "El sistema de archivos ya está abierto"
-#: include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:438
msgid "Filesystem is not open"
msgstr "El sistema de archivos no está abierto"
-#: include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:442
msgid "Filesystem is corrupt"
msgstr "El sistema de archivos está corrupto"
-#: include/svn_error_codes.h:446
+#: ../include/svn_error_codes.h:446
msgid "Invalid filesystem path syntax"
msgstr "Sintaxis de ruta de sistema de archivos inválida"
-#: include/svn_error_codes.h:450
+#: ../include/svn_error_codes.h:450
msgid "Invalid filesystem revision number"
msgstr "Número de revisión del sistema de archivos inválido"
-#: include/svn_error_codes.h:454
+#: ../include/svn_error_codes.h:454
msgid "Invalid filesystem transaction name"
msgstr "Nombre de transacción del sistema de archivos inválido"
-#: include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:458
msgid "Filesystem directory has no such entry"
msgstr "El directorio del sistema de archivos no tiene esa entrada"
-#: include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:462
msgid "Filesystem has no such representation"
msgstr "El sistema de archivos no tiene esa representación"
-#: include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:466
msgid "Filesystem has no such string"
msgstr "El sistema de archivos no tiene esa cadena"
-#: include/svn_error_codes.h:470
+#: ../include/svn_error_codes.h:470
msgid "Filesystem has no such copy"
msgstr "El sistema de archivos no tiene esa copia"
-#: include/svn_error_codes.h:474
+#: ../include/svn_error_codes.h:474
msgid "The specified transaction is not mutable"
msgstr "La transacción especificada no es mutable"
-#: include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:478
msgid "Filesystem has no item"
msgstr "El sistema de archivos no tiene el ítem"
-#: include/svn_error_codes.h:482
+#: ../include/svn_error_codes.h:482
msgid "Filesystem has no such node-rev-id"
msgstr "El sistema de archivos no tiene ese node-rev-id"
-#: include/svn_error_codes.h:486
+#: ../include/svn_error_codes.h:486
msgid "String does not represent a node or node-rev-id"
msgstr "La cadena no representa un nodo o un node-rev-id"
-#: include/svn_error_codes.h:490
+#: ../include/svn_error_codes.h:490
msgid "Name does not refer to a filesystem directory"
msgstr "El nombre no refiere un directorio con un sistema de archivos"
-#: include/svn_error_codes.h:494
+#: ../include/svn_error_codes.h:494
msgid "Name does not refer to a filesystem file"
msgstr "El nombre no se refiere a un archivo del sistema de archivos"
-#: include/svn_error_codes.h:498
+#: ../include/svn_error_codes.h:498
msgid "Name is not a single path component"
msgstr "El nombre no es una ruta de un solo componente"
-#: include/svn_error_codes.h:502
+#: ../include/svn_error_codes.h:502
msgid "Attempt to change immutable filesystem node"
msgstr "Se intentó cambiar un nodo inmutable del sistema de archivos"
-#: include/svn_error_codes.h:506
+#: ../include/svn_error_codes.h:506
msgid "Item already exists in filesystem"
msgstr "El ítem ya existe en el sistema de archivos"
-#: include/svn_error_codes.h:510
+#: ../include/svn_error_codes.h:510
msgid "Attempt to remove or recreate fs root dir"
msgstr ""
"Intento de eliminar o recrear el directorio raíz del sistema de archivos"
-#: include/svn_error_codes.h:514
+#: ../include/svn_error_codes.h:514
msgid "Object is not a transaction root"
msgstr "El objeto no es una raíz de transacción"
-#: include/svn_error_codes.h:518
+#: ../include/svn_error_codes.h:518
msgid "Object is not a revision root"
msgstr "El objeto no es una raíz de revisión"
-#: include/svn_error_codes.h:522
+#: ../include/svn_error_codes.h:522
msgid "Merge conflict during commit"
msgstr "Conflicto en la fusión durante un commit"
-#: include/svn_error_codes.h:526
+#: ../include/svn_error_codes.h:526
msgid "A representation vanished or changed between reads"
msgstr "Una representación desapareció o cambió entre lecturas"
-#: include/svn_error_codes.h:530
+#: ../include/svn_error_codes.h:530
msgid "Tried to change an immutable representation"
msgstr "Se intentó cambiar una representación inmutable"
-#: include/svn_error_codes.h:534
+#: ../include/svn_error_codes.h:534
msgid "Malformed skeleton data"
msgstr "Datos esqueleto malformados"
-#: include/svn_error_codes.h:538
+#: ../include/svn_error_codes.h:538
msgid "Transaction is out of date"
msgstr "La transacción está obsoleta"
-#: include/svn_error_codes.h:542
+#: ../include/svn_error_codes.h:542
msgid "Berkeley DB error"
msgstr "Error de la base Berkeley"
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:546
msgid "Berkeley DB deadlock error"
msgstr "Error de 'deadlock' en Berkeley DB"
-#: include/svn_error_codes.h:550
+#: ../include/svn_error_codes.h:550
msgid "Transaction is dead"
msgstr "La transacción está muerta"
-#: include/svn_error_codes.h:554
+#: ../include/svn_error_codes.h:554
msgid "Transaction is not dead"
msgstr "La transacción no está muerta"
-#: include/svn_error_codes.h:559
+#: ../include/svn_error_codes.h:559
msgid "Unknown FS type"
msgstr "Tipo de sistema de archivos desconocido"
-#: include/svn_error_codes.h:564
+#: ../include/svn_error_codes.h:564
msgid "No user associated with filesystem"
msgstr "No hay un usuario asociado con el sistema de archivos"
-#: include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:569
msgid "Path is already locked"
msgstr "La ruta ya está bloqueada"
-#: include/svn_error_codes.h:574 include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:574 ../include/svn_error_codes.h:721
msgid "Path is not locked"
msgstr "La ruta no está bloqueada"
-#: include/svn_error_codes.h:579
+#: ../include/svn_error_codes.h:579
msgid "Lock token is incorrect"
msgstr "El token de bloqueo es incorrecto"
-#: include/svn_error_codes.h:584
+#: ../include/svn_error_codes.h:584
msgid "No lock token provided"
msgstr "No se proveyó un token de bloqueo"
-#: include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:589
msgid "Username does not match lock owner"
msgstr "El nombre de usuario no coincide con el dueño del bloqueo"
-#: include/svn_error_codes.h:594
+#: ../include/svn_error_codes.h:594
msgid "Filesystem has no such lock"
msgstr "El sistema de archivos no tiene ese bloqueo"
-#: include/svn_error_codes.h:599
+#: ../include/svn_error_codes.h:599
msgid "Lock has expired"
msgstr "El bloqueo expiró"
-#: include/svn_error_codes.h:604 include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:604 ../include/svn_error_codes.h:708
msgid "Item is out of date"
msgstr "El ítem está desactualizado"
-#: include/svn_error_codes.h:616
+#: ../include/svn_error_codes.h:616
msgid "Unsupported FS format"
msgstr "Formato de FS no edmitido"
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:621
msgid "Representation is being written"
msgstr "La representación se está escribiendo"
-#: include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:626
msgid "The generated transaction name is too long"
msgstr "El nombre de transacción generado es demasiado largo"
-#: include/svn_error_codes.h:631
+#: ../include/svn_error_codes.h:631
msgid "SQLite error"
msgstr "Error de SQLite"
-#: include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:636
+msgid "Filesystem has no such node origin record"
+msgstr "El sistema de archivos no tiene ese registro de nodo origen"
+
+#: ../include/svn_error_codes.h:642
msgid "The repository is locked, perhaps for db recovery"
msgstr "El repositorio tiene un lock, quizá se está recuperando la bd"
-#: include/svn_error_codes.h:641
+#: ../include/svn_error_codes.h:646
msgid "A repository hook failed"
msgstr "Un 'hook' del repositorio falló"
-#: include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:650
msgid "Incorrect arguments supplied"
msgstr "Se proveyeron parámetros incorrectos"
-#: include/svn_error_codes.h:649
+#: ../include/svn_error_codes.h:654
msgid "A report cannot be generated because no data was supplied"
msgstr "No se puede generar un reporte porque no se suministraron datos"
-#: include/svn_error_codes.h:653
+#: ../include/svn_error_codes.h:658
msgid "Bogus revision report"
msgstr "Reporte sin sentido de revisión"
-#: include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
msgid "Unsupported repository version"
msgstr "Versión de repositorio no admitida"
-#: include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:671
msgid "Disabled repository feature"
msgstr "Característica del repositorio desactivada"
-#: include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:675
msgid "Error running post-commit hook"
msgstr "Error ejecutando 'hook' post-commit"
-#: include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:680
msgid "Error running post-lock hook"
msgstr "Error ejecutando 'hook' post-lock"
-#: include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:685
msgid "Error running post-unlock hook"
msgstr "Error ejecutando 'hook' post-unlock"
-#: include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:692
msgid "Bad URL passed to RA layer"
msgstr "Mal URL pasado a la capa RA"
-#: include/svn_error_codes.h:691
+#: ../include/svn_error_codes.h:696
msgid "Authorization failed"
msgstr "falló la autorización"
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:700
msgid "Unknown authorization method"
msgstr "Método de autorización desconocido"
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:704
msgid "Repository access method not implemented"
msgstr "Método de acceso al repositorio no implementado"
-#: include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:712
msgid "Repository has no UUID"
msgstr "El repositorio no tiene UUID"
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:716
msgid "Unsupported RA plugin ABI version"
msgstr "Versión de ABI no admitida para el módulo de acceso a repositorio"
-#: include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:726
msgid "Inquiry about unknown capability"
msgstr "Pregunta acerca de una capacidad desconcida"
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:732
msgid "RA layer failed to init socket layer"
msgstr "La capa RA no pudo inicializar la capa de socket"
-#: include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:736
msgid "RA layer failed to create HTTP request"
msgstr "La capa RA no pudo crear el requerimiento HTTP"
-#: include/svn_error_codes.h:735
+#: ../include/svn_error_codes.h:740
msgid "RA layer request failed"
msgstr "Falló un requerimiento a la capa RA"
-#: include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:744
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "La capa RA no recibió la información OPTIONS pedida"
-#: include/svn_error_codes.h:743
+#: ../include/svn_error_codes.h:748
msgid "RA layer failed to fetch properties"
msgstr "La capa RA no pudo obtener propiedades"
-#: include/svn_error_codes.h:747
+#: ../include/svn_error_codes.h:752
msgid "RA layer file already exists"
msgstr "El archivo de capa RA ya existe"
-#: include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:756
msgid "Invalid configuration value"
msgstr "Valor de configuración inválido"
-#: include/svn_error_codes.h:755
+#: ../include/svn_error_codes.h:760
msgid "HTTP Path Not Found"
msgstr "Ruta HTTP no encontrada"
-#: include/svn_error_codes.h:759
+#: ../include/svn_error_codes.h:764
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Falló la ejecución de PROPPATCH de WebDAV"
-#: include/svn_error_codes.h:764 include/svn_error_codes.h:805
-#: libsvn_ra_svn/marshal.c:640 libsvn_ra_svn/marshal.c:758
-#: libsvn_ra_svn/marshal.c:785
+#: ../include/svn_error_codes.h:769 ../include/svn_error_codes.h:810
+#: ../libsvn_ra_svn/marshal.c:640 ../libsvn_ra_svn/marshal.c:758
+#: ../libsvn_ra_svn/marshal.c:785
msgid "Malformed network data"
msgstr "Datos de red malformados"
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:774
msgid "Unable to extract data from response header"
msgstr "No se pudo extraer datos de una cabecera de la respuesta"
-#: include/svn_error_codes.h:774
+#: ../include/svn_error_codes.h:779
msgid "Repository has been moved"
msgstr "El repositorio ha sido movido"
-#: include/svn_error_codes.h:780 include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:785 ../include/svn_error_codes.h:814
msgid "Couldn't find a repository"
msgstr "No se pudo encontrar un repositorio"
-#: include/svn_error_codes.h:784
+#: ../include/svn_error_codes.h:789
msgid "Couldn't open a repository"
msgstr "No se pudo abrir un repositorio"
-#: include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:794
msgid "Special code for wrapping server errors to report to client"
msgstr ""
"Código especial para envolver errores del servidor al reportarlos al cliente"
-#: include/svn_error_codes.h:793
+#: ../include/svn_error_codes.h:798
msgid "Unknown svn protocol command"
msgstr "Comando de protocolo svn desconocido"
-#: include/svn_error_codes.h:797
+#: ../include/svn_error_codes.h:802
msgid "Network connection closed unexpectedly"
msgstr "La conexión de red se cerró inesperadamente"
-#: include/svn_error_codes.h:801
+#: ../include/svn_error_codes.h:806
msgid "Network read/write error"
msgstr "Error de lectura/escritura de red"
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:818
msgid "Client/server version mismatch"
msgstr "No coinciden las versiones del cliente y servidor"
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:823
msgid "Cannot negotiate authentication mechanism"
msgstr "No se pudo negociar un mecanismo de autentificación"
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:832
msgid "Credential data unavailable"
msgstr "Credenciales no disponibles"
-#: include/svn_error_codes.h:831
+#: ../include/svn_error_codes.h:836
msgid "No authentication provider available"
msgstr "No hay proveedores de autentificación disponibles"
-#: include/svn_error_codes.h:835 include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:840 ../include/svn_error_codes.h:844
msgid "All authentication providers exhausted"
msgstr "Se agotaron los proveedores de autentificación"
-#: include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:849
msgid "Authentication failed"
msgstr "Falló la autentificación"
-#: include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:855
msgid "Read access denied for root of edit"
msgstr "Acceso de lectura denegado para la raíz de la edición"
-#: include/svn_error_codes.h:855
+#: ../include/svn_error_codes.h:860
msgid "Item is not readable"
msgstr "El ítem no es legible"
-#: include/svn_error_codes.h:860
+#: ../include/svn_error_codes.h:865
msgid "Item is partially readable"
msgstr "El ítem es legible parcialmente"
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:869
msgid "Invalid authz configuration"
msgstr "Valor de configuración del subsistema 'authz' inválido"
-#: include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:874
msgid "Item is not writable"
msgstr "El ítem no es escribible"
-#: include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:880
msgid "Svndiff data has invalid header"
msgstr "Los datos svndiff tienen una cabecera inválida"
-#: include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:884
msgid "Svndiff data contains corrupt window"
msgstr "Los datos svndiff tienen una ventana corrupta"
-#: include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:888
msgid "Svndiff data contains backward-sliding source view"
msgstr ""
"Los datos de svndiff contienen una vista fuente que se desliza en reversa "
"(backward-sliding source view)"
-#: include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:892
msgid "Svndiff data contains invalid instruction"
msgstr "Los datos svndiff tienen una instrucción inválida"
-#: include/svn_error_codes.h:891
+#: ../include/svn_error_codes.h:896
msgid "Svndiff data ends unexpectedly"
msgstr "Los datos svndiff terminan inesperadamente"
-#: include/svn_error_codes.h:895
+#: ../include/svn_error_codes.h:900
msgid "Svndiff compressed data is invalid"
msgstr "Los datos svndiff comprimidos son inválidos"
-#: include/svn_error_codes.h:901
+#: ../include/svn_error_codes.h:906
msgid "Diff data source modified unexpectedly"
msgstr "La fuente de datos diff se modificó inesperadamente"
-#: include/svn_error_codes.h:907
+#: ../include/svn_error_codes.h:912
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache no tiene la ruta a un sistema de archivos SVN"
-#: include/svn_error_codes.h:911
+#: ../include/svn_error_codes.h:916
msgid "Apache got a malformed URI"
msgstr "Apache obtuvo un URI malformado"
-#: include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:920
msgid "Activity not found"
msgstr "No se encontró la actividad"
-#: include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:924
msgid "Baseline incorrect"
msgstr "Linea base incorrecta"
-#: include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:928
msgid "Input/output error"
msgstr "Error de entrada/salida"
-#: include/svn_error_codes.h:929
+#: ../include/svn_error_codes.h:934
msgid "A path under version control is needed for this operation"
msgstr "Para esta operación se necesita una ruta bajo control de revisiones"
-#: include/svn_error_codes.h:933
+#: ../include/svn_error_codes.h:938
msgid "Repository access is needed for this operation"
msgstr "Para esta operación se necesita acceso al repositorio"
-#: include/svn_error_codes.h:937
+#: ../include/svn_error_codes.h:942
msgid "Bogus revision information given"
msgstr "Fue dada información de revisión sin sentido"
-#: include/svn_error_codes.h:941
+#: ../include/svn_error_codes.h:946
msgid "Attempting to commit to a URL more than once"
msgstr "Intento de hacer commit en un URL más de una vez"
-#: include/svn_error_codes.h:945
+#: ../include/svn_error_codes.h:950
msgid "Operation does not apply to binary file"
msgstr "La operación no se aplica a un archivo binario"
-#: include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:956
msgid "Format of an svn:externals property was invalid"
msgstr "El formato de la propiedad svn:externals es inválido"
-#: include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:960
msgid "Attempting restricted operation for modified resource"
msgstr "Intentando operación restringida para un recurso modificado"
-#: include/svn_error_codes.h:959
+#: ../include/svn_error_codes.h:964
msgid "Operation does not apply to directory"
msgstr "La operación no se aplica a un directorio"
-#: include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:968
msgid "Revision range is not allowed"
msgstr "No se permite el rango de revisiones"
-#: include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:972
msgid "Inter-repository relocation not allowed"
msgstr "No se permite una reubicación inter-repositorio"
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:976
msgid "Author name cannot contain a newline"
msgstr "El nombre del autor no puede contener un fin de línea"
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:980
msgid "Bad property name"
msgstr "Nombre de propiedad inaceptable"
-#: include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:985
msgid "Two versioned resources are unrelated"
msgstr "Dos recursos versionados no están relacionados"
-#: include/svn_error_codes.h:985
+#: ../include/svn_error_codes.h:990
msgid "Path has no lock token"
msgstr "La ruta no tiene token de bloqueo"
-#: include/svn_error_codes.h:990
+#: ../include/svn_error_codes.h:995
msgid "Operation does not support multiple sources"
msgstr "La operación no admite múltiples fuentes"
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1000
msgid "No versioned parent directories"
msgstr "No hay directorios padre versionados"
-#: include/svn_error_codes.h:1001
+#: ../include/svn_error_codes.h:1006
msgid "A problem occurred; see later errors for details"
msgstr "Hubo un problema; para más detalles vea los errores a continuación"
-#: include/svn_error_codes.h:1005
+#: ../include/svn_error_codes.h:1010
msgid "Failure loading plugin"
msgstr "Falló la carga del aplique"
-#: include/svn_error_codes.h:1009
+#: ../include/svn_error_codes.h:1014
msgid "Malformed file"
msgstr "Archivo malformado"
-#: include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1018
msgid "Incomplete data"
msgstr "Datos incompletos"
-#: include/svn_error_codes.h:1017
+#: ../include/svn_error_codes.h:1022
msgid "Incorrect parameters given"
msgstr "Se dieron parámetros incorrectos"
-#: include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1026
msgid "Tried a versioning operation on an unversioned resource"
msgstr "Se intentó una operación de versiones en un recurso no versionado"
-#: include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1030
msgid "Test failed"
msgstr "Falló la prueba"
-#: include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1034
msgid "Trying to use an unsupported feature"
msgstr "Intentando usar una característica no admitida"
-#: include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1038
msgid "Unexpected or unknown property kind"
msgstr "Tipo de propiedad no esperado o desconocido"
-#: include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1042
msgid "Illegal target for the requested operation"
msgstr "Objetivo ilegal para la operación pedida"
-#: include/svn_error_codes.h:1041
+#: ../include/svn_error_codes.h:1046
msgid "MD5 checksum is missing"
msgstr "Falta la suma de verificación MD5"
-#: include/svn_error_codes.h:1045
+#: ../include/svn_error_codes.h:1050
msgid "Directory needs to be empty but is not"
msgstr "El directorio debería estar vacío pero no lo está"
-#: include/svn_error_codes.h:1049
+#: ../include/svn_error_codes.h:1054
msgid "Error calling external program"
msgstr "Error invocando programa externo"
-#: include/svn_error_codes.h:1053
+#: ../include/svn_error_codes.h:1058
msgid "Python exception has been set with the error"
msgstr "Se estableció una excepción Python con el error"
-#: include/svn_error_codes.h:1057
+#: ../include/svn_error_codes.h:1062
msgid "A checksum mismatch occurred"
msgstr "La suma de verificación no coincide"
-#: include/svn_error_codes.h:1061
+#: ../include/svn_error_codes.h:1066
msgid "The operation was interrupted"
msgstr "La operación fue interrumpida"
-#: include/svn_error_codes.h:1065
+#: ../include/svn_error_codes.h:1070
msgid "The specified diff option is not supported"
msgstr "No se soporta la opción de diff especificada"
-#: include/svn_error_codes.h:1069
+#: ../include/svn_error_codes.h:1074
msgid "Property not found"
msgstr "Propiedad no encontrada"
-#: include/svn_error_codes.h:1073
+#: ../include/svn_error_codes.h:1078
msgid "No auth file path available"
msgstr "Ruta de archivo de autentificación no disponible"
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1083
msgid "Incompatible library version"
msgstr "Versión de biblioteca incompatible"
-#: include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1088
msgid "Merge info parse error"
msgstr "Error interpretando la info de fusión"
-#: include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1093
msgid "Cease invocation of this API"
msgstr "Deje de llamar a esta API"
-#: include/svn_error_codes.h:1093
+#: ../include/svn_error_codes.h:1098
msgid "Error parsing revision number"
msgstr "Error analizando el número de revisión"
-#: include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1103
msgid "Iteration terminated before completion"
msgstr "Interacción terminada antes de que termine"
-#: include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1107
msgid "Unknown changelist"
msgstr "Lista de cambios desconocida"
-#: include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1113
msgid "Error parsing arguments"
msgstr "Error analizando parámetros"
-#: include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1117
msgid "Not enough arguments provided"
msgstr "No se dieron suficientes parámetros"
-#: include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1121
msgid "Mutually exclusive arguments specified"
msgstr "Se especificaron parámetros mutuamente excluyentes"
-#: include/svn_error_codes.h:1120
+#: ../include/svn_error_codes.h:1125
msgid "Attempted command in administrative dir"
msgstr "Se intentó un comando en el directorio administrativo"
-#: include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1129
msgid "The log message file is under version control"
msgstr "El archivo con el mensaje de log está bajo control de versiones"
-#: include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1133
msgid "The log message is a pathname"
msgstr "El mensaje de log es una ruta"
-#: include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1137
msgid "Committing in directory scheduled for addition"
msgstr "Commit en un directorio agendado para ser añadido"
-#: include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1141
msgid "No external editor available"
msgstr "No está disponible un editor externo"
-#: include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1145
msgid "Something is wrong with the log message's contents"
msgstr "Algo está mal con el contenido del mensaje de log"
-#: include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1149
msgid "A log message was given where none was necessary"
msgstr "Se dio un mensaje de log cuando no era necesario"
-#: include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1153
msgid "No external merge tool available"
msgstr "No está disponible una herramienta de fusionado externa"
-#: libsvn_client/add.c:348 libsvn_wc/copy.c:188
+#: ../libsvn_client/add.c:348 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "No se puede cerrar el directorio '%s'"
-#: libsvn_client/add.c:356
+#: ../libsvn_client/add.c:356
#, c-format
msgid "Error during add of '%s'"
msgstr "Error durante la adición de '%s'"
-#: libsvn_client/blame.c:391 libsvn_client/blame.c:1254
+#: ../libsvn_client/blame.c:391
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr ""
"No se puede calcular la información \"blame\" para el archivo binario '%s'"
-#: libsvn_client/blame.c:627
+#: ../libsvn_client/blame.c:621
msgid "blame of the WORKING revision is not supported"
msgstr "La operación 'blame' no está admitida para la revisión WORKING"
-#: libsvn_client/blame.c:641
+#: ../libsvn_client/blame.c:635
msgid "Start revision must precede end revision"
msgstr "La revisión del comienzo debe preceder a la del final"
-#: libsvn_client/blame.c:1081 libsvn_ra/compat.c:175
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "Información changed-path faltante para '%s' en la revisión %ld"
-
-#: libsvn_client/blame.c:1141 libsvn_client/cat.c:206
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "El URL '%s' se refiere a un directorio"
-
-#: libsvn_client/blame.c:1214
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr ""
-"A la acción de revisión '%c' para la revisión %ld de '%s' le falta una "
-"revisión previa"
-
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' se refiere a un directorio"
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:126 ../libsvn_client/export.c:183
msgid "(local)"
msgstr "(local)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:943
+#: ../libsvn_client/cat.c:206
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "El URL '%s' se refiere a un directorio"
+
+#: ../libsvn_client/checkout.c:91 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "El URL '%s' no existe"
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:95
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "El URL '%s' se refiere a un archivo, no a un directorio"
-#: libsvn_client/checkout.c:167
+#: ../libsvn_client/checkout.c:167
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' ya es una copia de trabajo para un URL diferente"
-#: libsvn_client/checkout.c:171
+#: ../libsvn_client/checkout.c:171
msgid "; run 'svn update' to complete it"
msgstr "; ejecute 'svn update' para completarla"
-#: libsvn_client/checkout.c:181
+#: ../libsvn_client/checkout.c:181
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' ya existe y no es un directorio"
-#: libsvn_client/commit.c:433
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "Tipo desconocido o no-versionable para '%s'"
-#: libsvn_client/commit.c:538
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "Se requiere un nuevo nombre de entrada para importar un archivo"
-#: libsvn_client/commit.c:573 libsvn_wc/adm_ops.c:1037
-#: libsvn_wc/questions.c:93
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:1037
+#: ../libsvn_wc/questions.c:93
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: libsvn_client/commit.c:634 libsvn_client/copy.c:536 svnlook/main.c:1264
+#: ../libsvn_client/commit.c:634 ../libsvn_client/copy.c:562
+#: ../svnlook/main.c:1264
#, c-format
msgid "Path '%s' does not exist"
msgstr "La ruta '%s' no existe"
-#: libsvn_client/commit.c:769 libsvn_client/copy.c:545
-#: libsvn_client/copy.c:938 libsvn_client/copy.c:1178
-#: libsvn_client/copy.c:1602
+#: ../libsvn_client/commit.c:769 ../libsvn_client/copy.c:571
+#: ../libsvn_client/copy.c:964 ../libsvn_client/copy.c:1204
+#: ../libsvn_client/copy.c:1626
#, c-format
msgid "Path '%s' already exists"
msgstr "La ruta '%s' ya existe."
-#: libsvn_client/commit.c:784
+#: ../libsvn_client/commit.c:784
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' es un nombre reservado y no se puede importar"
-#: libsvn_client/commit.c:917 libsvn_client/copy.c:1342
+#: ../libsvn_client/commit.c:917 ../libsvn_client/copy.c:1367
msgid "Commit failed (details follow):"
msgstr "Falló el commit (detalles a continuación):"
-#: libsvn_client/commit.c:925
+#: ../libsvn_client/commit.c:925
msgid "Commit succeeded, but other errors follow:"
msgstr "Commit exitoso, pero hubo otros errores:"
-#: libsvn_client/commit.c:932
+#: ../libsvn_client/commit.c:932
msgid "Error unlocking locked dirs (details follow):"
msgstr "Error sacando lock a directorios (detalles a continuación):"
-#: libsvn_client/commit.c:943
+#: ../libsvn_client/commit.c:943
msgid "Error bumping revisions post-commit (details follow):"
msgstr ""
"Error incrementando las revisiones después del commit (detalles a "
"continuación):"
-#: libsvn_client/commit.c:954
+#: ../libsvn_client/commit.c:954
msgid "Error in post-commit clean-up (details follow):"
msgstr "Error en la limpieza post-commit (detalles a continuación):"
-#: libsvn_client/commit.c:1304
+#: ../libsvn_client/commit.c:1304
msgid "Are all the targets part of the same working copy?"
msgstr "¿Son todos los objetivos parte de la misma copia de trabajo?"
-#: libsvn_client/commit.c:1337
+#: ../libsvn_client/commit.c:1337
msgid "Cannot non-recursively commit a directory deletion"
msgstr ""
"No se puede hacer commit no recursivo de una eliminación de un directorio"
-#: libsvn_client/commit.c:1381
+#: ../libsvn_client/commit.c:1381
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' es un URL, pero los URLS no pueden ser objetivos de commit"
-#: libsvn_client/commit_util.c:273 libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:273 ../libsvn_client/commit_util.c:284
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Tipo de entrada desconocido para '%s'"
-#: libsvn_client/commit_util.c:301
+#: ../libsvn_client/commit_util.c:301
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "La entrada '%s' ha cambiado súbitamente a estatus especial"
-#: libsvn_client/commit_util.c:356
+#: ../libsvn_client/commit_util.c:356
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Abortando el commit: '%s' queda en conflicto"
-#: libsvn_client/commit_util.c:423
+#: ../libsvn_client/commit_util.c:423
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "No se esperaba que '%s' sea la raíz de una copia de trabajo"
-#: libsvn_client/commit_util.c:441 libsvn_client/commit_util.c:1120
+#: ../libsvn_client/commit_util.c:441 ../libsvn_client/commit_util.c:1120
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr ""
"El ítem de commit '%s' tiene un flag de copia pero no tiene un URL copyfrom"
-#: libsvn_client/commit_util.c:704
+#: ../libsvn_client/commit_util.c:704
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1103,18 +1096,18 @@
"'%s' no está bajo control de versiones y no es parte del commit, aún así su "
"hijo '%s' es parte del commit"
-#: libsvn_client/commit_util.c:786
+#: ../libsvn_client/commit_util.c:786
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "La entrada para '%s' no tiene URL"
-#: libsvn_client/commit_util.c:819
+#: ../libsvn_client/commit_util.c:819
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr ""
"'%s' está agendado para ser añadido dentro de un directorio no versionado"
-#: libsvn_client/commit_util.c:839
+#: ../libsvn_client/commit_util.c:839
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1125,39 +1118,40 @@
"para adición. ¿Será que se está efectuando un commit en un destino que está\n"
"dentro de un directorio no (o no aún) versionado?"
-#: libsvn_client/commit_util.c:863 svn/changelist-cmd.c:62 svn/diff-cmd.c:135
-#: svn/info-cmd.c:466 svn/lock-cmd.c:101 svn/propdel-cmd.c:72
-#: svn/propget-cmd.c:196 svn/proplist-cmd.c:128 svn/revert-cmd.c:59
-#: svn/status-cmd.c:231 svn/unlock-cmd.c:60 svn/update-cmd.c:60
+#: ../libsvn_client/commit_util.c:863 ../svn/changelist-cmd.c:62
+#: ../svn/diff-cmd.c:204 ../svn/info-cmd.c:466 ../svn/lock-cmd.c:101
+#: ../svn/propdel-cmd.c:72 ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:128
+#: ../svn/revert-cmd.c:59 ../svn/status-cmd.c:231 ../svn/unlock-cmd.c:60
+#: ../svn/update-cmd.c:60
#, c-format
msgid "Unknown changelist '%s'"
msgstr "Lista de cambios desconocida '%s'"
-#: libsvn_client/commit_util.c:976
+#: ../libsvn_client/commit_util.c:976
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"No se puede hacer commit de '%s' y '%s', siendo que refieren al mismo URL"
-#: libsvn_client/commit_util.c:1125
+#: ../libsvn_client/commit_util.c:1125
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr ""
"El ítem de commit '%s' tiene un flag de copia pero una revisión inválida"
-#: libsvn_client/commit_util.c:1884
+#: ../libsvn_client/commit_util.c:1884
msgid "Standard properties can't be set explicitly as revision properties"
msgstr ""
"Las propiedades estándares no pueden asignarse explicitamente como "
"propiedades de revisión"
-#: libsvn_client/copy.c:561 libsvn_client/copy.c:1618
-#: libsvn_client/update.c:143
+#: ../libsvn_client/copy.c:587 ../libsvn_client/copy.c:1642
+#: ../libsvn_client/update.c:143
#, c-format
msgid "Path '%s' is not a directory"
msgstr "La ruta '%s' no es un directorio"
-#: libsvn_client/copy.c:804
+#: ../libsvn_client/copy.c:830
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1166,144 +1160,144 @@
"Origen y destino no parecen estar en el mismo repositorio (orig: '%s'; dest: "
"'%s')"
-#: libsvn_client/copy.c:919
+#: ../libsvn_client/copy.c:945
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "No se puede mover al URL '%s' a sí mismo"
-#: libsvn_client/copy.c:928 libsvn_client/prop_commands.c:228
+#: ../libsvn_client/copy.c:954 ../libsvn_client/prop_commands.c:228
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "La ruta '%s' no existe en la revisión %ld"
-#: libsvn_client/copy.c:1442
+#: ../libsvn_client/copy.c:1466
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"El URL origen '%s' es de un repositorio externo; se lo deja como una copia "
"de trabajo disjunta"
-#: libsvn_client/copy.c:1589
+#: ../libsvn_client/copy.c:1613
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "No se encontró la ruta '%s' en la revisión %ld"
-#: libsvn_client/copy.c:1594
+#: ../libsvn_client/copy.c:1618
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "No se encontró la ruta '%s' en la última revisión"
-#: libsvn_client/copy.c:1644
+#: ../libsvn_client/copy.c:1668
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "La entrada para '%s' ya existe (aunque la copia de trabajo falte)"
-#: libsvn_client/copy.c:1737 libsvn_client/log.c:342
+#: ../libsvn_client/copy.c:1761 ../libsvn_client/log.c:342
msgid "Revision type requires a working copy path, not a URL"
msgstr ""
"El tipo de revisión sólo funciona en rutas de copia de trabajo, no en URLs"
-#: libsvn_client/copy.c:1782
+#: ../libsvn_client/copy.c:1806
msgid "Cannot mix repository and working copy sources"
msgstr "No se pueden mezclar fuentes de repositorio y copia de trabajo"
-#: libsvn_client/copy.c:1825
+#: ../libsvn_client/copy.c:1849
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "No se puede copiar la ruta '%s' a su propio descendiente '%s'"
-#: libsvn_client/copy.c:1845
+#: ../libsvn_client/copy.c:1869
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "No se puede mover la ruta '%s' a sí misma"
-#: libsvn_client/copy.c:1854
+#: ../libsvn_client/copy.c:1878
msgid "Moves between the working copy and the repository are not supported"
msgstr "No se admite el mover entre una copia de trabajo y un repositorio"
-#: libsvn_client/copy.c:1917
+#: ../libsvn_client/copy.c:1941
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "'%s' no tiene un URL asociado"
-#: libsvn_client/copy.c:2284 svn/move-cmd.c:60
+#: ../libsvn_client/copy.c:2317 ../svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"No se puede especificar revisiones (excepto HEAD) en operaciones de mover"
-#: 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' obstaculiza al recurso que sí está bajo control de versiones"
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2914 libsvn_wc/entries.c:1272
-#: libsvn_wc/entries.c:2383 libsvn_wc/entries.c:3005
-#: libsvn_wc/update_editor.c:2350
+#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:2914
+#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
+#: ../libsvn_wc/entries.c:3005 ../libsvn_wc/update_editor.c:2361
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' no está bajo control de versiones"
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' está modificado localmente"
-#: libsvn_client/diff.c:136
+#: ../libsvn_client/diff.c:136
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " Se revirtió %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: ../libsvn_client/diff.c:154
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Se fusionó %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: ../libsvn_client/diff.c:176
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sCambios de propiedades en %s%s"
-#: libsvn_client/diff.c:204
+#: ../libsvn_client/diff.c:204
#, c-format
msgid "Name: %s%s"
msgstr "Nombre: %s%s"
-#: libsvn_client/diff.c:323
+#: ../libsvn_client/diff.c:323
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisión: %ld)"
-#: libsvn_client/diff.c:325
+#: ../libsvn_client/diff.c:325
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copia de trabajo)"
-#: libsvn_client/diff.c:468
+#: ../libsvn_client/diff.c:468
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "No se puede mostrar: el archivo está marcado como binario.%s"
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:1633
+#: ../libsvn_client/diff.c:828 ../libsvn_client/merge.c:1633
msgid "Not all required revisions are specified"
msgstr "No se especificaron todas las revisiones requeridas"
-#: libsvn_client/diff.c:843
+#: ../libsvn_client/diff.c:843
msgid "At least one revision must be non-local for a pegged diff"
msgstr ""
"Al menos una revisión debe ser no-local para un diff de clavija (pegged)"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: ../libsvn_client/diff.c:955 ../libsvn_client/diff.c:967
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' no se encontró en el repositorio en la revisión %ld"
-#: libsvn_client/diff.c:1026
+#: ../libsvn_client/diff.c:1026
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"Lo siento, svn_client_diff4 fue llamado de una manera que todavía no está "
"admitida"
-#: libsvn_client/diff.c:1082
+#: ../libsvn_client/diff.c:1082
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1311,155 +1305,157 @@
"Sólo los diffs entre la base de texto de una ruta y sus archivos de trabajo "
"son admitidos en este momento"
-#: libsvn_client/diff.c:1227 libsvn_client/switch.c:125
+#: ../libsvn_client/diff.c:1227 ../libsvn_client/switch.c:124
#, c-format
msgid "Directory '%s' has no URL"
msgstr "El directorio '%s' no tiene URL"
-#: libsvn_client/diff.c:1437
+#: ../libsvn_client/diff.c:1437
msgid "Summarizing diff can only compare repository to repository"
msgstr "El 'diff' resumido sólo puede comparar dos referencias al repositorio"
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' no es un estilo de fines de línea válido"
-#: libsvn_client/export.c:261
+#: ../libsvn_client/export.c:261
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"El directorio destino ya existe; y no se sobreescribirá a menos que se "
"fuerce la acción"
-#: libsvn_client/export.c:407 libsvn_client/export.c:550
+#: ../libsvn_client/export.c:407 ../libsvn_client/export.c:550
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' existe y no es un directorio"
-#: libsvn_client/export.c:411 libsvn_client/export.c:554
+#: ../libsvn_client/export.c:411 ../libsvn_client/export.c:554
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: libsvn_client/export.c:725 libsvn_wc/adm_crawler.c:1092
-#: libsvn_wc/update_editor.c:2034 libsvn_wc/update_editor.c:2695
+#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
+#: ../libsvn_wc/update_editor.c:2045 ../libsvn_wc/update_editor.c:2711
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr ""
"La suma de verificación no coincide para '%s'; se esperaba: '%s', presente: "
"'%s'"
-#: libsvn_client/externals.c:315
+#: ../libsvn_client/externals.c:315
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "El URL '%s' no tiene el protocolo al principio"
-#: libsvn_client/externals.c:364
+#: ../libsvn_client/externals.c:364
#, c-format
msgid "Illegal parent directory URL '%s'."
msgstr "URL de directorio padre ilegal '%s'"
-#: libsvn_client/externals.c:394
+#: ../libsvn_client/externals.c:394
#, c-format
msgid "Illegal repository root URL '%s'."
msgstr "URL de raíz de repositorio ilegal '%s'"
-#: libsvn_client/externals.c:436
+#: ../libsvn_client/externals.c:436
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'."
msgstr ""
"El URL externo relativo '%s' no puede tener referencias hacia atrás, es "
"decir '..'."
-#: libsvn_client/externals.c:468
+#: ../libsvn_client/externals.c:468
#, c-format
msgid "Unrecognized format for the relative external URL '%s'."
msgstr "Formato no reconocido para URL externo relativo '%s'"
-#: libsvn_client/externals.c:690
+#: ../libsvn_client/externals.c:690
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr ""
-#: libsvn_client/info.c:410
+#: ../libsvn_client/info.c:410
#, c-format
msgid ""
"Server does not support retrieving information about the repository root"
msgstr ""
"El servidor no admite la obtención de información de la raíz del repositorio"
-#: libsvn_client/info.c:417 libsvn_client/info.c:432 libsvn_client/info.c:442
+#: ../libsvn_client/info.c:417 ../libsvn_client/info.c:432
+#: ../libsvn_client/info.c:442
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "El URL '%s' no existe en la revisión '%ld'"
-#: libsvn_client/list.c:235
+#: ../libsvn_client/list.c:235
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "El URL '%s' no existe en esa revisión"
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"No se encontró un padre común, imposible operar en parámetros disjuntos"
-#: libsvn_client/locking_commands.c:261 libsvn_client/merge.c:4155
-#: libsvn_client/merge.c:4161 libsvn_client/merge.c:4390
-#: libsvn_client/ra.c:391 libsvn_client/ra.c:428 libsvn_client/ra.c:596
+#: ../libsvn_client/locking_commands.c:261 ../libsvn_client/merge.c:4155
+#: ../libsvn_client/merge.c:4161 ../libsvn_client/merge.c:4390
+#: ../libsvn_client/mergeinfo.c:457 ../libsvn_client/ra.c:391
+#: ../libsvn_client/ra.c:428 ../libsvn_client/ra.c:596
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' no tiene URL"
-#: libsvn_client/locking_commands.c:285
+#: ../libsvn_client/locking_commands.c:285
msgid "Unable to lock/unlock across multiple repositories"
msgstr "No se puede establecer bloqueos a lo largo de múltiples repositorios"
-#: libsvn_client/locking_commands.c:326
+#: ../libsvn_client/locking_commands.c:326
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' no está bloqueado en esta copia de trabajo"
-#: libsvn_client/locking_commands.c:374
+#: ../libsvn_client/locking_commands.c:374
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: libsvn_client/locking_commands.c:407 libsvn_fs/fs-loader.c:1007
-#: libsvn_ra/ra_loader.c:1022
+#: ../libsvn_client/locking_commands.c:407 ../libsvn_fs/fs-loader.c:1021
+#: ../libsvn_ra/ra_loader.c:1077
msgid "Lock comment contains illegal characters"
msgstr "El comentario de bloqueo tiene caracteres ilegales"
-#: libsvn_client/log.c:329
+#: ../libsvn_client/log.c:329
msgid "Missing required revision specification"
msgstr "Falta la especificación de la revisión"
-#: libsvn_client/log.c:378
+#: ../libsvn_client/log.c:378
msgid "When specifying working copy paths, only one target may be given"
msgstr ""
"Cuando se especifican rutas de copia de trabajo sólo se permite un objetivo"
-#: libsvn_client/log.c:398 libsvn_client/mergeinfo.c:340
-#: libsvn_client/status.c:284 libsvn_client/update.c:157
-#: libsvn_client/util.c:168
+#: ../libsvn_client/log.c:398 ../libsvn_client/mergeinfo.c:340
+#: ../libsvn_client/status.c:284 ../libsvn_client/update.c:157
+#: ../libsvn_client/util.c:169
#, c-format
msgid "Entry '%s' has no URL"
msgstr "La entrada '%s' no tiene URL"
-#: libsvn_client/log.c:652
+#: ../libsvn_client/log.c:650
msgid "No commits in repository"
msgstr "No hubo commits en el repositorio"
-#: libsvn_client/merge.c:127
+#: ../libsvn_client/merge.c:127
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "Los URLs no tienen protocolo ('%s' y '%s')"
-#: libsvn_client/merge.c:133 libsvn_client/merge.c:139
+#: ../libsvn_client/merge.c:133 ../libsvn_client/merge.c:139
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "El URL no tiene protocolo: '%s'"
-#: libsvn_client/merge.c:146
+#: ../libsvn_client/merge.c:146
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "No se soporta todavía mezclar protocolos de acceso ('%s' y '%s')"
@@ -1467,23 +1463,23 @@
#. 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:482
+#: ../libsvn_client/merge.c:482
msgid ".working"
msgstr ".copia-de-trabajo"
# Sin acento a propósito!
-#: libsvn_client/merge.c:484
+#: ../libsvn_client/merge.c:484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".izquierda-fusion.r%ld"
# Sin acento a propósito!
-#: libsvn_client/merge.c:487
+#: ../libsvn_client/merge.c:487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".derecha-fusion.r%ld"
-#: libsvn_client/merge.c:1745
+#: ../libsvn_client/merge.c:1745
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1495,75 +1491,75 @@
"resuélvalos y vuelva a ejecutar la fusión para que se apliquen\n"
"los cambios de las revisiones que falta fusionar"
-#: libsvn_client/merge.c:4220
+#: ../libsvn_client/merge.c:4220
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr ""
"El uso de dos URLs no es compatible con la modificación de la info de fusión"
-#: libsvn_client/prop_commands.c:73
+#: ../libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' es una wcprop, por lo tanto no es accesible por clientes"
-#: libsvn_client/prop_commands.c:215
+#: ../libsvn_client/prop_commands.c:215
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "La propiedad '%s' no es una propiedad regular"
-#: libsvn_client/prop_commands.c:323
+#: ../libsvn_client/prop_commands.c:323
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "No se permite en este contexto la propiedad de revisión '%s'"
-#: libsvn_client/prop_commands.c:331 libsvn_client/prop_commands.c:462
+#: ../libsvn_client/prop_commands.c:331 ../libsvn_client/prop_commands.c:462
#, c-format
msgid "Bad property name: '%s'"
msgstr "Nombre de propiedad inaceptable: '%s'"
-#: libsvn_client/prop_commands.c:342
+#: ../libsvn_client/prop_commands.c:342
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr ""
"Asignar una propiedad al objetivo no local '%s' necesita una revisión base"
-#: libsvn_client/prop_commands.c:348
+#: ../libsvn_client/prop_commands.c:348
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"No se admite asignar recursivamente una propiedad al objetivo no local '%s'"
-#: libsvn_client/prop_commands.c:365
+#: ../libsvn_client/prop_commands.c:365
#, c-format
msgid "Setting property '%s' on non-local target '%s' is not supported"
msgstr "No se admite asignar la propiedad '%s' al objetivo no local '%s'"
-#: libsvn_client/prop_commands.c:458
+#: ../libsvn_client/prop_commands.c:458
msgid "Value will not be set unless forced"
msgstr "El valor no se asignará a menos que se fuerce la operación"
-#: libsvn_client/prop_commands.c:679
+#: ../libsvn_client/prop_commands.c:679
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' no existe en la revisión %ld"
-#: libsvn_client/prop_commands.c:686 libsvn_client/prop_commands.c:1020
+#: ../libsvn_client/prop_commands.c:686 ../libsvn_client/prop_commands.c:1020
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Tipo de nodo desconocido para '%s'"
-#: libsvn_client/ra.c:148
+#: ../libsvn_client/ra.c:148
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Intento de asignar la propiedad de copia de trabajo '%s' en '%s' en una "
"operación que no es de commit"
-#: libsvn_client/ra.c:665 libsvn_ra/compat.c:371
+#: ../libsvn_client/ra.c:665 ../libsvn_ra/compat.c:372
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Imposible encontrar la ubicación de '%s' en la revisión %ld"
-#: libsvn_client/ra.c:672
+#: ../libsvn_client/ra.c:672
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1572,30 +1568,30 @@
"La ubicación de '%s' para la revisión %ld no existe en el repositorio, o se "
"refiere a un objeto no relacionado"
-#: libsvn_client/relocate.c:101
+#: ../libsvn_client/relocate.c:101
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "'%s' no es la raíz del repositorio"
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:108
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr ""
"El repositorio en '%s' tiene un uuid '%s', pero la copia de trabajo tiene '%"
"s'"
-#: libsvn_client/revisions.c:99
+#: ../libsvn_client/revisions.c:99
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "La ruta '%s' no registra el commit de ninguna revisión"
-#: libsvn_client/revisions.c:126
+#: ../libsvn_client/revisions.c:126
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Tipo de revisión no reconocido pedido para '%s'"
-#: libsvn_client/switch.c:149 libsvn_ra_local/ra_plugin.c:107
-#: libsvn_ra_local/ra_plugin.c:613 libsvn_wc/update_editor.c:3183
+#: ../libsvn_client/switch.c:142 ../libsvn_ra_local/ra_plugin.c:195
+#: ../libsvn_ra_local/ra_plugin.c:270 ../libsvn_wc/update_editor.c:3199
#, c-format
msgid ""
"'%s'\n"
@@ -1606,51 +1602,51 @@
"no es el mismo repositorio que\n"
"'%s'"
-#: libsvn_client/switch.c:167
+#: ../libsvn_client/switch.c:161
#, c-format
msgid "Destination does not exist: '%s'"
msgstr "El destino no existe: '%s'"
-#: libsvn_client/util.c:209
+#: ../libsvn_client/util.c:204
#, c-format
msgid "URL '%s' is not a child of repository root URL '%s'"
msgstr "El URL '%s' no es hijo del URL raíz del repositorio '%s'"
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Falló la compresión de datos svndiff"
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
msgstr "Falló la decompresión de datos svndiff"
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
msgstr ""
"El tamaño de los datos descomprimidos no corresponde con el largo original "
"almacenado"
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:484
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Flujo diff inválido: ins %d no se puede decodificar"
-#: libsvn_delta/svndiff.c:488
+#: ../libsvn_delta/svndiff.c:488
#, c-format
msgid "Invalid diff stream: insn %d has non-positive length"
msgstr "Flujo diff inválido: la ins %d tiene un largo no positivo"
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:492
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Flujo diff inválido: la ins %d sobrepasa la vista objetivo"
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Flujo diff inválido: [src] la ins %d sobrepasa la vista objetivo"
-#: 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"
@@ -1658,81 +1654,81 @@
"Flujo diff inválido: [tgt] la ins %d comienza más allá de la posición de la "
"vista objetivo"
-#: 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 ""
"Flujo diff inválido: [new] la ins %d sobrepasa la sección de nuevos datos"
-#: libsvn_delta/svndiff.c:524
+#: ../libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "El delta no llena la ventana objetivo"
-#: libsvn_delta/svndiff.c:527
+#: ../libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "El delta no contiene datos nuevos suficientes"
-#: libsvn_delta/svndiff.c:633
+#: ../libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Los datos svndiff tienen una cabecera inválida"
-#: 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 "Los datos svndiff tienen una cabecera de ventana corrupta"
-#: libsvn_delta/svndiff.c:697
+#: ../libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr ""
"Los datos de svndiff contienen una vista de fuente que se desliza en reversa "
"(backward-sliding source view)"
-#: 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 "Inesperado final de los datos svndiff"
-#: libsvn_diff/diff_file.c:462
+#: ../libsvn_diff/diff_file.c:462
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "El archivo '%s' cambió inesperadamente durante la operación de 'diff'"
-#: libsvn_diff/diff_file.c:586
+#: ../libsvn_diff/diff_file.c:586
#, c-format
msgid "Error parsing diff options"
msgstr "Error analizando las opciones para diff"
-#: libsvn_diff/diff_file.c:609
+#: ../libsvn_diff/diff_file.c:609
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Parámetro inválido '%s' en las opciones para diff"
-#: libsvn_diff/diff_file.c:1465
+#: ../libsvn_diff/diff_file.c:1465
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Falló el borrar el mmap '%s'"
-#: libsvn_fs/fs-loader.c:104 libsvn_ra/ra_loader.c:172
-#: libsvn_ra/ra_loader.c:185
+#: ../libsvn_fs/fs-loader.c:104 ../libsvn_ra/ra_loader.c:174
+#: ../libsvn_ra/ra_loader.c:187
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "'%s' no define '%s()'"
-#: libsvn_fs/fs-loader.c:121
+#: ../libsvn_fs/fs-loader.c:121
#, c-format
msgid "Can't grab FS mutex"
msgstr "No se pudo tomar el mutex FS"
-#: libsvn_fs/fs-loader.c:133
+#: ../libsvn_fs/fs-loader.c:133
#, c-format
msgid "Can't ungrab FS mutex"
msgstr "No se pudo soltar el mutex FS"
-#: libsvn_fs/fs-loader.c:154
+#: ../libsvn_fs/fs-loader.c:154
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Falló el cargar un módulo para el tipo de FS '%s'"
-#: libsvn_fs/fs-loader.c:187
+#: ../libsvn_fs/fs-loader.c:187
#, c-format
msgid ""
"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -1740,275 +1736,288 @@
"Conflicto de versiones en módulo FS para '%s': se encontró %d.%d.%d%s, se "
"esperaba %d.%d.%d%s"
-#: libsvn_fs/fs-loader.c:212
+#: ../libsvn_fs/fs-loader.c:212
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Tipo de FS '%s' desconocido"
-#: libsvn_fs/fs-loader.c:303
+#: ../libsvn_fs/fs-loader.c:303
#, c-format
msgid "Can't allocate FS mutex"
msgstr "No se pudo crear el mutex FS"
-#: libsvn_fs/fs-loader.c:1013
+#: ../libsvn_fs/fs-loader.c:1027
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Se le pasó una fecha de expiración negativa a svn_fs_lock"
-#: 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 "Error de la BD Berkeley para el sistema de archivos '%s' al %s:\n"
-#: libsvn_fs_base/bdb/changes-table.c:87
+#: ../libsvn_fs_base/bdb/changes-table.c:87
msgid "creating change"
msgstr "crear cambio"
-#: libsvn_fs_base/bdb/changes-table.c:113
+#: ../libsvn_fs_base/bdb/changes-table.c:113
msgid "deleting changes"
msgstr "borrar cambios"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2730
+#: ../libsvn_fs_base/bdb/changes-table.c:145 ../libsvn_fs_fs/fs_fs.c:2857
msgid "Missing required node revision ID"
msgstr "Falta el id de revisión del nodo"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2740
+#: ../libsvn_fs_base/bdb/changes-table.c:156 ../libsvn_fs_fs/fs_fs.c:2867
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Orden de cambios erróneo: nuevo ID de revisión de nodo sin delete"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2751
+#: ../libsvn_fs_base/bdb/changes-table.c:166 ../libsvn_fs_fs/fs_fs.c:2878
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Orden de cambios erróneo: cambio no aditivo en una ruta eliminada"
-#: 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 "crear cursor para leer cambios"
-#: 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 "Error leyendo cambios para la clave '%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 "obtener cambios"
-#: 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 "cerrar cursor de cambios"
-#: libsvn_fs_base/bdb/copies-table.c:85
+#: ../libsvn_fs_base/bdb/copies-table.c:85
msgid "storing copy record"
msgstr "almacenar registro de copia"
-#: 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 "reservando nuevo ID de copia (obteniendo 'next-key')"
-#: libsvn_fs_base/bdb/copies-table.c:128
+#: ../libsvn_fs_base/bdb/copies-table.c:128
msgid "bumping next copy key"
msgstr "generando siguiente clave de copia"
-#: libsvn_fs_base/bdb/copies-table.c:167
+#: ../libsvn_fs_base/bdb/copies-table.c:167
msgid "deleting entry from 'copies' table"
msgstr "borrar entrada de la tabla 'copies'"
-#: libsvn_fs_base/bdb/copies-table.c:195
+#: ../libsvn_fs_base/bdb/copies-table.c:195
msgid "reading copy"
msgstr "leer copia"
-#: libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/node-origins-table.c:101
+#, c-format
+msgid "Node origin for '%s' already exists in filesystem '%s'"
+msgstr ""
+"El nodo origen de '%s' ya existe en el sistema de archivos '%s'"
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:107
+msgid "storing node-origins record"
+msgstr "almacenando registro node-origins"
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:97
msgid "allocating new node ID (getting 'next-key')"
msgstr "reservar nuevo ID de nodo (obteniendo 'next-key')"
-#: libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:115
msgid "bumping next node ID key"
msgstr "generando siguiente clave de ID de nodo"
-#: libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:152
#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr ""
"El id sucesor '%s' (para '%s') ya existe en el sistema de archivos '%s'"
-#: libsvn_fs_base/bdb/nodes-table.c:178
+#: ../libsvn_fs_base/bdb/nodes-table.c:178
msgid "deleting entry from 'nodes' table"
msgstr "borrar entrada de la tabla 'nodes'"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:218
msgid "reading node revision"
msgstr "leer la revisión del nodo"
-#: libsvn_fs_base/bdb/nodes-table.c:250
+#: ../libsvn_fs_base/bdb/nodes-table.c:250
msgid "storing node revision"
msgstr "almacenar la revisión del nodo"
-#: 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 "No hay una representación '%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 "leer representación"
-#: libsvn_fs_base/bdb/reps-table.c:124
+#: ../libsvn_fs_base/bdb/reps-table.c:124
msgid "storing representation"
msgstr "almacenar representación"
-#: libsvn_fs_base/bdb/reps-table.c:154
+#: ../libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
msgstr "reservar espacio para nueva representación (obteniendo next-key)"
-#: libsvn_fs_base/bdb/reps-table.c:175
+#: ../libsvn_fs_base/bdb/reps-table.c:175
msgid "bumping next representation key"
msgstr "generar siguiente clave de representación"
#. 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 "borrar representación"
#. 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 "leer la revisión del sistema de archivos"
-#: libsvn_fs_base/bdb/strings-table.c:89
+#: ../libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "crear un cursor para leer una cadena"
-#: libsvn_fs_base/bdb/txn-table.c:92
+#: ../libsvn_fs_base/bdb/txn-table.c:92
msgid "storing transaction record"
msgstr "almacenar registro de transacción"
-#: libsvn_fs_base/bdb/uuids-table.c:114
+#: ../libsvn_fs_base/bdb/uuids-table.c:114
msgid "get repository uuid"
msgstr "obtener uuid del repositorio"
-#: libsvn_fs_base/bdb/uuids-table.c:142
+#: ../libsvn_fs_base/bdb/uuids-table.c:142
msgid "set repository uuid"
msgstr "asignar uuid del repositorio"
-#: libsvn_fs_base/dag.c:221
+#: ../libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el id de la transacción inicial no es '0' en el sistema de "
"archivos '%s'"
-#: libsvn_fs_base/dag.c:229
+#: ../libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el id de la copia inicial no es '0' en el sistema de archivos '%"
"s'"
-#: libsvn_fs_base/dag.c:238
+#: ../libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el número de la revisión inicial no es '0' en el sistema de "
"archivos '%s'"
-#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:324
+#: ../libsvn_fs_base/dag.c:286 ../libsvn_fs_base/dag.c:462
+#: ../libsvn_fs_fs/dag.c:324
msgid "Attempted to create entry in non-directory parent"
msgstr "Se intentó crearle una entrada a un padre que no era un directorio"
-#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:318
+#: ../libsvn_fs_base/dag.c:456 ../libsvn_fs_fs/dag.c:318
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Se intentó crear un nodo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:330
+#: ../libsvn_fs_base/dag.c:468 ../libsvn_fs_base/dag.c:702
+#: ../libsvn_fs_fs/dag.c:330
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Se intentó clonar el hijo de un nodo inmutable"
-#: libsvn_fs_base/dag.c:475
+#: ../libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Se intentó crear una entrada que ya existe"
-#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:392
+#: ../libsvn_fs_base/dag.c:526 ../libsvn_fs_fs/dag.c:392
msgid "Attempted to set entry in non-directory node"
msgstr "Se intentó establecer una entrada en un nodo que no es un directorio"
-#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:398
+#: ../libsvn_fs_base/dag.c:532 ../libsvn_fs_fs/dag.c:398
msgid "Attempted to set entry in immutable node"
msgstr "Se intentó establecer una entrada en un nodo inmutable"
-#: libsvn_fs_base/dag.c:596
+#: ../libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"No se puede establecer una lista de propiedades en el nodo-revisión "
"*inmutable* %s"
-#: libsvn_fs_base/dag.c:708
+#: ../libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Se intentó crear un clon hijo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:834
+#: ../libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Se intentó borrar la entrada '%s' de un nodo que no es un directorio"
-#: libsvn_fs_base/dag.c:840
+#: ../libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "Se intentó borrar la entrada '%s' de un nodo de directorio inmutable"
-#: libsvn_fs_base/dag.c:847
+#: ../libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Se intentó borrar un nodo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
+#: ../libsvn_fs_base/dag.c:862 ../libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Falló el borrado: el directorio no tiene una entrada '%s'"
-#: libsvn_fs_base/dag.c:944
+#: ../libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Se intentó la remoción de un nodo inmutable"
-#: libsvn_fs_base/dag.c:1064
+#: ../libsvn_fs_base/dag.c:1067
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr ""
"Se intentó obtener el contenido texto de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1099
+#: ../libsvn_fs_base/dag.c:1102
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Se intentó obtener el tamaño de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1125
+#: ../libsvn_fs_base/dag.c:1128
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr ""
"Se intentó obtener la suma de verificación de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
+#: ../libsvn_fs_base/dag.c:1159 ../libsvn_fs_base/dag.c:1213
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr ""
"Se intentó establecer el contenido texto de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
+#: ../libsvn_fs_base/dag.c:1165 ../libsvn_fs_base/dag.c:1219
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Se intentó establecer el contenido texto de un nodo inmutable"
-#: libsvn_fs_base/dag.c:1239
+#: ../libsvn_fs_base/dag.c:1242
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -2019,128 +2028,135 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_base/dag.c:1294
+#: ../libsvn_fs_base/dag.c:1297
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Se intentó abrir nodo hijo '%s' inexistente"
-#: libsvn_fs_base/dag.c:1300
+#: ../libsvn_fs_base/dag.c:1303
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Se intentó abrir un nodo con un nombre ilegal '%s'"
-#: libsvn_fs_base/err.c:41
+#: ../libsvn_fs_base/err.c:41
#, c-format
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr ""
"Revisión del sistema de archivos %ld corrupta en el sistema de archivos '%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 "Referencia a nodo inexistente '%s' en el sistema de archivos '%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 ""
"Referencia a una revisión %ld inexistente en el sistema de archivos '%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 ""
"Entrada corrupta en la tabla 'transactions' para '%s' en el sistema de "
"archivos '%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 ""
"Entrada corrupta en la tabla 'copies' para '%s' en el sistema de archivos '%"
"s'"
-#: libsvn_fs_base/err.c:96
+#: ../libsvn_fs_base/err.c:96
#, c-format
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "No hay una transacción de nombre '%s' en el sistema de archivos '%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 ""
"No se pudo modificar la transacción de nombre '%s' en el sistema de archivos "
"'%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 "No hay una copia con id '%s' en el sistema de archivos '%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 ""
"El token '%s' no apunta a ningún bloqueo existente en el sistema de archivos "
"'%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 ""
"No se dio ningún token para la ruta '%s' en el sistema de archivos '%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 ""
"Bloqueo corrupto en la tabla 'locks' para '%s' en el sistema de archivos '%s'"
-#: libsvn_fs_base/fs.c:81
+#: ../libsvn_fs_base/err.c:157
+#, fuzzy, c-format
+msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
+msgstr ""
+"Entrada corrupta en la tabla 'copies' para '%s' en el sistema de archivos '%"
+"s'"
+
+#: ../libsvn_fs_base/fs.c:82
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr ""
"Versión de la base de datos errónea: se obtuvo %d.%d.%d cuando debería ser "
"por lo menos %d.%d.%d"
-#: libsvn_fs_base/fs.c:92
+#: ../libsvn_fs_base/fs.c:93
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr ""
"Versión de la base de datos errónea: se compiló con %d.%d.%d, pero se está "
"corriendo contra %d.%d.%d"
-#: libsvn_fs_base/fs.c:110 libsvn_fs_fs/fs.c:53
+#: ../libsvn_fs_base/fs.c:111 ../libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "El objeto de sistema de archivos ya está abierto"
-#: libsvn_fs_base/fs.c:191
+#: ../libsvn_fs_base/fs.c:193
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr ""
"Error de la BD Berkeley para el sistema de archivos '%s' al cerrar el "
"ambiente:\n"
-#: libsvn_fs_base/fs.c:540
+#: ../libsvn_fs_base/fs.c:542
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr ""
"Error de la BD Berkeley para el sistema de archivos '%s' al crear el "
"ambiente:\n"
-#: libsvn_fs_base/fs.c:546
+#: ../libsvn_fs_base/fs.c:548
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr ""
"Error de la BD Berkeley para el sistema de archivos '%s' al abrir el "
"ambiente:\n"
-#: libsvn_fs_base/fs.c:675
+#: ../libsvn_fs_base/fs.c:684
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Se esperaba el formato de FS '%d', se encontró '%d'"
-#: libsvn_fs_base/fs.c:1114
+#: ../libsvn_fs_base/fs.c:1125
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2152,7 +2168,7 @@
"el problema persiste, intente desactivar esta funcionalidad\n"
"en DB_CONFIG"
-#: libsvn_fs_base/fs.c:1133
+#: ../libsvn_fs_base/fs.c:1144
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2164,30 +2180,30 @@
"el algoritmo de hotcopy. Si el problema persiste, intente desactivar esta\n"
"funcionalidad en DB_CONFIG"
-#: libsvn_fs_base/fs.c:1180
+#: ../libsvn_fs_base/fs.c:1191
msgid "Module for working with a Berkeley DB repository."
msgstr "Módulo para trabajar con un repositorio Berkeley DB."
-#: libsvn_fs_base/fs.c:1214
+#: ../libsvn_fs_base/fs.c:1225
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versión de cargador FS (%d) no admitida para bdb"
-#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:613
+#: ../libsvn_fs_base/lock.c:445 ../libsvn_fs_fs/lock.c:613
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"No se puede verificar el bloqueo sobre la ruta '%s'; no hay un nombre de "
"usuario disponible"
-#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:619
+#: ../libsvn_fs_base/lock.c:451 ../libsvn_fs_fs/lock.c:619
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"El usuario %s no es el dueño del bloqueo sobre la ruta '%s' (actualmente "
"bloqueada por %s)"
-#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:626
+#: ../libsvn_fs_base/lock.c:458 ../libsvn_fs_fs/lock.c:626
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2196,25 +2212,25 @@
#. 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 "Tipo de nodo desconocido para la representación '%s'"
-#: libsvn_fs_base/reps-strings.c:108
+#: ../libsvn_fs_base/reps-strings.c:108
msgid "Representation is not of type 'delta'"
msgstr "La representación no es de tipo 'delta'"
-#: libsvn_fs_base/reps-strings.c:378
+#: ../libsvn_fs_base/reps-strings.c:378
msgid "Svndiff source length inconsistency"
msgstr "Inconsistencia en el largo de la fuente 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 "Inconsistencias en la versión de diff en la representación '%s'"
-#: 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 '%"
@@ -2223,18 +2239,18 @@
"Se detectó corrupción al leer la cadena de deltas de la representación '%s' "
"a la '%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 ""
"Contenidos de la rep son demasiado grandes: se obtuvo %s, el límite es %s"
-#: libsvn_fs_base/reps-strings.c:795
+#: ../libsvn_fs_base/reps-strings.c:795
#, c-format
msgid "Failure reading rep '%s'"
msgstr "Falla al leer rep '%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"
@@ -2245,105 +2261,105 @@
" esperada: %s\n"
" presente: %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 nula, pero el offset ya es más que cero"
-#: 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 "La rep '%s' no es inmutable"
-#: 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 "La rep '%s' es a la vez mutable y no-textocompleto"
-#: libsvn_fs_base/reps-strings.c:1339
+#: ../libsvn_fs_base/reps-strings.c:1339
msgid "Failed to get new string key"
msgstr "Falló el obtener nueva cadena llave"
-#: libsvn_fs_base/reps-strings.c:1415
+#: ../libsvn_fs_base/reps-strings.c:1415
#, c-format
msgid "Attempt to deltify '%s' against itself"
msgstr "Se intentó deltificar '%s' contra sí mismo"
-#: 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 "Falló el cálculo del digesto MD5 para '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: ../libsvn_fs_base/revs-txns.c:68
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "La transacción no está muerta: '%s'"
-#: libsvn_fs_base/revs-txns.c:71
+#: ../libsvn_fs_base/revs-txns.c:71
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "La transacción está muerta: '%s'"
-#: libsvn_fs_base/revs-txns.c:1040
+#: ../libsvn_fs_base/revs-txns.c:1064
msgid "Transaction aborted, but cleanup failed"
msgstr "La transacción abortó, pero la limpieza posterior falló"
-#: libsvn_fs_base/tree.c:745 libsvn_fs_fs/tree.c:697
+#: ../libsvn_fs_base/tree.c:746 ../libsvn_fs_fs/tree.c:697
#, c-format
msgid "Failure opening '%s'"
msgstr "No se pudo abrir '%s'"
-#: libsvn_fs_base/tree.c:1378 libsvn_fs_fs/tree.c:1144
+#: ../libsvn_fs_base/tree.c:1379 ../libsvn_fs_fs/tree.c:1145
msgid "Cannot compare property value between two different filesystems"
msgstr ""
"No se pueden comparar valores de propiedades de sistemas de archivos "
"diferentes"
-#: libsvn_fs_base/tree.c:1705
+#: ../libsvn_fs_base/tree.c:1706
msgid "Corrupt DB: faulty predecessor count"
msgstr "BD corrupta: cuenta de predecesores inválida"
-#: libsvn_fs_base/tree.c:1760 libsvn_fs_fs/tree.c:1180
+#: ../libsvn_fs_base/tree.c:1761 ../libsvn_fs_fs/tree.c:1181
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Nodo inmutable inesperado en '%s'"
-#: libsvn_fs_base/tree.c:1781 libsvn_fs_fs/tree.c:1203
+#: ../libsvn_fs_base/tree.c:1782 ../libsvn_fs_fs/tree.c:1204
#, c-format
msgid "Conflict at '%s'"
msgstr "Conflicto en '%s'"
-#: libsvn_fs_base/tree.c:1831 libsvn_fs_base/tree.c:2543
-#: libsvn_fs_fs/tree.c:1252 libsvn_fs_fs/tree.c:1744
+#: ../libsvn_fs_base/tree.c:1832 ../libsvn_fs_base/tree.c:2544
+#: ../libsvn_fs_fs/tree.c:1253 ../libsvn_fs_fs/tree.c:1745
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Mala fusión; el ancestro, fuente, y objetivo no están en el mismo sistema de "
"archivos"
-#: libsvn_fs_base/tree.c:1847 libsvn_fs_fs/tree.c:1268
+#: ../libsvn_fs_base/tree.c:1848 ../libsvn_fs_fs/tree.c:1269
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "Mala fusión; el objetivo '%s' tiene id '%s', el mismo que su ancestro"
-#: libsvn_fs_base/tree.c:2350
+#: ../libsvn_fs_base/tree.c:2351
#, c-format
msgid "Transaction '%s' out-of-date with respect to revision '%s'"
msgstr ""
"La transacción '%s' está desactualizada con respecto a la revisión '%s'"
-#: libsvn_fs_base/tree.c:2726 libsvn_fs_fs/tree.c:1883
+#: ../libsvn_fs_base/tree.c:2727 ../libsvn_fs_fs/tree.c:1884
msgid "The root directory cannot be deleted"
msgstr "No se puede borrar el directorio raíz"
-#: libsvn_fs_base/tree.c:2907 libsvn_fs_fs/tree.c:1955
+#: ../libsvn_fs_base/tree.c:2908 ../libsvn_fs_fs/tree.c:1956
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "No se puede copiar entre sistemas de archivos diferentes ('%s' y '%s')"
-#: libsvn_fs_base/tree.c:2916 libsvn_fs_fs/tree.c:1961
+#: ../libsvn_fs_base/tree.c:2917 ../libsvn_fs_fs/tree.c:1962
msgid "Copy from mutable tree not currently supported"
msgstr "No se soporta todavía copiar desde un árbol mutable"
-#: libsvn_fs_base/tree.c:3411 libsvn_fs_fs/tree.c:2388
+#: ../libsvn_fs_base/tree.c:3412 ../libsvn_fs_fs/tree.c:2389
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2354,23 +2370,24 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_base/tree.c:3666 libsvn_fs_fs/tree.c:2624
+#: ../libsvn_fs_base/tree.c:3667 ../libsvn_fs_fs/tree.c:2625
msgid "Cannot compare file contents between two different filesystems"
msgstr ""
"No se puede comparar el contenido de archivos pertenecientes a sistemas de "
"archivos diferentes"
-#: libsvn_fs_base/tree.c:3675 libsvn_fs_base/tree.c:3680
-#: libsvn_fs_fs/tree.c:2633 libsvn_fs_fs/tree.c:2638
+#: ../libsvn_fs_base/tree.c:3676 ../libsvn_fs_base/tree.c:3681
+#: ../libsvn_fs_fs/tree.c:2634 ../libsvn_fs_fs/tree.c:2639
+#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' no es un archivo"
-#: libsvn_fs_fs/dag.c:374
+#: ../libsvn_fs_fs/dag.c:374
msgid "Can't get entries of non-directory"
msgstr "No se puede obtener entradas de lo que no es un directorio"
-#: libsvn_fs_fs/dag.c:904
+#: ../libsvn_fs_fs/dag.c:904
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2381,75 +2398,90 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_fs/err.c:52
+#: ../libsvn_fs_fs/err.c:52
#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr ""
"Archivo de bloqueo corrupto para la ruta '%s' en el sistema de archivos '%s'"
-#: libsvn_fs_fs/fs.c:88
+#: ../libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "No se pudo obtener datos compartidos de FSFS"
-#: libsvn_fs_fs/fs.c:104
+#: ../libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "No se pudo crear el mutex FSFS de escritura"
-#: libsvn_fs_fs/fs.c:112
+#: ../libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "No se pudo crear el mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs.c:118
+#: ../libsvn_fs_fs/fs.c:119
+#, c-format
+msgid "Can't create FSFS txn-current mutex"
+msgstr "No se pudo crear el mutex FSFS de txn actual"
+
+#: ../libsvn_fs_fs/fs.c:125
#, c-format
msgid "Can't store FSFS shared data"
msgstr "No se pudo almacenar datos compartidos de FSFS"
-#: libsvn_fs_fs/fs.c:298
+#: ../libsvn_fs_fs/fs.c:305
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Módulo para usar un repositorio basado en archivos comunes (FSFS)."
-#: libsvn_fs_fs/fs.c:332
+#: ../libsvn_fs_fs/fs.c:339
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versión de cargador FS (%d) no admitida para fsfs"
-#: libsvn_fs_fs/fs_fs.c:382
+#: ../libsvn_fs_fs/fs_fs.c:395
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "No se pudo tomar el mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:390
+#: ../libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "No se pudo soltar el mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:416
+#: ../libsvn_fs_fs/fs_fs.c:456
+#, c-format
+msgid "Can't grab FSFS mutex for '%s'"
+msgstr "No se pudo tomar el mutex FSFS para '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:471
+#, c-format
+msgid "Can't ungrab FSFS mutex for '%s'"
+msgstr "No se pudo soltar el mutex para '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:542
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "No se pudo desbloquear la transacción desconocida '%s'"
-#: libsvn_fs_fs/fs_fs.c:420
+#: ../libsvn_fs_fs/fs_fs.c:546
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "No se pudo desbloquear la transacción no bloqueada '%s'"
-#: libsvn_fs_fs/fs_fs.c:427
+#: ../libsvn_fs_fs/fs_fs.c:553
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"No se pudo desbloquear el archivo de bloqueo prototipo para la transacción '%"
"s'"
-#: libsvn_fs_fs/fs_fs.c:433
+#: ../libsvn_fs_fs/fs_fs.c:559
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"No se pudo cerrar el archivo de bloqueo prototipo para la transacción '%s'"
-#: libsvn_fs_fs/fs_fs.c:495
+#: ../libsvn_fs_fs/fs_fs.c:621
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2458,7 +2490,7 @@
"No se pudo escribir en el archivo de bloqueo prototipo de la transacción '%"
"s' porque el proceso actual está escribiendo una representación previa"
-#: libsvn_fs_fs/fs_fs.c:531
+#: ../libsvn_fs_fs/fs_fs.c:657
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2467,117 +2499,117 @@
"No se pudo escribir en el archivo de bloqueo prototipo de la transacción '%"
"s' porque otro proceso está escribiendo una representación previa"
-#: libsvn_fs_fs/fs_fs.c:538 libsvn_subr/io.c:1545
+#: ../libsvn_fs_fs/fs_fs.c:664 ../libsvn_subr/io.c:1545
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "No se pudo conseguir un bloqueo exclusivo sobre el archivo '%s'"
-#: libsvn_fs_fs/fs_fs.c:650
+#: ../libsvn_fs_fs/fs_fs.c:776
#, c-format
msgid "Format file '%s' contains an unexpected non-digit"
msgstr "El archivo de formato '%s' contiene un carácter que no es un dígito"
-#: libsvn_fs_fs/fs_fs.c:698
+#: ../libsvn_fs_fs/fs_fs.c:824
#, c-format
msgid "Can't read first line of format file '%s'"
msgstr "No se pudo leer la primera línea del archivo de formato '%s'"
-#: libsvn_fs_fs/fs_fs.c:742
+#: ../libsvn_fs_fs/fs_fs.c:868
#, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr ""
"'%s' contiene la opción de formato de sisteme de archivos inválida '%s'"
-#: libsvn_fs_fs/fs_fs.c:803
+#: ../libsvn_fs_fs/fs_fs.c:929
#, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr "Se esperaba un formato de FS entre 1 y '%d', se encontró '%d'"
-#: libsvn_fs_fs/fs_fs.c:1116 libsvn_fs_fs/fs_fs.c:1130
+#: ../libsvn_fs_fs/fs_fs.c:1243 ../libsvn_fs_fs/fs_fs.c:1257
msgid "Found malformed header in revision file"
msgstr "Se encontró una cabecera inválida el un archivo de revisión"
-#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1246
-#: libsvn_fs_fs/fs_fs.c:1253 libsvn_fs_fs/fs_fs.c:1260
-#: libsvn_fs_fs/fs_fs.c:1268 libsvn_fs_fs/fs_fs.c:1276
+#: ../libsvn_fs_fs/fs_fs.c:1359 ../libsvn_fs_fs/fs_fs.c:1373
+#: ../libsvn_fs_fs/fs_fs.c:1380 ../libsvn_fs_fs/fs_fs.c:1387
+#: ../libsvn_fs_fs/fs_fs.c:1395 ../libsvn_fs_fs/fs_fs.c:1403
msgid "Malformed text rep offset line in node-rev"
msgstr "Línea de incremento en repositorio de texto malformada en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1345
+#: ../libsvn_fs_fs/fs_fs.c:1472
msgid "Missing kind field in node-rev"
msgstr "Falta el campo tipo en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1376
+#: ../libsvn_fs_fs/fs_fs.c:1503
msgid "Missing cpath in node-rev"
msgstr "Falta cpath en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1403 libsvn_fs_fs/fs_fs.c:1409
+#: ../libsvn_fs_fs/fs_fs.c:1530 ../libsvn_fs_fs/fs_fs.c:1536
msgid "Malformed copyroot line in node-rev"
msgstr "Línea copyroot malformada en el node-rev"
-#: libsvn_fs_fs/fs_fs.c:1427 libsvn_fs_fs/fs_fs.c:1433
+#: ../libsvn_fs_fs/fs_fs.c:1554 ../libsvn_fs_fs/fs_fs.c:1560
msgid "Malformed copyfrom line in node-rev"
msgstr "Línea copyfrom malformada en el node-rev"
-#: libsvn_fs_fs/fs_fs.c:1542 libsvn_fs_fs/fs_fs.c:4148
+#: ../libsvn_fs_fs/fs_fs.c:1669 ../libsvn_fs_fs/fs_fs.c:4294
msgid "Attempted to write to non-transaction"
msgstr "Intento de escribir en lo que no era una transacción"
-#: libsvn_fs_fs/fs_fs.c:1626
+#: ../libsvn_fs_fs/fs_fs.c:1753
msgid "Malformed representation header"
msgstr "Cabecera de representación malformada"
-#: libsvn_fs_fs/fs_fs.c:1650
+#: ../libsvn_fs_fs/fs_fs.c:1777
msgid "Missing node-id in node-rev"
msgstr "Falta node-id en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1656
+#: ../libsvn_fs_fs/fs_fs.c:1783
msgid "Corrupt node-id in node-rev"
msgstr "node-id corrupto en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1701
+#: ../libsvn_fs_fs/fs_fs.c:1828
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Al archivo de revisión le falta el fin de línea final"
-#: libsvn_fs_fs/fs_fs.c:1713
+#: ../libsvn_fs_fs/fs_fs.c:1840
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "La línea final en un archivo de revisión tiene más de 64 caracteres"
-#: libsvn_fs_fs/fs_fs.c:1728
+#: ../libsvn_fs_fs/fs_fs.c:1855
msgid "Final line in revision file missing space"
msgstr "Le falta un espacio a la línea final en un archivo de revisión"
-#: libsvn_fs_fs/fs_fs.c:1771 libsvn_fs_fs/fs_fs.c:1855 libsvn_repos/log.c:1355
-#: libsvn_repos/log.c:1359
+#: ../libsvn_fs_fs/fs_fs.c:1898 ../libsvn_fs_fs/fs_fs.c:1982
+#: ../libsvn_repos/log.c:1355 ../libsvn_repos/log.c:1359
#, c-format
msgid "No such revision %ld"
msgstr "No hay una revisión %ld"
-#: libsvn_fs_fs/fs_fs.c:1928
+#: ../libsvn_fs_fs/fs_fs.c:2055
msgid "Malformed svndiff data in representation"
msgstr "Datos svndiff malformados en la representación"
-#: libsvn_fs_fs/fs_fs.c:2071 libsvn_fs_fs/fs_fs.c:2084
+#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"La lectura de una ventana de svndiff leyó más allá del fin de la "
"representación"
-#: libsvn_fs_fs/fs_fs.c:2220
+#: ../libsvn_fs_fs/fs_fs.c:2347
msgid "svndiff data requested non-existent source"
msgstr "datos svndiff pidieron una fuente que no existe"
-#: libsvn_fs_fs/fs_fs.c:2226
+#: ../libsvn_fs_fs/fs_fs.c:2353
msgid "svndiff requested position beyond end of stream"
msgstr "la posición pedida por svndiff va más allá del final del flujo"
-#: libsvn_fs_fs/fs_fs.c:2249 libsvn_fs_fs/fs_fs.c:2266
+#: ../libsvn_fs_fs/fs_fs.c:2376 ../libsvn_fs_fs/fs_fs.c:2393
msgid "svndiff window length is corrupt"
msgstr "el largo de la ventana svndiff está corrupto"
-#: libsvn_fs_fs/fs_fs.c:2314
+#: ../libsvn_fs_fs/fs_fs.c:2441
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2588,219 +2620,219 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2538 libsvn_fs_fs/fs_fs.c:2551
-#: libsvn_fs_fs/fs_fs.c:2557 libsvn_fs_fs/fs_fs.c:5278
-#: libsvn_fs_fs/fs_fs.c:5287 libsvn_fs_fs/fs_fs.c:5293
+#: ../libsvn_fs_fs/fs_fs.c:2665 ../libsvn_fs_fs/fs_fs.c:2678
+#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:5377
+#: ../libsvn_fs_fs/fs_fs.c:5386 ../libsvn_fs_fs/fs_fs.c:5392
msgid "Directory entry corrupt"
msgstr "Entrada corrupta de directorio"
-#: libsvn_fs_fs/fs_fs.c:2896 libsvn_fs_fs/fs_fs.c:2904
-#: libsvn_fs_fs/fs_fs.c:2936 libsvn_fs_fs/fs_fs.c:2956
-#: libsvn_fs_fs/fs_fs.c:2990 libsvn_fs_fs/fs_fs.c:2995
+#: ../libsvn_fs_fs/fs_fs.c:3023 ../libsvn_fs_fs/fs_fs.c:3031
+#: ../libsvn_fs_fs/fs_fs.c:3063 ../libsvn_fs_fs/fs_fs.c:3083
+#: ../libsvn_fs_fs/fs_fs.c:3117 ../libsvn_fs_fs/fs_fs.c:3122
msgid "Invalid changes line in rev-file"
msgstr "Línea de cambios inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2929
+#: ../libsvn_fs_fs/fs_fs.c:3056
msgid "Invalid change kind in rev file"
msgstr "Tipo de cambio inválido en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2949
+#: ../libsvn_fs_fs/fs_fs.c:3076
msgid "Invalid text-mod flag in rev-file"
msgstr "Bandera text-mod inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2969
+#: ../libsvn_fs_fs/fs_fs.c:3096
msgid "Invalid prop-mod flag in rev-file"
msgstr "Bandera prop-mod inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:3153
+#: ../libsvn_fs_fs/fs_fs.c:3280
msgid "Copying from transactions not allowed"
msgstr "No se permite copiar desde transacciones"
-#: libsvn_fs_fs/fs_fs.c:3323
+#: ../libsvn_fs_fs/fs_fs.c:3448
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Imposible crear directorio de transacción en '%s' para la revisión %ld"
-#: libsvn_fs_fs/fs_fs.c:3579 libsvn_fs_fs/fs_fs.c:3586
+#: ../libsvn_fs_fs/fs_fs.c:3725 ../libsvn_fs_fs/fs_fs.c:3732
msgid "next-id file corrupt"
msgstr "archivo next-id corrupto"
-#: libsvn_fs_fs/fs_fs.c:3674
+#: ../libsvn_fs_fs/fs_fs.c:3820
msgid "Transaction cleanup failed"
msgstr "La limpieza posterior a la transacción falló"
-#: libsvn_fs_fs/fs_fs.c:3842
+#: ../libsvn_fs_fs/fs_fs.c:3988
msgid "Invalid change type"
msgstr "Tipo de cambio inválido"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: ../libsvn_fs_fs/fs_fs.c:4313
msgid "Can't set text contents of a directory"
msgstr "No se puede asignar contenido de tipo 'texto' a un directorio"
-#: libsvn_fs_fs/fs_fs.c:4251 libsvn_fs_fs/fs_fs.c:4256
-#: libsvn_fs_fs/fs_fs.c:4263
+#: ../libsvn_fs_fs/fs_fs.c:4397 ../libsvn_fs_fs/fs_fs.c:4402
+#: ../libsvn_fs_fs/fs_fs.c:4409
msgid "Corrupt current file"
msgstr "Archivo actual corrupto"
-#: libsvn_fs_fs/fs_fs.c:4548 libsvn_subr/io.c:2832 svn/util.c:379
-#: svn/util.c:394 svn/util.c:418
+#: ../libsvn_fs_fs/fs_fs.c:4694 ../libsvn_subr/io.c:2832 ../svn/util.c:379
+#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
msgstr "No se pudo obtener atributos del archivo '%s'"
-#: libsvn_fs_fs/fs_fs.c:4552
+#: ../libsvn_fs_fs/fs_fs.c:4698
#, c-format
msgid "Can't chmod '%s'"
msgstr "No se pudo cambiar los permisos de '%s'"
-#: libsvn_fs_fs/fs_fs.c:4701
-#, c-format
-msgid "Can't grab FSFS repository mutex"
-msgstr "No se pudo tomar el mutex del repositorio FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4715
-#, c-format
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "No se pudo soltar el mutex del repositorio FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4835
+#: ../libsvn_fs_fs/fs_fs.c:4920
msgid "Transaction out of date"
msgstr "La transacción está obsoleta"
-#: libsvn_fs_fs/fs_fs.c:5219
+#: ../libsvn_fs_fs/fs_fs.c:5318
msgid "Recovery encountered a non-directory node"
msgstr "La recuperación encontró un nodo que no es un directorio"
-#: libsvn_fs_fs/fs_fs.c:5241
+#: ../libsvn_fs_fs/fs_fs.c:5340
msgid "Recovery encountered a deltified directory representation"
msgstr "La recuperación encontró una representación de directorio deltificada"
-#: libsvn_fs_fs/fs_fs.c:5507
+#: ../libsvn_fs_fs/fs_fs.c:5606
msgid "No such transaction"
msgstr "No existe tal transacción"
-#: libsvn_fs_fs/lock.c:228
+#: ../libsvn_fs_fs/lock.c:228
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "No se pudo escribir el archivo de hashes lock/entries '%s'"
-#: libsvn_fs_fs/lock.c:284
+#: ../libsvn_fs_fs/lock.c:284
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "No se pudo interpretar el archivo de hash de locks/entries '%s'"
-#: libsvn_fs_fs/lock.c:713 libsvn_fs_fs/lock.c:734
+#: ../libsvn_fs_fs/lock.c:713 ../libsvn_fs_fs/lock.c:734
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "la ruta '%s' no existe en la revisión HEAD"
-#: libsvn_fs_fs/lock.c:739
+#: ../libsvn_fs_fs/lock.c:739
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Falló el bloqueo: existe una versión más nueva de '%s'"
-#: libsvn_fs_util/fs-util.c:96
+#: ../libsvn_fs_util/fs-util.c:96
msgid "Filesystem object has not been opened yet"
msgstr "El objeto de sistema de archivos no está abierto todavía"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:119
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:119
msgid "Merge Tracking schema format not set"
msgstr "Esquema del seguimiento de fusiones no establecido"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:124
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:124
#, c-format
msgid "Merge Tracking schema format %d not recognized"
msgstr "Formato %d del esquema del seguimiento de fusiones no reconocido"
-#: libsvn_ra/compat.c:302 libsvn_ra/compat.c:549
+#: ../libsvn_ra/compat.c:176
+#, c-format
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "Información changed-path faltante para '%s' en la revisión %ld"
+
+#: ../libsvn_ra/compat.c:303 ../libsvn_ra/compat.c:550
#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "La ruta '%s' no existe en la revisión %ld"
-#: libsvn_ra/compat.c:379
+#: ../libsvn_ra/compat.c:380
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' en la revisión %ld es un objeto no relacionado"
-#: libsvn_ra/ra_loader.c:227
+#: ../libsvn_ra/ra_loader.c:229
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr ""
"Conflicto de versiones en modulo de acceso a repositorio para '%s': se "
"encontró %d.%d.%d%s, se esperaba %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:403 libsvn_ra_serf/serf.c:137
-#: libsvn_ra_serf/serf.c:218
+#: ../libsvn_ra/ra_loader.c:405 ../libsvn_ra_serf/serf.c:331
+#: ../libsvn_ra_serf/serf.c:414
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "URL de repositorio ilegal '%s'"
-#: libsvn_ra/ra_loader.c:417
+#: ../libsvn_ra/ra_loader.c:419
msgid "Invalid config: unknown HTTP library"
msgstr "Configuración inválida: biblioteca HTTP desconocida"
-#: libsvn_ra/ra_loader.c:454
+#: ../libsvn_ra/ra_loader.c:456
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Protocolo de URL no reconocido en '%s'"
-#: libsvn_ra/ra_loader.c:505
+#: ../libsvn_ra/ra_loader.c:507
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' no está en el mismo repositorio que '%s'"
-#: libsvn_ra/ra_loader.c:1112
+#: ../libsvn_ra/ra_loader.c:1178
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - maneja el protocolo '%s'\n"
-#: libsvn_ra/ra_loader.c:1198
+#: ../libsvn_ra/ra_loader.c:1264
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Protocolo de URL '%s' no reconocido"
#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:251
+#. ** The RA vtable routines **
+#: ../libsvn_ra_local/ra_plugin.c:394
msgid "Module for accessing a repository on local disk."
msgstr "Módulo para acceder a un repositorio en el disco local."
-#: libsvn_ra_local/ra_plugin.c:291
+#: ../libsvn_ra_local/ra_plugin.c:434
msgid "Unable to open an ra_local session to URL"
msgstr "No se pudo abrir una sesión ra_local con el URL"
-#: libsvn_ra_local/ra_plugin.c:1432 libsvn_ra_neon/session.c:1091
-#: libsvn_ra_serf/serf.c:872 libsvn_ra_svn/client.c:2170
+#: ../libsvn_ra_local/ra_plugin.c:466
+#, fuzzy, c-format
+msgid "URL '%s' is not a child of the session's repository root URL '%s'"
+msgstr "El URL '%s' no es hijo del URL raíz del repositorio '%s'"
+
+#: ../libsvn_ra_local/ra_plugin.c:1350 ../libsvn_ra_neon/session.c:796
+#: ../libsvn_ra_serf/serf.c:225 ../libsvn_ra_svn/client.c:2174
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "No se sabe nada de la capacidad '%s'"
-#: libsvn_ra_local/ra_plugin.c:1509
+#: ../libsvn_ra_local/ra_plugin.c:1427
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versión de cargador RA (%d) no admitida para ra_local."
-#: libsvn_ra_local/split_url.c:44
+#: ../libsvn_ra_local/split_url.c:45
#, c-format
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "El URL local '%s' no contiene el prefijo 'file://'"
-#: libsvn_ra_local/split_url.c:55
+#: ../libsvn_ra_local/split_url.c:56
#, c-format
msgid "Local URL '%s' contains only a hostname, no path"
msgstr "El URL '%s' contiene sólo un nombre de máquina, sin una ruta"
-#: libsvn_ra_local/split_url.c:117
+#: ../libsvn_ra_local/split_url.c:118
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "El URL local '%s' contiene un nombre de máquina no admitido"
-#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#: ../libsvn_ra_local/split_url.c:128 ../libsvn_ra_local/split_url.c:135
#, c-format
msgid "Unable to open repository '%s'"
msgstr "No se pudo abrir el repositorio '%s'"
-#: libsvn_ra_neon/commit.c:244
+#: ../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)"
@@ -2808,45 +2840,46 @@
"No se pudo obtener el 'URL del recurso versión' (necesitado al importar o "
"cuando falta en las propiedades locales en el caché)"
-#: libsvn_ra_neon/commit.c:492
+#: ../libsvn_ra_neon/commit.c:492
#, c-format
msgid "File or directory '%s' is out of date; try updating"
-msgstr "El archivo o directorio '%s' está desactualizado; pruebe una actualización"
+msgstr ""
+"El archivo o directorio '%s' está desactualizado; pruebe una actualización"
-#: libsvn_ra_neon/commit.c:500
+#: ../libsvn_ra_neon/commit.c:500
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "La respuesta CHECKOUT no incluyó una cabecera 'Location:'"
-#: libsvn_ra_neon/commit.c:510 libsvn_ra_neon/props.c:210
-#: libsvn_ra_neon/util.c:518 libsvn_ra_serf/commit.c:1337
-#: libsvn_ra_serf/commit.c:1727 libsvn_ra_serf/update.c:2107
+#: ../libsvn_ra_neon/commit.c:510 ../libsvn_ra_neon/props.c:210
+#: ../libsvn_ra_neon/util.c:518 ../libsvn_ra_serf/commit.c:1337
+#: ../libsvn_ra_serf/commit.c:1727 ../libsvn_ra_serf/update.c:2107
#, c-format
msgid "Unable to parse URL '%s'"
msgstr "No se pudo entender el URL '%s'"
-#: libsvn_ra_neon/commit.c:1035 libsvn_ra_serf/commit.c:1577
+#: ../libsvn_ra_neon/commit.c:1035 ../libsvn_ra_serf/commit.c:1577
#, c-format
msgid "File '%s' already exists"
msgstr "El archivo '%s' ya existe"
-#: libsvn_ra_neon/commit.c:1160
+#: ../libsvn_ra_neon/commit.c:1160
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "No se pudo escribir svndiff a un archivo temporal"
-#: libsvn_ra_neon/fetch.c:278
+#: ../libsvn_ra_neon/fetch.c:254
msgid "Could not save the URL of the version resource"
msgstr "No se pudo guardar el URL del recurso versionado"
-#: libsvn_ra_neon/fetch.c:471
+#: ../libsvn_ra_neon/fetch.c:447
msgid "Could not get content-type from response"
msgstr "No se pudo obtener el 'content-type' a partir de la respuesta."
-#: libsvn_ra_neon/fetch.c:564
+#: ../libsvn_ra_neon/fetch.c:540
msgid "Could not save file"
msgstr "No se pudo grabar el archivo"
-#: libsvn_ra_neon/fetch.c:785 libsvn_ra_svn/client.c:946
+#: ../libsvn_ra_neon/fetch.c:761 ../libsvn_ra_svn/client.c:949
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2857,53 +2890,13 @@
" suma esperada: %s\n"
" suma presente: %s\n"
-#: libsvn_ra_neon/fetch.c:1031
+#: ../libsvn_ra_neon/fetch.c:1007
msgid "Server response missing the expected deadprop-count property"
msgstr ""
"A la respuesta del servidor le falta la propiedad deadprop-count y se la "
"esperaba"
-#: libsvn_ra_neon/fetch.c:1225
-msgid "Server does not support date-based operations"
-msgstr "El servidor no soporta operaciones basadas en fechas"
-
-#: libsvn_ra_neon/fetch.c:1232
-msgid "Invalid server response to dated-rev request"
-msgstr "Respuesta inválida del servidor a petición dated-rev"
-
-#: libsvn_ra_neon/fetch.c:1297
-msgid "Expected a valid revnum and path"
-msgstr "Se esperaban un número de revisión y una ruta válidos"
-
-#: libsvn_ra_neon/fetch.c:1379
-msgid "'get-locations' REPORT not implemented"
-msgstr "el REPORT 'get-locations' no está implementado"
-
-#: libsvn_ra_neon/fetch.c:1457 libsvn_ra_serf/getlocationsegments.c:101
-#: libsvn_ra_svn/client.c:1565
-msgid "Expected valid revision range"
-msgstr "Se esperaba un rango de revisiones válido"
-
-#: libsvn_ra_neon/fetch.c:1544
-msgid "'get-location-segments' REPORT not implemented"
-msgstr "el REPORT 'get-location-segments' no está implementado"
-
-#: libsvn_ra_neon/fetch.c:1721
-msgid "Incomplete lock data returned"
-msgstr "Se devolvieron datos de bloqueo incompletos"
-
-#: libsvn_ra_neon/fetch.c:1787 libsvn_ra_serf/property.c:354
-#: libsvn_ra_serf/update.c:1864
-#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "Se obtuvo una codificación no reconocida: '%s'"
-
-#: libsvn_ra_neon/fetch.c:1878 libsvn_ra_neon/fetch.c:1882
-#: libsvn_ra_serf/locks.c:545
-msgid "Server does not support locking features"
-msgstr "El servidor no admite la funcionalidad de crear bloqueos"
-
-#: libsvn_ra_neon/fetch.c:1957 libsvn_ra_serf/commit.c:2103
+#: ../libsvn_ra_neon/fetch.c:1174 ../libsvn_ra_serf/commit.c:2103
msgid ""
"DAV request failed; it's possible that the repository's pre-revprop-change "
"hook either failed or is non-existent"
@@ -2911,69 +2904,109 @@
"El requerimiento DAV falló. Es posible que el script de repositorio 'pre-"
"revprop-change' haya fallado o sea inexistente"
-#: libsvn_ra_neon/fetch.c:2688
+#: ../libsvn_ra_neon/fetch.c:1905
#, c-format
msgid "Error writing to '%s': unexpected EOF"
msgstr "Error escribiendo en '%s': final inesperado de archivo"
-#: libsvn_ra_neon/fetch.c:2835
+#: ../libsvn_ra_neon/fetch.c:2052
#, c-format
msgid "Unknown XML encoding: '%s'"
msgstr "Codificación XML desconocida: '%s'"
-#: libsvn_ra_neon/fetch.c:3122
+#: ../libsvn_ra_neon/fetch.c:2339
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "El manejo de la respuesta REPORT no completó la corrida del editor"
-#: libsvn_ra_neon/file_revs.c:285
+#: ../libsvn_ra_neon/file_revs.c:285
msgid "Failed to write full amount to stream"
msgstr "No se pudo escribir la cantidad total en un flujo"
-#: libsvn_ra_neon/file_revs.c:371
+#: ../libsvn_ra_neon/file_revs.c:371
msgid "'get-file-revs' REPORT not implemented"
msgstr "El REPORT 'get-file-revs' no está implementado"
-#: libsvn_ra_neon/file_revs.c:378
+#: ../libsvn_ra_neon/file_revs.c:378
msgid "The file-revs report didn't contain any revisions"
msgstr "El reporte de file-revs no contiene ninguna revisión"
-#: libsvn_ra_neon/lock.c:189
+#: ../libsvn_ra_neon/get_dated_rev.c:147
+msgid "Server does not support date-based operations"
+msgstr "El servidor no soporta operaciones basadas en fechas"
+
+#: ../libsvn_ra_neon/get_dated_rev.c:154
+msgid "Invalid server response to dated-rev request"
+msgstr "Respuesta inválida del servidor a petición dated-rev"
+
+#: ../libsvn_ra_neon/get_location_segments.c:118
+#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1568
+msgid "Expected valid revision range"
+msgstr "Se esperaba un rango de revisiones válido"
+
+#: ../libsvn_ra_neon/get_location_segments.c:205
+msgid "'get-location-segments' REPORT not implemented"
+msgstr "el REPORT 'get-location-segments' no está implementado"
+
+#: ../libsvn_ra_neon/get_locations.c:108
+msgid "Expected a valid revnum and path"
+msgstr "Se esperaban un número de revisión y una ruta válidos"
+
+#: ../libsvn_ra_neon/get_locations.c:190
+msgid "'get-locations' REPORT not implemented"
+msgstr "el REPORT 'get-locations' no está implementado"
+
+#: ../libsvn_ra_neon/get_locks.c:231
+msgid "Incomplete lock data returned"
+msgstr "Se devolvieron datos de bloqueo incompletos"
+
+#: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:354
+#: ../libsvn_ra_serf/update.c:1864
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr "Se obtuvo una codificación no reconocida: '%s'"
+
+#: ../libsvn_ra_neon/get_locks.c:388 ../libsvn_ra_neon/get_locks.c:392
+#: ../libsvn_ra_serf/locks.c:545
+msgid "Server does not support locking features"
+msgstr "El servidor no admite la funcionalidad de crear bloqueos"
+
+#: ../libsvn_ra_neon/lock.c:189
msgid "Invalid creation date header value in response."
msgstr "Cabecera de fecha de creación inválida en la respuesta."
-#: libsvn_ra_neon/lock.c:213
+#: ../libsvn_ra_neon/lock.c:213
msgid "Invalid timeout value"
msgstr "Valor máximo de espera inválido"
-#: libsvn_ra_neon/lock.c:252 libsvn_ra_neon/lock.c:382
+#: ../libsvn_ra_neon/lock.c:252 ../libsvn_ra_neon/lock.c:382
#, c-format
msgid "Failed to parse URI '%s'"
msgstr "No se pudo entender el URI '%s'"
-#: libsvn_ra_neon/lock.c:397 libsvn_ra_serf/locks.c:705
+#: ../libsvn_ra_neon/lock.c:397 ../libsvn_ra_serf/locks.c:705
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "'%s' no está bloqueado en el repositorio"
-#: libsvn_ra_neon/lock.c:524
+#: ../libsvn_ra_neon/lock.c:524
msgid "Failed to fetch lock information"
msgstr "El pedido de información de bloqueos falló"
-#: libsvn_ra_neon/log.c:169 libsvn_ra_serf/log.c:210
+#: ../libsvn_ra_neon/log.c:164 ../libsvn_ra_serf/log.c:203
#, c-format
msgid "Missing name attr in revprop element"
msgstr "Falta el atributo 'name' en el elemento 'revprop'"
# ¡Traducción hecha viendo el código!
-#: libsvn_ra_neon/log.c:299 libsvn_ra_serf/log.c:299
-#: libsvn_ra_svn/client.c:1290
+#: ../libsvn_ra_neon/log.c:433 ../libsvn_ra_serf/log.c:533
+#: ../libsvn_ra_svn/client.c:1293
msgid "Server does not support custom revprops via log"
msgstr ""
"El servidor es viejo y no tiene la capacidad de enviar propiedades "
"personalizadas via log"
-#: libsvn_ra_neon/merge.c:218
+#: ../libsvn_ra_neon/merge.c:218
#, c-format
msgid ""
"Protocol error: we told the server not to auto-merge any resources, but it "
@@ -2982,7 +3015,7 @@
"Error de protocolo: le dijimos al servidor que no auto-fusione ningún "
"recurso, pero dijo que '%s' fue fusionado"
-#: libsvn_ra_neon/merge.c:227
+#: ../libsvn_ra_neon/merge.c:227
#, c-format
msgid ""
"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
@@ -2991,7 +3024,7 @@
"Error interno: hay un padre desconocido (%d) para el elemento 'DAV:response' "
"dentro de la respuesta MERGE"
-#: libsvn_ra_neon/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 "
@@ -3001,16 +3034,16 @@
"todas las propiedades que solicitamos (y que necesitamos para completar el "
"commit)"
-#: libsvn_ra_neon/merge.c:261 libsvn_ra_serf/merge.c:302
+#: ../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 "Una respuesta a un merge para '%s' no es un hijo del destino ('%s')"
-#: libsvn_ra_neon/merge.c:515
+#: ../libsvn_ra_neon/merge.c:515
msgid "The MERGE property response had an error status"
msgstr "La respuesta la propiedad MERGE tuvo un estado de error"
-#: libsvn_ra_neon/options.c:144
+#: ../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"
@@ -3018,192 +3051,192 @@
"La respuesta OPTIONS no incluyó el activity-collection-set solicitado; esto "
"frecuentemente significa que el URL no tiene WebDAV habilitado"
-#: libsvn_ra_neon/props.c:598
+#: ../libsvn_ra_neon/props.c:598
#, c-format
msgid "Failed to find label '%s' for URL '%s'"
msgstr "No se encontró la etiqueta '%s' para el URL '%s'"
-#: libsvn_ra_neon/props.c:627
+#: ../libsvn_ra_neon/props.c:627
#, c-format
msgid "'%s' was not present on the resource"
msgstr "'%s' no está presente en el recurso"
-#: libsvn_ra_neon/props.c:670
+#: ../libsvn_ra_neon/props.c:670
#, c-format
msgid "Neon was unable to parse URL '%s'"
msgstr "Neon no pudo entender el URL '%s'"
-#: libsvn_ra_neon/props.c:703
+#: ../libsvn_ra_neon/props.c:703
msgid "The path was not part of a repository"
msgstr "La ruta no es parte de un repositorio"
-#: libsvn_ra_neon/props.c:712 libsvn_ra_serf/property.c:681
+#: ../libsvn_ra_neon/props.c:712 ../libsvn_ra_serf/property.c:681
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
msgstr "Ninguna parte de la ruta '%s' fue encontrada en HEAD del repositorio"
-#: libsvn_ra_neon/props.c:764 libsvn_ra_neon/props.c:819
+#: ../libsvn_ra_neon/props.c:764 ../libsvn_ra_neon/props.c:819
msgid "The VCC property was not found on the resource"
msgstr "No se encontró en el recurso la propiedad VCC"
-#: libsvn_ra_neon/props.c:832
+#: ../libsvn_ra_neon/props.c:832
msgid "The relative-path property was not found on the resource"
msgstr "No se encontró en el recurso la propiedad relative-path"
-#: libsvn_ra_neon/props.c:953
+#: ../libsvn_ra_neon/props.c:953
msgid "'DAV:baseline-collection' was not present on the baseline resource"
msgstr ""
"'DAV:baseline-collection' no estuvo presente en el recurso de la línea base"
-#: libsvn_ra_neon/props.c:972
+#: ../libsvn_ra_neon/props.c:972
#, c-format
msgid "'%s' was not present on the baseline resource"
msgstr "'%s' no estaba presente en el recurso de la línea base"
-#: libsvn_ra_neon/props.c:1124 libsvn_ra_serf/commit.c:815
+#: ../libsvn_ra_neon/props.c:1124 ../libsvn_ra_serf/commit.c:815
msgid "At least one property change failed; repository is unchanged"
msgstr "Al menos un cambio de propiedad falló; repositorio inalterado"
-#: libsvn_ra_neon/replay.c:272
+#: ../libsvn_ra_neon/replay.c:272
msgid "Got apply-textdelta element without preceding add-file or open-file"
msgstr ""
"Se obtubo un elemento 'apply-textdelta' sin un 'add-file' u 'open-file' "
"previo"
-#: libsvn_ra_neon/replay.c:296
+#: ../libsvn_ra_neon/replay.c:296
msgid "Got close-file element without preceding add-file or open-file"
msgstr ""
"Se obtubo un elemento 'close-file' sin un 'add-file' u 'open-file' previo"
-#: libsvn_ra_neon/replay.c:313
+#: ../libsvn_ra_neon/replay.c:313
msgid "Got close-directory element without ever opening a directory"
msgstr ""
"Se obtubo un elemento 'close-directory' sin que se haya abierto un directorio"
-#: libsvn_ra_neon/replay.c:432 libsvn_ra_serf/replay.c:499
+#: ../libsvn_ra_neon/replay.c:432 ../libsvn_ra_serf/replay.c:499
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "Error escribiendo en flujo: fin de archivo inesperado"
-#: libsvn_ra_neon/replay.c:439
+#: ../libsvn_ra_neon/replay.c:439
#, c-format
msgid "Got cdata content for a prop delete"
msgstr "Se obtuvo contenido cdata para un borrado de propiedad"
-#: libsvn_ra_neon/session.c:454
+#: ../libsvn_ra_neon/session.c:454
msgid "Invalid URL: illegal character in proxy port number"
msgstr "URL inválido: carácter ilegal en el número de puerto del proxy"
-#: libsvn_ra_neon/session.c:458
+#: ../libsvn_ra_neon/session.c:458
msgid "Invalid URL: negative proxy port number"
msgstr "URL inválido: número de puerto del proxy negativo"
-#: libsvn_ra_neon/session.c:461
+#: ../libsvn_ra_neon/session.c:461
msgid ""
"Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr ""
"URL inválido: el puerto del proxy es mayor al máximo puerto TCP posible 65535"
-#: libsvn_ra_neon/session.c:475
+#: ../libsvn_ra_neon/session.c:475
msgid "Invalid config: illegal character in timeout value"
msgstr "Configuración inválida: carácter ilegal en valor máximo de espera"
-#: libsvn_ra_neon/session.c:479
+#: ../libsvn_ra_neon/session.c:479
msgid "Invalid config: negative timeout value"
msgstr "Configuración inválida: valor máximo de espera negativo"
-#: libsvn_ra_neon/session.c:492
+#: ../libsvn_ra_neon/session.c:492
msgid "Invalid config: illegal character in debug mask value"
msgstr ""
"Configuración inválida: carácter ilegal en el valor de la máscara de debug"
-#: libsvn_ra_neon/session.c:517
+#: ../libsvn_ra_neon/session.c:517
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr ""
"Configuración inválida: método http de autentificación '%s' desconocido"
-#: libsvn_ra_neon/session.c:578
+#: ../libsvn_ra_neon/session.c:578
msgid "Module for accessing a repository via WebDAV protocol using Neon."
msgstr "Módulo para acceder a un repositorio vía WebDAV usando Neon."
-#: libsvn_ra_neon/session.c:633 libsvn_ra_serf/locks.c:539
-msgid "Malformed URL for repository"
-msgstr "URL de repositorio no propiamente formada"
-
-#: libsvn_ra_neon/session.c:672
-msgid "Network socket initialization failed"
-msgstr "Falló la inicialización del 'socket' de red"
-
-#: libsvn_ra_neon/session.c:691
-msgid "SSL is not supported"
-msgstr "No se soporta SSL"
-
-#: libsvn_ra_neon/session.c:832
-#, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "Configuración inválida: imposible cargar archivo de certificado '%s'"
-
-#: libsvn_ra_neon/session.c:950 libsvn_ra_serf/serf.c:730
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr ""
-"La propiedad UUID no se encontró en el recurso ni en ninguno de sus padres"
-
-#: libsvn_ra_neon/session.c:958
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "Por favor actualice el servidor a la versión 0.19 o posterior"
-
-#: libsvn_ra_neon/session.c:1051
+#: ../libsvn_ra_neon/session.c:756
#, c-format
msgid "OPTIONS request (for capabilities) got HTTP response code %d"
msgstr ""
"El pedido OPTIONS (por capacidades) obtuvo un código de respuesta HTTP %d"
-#: libsvn_ra_neon/session.c:1098 libsvn_ra_serf/serf.c:879
+#: ../libsvn_ra_neon/session.c:803 ../libsvn_ra_serf/serf.c:232
#, c-format
-msgid "attempt to fetch capability '%s' resulted in '%s'"
-msgstr "el intento de obtener la capacidad '%s' resultó en '%s'"
+msgid "Attempt to fetch capability '%s' resulted in '%s'"
+msgstr "El intento de obtener la capacidad '%s' resultó en '%s'"
-#: libsvn_ra_neon/session.c:1168
+#: ../libsvn_ra_neon/session.c:826 ../libsvn_ra_serf/locks.c:539
+msgid "Malformed URL for repository"
+msgstr "URL de repositorio no propiamente formada"
+
+#: ../libsvn_ra_neon/session.c:865
+msgid "Network socket initialization failed"
+msgstr "Falló la inicialización del 'socket' de red"
+
+#: ../libsvn_ra_neon/session.c:884
+msgid "SSL is not supported"
+msgstr "No se soporta SSL"
+
+#: ../libsvn_ra_neon/session.c:1025
+#, c-format
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr "Configuración inválida: imposible cargar archivo de certificado '%s'"
+
+#: ../libsvn_ra_neon/session.c:1145 ../libsvn_ra_serf/serf.c:926
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr ""
+"La propiedad UUID no se encontró en el recurso ni en ninguno de sus padres"
+
+#: ../libsvn_ra_neon/session.c:1153
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "Por favor actualice el servidor a la versión 0.19 o posterior"
+
+#: ../libsvn_ra_neon/session.c:1223
#, c-format
msgid "Unsupported RA loader version (%d) for ra_neon"
msgstr "Versión de cargador RA (%d) no admitida para ra_neon"
-#: libsvn_ra_neon/util.c:203
+#: ../libsvn_ra_neon/util.c:203
msgid "The request response contained at least one error"
msgstr "La respuesta contenía al menos un error"
-#: libsvn_ra_neon/util.c:238
+#: ../libsvn_ra_neon/util.c:238
msgid "The response contains a non-conforming HTTP status line"
msgstr "La respuesta contiene una línea de estado HTTP no conformante"
-#: libsvn_ra_neon/util.c:248
+#: ../libsvn_ra_neon/util.c:248
#, c-format
msgid "Error setting property '%s': "
msgstr "Error estableciendo la propiedad '%s': "
-#: libsvn_ra_neon/util.c:532
+#: ../libsvn_ra_neon/util.c:532
#, c-format
msgid "%s of '%s'"
msgstr "%s de '%s'"
-#: libsvn_ra_neon/util.c:544
+#: ../libsvn_ra_neon/util.c:544
#, c-format
msgid "'%s' path not found"
msgstr "ruta '%s' no encontrada"
-#: libsvn_ra_neon/util.c:553
+#: ../libsvn_ra_neon/util.c:553
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr "El repositorio se movió permanente a '%'s; use 'relocate' por favor"
-#: libsvn_ra_neon/util.c:555
+#: ../libsvn_ra_neon/util.c:555
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr ""
"El repositorio se movió temporariamente a '%s'; use 'relocate' por favor"
-#: libsvn_ra_neon/util.c:563
+#: ../libsvn_ra_neon/util.c:563
#, c-format
msgid ""
"Server sent unexpected return value (%d %s) in response to %s request for '%"
@@ -3212,40 +3245,40 @@
"El servidor envió un valor de devolución inesperado (%d %s) en respuesta al "
"requerimiento %s para '%s'"
-#: libsvn_ra_neon/util.c:569
+#: ../libsvn_ra_neon/util.c:569
msgid "authorization failed"
msgstr "falló la autorización"
-#: libsvn_ra_neon/util.c:573
+#: ../libsvn_ra_neon/util.c:573
msgid "could not connect to server"
msgstr "no se pudo establecer la conexión con el servidor"
-#: libsvn_ra_neon/util.c:577
+#: ../libsvn_ra_neon/util.c:577
msgid "timed out waiting for server"
msgstr "tiempo máximo de esperando al servidor superado"
-#: libsvn_ra_neon/util.c:910
+#: ../libsvn_ra_neon/util.c:910
#, c-format
msgid "Can't calculate the request body size"
msgstr "No se puede calcular el tamaño del cuerpo del requerimiento"
-#: libsvn_ra_neon/util.c:1237
+#: ../libsvn_ra_neon/util.c:1237
#, c-format
msgid "Error reading spooled %s request response"
msgstr "Error leyendo la respuesta almacenada temporariamente al pedido %s"
-#: libsvn_ra_neon/util.c:1247
+#: ../libsvn_ra_neon/util.c:1247
#, c-format
msgid "The %s request returned invalid XML in the response: %s (%s)"
msgstr "El requerimiento %s devolvió una respuesta con XML inválido: %s (%s)"
-#: libsvn_ra_neon/util.c:1279
+#: ../libsvn_ra_neon/util.c:1279
#, c-format
msgid "%s request failed on '%s'"
msgstr "requerimiento %s falló en '%s'"
-#: libsvn_ra_serf/blame.c:463 libsvn_ra_serf/serf.c:255
-#: libsvn_ra_serf/update.c:2166 libsvn_ra_serf/util.c:1176
+#: ../libsvn_ra_serf/blame.c:463 ../libsvn_ra_serf/serf.c:451
+#: ../libsvn_ra_serf/update.c:2166 ../libsvn_ra_serf/util.c:1177
msgid ""
"The OPTIONS response did not include the requested version-controlled-"
"configuration value"
@@ -3253,491 +3286,490 @@
"La respuesta a OPTIONS no incluyó el valor version-controlled-configuration "
"pedido"
-#: libsvn_ra_serf/blame.c:475
+#: ../libsvn_ra_serf/blame.c:475
msgid ""
"The OPTIONS response did not include the requested baseline-relative-path "
"value"
msgstr ""
"La respuesta a OPTIONS no incluyó el valor baseline-relative-path pedido"
-#: libsvn_ra_serf/blame.c:495 libsvn_ra_serf/commit.c:1128
-#: libsvn_ra_serf/property.c:923 libsvn_ra_serf/serf.c:271
-#: libsvn_ra_serf/update.c:1103 libsvn_ra_serf/update.c:1647
+#: ../libsvn_ra_serf/blame.c:495 ../libsvn_ra_serf/commit.c:1128
+#: ../libsvn_ra_serf/property.c:923 ../libsvn_ra_serf/serf.c:467
+#: ../libsvn_ra_serf/update.c:1103 ../libsvn_ra_serf/update.c:1647
msgid "The OPTIONS response did not include the requested checked-in value"
msgstr "La respuesta a OPTIONS no incluyó el valor checked-in pedido"
-#: libsvn_ra_serf/blame.c:522 libsvn_ra_serf/commit.c:1357
-#: libsvn_ra_serf/commit.c:1747 libsvn_ra_serf/getlocations.c:257
-#: libsvn_ra_serf/property.c:937 libsvn_ra_serf/serf.c:393
-#: libsvn_ra_serf/serf.c:629
+#: ../libsvn_ra_serf/blame.c:522 ../libsvn_ra_serf/commit.c:1357
+#: ../libsvn_ra_serf/commit.c:1747 ../libsvn_ra_serf/property.c:937
+#: ../libsvn_ra_serf/serf.c:589 ../libsvn_ra_serf/serf.c:825
msgid ""
"The OPTIONS response did not include the requested baseline-collection value"
msgstr "La respuesta a OPTIONS no incluyó el valor baseline-collection pedido"
-#: libsvn_ra_serf/commit.c:408 libsvn_ra_serf/commit.c:428
+#: ../libsvn_ra_serf/commit.c:408 ../libsvn_ra_serf/commit.c:428
#, c-format
msgid "Directory '%s' is out of date; try updating"
msgstr "El directorio '%s' está desactualizado; pruebe una actualización"
-#: libsvn_ra_serf/commit.c:421 libsvn_ra_serf/commit.c:504
-#: libsvn_ra_serf/commit.c:570 libsvn_repos/commit.c:386
+#: ../libsvn_ra_serf/commit.c:421 ../libsvn_ra_serf/commit.c:504
+#: ../libsvn_ra_serf/commit.c:570 ../libsvn_repos/commit.c:388
#, c-format
msgid "Path '%s' not present"
msgstr "La ruta '%s' no está presente"
-#: libsvn_ra_serf/commit.c:557 libsvn_ra_serf/commit.c:577
+#: ../libsvn_ra_serf/commit.c:557 ../libsvn_ra_serf/commit.c:577
#, c-format
msgid "File '%s' is out of date; try updating"
msgstr "El archivo '%s' está desactualizado; pruebe una actualización"
-#: libsvn_ra_serf/commit.c:1020
+#: ../libsvn_ra_serf/commit.c:1020
#, c-format
msgid "Failed writing updated file"
msgstr "Falló el escribir el archivo actualizado"
-#: libsvn_ra_serf/commit.c:1072
+#: ../libsvn_ra_serf/commit.c:1072
msgid ""
"The OPTIONS response did not include the requested activity-collection-set "
"value"
msgstr ""
"La respuesta a OPTIONS no incluyó el valor activity-collection-set pedido"
-#: libsvn_ra_serf/commit.c:1100
+#: ../libsvn_ra_serf/commit.c:1100
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s de '%s': %d %s (%s://%s)"
-#: libsvn_ra_serf/commit.c:1383
+#: ../libsvn_ra_serf/commit.c:1383
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Falló el añadir un directorio: %s en %s (%d)"
-#: libsvn_ra_serf/locks.c:408
+#: ../libsvn_ra_serf/locks.c:408
#, c-format
msgid "Lock request failed: %d %s"
msgstr "El pedido de bloqueo falló: %d %s"
-#: libsvn_ra_serf/locks.c:631
+#: ../libsvn_ra_serf/locks.c:631
msgid "Lock request failed"
msgstr "El pedido de bloqueo falló"
-#: libsvn_ra_serf/locks.c:745
+#: ../libsvn_ra_serf/locks.c:745
#, c-format
msgid "Unlock request failed: %d %s"
msgstr "El pedido de desbloquear falló: %d %s"
-#: libsvn_ra_serf/replay.c:161 libsvn_ra_serf/update.c:1200
+#: ../libsvn_ra_serf/replay.c:161 ../libsvn_ra_serf/update.c:1200
msgid "Missing revision attr in target-revision element"
msgstr "Falta el atributo 'revision' en el elemento 'target-revision'"
-#: libsvn_ra_serf/replay.c:179
+#: ../libsvn_ra_serf/replay.c:179
msgid "Missing revision attr in open-root element"
msgstr "Falta el atributo 'revision' en el elemento 'open-root'"
-#: libsvn_ra_serf/replay.c:198 libsvn_ra_serf/update.c:1402
+#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1402
msgid "Missing name attr in delete-entry element"
msgstr "Falta el atributo 'name' en el elemento 'delete-entry'"
-#: libsvn_ra_serf/replay.c:204
+#: ../libsvn_ra_serf/replay.c:204
msgid "Missing revision attr in delete-entry element"
msgstr "Falta el atributo 'revision' en el elemento 'delete-entry'"
-#: libsvn_ra_serf/replay.c:224 libsvn_ra_serf/update.c:1262
+#: ../libsvn_ra_serf/replay.c:224 ../libsvn_ra_serf/update.c:1262
msgid "Missing name attr in open-directory element"
msgstr "Falta el atributo 'name' en el elemento 'open-directory'"
-#: libsvn_ra_serf/replay.c:230 libsvn_ra_serf/update.c:1218
-#: libsvn_ra_serf/update.c:1253
+#: ../libsvn_ra_serf/replay.c:230 ../libsvn_ra_serf/update.c:1218
+#: ../libsvn_ra_serf/update.c:1253
msgid "Missing revision attr in open-directory element"
msgstr "Falta el atributo 'revision' en el elemento 'open-directory'"
-#: libsvn_ra_serf/replay.c:250 libsvn_ra_serf/update.c:1297
+#: ../libsvn_ra_serf/replay.c:250 ../libsvn_ra_serf/update.c:1297
msgid "Missing name attr in add-directory element"
msgstr "Falta el atributo 'name' en el elemento 'add-directory'"
-#: libsvn_ra_serf/replay.c:285 libsvn_ra_serf/update.c:1337
+#: ../libsvn_ra_serf/replay.c:285 ../libsvn_ra_serf/update.c:1337
msgid "Missing name attr in open-file element"
msgstr "Falta el atributo 'name' en el elemento 'open-file'"
-#: libsvn_ra_serf/replay.c:291 libsvn_ra_serf/update.c:1346
+#: ../libsvn_ra_serf/replay.c:291 ../libsvn_ra_serf/update.c:1346
msgid "Missing revision attr in open-file element"
msgstr "Falta el atributo 'revision' en el elemento 'open-file'"
-#: libsvn_ra_serf/replay.c:311 libsvn_ra_serf/update.c:1372
+#: ../libsvn_ra_serf/replay.c:311 ../libsvn_ra_serf/update.c:1372
msgid "Missing name attr in add-file element"
msgstr "Falta el atributo 'name' en el elemento 'add-file'"
-#: libsvn_ra_serf/replay.c:378 libsvn_ra_serf/update.c:1492
-#: libsvn_ra_serf/update.c:1569
+#: ../libsvn_ra_serf/replay.c:378 ../libsvn_ra_serf/update.c:1492
+#: ../libsvn_ra_serf/update.c:1569
#, c-format
msgid "Missing name attr in %s element"
msgstr "Falta el atributo 'name' en el elemento '%s'"
-#: libsvn_ra_serf/serf.c:54
+#: ../libsvn_ra_serf/serf.c:248
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr "Módulo para acceder a un repositorio vía WebDAV usando serf."
-#: libsvn_ra_serf/serf.c:174
+#: ../libsvn_ra_serf/serf.c:368
#, c-format
msgid "Could not lookup hostname `%s'"
msgstr "No se pudo buscar el nombre de máquina `%s'"
-#: libsvn_ra_serf/serf.c:288
+#: ../libsvn_ra_serf/serf.c:484
msgid "The OPTIONS response did not include the requested version-name value"
msgstr "La respuesta a OPTIONS no incluyó el valor version-name pedido"
-#: libsvn_ra_serf/serf.c:452
+#: ../libsvn_ra_serf/serf.c:648
msgid "The OPTIONS response did not include the requested resourcetype value"
msgstr "La respuesta a OPTIONS no incluyó el valor resourcetype pedido"
-#: libsvn_ra_serf/serf.c:943
+#: ../libsvn_ra_serf/serf.c:990
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Versión de cargador RA (%d) no admitida para ra_serf"
-#: libsvn_ra_serf/update.c:1433
+#: ../libsvn_ra_serf/update.c:1433
msgid "Missing name attr in absent-directory element"
msgstr "Falta el atributo 'name' en el elemento 'absent-directory'"
-#: libsvn_ra_serf/update.c:1456
+#: ../libsvn_ra_serf/update.c:1456
msgid "Missing name attr in absent-file element"
msgstr "Falta el atributo 'name' en el elemento 'absent-file'"
-#: libsvn_ra_serf/update.c:2237
+#: ../libsvn_ra_serf/update.c:2237
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Error obteniendo el resultado de REPORT (%d)"
-#: libsvn_ra_serf/util.c:963
+#: ../libsvn_ra_serf/util.c:964
msgid "Premature EOF seen from server"
msgstr "Se recibió del servidor un EOF prematuro"
-#: libsvn_ra_serf/util.c:1013
+#: ../libsvn_ra_serf/util.c:1014
msgid "Unspecified error message"
msgstr "Mensaje de error no especificado"
-#: libsvn_ra_svn/client.c:133
+#: ../libsvn_ra_svn/client.c:133
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Nombre de máquina '%s' desconocido"
-#: libsvn_ra_svn/client.c:145
+#: ../libsvn_ra_svn/client.c:145
#, c-format
msgid "Can't create socket"
msgstr "No se pudo crear el socket"
-#: libsvn_ra_svn/client.c:149
+#: ../libsvn_ra_svn/client.c:149
#, c-format
msgid "Can't connect to host '%s'"
msgstr "No fue posible conectarse al equipo '%s'"
-#: libsvn_ra_svn/client.c:172
+#: ../libsvn_ra_svn/client.c:172
msgid "Prop diffs element not a list"
msgstr "Elemento de difs de propiedades no es una lista"
-#: libsvn_ra_svn/client.c:210
+#: ../libsvn_ra_svn/client.c:210
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Tipo de nodo no reconocido '%s' del servidor"
-#: libsvn_ra_svn/client.c:374
+#: ../libsvn_ra_svn/client.c:374
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Protocolo de túnel '%s' no definido"
-#: libsvn_ra_svn/client.c:391
+#: ../libsvn_ra_svn/client.c:391
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr ""
"El protocolo de túnel %s requiere que la variable de entorno %s sea definida"
-#: libsvn_ra_svn/client.c:402
+#: ../libsvn_ra_svn/client.c:402
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "No se pudieron procesar los símbolos del comando '%s'"
-#: libsvn_ra_svn/client.c:433
+#: ../libsvn_ra_svn/client.c:433
#, c-format
msgid "Error in child process: %s"
msgstr "Error en proceso hijo: '%s'"
-#: libsvn_ra_svn/client.c:457
+#: ../libsvn_ra_svn/client.c:457
#, c-format
msgid "Can't create tunnel"
msgstr "No se pudo crear el túnel"
-#: libsvn_ra_svn/client.c:495
+#: ../libsvn_ra_svn/client.c:495
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "URL de repositorio de svn ilegal '%s'"
-#: libsvn_ra_svn/client.c:554
+#: ../libsvn_ra_svn/client.c:554
#, c-format
msgid "Server requires minimum version %d"
msgstr "El servidor requiere como mínimo la versión %d"
-#: libsvn_ra_svn/client.c:558
+#: ../libsvn_ra_svn/client.c:558
#, c-format
msgid "Server only supports versions up to %d"
msgstr "El servidor sólo admite versiones hasta la %d"
# ¡Traducción hecha viendo el código!
-#: libsvn_ra_svn/client.c:566
+#: ../libsvn_ra_svn/client.c:566
msgid "Server does not support edit pipelining"
msgstr "El servidor es viejo y no tiene la capacidad 'edit-pipeline'"
-#: libsvn_ra_svn/client.c:592
+#: ../libsvn_ra_svn/client.c:595
msgid "Impossibly long repository root from server"
msgstr "El servidor devolvió una raíz de repositorio imposiblemente larga"
-#: libsvn_ra_svn/client.c:603
+#: ../libsvn_ra_svn/client.c:606
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Módulo para acceder al repositorio vía el protocolo de red svn."
-#: libsvn_ra_svn/client.c:763
+#: ../libsvn_ra_svn/client.c:766
msgid "Server did not send repository root"
msgstr "El servidor no envió la raíz del repositorio"
-#: libsvn_ra_svn/client.c:836
+#: ../libsvn_ra_svn/client.c:839
msgid ""
"Server doesn't support setting arbitrary revision properties during commit"
msgstr ""
"El servidor no admite el establecer propiedades de revisión arbitrarias en "
"el momento del commit"
-#: libsvn_ra_svn/client.c:924
+#: ../libsvn_ra_svn/client.c:927
msgid "Non-string as part of file contents"
msgstr "Parte del contenido del archivo no es una cadena"
-#: libsvn_ra_svn/client.c:1025
+#: ../libsvn_ra_svn/client.c:1028
msgid "Dirlist element not a list"
msgstr "Elemento de la lista de directorios no es una lista"
-#: libsvn_ra_svn/client.c:1086
+#: ../libsvn_ra_svn/client.c:1089
msgid "Merge info element is not a list"
msgstr "Un elemento en la info de fusión no es una lista"
-#: libsvn_ra_svn/client.c:1279
+#: ../libsvn_ra_svn/client.c:1282
msgid "Log entry not a list"
msgstr "Entrada de bitácora no es una lista"
-#: libsvn_ra_svn/client.c:1314
+#: ../libsvn_ra_svn/client.c:1317
msgid "Changed-path entry not a list"
msgstr "La entrada Changed-path no es una lista"
-#: libsvn_ra_svn/client.c:1430
+#: ../libsvn_ra_svn/client.c:1433
msgid "'stat' not implemented"
msgstr "'stat' no implementado"
-#: libsvn_ra_svn/client.c:1487
+#: ../libsvn_ra_svn/client.c:1490
msgid "'get-locations' not implemented"
msgstr "'get-locations' no está implementado"
-#: libsvn_ra_svn/client.c:1499
+#: ../libsvn_ra_svn/client.c:1502
msgid "Location entry not a list"
msgstr "La entrada Location no es una lista"
-#: libsvn_ra_svn/client.c:1544
+#: ../libsvn_ra_svn/client.c:1547
msgid "'get-location-segments' not implemented"
msgstr "'get-location-segments' no está implementado"
-#: libsvn_ra_svn/client.c:1556
+#: ../libsvn_ra_svn/client.c:1559
#, fuzzy
msgid "Location segment entry not a list"
msgstr "La entrada Location no es una lista"
-#: libsvn_ra_svn/client.c:1618
+#: ../libsvn_ra_svn/client.c:1621
msgid "'get-file-revs' not implemented"
msgstr "'get-file-revs' no está implementado"
-#: libsvn_ra_svn/client.c:1631
+#: ../libsvn_ra_svn/client.c:1634
msgid "Revision entry not a list"
msgstr "La entrada de la revisión no es una lista"
-#: libsvn_ra_svn/client.c:1648 libsvn_ra_svn/client.c:1673
+#: ../libsvn_ra_svn/client.c:1651 ../libsvn_ra_svn/client.c:1676
msgid "Text delta chunk not a string"
msgstr "Porción del delta de texto no es una cadena"
-#: libsvn_ra_svn/client.c:1685
+#: ../libsvn_ra_svn/client.c:1688
msgid "The get-file-revs command didn't return any revisions"
msgstr "El comando get-file-revs no devolvió ninguna revisión"
-#: libsvn_ra_svn/client.c:1733
+#: ../libsvn_ra_svn/client.c:1736
msgid "Server doesn't support the lock command"
msgstr "El servidor no soporta el comando 'lock'"
-#: libsvn_ra_svn/client.c:1797
+#: ../libsvn_ra_svn/client.c:1800
msgid "Server doesn't support the unlock command"
msgstr "El servidor no soporta el comando 'unlock'"
-#: libsvn_ra_svn/client.c:1894
+#: ../libsvn_ra_svn/client.c:1897
msgid "Lock response not a list"
msgstr "La respuesta a un pedido de bloqueo no es una lista"
-#: libsvn_ra_svn/client.c:1908
+#: ../libsvn_ra_svn/client.c:1911
msgid "Unknown status for lock command"
msgstr "Se recibió un estado desconocido para el comando 'lock'"
-#: libsvn_ra_svn/client.c:1930
+#: ../libsvn_ra_svn/client.c:1933
msgid "Didn't receive end marker for lock responses"
msgstr "No se recibió el marcador de final para las respuestas de 'lock'"
-#: libsvn_ra_svn/client.c:2017
+#: ../libsvn_ra_svn/client.c:2020
msgid "Unlock response not a list"
msgstr "La respuesta a un pedido de desbloqueo no es una lista"
-#: libsvn_ra_svn/client.c:2031
+#: ../libsvn_ra_svn/client.c:2034
msgid "Unknown status for unlock command"
msgstr "Se recibió un estado desconocido para el comando 'unlock'"
-#: libsvn_ra_svn/client.c:2052
+#: ../libsvn_ra_svn/client.c:2055
msgid "Didn't receive end marker for unlock responses"
msgstr "No se recibió el marcador de final para las respuestas de 'unlock'"
-#: libsvn_ra_svn/client.c:2076 libsvn_ra_svn/client.c:2104
+#: ../libsvn_ra_svn/client.c:2079 ../libsvn_ra_svn/client.c:2107
msgid "Server doesn't support the get-lock command"
msgstr "El servidor no soporta el comando 'get-lock'"
-#: libsvn_ra_svn/client.c:2117
+#: ../libsvn_ra_svn/client.c:2120
msgid "Lock element not a list"
msgstr "Elemento bloqueo no es una lista"
-#: libsvn_ra_svn/client.c:2140
+#: ../libsvn_ra_svn/client.c:2143
msgid "Server doesn't support the replay command"
msgstr "El servidor no soporta el comando 'replay'"
-#: libsvn_ra_svn/client.c:2233
+#: ../libsvn_ra_svn/client.c:2237
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Versión de cargador RA (%d) no admitida para ra_svn"
-#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/cyrus_auth.c:441 libsvn_ra_svn/cyrus_auth.c:488
-#: 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:441 ../libsvn_ra_svn/cyrus_auth.c:488
+#: ../libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Respuesta del servidor inesperada ante autenticación"
-#: 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:104
+#: ../svnserve/cyrus_auth.c:114
#, c-format
msgid "Could not initialize the SASL library"
msgstr "No se pudo incializar la biblioteca SASL"
-#: libsvn_ra_svn/cyrus_auth.c:811 libsvn_ra_svn/internal_auth.c:57
-#: libsvn_ra_svn/internal_auth.c:108
+#: ../libsvn_ra_svn/cyrus_auth.c:811 ../libsvn_ra_svn/internal_auth.c:57
+#: ../libsvn_ra_svn/internal_auth.c:108
#, c-format
msgid "Authentication error from server: %s"
msgstr "Error de autentificación del servidor: %s"
-#: libsvn_ra_svn/cyrus_auth.c:815
+#: ../libsvn_ra_svn/cyrus_auth.c:815
msgid "Can't get username or password"
msgstr "No se pudo obtener el usuario o la clave"
-#: libsvn_ra_svn/editorp.c:129
+#: ../libsvn_ra_svn/editorp.c:129
msgid "Successful edit status returned too soon"
msgstr "Estatus de edición exitosa retornado demasiado pronto"
-#: libsvn_ra_svn/editorp.c:456
+#: ../libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Símbolo de archivo o directorio inválido durante la edición"
-#: libsvn_ra_svn/editorp.c:665
+#: ../libsvn_ra_svn/editorp.c:665
msgid "Apply-textdelta already active"
msgstr "Apply-textdelta ya está activo"
-#: 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 no está activo"
-#: libsvn_ra_svn/editorp.c:800
+#: ../libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "El comando 'finish-replay' es inválido fuera de un 'replay'"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:907
+#: ../libsvn_ra_svn/editorp.c:891 ../libsvn_ra_svn/marshal.c:907
#, c-format
msgid "Unknown command '%s'"
msgstr "Comando desconocido: '%s'"
-#: libsvn_ra_svn/internal_auth.c:95 libsvn_subr/prompt.c:156
+#: ../libsvn_ra_svn/internal_auth.c:95 ../libsvn_subr/prompt.c:156
#, c-format
msgid "Can't get password"
msgstr "No se pudo obtener clave"
-#: libsvn_ra_svn/marshal.c:86
+#: ../libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "La entrada Capability no es una palabra"
-#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
-#: libsvn_ra_svn/streams.c:155
+#: ../libsvn_ra_svn/marshal.c:253 ../libsvn_ra_svn/streams.c:80
+#: ../libsvn_ra_svn/streams.c:155
msgid "Connection closed unexpectedly"
msgstr "La conexión de red se cerró inesperadamente"
-#: libsvn_ra_svn/marshal.c:537
+#: ../libsvn_ra_svn/marshal.c:537
msgid "String length larger than maximum"
msgstr "La cadena es más larga que el máximo"
-#: libsvn_ra_svn/marshal.c:574
+#: ../libsvn_ra_svn/marshal.c:574
msgid "Too many nested items"
msgstr "Demasiados items anidados"
-#: libsvn_ra_svn/marshal.c:593
+#: ../libsvn_ra_svn/marshal.c:593
msgid "Number is larger than maximum"
msgstr "El número es más largo que el máximo"
-#: libsvn_ra_svn/marshal.c:807
+#: ../libsvn_ra_svn/marshal.c:807
msgid "Proplist element not a list"
msgstr "Elemento de la Lista de Propiedades no es una lista"
-#: libsvn_ra_svn/marshal.c:830
+#: ../libsvn_ra_svn/marshal.c:830
msgid "Empty error list"
msgstr "Lista de error vacía"
-#: libsvn_ra_svn/marshal.c:839
+#: ../libsvn_ra_svn/marshal.c:839
msgid "Malformed error list"
msgstr "Lista de errores malformada"
-#: libsvn_ra_svn/marshal.c:878
+#: ../libsvn_ra_svn/marshal.c:878
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Estatus desconocido '%s' en la respuesta del comando"
-#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
+#: ../libsvn_ra_svn/streams.c:77 ../libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
msgstr "No se puede leer desde la conexión"
-#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
+#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:166
#, c-format
msgid "Can't write to connection"
msgstr "No se puede escribir a la conexión"
-#: libsvn_ra_svn/streams.c:144
+#: ../libsvn_ra_svn/streams.c:144
#, c-format
msgid "Can't get socket timeout"
msgstr "No se pudo obtener el tiempo de espera máximo del socket"
-#: libsvn_repos/commit.c:127
+#: ../libsvn_repos/commit.c:127
#, c-format
msgid "Directory '%s' is out of date"
msgstr "El directorio '%s' está desactualizado"
-#: libsvn_repos/commit.c:128
+#: ../libsvn_repos/commit.c:128
#, c-format
msgid "File '%s' is out of date"
msgstr "El archivo '%s' está desactualizado"
-#: libsvn_repos/commit.c:294 libsvn_repos/commit.c:439
+#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Se obtuvo una ruta origen, pero no una revisión origen para '%s'"
-#: libsvn_repos/commit.c:326 libsvn_repos/commit.c:470
+#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "El URL origen '%s' es de un repositorio diferente"
-#: libsvn_repos/commit.c:595
+#: ../libsvn_repos/commit.c:597
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3750,15 +3782,15 @@
" suma esperada: %s\n"
" suma presente: %s\n"
-#: libsvn_repos/delta.c:188
+#: ../libsvn_repos/delta.c:188
msgid "Unable to open root of edit"
msgstr "No se pudo abrir la raíz de la edición"
-#: libsvn_repos/delta.c:239
+#: ../libsvn_repos/delta.c:239
msgid "Invalid target path"
msgstr "Ruta objetivo inválida"
-#: libsvn_repos/delta.c:265
+#: ../libsvn_repos/delta.c:265
msgid ""
"Invalid editor anchoring; at least one of the input paths is not a directory "
"and there was no source entry"
@@ -3766,7 +3798,7 @@
"Anclaje del editor inválido; por lo menos una de las rutas de entrada no es "
"un directorio y no había entrada origen"
-#: libsvn_repos/dump.c:415
+#: ../libsvn_repos/dump.c:415
#, c-format
msgid ""
"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
@@ -3777,31 +3809,31 @@
"AVISO: que la última revisión volcada (%ld). Cargando este volcado en un\n"
"AVISO: repositorio vacío fallará.\n"
-#: libsvn_repos/dump.c:953
+#: ../libsvn_repos/dump.c:953
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
msgstr "La revisión de comienzo %ld es mayor que la de final %ld"
-#: libsvn_repos/dump.c:958
+#: ../libsvn_repos/dump.c:958
#, c-format
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "La revisión de final %ld es inválida (la última es %ld)"
-#: libsvn_repos/dump.c:1065
+#: ../libsvn_repos/dump.c:1065
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* Revisión %ld volcada.\n"
-#: libsvn_repos/dump.c:1066
+#: ../libsvn_repos/dump.c:1066
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* Revisión %ld verificada.\n"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1284
+#: ../libsvn_repos/fs-wrap.c:57 ../libsvn_repos/load.c:1284
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Commit exitoso, pero el hook 'post-commit' falló"
-#: libsvn_repos/fs-wrap.c:183
+#: ../libsvn_repos/fs-wrap.c:157
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3810,38 +3842,38 @@
"El almacenar la propiedad no-común '%s' no está permitido vía la interfaz "
"del repositorio y podría indicar un bug en su cliente"
-#: libsvn_repos/fs-wrap.c:260
+#: ../libsvn_repos/fs-wrap.c:253
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Escritura negada: no hay autorización para leer toda la revisión %ld"
-#: libsvn_repos/fs-wrap.c:464
+#: ../libsvn_repos/fs-wrap.c:457
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"No se puede desbloquear la ruta '%s', no se dispone de un nombre de usuario "
"autenticado"
-#: libsvn_repos/fs-wrap.c:478
+#: ../libsvn_repos/fs-wrap.c:471
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Desbloqueo exitoso, pero el hook 'post-unlock' falló"
-#: libsvn_repos/hooks.c:87
+#: ../libsvn_repos/hooks.c:87
#, c-format
msgid "'%s' hook succeeded, but error output could not be read"
msgstr ""
"El hook '%s' finalizó exitosamente, pero no se pudo leer salida de error"
-#: libsvn_repos/hooks.c:102
+#: ../libsvn_repos/hooks.c:102
msgid "[Error output could not be translated from the native locale to UTF-8.]"
msgstr ""
"[La salida de error no pudo ser traducida de la codificación nativa a UTF-8.]"
-#: libsvn_repos/hooks.c:107
+#: ../libsvn_repos/hooks.c:107
msgid "[Error output could not be read.]"
msgstr "[No se pudo leer la salida de error.]"
-#: libsvn_repos/hooks.c:116
+#: ../libsvn_repos/hooks.c:116
#, c-format
msgid ""
"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
@@ -3850,72 +3882,72 @@
"El hook '%s' falló (no terminó limpiamente: apr_exit_why_e fue %d, y el "
"código de salida fue %d)."
-#: libsvn_repos/hooks.c:123
+#: ../libsvn_repos/hooks.c:123
#, c-format
msgid "'%s' hook failed (exited with a non-zero exitcode of %d). "
msgstr "El hook '%s' falló (salió con un código de salida no cero de %d). "
-#: libsvn_repos/hooks.c:130
+#: ../libsvn_repos/hooks.c:130
msgid "The following error output was produced by the hook:\n"
msgstr "La siguiente salida de error fue producida por el hook:\n"
-#: libsvn_repos/hooks.c:137
+#: ../libsvn_repos/hooks.c:137
msgid "No error output was produced by the hook."
msgstr "El hook no produjo salida de error."
-#: libsvn_repos/hooks.c:170
+#: ../libsvn_repos/hooks.c:170
#, c-format
msgid "Can't create pipe for hook '%s'"
msgstr "No se pudo crear el pipe para el hook '%s'"
-#: libsvn_repos/hooks.c:182
+#: ../libsvn_repos/hooks.c:182
#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
msgstr ""
"No se pudo marcar el extremo de lectura del pipe como no-heredable para el "
"hook '%s'"
-#: libsvn_repos/hooks.c:188
+#: ../libsvn_repos/hooks.c:188
#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
msgstr ""
"No se pudo marcar el extremo de escritura del pipe como no-heredable para el "
"hook '%s'"
-#: libsvn_repos/hooks.c:197
+#: ../libsvn_repos/hooks.c:197
#, c-format
msgid "Can't create null stdout for hook '%s'"
msgstr "No se puede crear salida estándar nula para el hook '%s'"
-#: libsvn_repos/hooks.c:209
+#: ../libsvn_repos/hooks.c:209
#, c-format
msgid "Error closing write end of stderr pipe"
msgstr ""
"Error cerrando el extremo para escribir del pipe de la salida de error "
"estándar"
-#: libsvn_repos/hooks.c:214
+#: ../libsvn_repos/hooks.c:214
#, c-format
msgid "Failed to start '%s' hook"
msgstr "Falló el iniciar el hook '%s'"
-#: libsvn_repos/hooks.c:227
+#: ../libsvn_repos/hooks.c:227
#, c-format
msgid "Error closing read end of stderr pipe"
msgstr ""
"Error cerrando el extremo para leer del pipe de la salida de error estándar"
-#: libsvn_repos/hooks.c:231
+#: ../libsvn_repos/hooks.c:231
#, c-format
msgid "Error closing null file"
msgstr "Error cerrando el archivo nulo"
-#: libsvn_repos/hooks.c:533
+#: ../libsvn_repos/hooks.c:533
#, c-format
msgid "Failed to run '%s' hook; broken symlink"
msgstr "No se pudo correr el hook '%s': enlace simbólico roto"
-#: libsvn_repos/hooks.c:677
+#: ../libsvn_repos/hooks.c:682
msgid ""
"Repository has not been enabled to accept revision propchanges;\n"
"ask the administrator to create a pre-revprop-change hook"
@@ -3923,63 +3955,63 @@
"No se han habilitado en este repositorio los cambios en propiedades\n"
"de revisión; pídale al administrador que cree el hook pre-revprop-change"
-#: libsvn_repos/load.c:121
+#: ../libsvn_repos/load.c:121
msgid "Premature end of content data in dumpstream"
msgstr "Final prematuro de datos en el volcado"
-#: libsvn_repos/load.c:128
+#: ../libsvn_repos/load.c:128
msgid "Dumpstream data appears to be malformed"
msgstr "El volcado parece estar malformado"
-#: libsvn_repos/load.c:177
+#: ../libsvn_repos/load.c:177
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
msgstr "El volcado contiene una cabecera malformada (sin ':') en '%.20s'"
-#: libsvn_repos/load.c:190
+#: ../libsvn_repos/load.c:190
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
msgstr "El volcado contiene una cabecera malformada (sin valor) en '%.20s'"
-#: libsvn_repos/load.c:304
+#: ../libsvn_repos/load.c:304
msgid "Incomplete or unterminated property block"
msgstr "Bloque de propiedad incompleto o sin terminar"
-#: libsvn_repos/load.c:442
+#: ../libsvn_repos/load.c:442
msgid "Unexpected EOF writing contents"
msgstr "Final de archivo inesperado al escribir el contenido"
-#: libsvn_repos/load.c:471
+#: ../libsvn_repos/load.c:471
msgid "Malformed dumpfile header"
msgstr "Cabecera de archivo de volcado malformada"
-#: libsvn_repos/load.c:477 libsvn_repos/load.c:519
+#: ../libsvn_repos/load.c:477 ../libsvn_repos/load.c:519
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "Versión de archivo de volcado no admitida: %d"
-#: libsvn_repos/load.c:622
+#: ../libsvn_repos/load.c:622
msgid "Unrecognized record type in stream"
msgstr "Tipo de registro no reconocido en el flujo"
-#: libsvn_repos/load.c:734
+#: ../libsvn_repos/load.c:734
msgid "Sum of subblock sizes larger than total block content length"
msgstr ""
"La suma de los tamaños de los subloques es mayor que el largo total del "
"bloque"
-#: libsvn_repos/load.c:927
+#: ../libsvn_repos/load.c:927
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< Nueva transacción iniciada, basada en la revisión original %ld\n"
-#: libsvn_repos/load.c:972
+#: ../libsvn_repos/load.c:972
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr ""
"Revisión relativa de origen %ld no está disponible en el repositorio actual"
-#: libsvn_repos/load.c:989
+#: ../libsvn_repos/load.c:989
#, c-format
msgid ""
"Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -3992,41 +4024,41 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_repos/load.c:1042
+#: ../libsvn_repos/load.c:1042
msgid "Malformed dumpstream: Revision 0 must not contain node records"
msgstr ""
"Volcado malformado: La revisión 0 no debe contener registros de tipo nodo"
-#: libsvn_repos/load.c:1052
+#: ../libsvn_repos/load.c:1052
#, c-format
msgid " * editing path : %s ..."
msgstr " * editando ruta : %s ..."
-#: libsvn_repos/load.c:1059
+#: ../libsvn_repos/load.c:1059
#, c-format
msgid " * deleting path : %s ..."
msgstr " * borrando ruta : %s ..."
-#: libsvn_repos/load.c:1067
+#: ../libsvn_repos/load.c:1067
#, c-format
msgid " * adding path : %s ..."
msgstr " * añadiendo ruta : %s ..."
-#: libsvn_repos/load.c:1076
+#: ../libsvn_repos/load.c:1076
#, c-format
msgid " * replacing path : %s ..."
msgstr " * reemplazando ruta : %s ..."
-#: libsvn_repos/load.c:1086
+#: ../libsvn_repos/load.c:1086
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "Acción de nodo no reconocida sobre el nodo '%s'"
-#: libsvn_repos/load.c:1231
+#: ../libsvn_repos/load.c:1231
msgid " done.\n"
msgstr " hecho.\n"
-#: libsvn_repos/load.c:1308
+#: ../libsvn_repos/load.c:1308
#, c-format
msgid ""
"\n"
@@ -4037,7 +4069,7 @@
"------- Commit de la revisión %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1314
+#: ../libsvn_repos/load.c:1314
#, c-format
msgid ""
"\n"
@@ -4048,470 +4080,470 @@
"------- Commit de rev nueva %ld (cargada de la rev original %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' no fue encontrado en el sistema de archivos"
-#: libsvn_repos/replay.c:387
+#: ../libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr ""
"La ruta del sistema de archivos '%s' no es ni un archivo ni un directorio"
-#: libsvn_repos/reporter.c:230
+#: ../libsvn_repos/reporter.c:230
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Profundidad inválida (%s) para la ruta '%s'"
-#: libsvn_repos/reporter.c:753
+#: ../libsvn_repos/reporter.c:753
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "La ruta '%s' de la copia de trabajo no existe en el repositorio"
-#: libsvn_repos/reporter.c:1106
+#: ../libsvn_repos/reporter.c:1106
msgid "Not authorized to open root of edit operation"
msgstr "No se está autorizado a abrir la raíz de la operación de edición"
-#: libsvn_repos/reporter.c:1125
+#: ../libsvn_repos/reporter.c:1125
msgid "Target path does not exist"
msgstr "La ruta objetivo no existe"
-#: libsvn_repos/reporter.c:1132
+#: ../libsvn_repos/reporter.c:1132
msgid "Cannot replace a directory from within"
msgstr "No se puede reemplazar a un directorio desde dentro de él"
-#: libsvn_repos/reporter.c:1176
+#: ../libsvn_repos/reporter.c:1176
msgid "Invalid report for top level of working copy"
msgstr "'Report' inválido para la base de la copia de trabajo"
-#: libsvn_repos/reporter.c:1191
+#: ../libsvn_repos/reporter.c:1191
msgid "Two top-level reports with no target"
msgstr "Dos reportes en el nivel base sin objetivos"
-#: libsvn_repos/reporter.c:1224
+#: ../libsvn_repos/reporter.c:1224
#, c-format
msgid "Unsupported report depth '%s'"
msgstr "Profundidad de reporte '%s' no admitida"
-#: libsvn_repos/repos.c:178
+#: ../libsvn_repos/repos.c:180
#, c-format
msgid "'%s' exists and is non-empty"
msgstr "'%s' existe y no está vacío"
-#: libsvn_repos/repos.c:224
+#: ../libsvn_repos/repos.c:226
msgid "Creating db logs lock file"
msgstr "Creando archivo de bloqueo de los logs de la bd"
-#: libsvn_repos/repos.c:242
+#: ../libsvn_repos/repos.c:244
msgid "Creating db lock file"
msgstr "Creando archivo de bloqueo de la bd"
-#: libsvn_repos/repos.c:252
+#: ../libsvn_repos/repos.c:254
msgid "Creating lock dir"
msgstr "Creando directorio de lock"
-#: libsvn_repos/repos.c:283
+#: ../libsvn_repos/repos.c:285
msgid "Creating hook directory"
msgstr "Creando directorio de hooks"
-#: libsvn_repos/repos.c:346
+#: ../libsvn_repos/repos.c:361
msgid "Creating start-commit hook"
msgstr "Creando hook start-commit"
-#: libsvn_repos/repos.c:425
+#: ../libsvn_repos/repos.c:440
msgid "Creating pre-commit hook"
msgstr "Creando hook pre-commit"
-#: libsvn_repos/repos.c:501
+#: ../libsvn_repos/repos.c:516
msgid "Creating pre-revprop-change hook"
msgstr "Creando hook pre-revprop-change"
-#: libsvn_repos/repos.c:721
+#: ../libsvn_repos/repos.c:736
msgid "Creating post-commit hook"
msgstr "Creando hook post-commit"
-#: libsvn_repos/repos.c:907
+#: ../libsvn_repos/repos.c:922
msgid "Creating post-revprop-change hook"
msgstr "Creando hook post-revprop-change"
-#: libsvn_repos/repos.c:917
+#: ../libsvn_repos/repos.c:932
msgid "Creating conf directory"
msgstr "Creando directorio de configuración"
-#: libsvn_repos/repos.c:975
+#: ../libsvn_repos/repos.c:990
msgid "Creating svnserve.conf file"
msgstr "Creando archivo svnserve.conf"
-#: libsvn_repos/repos.c:993
+#: ../libsvn_repos/repos.c:1008
msgid "Creating passwd file"
msgstr "Creando archivo passwd"
-#: libsvn_repos/repos.c:1035
+#: ../libsvn_repos/repos.c:1050
msgid "Creating authz file"
msgstr "Creando archivo authz"
-#: libsvn_repos/repos.c:1068
+#: ../libsvn_repos/repos.c:1083
msgid "Could not create top-level directory"
msgstr "No se pudo crear el directorio base"
-#: libsvn_repos/repos.c:1080
+#: ../libsvn_repos/repos.c:1095
msgid "Creating DAV sandbox dir"
msgstr "Creando directorio sandbox DAV"
-#: libsvn_repos/repos.c:1151
+#: ../libsvn_repos/repos.c:1166
msgid "Error opening db lockfile"
msgstr "Error abriendo archivo de lock de la bd"
-#: libsvn_repos/repos.c:1188
+#: ../libsvn_repos/repos.c:1203
msgid "Repository creation failed"
msgstr "Falló la creación del repositorio"
-#: libsvn_repos/repos.c:1269
+#: ../libsvn_repos/repos.c:1284
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Se esperaba el formato de repositorio '%d' o '%d', se encontró '%d'"
-#: libsvn_repos/rev_hunt.c:79
+#: ../libsvn_repos/rev_hunt.c:79
#, c-format
msgid "Failed to find time on revision %ld"
msgstr "No se encontró la fecha/hora en la revisión %ld"
-#: libsvn_repos/rev_hunt.c:234 libsvn_repos/rev_hunt.c:349
+#: ../libsvn_repos/rev_hunt.c:234 ../libsvn_repos/rev_hunt.c:349
#, c-format
msgid "Invalid start revision %ld"
msgstr "Revisión inicial inválida %ld"
-#: libsvn_repos/rev_hunt.c:238 libsvn_repos/rev_hunt.c:353
+#: ../libsvn_repos/rev_hunt.c:238 ../libsvn_repos/rev_hunt.c:353
#, c-format
msgid "Invalid end revision %ld"
msgstr "Revisión final inválida %ld"
-#: libsvn_repos/rev_hunt.c:542
+#: ../libsvn_repos/rev_hunt.c:542
msgid "Unreadable path encountered; access denied"
msgstr "Se encontró una ruta ilegible, se niega el acceso"
-#: libsvn_repos/rev_hunt.c:1144
+#: ../libsvn_repos/rev_hunt.c:1115
#, c-format
msgid "'%s' is not a file in revision %ld"
msgstr "'%s' no es un archivo en la revisión %ld"
-#: libsvn_subr/cmdline.c:502
+#: ../libsvn_subr/cmdline.c:502
#, c-format
msgid "Error initializing command line arguments"
msgstr "Error incializando los parámetros de línea de comandos"
-#: libsvn_subr/config.c:633
+#: ../libsvn_subr/config.c:633
#, c-format
msgid "Config error: invalid boolean value '%s'"
msgstr "Error de configuración: valor lógico inválido '%s'"
-#: libsvn_subr/config.c:883
+#: ../libsvn_subr/config.c:883
#, c-format
msgid "Config error: invalid integer value '%s'"
msgstr "Error de configuración: valor entero inválido '%s'"
-#: libsvn_subr/config_auth.c:94
+#: ../libsvn_subr/config_auth.c:94
msgid "Unable to open auth file for reading"
msgstr "No se pudo abrir para lectura el archivo de autenticación"
-#: libsvn_subr/config_auth.c:99
+#: ../libsvn_subr/config_auth.c:99
#, c-format
msgid "Error parsing '%s'"
msgstr "Error analizando '%s'"
-#: libsvn_subr/config_auth.c:123
+#: ../libsvn_subr/config_auth.c:123
msgid "Unable to locate auth file"
msgstr "No se pudo encontrar el archivo de autenticación"
-#: libsvn_subr/config_auth.c:134
+#: ../libsvn_subr/config_auth.c:134
msgid "Unable to open auth file for writing"
msgstr "No se pudo abrir para escritura el archivo de autenticación"
-#: libsvn_subr/config_auth.c:137
+#: ../libsvn_subr/config_auth.c:137
#, c-format
msgid "Error writing hash to '%s'"
msgstr "Error escribiendo hash en '%s'"
-#: libsvn_subr/date.c:204
+#: ../libsvn_subr/date.c:204
#, c-format
msgid "Can't manipulate current date"
msgstr "No se pudo manipular la fecha actual"
-#: 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 "No se pudo calcular la fecha pedida"
-#: libsvn_subr/date.c:281
+#: ../libsvn_subr/date.c:281
#, c-format
msgid "Can't expand time"
msgstr "No se pudo expandir la fecha"
-#: libsvn_subr/dso.c:71
+#: ../libsvn_subr/dso.c:71
#, c-format
msgid "Can't grab DSO mutex"
msgstr "No se pudo tomar el mutex 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 "No se pudo soltar el mutex DSO"
-#: libsvn_subr/error.c:346
+#: ../libsvn_subr/error.c:346
msgid "Can't recode error string from APR"
msgstr "No se pudo recodificar el mensaje de error de APR"
-#: libsvn_subr/error.c:437
+#: ../libsvn_subr/error.c:437
#, c-format
msgid "%swarning: %s\n"
msgstr "%saviso: %s\n"
-#: libsvn_subr/io.c:150
+#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
msgstr "No se pudo verificar la ruta '%s'"
-#: libsvn_subr/io.c:404
+#: ../libsvn_subr/io.c:404
#, c-format
msgid "Can't open '%s'"
msgstr "No se pudo abrir '%s'"
-#: libsvn_subr/io.c:426 libsvn_subr/io.c:549
+#: ../libsvn_subr/io.c:426 ../libsvn_subr/io.c:549
#, c-format
msgid "Unable to make name for '%s'"
msgstr "No se pudo crear un nombre para '%s'"
-#: libsvn_subr/io.c:536
+#: ../libsvn_subr/io.c:536
#, c-format
msgid "Can't create symbolic link '%s'"
msgstr "No se pudo crear el enlace simbólico '%s'"
-#: libsvn_subr/io.c:553 libsvn_subr/io.c:607 libsvn_subr/io.c:635
+#: ../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 "En esta plataforma no se admiten los enlaces simbólicos"
-#: libsvn_subr/io.c:586
+#: ../libsvn_subr/io.c:586
#, c-format
msgid "Can't read contents of link"
msgstr "No se pudo leer el contenido del enlace"
-#: libsvn_subr/io.c:648
+#: ../libsvn_subr/io.c:648
#, c-format
msgid "Can't find a temporary directory"
msgstr "No se pudo encontrar un directorio temporario"
-#: libsvn_subr/io.c:742
+#: ../libsvn_subr/io.c:742
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "No se pudo copiar '%s' a '%s'"
-#: libsvn_subr/io.c:795
+#: ../libsvn_subr/io.c:795
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "No se pudo asignar permisos en '%s'"
-#: libsvn_subr/io.c:817
+#: ../libsvn_subr/io.c:817
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "No se pudo agregar '%s' a '%s'"
-#: libsvn_subr/io.c:851
+#: ../libsvn_subr/io.c:851
#, c-format
msgid "Source '%s' is not a directory"
msgstr "El origen '%s' no es un directorio"
-#: libsvn_subr/io.c:857
+#: ../libsvn_subr/io.c:857
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "El destino '%s' no es un directorio"
-#: libsvn_subr/io.c:863
+#: ../libsvn_subr/io.c:863
#, c-format
msgid "Destination '%s' already exists"
msgstr "El destino '%s' ya existe."
-#: libsvn_subr/io.c:932 libsvn_subr/io.c:1883 libsvn_subr/io.c:1934
-#: libsvn_subr/io.c:1986
+#: ../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 "No se pudo leer el directorio '%s'"
-#: libsvn_subr/io.c:937 libsvn_subr/io.c:1888 libsvn_subr/io.c:1939
-#: libsvn_subr/io.c:1991 libsvn_subr/io.c:3154
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3154
#, c-format
msgid "Error closing directory '%s'"
msgstr "Error cerrando el directorio '%s'"
-#: libsvn_subr/io.c:965
+#: ../libsvn_subr/io.c:965
#, c-format
msgid "Can't make directory '%s'"
msgstr "No se pudo crear el directorio '%s'"
-#: libsvn_subr/io.c:1052
+#: ../libsvn_subr/io.c:1052
#, c-format
msgid "Can't set access time of '%s'"
msgstr "No se pudo establecer la fecha de acceso de '%s'"
-#: libsvn_subr/io.c:1192
+#: ../libsvn_subr/io.c:1192
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr ""
"No se pudieron obtener los permisos por omisión del archivo en '%s' (falló "
"'stat')"
-#: libsvn_subr/io.c:1203
+#: ../libsvn_subr/io.c:1203
#, c-format
msgid "Can't open file at '%s'"
msgstr "No se pudo abrir el archivo en '%s'"
-#: libsvn_subr/io.c:1207
+#: ../libsvn_subr/io.c:1207
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "No se pudieron obtener los permisos del archivo en '%s' (falló 'stat')"
-#: libsvn_subr/io.c:1246 libsvn_subr/io.c:1344
+#: ../libsvn_subr/io.c:1246 ../libsvn_subr/io.c:1344
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "No se pudieron cambiar los permisos del archivo '%s'"
-#: libsvn_subr/io.c:1384
+#: ../libsvn_subr/io.c:1384
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "No se pudo marcar al archivo '%s' como sólo-lectura"
-#: libsvn_subr/io.c:1416
+#: ../libsvn_subr/io.c:1416
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "No se pudo marcar al archivo '%s' como lectura-escritura"
-#: libsvn_subr/io.c:1460
+#: ../libsvn_subr/io.c:1460
#, c-format
msgid "Error getting UID of process"
msgstr "Error obteniendo el UID de un proceso"
-#: libsvn_subr/io.c:1541
+#: ../libsvn_subr/io.c:1541
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "No se puedo conseguir un bloqueo compartido sobre el archivo '%s'"
-#: libsvn_subr/io.c:1576
+#: ../libsvn_subr/io.c:1576
#, c-format
msgid "Can't flush file '%s'"
msgstr "No se pudo purgar el búfer asociado al archivo '%s'"
-#: libsvn_subr/io.c:1577
+#: ../libsvn_subr/io.c:1577
#, c-format
msgid "Can't flush stream"
msgstr "No se pudo purgar el flujo"
-#: libsvn_subr/io.c:1589 libsvn_subr/io.c:1606
+#: ../libsvn_subr/io.c:1589 ../libsvn_subr/io.c:1606
#, c-format
msgid "Can't flush file to disk"
msgstr "No se pudo purgar el búfer de un archivo hacia el disco"
-#: libsvn_subr/io.c:1628 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#: ../libsvn_subr/io.c:1628 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "No se pudo abrir la entrada estándar"
-#: libsvn_subr/io.c:1649
+#: ../libsvn_subr/io.c:1649
msgid "Reading from stdin is disallowed"
msgstr "No se permite leer de la entrada estándar"
-#: libsvn_subr/io.c:1663
+#: ../libsvn_subr/io.c:1663
#, c-format
msgid "Can't get file name"
msgstr "No se pudo obtener el nombre de archivo"
-#: libsvn_subr/io.c:1731
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "No se pudo remover el archivo '%s'"
-#: libsvn_subr/io.c:1810 libsvn_subr/io.c:3005 libsvn_subr/io.c:3091
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3005 ../libsvn_subr/io.c:3091
#, c-format
msgid "Can't open directory '%s'"
msgstr "No se pudo abrir el directorio '%s'"
-#: libsvn_subr/io.c:1864 libsvn_subr/io.c:1894
+#: ../libsvn_subr/io.c:1864 ../libsvn_subr/io.c:1894
#, c-format
msgid "Can't remove '%s'"
msgstr "No se pudo borrar '%s'"
-#: libsvn_subr/io.c:1874
+#: ../libsvn_subr/io.c:1874
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "No se pudo rebobinar el directorio '%s'"
-#: libsvn_subr/io.c:2055
+#: ../libsvn_subr/io.c:2055
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "No se pudieron crear los atributos del proceso '%s'"
-#: libsvn_subr/io.c:2061
+#: ../libsvn_subr/io.c:2061
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "No se pudo establecer cmdtype del proceso '%s'"
-#: libsvn_subr/io.c:2073
+#: ../libsvn_subr/io.c:2073
#, c-format
msgid "Can't set process '%s' directory"
msgstr "No se pudo establecer el directorio del proceso '%s'"
-#: libsvn_subr/io.c:2086
+#: ../libsvn_subr/io.c:2086
#, c-format
msgid "Can't set process '%s' child input"
msgstr "No se pudo establecer la entrada del proceso '%s'"
-#: libsvn_subr/io.c:2093
+#: ../libsvn_subr/io.c:2093
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "No se pudo establecer el archivo de salida del proceso '%s'"
-#: libsvn_subr/io.c:2100
+#: ../libsvn_subr/io.c:2100
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "No se pudo establecer el archivo de salida de error del proceso '%s'"
-#: libsvn_subr/io.c:2107
+#: ../libsvn_subr/io.c:2107
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr ""
"No se pudo establecer el archivo de salida de error del proceso '%s' para el "
"manejador de errores"
-#: libsvn_subr/io.c:2113
+#: ../libsvn_subr/io.c:2113
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "No se pudo establecer el manejador de errores del proceso '%s'"
-#: libsvn_subr/io.c:2136
+#: ../libsvn_subr/io.c:2136
#, c-format
msgid "Can't start process '%s'"
msgstr "No se pudo iniciar al proceso '%s'"
-#: libsvn_subr/io.c:2160
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Error esperando al proceso '%s'"
-#: libsvn_subr/io.c:2168
+#: ../libsvn_subr/io.c:2168
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "El proceso '%s' falló (exitwhy %d)"
-#: libsvn_subr/io.c:2175
+#: ../libsvn_subr/io.c:2175
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "El proceso '%s' terminó con código de error %d"
-#: libsvn_subr/io.c:2286
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' devolvió %d"
-#: libsvn_subr/io.c:2409
+#: ../libsvn_subr/io.c:2409
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4526,174 +4558,174 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2536
+#: ../libsvn_subr/io.c:2536
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "No se pudo detectar el tipo MIME de '%s', que no es un archivo"
-#: libsvn_subr/io.c:2626
+#: ../libsvn_subr/io.c:2626
#, c-format
msgid "Can't open file '%s'"
msgstr "No se pudo abrir el archivo '%s'"
-#: libsvn_subr/io.c:2662
+#: ../libsvn_subr/io.c:2662
#, c-format
msgid "Can't close file '%s'"
msgstr "No se pudo cerrar el archivo '%s'"
-#: libsvn_subr/io.c:2663
+#: ../libsvn_subr/io.c:2663
#, c-format
msgid "Can't close stream"
msgstr "No se pudo cerrar un flujo"
-#: libsvn_subr/io.c:2673 libsvn_subr/io.c:2697 libsvn_subr/io.c:2710
+#: ../libsvn_subr/io.c:2673 ../libsvn_subr/io.c:2697 ../libsvn_subr/io.c:2710
#, c-format
msgid "Can't read file '%s'"
msgstr "No se pudo leer el archivo '%s'"
-#: libsvn_subr/io.c:2674 libsvn_subr/io.c:2698 libsvn_subr/io.c:2711
+#: ../libsvn_subr/io.c:2674 ../libsvn_subr/io.c:2698 ../libsvn_subr/io.c:2711
#, c-format
msgid "Can't read stream"
msgstr "No se pudo leer de un flujo"
-#: libsvn_subr/io.c:2685
+#: ../libsvn_subr/io.c:2685
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "No se pudo obtener la información de atributos del archivo '%s'"
-#: libsvn_subr/io.c:2686
+#: ../libsvn_subr/io.c:2686
#, c-format
msgid "Can't get attribute information from stream"
msgstr "No se pudo obtener la información de atributos del flujo"
-#: libsvn_subr/io.c:2722
+#: ../libsvn_subr/io.c:2722
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "No se pudo establecer el puntero de posición en el archivo '%s'"
-#: libsvn_subr/io.c:2723
+#: ../libsvn_subr/io.c:2723
#, c-format
msgid "Can't set position pointer in stream"
msgstr "No se pudo establecer el puntero de posición en el flujo"
-#: libsvn_subr/io.c:2734 libsvn_subr/io.c:2768
+#: ../libsvn_subr/io.c:2734 ../libsvn_subr/io.c:2768
#, c-format
msgid "Can't write to file '%s'"
msgstr "No se pudo escribir en el archivo '%s'"
-#: libsvn_subr/io.c:2735 libsvn_subr/io.c:2769
+#: ../libsvn_subr/io.c:2735 ../libsvn_subr/io.c:2769
#, c-format
msgid "Can't write to stream"
msgstr "No se pudo escribir en un flujo"
-#: libsvn_subr/io.c:2809
+#: ../libsvn_subr/io.c:2809
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "No se pudo leer la línea del largo en el archivo '%s'"
-#: libsvn_subr/io.c:2813
+#: ../libsvn_subr/io.c:2813
msgid "Can't read length line in stream"
msgstr "No se pudo leer la línea del largo en el flujo"
-#: libsvn_subr/io.c:2860
+#: ../libsvn_subr/io.c:2860
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "No se pudo mover '%s' a '%s'"
-#: libsvn_subr/io.c:2939
+#: ../libsvn_subr/io.c:2939
#, c-format
msgid "Can't create directory '%s'"
msgstr "No se puede crear el directorio '%s'"
-#: libsvn_subr/io.c:2950 libsvn_wc/copy.c:543
+#: ../libsvn_subr/io.c:2950 ../libsvn_wc/copy.c:543
#, c-format
msgid "Can't hide directory '%s'"
msgstr "No se pudo ocultar el directorio '%s'"
-#: libsvn_subr/io.c:3023
+#: ../libsvn_subr/io.c:3023
#, c-format
msgid "Can't remove directory '%s'"
msgstr "No se pudo eliminar el directorio '%s'"
-#: libsvn_subr/io.c:3041
+#: ../libsvn_subr/io.c:3041
#, c-format
msgid "Can't read directory"
msgstr "No se pudo leer el directorio"
-#: libsvn_subr/io.c:3110
+#: ../libsvn_subr/io.c:3110
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "No se pudo leer una entrada de directorio en '%s'"
-#: libsvn_subr/io.c:3235
+#: ../libsvn_subr/io.c:3235
#, c-format
msgid "Can't check directory '%s'"
msgstr "No se pudo verificar el directorio '%s'"
-#: libsvn_subr/io.c:3257
+#: ../libsvn_subr/io.c:3257
#, c-format
msgid "Version %d is not non-negative"
msgstr "La versión %d no es un número positivo"
-#: libsvn_subr/io.c:3307
+#: ../libsvn_subr/io.c:3307
#, c-format
msgid "Reading '%s'"
msgstr "Leyendo '%s'"
-#: libsvn_subr/io.c:3323
+#: ../libsvn_subr/io.c:3323
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "La primera línea de '%s' contiene un carácter que no es un dígito"
-#: libsvn_subr/kitchensink.c:40
+#: ../libsvn_subr/kitchensink.c:40
#, c-format
msgid "Invalid revision number found parsing '%s'"
msgstr "Número de revisión inválido analizando '%s'"
-#: libsvn_subr/kitchensink.c:52
+#: ../libsvn_subr/kitchensink.c:52
#, c-format
msgid "Negative revision number found parsing '%s'"
msgstr "Número de revisión negativo analizando '%s'"
-#: libsvn_subr/mergeinfo.c:143
+#: ../libsvn_subr/mergeinfo.c:143
#, c-format
msgid "Invalid character '%c' found in revision list"
msgstr "Caracter inválido '%c' encontrado en la lista de revisiones"
-#: libsvn_subr/mergeinfo.c:192 libsvn_subr/mergeinfo.c:199
+#: ../libsvn_subr/mergeinfo.c:192 ../libsvn_subr/mergeinfo.c:199
#, c-format
msgid "Invalid character '%c' found in range list"
msgstr "Caracter inválido '%c' encontrado en la lista de rangos"
-#: libsvn_subr/mergeinfo.c:206
+#: ../libsvn_subr/mergeinfo.c:206
msgid "Range list parsing ended before hitting newline"
msgstr ""
"El análisis de la lista de rangos finalizó antes de llegar al fin de línea"
-#: libsvn_subr/mergeinfo.c:225
+#: ../libsvn_subr/mergeinfo.c:225
msgid "Pathname not terminated by ':'"
msgstr "Ruta no terminada con ':'"
-#: libsvn_subr/mergeinfo.c:233
+#: ../libsvn_subr/mergeinfo.c:233
#, c-format
msgid "Could not find end of line in range list line in '%s'"
msgstr "No se encontró final de línea en la lista de rangos en '%s'"
-#: libsvn_subr/nls.c:79
+#: ../libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "No se pudo convertir una cadena a UCS-2: '%s'"
-#: libsvn_subr/nls.c:86
+#: ../libsvn_subr/nls.c:86
msgid "Can't get module file name"
msgstr "No se pudo obtener el nombre de archivo del módulo"
-#: 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 "No se pudo convertir la ruta del módulo a UTF-8 desde UCS-2: '%s'"
-#: libsvn_subr/opt.c:233 libsvn_subr/opt.c:260 libsvn_subr/opt.c:337
+#: ../libsvn_subr/opt.c:233 ../libsvn_subr/opt.c:260 ../libsvn_subr/opt.c:337
msgid ""
"\n"
"Valid options:\n"
@@ -4701,11 +4733,11 @@
"\n"
"Opciones válidas:\n"
-#: libsvn_subr/opt.c:467
+#: ../libsvn_subr/opt.c:467
msgid " ARG"
msgstr " PAR"
-#: libsvn_subr/opt.c:492 libsvn_subr/opt.c:525
+#: ../libsvn_subr/opt.c:492 ../libsvn_subr/opt.c:525
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4714,27 +4746,27 @@
"\"%s\": comando desconocido.\n"
"\n"
-#: libsvn_subr/opt.c:850
+#: ../libsvn_subr/opt.c:850
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Error de sintaxis analizando la revisión '%s'"
-#: libsvn_subr/opt.c:926
+#: ../libsvn_subr/opt.c:958
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "El URL '%s'no está propiamente codificado como URL"
-#: libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:964
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "El URL '%s' contiene un elemento '..'"
-#: libsvn_subr/opt.c:961
+#: ../libsvn_subr/opt.c:993
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Error resolviendo mayúsculas/minúsculas de '%s'"
-#: libsvn_subr/opt.c:1063
+#: ../libsvn_subr/opt.c:1100
#, c-format
msgid ""
"%s, version %s\n"
@@ -4745,7 +4777,7 @@
" compilado %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1066
+#: ../libsvn_subr/opt.c:1103
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4759,56 +4791,56 @@
"por CollabNet (http://www.Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1119 libsvn_subr/opt.c:1186
+#: ../libsvn_subr/opt.c:1156 ../libsvn_subr/opt.c:1223
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Tipee '%s help' para ver el modo de uso.\n"
-#: libsvn_subr/path.c:1169
+#: ../libsvn_subr/path.c:1169
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "No se pudo determinar la ruta absoluta de '%s'"
-#: libsvn_subr/path.c:1206
+#: ../libsvn_subr/path.c:1206
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' no es un nombre ni de archivo ni de directorio"
-#: libsvn_subr/path.c:1319
+#: ../libsvn_subr/path.c:1319
#, c-format
msgid "Can't determine the native path encoding"
msgstr "No se pudo determinar la codificación nativa usada en las rutas"
-#: libsvn_subr/path.c:1432
+#: ../libsvn_subr/path.c:1432
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Carácter de control '0x%02x' inválido en la ruta '%s'"
-#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#: ../libsvn_subr/prompt.c:115 ../libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
msgstr "No se pudo leer de la entrada estándar"
-#: libsvn_subr/prompt.c:178
+#: ../libsvn_subr/prompt.c:178
#, c-format
msgid "Authentication realm: %s\n"
msgstr "Reino de autentificación: %s\n"
-#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+#: ../libsvn_subr/prompt.c:204 ../libsvn_subr/prompt.c:227
msgid "Username: "
msgstr "Usuario: "
-#: libsvn_subr/prompt.c:206
+#: ../libsvn_subr/prompt.c:206
#, c-format
msgid "Password for '%s': "
msgstr "Clave de '%s': "
-#: libsvn_subr/prompt.c:249
+#: ../libsvn_subr/prompt.c:249
#, c-format
msgid "Error validating server certificate for '%s':\n"
msgstr "Error validando el certificado del servidor de '%s':\n"
-#: libsvn_subr/prompt.c:255
+#: ../libsvn_subr/prompt.c:255
msgid ""
" - The certificate is not issued by a trusted authority. Use the\n"
" fingerprint to validate the certificate manually!\n"
@@ -4816,23 +4848,23 @@
" - El certificado no fue emitido por una autoridad marcada como\n"
" confiable. ¡Use la \"huella\" para validar el certificado manualmente!\n"
-#: libsvn_subr/prompt.c:262
+#: ../libsvn_subr/prompt.c:262
msgid " - The certificate hostname does not match.\n"
msgstr " - El nombre de máquina del certificado no coincide.\n"
-#: libsvn_subr/prompt.c:268
+#: ../libsvn_subr/prompt.c:268
msgid " - The certificate is not yet valid.\n"
msgstr " - El certificado no es válido aún.\n"
-#: libsvn_subr/prompt.c:274
+#: ../libsvn_subr/prompt.c:274
msgid " - The certificate has expired.\n"
msgstr " - El certificado ha expirado.\n"
-#: libsvn_subr/prompt.c:280
+#: ../libsvn_subr/prompt.c:280
msgid " - The certificate has an unknown error.\n"
msgstr " - El certificado tiene un error desconocido.\n"
-#: libsvn_subr/prompt.c:285
+#: ../libsvn_subr/prompt.c:285
#, c-format
msgid ""
"Certificate information:\n"
@@ -4847,86 +4879,86 @@
" - Emisor: %s\n"
" - \"Huella\": %s\n"
-#: libsvn_subr/prompt.c:300
+#: ../libsvn_subr/prompt.c:300
msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
msgstr "¿(R)echazar, aceptar (t)emporariamente o aceptar (p)ermanentemente?"
-#: libsvn_subr/prompt.c:304
+#: ../libsvn_subr/prompt.c:304
msgid "(R)eject or accept (t)emporarily? "
msgstr "¿(R)echazar o aceptar (t)emporariamente? "
-#: libsvn_subr/prompt.c:343
+#: ../libsvn_subr/prompt.c:343
msgid "Client certificate filename: "
msgstr "Nombre de archivo del certificado cliente: "
-#: libsvn_subr/prompt.c:366
+#: ../libsvn_subr/prompt.c:366
#, c-format
msgid "Passphrase for '%s': "
msgstr "Frase clave para '%s': "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:2429
+#: ../libsvn_subr/subst.c:1745 ../libsvn_wc/props.c:2429
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "El archivo '%s' tiene finales de línea inconsistentes"
#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
-#: libsvn_subr/time.c:81
+#: ../libsvn_subr/time.c:81
msgid " (%a, %d %b %Y)"
msgstr " (%a %d de %b de %Y)"
-#: libsvn_subr/utf.c:195
+#: ../libsvn_subr/utf.c:195
msgid "Can't lock charset translation mutex"
msgstr "No se pudo lockear el mutex de conversión de codificación"
-#: libsvn_subr/utf.c:213 libsvn_subr/utf.c:322
+#: ../libsvn_subr/utf.c:213 ../libsvn_subr/utf.c:322
msgid "Can't unlock charset translation mutex"
msgstr "No se pudo deslockear el mutex de conversión de codificación"
-#: libsvn_subr/utf.c:274
+#: ../libsvn_subr/utf.c:274
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr ""
"No se pudo crear un convertidor de caracteres de la codificación nativa a '%"
"s'"
-#: libsvn_subr/utf.c:278
+#: ../libsvn_subr/utf.c:278
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr ""
"No se pudo crear un convertidor de caracteres de '%s' a la codificación "
"nativa"
-#: libsvn_subr/utf.c:282
+#: ../libsvn_subr/utf.c:282
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "No se pudo crear un convertidor de caracteres de '%s' a '%s'"
-#: libsvn_subr/utf.c:288
+#: ../libsvn_subr/utf.c:288
#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "No se pudo crear un convertidor de caracteres de '%i' a '%i'"
-#: libsvn_subr/utf.c:522
+#: ../libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "No se pudo convertir una cadena de la codificación nativa a '%s':"
-#: libsvn_subr/utf.c:526
+#: ../libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "No se pudo convertir una cadena de '%s' a la codificación nativa:"
-#: libsvn_subr/utf.c:530
+#: ../libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "No se pudo convertir una cadena de '%s' a '%s':"
-#: libsvn_subr/utf.c:536
+#: ../libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "No se pudo convertir una cadena del CCSID '%i' al CCSID '%i'"
-#: libsvn_subr/utf.c:581
+#: ../libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4935,7 +4967,7 @@
"El dato seguro '%s' fue seguido del byte no-ASCII %d: imposible convertir a/"
"desde UTF-8"
-#: libsvn_subr/utf.c:589
+#: ../libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4943,7 +4975,7 @@
"Carácter no-ASCII (código %d) detectado, y es imposible de convertir a/de "
"UTF-8"
-#: libsvn_subr/utf.c:631
+#: ../libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4956,56 +4988,56 @@
"seguidos de una secuencia UTF-8 inválida\n"
"(hex:%s)"
-#: libsvn_subr/validate.c:48
+#: ../libsvn_subr/validate.c:48
#, c-format
msgid "MIME type '%s' has empty media type"
msgstr "El tipo MIME '%s' tiene el tipo de medio vacío"
-#: libsvn_subr/validate.c:53
+#: ../libsvn_subr/validate.c:53
#, c-format
msgid "MIME type '%s' does not contain '/'"
msgstr "El tipo MIME '%s' no contiene '/'"
-#: libsvn_subr/validate.c:58
+#: ../libsvn_subr/validate.c:58
#, c-format
msgid "MIME type '%s' ends with non-alphanumeric character"
msgstr "El tipo MIME '%s' termina con un carácter no alfanumérico"
-#: 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 ""
"Conflicto de versiones en '%s': se encontró %d.%d.%d%s, se esperaba %d.%d.%d%"
"s"
-#: libsvn_subr/xml.c:400
+#: ../libsvn_subr/xml.c:400
#, c-format
msgid "Malformed XML: %s at line %d"
msgstr "XML malformado: %s en la línea %d"
-#: libsvn_wc/adm_crawler.c:678
+#: ../libsvn_wc/adm_crawler.c:678
msgid "Error aborting report"
msgstr "Error abortando el reporte"
-#: libsvn_wc/adm_crawler.c:1103
+#: ../libsvn_wc/adm_crawler.c:1103
#, c-format
msgid "While preparing '%s' for commit"
msgstr "Al preparar '%s' para el commit"
-#: 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' no es un nombre de directorio administrativo válido"
-#: libsvn_wc/adm_files.c:260
+#: ../libsvn_wc/adm_files.c:260
msgid "Bad type indicator"
msgstr "Mal indicador de tipo"
-#: libsvn_wc/adm_files.c:493
+#: ../libsvn_wc/adm_files.c:493
msgid "APR_APPEND not supported for adm files"
msgstr "No se soporta APR_APPEND para archivos administrativos"
-#: libsvn_wc/adm_files.c:536
+#: ../libsvn_wc/adm_files.c:536
msgid ""
"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
"again"
@@ -5013,48 +5045,49 @@
"Su directorio .svn/tmp puede no estar presente o estar corrupto; corra 'svn "
"cleanup' e intente nuevamente"
-#: libsvn_wc/adm_files.c:705 libsvn_wc/lock.c:602 libsvn_wc/lock.c:868
+#: ../libsvn_wc/adm_files.c:705 ../libsvn_wc/lock.c:602
+#: ../libsvn_wc/lock.c:868
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' no es una copia de trabajo"
-#: libsvn_wc/adm_files.c:712 libsvn_wc/adm_files.c:779
+#: ../libsvn_wc/adm_files.c:712 ../libsvn_wc/adm_files.c:779
msgid "No such thing as 'base' working copy properties!"
msgstr ""
"¡No existe tal cosa como las propiedades 'base' en la copia de trabajo!"
-#: libsvn_wc/adm_files.c:868
+#: ../libsvn_wc/adm_files.c:868
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr ""
"La revisión %ld no se corresponde con la revisión %ld existente en '%s'"
-#: libsvn_wc/adm_files.c:876
+#: ../libsvn_wc/adm_files.c:876
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "El URL '%s' no coincide con el URL existente '%s' en '%s'"
-#: libsvn_wc/adm_ops.c:277
+#: ../libsvn_wc/adm_ops.c:277
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Tipo de nodo no reconocido: '%s'"
-#: libsvn_wc/adm_ops.c:1041 libsvn_wc/adm_ops.c:1406
+#: ../libsvn_wc/adm_ops.c:1041 ../libsvn_wc/adm_ops.c:1406
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Tipo de nodo no admitido para la ruta '%s'"
-#: libsvn_wc/adm_ops.c:1402
+#: ../libsvn_wc/adm_ops.c:1402
#, c-format
msgid "'%s' not found"
msgstr "'%s' no encontrado"
-#: libsvn_wc/adm_ops.c:1436
+#: ../libsvn_wc/adm_ops.c:1436
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' ya está bajo control de versiones"
-#: libsvn_wc/adm_ops.c:1448
+#: ../libsvn_wc/adm_ops.c:1448
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -5063,46 +5096,46 @@
"No se puede reemplazar '%s' con un nodo de un tipo diferente; haga commit de "
"la eliminación y actualice el padre antes de agregar '%s'"
-#: libsvn_wc/adm_ops.c:1465
+#: ../libsvn_wc/adm_ops.c:1465
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr ""
"No se pudo encontrar la entrada del directorio padre al intentar añadir '%s'"
-#: libsvn_wc/adm_ops.c:1470
+#: ../libsvn_wc/adm_ops.c:1470
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "No se puede añadir '%s' a un directorio agendado para ser borrado"
-#: libsvn_wc/adm_ops.c:1486
+#: ../libsvn_wc/adm_ops.c:1486
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "El URL '%s' tiene una raíz de repositorio diferente a la de su padre"
-#: libsvn_wc/adm_ops.c:1816
+#: ../libsvn_wc/adm_ops.c:1816
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Error restituyendo el texto de '%s'"
-#: libsvn_wc/adm_ops.c:1980
+#: ../libsvn_wc/adm_ops.c:1980
msgid "Cannot revert"
msgstr "No se pudo revertir"
-#: libsvn_wc/adm_ops.c:2007
+#: ../libsvn_wc/adm_ops.c:2007
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr ""
"No se pueden revertir los cambios de '%s': tipo de entrada de nodo no "
"admitido"
-#: libsvn_wc/adm_ops.c:2018
+#: ../libsvn_wc/adm_ops.c:2018
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"No se pueden revertir los cambios de '%s': tipo de nodo no admitido en la "
"copia de trabajo"
-#: libsvn_wc/adm_ops.c:2065
+#: ../libsvn_wc/adm_ops.c:2065
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -5110,53 +5143,53 @@
"No se puede revertir la adición del directorio actual; por favor inténtelo "
"desde el directorio padre"
-#: libsvn_wc/adm_ops.c:2093
+#: ../libsvn_wc/adm_ops.c:2093
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Tipo desconocido o inesperado para la ruta '%s'"
-#: libsvn_wc/adm_ops.c:2315
+#: ../libsvn_wc/adm_ops.c:2315
#, c-format
msgid "File '%s' has local modifications"
msgstr "El archivo '%s' está modificado localmente"
-#: libsvn_wc/adm_ops.c:2597
+#: ../libsvn_wc/adm_ops.c:2597
msgid "Invalid 'conflict_result' argument"
msgstr "Parámetro de 'conflict_result' inválido"
-#: libsvn_wc/adm_ops.c:2937
+#: ../libsvn_wc/adm_ops.c:2937
#, c-format
msgid "'%s' is a directory, and thus cannot be a member of a changelist"
msgstr ""
"'%s' es un directorio, por lo tanto no puede ser miembro de una lista de "
"cambios"
-#: libsvn_wc/adm_ops.c:2959
+#: ../libsvn_wc/adm_ops.c:2959
#, c-format
msgid "'%s' is not currently a member of changelist '%s'."
msgstr "'%s' no es actualmente parte de la lista de cambios '%s'."
-#: libsvn_wc/adm_ops.c:2981
+#: ../libsvn_wc/adm_ops.c:2981
#, c-format
msgid "Removing '%s' from changelist '%s'."
msgstr "Eliminando '%s' de la lista de cambios '%s'."
-#: libsvn_wc/copy.c:197
+#: ../libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Error durante la copia recursiva de '%s'"
-#: libsvn_wc/copy.c:403
+#: ../libsvn_wc/copy.c:403
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' ya existe y obstaculiza el camino"
-#: libsvn_wc/copy.c:415
+#: ../libsvn_wc/copy.c:415
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Ya hay un ítem versionado '%s'"
-#: libsvn_wc/copy.c:430 libsvn_wc/copy.c:692
+#: ../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 "
@@ -5165,110 +5198,110 @@
"No se puede copiar o mover '%s': no está en el repositorio todavía; intente "
"primero hacer commit"
-#: libsvn_wc/copy.c:799
+#: ../libsvn_wc/copy.c:799
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"No se puede copiar a '%s' ya que no es del repositorio '%s'; es de '%s'"
-#: libsvn_wc/copy.c:806
+#: ../libsvn_wc/copy.c:806
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "No se puede copiar a '%s' ya que está agendado para ser borrado"
-#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:368 libsvn_wc/entries.c:604
-#: libsvn_wc/entries.c:865
+#: ../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 "La entrada '%s' tiene un valor '%s' inválido"
-#: libsvn_wc/entries.c:114
+#: ../libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Secuencua de protección de un dato inválida"
-#: libsvn_wc/entries.c:121
+#: ../libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Caracter protegido inválido"
-#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:210
-#: libsvn_wc/entries.c:222
+#: ../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 "Inesperado final de una entrada"
-#: libsvn_wc/entries.c:192
+#: ../libsvn_wc/entries.c:192
#, c-format
msgid "Entry contains non-canonical path '%s'"
msgstr "La entrada contiene la ruta no canónica '%s'"
-#: libsvn_wc/entries.c:244
+#: ../libsvn_wc/entries.c:244
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Valor inválido para el campo '%s'"
-#: libsvn_wc/entries.c:326 libsvn_wc/entries.c:579
+#: ../libsvn_wc/entries.c:326 ../libsvn_wc/entries.c:579
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "La entrada '%s' tiene un tipo de nodo inválido"
-#: libsvn_wc/entries.c:347 libsvn_wc/entries.c:556
+#: ../libsvn_wc/entries.c:347 ../libsvn_wc/entries.c:556
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "La entrada para '%s' tiene una raíz de repositorio inválida"
-#: libsvn_wc/entries.c:1011
+#: ../libsvn_wc/entries.c:1011
#, c-format
msgid "XML parser failed in '%s'"
msgstr "El procesador XML falló interpretando '%s'"
-#: libsvn_wc/entries.c:1070
+#: ../libsvn_wc/entries.c:1070
msgid "Missing default entry"
msgstr "Falta la entrada por omisión"
-#: libsvn_wc/entries.c:1075
+#: ../libsvn_wc/entries.c:1075
msgid "Default entry has no revision number"
msgstr "La entrada por omisión no tiene número de revisión"
-#: libsvn_wc/entries.c:1080
+#: ../libsvn_wc/entries.c:1080
msgid "Default entry is missing URL"
msgstr "A la entrada por omisión le falta el URL"
-#: libsvn_wc/entries.c:1156
+#: ../libsvn_wc/entries.c:1156
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Línea de versión inválida en el archivo de entradas de '%s'"
-#: libsvn_wc/entries.c:1173
+#: ../libsvn_wc/entries.c:1173
msgid "Missing entry terminator"
msgstr "Falta el terminador de la entrada"
-#: libsvn_wc/entries.c:1176
+#: ../libsvn_wc/entries.c:1176
msgid "Invalid entry terminator"
msgstr "Terminador de la entrada inválido"
-#: libsvn_wc/entries.c:1180
+#: ../libsvn_wc/entries.c:1180
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Error en la entrada %d en el archivo de entradas de '%s':"
-#: libsvn_wc/entries.c:1303
+#: ../libsvn_wc/entries.c:1303
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Copia de trabajo corrupta: '%s' no tiene entrada por omisión"
-#: libsvn_wc/entries.c:1320
+#: ../libsvn_wc/entries.c:1320
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr ""
"Copia de trabajo corrupta: el directorio '%s' tiene un agendado inválido"
-#: libsvn_wc/entries.c:1354
+#: ../libsvn_wc/entries.c:1354
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Copia de trabajo corrupta: '%s' en el directorio '%s' tiene un agendado "
"inválido"
-#: libsvn_wc/entries.c:1363
+#: ../libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5277,7 +5310,7 @@
"Copia de trabajo corrupta: '%s' en el directorio '%s' (que está marcado para "
"ser añadido) no está marcado también para ser añadido"
-#: libsvn_wc/entries.c:1371
+#: ../libsvn_wc/entries.c:1371
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5286,7 +5319,7 @@
"Copia de trabajo corrupta: '%s' en el directorio '%s' (el cual está "
"programado para eliminación) no está en sí programada para eliminación"
-#: libsvn_wc/entries.c:1379
+#: ../libsvn_wc/entries.c:1379
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5295,17 +5328,17 @@
"Copia de trabajo corrupta: '%s' en el directorio '%s' (el cual está "
"programado para reemplazo) tiene una programación inválida"
-#: libsvn_wc/entries.c:2026
+#: ../libsvn_wc/entries.c:2026
#, c-format
msgid "No default entry in directory '%s'"
msgstr "No hay entrada por omisión en el directorio '%s'"
-#: libsvn_wc/entries.c:2081
+#: ../libsvn_wc/entries.c:2081
#, c-format
msgid "Error writing to '%s'"
msgstr "Error escribiendo en '%s'"
-#: libsvn_wc/entries.c:2410
+#: ../libsvn_wc/entries.c:2410
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -5314,7 +5347,7 @@
"No se puede añadir '%s' a un directorio borrado; trate desborrando el "
"directorio padre de este archivo primero"
-#: libsvn_wc/entries.c:2416
+#: ../libsvn_wc/entries.c:2416
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -5323,108 +5356,108 @@
"No se puede reemplazar '%s' en un directorio borrado; trate desborrando el "
"directorio padre de este archivo primero"
-#: libsvn_wc/entries.c:2425
+#: ../libsvn_wc/entries.c:2425
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr "'%s' está marcado como ausente, no puede ser agendado para ser añadido"
-#: libsvn_wc/entries.c:2454
+#: ../libsvn_wc/entries.c:2454
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "La entrada '%s' ya está bajo control de versiones"
-#: libsvn_wc/entries.c:2551
+#: ../libsvn_wc/entries.c:2551
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "La entrada '%s' tiene un agendado ilegal"
-#: libsvn_wc/entries.c:2697
+#: ../libsvn_wc/entries.c:2697
#, c-format
msgid "No such entry: '%s'"
msgstr "No hay una entrada '%s'"
-#: libsvn_wc/entries.c:2831
+#: ../libsvn_wc/entries.c:2831
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Error escribiendo archivo de entradas de '%s'"
-#: libsvn_wc/entries.c:2874
+#: ../libsvn_wc/entries.c:2874
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "El directorio '%s' no tiene una entrada THIS_DIR"
-#: libsvn_wc/entries.c:3021
+#: ../libsvn_wc/entries.c:3021
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' tiene un tipo de nodo no reconocido"
-#: libsvn_wc/entries.c:3058
+#: ../libsvn_wc/entries.c:3058
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Inesperadamente se encontró '%s': la ruta se marca como faltante"
-#: libsvn_wc/lock.c:366 libsvn_wc/lock.c:572
+#: ../libsvn_wc/lock.c:366 ../libsvn_wc/lock.c:572
#, c-format
msgid "Working copy '%s' locked"
msgstr "La copia de trabajo '%s' está bloqueada"
-#: libsvn_wc/lock.c:491
+#: ../libsvn_wc/lock.c:491
#, c-format
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "La ruta '%s' termina en '%s', que no se soporta para esta operación"
-#: libsvn_wc/lock.c:940 libsvn_wc/lock.c:979
+#: ../libsvn_wc/lock.c:940 ../libsvn_wc/lock.c:979
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "No se pudo verificar existencia de la ruta para '%s'"
-#: libsvn_wc/lock.c:950
+#: ../libsvn_wc/lock.c:950
#, c-format
msgid "Expected '%s' to be a directory but found a file"
msgstr "Se esperaba que '%s' fuera un directorio, pero es un archivo"
-#: libsvn_wc/lock.c:962
+#: ../libsvn_wc/lock.c:962
#, c-format
msgid "Expected '%s' to be a file but found a directory"
msgstr "Se esperaba que '%s' fuera un archivo, pero es un directorio"
-#: libsvn_wc/lock.c:986
+#: ../libsvn_wc/lock.c:986
#, c-format
msgid "Directory '%s' is missing"
msgstr "El directorio '%s' no está"
-#: libsvn_wc/lock.c:996
+#: ../libsvn_wc/lock.c:996
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
msgstr ""
"El directorio '%s' con la información de administración de la CdT no está"
-#: libsvn_wc/lock.c:1001
+#: ../libsvn_wc/lock.c:1001
#, c-format
msgid "Unable to lock '%s'"
msgstr "No se pudo lockear '%s'"
-#: libsvn_wc/lock.c:1006
+#: ../libsvn_wc/lock.c:1006
#, c-format
msgid "Working copy '%s' is not locked"
msgstr "La copia de trabajo '%s' no está bloqueada"
-#: libsvn_wc/lock.c:1422
+#: ../libsvn_wc/lock.c:1422
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "Lock de escritura arrebatado en '%s'"
-#: libsvn_wc/lock.c:1430
+#: ../libsvn_wc/lock.c:1430
#, c-format
msgid "No write-lock in '%s'"
msgstr "No hay lock de escritura en '%s'"
-#: libsvn_wc/lock.c:1452
+#: ../libsvn_wc/lock.c:1452
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr "El archivo de lock '%s' no es un archivo común"
-#: libsvn_wc/log.c:356
+#: ../libsvn_wc/log.c:356
msgid "Can't move source to dest"
msgstr "No se pudo mover"
@@ -5432,165 +5465,165 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:519
+#: ../libsvn_wc/log.c:519
#, c-format
msgid "In directory '%s'"
msgstr "En el directorio '%s'"
-#: libsvn_wc/log.c:544
+#: ../libsvn_wc/log.c:544
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Falta el atributo 'left' en '%s'"
-#: libsvn_wc/log.c:551
+#: ../libsvn_wc/log.c:551
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Falta el atributo 'right' en '%s'"
-#: libsvn_wc/log.c:619
+#: ../libsvn_wc/log.c:619
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Falta el atributo 'dest' en '%s'"
-#: libsvn_wc/log.c:700
+#: ../libsvn_wc/log.c:700
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Falta el atributo 'timestamp' en '%s'"
-#: libsvn_wc/log.c:796 libsvn_wc/props.c:507
+#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:507
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Error obteniendo 'tiempo afectado' en '%s'"
-#: libsvn_wc/log.c:844
+#: ../libsvn_wc/log.c:844
#, c-format
msgid "Error getting file size on '%s'"
msgstr "Error obteniendo el tamaño de archivo en '%s'"
-#: libsvn_wc/log.c:862
+#: ../libsvn_wc/log.c:862
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Error modificando la entrada de '%s'"
-#: libsvn_wc/log.c:888
+#: ../libsvn_wc/log.c:888
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Error removiendo el bloqueo de la entrada de '%s'"
-#: libsvn_wc/log.c:911
+#: ../libsvn_wc/log.c:911
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Error eliminando lista de cambios para la entrada '%s'"
-#: libsvn_wc/log.c:1084
+#: ../libsvn_wc/log.c:1084
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Falta el atributo 'revision' en '%s'"
-#: libsvn_wc/log.c:1108
+#: ../libsvn_wc/log.c:1108
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "El comando de log para el directorio '%s' está mal ubicado"
-#: libsvn_wc/log.c:1276
+#: ../libsvn_wc/log.c:1276
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Error reemplazando el archivo base de '%s'"
-#: libsvn_wc/log.c:1281
+#: ../libsvn_wc/log.c:1281
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Error obteniendo 'tiempo afectado' de '%s'"
-#: libsvn_wc/log.c:1304
+#: ../libsvn_wc/log.c:1304
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Error obteniendo 'tiempo afectado' para '%s'"
-#: libsvn_wc/log.c:1324
+#: ../libsvn_wc/log.c:1324
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Error comparando '%s' y '%s'"
-#: libsvn_wc/log.c:1373 libsvn_wc/log.c:1422
+#: ../libsvn_wc/log.c:1373 ../libsvn_wc/log.c:1422
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Error modificando la entrada de '%s'"
-#: libsvn_wc/log.c:1477
+#: ../libsvn_wc/log.c:1477
msgid "Invalid 'format' attribute"
msgstr "Atributo 'format' inválido"
-#: libsvn_wc/log.c:1512
+#: ../libsvn_wc/log.c:1512
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Entrada de log a la que le falta el atributo 'name' (entrada '%s' para el "
"directorio '%s')"
-#: libsvn_wc/log.c:1583
+#: ../libsvn_wc/log.c:1583
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Elemento de archivo de log '%s' no reconocido en '%s'"
-#: libsvn_wc/log.c:1594
+#: ../libsvn_wc/log.c:1594
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Error procesando el comando '%s' en '%s'"
-#: libsvn_wc/log.c:1776
+#: ../libsvn_wc/log.c:1776
msgid "Couldn't open log"
msgstr "No se pudo abrir el log"
-#: libsvn_wc/log.c:1787
+#: ../libsvn_wc/log.c:1787
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Error escribiendo archivo de log administrativo en '%s'"
-#: libsvn_wc/log.c:2440
+#: ../libsvn_wc/log.c:2440
#, c-format
msgid "Error writing log for '%s'"
msgstr "Error escribiendo log para '%s'"
-#: libsvn_wc/log.c:2489
+#: ../libsvn_wc/log.c:2489
#, c-format
msgid "'%s' is not a working copy directory"
msgstr "'%s' no es un directorio con una copia de trabajo"
-#: libsvn_wc/merge.c:430
+#: ../libsvn_wc/merge.c:430 ../libsvn_wc/merge.c:675
msgid "Conflict callback violated API: returned no results"
msgstr "El callback de conflictos violó la API: no devolvió resultados"
-#: libsvn_wc/merge.c:726
+#: ../libsvn_wc/merge.c:722
msgid "Conflict callback violated API: returned no merged file"
msgstr ""
"El callback de conflictos violó la API: no devolvió un archivo fusionado"
-#: libsvn_wc/props.c:111
+#: ../libsvn_wc/props.c:111
#, c-format
msgid "Can't parse '%s'"
msgstr "No se pudo interpretar '%s'"
-#: libsvn_wc/props.c:142
+#: ../libsvn_wc/props.c:142
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "No se pudo escribir el hash de propiedades a '%s'"
-#: libsvn_wc/props.c:583
+#: ../libsvn_wc/props.c:583
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Falta el fin de línea en el archivo wcprops de '%s'"
-#: libsvn_wc/props.c:1399
+#: ../libsvn_wc/props.c:1399
msgid "Conflict callback violated API: returned no results."
msgstr "El callback de conflictos violó la API: no devolvió resultados"
-#: libsvn_wc/props.c:1434
+#: ../libsvn_wc/props.c:1434
msgid "Conflict callback violated API: returned no merged file."
msgstr ""
"El callback de conflictos violó la API: no devolvió el archivo fusionado."
-#: libsvn_wc/props.c:1528
+#: ../libsvn_wc/props.c:1528
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5599,7 +5632,7 @@
"Intentando añadir una nueva propiedad '%s' con valor '%s',\n"
"pero ya existe con valor '%s'."
-#: libsvn_wc/props.c:1543
+#: ../libsvn_wc/props.c:1543
#, c-format
msgid ""
"Trying to create property '%s' with value '%s',\n"
@@ -5608,7 +5641,7 @@
"Intentando crear una propiedad '%s' con valor '%s',\n"
"pero fue borrada localmente."
-#: libsvn_wc/props.c:1617
+#: ../libsvn_wc/props.c:1617
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5617,7 +5650,7 @@
"Se intenta eliminar la propiedad '%s' con valor '%s'\n"
"pero su valor fue modificado de '%s' a '%s'."
-#: libsvn_wc/props.c:1638
+#: ../libsvn_wc/props.c:1638
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5626,7 +5659,7 @@
"Intentando eliminar la propiedad '%s' con valor '%s',\n"
"pero el valor local es '%s'."
-#: libsvn_wc/props.c:1725
+#: ../libsvn_wc/props.c:1725
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5635,7 +5668,7 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad fue cambiada localmente de '%s' a '%s'."
-#: libsvn_wc/props.c:1733
+#: ../libsvn_wc/props.c:1733
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5644,7 +5677,7 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad fue añadida localmente con valor '%s'."
-#: libsvn_wc/props.c:1754
+#: ../libsvn_wc/props.c:1754
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5653,7 +5686,7 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero fue eliminada localmente."
-#: libsvn_wc/props.c:1788
+#: ../libsvn_wc/props.c:1788
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5662,7 +5695,7 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad no existe."
-#: libsvn_wc/props.c:1826
+#: ../libsvn_wc/props.c:1826
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5671,47 +5704,47 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad ya existe con valor '%s'."
-#: libsvn_wc/props.c:2131 libsvn_wc/props.c:2159 libsvn_wc/props.c:2304
-#: libsvn_wc/props.c:2519
+#: ../libsvn_wc/props.c:2131 ../libsvn_wc/props.c:2159
+#: ../libsvn_wc/props.c:2304 ../libsvn_wc/props.c:2519
msgid "Failed to load properties from disk"
msgstr "Error al leer propiedades del disco"
-#: libsvn_wc/props.c:2187
+#: ../libsvn_wc/props.c:2187
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "No se pudo escribir el hash de la propiedad para '%s'"
-#: libsvn_wc/props.c:2299 libsvn_wc/props.c:2463
+#: ../libsvn_wc/props.c:2299 ../libsvn_wc/props.c:2463
#, c-format
msgid "Property '%s' is an entry property"
msgstr "La propiedad '%s' es una propiedad de entradas"
-#: libsvn_wc/props.c:2343
+#: ../libsvn_wc/props.c:2343
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "No se puede asignar '%s' en un directorio ('%s')"
-#: libsvn_wc/props.c:2351
+#: ../libsvn_wc/props.c:2351
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "No se puede asignar '%s' en un archivo ('%s')"
-#: libsvn_wc/props.c:2357
+#: ../libsvn_wc/props.c:2357
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' no es ni un archivo ni un directorio"
-#: libsvn_wc/props.c:2438
+#: ../libsvn_wc/props.c:2438
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "El archivo '%s' tiene una propiedad mime que indica que es binario"
-#: libsvn_wc/props.c:3197 libsvn_wc/props.c:3264
+#: ../libsvn_wc/props.c:3197 ../libsvn_wc/props.c:3264
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Error interpretando propiedad %s en '%s': '%s'"
-#: libsvn_wc/props.c:3314
+#: ../libsvn_wc/props.c:3314
#, c-format
msgid ""
"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
@@ -5719,7 +5752,7 @@
"Propiedad %s inválida en '%s': el objetivo '%s' es una ruta absoluta o "
"involucra '..'"
-#: libsvn_wc/questions.c:122
+#: ../libsvn_wc/questions.c:122
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5728,7 +5761,7 @@
"El formato de la copia de trabajo de '%s' es demasiado viejo (%d); por favor "
"actualice su copia de trabajo nuevamente"
-#: libsvn_wc/questions.c:133
+#: ../libsvn_wc/questions.c:133
#, c-format
msgid ""
"This client is too old to work with working copy '%s'. You need\n"
@@ -5742,7 +5775,7 @@
"Vea http://subversion.tigris.org/faq.html#working-copy-format-change\n"
"para más detalles."
-#: libsvn_wc/questions.c:344
+#: ../libsvn_wc/questions.c:344
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5754,26 +5787,26 @@
" esperaba: %s\n"
" presente: %s\n"
-#: libsvn_wc/relocate.c:78
+#: ../libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "El comando 'relocate' sólo puede cambiar la parte directorio de un URL"
-#: libsvn_wc/update_editor.c:478
+#: ../libsvn_wc/update_editor.c:482
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "No hay una entrada '.' en: '%s'"
-#: libsvn_wc/update_editor.c:975
+#: ../libsvn_wc/update_editor.c:979
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "La ruta '%s' no está en la copia de trabajo"
-#: libsvn_wc/update_editor.c:1087
+#: ../libsvn_wc/update_editor.c:1091
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "No se borrará al directorio modificado localmente '%s'"
-#: libsvn_wc/update_editor.c:1259
+#: ../libsvn_wc/update_editor.c:1263
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -5782,7 +5815,7 @@
"Falló el añadido del directorio '%s': ya existe un objeto que no es un "
"directorio y tiene el mismo nombre"
-#: libsvn_wc/update_editor.c:1292
+#: ../libsvn_wc/update_editor.c:1296
#, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5791,7 +5824,7 @@
"Falló el añadido del directorio '%s': ya existe un directorio no versionado "
"del mismo nombre"
-#: libsvn_wc/update_editor.c:1314
+#: ../libsvn_wc/update_editor.c:1318
#, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5800,7 +5833,7 @@
"Falló el añadido del directorio '%s': ya existe un directorio versionado del "
"mismo nombre"
-#: libsvn_wc/update_editor.c:1325
+#: ../libsvn_wc/update_editor.c:1329
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5809,18 +5842,18 @@
"Falló el añadido del directorio '%s': objeto del mismo nombre como "
"directorio administrativo"
-#: libsvn_wc/update_editor.c:1339
+#: ../libsvn_wc/update_editor.c:1343
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
"Falló el añadido del directorio '%s': parámetros copyfrom no admitidos "
"todavía"
-#: libsvn_wc/update_editor.c:1630
+#: ../libsvn_wc/update_editor.c:1637
msgid "Couldn't do property merge"
msgstr "No se pudo efectuar la fusión de la propiedad"
-#: libsvn_wc/update_editor.c:1699
+#: ../libsvn_wc/update_editor.c:1710
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5829,12 +5862,11 @@
"Falló el marcar '%s' como ausente: un objeto del mismo nombre ya está "
"agendado para ser añadido"
-#: libsvn_wc/update_editor.c:1772
-#, fuzzy
+#: ../libsvn_wc/update_editor.c:1783
msgid "Bad copyfrom arguments received"
-msgstr "Demasiados parámetros"
+msgstr "Se recibieron parámetros copyfrom incorrectos"
-#: libsvn_wc/update_editor.c:1811
+#: ../libsvn_wc/update_editor.c:1822
#, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5843,7 +5875,7 @@
"No se pudo añadir el archivo '%s': ya existe un archivo del mismo nombre "
"agendado para ser añadido con historia"
-#: libsvn_wc/update_editor.c:1823
+#: ../libsvn_wc/update_editor.c:1834
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
@@ -5851,88 +5883,88 @@
"No se pudo añadir el archivo '%s': ya existe un objeto del mismo nombre que "
"no es un archivo"
-#: libsvn_wc/update_editor.c:1838
+#: ../libsvn_wc/update_editor.c:1849
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr ""
"No se pudo añadir el archivo '%s': ya existe un objeto del mismo nombre"
-#: libsvn_wc/update_editor.c:1896
+#: ../libsvn_wc/update_editor.c:1907
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "El archivo '%s' del directorio '%s' no es un recurso versionado"
-#: libsvn_wc/update_editor.c:2043
+#: ../libsvn_wc/update_editor.c:2054
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr ""
"Inconsistencia en la suma de verificación de '%s': registrada '%s', "
"presente: '%s'"
-#: libsvn_wc/update_editor.c:2771
+#: ../libsvn_wc/update_editor.c:2787
msgid "Destination directory of add-with-history is missing a URL"
msgstr "Al directorio destino de add-with-history le falta un URL"
-#: libsvn_wc/update_editor.c:2786
+#: ../libsvn_wc/update_editor.c:2802
msgid "Destination URLs are broken"
msgstr "Los URLs destino están rotos"
-#: libsvn_wc/update_editor.c:3022
+#: ../libsvn_wc/update_editor.c:3038
msgid "No fetch_func supplied to update_editor"
msgstr "No se le suministró una función fetch_func al update_editor"
-#: libsvn_wc/update_editor.c:3623
+#: ../libsvn_wc/update_editor.c:3652
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' no tiene información de ancestros"
-#: libsvn_wc/update_editor.c:3777
+#: ../libsvn_wc/update_editor.c:3806
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "El URL 'copyfrom' '%s' tiene una raíz de repositorio diferente a '%s'"
-#: libsvn_wc/util.c:53
+#: ../libsvn_wc/util.c:53
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' no es un directorio"
-#: libsvn_wc/util.c:85
+#: ../libsvn_wc/util.c:85
msgid "Unable to make any directories"
msgstr "No se pudo crear ningún directorio"
-#: libsvn_wc/util.c:281
+#: ../libsvn_wc/util.c:281
#, c-format
msgid "Cannot find a URL for '%s'"
msgstr "No se pudo encontrar un URL para '%s'"
-#: svn/blame-cmd.c:247 svn/list-cmd.c:233
+#: ../svn/blame-cmd.c:247 ../svn/list-cmd.c:233
msgid "'verbose' option invalid in XML mode"
msgstr "La opción 'verbose' no es válida en modo XML"
-#: svn/blame-cmd.c:259 svn/info-cmd.c:500 svn/list-cmd.c:245
-#: svn/status-cmd.c:273
+#: ../svn/blame-cmd.c:259 ../svn/info-cmd.c:500 ../svn/list-cmd.c:245
+#: ../svn/status-cmd.c:273
msgid "'incremental' option only valid in XML mode"
msgstr "La opción 'incremental' sólo es válida en modo XML"
-#: svn/blame-cmd.c:322
+#: ../svn/blame-cmd.c:322
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Omitiendo el archivo binario: '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
+#: ../svn/checkout-cmd.c:129 ../svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' no parece ser un URL"
-#: svn/conflict-callbacks.c:134
+#: ../svn/conflict-callbacks.c:134
msgid "No editor found."
msgstr "No se encontró un editor."
-#: svn/conflict-callbacks.c:141
+#: ../svn/conflict-callbacks.c:141
msgid "Error running editor."
msgstr "Error ejecutando el editor."
-#: svn/conflict-callbacks.c:151
+#: ../svn/conflict-callbacks.c:151
#, c-format
msgid ""
"Invalid option; there's no merged version to edit.\n"
@@ -5941,40 +5973,47 @@
"Opción inválida; no hay una versión fusionada para editar.\n"
"\n"
-#: svn/conflict-callbacks.c:173
+#: ../svn/conflict-callbacks.c:173
msgid "No merge tool found.\n"
msgstr "No se encontró una herramienta de fusionado.\n"
-#: svn/conflict-callbacks.c:180
+#: ../svn/conflict-callbacks.c:180
msgid "Error running merge tool."
msgstr "Error ejecutando la herramienta de fusionado."
-#: svn/conflict-callbacks.c:240
+#: ../svn/conflict-callbacks.c:240
msgid "No editor found, leaving all conflicts."
msgstr "No se encontró un editor, se dejan todos los conflictos."
-#: svn/conflict-callbacks.c:249
+#: ../svn/conflict-callbacks.c:249
msgid "Error running editor, leaving all conflicts."
msgstr "Error ejecutando el editor, se dejan todos los conflictos."
-#: svn/conflict-callbacks.c:301
+#: ../svn/conflict-callbacks.c:281
+msgid "No merge tool found, leaving all conflicts."
+msgstr "No se encontró una herramienta para fusionar, se dejan todos los conflictos."
+
+#: ../svn/conflict-callbacks.c:290
+msgid "Error running merge tool leaving all conflicts."
+msgstr "Error ejecutando la herramienta para fusionar, se dejan todos los conflictos."
+
+#: ../svn/conflict-callbacks.c:326
#, c-format
msgid "Conflict discovered in '%s'.\n"
msgstr "Se descubrió un conflicto en '%s'.\n"
-#: svn/conflict-callbacks.c:306
+#: ../svn/conflict-callbacks.c:331
#, c-format
msgid "Conflict for property '%s' discovered on '%s'.\n"
msgstr "Se descubrió un conflicto para la propiedad '%s' en '%s'.\n"
-#: svn/conflict-callbacks.c:323
+#: ../svn/conflict-callbacks.c:348
#, c-format
msgid ""
"They want to delete the property, you want to change the value to '%s'.\n"
-msgstr ""
-"Quieren borrar la propiedad, usted quiere cambiar su valor a '%s'.\n"
+msgstr "Quieren borrar la propiedad, usted quiere cambiar su valor a '%s'.\n"
-#: svn/conflict-callbacks.c:332
+#: ../svn/conflict-callbacks.c:357
#, c-format
msgid ""
"They want to change the property value to '%s', you want to delete the "
@@ -5982,27 +6021,27 @@
msgstr ""
"Quieren cambiar el valor de la propiedad a '%s', usted quiere borrarla.\n"
-#: svn/conflict-callbacks.c:354
+#: ../svn/conflict-callbacks.c:379
msgid "Select: (p)ostpone"
msgstr "Seleccione: (p)osponer"
-#: svn/conflict-callbacks.c:356
+#: ../svn/conflict-callbacks.c:381
msgid ", (d)iff, (e)dit"
msgstr ", ver (d)if., (e)ditar"
-#: svn/conflict-callbacks.c:359
+#: ../svn/conflict-callbacks.c:384
msgid ", (m)ine, (t)heirs"
msgstr ", (m)ío, (t) de ellos"
-#: svn/conflict-callbacks.c:362
+#: ../svn/conflict-callbacks.c:387
msgid ", (r)esolved"
msgstr ", (r)esuelto"
-#: svn/conflict-callbacks.c:364
+#: ../svn/conflict-callbacks.c:389
msgid ", (h)elp for more options : "
msgstr ", (h) ayuda para más opciones : "
-#: svn/conflict-callbacks.c:375
+#: ../svn/conflict-callbacks.c:400
#, c-format
msgid ""
" (p)ostpone - mark the conflict to be resolved later\n"
@@ -6025,7 +6064,7 @@
" (h) ayuda - mostrar esta lista\n"
"\n"
-#: svn/conflict-callbacks.c:405
+#: ../svn/conflict-callbacks.c:430
#, c-format
msgid ""
"Invalid option; there's no merged version to diff.\n"
@@ -6034,7 +6073,7 @@
"Opción inválida; no hay una versión fusionada para ver diferencias.\n"
"\n"
-#: svn/conflict-callbacks.c:423 svn/conflict-callbacks.c:437
+#: ../svn/conflict-callbacks.c:448 ../svn/conflict-callbacks.c:462
#, c-format
msgid ""
"Invalid option.\n"
@@ -6043,7 +6082,7 @@
"Opción inválida.\n"
"\n"
-#: svn/conflict-callbacks.c:467
+#: ../svn/conflict-callbacks.c:492
#, c-format
msgid ""
"Conflict discovered when trying to add '%s'.\n"
@@ -6052,11 +6091,11 @@
"Se descubrió un conflicto al intentar añadir '%s'.\n"
"Ya existe un objeto con el mismo nombre.\n"
-#: svn/conflict-callbacks.c:470
+#: ../svn/conflict-callbacks.c:495
msgid "Select: (p)ostpone, (m)ine, (t)heirs, (h)elp :"
msgstr "Elija: (p)osponer, (m)i versión, la de ellos (t), ayuda (h) :"
-#: svn/conflict-callbacks.c:481
+#: ../svn/conflict-callbacks.c:506
#, c-format
msgid ""
" (p)ostpone - resolve the conflict later\n"
@@ -6071,36 +6110,40 @@
" (h) ayuda - mostrar esta lista\n"
"\n"
-#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:65 svn/move-cmd.c:76
-#: svn/propedit-cmd.c:202
+#: ../svn/copy-cmd.c:125 ../svn/delete-cmd.c:64 ../svn/mkdir-cmd.c:65
+#: ../svn/move-cmd.c:76 ../svn/propedit-cmd.c:202
msgid ""
"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
"Las operaciones locales que no involucran un 'commit' o las remotas que "
"operan sobre propedades de revisión, no llevan un mensaje de log"
-#: svn/diff-cmd.c:119 svnserve/main.c:530
+#: ../svn/diff-cmd.c:171 ../svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "No se pudo abrir la salida estándar"
-#: svn/diff-cmd.c:121
+#: ../svn/diff-cmd.c:173
#, c-format
msgid "Can't open stderr"
msgstr "No se pudo abrir la salida de error estándar"
-#: svn/diff-cmd.c:210
+#: ../svn/diff-cmd.c:182
+msgid "'--xml' option only valid with '--summarize' option"
+msgstr "La opción '--xml' sólo es válida conjuntamente con '--summarize'"
+
+#: ../svn/diff-cmd.c:279
msgid "'--new' option only valid with '--old' option"
msgstr "La opción '--new' sólo es válida conjuntamente con '--old'"
-#: svn/diff-cmd.c:240
+#: ../svn/diff-cmd.c:309
#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr ""
"La lista de objetivos para diff no puede contener copias de trabajo y URLs "
"al mismo tiempo"
-#: svn/export-cmd.c:87
+#: ../svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -6108,7 +6151,7 @@
"El directorio destino ya existe; por favor remuévalo o use --force para "
"sobreescribirlo"
-#: svn/help-cmd.c:45
+#: ../svn/help-cmd.c:45
#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
@@ -6135,7 +6178,7 @@
"\n"
"Subcomandos disponibles:\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"
@@ -6143,7 +6186,7 @@
"Subversion es una herramienta para control de versiones.\n"
"Para información adicional, vea http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1429
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -6151,191 +6194,191 @@
"Están disponibles los siguientes módulos de acceso a repositorios (RA):\n"
"\n"
-#: svn/import-cmd.c:82
+#: ../svn/import-cmd.c:82
msgid "Repository URL required when importing"
msgstr "Se requiere un URL de repositorio para importar"
-#: svn/import-cmd.c:86
+#: ../svn/import-cmd.c:86
msgid "Too many arguments to import command"
msgstr "Demasiados parámetros al comando import"
-#: svn/import-cmd.c:101
+#: ../svn/import-cmd.c:101
#, c-format
msgid "Invalid URL '%s'"
msgstr "URL inválido '%s'"
-#: svn/info-cmd.c:90
+#: ../svn/info-cmd.c:90
#, c-format
msgid "'%s' has invalid revision"
msgstr "'%s' tiene una revisión inválida"
-#: svn/info-cmd.c:239 svn/mergeinfo-cmd.c:111 svnadmin/main.c:1146
+#: ../svn/info-cmd.c:239 ../svn/mergeinfo-cmd.c:111 ../svnadmin/main.c:1146
#, c-format
msgid "Path: %s\n"
msgstr "Ruta: %s\n"
-#: svn/info-cmd.c:245 svnlook/main.c:778
+#: ../svn/info-cmd.c:245 ../svnlook/main.c:778
#, c-format
msgid "Name: %s\n"
msgstr "Nombre: %s\n"
-#: svn/info-cmd.c:249
+#: ../svn/info-cmd.c:249
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:252
+#: ../svn/info-cmd.c:252
#, c-format
msgid "Repository Root: %s\n"
msgstr "Raíz del repositorio: %s\n"
-#: svn/info-cmd.c:256
+#: ../svn/info-cmd.c:256
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID del repositorio: %s\n"
-#: svn/info-cmd.c:260
+#: ../svn/info-cmd.c:260
#, c-format
msgid "Revision: %ld\n"
msgstr "Revisión: %ld\n"
-#: svn/info-cmd.c:265
+#: ../svn/info-cmd.c:265
#, c-format
msgid "Node Kind: file\n"
msgstr "Tipo de nodo: archivo\n"
-#: svn/info-cmd.c:269
+#: ../svn/info-cmd.c:269
#, c-format
msgid "Node Kind: directory\n"
msgstr "Tipo de nodo: directorio\n"
-#: svn/info-cmd.c:273
+#: ../svn/info-cmd.c:273
#, c-format
msgid "Node Kind: none\n"
msgstr "Tipo de nodo: ninguno\n"
-#: svn/info-cmd.c:278
+#: ../svn/info-cmd.c:278
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Tipo de nodo: desconocido\n"
-#: svn/info-cmd.c:287
+#: ../svn/info-cmd.c:287
#, c-format
msgid "Schedule: normal\n"
msgstr "Agendado: normal\n"
-#: svn/info-cmd.c:291
+#: ../svn/info-cmd.c:291
#, c-format
msgid "Schedule: add\n"
msgstr "Agendado: añadido\n"
-#: svn/info-cmd.c:295
+#: ../svn/info-cmd.c:295
#, c-format
msgid "Schedule: delete\n"
msgstr "Agendado: borrado\n"
-#: svn/info-cmd.c:299
+#: ../svn/info-cmd.c:299
#, c-format
msgid "Schedule: replace\n"
msgstr "Agendado: reemplazar\n"
-#: svn/info-cmd.c:315
+#: ../svn/info-cmd.c:315
#, c-format
msgid "Depth: empty\n"
msgstr "Profundidad: vacío\n"
-#: svn/info-cmd.c:319
+#: ../svn/info-cmd.c:319
#, c-format
msgid "Depth: files\n"
msgstr "Profundidad: archivos\n"
-#: svn/info-cmd.c:323
+#: ../svn/info-cmd.c:323
#, c-format
msgid "Depth: immediates\n"
msgstr "Profundidad: inmediatos\n"
#. Other depths should never happen here.
-#: svn/info-cmd.c:334
+#: ../svn/info-cmd.c:334
#, c-format
msgid "Depth: INVALID\n"
msgstr "Profundidad: INVÁLIDA\n"
-#: svn/info-cmd.c:338
+#: ../svn/info-cmd.c:338
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Copiado desde el URL: %s\n"
-#: svn/info-cmd.c:342
+#: ../svn/info-cmd.c:342
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Copiado desde la rev: %ld\n"
-#: svn/info-cmd.c:347
+#: ../svn/info-cmd.c:347
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Autor del último cambio: %s\n"
-#: svn/info-cmd.c:351
+#: ../svn/info-cmd.c:351
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Revisión del último cambio: %ld\n"
-#: svn/info-cmd.c:356
+#: ../svn/info-cmd.c:356
msgid "Last Changed Date"
msgstr "Fecha de último cambio"
-#: svn/info-cmd.c:362
+#: ../svn/info-cmd.c:362
msgid "Text Last Updated"
msgstr "Texto actualizado por última vez"
-#: svn/info-cmd.c:366
+#: ../svn/info-cmd.c:366
msgid "Properties Last Updated"
msgstr "Propiedades actualizadas por última vez"
-#: svn/info-cmd.c:369
+#: ../svn/info-cmd.c:369
#, c-format
msgid "Checksum: %s\n"
msgstr "Suma de verificación: %s\n"
-#: svn/info-cmd.c:374
+#: ../svn/info-cmd.c:374
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Archivo base previo del conflicto: %s\n"
-#: svn/info-cmd.c:380
+#: ../svn/info-cmd.c:380
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Archivo de la copia de trabajo previo del conflicto: %s\n"
-#: svn/info-cmd.c:385
+#: ../svn/info-cmd.c:385
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Archivo base del conflicto: %s\n"
-#: svn/info-cmd.c:390
+#: ../svn/info-cmd.c:390
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Archivo de propiedades del conflicto: %s\n"
-#: svn/info-cmd.c:398
+#: ../svn/info-cmd.c:398
#, c-format
msgid "Lock Token: %s\n"
msgstr "Token de bloqueo: %s\n"
-#: svn/info-cmd.c:402
+#: ../svn/info-cmd.c:402
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Dueño del bloqueo: %s\n"
-#: svn/info-cmd.c:407
+#: ../svn/info-cmd.c:407
msgid "Lock Created"
msgstr "Bloqueo creado"
-#: svn/info-cmd.c:411
+#: ../svn/info-cmd.c:411
msgid "Lock Expires"
msgstr "El bloqueo expira"
-#: svn/info-cmd.c:420
+#: ../svn/info-cmd.c:420
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -6344,7 +6387,7 @@
"Comentario del bloqueo (%i líneas):\n"
"%s\n"
-#: svn/info-cmd.c:421
+#: ../svn/info-cmd.c:421
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -6353,12 +6396,12 @@
"Comentario del bloqueo (%i línea):\n"
"%s\n"
-#: svn/info-cmd.c:428
+#: ../svn/info-cmd.c:428
#, c-format
msgid "Changelist: %s\n"
msgstr "Lista de cambios: %s\n"
-#: svn/info-cmd.c:536
+#: ../svn/info-cmd.c:536
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -6367,7 +6410,7 @@
"%s: (No es un recurso versionado)\n"
"\n"
-#: svn/info-cmd.c:545
+#: ../svn/info-cmd.c:545
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -6376,95 +6419,96 @@
"%s: (No es un URL válido)\n"
"\n"
-#: svn/list-cmd.c:90
+#: ../svn/list-cmd.c:90
msgid "%b %d %H:%M"
msgstr "%d de %b %H:%M"
-#: svn/list-cmd.c:95
+#: ../svn/list-cmd.c:95
msgid "%b %d %Y"
msgstr "%d de %b %Y"
-#: svn/lock-cmd.c:53
+#: ../svn/lock-cmd.c:53
msgid "Lock comment contains a zero byte"
msgstr "Mensaje del bloqueo contiene un byte cero"
-#: svn/log-cmd.c:176
+#: ../svn/log-cmd.c:176
msgid "(no author)"
msgstr "(sin autor)"
-#: svn/log-cmd.c:187
+#: ../svn/log-cmd.c:187
msgid "(no date)"
msgstr "(sin fecha)"
-#: svn/log-cmd.c:217
+#: ../svn/log-cmd.c:217
#, c-format
msgid "Changed paths:\n"
msgstr "Rutas cambiadas:\n"
-#: svn/log-cmd.c:232
+#: ../svn/log-cmd.c:232
#, c-format
msgid " (from %s:%ld)"
msgstr " (de %s:%ld)"
#. Print the result of merge line
-#: svn/log-cmd.c:247
+#: ../svn/log-cmd.c:247
#, c-format
msgid "Result of a merge from:"
msgstr "Resultado de una fusión desde:"
-#: svn/log-cmd.c:462
+#: ../svn/log-cmd.c:462
msgid "'with-all-revprops' option only valid in XML mode"
msgstr "La opción 'with-all-revprops' sólo es válida en modo XML"
-#: svn/log-cmd.c:466
+#: ../svn/log-cmd.c:466
msgid "'with-revprop' option only valid in XML mode"
msgstr "La opción 'with-revprop' sólo es válida en modo XML"
-#: svn/log-cmd.c:482 svn/propset-cmd.c:106
+#: ../svn/log-cmd.c:482 ../svn/propset-cmd.c:106
#, c-format
msgid "no such changelist '%s'"
msgstr "No hay una lista de cambios '%s'"
-#: svn/log-cmd.c:550
+#: ../svn/log-cmd.c:550
msgid "Only relative paths can be specified after a URL"
msgstr "Sólo se permiten rutas relativas después de un URL"
-#: svn/log-cmd.c:590
+#: ../svn/log-cmd.c:590
#, c-format
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "no se puede asignar con la opción 'with-revprop' (saque el '=')"
-#: svn/main.c:60
+#: ../svn/main.c:60
msgid "force operation to run"
msgstr "forzar operación"
-#: svn/main.c:62
+#: ../svn/main.c:62
msgid "force validity of log message source"
msgstr "forzar la validez de la fuente del mensaje"
-#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:231 svnadmin/main.c:234
-#: svndumpfilter/main.c:774 svndumpfilter/main.c:777 svnlook/main.c:92
-#: svnlook/main.c:104 svnsync/main.c:138 svnsync/main.c:140
+#: ../svn/main.c:63 ../svn/main.c:64 ../svnadmin/main.c:231
+#: ../svnadmin/main.c:234 ../svndumpfilter/main.c:774
+#: ../svndumpfilter/main.c:777 ../svnlook/main.c:92 ../svnlook/main.c:104
+#: ../svnsync/main.c:138 ../svnsync/main.c:140
msgid "show help on a subcommand"
msgstr "mostrar ayuda de un subcomando"
-#: svn/main.c:65
+#: ../svn/main.c:65
msgid "specify log message ARG"
msgstr "especifica PAR como mensaje de log"
-#: svn/main.c:66
+#: ../svn/main.c:66
msgid "print nothing, or only summary information"
msgstr "no mostrar nada, o sólo totales"
-#: svn/main.c:67
+#: ../svn/main.c:67
msgid "descend recursively, same as --depth=infinity"
msgstr "descender recursivamente, igual que --depth=infinity"
-#: svn/main.c:68
+#: ../svn/main.c:68
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr "obsoleto; pruebe --depth=files o --depth=immediates"
-#: svn/main.c:70
+#: ../svn/main.c:70
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -6472,7 +6516,7 @@
"el cambio hecho por la rev. PAR (símil -r PAR-1:PAR)\n"
" Si PAR es negativo entonces es -r PAR:PAR-1"
-#: svn/main.c:74
+#: ../svn/main.c:74
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -6497,41 +6541,41 @@
"BASE\n"
" 'PREV' revisión justo antes de COMMITED"
-#: svn/main.c:84
+#: ../svn/main.c:84
msgid "read log message from file ARG"
msgstr "leer mensaje de log del archivo PAR"
-#: svn/main.c:86
+#: ../svn/main.c:86
msgid "give output suitable for concatenation"
msgstr "proveer salida apta de ser unida a otras salidas"
-#: svn/main.c:89
+#: ../svn/main.c:89
msgid "treat value as being in charset encoding ARG"
msgstr "el valor está en la codificación de caracteres PAR"
-#: svn/main.c:92 svnadmin/main.c:237 svndumpfilter/main.c:780
-#: svnlook/main.c:134 svnserve/main.c:151 svnsync/main.c:136
-#: svnversion/main.c:126
+#: ../svn/main.c:92 ../svnadmin/main.c:237 ../svndumpfilter/main.c:780
+#: ../svnlook/main.c:134 ../svnserve/main.c:151 ../svnsync/main.c:136
+#: ../svnversion/main.c:126
msgid "show program version information"
msgstr "mostrar información de la versión"
-#: svn/main.c:93
+#: ../svn/main.c:93
msgid "print extra information"
msgstr "mostrar información extra"
-#: svn/main.c:94
+#: ../svn/main.c:94
msgid "display update information"
msgstr "mostrar información de actualización"
-#: svn/main.c:96
+#: ../svn/main.c:96
msgid "specify a username ARG"
msgstr "especifica un nombre de usuario PAR"
-#: svn/main.c:98
+#: ../svn/main.c:98
msgid "specify a password ARG"
msgstr "especifica una clave PAR"
-#: svn/main.c:101 svnlook/main.c:138
+#: ../svn/main.c:101 ../svnlook/main.c:138
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed "
@@ -6571,13 +6615,13 @@
" Ignorar cambios en estilos de final\n"
" de línea."
-#: svn/main.c:130
+#: ../svn/main.c:130
msgid "pass contents of file ARG as additional args"
msgstr ""
"pasar el contenido del archivo PAR\n"
" como parámetros adicionales"
-#: svn/main.c:132
+#: ../svn/main.c:132
msgid ""
"pass depth ('empty', 'files', 'immediates', or\n"
" 'infinity') as ARG"
@@ -6585,100 +6629,100 @@
"pasa profundidad ('empty', 'files', 'immediates', o\n"
" 'infinity') como ARG"
-#: svn/main.c:135
+#: ../svn/main.c:135
msgid "output in XML"
msgstr "salida en XML"
-#: svn/main.c:136
+#: ../svn/main.c:136
msgid "use strict semantics"
msgstr "semántica estricta"
-#: svn/main.c:138
+#: ../svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "no atravesar copias al recorrer la historia"
-#: svn/main.c:140
+#: ../svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr ""
"no usar la configuración de ignorado\n"
" (ni de la propiedad svn:ignore ni de\n"
" los valores por defecto)"
-#: svn/main.c:142 svnsync/main.c:116
+#: ../svn/main.c:142 ../svnsync/main.c:116
msgid "do not cache authentication tokens"
msgstr "no almacenar y reusar claves"
-#: svn/main.c:144 svnsync/main.c:114
+#: ../svn/main.c:144 ../svnsync/main.c:114
msgid "do no interactive prompting"
msgstr "no pedir información interactivamente"
-#: svn/main.c:146
+#: ../svn/main.c:146
msgid "try operation but make no changes"
msgstr "intentar la operación, pero no hacer cambios"
-#: svn/main.c:148 svnlook/main.c:113
+#: ../svn/main.c:148 ../svnlook/main.c:113
msgid "do not print differences for deleted files"
msgstr "no mostrar diferencias para archivos borrados"
-#: svn/main.c:150
+#: ../svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "tomar en cuenta ancestros al calcular diferencias"
-#: svn/main.c:152
+#: ../svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr ""
"no tomar en cuenta información de ancestros\n"
" al calcular las fusiones"
-#: svn/main.c:154
+#: ../svn/main.c:154
msgid "ignore externals definitions"
msgstr "ignorar definiciones de 'externals'"
-#: svn/main.c:157
+#: ../svn/main.c:157
msgid "use ARG as diff command"
msgstr "usar PAR como comando para mostrar diferencias"
-#: svn/main.c:159
+#: ../svn/main.c:159
msgid "use ARG as merge command"
msgstr "usar PAR como comando para fusionar"
-#: svn/main.c:161
+#: ../svn/main.c:161
msgid "use ARG as external editor"
msgstr "usar PAR como el editor externo"
-#: svn/main.c:164
+#: ../svn/main.c:164
msgid "mark revisions as merged (use with -r)"
msgstr "marcar revisiones como fusionadas (use con -r)"
-#: svn/main.c:166
+#: ../svn/main.c:166
msgid "use ARG as the older target"
msgstr "usar PAR como el objetivo más viejo"
-#: svn/main.c:168
+#: ../svn/main.c:168
msgid "use ARG as the newer target"
msgstr "usar PAR como el objetivo más nuevo"
-#: svn/main.c:170
+#: ../svn/main.c:170
msgid "operate on a revision property (use with -r)"
msgstr "operar en una propiedad de revisión (use con -r)"
-#: svn/main.c:172
+#: ../svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "reubicar vía reescritura de URL"
-#: svn/main.c:174 svnadmin/main.c:273 svnsync/main.c:134
+#: ../svn/main.c:174 ../svnadmin/main.c:273 ../svnsync/main.c:134
msgid "read user configuration files from directory ARG"
msgstr "leer configuración del usuario del directorio PAR"
-#: svn/main.c:176
+#: ../svn/main.c:176
msgid "enable automatic properties"
msgstr "activar asignación automática de propiedades"
-#: svn/main.c:178
+#: ../svn/main.c:178
msgid "disable automatic properties"
msgstr "desactivar asignación automática de propiedades"
-#: svn/main.c:180
+#: ../svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6690,55 +6734,55 @@
" svn:eol-style valga 'native'.\n"
" PAR puede ser 'LF', 'CR', 'CRLF'"
-#: svn/main.c:188
+#: ../svn/main.c:188
msgid "maximum number of log entries"
msgstr "número máximo de entradas de log"
-#: svn/main.c:190
+#: ../svn/main.c:190
msgid "don't unlock the targets"
msgstr "no desbloquear los objetivos"
-#: svn/main.c:192
+#: ../svn/main.c:192
msgid "show a summary of the results"
msgstr "muestra un resumen de los resultados"
-#: svn/main.c:194
+#: ../svn/main.c:194
msgid "remove changelist association"
msgstr "eliminar asociación con lista de cambios"
-#: svn/main.c:196
+#: ../svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "operar sólo en miembro de la lista de cambios PAR"
-#: svn/main.c:198
+#: ../svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "no eliminar la lista de cambios en el commit"
-#: svn/main.c:200
+#: ../svn/main.c:200
msgid "keep path in working copy"
msgstr "conservar ruta en copia de trabajo"
-#: svn/main.c:202
+#: ../svn/main.c:202
msgid "retrieve all revision properties"
msgstr "obtener todas las propiedades de revisión"
-#: svn/main.c:204
+#: ../svn/main.c:204
msgid ""
"set revision property ARG in new revision\n"
" using the name=value format"
msgstr ""
-#: svn/main.c:208
+#: ../svn/main.c:208
msgid "make intermediate directories"
msgstr "crea los directorios intemedios"
-#: svn/main.c:210
+#: ../svn/main.c:210
msgid ""
"use/display additional information from merge\n"
" history"
msgstr "usa/muestra info adicional de la historia de fusiones"
-#: svn/main.c:214
+#: ../svn/main.c:214
msgid ""
"specify automatic conflict resolution action\n"
" ('"
@@ -6747,7 +6791,7 @@
" automática de los conflictos\n"
" ('"
-#: svn/main.c:261
+#: ../svn/main.c:261
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6757,11 +6801,11 @@
"para ser añadidos al repositorio. Serán añadidos en el próximo commit.\n"
"uso: add RUTA...\n"
-#: svn/main.c:267
+#: ../svn/main.c:267
msgid "add intermediate parents"
msgstr "añadir padres intermedios"
-#: svn/main.c:270
+#: ../svn/main.c:270
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6777,7 +6821,7 @@
" Si se especifica, REV determina la revisión en la que el objetivo\n"
" se busca primero.\n"
-#: svn/main.c:280
+#: ../svn/main.c:280
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6791,7 +6835,7 @@
" Si se especifica, REV determina la revisión en la que el objetivo\n"
" se busca primero.\n"
-#: svn/main.c:288
+#: ../svn/main.c:288
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
@@ -6801,7 +6845,7 @@
"uso: 1. changelist NOMLIST OBJETIVO...\n"
" 2. changelist --remove OBJETIVO...\n"
-#: svn/main.c:294
+#: ../svn/main.c:294
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6847,7 +6891,7 @@
" como una modificación local. Todas las propiedades del repositorio\n"
" se aplicarán en la ruta obstruida.\n"
-#: svn/main.c:319
+#: ../svn/main.c:319
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6857,7 +6901,7 @@
"continuando operaciones inconclusas, etc.\n"
"uso: cleanup [RUTA...]\n"
-#: svn/main.c:326
+#: ../svn/main.c:326
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6875,7 +6919,7 @@
" Si alguno de los objetivos está bloqueado o contiene items que lo\n"
" están, éstos serán desbloqueados después de un commit exitoso.\n"
-#: svn/main.c:334
+#: ../svn/main.c:334
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6895,7 +6939,7 @@
" o contiene items que lo están, éstos serán desbloqueados después\n"
" de un commit exitoso.\n"
-#: svn/main.c:348
+#: ../svn/main.c:348
msgid ""
"Duplicate something in working copy or repository, remembering\n"
"history.\n"
@@ -6925,7 +6969,7 @@
" URL -> URL: copia completamente en servidor; para ramas y etiquetas\n"
" Todos los ORIGs deben ser del mismo tipo.\n"
-#: svn/main.c:364
+#: ../svn/main.c:364
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -6957,7 +7001,7 @@
" 2. Cada ítem especificado con un URL es eliminado en el repositorio\n"
" mediante un commit inmediato.\n"
-#: svn/main.c:381
+#: ../svn/main.c:381
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -7014,7 +7058,7 @@
" Use simplemente 'svn diff' para mostrar las modificaciones locales de una\n"
" copia de trabajo.\n"
-#: svn/main.c:410
+#: ../svn/main.c:411
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -7054,7 +7098,7 @@
" Si se especifica, REVPEG determina la revisión en la que el objetivo\n"
" se busca primero.\n"
-#: svn/main.c:432
+#: ../svn/main.c:433
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -7062,7 +7106,7 @@
"Describe el uso de este programa o de sus subcomandos.\n"
"uso: help [SUBCOMANDO...]\n"
-#: svn/main.c:438
+#: ../svn/main.c:439
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -7086,7 +7130,7 @@
" Los items no versionables tales como archivos de dispositivos\n"
" o pipes se ignoran si se usa --force.\n"
-#: svn/main.c:453
+#: ../svn/main.c:454
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -7102,7 +7146,7 @@
" OBJETIVO puede ser una ruta de una copia de trabajo o un URL. Si se\n"
" especifica, REV determina en qué revisión se busca primero al objetivo.\n"
-#: svn/main.c:464
+#: ../svn/main.c:465
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -7143,7 +7187,7 @@
" Tamaño (en bytes)\n"
" Fecha y hora del último commit\n"
-#: svn/main.c:486
+#: ../svn/main.c:487
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -7159,20 +7203,19 @@
" Use --force para robar el bloqueo de otro usuario o de otra copia\n"
" de trabajo.\n"
-#: svn/main.c:493
+#: ../svn/main.c:494
msgid "read lock comment from file ARG"
msgstr "leer el comentario de lock del archivo PAR"
-#: svn/main.c:494
+#: ../svn/main.c:495
msgid "specify lock comment ARG"
msgstr "especifica PAR como comentario de lock"
-#: svn/main.c:495
-#, fuzzy
+#: ../svn/main.c:496
msgid "force validity of lock comment source"
-msgstr "forzar la validez de la fuente del mensaje"
+msgstr "forzar la validez de la fuente del comentario de bloqueo"
-#: svn/main.c:498
+#: ../svn/main.c:499
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -7228,7 +7271,7 @@
" svn log http://www.example.com/repo/proyecto/foo.c\n"
" svn log http://www.example.com/repo/proyecto foo.c bar.c\n"
-#: svn/main.c:533
+#: ../svn/main.c:534
msgid "retrieve revision property ARG"
msgstr "obtiene la propiedad de revisión PAR"
@@ -7236,12 +7279,13 @@
# es ininteligible. Si en la versión liberada no se aclara: preguntar
# en la lista.
#
-#: svn/main.c:536
+#: ../svn/main.c:537
+#, 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]... | [-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"
@@ -7260,6 +7304,10 @@
" is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
" does the reverse: '-r M:<M-1>'. If neither N nor M is specified,\n"
" they default to OLDEST_CONTIGUOUS_REV_OF_SOURCE_AT_URL and HEAD.\n"
+" Multiple '-c' and/or '-r' may be specified and mixing of forward\n"
+" and reverse ranges is allowed, however the ranges are compacted\n"
+" to their minimum representation before merging begins (which may\n"
+" result in a no-op).\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"
@@ -7297,7 +7345,7 @@
" correspondan con un archivo en '.', en cuyo caso las diferencias se\n"
" aplicarán a ese archivo.\n"
-#: svn/main.c:569
+#: ../svn/main.c:574
msgid ""
"Query merge-related information.\n"
"usage: mergeinfo [TARGET[@REV]...]\n"
@@ -7305,7 +7353,7 @@
"Pregunta información relacionada con las fusiones.\n"
"uso: mergeinfo [OBJETIVO[@REV]...]\n"
-#: svn/main.c:574
+#: ../svn/main.c:579
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -7339,7 +7387,7 @@
" En ambos casos, todos los directorios intermedios deben ya existir\n"
" a menos que se use la opción --parents.\n"
-#: svn/main.c:591
+#: ../svn/main.c:596
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -7370,7 +7418,7 @@
" URL -> URL: cambio de nombre en el servidor directamente.\n"
" Todos los ORIGs deben ser del mismo tipo.\n"
-#: svn/main.c:608
+#: ../svn/main.c:613
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -7389,7 +7437,7 @@
"repositorio.\n"
" OBJETIVO sólo se usa para determinar sobre qué repositorio operar.\n"
-#: svn/main.c:620
+#: ../svn/main.c:625
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -7411,7 +7459,7 @@
" del repositorio.\n"
" OBJETIVO sólo se usa para determinar sobre qué repositorio operar.\n"
-#: svn/main.c:634
+#: ../svn/main.c:639
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -7447,7 +7495,7 @@
" embellecimientos (útil, por ejemplo, cuando se redireccionan\n"
" valores de propiedad binarios a un archivo).\n"
-#: svn/main.c:653
+#: ../svn/main.c:658
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -7468,7 +7516,7 @@
" 2. Lista propiedades remotas no versionadas en la revisión del\n"
" repositorio.\n"
-#: svn/main.c:665
+#: ../svn/main.c:670
#, fuzzy
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
@@ -7585,11 +7633,11 @@
" intento no recursivo fallará y un intento recursivo asignará\n"
" la propiedad sólo en los archivos hijos del directorio.\n"
-#: svn/main.c:726
+#: ../svn/main.c:731
msgid "read property value from file ARG"
msgstr "leer el valor de la propiedad del archivo PAR"
-#: svn/main.c:729
+#: ../svn/main.c:734
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -7607,7 +7655,7 @@
" auxiliares relacionados y permite que la RUTA pueda intervenir de\n"
" nuevo en un commit.\n"
-#: svn/main.c:736
+#: ../svn/main.c:741
msgid ""
"specify automatic conflict resolution source\n"
" '"
@@ -7616,7 +7664,7 @@
" automática de los conflictos\n"
" '"
-#: svn/main.c:743
+#: ../svn/main.c:748
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -7632,7 +7680,7 @@
"cualquier\n"
" estado de conflicto. Sin embargo no restituye directorios eliminados.\n"
-#: svn/main.c:752
+#: ../svn/main.c:757
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -7714,8 +7762,8 @@
" Sin parámetros muestra solamente los items modificados localmente (sin\n"
" acceder a la red).\n"
" Con -q muestra sólo información sumarizada sobre los ítems modificados\n"
-" localmente."
-" Con -u agrega la revisión de trabajo y estado de actualización\n"
+" localmente. Con -u agrega la revisión de trabajo y estado de "
+"actualización\n"
" respecto del servidor.\n"
" Con -v muestra la información de revisión completa para cada ítem.\n"
"\n"
@@ -7789,7 +7837,7 @@
" 965 687 joe wc/zig.c\n"
" Estado respecto a la revisión: 981\n"
-#: svn/main.c:829
+#: ../svn/main.c:834
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -7840,7 +7888,7 @@
" local. Todas las propiedades del repositorio se aplicarán en la ruta\n"
" obstruida.\n"
-#: svn/main.c:857
+#: ../svn/main.c:862
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7852,7 +7900,7 @@
"\n"
" Use --force para romper el bloqueo.\n"
-#: svn/main.c:864
+#: ../svn/main.c:869
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7921,52 +7969,53 @@
" obstruida. Las rutas obstruidas se reportan en la primera columna con\n"
" el código 'E'.\n"
-#: svn/main.c:941 svnadmin/main.c:78 svnlook/main.c:329 svnsync/main.c:184
+#: ../svn/main.c:946 ../svnadmin/main.c:78 ../svnlook/main.c:329
+#: ../svnsync/main.c:184
msgid "Caught signal"
msgstr "Se atrapó una señal"
-#: svn/main.c:960
+#: ../svn/main.c:965
#, fuzzy
msgid "Revision property pair is empty"
msgstr "La entrada de la revisión no es una lista"
-#: svn/main.c:980 svn/propedit-cmd.c:60 svn/propget-cmd.c:181
-#: svn/propset-cmd.c:65
+#: ../svn/main.c:985 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:181
+#: ../svn/propset-cmd.c:65
#, c-format
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' no es un nombre válido para una propiedad de Subversion"
-#: svn/main.c:1101 svnlook/main.c:2076
+#: ../svn/main.c:1106 ../svnlook/main.c:2076
msgid "Non-numeric limit argument given"
msgstr "Se dio un límite no numérico"
-#: svn/main.c:1107 svnlook/main.c:2082
+#: ../svn/main.c:1112 ../svnlook/main.c:2082
msgid "Argument to --limit must be positive"
msgstr "El parámetro de --limit debe ser positivo"
-#: svn/main.c:1127 svn/main.c:1334
+#: ../svn/main.c:1132 ../svn/main.c:1339
msgid "Can't specify -c with --old"
msgstr "No se puede especificar -c conjuntamente con --old"
-#: svn/main.c:1134
+#: ../svn/main.c:1139
msgid "Non-numeric change argument given to -c"
msgstr "Se dio como parámetro un cambio no numérico a -c"
-#: svn/main.c:1140
+#: ../svn/main.c:1145
msgid "There is no change 0"
msgstr "No hay un cambio 0"
-#: svn/main.c:1175 svnadmin/main.c:1345
+#: ../svn/main.c:1180 ../svnadmin/main.c:1345
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Error de sintaxis en el parámetro de revisión '%s'"
-#: svn/main.c:1248
+#: ../svn/main.c:1253
#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Error convirtiendo la profundidad desde el locale a UTF8"
-#: svn/main.c:1255
+#: ../svn/main.c:1260
#, c-format
msgid ""
"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
@@ -7974,28 +8023,28 @@
"'%s' no es una profundidad válida; pruebe 'empty', 'files', 'immediates', o "
"'infinity'"
-#: svn/main.c:1362
+#: ../svn/main.c:1367
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Error de sintaxis en el parámetro de native-eol '%s'"
-#: svn/main.c:1406
+#: ../svn/main.c:1411
#, c-format
msgid "'%s' is not a valid accept value"
msgstr "'%s' no es un valor válido de aceptación"
-#: svn/main.c:1459 svndumpfilter/main.c:1201 svnlook/main.c:2154
+#: ../svn/main.c:1464 ../svndumpfilter/main.c:1201 ../svnlook/main.c:2154
#, c-format
msgid "Subcommand argument required\n"
msgstr "El subcomando requiere un parámetro\n"
-#: svn/main.c:1478 svnadmin/main.c:1477 svndumpfilter/main.c:1220
-#: svnlook/main.c:2173
+#: ../svn/main.c:1483 ../svnadmin/main.c:1477 ../svndumpfilter/main.c:1220
+#: ../svnlook/main.c:2173
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Comando desconocido: '%s'\n"
-#: svn/main.c:1512
+#: ../svn/main.c:1517
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8004,7 +8053,7 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svn help %s' para ver modo de uso.\n"
-#: svn/main.c:1526
+#: ../svn/main.c:1531
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -8012,19 +8061,19 @@
"Se encontraron múltiples indicaciones de revisiones; no se puede usar -c más "
"de una vez, o usar -c y -r a la vez"
-#: svn/main.c:1580
+#: ../svn/main.c:1585
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"El mensaje de log es un archivo versionado, use '--force-log' para actuar de "
"todas formas"
-#: svn/main.c:1587
+#: ../svn/main.c:1592
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"El mensaje de bloqueo es un archivo versionado, use '--force-log' para "
"actuar de todas formas"
-#: svn/main.c:1607
+#: ../svn/main.c:1612
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8032,7 +8081,7 @@
"El mensaje de log es una ruta (¿la intención fue usar -F?); use '--force-"
"log' para forzar la acción"
-#: svn/main.c:1614
+#: ../svn/main.c:1619
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8040,24 +8089,24 @@
"El mensaje de bloqueo es una ruta (¿la intención fue usar -F?); use '--force-"
"log' para forzar la acción"
-#: svn/main.c:1625
+#: ../svn/main.c:1630
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate y --depth son mutuamente excluyentes"
-#: svn/main.c:1682
+#: ../svn/main.c:1697
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props y --no-auto-props son mutuamente excluyentes"
-#: svn/main.c:1794 svn/main.c:1800
+#: ../svn/main.c:1809 ../svn/main.c:1815
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s es incompatible con --non-interactive"
-#: svn/main.c:1827
+#: ../svn/main.c:1842
msgid "Try 'svn help' for more info"
msgstr "Pruebe 'svn help' para más información"
-#: svn/main.c:1837
+#: ../svn/main.c:1852
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8065,20 +8114,20 @@
"svn: ejecute 'svn cleanup' para quitar locks (tipee 'svn help cleanup' para "
"más detalles)\n"
-#: svn/merge-cmd.c:98
+#: ../svn/merge-cmd.c:98
msgid "Second revision required"
msgstr "Se requiere una segunda revisión"
-#: svn/merge-cmd.c:107 svn/merge-cmd.c:133
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:133
msgid "Too many arguments given"
msgstr "Demasiados parámetros"
-#: svn/merge-cmd.c:149
+#: ../svn/merge-cmd.c:149
msgid "A working copy merge source needs an explicit revision"
msgstr ""
"Se necesita una revisión explícita al fusionar con una copia de trabajo"
-#: svn/merge-cmd.c:222
+#: ../svn/merge-cmd.c:222
#, c-format
msgid ""
"Unable to determine merge source for '%s' -- please provide an explicit "
@@ -8087,12 +8136,12 @@
"No se pudo determinar la fuente de la fusión para '%s' -- por favor provéala "
"explícitamente"
-#: svn/mergeinfo-cmd.c:134
+#: ../svn/mergeinfo-cmd.c:134
#, c-format
msgid " Source path: %s\n"
msgstr " Ruta origen: %s\n"
-#: svn/mergeinfo-cmd.c:136
+#: ../svn/mergeinfo-cmd.c:136
#, c-format
msgid " Merged ranges: "
msgstr " Rangos fusionados: "
@@ -8106,55 +8155,55 @@
#. ### system. It may just mean the system has to work
#. ### harder to provide that information.
#.
-#: svn/mergeinfo-cmd.c:150
+#: ../svn/mergeinfo-cmd.c:150
#, c-format
msgid " Eligible ranges: "
msgstr " Rangos elegibles: "
-#: svn/mergeinfo-cmd.c:163
+#: ../svn/mergeinfo-cmd.c:163
#, c-format
msgid "(source no longer available in HEAD)\n"
msgstr "(la fuente ya no está disponible en HEAD)\n"
-#: svn/mkdir-cmd.c:87
+#: ../svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Quizá deba usar 'svn add' o 'svn add --non-recursive'."
-#: svn/mkdir-cmd.c:93
+#: ../svn/mkdir-cmd.c:93
msgid "Try 'svn mkdir --parents' instead?"
msgstr "¿Y si prueba con 'svn mkdir --parents'?"
-#: svn/notify.c:72
+#: ../svn/notify.c:72
#, c-format
msgid "Skipped missing target: '%s'\n"
msgstr "Omitiendo objetivo faltante: '%s'\n"
-#: svn/notify.c:79
+#: ../svn/notify.c:79
#, c-format
msgid "Skipped '%s'\n"
msgstr "Omitiendo '%s'\n"
-#: svn/notify.c:127
+#: ../svn/notify.c:127
#, c-format
msgid "Restored '%s'\n"
msgstr "Se restituyó '%s'\n"
-#: svn/notify.c:133
+#: ../svn/notify.c:133
#, c-format
msgid "Reverted '%s'\n"
msgstr "Se revirtió '%s'\n"
-#: svn/notify.c:139
+#: ../svn/notify.c:139
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr "Falló la reversión de '%s' -- intente actualizarlo.\n"
-#: svn/notify.c:147
+#: ../svn/notify.c:147
#, c-format
msgid "Resolved conflicted state of '%s'\n"
msgstr "Se resolvió el conflicto de '%s'\n"
-#: svn/notify.c:228
+#: ../svn/notify.c:228
#, c-format
msgid ""
"\n"
@@ -8163,77 +8212,77 @@
"\n"
"Obteniendo ítem externo en '%s'\n"
-#: svn/notify.c:243
+#: ../svn/notify.c:243
#, c-format
msgid "Exported external at revision %ld.\n"
msgstr "Ítem externo exportado en la revisión %ld.\n"
-#: svn/notify.c:244
+#: ../svn/notify.c:244
#, c-format
msgid "Exported revision %ld.\n"
msgstr "Se exportó la revisión %ld.\n"
-#: svn/notify.c:252
+#: ../svn/notify.c:252
#, c-format
msgid "Checked out external at revision %ld.\n"
msgstr "Se obtuvo recurso externo en la revisión %ld.\n"
-#: svn/notify.c:253
+#: ../svn/notify.c:253
#, c-format
msgid "Checked out revision %ld.\n"
msgstr "Revisión obtenida: %ld\n"
-#: svn/notify.c:263
+#: ../svn/notify.c:263
#, c-format
msgid "Updated external to revision %ld.\n"
msgstr "Recurso externo actualizado a la revisión %ld.\n"
-#: svn/notify.c:264
+#: ../svn/notify.c:264
#, c-format
msgid "Updated to revision %ld.\n"
msgstr "Actualizado a la revisión %ld.\n"
-#: svn/notify.c:272
+#: ../svn/notify.c:272
#, c-format
msgid "External at revision %ld.\n"
msgstr "Recurso externo en revisión %ld.\n"
-#: svn/notify.c:273
+#: ../svn/notify.c:273
#, c-format
msgid "At revision %ld.\n"
msgstr "En la revisión %ld.\n"
-#: svn/notify.c:285
+#: ../svn/notify.c:285
#, c-format
msgid "External export complete.\n"
msgstr "Exportación externa completa.\n"
-#: svn/notify.c:286
+#: ../svn/notify.c:286
#, c-format
msgid "Export complete.\n"
msgstr "Exportación completa.\n"
-#: svn/notify.c:293
+#: ../svn/notify.c:293
#, c-format
msgid "External checkout complete.\n"
msgstr "Obtención de recursos externos completa.\n"
-#: svn/notify.c:294
+#: ../svn/notify.c:294
#, c-format
msgid "Checkout complete.\n"
msgstr "Obtención completa.\n"
-#: svn/notify.c:301
+#: ../svn/notify.c:301
#, c-format
msgid "External update complete.\n"
msgstr "Actualización de recurso externo completa.\n"
-#: svn/notify.c:302
+#: ../svn/notify.c:302
#, c-format
msgid "Update complete.\n"
msgstr "Actualización completa.\n"
-#: svn/notify.c:318
+#: ../svn/notify.c:318
#, c-format
msgid ""
"\n"
@@ -8242,158 +8291,158 @@
"\n"
"Averiguando el estado del recurso externo en '%s'\n"
-#: svn/notify.c:326
+#: ../svn/notify.c:326
#, c-format
msgid "Status against revision: %6ld\n"
msgstr "Estado respecto a la revisión: %6ld\n"
-#: svn/notify.c:334
+#: ../svn/notify.c:334
#, c-format
msgid "Sending %s\n"
msgstr "Enviando %s\n"
-#: svn/notify.c:343
+#: ../svn/notify.c:343
#, c-format
msgid "Adding (bin) %s\n"
msgstr "Añadiendo(bin) %s\n"
-#: svn/notify.c:350
+#: ../svn/notify.c:350
#, c-format
msgid "Adding %s\n"
msgstr "Añadiendo %s\n"
-#: svn/notify.c:357
+#: ../svn/notify.c:357
#, c-format
msgid "Deleting %s\n"
msgstr "Eliminando %s\n"
-#: svn/notify.c:364
+#: ../svn/notify.c:364
#, c-format
msgid "Replacing %s\n"
msgstr "Reemplazando %s\n"
-#: svn/notify.c:374 svnsync/main.c:655
+#: ../svn/notify.c:374 ../svnsync/main.c:655
#, c-format
msgid "Transmitting file data "
msgstr "Transmitiendo contenido de archivos "
-#: svn/notify.c:383
+#: ../svn/notify.c:383
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "'%s' está bloqueado por el usuario '%s'.\n"
-#: svn/notify.c:389
+#: ../svn/notify.c:389
#, c-format
msgid "'%s' unlocked.\n"
msgstr "'%s' desbloqueado.\n"
-#: svn/notify.c:400
+#: ../svn/notify.c:400
#, c-format
msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "La ruta '%s' ahora es miembro de la lista de cambios '%s'.\n"
-#: svn/notify.c:408
+#: ../svn/notify.c:408
#, c-format
msgid "Path '%s' is no longer a member of a changelist.\n"
msgstr "La ruta '%s' ya no miembro de una lista de cambios.\n"
-#: svn/notify.c:427
+#: ../svn/notify.c:427
#, c-format
msgid "--- Merging differences between repository URLs into '%s':\n"
msgstr "--- Fusionando las diferencias entre URLs del repositorio en '%s':\n"
-#: svn/notify.c:432
+#: ../svn/notify.c:432
#, c-format
msgid "--- Merging r%ld into '%s':\n"
msgstr "--- Fusionando r%ld en '%s':\n"
-#: svn/notify.c:436
-#, fuzzy, c-format
+#: ../svn/notify.c:436
+#, c-format
msgid "--- Reverse-merging r%ld into '%s':\n"
-msgstr "--- Fusionando r%ld hasta r%ld:\n"
+msgstr "--- Efectuando la fusión reversa de r%ld en '%s':\n"
-#: svn/notify.c:440
+#: ../svn/notify.c:440
#, c-format
msgid "--- Merging r%ld through r%ld into '%s':\n"
msgstr "--- Fusionando r%ld hasta r%ld en '%s':\n"
-#: svn/notify.c:446
-#, fuzzy, c-format
+#: ../svn/notify.c:446
+#, c-format
msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
-msgstr "--- Fusionando r%ld hasta r%ld:\n"
+msgstr "--- Efectuando la fusión reversa de r%ld hasta r%ld en '%s':\n"
-#: svn/propdel-cmd.c:105
+#: ../svn/propdel-cmd.c:105
#, c-format
msgid "property '%s' deleted from repository revision %ld\n"
msgstr "propiedad '%s' borrada de la revisión del repositorio %ld\n"
-#: svn/propdel-cmd.c:114
+#: ../svn/propdel-cmd.c:114
#, c-format
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr ""
"No se puede especificar una revisión al borrar la propiedad versionada '%s'"
-#: svn/propdel-cmd.c:152
+#: ../svn/propdel-cmd.c:152
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "propiedad '%s' borrada (recursivamente) de '%s'.\n"
-#: svn/propdel-cmd.c:153
+#: ../svn/propdel-cmd.c:153
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "propiedad '%s' borrada de '%s'.\n"
-#: svn/propedit-cmd.c:106 svn/propedit-cmd.c:245 svn/propset-cmd.c:90
+#: ../svn/propedit-cmd.c:106 ../svn/propedit-cmd.c:245 ../svn/propset-cmd.c:90
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr ""
"Opción de codificación inválida: valor de la propiedad no almacenado en UTF8"
-#: svn/propedit-cmd.c:115
+#: ../svn/propedit-cmd.c:115
#, c-format
msgid "Set new value for property '%s' on revision %ld\n"
msgstr "Nuevo valor para la propiedad '%s' asignado en la revisión %ld\n"
-#: svn/propedit-cmd.c:121
+#: ../svn/propedit-cmd.c:121
#, c-format
msgid "No changes to property '%s' on revision %ld\n"
msgstr "No se modifica la propiedad '%s' en la revisión %ld\n"
-#: svn/propedit-cmd.c:129
+#: ../svn/propedit-cmd.c:129
#, c-format
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr ""
"No se puede especificar una revisión para editar la propiedad versionada '%s'"
-#: svn/propedit-cmd.c:155 svn/propset-cmd.c:191
+#: ../svn/propedit-cmd.c:155 ../svn/propset-cmd.c:191
msgid "Explicit target argument required"
msgstr "Se requiere un parámetro explícito con un objetivo"
-#: svn/propedit-cmd.c:214 svn/switch-cmd.c:148
+#: ../svn/propedit-cmd.c:214 ../svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' no parece ser una ruta de una copia de trabajo"
-#: svn/propedit-cmd.c:273
+#: ../svn/propedit-cmd.c:273
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Se asignó un nuevo valor a la propiedad '%s' en '%s'\n"
-#: svn/propedit-cmd.c:283
+#: ../svn/propedit-cmd.c:283
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "No hay cambios a la propiedad '%s' en '%s'\n"
-#: svn/proplist-cmd.c:96
+#: ../svn/proplist-cmd.c:96
#, c-format
msgid "Properties on '%s':\n"
msgstr "Propiedades en '%s':\n"
-#: svn/proplist-cmd.c:182
+#: ../svn/proplist-cmd.c:182
#, c-format
msgid "Unversioned properties on revision %ld:\n"
msgstr "Propiedades no versionadas en revisión %ld:\n"
-#: svn/props.c:54
+#: ../svn/props.c:54
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -8401,15 +8450,15 @@
"Se debe especificar la revisión como un número, una fecha, o 'HEAD' al "
"operar en una propiedad de revisión"
-#: svn/props.c:61
+#: ../svn/props.c:61
msgid "Wrong number of targets specified"
msgstr "Se especificó un número incorrecto de objetivos"
-#: svn/props.c:70
+#: ../svn/props.c:70
msgid "Either a URL or versioned item is required"
msgstr "Se requiere un URL o un ítem versionado"
-#: svn/props.c:217
+#: ../svn/props.c:217
#, c-format
msgid ""
"To turn off the %s property, use 'svn propdel';\n"
@@ -8418,44 +8467,44 @@
"Para apagar la propiedad %s use 'svn propdel';\n"
"el asignarle '%s' a la propiedad no la apagará."
-#: svn/propset-cmd.c:141
+#: ../svn/propset-cmd.c:141
#, c-format
msgid "property '%s' set on repository revision %ld\n"
msgstr "propiedad '%s' asignada en la revisión del repositorio %ld\n"
-#: svn/propset-cmd.c:149
+#: ../svn/propset-cmd.c:149
#, c-format
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr ""
"No se puede especificar una revisión al asignar a la propiedad versionada '%"
"s'"
-#: svn/propset-cmd.c:184
+#: ../svn/propset-cmd.c:184
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr ""
"Se requiere un objetivo explícito ('%s' interpretado como un valor de "
"propiedad)"
-#: svn/propset-cmd.c:224
+#: ../svn/propset-cmd.c:224
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "propiedad '%s' asignada (recursivamente) en '%s'\n"
-#: svn/propset-cmd.c:225
+#: ../svn/propset-cmd.c:225
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "propiedad '%s' asignada en '%s'\n"
-#: svn/resolved-cmd.c:68
+#: ../svn/resolved-cmd.c:68
msgid "invalid 'accept' ARG"
msgstr "atributo 'accept' inválido"
-#: svn/revert-cmd.c:93
+#: ../svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "¿Y si prueba con 'svn revert --recursive'?"
-#: svn/status-cmd.c:337
+#: ../svn/status-cmd.c:337
#, c-format
msgid ""
"\n"
@@ -8464,17 +8513,17 @@
"\n"
"--- Lista de cambios '%s':\n"
-#: svn/status.c:254
+#: ../svn/status.c:254
#, c-format
msgid "'%s' has lock token, but no lock owner"
msgstr "'%s' tiene un token de bloqueo, pero no tiene un dueño del bloqueo"
-#: svn/switch-cmd.c:58
+#: ../svn/switch-cmd.c:58
#, c-format
msgid "'%s' to '%s' is not a valid relocation"
msgstr "Ir de '%s' a '%s' no es una reubicación válida"
-#: svn/util.c:63
+#: ../svn/util.c:63
#, c-format
msgid ""
"\n"
@@ -8483,7 +8532,7 @@
"\n"
"Commit de la revisión %ld.\n"
-#: svn/util.c:71
+#: ../svn/util.c:71
#, c-format
msgid ""
"\n"
@@ -8492,7 +8541,7 @@
"\n"
"Aviso: %s\n"
-#: svn/util.c:132
+#: ../svn/util.c:132
msgid ""
"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
"time configuration option is empty or consists solely of whitespace. "
@@ -8502,7 +8551,7 @@
"configuración 'editor-cmd' están vacías o consisten solamente en espacios. "
"Se esperaba un comando de shell."
-#: svn/util.c:139
+#: ../svn/util.c:139
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -8510,35 +8559,35 @@
"No está asignada ninguna de las variables SVN_EDITOR, VISUAL o EDITOR, y no "
"se encontró la opción 'editor-cmd' en la configuración"
-#: svn/util.c:167 svn/util.c:305
+#: ../svn/util.c:167 ../svn/util.c:305
#, c-format
msgid "Can't get working directory"
msgstr "No se pudo obtener el directorio de trabajo"
-#: svn/util.c:178 svn/util.c:316 svn/util.c:339
+#: ../svn/util.c:178 ../svn/util.c:316 ../svn/util.c:339
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "No se pudo cambiar el directorio de trabajo a '%s'"
-#: svn/util.c:186 svn/util.c:481
+#: ../svn/util.c:186 ../svn/util.c:481
#, c-format
msgid "Can't restore working directory"
msgstr "No se pudo restituir el directorio de trabajo"
-#: svn/util.c:193 svn/util.c:409
+#: ../svn/util.c:193 ../svn/util.c:409
#, c-format
msgid "system('%s') returned %d"
msgstr "system('%s') devolvió %d"
-#: svn/util.c:231
+#: ../svn/util.c:231
msgid ""
"The SVN_MERGE environment variable is empty or consists solely of "
"whitespace. Expected a shell command.\n"
msgstr ""
-"Las variable de entorno SVN_MERGE está vacía o consiste solamente "
-"en espacios. Se esperaba un comando de shell.\n"
+"Las variable de entorno SVN_MERGE está vacía o consiste solamente en "
+"espacios. Se esperaba un comando de shell.\n"
-#: svn/util.c:237
+#: ../svn/util.c:237
msgid ""
"The environment variable SVN_MERGE and the merge-tool-cmd run-time "
"configuration option were not set.\n"
@@ -8546,32 +8595,32 @@
"No está asignada la variable SVN_MERGE y no se encontró la opción 'merge-"
"tool-cmd' en la configuración.\n"
-#: svn/util.c:364
+#: ../svn/util.c:364
#, c-format
msgid "Can't write to '%s'"
msgstr "No se pudo escribir en '%s'"
-#: svn/util.c:450
+#: ../svn/util.c:450
msgid "Error normalizing edited contents to internal format"
msgstr "Error normalizando el conenido editado al formato interno"
-#: svn/util.c:523
+#: ../svn/util.c:523
msgid "Log message contains a zero byte"
msgstr "Mensaje del log contiene un byte cero"
-#: svn/util.c:583
+#: ../svn/util.c:583
msgid "Your commit message was left in a temporary file:"
msgstr "Su mensaje de commit fue dejado en un archivo temporario:"
-#: svn/util.c:635
+#: ../svn/util.c:635
msgid "--This line, and those below, will be ignored--"
msgstr "--Esta línea y las que están debajo serán ignoradas--"
-#: svn/util.c:660
+#: ../svn/util.c:660
msgid "Error normalizing log message to internal format"
msgstr "Error normalizando el mensaje al formato interno"
-#: svn/util.c:675
+#: ../svn/util.c:675
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -8579,13 +8628,13 @@
"El uso de un editor externo para obtener el mensaje de log no está admitido "
"en OS400; considere el usar las opciones --message (-m) o --file (-F)"
-#: svn/util.c:761
+#: ../svn/util.c:761
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr ""
"No se puede llamar un editor para obtener el mensaje de log si se opera no "
"interactivamente"
-#: svn/util.c:774
+#: ../svn/util.c:774
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) "
@@ -8595,7 +8644,7 @@
"asignar la variable $SVN_EDITOR o usar las opciones --message (-m) o --file "
"(-F)"
-#: svn/util.c:810
+#: ../svn/util.c:810
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -8605,77 +8654,77 @@
"Mensaje de log sin cambios o no especificado\n"
"(a)bortar, (c)ontinuar, (e)ditar :\n"
-#: svn/util.c:863
+#: ../svn/util.c:863
msgid "Use --force to override this restriction"
msgstr "Use --force para pasar por alto esta restricción"
-#: svnadmin/main.c:95 svndumpfilter/main.c:62
+#: ../svnadmin/main.c:95 ../svndumpfilter/main.c:62
#, c-format
msgid "Can't open stdio file"
msgstr "No se pudo abrir archivo stdio"
-#: svnadmin/main.c:124
+#: ../svnadmin/main.c:124
msgid "Repository argument required"
msgstr "El subcomando requiere un parámetro que indique el repositorio"
-#: svnadmin/main.c:129
+#: ../svnadmin/main.c:129
#, c-format
msgid "'%s' is an URL when it should be a path"
msgstr "'%s' es un URL cuando debería ser una ruta"
-#: svnadmin/main.c:240
+#: ../svnadmin/main.c:240
msgid "specify revision number ARG (or X:Y range)"
msgstr "especifica el número de revisión (o rango X:Y) PAR"
-#: svnadmin/main.c:243
+#: ../svnadmin/main.c:243
msgid "dump incrementally"
msgstr "volcado incremental"
-#: svnadmin/main.c:246
+#: ../svnadmin/main.c:246
msgid "use deltas in dump output"
msgstr "usar deltas en el volcado"
-#: svnadmin/main.c:249
+#: ../svnadmin/main.c:249
msgid "bypass the repository hook system"
msgstr "pasar por alto el sistema de 'hooks' del repositorio"
-#: svnadmin/main.c:252
+#: ../svnadmin/main.c:252
msgid "no progress (only errors) to stderr"
msgstr "no mostrar progreso (sólo errores) en stderr"
-#: svnadmin/main.c:255
+#: ../svnadmin/main.c:255
msgid "ignore any repos UUID found in the stream"
msgstr ""
"ignorar cualquier UUID de repositorio\n"
" encontrado en el flujo"
-#: svnadmin/main.c:258
+#: ../svnadmin/main.c:258
msgid "set repos UUID to that found in stream, if any"
msgstr ""
"asignar al repos el UUID encontrado\n"
" en el flujo, si lo hay"
-#: svnadmin/main.c:261
+#: ../svnadmin/main.c:261
msgid "type of repository: 'fsfs' (default) or 'bdb'"
msgstr "tipo de repositorio: 'fsfs' (por defecto) o 'bdb'"
-#: svnadmin/main.c:264
+#: ../svnadmin/main.c:264
msgid "load at specified directory in repository"
msgstr ""
"cargar en el directorio especificado\n"
" en el repositorio"
-#: svnadmin/main.c:267
+#: ../svnadmin/main.c:267
msgid "disable fsync at transaction commit [Berkeley DB]"
msgstr ""
"desactivar fsync en el commit de las\n"
" transacciones [Berkeley DB]"
-#: svnadmin/main.c:270
+#: ../svnadmin/main.c:270
msgid "disable automatic log file removal [Berkeley DB]"
msgstr "desactivar borrado automático de los archivos de log [Berkeley DB]"
-#: svnadmin/main.c:276
+#: ../svnadmin/main.c:276
msgid ""
"remove redundant Berkeley DB log files\n"
" from source repository [Berkeley DB]"
@@ -8683,31 +8732,31 @@
"remover archivos de log de Berkeley DB redundantes\n"
" del repositorio fuente [Berkeley DB]"
-#: svnadmin/main.c:280
+#: ../svnadmin/main.c:280
msgid "call pre-commit hook before committing revisions"
msgstr ""
"llamar al hook pre-commit antes de hacer\n"
" commit en las revisiones"
-#: svnadmin/main.c:283
+#: ../svnadmin/main.c:283
msgid "call post-commit hook after committing revisions"
msgstr ""
"llamar al hook post-commit después de\n"
" hacer commit en las revisiones"
-#: svnadmin/main.c:286
+#: ../svnadmin/main.c:286
msgid "call hook before changing revision property"
msgstr ""
"llamar al hook antes de cambiar la\n"
" propiedad de revisión"
-#: svnadmin/main.c:289
+#: ../svnadmin/main.c:289
msgid "call hook after changing revision property"
msgstr ""
"llamar al hook después de cambiar la\n"
" propiedad de revisión"
-#: svnadmin/main.c:292
+#: ../svnadmin/main.c:292
msgid ""
"wait instead of exit if the repository is in\n"
" use by another process"
@@ -8715,7 +8764,7 @@
"esperar en lugar de salir si el repositorio está en\n"
" uso por otro proceso"
-#: svnadmin/main.c:296
+#: ../svnadmin/main.c:296
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.4"
@@ -8723,7 +8772,7 @@
"usar formato compatible con versiones de Subversion\n"
" anteriores a 1.4"
-#: svnadmin/main.c:300
+#: ../svnadmin/main.c:300
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.5"
@@ -8731,7 +8780,7 @@
"usar formato compatible con versiones de Subversion\n"
" anteriores a 1.5"
-#: svnadmin/main.c:313
+#: ../svnadmin/main.c:313
msgid ""
"usage: svnadmin crashtest REPOS_PATH\n"
"\n"
@@ -8744,7 +8793,7 @@
"Esto simula la acción de un proceso que se cuelga mientras tiene abierto\n"
"un 'handle' a un repositorio.\n"
-#: svnadmin/main.c:319
+#: ../svnadmin/main.c:319
msgid ""
"usage: svnadmin create REPOS_PATH\n"
"\n"
@@ -8754,7 +8803,7 @@
"\n"
"Crea un repositorio vacío en RUTA_REPOS.\n"
-#: svnadmin/main.c:326
+#: ../svnadmin/main.c:326
msgid ""
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
@@ -8772,7 +8821,7 @@
"diferencias o 'deltas' respecto de la revisión anterior. Si no se\n"
"especifican revisiones se deltificará la revisión HEAD.\n"
-#: svnadmin/main.c:335
+#: ../svnadmin/main.c:335
msgid ""
"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
"\n"
@@ -8792,7 +8841,7 @@
"revisión. Si se usa --incremental la primera revisión volcada será la\n"
"diferencia respecto de la versión previa, en vez del contenido completo.\n"
-#: svnadmin/main.c:345
+#: ../svnadmin/main.c:345
msgid ""
"usage: svnadmin help [SUBCOMMAND...]\n"
"\n"
@@ -8802,7 +8851,7 @@
"\n"
"Describe el uso de este programa o de sus subcomandos.\n"
-#: svnadmin/main.c:350
+#: ../svnadmin/main.c:350
msgid ""
"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
"\n"
@@ -8812,7 +8861,7 @@
"\n"
"Hace una copia 'en caliente' de un repositorio.\n"
-#: svnadmin/main.c:355
+#: ../svnadmin/main.c:355
msgid ""
"usage: svnadmin list-dblogs REPOS_PATH\n"
"\n"
@@ -8828,7 +8877,7 @@
"AVISO: Modificar o borrar archivos de log que todavía estén en uso\n"
"provocará que el repositorio se corrompa.\n"
-#: svnadmin/main.c:362
+#: ../svnadmin/main.c:362
msgid ""
"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
"\n"
@@ -8840,7 +8889,7 @@
"Lista los archivos de log de la base Berkeley no usados.\n"
"\n"
-#: svnadmin/main.c:367
+#: ../svnadmin/main.c:367
msgid ""
"usage: svnadmin load REPOS_PATH\n"
"\n"
@@ -8857,7 +8906,7 @@
"el flujo de entrada. El feedback del progreso de la operación será\n"
"enviado a la salida estándar.\n"
-#: svnadmin/main.c:377
+#: ../svnadmin/main.c:377
msgid ""
"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
"\n"
@@ -8869,7 +8918,7 @@
"Muestra descripciones de todos los bloqueos en o debajo de RUTA-EN-EL-REPOS\n"
"(qué, si no se provee, será la raíz del repositorio).\n"
-#: svnadmin/main.c:383
+#: ../svnadmin/main.c:383
msgid ""
"usage: svnadmin lstxns REPOS_PATH\n"
"\n"
@@ -8879,7 +8928,7 @@
"\n"
"Muestra los nombres de las transacciones en curso.\n"
-#: svnadmin/main.c:388
+#: ../svnadmin/main.c:388
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
@@ -8895,7 +8944,7 @@
"La recuperación de una base Berkele requiere acceso exclusivo y el comando\n"
"terminará sin hacer nada si el repositorio está en uso por otro proceso.\n"
-#: svnadmin/main.c:396
+#: ../svnadmin/main.c:396
msgid ""
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
"\n"
@@ -8905,7 +8954,7 @@
"\n"
"Remueve incondicionalmente el bloqueo de cada RUTA_BLOQUEADA.\n"
-#: svnadmin/main.c:401
+#: ../svnadmin/main.c:401
msgid ""
"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
"\n"
@@ -8915,7 +8964,7 @@
"\n"
"Borra las transacciones por nombre.\n"
-#: svnadmin/main.c:406
+#: ../svnadmin/main.c:406
msgid ""
"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
"\n"
@@ -8941,7 +8990,7 @@
"NOTA: Las propiedades de revisión no están versionadas, por lo que\n"
"este comando sobreescribira el mensaje de log anterior.\n"
-#: svnadmin/main.c:418
+#: ../svnadmin/main.c:418
msgid ""
"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
"\n"
@@ -8964,7 +9013,7 @@
"NOTA: Las propiedades de revisión no están versionadas, por lo que\n"
"este comando sobreescribira el valor anterior de la propiedad.\n"
-#: svnadmin/main.c:429
+#: ../svnadmin/main.c:429
msgid ""
"usage: svnadmin verify REPOS_PATH\n"
"\n"
@@ -8974,30 +9023,30 @@
"\n"
"Verifica los datos almacenados en el repositorio.\n"
-#: svnadmin/main.c:486
+#: ../svnadmin/main.c:486
msgid "Invalid revision specifier"
msgstr "Especificador de revisión inválido"
-#: svnadmin/main.c:491
+#: ../svnadmin/main.c:491
#, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "El número de revisión no debe ser mayor que el de la última (%ld)"
-#: svnadmin/main.c:569 svnadmin/main.c:669
+#: ../svnadmin/main.c:569 ../svnadmin/main.c:669
msgid "First revision cannot be higher than second"
msgstr "La primera revisión no puede ser más alta que la segunda"
-#: svnadmin/main.c:578
+#: ../svnadmin/main.c:578
#, c-format
msgid "Deltifying revision %ld..."
msgstr "Deltificando revisión %ld..."
-#: svnadmin/main.c:582
+#: ../svnadmin/main.c:582
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: svnadmin/main.c:706
+#: ../svnadmin/main.c:706
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -9011,7 +9060,7 @@
"\n"
"Subcomandos disponibles:\n"
-#: svnadmin/main.c:713 svnlook/main.c:1752 svnserve/main.c:207
+#: ../svnadmin/main.c:713 ../svnlook/main.c:1752 ../svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -9019,7 +9068,7 @@
"Los siguientes módulos de motor de repositorio (FS) están disponibles:\n"
"\n"
-#: svnadmin/main.c:790
+#: ../svnadmin/main.c:790
#, c-format
msgid ""
"Repository lock acquired.\n"
@@ -9029,7 +9078,7 @@
"Espere por favor: la recuperación del repositorio puede llevar algún "
"tiempo...\n"
-#: svnadmin/main.c:826
+#: ../svnadmin/main.c:826
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -9037,13 +9086,13 @@
"Falló el obtener acceso exclusivo al repositorio; ¿será que otro proceso\n"
"tal como httpd, svnserve o svn lo tiene abierto?"
-#: svnadmin/main.c:831
+#: ../svnadmin/main.c:831
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"Esperando bloqueo del repositorio; ¿será que otro proceso lo tiene abierto?\n"
-#: svnadmin/main.c:839
+#: ../svnadmin/main.c:839
#, c-format
msgid ""
"\n"
@@ -9052,59 +9101,59 @@
"\n"
"Recuperación completa.\n"
-#: svnadmin/main.c:846
+#: ../svnadmin/main.c:846
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "La última versión de repositorio es %ld.\n"
-#: svnadmin/main.c:956
+#: ../svnadmin/main.c:956
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transacción '%s' eliminada.\n"
-#: svnadmin/main.c:1024 svnadmin/main.c:1051
+#: ../svnadmin/main.c:1024 ../svnadmin/main.c:1051
#, c-format
msgid "Missing revision"
msgstr "Revisión faltante"
-#: svnadmin/main.c:1027 svnadmin/main.c:1054
+#: ../svnadmin/main.c:1027 ../svnadmin/main.c:1054
#, c-format
msgid "Only one revision allowed"
msgstr "Sólo se permite una revisión"
-#: svnadmin/main.c:1033
+#: ../svnadmin/main.c:1033
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr ""
"Se requiere exactamente un nombre de propiedad y un parámetro que sea un "
"archivo"
-#: svnadmin/main.c:1060
+#: ../svnadmin/main.c:1060
#, c-format
msgid "Exactly one file argument required"
msgstr "Se requiere exactamente un parámetro que sea un archivo"
-#: svnadmin/main.c:1147 svnlook/main.c:1817
+#: ../svnadmin/main.c:1147 ../svnlook/main.c:1817
#, c-format
msgid "UUID Token: %s\n"
msgstr "Token UUID: %s\n"
-#: svnadmin/main.c:1148 svnlook/main.c:1818
+#: ../svnadmin/main.c:1148 ../svnlook/main.c:1818
#, c-format
msgid "Owner: %s\n"
msgstr "Dueño: %s\n"
-#: svnadmin/main.c:1149 svnlook/main.c:1819
+#: ../svnadmin/main.c:1149 ../svnlook/main.c:1819
#, c-format
msgid "Created: %s\n"
msgstr "Creado: %s\n"
-#: svnadmin/main.c:1150 svnlook/main.c:1820
+#: ../svnadmin/main.c:1150 ../svnlook/main.c:1820
#, c-format
msgid "Expires: %s\n"
msgstr "Expira: %s\n"
-#: svnadmin/main.c:1152
+#: ../svnadmin/main.c:1152
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9115,7 +9164,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1153
+#: ../svnadmin/main.c:1153
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9126,29 +9175,29 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1210
+#: ../svnadmin/main.c:1210
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "La ruta '%s' no está bloqueada.\n"
-#: svnadmin/main.c:1222
+#: ../svnadmin/main.c:1222
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Se removió el bloqueo sobre '%s'.\n"
-#: svnadmin/main.c:1331
+#: ../svnadmin/main.c:1331
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Se encontraron múltiples indicaciones de revisiones; intente '-r N:M' en vez "
"de '-r N -r M'"
-#: svnadmin/main.c:1459
+#: ../svnadmin/main.c:1459
#, c-format
msgid "subcommand argument required\n"
msgstr "el subcomando requiere un parámetro\n"
-#: svnadmin/main.c:1533
+#: ../svnadmin/main.c:1533
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9157,56 +9206,56 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svnadmin help %s' para ver modo de uso.\n"
-#: svnadmin/main.c:1566
+#: ../svnadmin/main.c:1566
msgid "Try 'svnadmin help' for more info"
msgstr "Pruebe 'svnadmin help' para más información"
-#: svndumpfilter/main.c:313
+#: ../svndumpfilter/main.c:313
msgid "This is an empty revision for padding."
msgstr "Esta es una revisión vacía para relleno."
-#: svndumpfilter/main.c:383
+#: ../svndumpfilter/main.c:383
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Se hizo commit de la revisión %ld como %ld.\n"
-#: svndumpfilter/main.c:406
+#: ../svndumpfilter/main.c:406
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Revisión %ld omitida.\n"
-#: svndumpfilter/main.c:508
+#: ../svndumpfilter/main.c:508
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "La ruta de origen para copia '%s' es inválida"
-#: svndumpfilter/main.c:552
+#: ../svndumpfilter/main.c:552
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "En el flujo filtrado no hay una revisión 'copyfrom' válida"
-#: svndumpfilter/main.c:657
+#: ../svndumpfilter/main.c:657
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr ""
"Se detectó un bloque de delta de propiedad - no admitido por svndumpfilter"
-#: svndumpfilter/main.c:782
+#: ../svndumpfilter/main.c:782
msgid "Do not display filtering statistics."
msgstr "No mostrar estadísticas de filtrado."
-#: svndumpfilter/main.c:784
+#: ../svndumpfilter/main.c:784
msgid "Remove revisions emptied by filtering."
msgstr "Remover revisiones vaciadas por el filtrado."
-#: svndumpfilter/main.c:786
+#: ../svndumpfilter/main.c:786
msgid "Renumber revisions left after filtering."
msgstr "Renombrar revisiones restantes después del filtrado."
-#: svndumpfilter/main.c:788
+#: ../svndumpfilter/main.c:788
msgid "Don't filter revision properties."
msgstr "No filtrar propiedades de las revisiones."
-#: svndumpfilter/main.c:799
+#: ../svndumpfilter/main.c:799
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -9214,7 +9263,7 @@
"Filtrar del flujo los nodos que tengan prefijos dados.\n"
"uso: svndumpfilter exclude PREFIJO_DE_RUTA...\n"
-#: svndumpfilter/main.c:805
+#: ../svndumpfilter/main.c:805
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -9222,7 +9271,7 @@
"Filtrar del flujo los nodos que no tengan los prefijos dados.\n"
"uso: svndumpfilter include PREFIJO_DE_RUTA...\n"
-#: svndumpfilter/main.c:811
+#: ../svndumpfilter/main.c:811
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -9230,7 +9279,7 @@
"Describe el uso de este programa o de sus subcomandos.\n"
"uso: svndumpfilter help [SUBCOMANDO...]\n"
-#: svndumpfilter/main.c:882
+#: ../svndumpfilter/main.c:882
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -9244,27 +9293,27 @@
"\n"
"Subcomandos disponibles:\n"
-#: svndumpfilter/main.c:937
+#: ../svndumpfilter/main.c:937
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Excluyendo (y eliminando revisiones vacías para) los prefijos:\n"
-#: svndumpfilter/main.c:939
+#: ../svndumpfilter/main.c:939
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Excluyendo prefijos:\n"
-#: svndumpfilter/main.c:941
+#: ../svndumpfilter/main.c:941
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Incluyendo (y eliminando revisiones vacías para) los prefijos:\n"
-#: svndumpfilter/main.c:943
+#: ../svndumpfilter/main.c:943
#, c-format
msgid "Including prefixes:\n"
msgstr "Incluyendo prefijos:\n"
-#: svndumpfilter/main.c:970
+#: ../svndumpfilter/main.c:970
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -9273,21 +9322,21 @@
"%d revisión/es descartadas.\n"
"\n"
-#: svndumpfilter/main.c:976
+#: ../svndumpfilter/main.c:976
msgid "Revisions renumbered as follows:\n"
msgstr "Revisiones renumeradas como sigue:\n"
-#: svndumpfilter/main.c:1003
+#: ../svndumpfilter/main.c:1003
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (descartada)\n"
-#: svndumpfilter/main.c:1018
+#: ../svndumpfilter/main.c:1018
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "%d nodo/s descartado/s:\n"
-#: svndumpfilter/main.c:1239
+#: ../svndumpfilter/main.c:1239
#, c-format
msgid ""
"\n"
@@ -9296,7 +9345,7 @@
"\n"
"Error: no se especificaron prefijos.\n"
-#: svndumpfilter/main.c:1283
+#: ../svndumpfilter/main.c:1283
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9305,55 +9354,55 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svndumpfilter help %s' para ver modo de uso.\n"
-#: svndumpfilter/main.c:1301
+#: ../svndumpfilter/main.c:1301
msgid "Try 'svndumpfilter help' for more info"
msgstr "Pruebe 'svndumpfilter help' para más información"
-#: svnlook/main.c:95
+#: ../svnlook/main.c:95
msgid "show details for copies"
msgstr "muestra detalles de las copias"
-#: svnlook/main.c:98
+#: ../svnlook/main.c:98
msgid "print differences against the copy source"
msgstr "muestra diferencias respecto de la fuente de la copia"
-#: svnlook/main.c:101
+#: ../svnlook/main.c:101
msgid "show full paths instead of indenting them"
msgstr "mostrar rutas completas en vez de sangrarlas"
-#: svnlook/main.c:107
+#: ../svnlook/main.c:107
msgid "maximum number of history entries"
msgstr "número máximo de entradas de historia"
-#: svnlook/main.c:110
+#: ../svnlook/main.c:110
msgid "do not print differences for added files"
msgstr "no mostrar diferencias para archivos añadidos"
-#: svnlook/main.c:116
+#: ../svnlook/main.c:116
msgid "operate on single directory only"
msgstr "operar en un solo directorio"
-#: svnlook/main.c:119
+#: ../svnlook/main.c:119
msgid "specify revision number ARG"
msgstr "especifica PAR como número de revisión"
-#: svnlook/main.c:122
+#: ../svnlook/main.c:122
msgid "operate on a revision property (use with -r or -t)"
msgstr "operar en una propiedad de revisión (use con -r o -t)"
-#: svnlook/main.c:125
+#: ../svnlook/main.c:125
msgid "show node revision ids for each path"
msgstr "mostrar el id de revisión del nodo de cada ruta"
-#: svnlook/main.c:128
+#: ../svnlook/main.c:128
msgid "specify transaction name ARG"
msgstr "especifica PAR como nombre de transacción"
-#: svnlook/main.c:131
+#: ../svnlook/main.c:131
msgid "be verbose"
msgstr "ser verborrágico"
-#: svnlook/main.c:177
+#: ../svnlook/main.c:177
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -9363,7 +9412,7 @@
"\n"
"Muestra el autor.\n"
-#: svnlook/main.c:182
+#: ../svnlook/main.c:182
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -9374,7 +9423,7 @@
"Muestra el contenido de un archivo. El carácter '/' al comienzo\n"
"de RUTA_ARCHIVO es opcional.\n"
-#: svnlook/main.c:187
+#: ../svnlook/main.c:187
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -9384,7 +9433,7 @@
"\n"
"Muestra las rutas que cambiaron.\n"
-#: svnlook/main.c:192
+#: ../svnlook/main.c:192
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -9394,7 +9443,7 @@
"\n"
"Muestra la fecha.\n"
-#: svnlook/main.c:197
+#: ../svnlook/main.c:197
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -9404,7 +9453,7 @@
"\n"
"Muestra diffs estilo GNU de los archivos y propiedades cambiados.\n"
-#: svnlook/main.c:203
+#: ../svnlook/main.c:203
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -9416,7 +9465,7 @@
"Imprimir los directorios que fueron cambiados (edición de propiedades)\n"
"o aquellos cuyos archivos hijos fueron cambiados.\n"
-#: svnlook/main.c:209
+#: ../svnlook/main.c:209
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -9426,7 +9475,7 @@
"\n"
"Describe el uso de este programa o de sus subcomandos.\n"
-#: svnlook/main.c:214
+#: ../svnlook/main.c:214
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9438,7 +9487,7 @@
"Muestra información acerca de la historia de una ruta del repositorio\n"
"(o del directorio raíz si no se especifica una ruta).\n"
-#: svnlook/main.c:220
+#: ../svnlook/main.c:220
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -9448,7 +9497,7 @@
"\n"
"Imprimir el autor, fecha, tamaño del mensaje de log y el mensaje de log.\n"
-#: svnlook/main.c:225
+#: ../svnlook/main.c:225
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -9458,7 +9507,7 @@
"\n"
"Si existe un bloqueo en una ruta en el repositorio, se lo describe.\n"
-#: svnlook/main.c:230
+#: ../svnlook/main.c:230
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -9468,7 +9517,7 @@
"\n"
"Muestra el mensaje de log.\n"
-#: svnlook/main.c:235
+#: ../svnlook/main.c:235
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -9481,7 +9530,7 @@
"Muestra el valor crudo de una propiedad en una ruta en el repositorio.\n"
"Con --revprop muestra el valor crudo de una propiedad de revisión.\n"
-#: svnlook/main.c:241
+#: ../svnlook/main.c:241
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9495,7 +9544,7 @@
"con la opción --revprop, propiedades de revisión.\n"
"Con -v, muestra también los valores de las propiedades.\n"
-#: svnlook/main.c:248
+#: ../svnlook/main.c:248
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9508,7 +9557,7 @@
"la raíz del árbol si no), opcionalmente mostrando los identificadores de "
"revisión de nodo.\n"
-#: svnlook/main.c:254
+#: ../svnlook/main.c:254
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -9518,7 +9567,7 @@
"\n"
"Muestra el UUID del repositorio.\n"
-#: svnlook/main.c:259
+#: ../svnlook/main.c:259
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -9528,54 +9577,55 @@
"\n"
"Muestra el número de revisión más reciente.\n"
-#: svnlook/main.c:863
+#: ../svnlook/main.c:863
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Copiado: %s (desde la rev %ld, %s)\n"
-#: svnlook/main.c:931
+#: ../svnlook/main.c:931
msgid "Added"
msgstr "Añadido"
-#: svnlook/main.c:932
+#: ../svnlook/main.c:932
msgid "Deleted"
msgstr "Borrado"
-#: svnlook/main.c:933
+#: ../svnlook/main.c:933
msgid "Modified"
msgstr "Modificado"
-#: svnlook/main.c:934
+#: ../svnlook/main.c:934
msgid "Index"
msgstr "Índice"
-#: svnlook/main.c:945
+#: ../svnlook/main.c:945
msgid ""
"(Binary files differ)\n"
"\n"
-msgstr "(Archivos binarios con diferencias)\n"
+msgstr ""
+"(Archivos binarios con diferencias)\n"
"\n"
-#: svnlook/main.c:1084
+#: ../svnlook/main.c:1084
msgid "unknown"
msgstr "desconocido"
-#: svnlook/main.c:1231 svnlook/main.c:1324 svnlook/main.c:1353
+#: ../svnlook/main.c:1231 ../svnlook/main.c:1324 ../svnlook/main.c:1353
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "La transacción '%s' no está basada en una revisión; extraño"
-#: svnlook/main.c:1261
+#: ../svnlook/main.c:1261
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' es un URL, probablemente debería ser una ruta"
-#: svnlook/main.c:1288
+#: ../svnlook/main.c:1288
#, c-format
msgid "Path '%s' is not a file"
msgstr "La ruta '%s' no es un archivo"
-#: svnlook/main.c:1437
+#: ../svnlook/main.c:1437
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -9584,7 +9634,7 @@
"REVISIÓN RUTA <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1442
+#: ../svnlook/main.c:1442
#, c-format
msgid ""
"REVISION PATH\n"
@@ -9593,27 +9643,27 @@
"REVISIÓN RUTA\n"
"-------- ----\n"
-#: svnlook/main.c:1491
+#: ../svnlook/main.c:1491
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "No se encontró la propiedad '%s' en la revisión %ld"
-#: svnlook/main.c:1498
+#: ../svnlook/main.c:1498
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "No se encontró la propiedad '%s' en la ruta '%s' revisión %ld"
-#: svnlook/main.c:1503
+#: ../svnlook/main.c:1503
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "No se encontró la propiedad '%s' en la ruta '%s' en la transacción %s"
-#: svnlook/main.c:1681 svnlook/main.c:1896
+#: ../svnlook/main.c:1681 ../svnlook/main.c:1896
#, c-format
msgid "Missing repository path argument"
msgstr "Falta parámetro con la ruta al repositorio"
-#: svnlook/main.c:1742
+#: ../svnlook/main.c:1742
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -9634,11 +9684,11 @@
"\n"
"Subcomandos disponibles:\n"
-#: svnlook/main.c:1798
+#: ../svnlook/main.c:1798
msgid "Missing path argument"
msgstr "Falta el parámetro de la ruta"
-#: svnlook/main.c:1823
+#: ../svnlook/main.c:1823
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9647,7 +9697,7 @@
"Comentario (%i líneas):\n"
"%s\n"
-#: svnlook/main.c:1824
+#: ../svnlook/main.c:1824
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9656,42 +9706,42 @@
"Comentario (%i línea):\n"
"%s\n"
-#: svnlook/main.c:1870
+#: ../svnlook/main.c:1870
#, c-format
msgid "Missing propname argument"
msgstr "Falta el parámetro con el nombre de la propiedad"
-#: svnlook/main.c:1871
+#: ../svnlook/main.c:1871
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Faltan los parámetros nombre de propiedad y ruta del repositorio"
-#: svnlook/main.c:1877
+#: ../svnlook/main.c:1877
msgid "Missing propname or repository path argument"
msgstr ""
"Faltan el parámetro nombre de propiedad o el parámetro ruta del repositorio"
-#: svnlook/main.c:2036
+#: ../svnlook/main.c:2036
msgid "Invalid revision number supplied"
msgstr "Se especificó un número de revisión inválido"
-#: svnlook/main.c:2124
+#: ../svnlook/main.c:2124
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Los parámetros '--transaction' (-t) y '--revision' (-r) no pueden coexistir"
-#: svnlook/main.c:2206
+#: ../svnlook/main.c:2206
#, c-format
msgid "Repository argument required\n"
msgstr "Se requiere el parámetro que indica el repositorio\n"
-#: svnlook/main.c:2215
+#: ../svnlook/main.c:2215
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' es un URL cuando debería ser una ruta\n"
-#: svnlook/main.c:2266
+#: ../svnlook/main.c:2266
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9700,91 +9750,91 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svnlook help %s' para ver modo de uso.\n"
-#: svnlook/main.c:2309
+#: ../svnlook/main.c:2309
msgid "Try 'svnlook help' for more info"
msgstr "Pruebe 'svnlook help' para más información"
-#: svnserve/cyrus_auth.c:243
+#: ../svnserve/cyrus_auth.c:243
#, c-format
msgid "Can't get hostname"
msgstr "No se pudo obtener el nombre de la máquina"
-#: svnserve/cyrus_auth.c:311
+#: ../svnserve/cyrus_auth.c:311
msgid "Could not obtain the list of SASL mechanisms"
msgstr "No se pudo obtener la lista de mecanismos SASL"
-#: svnserve/cyrus_auth.c:351
+#: ../svnserve/cyrus_auth.c:351
msgid "Couldn't obtain the authenticated username"
msgstr "No se pudo obtener el nombre de usuario autentificado"
-#: svnserve/main.c:142
+#: ../svnserve/main.c:142
msgid "daemon mode"
msgstr "modo demonio"
-#: svnserve/main.c:144
+#: ../svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "puerto en el que escuchar (para modo demonio)"
-#: svnserve/main.c:146
+#: ../svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "nombre de host o dirección IP en la que escuchar (para modo demonio)"
-#: svnserve/main.c:148
+#: ../svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "correr en primer plano (útil para depurar)"
-#: svnserve/main.c:149 svnversion/main.c:124
+#: ../svnserve/main.c:149 ../svnversion/main.c:124
msgid "display this help"
msgstr "mostrar esta ayuda"
-#: svnserve/main.c:152
+#: ../svnserve/main.c:152
msgid "inetd mode"
msgstr "modo inetd"
-#: svnserve/main.c:153
+#: ../svnserve/main.c:153
msgid "root of directory to serve"
msgstr "raíz del directorio a servir"
-#: svnserve/main.c:155
+#: ../svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr ""
"forzar sólo lectura, pasando por alto al archivo de configuración del "
"repositorio"
-#: svnserve/main.c:156
+#: ../svnserve/main.c:156
msgid "tunnel mode"
msgstr "modo túnel"
-#: svnserve/main.c:158
+#: ../svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "usuario del túnel (por omisión el nombre del uid actual)"
-#: svnserve/main.c:160
+#: ../svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "usar hilos en vez de procesos"
-#: svnserve/main.c:162
+#: ../svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "escuchar una sola vez (útil para depurar)"
-#: svnserve/main.c:164
+#: ../svnserve/main.c:164
msgid "read configuration from file ARG"
msgstr "leer configuración del archivo PAR"
-#: svnserve/main.c:166
+#: ../svnserve/main.c:166
msgid "write server process ID to file ARG"
msgstr "escribe el id de proceso del servidor al archivo PAR"
-#: svnserve/main.c:169
+#: ../svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "ejecutar como servicio windows (sólo SCM)"
-#: svnserve/main.c:181
+#: ../svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Tipee '%s --help' para ver el modo de uso.\n"
-#: svnserve/main.c:190
+#: ../svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -9794,97 +9844,97 @@
"\n"
"Opciones válidas:\n"
-#: svnserve/main.c:444
+#: ../svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: La ruta raíz '%s' no existe o no es un direcotrio.\n"
-#: svnserve/main.c:493
+#: ../svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Debe especificar exactamente una de entre -d, -i, -t o -X.\n"
-#: svnserve/main.c:511
+#: ../svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "La opción --tunnel-user sólo es válida en modo túnel.\n"
-#: svnserve/main.c:576
+#: ../svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
msgstr ""
-#: svnserve/main.c:612
+#: ../svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "No se pudo obtener la info de dirección"
-#: svnserve/main.c:626
+#: ../svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "No se pudo crear el socket servidor"
-#: svnserve/main.c:637
+#: ../svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "No se pudo asociar el socket servidor a una dirección (bind)"
-#: svnserve/main.c:703
+#: ../svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "No se pudo aceptar la conexión cliente"
-#: svnserve/main.c:755
+#: ../svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "No se pudo crear threadattr"
-#: svnserve/main.c:763
+#: ../svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "No se pudo marcar al hilo de ejecución como 'detached'"
-#: svnserve/main.c:776
+#: ../svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "No se pudo crear el hilo de ejecución"
-#: svnserve/serve.c:1484
+#: ../svnserve/serve.c:1486
msgid "Path is not a string"
msgstr "La ruta no es una cadena"
-#: svnserve/serve.c:1624
+#: ../svnserve/serve.c:1626
#, fuzzy
msgid "Log revprop entry not a string"
msgstr "Entrada de bitácora no es una lista"
-#: svnserve/serve.c:1631
+#: ../svnserve/serve.c:1633
#, fuzzy, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Comando de protocolo svn desconocido"
-#: svnserve/serve.c:1647
+#: ../svnserve/serve.c:1649
#, fuzzy
msgid "Log path entry not a string"
msgstr "Entrada de bitácora no es una lista"
-#: svnserve/winservice.c:341
+#: ../svnserve/winservice.c:341
#, c-format
msgid "Failed to create winservice_start_event"
msgstr "Falló la creación de winservice_start_event"
-#: svnserve/winservice.c:352
+#: ../svnserve/winservice.c:352
#, c-format
msgid "The service failed to start"
msgstr "El servicio no pudo comenzar su ejecución"
-#: svnserve/winservice.c:400
+#: ../svnserve/winservice.c:400
#, c-format
msgid "Failed to connect to Service Control Manager"
msgstr "Falló la conexión al gestor de servicios (Service Control Manager)"
-#: svnserve/winservice.c:411
+#: ../svnserve/winservice.c:411
#, c-format
msgid ""
"The service failed to start; an internal error occurred while starting the "
@@ -9893,7 +9943,7 @@
"El servicio no pudo comenzar su ejecución; un error interno sucedió al "
"intentarlo"
-#: svnsync/main.c:65
+#: ../svnsync/main.c:65
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -9923,7 +9973,7 @@
"En otras palabras, el repositorio destino debe ser un espejo de\n"
"sólo-lectura del repositorio origen.\n"
-#: svnsync/main.c:80
+#: ../svnsync/main.c:80
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
@@ -9935,7 +9985,7 @@
"Transfiere todas las revisiones pendientes al destino desde la fuente\n"
"con la que éste fue inicializado.\n"
-#: svnsync/main.c:86
+#: ../svnsync/main.c:86
msgid ""
"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
@@ -9969,7 +10019,7 @@
"cualquiera de los dos extremos del rango y significa \"la\n"
"última revisión transferida\".\n"
-#: svnsync/main.c:102
+#: ../svnsync/main.c:102
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -9979,99 +10029,99 @@
"\n"
"Describe el uso de este programa o de sus subcomandos.\n"
-#: svnsync/main.c:112
+#: ../svnsync/main.c:112
msgid "print as little as possible"
msgstr "imprimir tan poco como sea posible"
-#: svnsync/main.c:118
+#: ../svnsync/main.c:118
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
msgstr ""
-#: svnsync/main.c:122
+#: ../svnsync/main.c:122
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
msgstr ""
-#: svnsync/main.c:126
+#: ../svnsync/main.c:126
msgid "connect to source repository with username ARG"
msgstr "se conecta al repositorio fuente con el usuario PAR"
-#: svnsync/main.c:128
+#: ../svnsync/main.c:128
msgid "connect to source repository with password ARG"
msgstr "se conecta al repositorio fuente con la clave PAR"
-#: svnsync/main.c:130
+#: ../svnsync/main.c:130
msgid "connect to sync repository with username ARG"
msgstr ""
"se conecta al repositorio de\n"
" sincronización con el usuario PAR"
-#: svnsync/main.c:132
+#: ../svnsync/main.c:132
msgid "connect to sync repository with password ARG"
msgstr ""
"se conecta al repositorio de\n"
" sincronización con la clave PAR"
-#: svnsync/main.c:222
+#: ../svnsync/main.c:222
#, c-format
msgid "Can't get local hostname"
msgstr "No se pudo obtener el nombre de la máquina local"
-#: svnsync/main.c:245
+#: ../svnsync/main.c:245
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
"Falló la obtención de un bloqueo en el repositorio destino, el bloqueo lo "
"tiene actualmente '%s'\n"
-#: svnsync/main.c:340
+#: ../svnsync/main.c:340
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "La sesión tiene raíz en '%s', pero la raíz del repos es '%s'"
-#: svnsync/main.c:410
+#: ../svnsync/main.c:410
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Propiedades copiadas para revisión %ld (%s* propiedades omitidas).\n"
-#: svnsync/main.c:415
+#: ../svnsync/main.c:415
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Propiedades copiadas para revisión %ld.\n"
-#: svnsync/main.c:498
+#: ../svnsync/main.c:498
msgid "Cannot initialize a repository with content in it"
msgstr "No se puede inicializar un repositorio con contenido"
-#: svnsync/main.c:509
+#: ../svnsync/main.c:509
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "El repositorio destino ya está sincronizándose desde '%s'"
-#: svnsync/main.c:574 svnsync/main.c:577 svnsync/main.c:1249
-#: svnsync/main.c:1398
+#: ../svnsync/main.c:574 ../svnsync/main.c:577 ../svnsync/main.c:1249
+#: ../svnsync/main.c:1398
#, c-format
msgid "Path '%s' is not a URL"
msgstr "La ruta '%s' no es un URL"
-#: svnsync/main.c:959
+#: ../svnsync/main.c:959
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Commit de la revisión %ld.\n"
-#: svnsync/main.c:1000
+#: ../svnsync/main.c:1000
msgid "Destination repository has not been initialized"
msgstr "El repositorio destino no fue inicializado"
-#: svnsync/main.c:1015
+#: ../svnsync/main.c:1015
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "El UUID del repsitorio fuente (%s) no coincide con el esperado (%s)"
-#: svnsync/main.c:1078
+#: ../svnsync/main.c:1078
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -10082,7 +10132,7 @@
"HEAD del destino (%ld) son inconsistentes; ¿hizo usted commit en el "
"repositorio destino sin usar svnsync?"
-#: svnsync/main.c:1116
+#: ../svnsync/main.c:1116
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -10091,12 +10141,12 @@
"La revisión HEAD del destino (%ld) no es la última incorporada (%ld); ¿hizo "
"usted commit en el repositorio destino sin usar svnsync?"
-#: svnsync/main.c:1194
+#: ../svnsync/main.c:1194
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "El commit creó la rev %ld pero debió crear la rev %ld"
-#: svnsync/main.c:1291 svnsync/main.c:1296
+#: ../svnsync/main.c:1291 ../svnsync/main.c:1296
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -10104,17 +10154,17 @@
"No se pueden copiar revprops de una revisión (%ld) que no todavía no se "
"sincronizó"
-#: svnsync/main.c:1348
+#: ../svnsync/main.c:1348
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' no es un rango de revisiones válido"
-#: svnsync/main.c:1362 svnsync/main.c:1382
+#: ../svnsync/main.c:1362 ../svnsync/main.c:1382
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Número de revisión inválido (%ld)"
-#: svnsync/main.c:1422
+#: ../svnsync/main.c:1422
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -10128,7 +10178,7 @@
"\n"
"Subcomandos disponibles:\n"
-#: svnsync/main.c:1584
+#: ../svnsync/main.c:1584
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -10136,7 +10186,7 @@
"No se puede usar --username o --password con --source-username, --source-"
"password, --sync-username, o --sync-password.\n"
-#: svnsync/main.c:1664
+#: ../svnsync/main.c:1664
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10145,16 +10195,16 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svnsync help %s' para ver modo de uso.\n"
-#: svnsync/main.c:1736
+#: ../svnsync/main.c:1736
msgid "Try 'svnsync help' for more info"
msgstr "Pruebe 'svnsync help' para más información"
-#: svnversion/main.c:40
+#: ../svnversion/main.c:40
#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Tipee 'svnversion --help' para ver el modo de uso.\n"
-#: svnversion/main.c:51
+#: ../svnversion/main.c:51
#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
@@ -10213,24 +10263,35 @@
"\n"
"Opciones válidas:\n"
-#: svnversion/main.c:122
+#: ../svnversion/main.c:122
msgid "do not output the trailing newline"
msgstr "no mandar a la salida el salto de línea final"
-#: svnversion/main.c:123
+#: ../svnversion/main.c:123
msgid "last changed rather than current revisions"
msgstr "revisiones del último cambio en vez de actual"
-#: svnversion/main.c:222
+#: ../svnversion/main.c:222
#, c-format
msgid "exported%s"
msgstr "exportado%s"
-#: svnversion/main.c:231
+#: ../svnversion/main.c:231
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "%s no es un recurso versionado, no se exporta\n"
+#~ msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
+#~ msgstr ""
+#~ "A la acción de revisión '%c' para la revisión %ld de '%s' le falta una "
+#~ "revisión previa"
+
+#~ msgid "Can't grab FSFS repository mutex"
+#~ msgstr "No se pudo tomar el mutex del repositorio FSFS"
+
+#~ msgid "Can't ungrab FSFS repository mutex"
+#~ msgstr "No se pudo soltar el mutex del repositorio FSFS"
+
#, fuzzy
#~ msgid "Peg revision must be younger than any requested revision"
#~ msgstr "El número de revisión no debe ser mayor que el de la última (%ld)"
diff --git a/subversion/po/fr.po b/subversion/po/fr.po
index 7cd5a50..ec7bb96 100644
--- a/subversion/po/fr.po
+++ b/subversion/po/fr.po
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: subversion 1.5\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-11-02 07:49+0100\n"
-"PO-Revision-Date: 2007-11-02 07:54+0100\n"
+"POT-Creation-Date: 2007-11-14 09:54+0100\n"
+"PO-Revision-Date: 2007-11-14 09:57+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: French <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -121,1061 +121,1054 @@
# REPOS_PATH: CHEMIN_DÉPÔT
# SUBCOMMAND: SOUS_COMMANDE
#
-#: include/svn_error_codes.h:154
+#: ../include/svn_error_codes.h:154
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "Pool parent invalide passé à svn_make_pool()"
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:158
msgid "Bogus filename"
msgstr "Nom de fichier invalide"
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:162
msgid "Bogus URL"
msgstr "URL invalide"
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:166
msgid "Bogus date"
msgstr "Date invalide"
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:170
msgid "Bogus mime-type"
msgstr "Type mime invalide"
-#: include/svn_error_codes.h:180
+#: ../include/svn_error_codes.h:180
msgid "Wrong or unexpected property value"
msgstr "Valeur de propriété invalide ou inattendue"
-#: include/svn_error_codes.h:184
+#: ../include/svn_error_codes.h:184
msgid "Version file format not correct"
msgstr "Format du fichier de version invalide"
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:190
msgid "No such XML tag attribute"
msgstr "Attribut d'étiquette XML invalide"
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:194
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> n'a pas d'ancêtre"
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:198
msgid "Unrecognized binary data encoding; can't decode"
msgstr "Encodage binaire non reconnu ; décodage impossible"
-#: include/svn_error_codes.h:202
+#: ../include/svn_error_codes.h:202
msgid "XML data was not well-formed"
msgstr "Données XML malformées"
-#: include/svn_error_codes.h:206
+#: ../include/svn_error_codes.h:206
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:212
+#: ../include/svn_error_codes.h:212
msgid "Inconsistent line ending style"
msgstr "Style de fin de ligne inconsistant"
-#: include/svn_error_codes.h:216
+#: ../include/svn_error_codes.h:216
msgid "Unrecognized line ending style"
msgstr "Style de fin de ligne non reconnu"
-#: include/svn_error_codes.h:221
+#: ../include/svn_error_codes.h:221
msgid "Line endings other than expected"
msgstr "Fins de lignes différentes de ce qui est attendu"
-#: include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:225
msgid "Ran out of unique names"
msgstr "Plus de noms uniques disponibles"
-#: include/svn_error_codes.h:230
+#: ../include/svn_error_codes.h:230
msgid "Framing error in pipe protocol"
msgstr "Erreur de fenêtrage (framing) dans le protocole de pipeline (pipe)"
-#: include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:235
msgid "Read error in pipe"
msgstr "Erreur de lecture sur un pipeline (pipe)"
-#: include/svn_error_codes.h:239 libsvn_subr/cmdline.c:308
-#: libsvn_subr/cmdline.c:325 svn/util.c:885
+#: ../include/svn_error_codes.h:239 ../libsvn_subr/cmdline.c:308
+#: ../libsvn_subr/cmdline.c:325 ../svn/util.c:885
#, c-format
msgid "Write error"
msgstr "Erreur d'écriture"
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:245
msgid "Unexpected EOF on stream"
msgstr "Fin de fichier (EOF) inattendue sur le flux"
-#: include/svn_error_codes.h:249
+#: ../include/svn_error_codes.h:249
msgid "Malformed stream data"
msgstr "Flux de données malformé"
-#: include/svn_error_codes.h:253
+#: ../include/svn_error_codes.h:253
msgid "Unrecognized stream data"
msgstr "Flux de données non reconnu"
-#: include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:259
msgid "Unknown svn_node_kind"
msgstr "svn_node_kind inconnu"
-#: include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:263
msgid "Unexpected node kind found"
msgstr "Type de noeud inattendu"
-#: include/svn_error_codes.h:269
+#: ../include/svn_error_codes.h:269
msgid "Can't find an entry"
msgstr "Entrée non trouvée"
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:275
msgid "Entry already exists"
msgstr "L'entrée existe déjà"
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:279
msgid "Entry has no revision"
msgstr "L'entrée n'a pas de révision"
-#: include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:283
msgid "Entry has no URL"
msgstr "L'entrée n'a pas d'URL"
-#: include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:287
msgid "Entry has an invalid attribute"
msgstr "L'entrée a un attribut invalide"
-#: include/svn_error_codes.h:293
+#: ../include/svn_error_codes.h:293
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:298
+#: ../include/svn_error_codes.h:298
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:303
+#: ../include/svn_error_codes.h:303
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:308
+#: ../include/svn_error_codes.h:308
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Attempt to unlock with non-empty unwind stack"
-#: include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:312
msgid "Attempted to lock an already-locked dir"
msgstr "Tentative de verrouiller un répertoire déjà verrouillé"
-#: include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:316
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:321
+#: ../include/svn_error_codes.h:321
msgid "Invalid lock"
msgstr "Verrou invalide"
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:325
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:329
+#: ../include/svn_error_codes.h:329
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:333
+#: ../include/svn_error_codes.h:333
msgid "Problem running log"
msgstr "Problème dans le journal"
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:337
msgid "Can't find a working copy path"
msgstr "Chemin d'une copie de travail non trouvé"
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:341
msgid "Working copy is not up-to-date"
msgstr "La copie de travail n'est pas à jour"
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:345
msgid "Left locally modified or unversioned files"
msgstr "Il reste des fichiers localement modifiés ou non versionnés"
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:349
msgid "Unmergeable scheduling requested on an entry"
msgstr "Programmation d'opérations conflituelles sur une entrée"
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:353
msgid "Found a working copy path"
msgstr "Trouvé un chemin dans une copie de travail"
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:357
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:361
+#: ../include/svn_error_codes.h:361
msgid "Working copy is corrupt"
msgstr "La copie de travail est corrompue"
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:365
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:369
+#: ../include/svn_error_codes.h:369
msgid "Cannot change node kind"
msgstr "Type de noeud non modifiable"
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:373
msgid "Invalid operation on the current working directory"
msgstr "Opération invalide sur le répertoire courant"
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:377
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:381
+#: ../include/svn_error_codes.h:381
msgid "Unsupported working copy format"
msgstr "Format de copie de travail non reconnu"
-#: include/svn_error_codes.h:385
+#: ../include/svn_error_codes.h:385
msgid "Path syntax not supported in this context"
msgstr "Syntaxe avec chemin non acceptée dans ce contexte"
-#: include/svn_error_codes.h:390
+#: ../include/svn_error_codes.h:390
msgid "Invalid schedule"
msgstr "Programmation invalide"
-#: include/svn_error_codes.h:395
+#: ../include/svn_error_codes.h:395
msgid "Invalid relocation"
msgstr "Relocalisation invalide"
-#: include/svn_error_codes.h:400
+#: ../include/svn_error_codes.h:400
msgid "Invalid switch"
msgstr "Ré-aiguillage invalide"
-#: include/svn_error_codes.h:405
+#: ../include/svn_error_codes.h:405
msgid "Changelist doesn't match"
msgstr "La liste de changements ne correspond pas"
-#: include/svn_error_codes.h:410
+#: ../include/svn_error_codes.h:410
msgid "Conflict resolution failed"
msgstr "Échec de la résolution de conflit"
-#: include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:414
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:419
+#: ../include/svn_error_codes.h:419
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:426
+#: ../include/svn_error_codes.h:426
msgid "General filesystem error"
msgstr "Erreur générale du système de fichiers"
-#: include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:430
msgid "Error closing filesystem"
msgstr "Erreur à la fermeture du système de fichiers"
-#: include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:434
msgid "Filesystem is already open"
msgstr "Système de fichier déjà ouvert"
-#: include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:438
msgid "Filesystem is not open"
msgstr "Système de fichier non ouvert"
-#: include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:442
msgid "Filesystem is corrupt"
msgstr "Système de fichier corrompu"
-#: include/svn_error_codes.h:446
+#: ../include/svn_error_codes.h:446
msgid "Invalid filesystem path syntax"
msgstr "Syntaxe du chemin dans le système de fichiers invalide"
-#: include/svn_error_codes.h:450
+#: ../include/svn_error_codes.h:450
msgid "Invalid filesystem revision number"
msgstr "Numéro de révision dans le système de fichiers invalide"
-#: include/svn_error_codes.h:454
+#: ../include/svn_error_codes.h:454
msgid "Invalid filesystem transaction name"
msgstr "Nom de transaction dans le système de fichiers invalide"
-#: include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:458
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:462
+#: ../include/svn_error_codes.h:462
msgid "Filesystem has no such representation"
msgstr "Le système de fichiers ne contient pas cette représentation"
-#: include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:466
msgid "Filesystem has no such string"
msgstr "Le système de fichiers n'a pas cette chaîne (string)"
-#: include/svn_error_codes.h:470
+#: ../include/svn_error_codes.h:470
msgid "Filesystem has no such copy"
msgstr "Le système de fichiers n'a pas cette copie"
-#: include/svn_error_codes.h:474
+#: ../include/svn_error_codes.h:474
msgid "The specified transaction is not mutable"
msgstr "La transaction spécifiée n'est pas modifiable"
-#: include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:478
msgid "Filesystem has no item"
msgstr "Le système de fichiers ne contient pas cet élément"
-#: include/svn_error_codes.h:482
+#: ../include/svn_error_codes.h:482
msgid "Filesystem has no such node-rev-id"
msgstr ""
"Le système de fichiers ne contient pas cet identificateur de révision de "
"noeud (node-rev-id)"
-#: include/svn_error_codes.h:486
+#: ../include/svn_error_codes.h:486
msgid "String does not represent a node or node-rev-id"
msgstr ""
"La chaîne ne représente ni un noeud ni un identificateur de révision de "
"noeud (node-rev-id)"
-#: include/svn_error_codes.h:490
+#: ../include/svn_error_codes.h:490
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:494
+#: ../include/svn_error_codes.h:494
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:498
+#: ../include/svn_error_codes.h:498
msgid "Name is not a single path component"
msgstr "Le nom n'est pas un composant simple de chemin"
-#: include/svn_error_codes.h:502
+#: ../include/svn_error_codes.h:502
msgid "Attempt to change immutable filesystem node"
msgstr ""
"Tentative de changement d'un noeud non-modifiable du système de fichiers"
-#: include/svn_error_codes.h:506
+#: ../include/svn_error_codes.h:506
msgid "Item already exists in filesystem"
msgstr "L'élément exite déjà dans le système de fichiers"
-#: include/svn_error_codes.h:510
+#: ../include/svn_error_codes.h:510
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:514
+#: ../include/svn_error_codes.h:514
msgid "Object is not a transaction root"
msgstr "L'objet n'est pas une racine de transaction"
-#: include/svn_error_codes.h:518
+#: ../include/svn_error_codes.h:518
msgid "Object is not a revision root"
msgstr "L'objet n'est pas une racine de révision"
-#: include/svn_error_codes.h:522
+#: ../include/svn_error_codes.h:522
msgid "Merge conflict during commit"
msgstr "Fusion conflictuelle lors d'une propagation (commit)"
-#: include/svn_error_codes.h:526
+#: ../include/svn_error_codes.h:526
msgid "A representation vanished or changed between reads"
msgstr "Une représentation a disparu ou changé entre deux lectures"
-#: include/svn_error_codes.h:530
+#: ../include/svn_error_codes.h:530
msgid "Tried to change an immutable representation"
msgstr "Tentative de changement d'une représentation non-modifiable"
-#: include/svn_error_codes.h:534
+#: ../include/svn_error_codes.h:534
msgid "Malformed skeleton data"
msgstr "Données de squelette mal formées"
-#: include/svn_error_codes.h:538
+#: ../include/svn_error_codes.h:538
msgid "Transaction is out of date"
msgstr "La transaction est obsolète"
-#: include/svn_error_codes.h:542
+#: ../include/svn_error_codes.h:542
msgid "Berkeley DB error"
msgstr "Erreur de la base Berkeley"
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:546
msgid "Berkeley DB deadlock error"
msgstr "Erreur (étreinte fatale - deadlock) dans la base Berkeley"
-#: include/svn_error_codes.h:550
+#: ../include/svn_error_codes.h:550
msgid "Transaction is dead"
msgstr "Transaction morte"
-#: include/svn_error_codes.h:554
+#: ../include/svn_error_codes.h:554
msgid "Transaction is not dead"
msgstr "La transaction n'est pas morte"
-#: include/svn_error_codes.h:559
+#: ../include/svn_error_codes.h:559
msgid "Unknown FS type"
msgstr "Type de stockage de dépôt (FS) inconnu"
-#: include/svn_error_codes.h:564
+#: ../include/svn_error_codes.h:564
msgid "No user associated with filesystem"
msgstr "Aucun utilisateur associé au système de fichier"
-#: include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:569
msgid "Path is already locked"
msgstr "Chemin déjà verrouillé"
-#: include/svn_error_codes.h:574 include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:574 ../include/svn_error_codes.h:721
msgid "Path is not locked"
msgstr "Le chemin n'est pas verrouillé"
-#: include/svn_error_codes.h:579
+#: ../include/svn_error_codes.h:579
msgid "Lock token is incorrect"
msgstr "Nom de verrou incorrect"
-#: include/svn_error_codes.h:584
+#: ../include/svn_error_codes.h:584
msgid "No lock token provided"
msgstr "Aucun nom de verrou fourni"
-#: include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:589
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:594
+#: ../include/svn_error_codes.h:594
msgid "Filesystem has no such lock"
msgstr "Le système de fichiers n'a pas ce verrou"
-#: include/svn_error_codes.h:599
+#: ../include/svn_error_codes.h:599
msgid "Lock has expired"
msgstr "Verrou expiré"
-#: include/svn_error_codes.h:604 include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:604 ../include/svn_error_codes.h:708
msgid "Item is out of date"
msgstr "Élément obsolète"
-#: include/svn_error_codes.h:616
+#: ../include/svn_error_codes.h:616
msgid "Unsupported FS format"
msgstr "Format de stockage de dépôt (FS) non supporté"
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:621
msgid "Representation is being written"
msgstr "La représentation est en cours d'écriture"
-#: include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:626
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:631
+#: ../include/svn_error_codes.h:631
msgid "SQLite error"
msgstr "Erreur de SQLite"
-#: include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:636
+msgid "Filesystem has no such node origin record"
+msgstr "Le système de fichiers n'a pas d'enregistrement d'origine du noeud"
+
+#: ../include/svn_error_codes.h:642
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:641
+#: ../include/svn_error_codes.h:646
msgid "A repository hook failed"
msgstr "Échec d'une procédure automatique du dépôt"
-#: include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:650
msgid "Incorrect arguments supplied"
msgstr "Arguments fournis incorrects"
-#: include/svn_error_codes.h:649
+#: ../include/svn_error_codes.h:654
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:653
+#: ../include/svn_error_codes.h:658
msgid "Bogus revision report"
msgstr "Rapport de révision invalide"
-#: include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
msgid "Unsupported repository version"
msgstr "Version de dépot non supportée"
-#: include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:671
msgid "Disabled repository feature"
msgstr "Fonction du dépôt désactivée"
-#: include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:675
msgid "Error running post-commit hook"
msgstr "Erreur de la procédure d'après propagation (post-commit hook)"
-#: include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:680
msgid "Error running post-lock hook"
msgstr "Erreur de la procédure d'après verrouillage (post-lock hook)"
-#: include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:685
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:687
+#: ../include/svn_error_codes.h:692
msgid "Bad URL passed to RA layer"
msgstr "Mauvaise URL fournie à la couche RA"
-#: include/svn_error_codes.h:691
+#: ../include/svn_error_codes.h:696
msgid "Authorization failed"
msgstr "Autorisation refusée"
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:700
msgid "Unknown authorization method"
msgstr "Méthode d'autorisation inconnue"
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:704
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:707
+#: ../include/svn_error_codes.h:712
msgid "Repository has no UUID"
msgstr "Le dépôt n'a pas d'identifiant unique (UUID)"
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:716
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:721
+#: ../include/svn_error_codes.h:726
msgid "Inquiry about unknown capability"
msgstr "Demande concernant une capacité inconnue"
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:732
msgid "RA layer failed to init socket layer"
msgstr "La couche RA n'a pu initialiser la couche socket"
-#: include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:736
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:735
+#: ../include/svn_error_codes.h:740
msgid "RA layer request failed"
msgstr "La requête de la couche RA a échoué"
-#: include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:744
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:743
+#: ../include/svn_error_codes.h:748
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:747
+#: ../include/svn_error_codes.h:752
msgid "RA layer file already exists"
msgstr "Le fichier existe (couche RA)"
-#: include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:756
msgid "Invalid configuration value"
msgstr "Valeur de configuration invalide"
-#: include/svn_error_codes.h:755
+#: ../include/svn_error_codes.h:760
msgid "HTTP Path Not Found"
msgstr "Chemin HTTP non trouvé"
-#: include/svn_error_codes.h:759
+#: ../include/svn_error_codes.h:764
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Échec lors de l'exécution de WebDAV PROPPATCH"
-#: include/svn_error_codes.h:764 include/svn_error_codes.h:805
-#: libsvn_ra_svn/marshal.c:640 libsvn_ra_svn/marshal.c:758
-#: libsvn_ra_svn/marshal.c:785
+#: ../include/svn_error_codes.h:769 ../include/svn_error_codes.h:810
+#: ../libsvn_ra_svn/marshal.c:640 ../libsvn_ra_svn/marshal.c:758
+#: ../libsvn_ra_svn/marshal.c:785
msgid "Malformed network data"
msgstr "Donnée du réseau malformée"
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:774
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:774
+#: ../include/svn_error_codes.h:779
msgid "Repository has been moved"
msgstr "Le dépôt a été déplacé"
-#: include/svn_error_codes.h:780 include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:785 ../include/svn_error_codes.h:814
msgid "Couldn't find a repository"
msgstr "Impossible de trouver le dépôt"
-#: include/svn_error_codes.h:784
+#: ../include/svn_error_codes.h:789
msgid "Couldn't open a repository"
msgstr "Impossible d'ouvrir le dépôt"
-#: include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:794
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:793
+#: ../include/svn_error_codes.h:798
msgid "Unknown svn protocol command"
msgstr "Commande du protocole svn inconnue"
-#: include/svn_error_codes.h:797
+#: ../include/svn_error_codes.h:802
msgid "Network connection closed unexpectedly"
msgstr "La connection réseau a été fermée de façon inattendue"
-#: include/svn_error_codes.h:801
+#: ../include/svn_error_codes.h:806
msgid "Network read/write error"
msgstr "Erreur d'écriture/lecture réseau"
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:818
msgid "Client/server version mismatch"
msgstr "Versions client/serveur incompatibles"
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:823
msgid "Cannot negotiate authentication mechanism"
msgstr "Impossible de négocier de mécanisme d'authentification"
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:832
msgid "Credential data unavailable"
msgstr "Données d'identité (credentials) non disponibles"
-#: include/svn_error_codes.h:831
+#: ../include/svn_error_codes.h:836
msgid "No authentication provider available"
msgstr "Aucun fournisseur d'authentification disponible"
-#: include/svn_error_codes.h:835 include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:840 ../include/svn_error_codes.h:844
msgid "All authentication providers exhausted"
msgstr "Tous les fournisseurs d'authentifications sont épuisés"
-#: include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:849
msgid "Authentication failed"
msgstr "Échec de l'authentification"
-#: include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:855
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:855
+#: ../include/svn_error_codes.h:860
msgid "Item is not readable"
msgstr "Éléments non accessibles en lecture"
-#: include/svn_error_codes.h:860
+#: ../include/svn_error_codes.h:865
msgid "Item is partially readable"
msgstr "Certains éléments non accessibles en lecture"
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:869
msgid "Invalid authz configuration"
msgstr "Configuration de authz invalide"
-#: include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:874
msgid "Item is not writable"
msgstr "Éléments non accessibles en écriture"
-#: include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:880
msgid "Svndiff data has invalid header"
msgstr "Les données de svndiff contiennent un en-tête invalide"
-#: include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:884
msgid "Svndiff data contains corrupt window"
msgstr "Les données de svndiff contiennent une fenêtre corrompue"
-#: include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:888
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:887
+#: ../include/svn_error_codes.h:892
msgid "Svndiff data contains invalid instruction"
msgstr "Les données de svndiff contiennent une instruction invalide"
-#: include/svn_error_codes.h:891
+#: ../include/svn_error_codes.h:896
msgid "Svndiff data ends unexpectedly"
msgstr "Les données de svndiff se terminent de façon inattendue"
-#: include/svn_error_codes.h:895
+#: ../include/svn_error_codes.h:900
msgid "Svndiff compressed data is invalid"
msgstr "Les données compressées de svndiff sont invalides"
-#: include/svn_error_codes.h:901
+#: ../include/svn_error_codes.h:906
msgid "Diff data source modified unexpectedly"
msgstr "Modification des données sources de diff inattendue"
-#: include/svn_error_codes.h:907
+#: ../include/svn_error_codes.h:912
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:911
+#: ../include/svn_error_codes.h:916
msgid "Apache got a malformed URI"
msgstr "Apache a reçu une URI malformé"
-#: include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:920
msgid "Activity not found"
msgstr "Activité non trouvée"
-#: include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:924
msgid "Baseline incorrect"
msgstr "Ligne de base (baseline) incorrecte"
-#: include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:928
msgid "Input/output error"
msgstr "Erreur d'entrée/sortie"
-#: include/svn_error_codes.h:929
+#: ../include/svn_error_codes.h:934
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:933
+#: ../include/svn_error_codes.h:938
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:937
+#: ../include/svn_error_codes.h:942
msgid "Bogus revision information given"
msgstr "Fausse information de révision donnée"
-#: include/svn_error_codes.h:941
+#: ../include/svn_error_codes.h:946
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:945
+#: ../include/svn_error_codes.h:950
msgid "Operation does not apply to binary file"
msgstr "Opération non applicable à un fichier binaire"
-#: include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:956
msgid "Format of an svn:externals property was invalid"
msgstr "Format de la propriété svn:externals invalide"
-#: include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:960
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:959
+#: ../include/svn_error_codes.h:964
msgid "Operation does not apply to directory"
msgstr "Opération non applicable sur un répertoire"
-#: include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:968
msgid "Revision range is not allowed"
msgstr "Étendue de révision non permise"
-#: include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:972
msgid "Inter-repository relocation not allowed"
msgstr "Relocalisation entre dépôts différents non permise"
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:976
msgid "Author name cannot contain a newline"
msgstr "Le nom d'auteur ne peut contenir un saut de ligne"
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:980
msgid "Bad property name"
msgstr "Mauvais nom de propriété"
-#: include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:985
msgid "Two versioned resources are unrelated"
msgstr "Les deux ressources versionnées ne sont pas apparentées"
-#: include/svn_error_codes.h:985
+#: ../include/svn_error_codes.h:990
msgid "Path has no lock token"
msgstr "Chemin sans verrou"
-#: include/svn_error_codes.h:990
+#: ../include/svn_error_codes.h:995
msgid "Operation does not support multiple sources"
msgstr "Opération ne supportant pas des sources multiples"
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1000
msgid "No versioned parent directories"
msgstr "Pas de répertoire parent versionné"
-#: include/svn_error_codes.h:1001
+#: ../include/svn_error_codes.h:1006
msgid "A problem occurred; see later errors for details"
msgstr "Une erreur est survenue; voir erreurs suivantes pour plus de détails"
-#: include/svn_error_codes.h:1005
+#: ../include/svn_error_codes.h:1010
msgid "Failure loading plugin"
msgstr "Erreur lors du chargement du plugin"
-#: include/svn_error_codes.h:1009
+#: ../include/svn_error_codes.h:1014
msgid "Malformed file"
msgstr "Fichier malformé"
-#: include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1018
msgid "Incomplete data"
msgstr "Données incomplètes"
-#: include/svn_error_codes.h:1017
+#: ../include/svn_error_codes.h:1022
msgid "Incorrect parameters given"
msgstr "Paramètres fournis incorrects"
-#: include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1026
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:1025
+#: ../include/svn_error_codes.h:1030
msgid "Test failed"
msgstr "Test échoué"
-#: include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1034
msgid "Trying to use an unsupported feature"
msgstr "Tentative d'utilisation d'une fonction non supportée"
-#: include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1038
msgid "Unexpected or unknown property kind"
msgstr "Type de propriété inattendu ou inconnu"
-#: include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1042
msgid "Illegal target for the requested operation"
msgstr "Cible illégale pour l'opération demandée"
-#: include/svn_error_codes.h:1041
+#: ../include/svn_error_codes.h:1046
msgid "MD5 checksum is missing"
msgstr "Somme de contrôle MD5 manquante"
-#: include/svn_error_codes.h:1045
+#: ../include/svn_error_codes.h:1050
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:1049
+#: ../include/svn_error_codes.h:1054
msgid "Error calling external program"
msgstr "Erreur lors de l'appel d'un programme externe"
-#: include/svn_error_codes.h:1053
+#: ../include/svn_error_codes.h:1058
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:1057
+#: ../include/svn_error_codes.h:1062
msgid "A checksum mismatch occurred"
msgstr "Sommes de contrôle différentes"
-#: include/svn_error_codes.h:1061
+#: ../include/svn_error_codes.h:1066
msgid "The operation was interrupted"
msgstr "Opération interrompue"
-#: include/svn_error_codes.h:1065
+#: ../include/svn_error_codes.h:1070
msgid "The specified diff option is not supported"
msgstr "L'option fournie à diff n'est pas supportée"
-#: include/svn_error_codes.h:1069
+#: ../include/svn_error_codes.h:1074
msgid "Property not found"
msgstr "Propriété non trouvée"
-#: include/svn_error_codes.h:1073
+#: ../include/svn_error_codes.h:1078
msgid "No auth file path available"
msgstr "Pas de chemin de fichier d'authentification (auth file) disponible"
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1083
msgid "Incompatible library version"
msgstr "Version de librairie incompatible"
-#: include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1088
msgid "Merge info parse error"
msgstr "Merge info : erreur de syntaxe"
-#: include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1093
msgid "Cease invocation of this API"
msgstr "Cesse l'invocation de cette API"
-#: include/svn_error_codes.h:1093
+#: ../include/svn_error_codes.h:1098
msgid "Error parsing revision number"
msgstr "Erreur de syntaxe sur le numéro révision"
-#: include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1103
msgid "Iteration terminated before completion"
msgstr "Itérations arrêtées avant la fin"
-#: include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1107
msgid "Unknown changelist"
msgstr "Liste de changements inconnue"
-#: include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1113
msgid "Error parsing arguments"
msgstr "Erreur lors de l'analyse des arguments"
-#: include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1117
msgid "Not enough arguments provided"
msgstr "Nombre d'arguments insuffisant"
-#: include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1121
msgid "Mutually exclusive arguments specified"
msgstr "Arguments mutuellement exclusifs fournis"
-#: include/svn_error_codes.h:1120
+#: ../include/svn_error_codes.h:1125
msgid "Attempted command in administrative dir"
msgstr "Commande essayée sur un répertoire d'administration"
-#: include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1129
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:1128
+#: ../include/svn_error_codes.h:1133
msgid "The log message is a pathname"
msgstr "L'entrée du journal est un chemin de fichier"
-#: include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1137
msgid "Committing in directory scheduled for addition"
msgstr "Propagation dans un répertoire qui doit être ajouté"
-#: include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1141
msgid "No external editor available"
msgstr "Pas d'éditeur externe disponible"
-#: include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1145
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:1144
+#: ../include/svn_error_codes.h:1149
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:1148
+#: ../include/svn_error_codes.h:1153
msgid "No external merge tool available"
msgstr "Aucun éditeur externe de fusion disponible"
-#: libsvn_client/add.c:348 libsvn_wc/copy.c:188
+#: ../libsvn_client/add.c:348 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "Le répertoire '%s' ne peut être fermé"
-#: libsvn_client/add.c:356
+#: ../libsvn_client/add.c:356
#, c-format
msgid "Error during add of '%s'"
msgstr "Erreur lors de l'ajout de '%s'"
-#: libsvn_client/blame.c:391 libsvn_client/blame.c:1254
+#: ../libsvn_client/blame.c:391
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Blame non calculable sur le fichier binaire '%s'"
-#: libsvn_client/blame.c:627
+#: ../libsvn_client/blame.c:621
msgid "blame of the WORKING revision is not supported"
msgstr "blame de la révision courante non supporté"
-#: libsvn_client/blame.c:641
+#: ../libsvn_client/blame.c:635
msgid "Start revision must precede end revision"
msgstr "La révision de début doit précéder la révision de fin"
-#: libsvn_client/blame.c:1081 libsvn_ra/compat.c:175
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "Information de modification manquante pour '%s' à la révision %ld"
-
-#: libsvn_client/blame.c:1141 libsvn_client/cat.c:206
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "L'URL '%s' référence un répertoire"
-
-#: libsvn_client/blame.c:1214
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr ""
-"L'action de révision '%c' pour la révision %ld de '%s' nécessite une "
-"révision antérieure"
-
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' référence un répertoire"
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:126 ../libsvn_client/export.c:183
msgid "(local)"
msgstr "(local)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:943
+#: ../libsvn_client/cat.c:206
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "L'URL '%s' référence un répertoire"
+
+#: ../libsvn_client/checkout.c:91 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "L'URL '%s' n'existe pas"
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:95
#, 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:167
+#: ../libsvn_client/checkout.c:167
#, 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:171
+#: ../libsvn_client/checkout.c:171
msgid "; run 'svn update' to complete it"
msgstr "; lancer 'svn update' pour le finir."
-#: libsvn_client/checkout.c:181
+#: ../libsvn_client/checkout.c:181
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' existe déjà et n'est pas un répertoire"
-#: libsvn_client/commit.c:433
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "Type non versionnable ou inconnu pour '%s'"
-#: libsvn_client/commit.c:538
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "Nouveau nom d'entrée requis lors de l'importation d'un fichier"
-#: libsvn_client/commit.c:573 libsvn_wc/adm_ops.c:1037
-#: libsvn_wc/questions.c:93
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:1037
+#: ../libsvn_wc/questions.c:93
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: libsvn_client/commit.c:634 libsvn_client/copy.c:536 svnlook/main.c:1264
+#: ../libsvn_client/commit.c:634 ../libsvn_client/copy.c:565
+#: ../svnlook/main.c:1271
#, c-format
msgid "Path '%s' does not exist"
msgstr "Le chemin '%s' n'existe pas"
-#: libsvn_client/commit.c:769 libsvn_client/copy.c:545
-#: libsvn_client/copy.c:938 libsvn_client/copy.c:1178
-#: libsvn_client/copy.c:1602
+#: ../libsvn_client/commit.c:769 ../libsvn_client/copy.c:574
+#: ../libsvn_client/copy.c:967 ../libsvn_client/copy.c:1207
+#: ../libsvn_client/copy.c:1629
#, c-format
msgid "Path '%s' already exists"
msgstr "Le chemin '%s' existe déjà"
-#: libsvn_client/commit.c:784
+#: ../libsvn_client/commit.c:784
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' est un nom réservé et ne peut être importé"
-#: libsvn_client/commit.c:917 libsvn_client/copy.c:1342
+#: ../libsvn_client/commit.c:917 ../libsvn_client/copy.c:1370
msgid "Commit failed (details follow):"
msgstr "Échec de la propagation (commit), détails : "
-#: libsvn_client/commit.c:925
+#: ../libsvn_client/commit.c:925
msgid "Commit succeeded, but other errors follow:"
msgstr "Succès de la propagation (commit), mais erreurs : "
-#: libsvn_client/commit.c:932
+#: ../libsvn_client/commit.c:932
msgid "Error unlocking locked dirs (details follow):"
msgstr "Erreur en déverrouillant des répertoires verrouillés, détails :"
-#: libsvn_client/commit.c:943
+#: ../libsvn_client/commit.c:943
msgid "Error bumping revisions post-commit (details follow):"
msgstr ""
"Erreur en incrémentant les révisions après la propagation (post-commit), "
"détails :"
-#: libsvn_client/commit.c:954
+#: ../libsvn_client/commit.c:954
msgid "Error in post-commit clean-up (details follow):"
msgstr "Erreur lors du nettoyage d'après-propagation (post-commit), détails :"
-#: libsvn_client/commit.c:1304
+#: ../libsvn_client/commit.c:1304
msgid "Are all the targets part of the same working copy?"
msgstr "Les cibles font-elles parties de la même copie de travail ?"
-#: libsvn_client/commit.c:1337
+#: ../libsvn_client/commit.c:1337
msgid "Cannot non-recursively commit a directory deletion"
msgstr "Propagation non récursive de la suppression d'un répertoire impossible"
-#: libsvn_client/commit.c:1381
+#: ../libsvn_client/commit.c:1381
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "Une URL '%s' ne peut être la cible d'une propagation (commit)"
-#: libsvn_client/commit_util.c:273 libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:273 ../libsvn_client/commit_util.c:284
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Type d'entrée inconnu pour '%s'"
-#: libsvn_client/commit_util.c:301
+#: ../libsvn_client/commit_util.c:301
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "L'entrée '%s' a changé de statut spécial de façon inattendue"
-#: libsvn_client/commit_util.c:356
+#: ../libsvn_client/commit_util.c:356
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Arrêt de la propagation : '%s' demeure en conflit"
-#: libsvn_client/commit_util.c:423
+#: ../libsvn_client/commit_util.c:423
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "'%s' ne devrait pas être une racine de copie de travail"
-#: libsvn_client/commit_util.c:441 libsvn_client/commit_util.c:1120
+#: ../libsvn_client/commit_util.c:441 ../libsvn_client/commit_util.c:1120
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr ""
"L'élément de propagation '%s' marqué pour copie sans URL d'origine (copyfrom)"
-#: libsvn_client/commit_util.c:704
+#: ../libsvn_client/commit_util.c:704
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1184,17 +1177,17 @@
"'%s' n'est pas sous gestionnaire de version et ne fait pas partie de la "
"propagation (commit), alors que son enfant '%s' en fait partie"
-#: libsvn_client/commit_util.c:786
+#: ../libsvn_client/commit_util.c:786 ../libsvn_client/url.c:155
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "L'entrée pour '%s' n'a pas d'URL associée"
-#: libsvn_client/commit_util.c:819
+#: ../libsvn_client/commit_util.c:819
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s' est doit être ajouté dans un répertoire non versionné"
-#: libsvn_client/commit_util.c:839
+#: ../libsvn_client/commit_util.c:839
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1205,40 +1198,41 @@
"ajoutée. Peut-être propagez-vous (commit) un objet qui est à \n"
"l'intérieur d'un répertoire non (encore) versionné ?"
-#: libsvn_client/commit_util.c:863 svn/changelist-cmd.c:62 svn/diff-cmd.c:135
-#: svn/info-cmd.c:466 svn/lock-cmd.c:101 svn/propdel-cmd.c:72
-#: svn/propget-cmd.c:196 svn/proplist-cmd.c:128 svn/revert-cmd.c:59
-#: svn/status-cmd.c:231 svn/unlock-cmd.c:60 svn/update-cmd.c:60
+#: ../libsvn_client/commit_util.c:863 ../svn/changelist-cmd.c:62
+#: ../svn/diff-cmd.c:204 ../svn/info-cmd.c:466 ../svn/lock-cmd.c:101
+#: ../svn/propdel-cmd.c:72 ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:128
+#: ../svn/revert-cmd.c:59 ../svn/status-cmd.c:231 ../svn/unlock-cmd.c:60
+#: ../svn/update-cmd.c:60
#, c-format
msgid "Unknown changelist '%s'"
msgstr "Liste de changements inconnue '%s'"
-#: libsvn_client/commit_util.c:976
+#: ../libsvn_client/commit_util.c:976
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"'%s' et '%s' réfèrent à la même URL et ne peuvent être propagés (commit) "
"ensemble"
-#: libsvn_client/commit_util.c:1125
+#: ../libsvn_client/commit_util.c:1125
#, c-format
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:1884
+#: ../libsvn_client/commit_util.c:1884
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"
-#: libsvn_client/copy.c:561 libsvn_client/copy.c:1618
-#: libsvn_client/update.c:143
+#: ../libsvn_client/copy.c:590 ../libsvn_client/copy.c:1645
+#: ../libsvn_client/update.c:143
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Le chemin '%s' n'est pas un répertoire"
-#: libsvn_client/copy.c:804
+#: ../libsvn_client/copy.c:833
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1246,144 +1240,154 @@
msgstr ""
"Source et destination ne sont pas dans le même dépôt (src = '%s', dst = '%s')"
-#: libsvn_client/copy.c:919
+#: ../libsvn_client/copy.c:948
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "L'URL '%s' ne peut être déplacée (move) dans elle-même"
-#: libsvn_client/copy.c:928 libsvn_client/prop_commands.c:228
+#: ../libsvn_client/copy.c:957 ../libsvn_client/prop_commands.c:228
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Le chemin '%s' n'existe pas à la révision %ld"
-#: libsvn_client/copy.c:1442
+#: ../libsvn_client/copy.c:1469
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"L'URL source '%s' est dans un dépôt distant ; laissée comme une copie "
"disjointe"
-#: libsvn_client/copy.c:1589
+#: ../libsvn_client/copy.c:1616
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Chemin '%s' non trouvé à la révision %ld"
-#: libsvn_client/copy.c:1594
+#: ../libsvn_client/copy.c:1621
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Chemin '%s' non trouvé à la révision de tête"
-#: libsvn_client/copy.c:1644
+#: ../libsvn_client/copy.c:1671
#, c-format
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/log.c:342
+#: ../libsvn_client/copy.c:1764 ../libsvn_client/log.c:342
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"
-#: libsvn_client/copy.c:1782
+#: ../libsvn_client/copy.c:1809
msgid "Cannot mix repository and working copy sources"
msgstr "Impossible de mélanger des sources du dépôt et de la copie de travail"
-#: libsvn_client/copy.c:1825
+#: ../libsvn_client/copy.c:1852
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Le chemin '%s' ne peut être copié dans son propre enfant '%s'"
-#: libsvn_client/copy.c:1845
+#: ../libsvn_client/copy.c:1872
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Le chemin '%s' ne peut être déplacé dans lui-même"
-#: libsvn_client/copy.c:1854
+#: ../libsvn_client/copy.c:1881
msgid "Moves between the working copy and the repository are not supported"
msgstr ""
"Les déplacements (move) entre copie de travail et dépôt ne sont pas supportés"
-#: libsvn_client/copy.c:1917
+#: ../libsvn_client/copy.c:1944
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "'%s' n'a pas d'URL associée"
-#: libsvn_client/copy.c:2284 svn/move-cmd.c:60
+#: ../libsvn_client/copy.c:2320 ../svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "L'opération 'move' n'accepte d'autre révision que 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' obstrue le chemin de la ressource actuellement sous contrôle de version"
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2914 libsvn_wc/entries.c:1272
-#: libsvn_wc/entries.c:2383 libsvn_wc/entries.c:3005
-#: libsvn_wc/update_editor.c:2350
+#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:2914
+#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
+#: ../libsvn_wc/entries.c:3005 ../libsvn_wc/update_editor.c:2361
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' n'est pas versionné"
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' a des modifications locales"
-#: libsvn_client/diff.c:136
+#: ../libsvn_client/diff.c:136
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " Annulé %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: ../libsvn_client/diff.c:154
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Fusionné %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: ../libsvn_client/diff.c:176
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sModification de propriétés sur %s%s"
-#: libsvn_client/diff.c:204
+#: ../libsvn_client/diff.c:205
#, c-format
-msgid "Name: %s%s"
-msgstr "Nom : %s%s"
+msgid "Added: %s%s"
+msgstr "Ajouté : %s%s"
-#: libsvn_client/diff.c:323
+#: ../libsvn_client/diff.c:207
+#, c-format
+msgid "Deleted: %s%s"
+msgstr "Supprimé : %s%s"
+
+#: ../libsvn_client/diff.c:209
+#, c-format
+msgid "Modified: %s%s"
+msgstr "Modifié : %s%s"
+
+#: ../libsvn_client/diff.c:329
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(révision %ld)"
-#: libsvn_client/diff.c:325
+#: ../libsvn_client/diff.c:331
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copie de travail)"
-#: libsvn_client/diff.c:468
+#: ../libsvn_client/diff.c:474
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Impossible d'afficher : fichier considéré comme binaire.%s"
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:1587
+#: ../libsvn_client/diff.c:834 ../libsvn_client/merge.c:1633
msgid "Not all required revisions are specified"
msgstr "Toutes les révisions requises ne sont pas précisées"
-#: libsvn_client/diff.c:843
+#: ../libsvn_client/diff.c:849
msgid "At least one revision must be non-local for a pegged diff"
msgstr ""
"Au moins une révision ne doit pas être locale pour un diff avec révision "
"fixée"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: ../libsvn_client/diff.c:961 ../libsvn_client/diff.c:973
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' n'existe pas dans le dépôt à la révision %ld"
-#: libsvn_client/diff.c:1026
+#: ../libsvn_client/diff.c:1032
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:1082
+#: ../libsvn_client/diff.c:1088
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1391,71 +1395,71 @@
"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:1227 libsvn_client/switch.c:125
+#: ../libsvn_client/diff.c:1233 ../libsvn_client/switch.c:123
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Le répertoire '%s' n'a pas d'URL associée"
-#: libsvn_client/diff.c:1437
+#: ../libsvn_client/diff.c:1443
msgid "Summarizing diff can only compare repository to repository"
msgstr "Le diff résumé compare seulement un dépôt à un autre"
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' n'est pas une valeur de fin de ligne (EOL) valide"
-#: libsvn_client/export.c:261
+#: ../libsvn_client/export.c:261
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "Le répertoire de destination existe, et ne sera pas écrasé sans forcer"
-#: libsvn_client/export.c:407 libsvn_client/export.c:550
+#: ../libsvn_client/export.c:407 ../libsvn_client/export.c:550
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' existe et n'est pas un répertoire"
-#: libsvn_client/export.c:411 libsvn_client/export.c:554
+#: ../libsvn_client/export.c:411 ../libsvn_client/export.c:554
#, c-format
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:2034 libsvn_wc/update_editor.c:2695
+#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
+#: ../libsvn_wc/update_editor.c:2045 ../libsvn_wc/update_editor.c:2711
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Sommes de contrôle différentes pour '%s' ; '%s' attendu, '%s' obtenu"
-#: libsvn_client/externals.c:315
+#: ../libsvn_client/externals.c:315
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "L'URL '%s' ne commence pas par un schéma"
-#: libsvn_client/externals.c:364
+#: ../libsvn_client/externals.c:364
#, c-format
msgid "Illegal parent directory URL '%s'."
msgstr "URL de répertoire parent invalide '%s'."
-#: libsvn_client/externals.c:394
+#: ../libsvn_client/externals.c:394
#, c-format
msgid "Illegal repository root URL '%s'."
msgstr "URL de racine de dépôt invalide '%s'."
-#: libsvn_client/externals.c:436
+#: ../libsvn_client/externals.c:436
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'."
msgstr "L'URL relative externe '%s' ne peut avoir de remontée '..'."
-#: libsvn_client/externals.c:468
+#: ../libsvn_client/externals.c:468
#, c-format
msgid "Unrecognized format for the relative external URL '%s'."
msgstr "Format d'URL relative externe non reconnu '%s'."
-#: libsvn_client/externals.c:690
+#: ../libsvn_client/externals.c:690
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "Traversée de '%s' sans profondeur dans le contexte"
-#: libsvn_client/info.c:410
+#: ../libsvn_client/info.c:410
#, c-format
msgid ""
"Server does not support retrieving information about the repository root"
@@ -1463,78 +1467,79 @@
"Le serveur ne supporte pas la récupération d'information sur la racine du "
"dépôt"
-#: libsvn_client/info.c:417 libsvn_client/info.c:432 libsvn_client/info.c:442
+#: ../libsvn_client/info.c:417 ../libsvn_client/info.c:432
+#: ../libsvn_client/info.c:442
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "L'URL '%s' n'existe pas à la révision %ld"
-#: libsvn_client/list.c:235
+#: ../libsvn_client/list.c:235
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "L'URL '%s' n'existe pas à cette révision"
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:199
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:261 libsvn_client/merge.c:4079
-#: libsvn_client/merge.c:4085 libsvn_client/merge.c:4314
-#: libsvn_client/ra.c:376 libsvn_client/ra.c:413 libsvn_client/ra.c:581
+#: ../libsvn_client/locking_commands.c:261 ../libsvn_client/merge.c:4155
+#: ../libsvn_client/merge.c:4161 ../libsvn_client/merge.c:4390
+#: ../libsvn_client/ra.c:376 ../libsvn_client/ra.c:413
+#: ../libsvn_client/ra.c:581
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' n'a pas d'URL associée"
-#: libsvn_client/locking_commands.c:285
+#: ../libsvn_client/locking_commands.c:285
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Impossible de verrouiller/déverrouiller sur plusieurs dépôts"
-#: libsvn_client/locking_commands.c:326
+#: ../libsvn_client/locking_commands.c:326
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' n'est pas verrouillé dans cette copie de travail"
-#: libsvn_client/locking_commands.c:374
+#: ../libsvn_client/locking_commands.c:374
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: libsvn_client/locking_commands.c:407 libsvn_fs/fs-loader.c:1007
-#: libsvn_ra/ra_loader.c:1022
+#: ../libsvn_client/locking_commands.c:407 ../libsvn_fs/fs-loader.c:1021
+#: ../libsvn_ra/ra_loader.c:1077
msgid "Lock comment contains illegal characters"
msgstr "Le commentaire du verrou (lock) contient des caractères incorrects"
-#: libsvn_client/log.c:329
+#: ../libsvn_client/log.c:329
msgid "Missing required revision specification"
msgstr "Précision de la révision obligatoire"
-#: libsvn_client/log.c:378
+#: ../libsvn_client/log.c:378
msgid "When specifying working copy paths, only one target may be given"
msgstr "Une seule cible à préciser pour un chemin dans une copie de travail"
-#: libsvn_client/log.c:398 libsvn_client/mergeinfo.c:340
-#: libsvn_client/status.c:284 libsvn_client/update.c:157
-#: libsvn_client/util.c:168
+#: ../libsvn_client/log.c:398 ../libsvn_client/status.c:284
+#: ../libsvn_client/update.c:157
#, c-format
msgid "Entry '%s' has no URL"
msgstr "L'entrée '%s' n'a pas d'URL associée"
-#: libsvn_client/log.c:652
+#: ../libsvn_client/log.c:650
msgid "No commits in repository"
msgstr "Pas de propagation dans le dépôt"
-#: libsvn_client/merge.c:84
+#: ../libsvn_client/merge.c:127
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "URLs sans schéma ('%s' et '%s')"
-#: libsvn_client/merge.c:90 libsvn_client/merge.c:96
+#: ../libsvn_client/merge.c:133 ../libsvn_client/merge.c:139
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL sans schéma : '%s'"
-#: libsvn_client/merge.c:103
+#: ../libsvn_client/merge.c:146
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "Schémas d'accession mixtes non encore supportés ('%s' et '%s')"
@@ -1542,21 +1547,21 @@
#. 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:439
+#: ../libsvn_client/merge.c:482
msgid ".working"
msgstr ".courant"
-#: libsvn_client/merge.c:441
+#: ../libsvn_client/merge.c:484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".fusion-gauche.r%ld"
-#: libsvn_client/merge.c:444
+#: ../libsvn_client/merge.c:487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".fusion-droit.r%ld"
-#: libsvn_client/merge.c:1699
+#: ../libsvn_client/merge.c:1745
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1569,81 +1574,81 @@
"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:4144
+#: ../libsvn_client/merge.c:4220
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/prop_commands.c:73
+#: ../libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr ""
"'%s' est une propriété de copie de travail donc inaccessible aux clients"
-#: libsvn_client/prop_commands.c:215
+#: ../libsvn_client/prop_commands.c:215
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "La propriété de révision '%s' n'est pas une propriété connue"
-#: libsvn_client/prop_commands.c:323
+#: ../libsvn_client/prop_commands.c:323
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Propriéte de révision '%s' non permise dans ce contexte"
-#: libsvn_client/prop_commands.c:331 libsvn_client/prop_commands.c:462
+#: ../libsvn_client/prop_commands.c:331 ../libsvn_client/prop_commands.c:462
#, c-format
msgid "Bad property name: '%s'"
msgstr "Nom de propriété invalide : '%s'"
-#: libsvn_client/prop_commands.c:342
+#: ../libsvn_client/prop_commands.c:342
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr ""
"Définir une propriété sur une cible non locale '%s' nécessite une révision "
"de base"
-#: libsvn_client/prop_commands.c:348
+#: ../libsvn_client/prop_commands.c:348
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"Impossible de définir récursivement une propriété pour une cible non locale "
"'%s'"
-#: libsvn_client/prop_commands.c:365
+#: ../libsvn_client/prop_commands.c:365
#, c-format
msgid "Setting property '%s' on non-local target '%s' is not supported"
msgstr "Impossible de définir la propriété '%s' pour une cible non locale '%s'"
-#: libsvn_client/prop_commands.c:458
+#: ../libsvn_client/prop_commands.c:458
msgid "Value will not be set unless forced"
msgstr "Valeur non utilisée sauf en forçant"
-#: libsvn_client/prop_commands.c:679
+#: ../libsvn_client/prop_commands.c:679
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' n'existe pas à la révision %ld"
-#: libsvn_client/prop_commands.c:686 libsvn_client/prop_commands.c:1020
+#: ../libsvn_client/prop_commands.c:686 ../libsvn_client/prop_commands.c:1020
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Type de noeud inconnu pour '%s'"
-#: libsvn_client/ra.c:133
+#: ../libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Tentative de fixer la propriété de copie de travail '%s' sur '%s' hors d'une "
"opération de propagation"
-#: libsvn_client/ra.c:650 libsvn_ra/compat.c:371
+#: ../libsvn_client/ra.c:650 ../libsvn_ra/compat.c:372
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr ""
"Impossible de trouver la localisation dans le dépôt de '%s' pour la révision "
"%ld"
-#: libsvn_client/ra.c:657
+#: ../libsvn_client/ra.c:657
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1652,28 +1657,28 @@
"La localisation de '%s' à la révision %ld n'existe pas dans le dépôt ou "
"réfère à un autre objet"
-#: libsvn_client/relocate.c:101
+#: ../libsvn_client/relocate.c:101
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "'%s' n'est pas la racine du dépôt"
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:108
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "Le dépôt '%s' a pour uuid '%s', mais la copie de travail a '%s'"
-#: libsvn_client/revisions.c:99
+#: ../libsvn_client/revisions.c:99
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Chemin '%s' sans révision propagée"
-#: libsvn_client/revisions.c:126
+#: ../libsvn_client/revisions.c:126
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Type de révision demandé inconnu pour '%s'"
-#: libsvn_client/switch.c:149 libsvn_ra_local/ra_plugin.c:107
-#: libsvn_ra_local/ra_plugin.c:613 libsvn_wc/update_editor.c:3183
+#: ../libsvn_client/switch.c:141 ../libsvn_ra_local/ra_plugin.c:195
+#: ../libsvn_ra_local/ra_plugin.c:270 ../libsvn_wc/update_editor.c:3199
#, c-format
msgid ""
"'%s'\n"
@@ -1684,50 +1689,45 @@
"n'est pas dans le même dépôt que\n"
"'%s'"
-#: libsvn_client/switch.c:167
-#, c-format
-msgid "Destination does not exist: '%s'"
-msgstr "La destination n'existe pas : '%s'"
-
-#: libsvn_client/util.c:209
+#: ../libsvn_client/util.c:215
#, c-format
msgid "URL '%s' is not a child of repository root URL '%s'"
msgstr "l'URL '%s' n'est pas descendante de l'URL du dépôt racine '%s'"
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Échec de la compression des données de svndiff"
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
msgstr "Échec de la décompression des données de svndiff"
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
msgstr ""
"La taille des données décompressées ne correspond pas à la taille initiale"
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:484
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Flux diff invalide : insn %d ne peut être décodé"
-#: libsvn_delta/svndiff.c:488
+#: ../libsvn_delta/svndiff.c:488
#, c-format
msgid "Invalid diff stream: insn %d has non-positive length"
msgstr "Flux diff invalide : insn %d à une longueur non positive"
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:492
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Flux diff invalide : insn %d déborde la vue cible"
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Flux diff invalide : [src] insn %d déborde la vue source"
-#: 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"
@@ -1735,79 +1735,79 @@
"Flux diff invalide : [tgt] insn %d démarre au delà de la position de la vue "
"cible"
-#: 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 ""
"Flux diff invalide : [new] insn %d déborde la nouvelle section de données"
-#: libsvn_delta/svndiff.c:524
+#: ../libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Le delta ne comble pas la fenêtre cible"
-#: libsvn_delta/svndiff.c:527
+#: ../libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Le delta ne contient pas assez de nouvelles données"
-#: libsvn_delta/svndiff.c:633
+#: ../libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Entête de svndiff invalide"
-#: 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 contient une entête de fenêtre corrompue"
-#: libsvn_delta/svndiff.c:697
+#: ../libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff a des vues sources glissant en arrière"
-#: 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 "Fin de l'entrée inattendue pour svndiff"
-#: libsvn_diff/diff_file.c:462
+#: ../libsvn_diff/diff_file.c:462
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Modification inattendue du fichier '%s' pendant un diff"
-#: libsvn_diff/diff_file.c:585
+#: ../libsvn_diff/diff_file.c:585
#, c-format
msgid "Error parsing diff options"
msgstr "Erreur dans les options de diff"
-#: libsvn_diff/diff_file.c:608
+#: ../libsvn_diff/diff_file.c:608
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Argument '%s' invalide dans les options de diff"
-#: libsvn_diff/diff_file.c:1464
+#: ../libsvn_diff/diff_file.c:1464
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Échec à l'effacement du placement mémoire (mmap) '%s'"
-#: libsvn_fs/fs-loader.c:104 libsvn_ra/ra_loader.c:172
-#: libsvn_ra/ra_loader.c:185
+#: ../libsvn_fs/fs-loader.c:104 ../libsvn_ra/ra_loader.c:174
+#: ../libsvn_ra/ra_loader.c:187
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "'%s' ne définit pas '%s()'"
-#: libsvn_fs/fs-loader.c:121
+#: ../libsvn_fs/fs-loader.c:121
#, c-format
msgid "Can't grab FS mutex"
msgstr "Impossible d'obtenir l'exclusivité (mutex) du FS"
-#: libsvn_fs/fs-loader.c:133
+#: ../libsvn_fs/fs-loader.c:133
#, c-format
msgid "Can't ungrab FS mutex"
msgstr "Impossible de rendre l'exclusivité (mutex) du FS"
-#: libsvn_fs/fs-loader.c:154
+#: ../libsvn_fs/fs-loader.c:154
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Échec au chargement du module de stockage (FS) '%s'"
-#: libsvn_fs/fs-loader.c:187
+#: ../libsvn_fs/fs-loader.c:187
#, c-format
msgid ""
"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -1815,286 +1815,299 @@
"Problème de version de module FS pour '%s': %d.%d.%d%s trouvé, %d.%d.%d%s "
"attendu"
-#: libsvn_fs/fs-loader.c:212
+#: ../libsvn_fs/fs-loader.c:212
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Type de stockage de dépôt inconnu : '%s'"
-#: libsvn_fs/fs-loader.c:303
+#: ../libsvn_fs/fs-loader.c:303
#, c-format
msgid "Can't allocate FS mutex"
msgstr "Impossible d'allouer l'exclusivité (mutex) du FS"
-#: libsvn_fs/fs-loader.c:1013
+#: ../libsvn_fs/fs-loader.c:1027
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Date d'expiration négative passée à svn_fs_lock"
-#: 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 "Erreur de base Berkeley pour le système de fichiers '%s' en %s :\n"
-#: libsvn_fs_base/bdb/changes-table.c:87
+#: ../libsvn_fs_base/bdb/changes-table.c:87
msgid "creating change"
msgstr "créant une modification"
-#: libsvn_fs_base/bdb/changes-table.c:113
+#: ../libsvn_fs_base/bdb/changes-table.c:113
msgid "deleting changes"
msgstr "effaçant des modifications"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2730
+#: ../libsvn_fs_base/bdb/changes-table.c:145 ../libsvn_fs_fs/fs_fs.c:2857
msgid "Missing required node revision ID"
msgstr "Absence de l'ID requise de la révision du noeud"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2740
+#: ../libsvn_fs_base/bdb/changes-table.c:156 ../libsvn_fs_fs/fs_fs.c:2867
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Ordre de modificaiton invalide : nouvel ID de révision de noeud sans "
"effacement"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2751
+#: ../libsvn_fs_base/bdb/changes-table.c:166 ../libsvn_fs_fs/fs_fs.c:2878
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Ordre de modification invalide : modification autre qu'un ajout sur un "
"chemin effacé"
-#: 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 "créant un curseur pour lire les modifications"
-#: 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 "Erreur en lisant les modifications pour la clef '%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 "récupérant les modifications"
-#: 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 "fermant le curseur de modifications"
-#: libsvn_fs_base/bdb/copies-table.c:85
+#: ../libsvn_fs_base/bdb/copies-table.c:85
msgid "storing copy record"
msgstr "sauvegardant la copie de l'enregistrement"
-#: 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 "allouant un nouvel identifiant de copie ('next-key')"
-#: libsvn_fs_base/bdb/copies-table.c:128
+#: ../libsvn_fs_base/bdb/copies-table.c:128
msgid "bumping next copy key"
msgstr "incrémentant le prochain identifiant de copie"
-#: libsvn_fs_base/bdb/copies-table.c:167
+#: ../libsvn_fs_base/bdb/copies-table.c:167
msgid "deleting entry from 'copies' table"
msgstr "effaçant une entrée de la table des matière de la copie"
-#: libsvn_fs_base/bdb/copies-table.c:195
+#: ../libsvn_fs_base/bdb/copies-table.c:195
msgid "reading copy"
msgstr "lisant la copie"
-#: libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/node-origins-table.c:101
+#, c-format
+msgid "Node origin for '%s' already exists in filesystem '%s'"
+msgstr ""
+"L'origine du noeud pour '%s' existe déjà dans le système de fichiers '%s'"
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:107
+msgid "storing node-origins record"
+msgstr "sauvegarde des enregistrements d'origines de noeud"
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:97
msgid "allocating new node ID (getting 'next-key')"
msgstr "allouant un nouvel identifiant de noeud ('next-key')"
-#: libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:115
msgid "bumping next node ID key"
msgstr "incrémentant le prochain identifiant de noeud"
-#: libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:152
#, 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:178
msgid "deleting entry from 'nodes' table"
msgstr "effaçant l'entrée de la table des noeuds"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:218
msgid "reading node revision"
msgstr "lisant la révision du noeud"
-#: libsvn_fs_base/bdb/nodes-table.c:250
+#: ../libsvn_fs_base/bdb/nodes-table.c:250
msgid "storing node revision"
msgstr "sauvegardant la révision du noeud"
-#: 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 "Représentation '%s' inexistante"
#. 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 "lisant la représentation"
-#: libsvn_fs_base/bdb/reps-table.c:124
+#: ../libsvn_fs_base/bdb/reps-table.c:124
msgid "storing representation"
msgstr "sauvegardant la représentation"
-#: libsvn_fs_base/bdb/reps-table.c:154
+#: ../libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
msgstr "allouant une nouvelle représentation (next-key)"
-#: libsvn_fs_base/bdb/reps-table.c:175
+#: ../libsvn_fs_base/bdb/reps-table.c:175
msgid "bumping next representation key"
msgstr "incrémentant le prochain identifiant de représentation"
#. 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 "effaçant la représentation"
#. 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 "lisant la révision du système de fichiers"
-#: libsvn_fs_base/bdb/strings-table.c:89
+#: ../libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "créant un curseur pour lire une chaîne de caractères"
-#: libsvn_fs_base/bdb/txn-table.c:92
+#: ../libsvn_fs_base/bdb/txn-table.c:92
msgid "storing transaction record"
msgstr "sauvegardant l'enregistrement de la transaction"
-#: libsvn_fs_base/bdb/uuids-table.c:114
+#: ../libsvn_fs_base/bdb/uuids-table.c:114
msgid "get repository uuid"
msgstr "récupérant l'identifiant (uuid) du dépôt"
-#: libsvn_fs_base/bdb/uuids-table.c:142
+#: ../libsvn_fs_base/bdb/uuids-table.c:142
msgid "set repository uuid"
msgstr "définissant l'identifiant (uuid) du dépôt"
-#: libsvn_fs_base/dag.c:221
+#: ../libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : la transaction initiale n'est pas '0' dans le système de "
"fichier '%s'"
-#: libsvn_fs_base/dag.c:229
+#: ../libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : la copie initiale n'est pas '0' dans le système de fichier "
"'%s'"
-#: libsvn_fs_base/dag.c:238
+#: ../libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : le numéro de révision initial n'est pas '0' dans le système "
"de fichier '%s'"
-#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:324
+#: ../libsvn_fs_base/dag.c:286 ../libsvn_fs_base/dag.c:462
+#: ../libsvn_fs_fs/dag.c:324
msgid "Attempted to create entry in non-directory parent"
msgstr ""
"Tentative de création d'une entrée dans un parent qui n'est pas un répertoire"
-#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:318
+#: ../libsvn_fs_base/dag.c:456 ../libsvn_fs_fs/dag.c:318
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Tentative de création d'un noeud avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:330
+#: ../libsvn_fs_base/dag.c:468 ../libsvn_fs_base/dag.c:702
+#: ../libsvn_fs_fs/dag.c:330
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Tentative de clonage d'un enfant de noeud non modifiable"
-#: libsvn_fs_base/dag.c:475
+#: ../libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Tentative de création d'une entrée qui existe déjà"
-#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:392
+#: ../libsvn_fs_base/dag.c:526 ../libsvn_fs_fs/dag.c:392
msgid "Attempted to set entry in non-directory node"
msgstr "Tentative de fixer une entrée à un noeud qui n'est pas un répertoire"
-#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:398
+#: ../libsvn_fs_base/dag.c:532 ../libsvn_fs_fs/dag.c:398
msgid "Attempted to set entry in immutable node"
msgstr "Tentative de fixer une entrée à un noeud non modifiable"
-#: libsvn_fs_base/dag.c:596
+#: ../libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"Impossible de fixer des propriétés sur la révision de noeud *non modifiable* "
"%s"
-#: libsvn_fs_base/dag.c:708
+#: ../libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Tentative de clonage d'un enfant avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:834
+#: ../libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr ""
"Tentative de suppression de l'entrée '%s' d'un noeud qui n'est *pas* un "
"répertoire"
-#: libsvn_fs_base/dag.c:840
+#: ../libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Tentative de suppression de l'entrée '%s' d'un noeud répertoire non "
"modifiable"
-#: libsvn_fs_base/dag.c:847
+#: ../libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Tentative de suppression d'un noeud avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
+#: ../libsvn_fs_base/dag.c:862 ../libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Suppression échouée : le répertoire n'a pas d'entrée '%s'"
-#: libsvn_fs_base/dag.c:944
+#: ../libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Tentative d'effacer un noeud non modifiable"
-#: libsvn_fs_base/dag.c:1064
+#: ../libsvn_fs_base/dag.c:1067
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr ""
"Tentative d'obtention du contenu textuel d'une noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1099
+#: ../libsvn_fs_base/dag.c:1102
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Tentative d'obtention de la taille d'un noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1125
+#: ../libsvn_fs_base/dag.c:1128
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr ""
"Tentative d'obtention de la somme de contrôle d'un noeud qui n'est pas un "
"fichier"
-#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
+#: ../libsvn_fs_base/dag.c:1159 ../libsvn_fs_base/dag.c:1213
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr ""
"Tentative de définir le contenu textuel d'un noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
+#: ../libsvn_fs_base/dag.c:1165 ../libsvn_fs_base/dag.c:1219
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Tentative de définir le contenu textuel d'un noeud non modifiable"
-#: libsvn_fs_base/dag.c:1239
+#: ../libsvn_fs_base/dag.c:1242
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -2105,120 +2118,127 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_base/dag.c:1294
+#: ../libsvn_fs_base/dag.c:1297
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Tentative d'ouverture d'un noeud fils non existant '%s'"
-#: libsvn_fs_base/dag.c:1300
+#: ../libsvn_fs_base/dag.c:1303
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Tentative d'ouverture d'un noeud avec un nom illégal '%s'"
-#: libsvn_fs_base/err.c:41
+#: ../libsvn_fs_base/err.c:41
#, c-format
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "Révision %ld du système de fichier '%s' corrompue"
-#: 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 "Référence à un noeud inexistant '%s' du système de fichier '%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 "Référence à une révision %ld inexistante du système de fichier '%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 ""
"Entrée corrompue dans la table 'transactions' pour '%s' du système de "
"fichier '%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 ""
"Entrée corrompue dans la table 'copies' pour '%s' du système de fichier '%s'"
-#: libsvn_fs_base/err.c:96
+#: ../libsvn_fs_base/err.c:96
#, c-format
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "Aucune transaction appelée '%s' dans le système de fichier '%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 ""
"Impossible de modifier la transaction appelée '%s' dans le système de "
"fichier '%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 "Aucune copie avec l'id '%s' dans le système de fichier '%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 "Le nom '%s' ne correspond à aucun verrou du système de fichiers '%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 "Pas de nom pour '%s' dans le système de fichiers '%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 ""
"Verrou corrompu dans la table 'locks' pour '%s' dans le système de fichiers "
"'%s'"
-#: libsvn_fs_base/fs.c:81
+#: ../libsvn_fs_base/err.c:157
+#, c-format
+msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
+msgstr ""
+"Pas d'enregistrement dans la table 'node-origins' pour le noeud '%s' du "
+"système de fichier '%s'"
+
+#: ../libsvn_fs_base/fs.c:82
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "Mauvaise version de la base : %d.%d.%d, devrait être au moins %d.%d.%d"
-#: libsvn_fs_base/fs.c:92
+#: ../libsvn_fs_base/fs.c:93
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr ""
"Mauvaise version de la base : compilée avec %d.%d.%d, tourne avec %d.%d.%d"
-#: libsvn_fs_base/fs.c:110 libsvn_fs_fs/fs.c:53
+#: ../libsvn_fs_base/fs.c:111 ../libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "Objet du système de fichier déjà ouvert"
-#: libsvn_fs_base/fs.c:191
+#: ../libsvn_fs_base/fs.c:193
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr ""
"Erreur de base Berkeley pour le système de fichiers '%s' en cloturant "
"l'environnement :\n"
-#: libsvn_fs_base/fs.c:540
+#: ../libsvn_fs_base/fs.c:542
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr ""
"Erreur de base Berkeley pour le système de fichiers '%s' en créant "
"l'environnement :\n"
-#: libsvn_fs_base/fs.c:546
+#: ../libsvn_fs_base/fs.c:548
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr ""
"Erreur de base Berkeley pour le système de fichiers '%s' en ouvrant "
"l'environnement :\n"
-#: libsvn_fs_base/fs.c:675
+#: ../libsvn_fs_base/fs.c:684
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Format de stockage attendu '%d' ; format trouvé '%d'"
-#: libsvn_fs_base/fs.c:1114
+#: ../libsvn_fs_base/fs.c:1135
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2229,7 +2249,7 @@
"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:1133
+#: ../libsvn_fs_base/fs.c:1154
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2240,55 +2260,55 @@
"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:1180
+#: ../libsvn_fs_base/fs.c:1201
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:1214
+#: ../libsvn_fs_base/fs.c:1235
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Version %d du chargeur FS non supportée pour bdb"
-#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:613
+#: ../libsvn_fs_base/lock.c:445 ../libsvn_fs_fs/lock.c:613
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"Impossible de vérifier le verrou sur le chemin '%s' ; Aucun nom "
"d'utilisateur disponible"
-#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:619
+#: ../libsvn_fs_base/lock.c:451 ../libsvn_fs_fs/lock.c:619
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"L'utilisateur '%s' ne possède pas le verrou sur '%s' (actuellement "
"verrouillé par %s)"
-#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:626
+#: ../libsvn_fs_base/lock.c:458 ../libsvn_fs_fs/lock.c:626
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr "Le verrou sur '%s' ne peut être vérifié : pas de verrou de ce nom"
#. 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 "Type de noeud inconnu pour la représentation '%s'"
-#: libsvn_fs_base/reps-strings.c:108
+#: ../libsvn_fs_base/reps-strings.c:108
msgid "Representation is not of type 'delta'"
msgstr "La représentation n'est pas de type 'delta'"
-#: libsvn_fs_base/reps-strings.c:378
+#: ../libsvn_fs_base/reps-strings.c:378
msgid "Svndiff source length inconsistency"
msgstr "Incohérence de longueur de la source de 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 "Incohérence de version de diff dans la représentation '%s'"
-#: 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 '%"
@@ -2297,17 +2317,17 @@
"Corruption détectée pendant la lecture du delta de la représentation '%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 "Le contenu de la représentation est trop grand : %s, la limite est %s"
-#: libsvn_fs_base/reps-strings.c:795
+#: ../libsvn_fs_base/reps-strings.c:795
#, c-format
msgid "Failure reading rep '%s'"
msgstr "Échec à la lecture de la représentation '%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"
@@ -2318,103 +2338,103 @@
" attendu : %s\n"
" obtenu : %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 "Représentation nulle, mais décallage déjà au delà de zéro"
-#: 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 "La représentation '%s' n'est pas modifiable"
-#: 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 "Représentation '%s' à la fois modifiable et pas plein-texte"
-#: libsvn_fs_base/reps-strings.c:1339
+#: ../libsvn_fs_base/reps-strings.c:1339
msgid "Failed to get new string key"
msgstr "Échec à l'obtention d'une nouvelle chaîne clef"
-#: libsvn_fs_base/reps-strings.c:1415
+#: ../libsvn_fs_base/reps-strings.c:1415
#, c-format
msgid "Attempt to deltify '%s' against itself"
msgstr "Tentative de différencier '%s' avec lui-même"
-#: 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 "Échec du calcul du résumé MD5 de '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: ../libsvn_fs_base/revs-txns.c:68
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "La transaction n'est pas morte : '%s'"
-#: libsvn_fs_base/revs-txns.c:71
+#: ../libsvn_fs_base/revs-txns.c:71
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transaction morte : '%s'"
-#: libsvn_fs_base/revs-txns.c:1040
+#: ../libsvn_fs_base/revs-txns.c:1064
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaction interrompue, mais échec du nettoyage (cleanup)"
-#: libsvn_fs_base/tree.c:745 libsvn_fs_fs/tree.c:697
+#: ../libsvn_fs_base/tree.c:746 ../libsvn_fs_fs/tree.c:697
#, c-format
msgid "Failure opening '%s'"
msgstr "Échec à l'ouverture de '%s'"
-#: libsvn_fs_base/tree.c:1378 libsvn_fs_fs/tree.c:1144
+#: ../libsvn_fs_base/tree.c:1379 ../libsvn_fs_fs/tree.c:1145
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:1705
+#: ../libsvn_fs_base/tree.c:1706
msgid "Corrupt DB: faulty predecessor count"
msgstr "Base de données corrompue : nombre de prédécesseurs incorrect"
-#: libsvn_fs_base/tree.c:1760 libsvn_fs_fs/tree.c:1180
+#: ../libsvn_fs_base/tree.c:1761 ../libsvn_fs_fs/tree.c:1181
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Noeud non-modifiable inattendu à '%s'"
-#: libsvn_fs_base/tree.c:1781 libsvn_fs_fs/tree.c:1203
+#: ../libsvn_fs_base/tree.c:1782 ../libsvn_fs_fs/tree.c:1204
#, c-format
msgid "Conflict at '%s'"
msgstr "Conflit sur '%s'"
-#: libsvn_fs_base/tree.c:1831 libsvn_fs_base/tree.c:2543
-#: libsvn_fs_fs/tree.c:1252 libsvn_fs_fs/tree.c:1744
+#: ../libsvn_fs_base/tree.c:1832 ../libsvn_fs_base/tree.c:2544
+#: ../libsvn_fs_fs/tree.c:1253 ../libsvn_fs_fs/tree.c:1745
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:1847 libsvn_fs_fs/tree.c:1268
+#: ../libsvn_fs_base/tree.c:1848 ../libsvn_fs_fs/tree.c:1269
#, 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:2350
+#: ../libsvn_fs_base/tree.c:2351
#, 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:2726 libsvn_fs_fs/tree.c:1883
+#: ../libsvn_fs_base/tree.c:2727 ../libsvn_fs_fs/tree.c:1884
msgid "The root directory cannot be deleted"
msgstr "Le répertoire racine ne peut être effacé"
-#: libsvn_fs_base/tree.c:2907 libsvn_fs_fs/tree.c:1955
+#: ../libsvn_fs_base/tree.c:2908 ../libsvn_fs_fs/tree.c:1956
#, 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:2916 libsvn_fs_fs/tree.c:1961
+#: ../libsvn_fs_base/tree.c:2917 ../libsvn_fs_fs/tree.c:1962
msgid "Copy from mutable tree not currently supported"
msgstr "Copie à partir d'un arbre modifiable non supportée"
-#: libsvn_fs_base/tree.c:3411 libsvn_fs_fs/tree.c:2388
+#: ../libsvn_fs_base/tree.c:3412 ../libsvn_fs_fs/tree.c:2389
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2425,23 +2445,24 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_base/tree.c:3666 libsvn_fs_fs/tree.c:2624
+#: ../libsvn_fs_base/tree.c:3667 ../libsvn_fs_fs/tree.c:2625
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:3675 libsvn_fs_base/tree.c:3680
-#: libsvn_fs_fs/tree.c:2633 libsvn_fs_fs/tree.c:2638
+#: ../libsvn_fs_base/tree.c:3676 ../libsvn_fs_base/tree.c:3681
+#: ../libsvn_fs_fs/tree.c:2634 ../libsvn_fs_fs/tree.c:2639
+#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' n'est pas un fichier"
-#: libsvn_fs_fs/dag.c:374
+#: ../libsvn_fs_fs/dag.c:374
msgid "Can't get entries of non-directory"
msgstr "Liste des entrées seulement pour un répertoire"
-#: libsvn_fs_fs/dag.c:904
+#: ../libsvn_fs_fs/dag.c:904
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2452,76 +2473,93 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_fs/err.c:52
+#: ../libsvn_fs_fs/err.c:52
#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "Fichier de verrou corrompu pour '%s' dans le système de fichiers '%s'"
-#: libsvn_fs_fs/fs.c:88
+#: ../libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Impossible de charger les données partagées de FSFS"
-#: libsvn_fs_fs/fs.c:104
+#: ../libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr ""
"Impossible de créer l'exclusivité en écriture (write-lock mutex) de FSFS"
-#: libsvn_fs_fs/fs.c:112
+#: ../libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Impossible de créer l'exclusivité (txn list mutex) de FSFS"
-#: libsvn_fs_fs/fs.c:118
+#: ../libsvn_fs_fs/fs.c:119
+#, c-format
+msgid "Can't create FSFS txn-current mutex"
+msgstr ""
+"Impossible de créer l'exclusivité pour la transaction en cours de FSFS (txn-"
+"current mutex)"
+
+#: ../libsvn_fs_fs/fs.c:125
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Impossible de stocker les données partagées de FSFS"
-#: libsvn_fs_fs/fs.c:298
+#: ../libsvn_fs_fs/fs.c:305
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Module de stockage de dépôt à base de fichiers simples (FSFS)."
-#: libsvn_fs_fs/fs.c:332
+#: ../libsvn_fs_fs/fs.c:339
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Version %d du chargeur FS non supportée pour fsfs"
-#: libsvn_fs_fs/fs_fs.c:382
+#: ../libsvn_fs_fs/fs_fs.c:395
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Impossible d'obtenir l'exclusivité (txn list mutex) de FSFS"
-#: libsvn_fs_fs/fs_fs.c:390
+#: ../libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Impossible de rendre l'exclusivité (txn list mutex) de FSFS"
-#: libsvn_fs_fs/fs_fs.c:416
+#: ../libsvn_fs_fs/fs_fs.c:456
+#, c-format
+msgid "Can't grab FSFS mutex for '%s'"
+msgstr "Impossible d'obtenir l'exclusivité (mutex) sur FSFS pour '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:471
+#, c-format
+msgid "Can't ungrab FSFS mutex for '%s'"
+msgstr "Impossible de rendre l'exclusivité (mutex) sur FSFS pour '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:542
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Impossible de déverrouiller la transaction inconnue '%s'"
-#: libsvn_fs_fs/fs_fs.c:420
+#: ../libsvn_fs_fs/fs_fs.c:546
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Impossible de déverrouiller la transaction non verrouillée '%s'"
-#: libsvn_fs_fs/fs_fs.c:427
+#: ../libsvn_fs_fs/fs_fs.c:553
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"Impossible de déverrouiller le fichier verrou du prototype de révision pour "
"la transaction '%s'"
-#: libsvn_fs_fs/fs_fs.c:433
+#: ../libsvn_fs_fs/fs_fs.c:559
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"Impossible de fermer le fichier verrou du prototype de révision pour la "
"transaction '%s'"
-#: libsvn_fs_fs/fs_fs.c:495
+#: ../libsvn_fs_fs/fs_fs.c:621
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2531,7 +2569,7 @@
"transaction '%s' parce qu'une représentation précédente est en cours "
"d'écriture par ce processus."
-#: libsvn_fs_fs/fs_fs.c:531
+#: ../libsvn_fs_fs/fs_fs.c:657
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2541,115 +2579,115 @@
"transaction '%s' parce qu'une représentation précédente est en cours "
"d'écriture par un autre processus"
-#: libsvn_fs_fs/fs_fs.c:538 libsvn_subr/io.c:1545
+#: ../libsvn_fs_fs/fs_fs.c:664 ../libsvn_subr/io.c:1545
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Impossible d'obtenir le verrou exclusif sur le fichier '%s'"
-#: libsvn_fs_fs/fs_fs.c:650
+#: ../libsvn_fs_fs/fs_fs.c:776
#, c-format
msgid "Format file '%s' contains an unexpected non-digit"
msgstr "Le fichier de format '%s' contient un caractère non-numérique"
-#: libsvn_fs_fs/fs_fs.c:698
+#: ../libsvn_fs_fs/fs_fs.c:824
#, c-format
msgid "Can't read first line of format file '%s'"
msgstr "Impossible de lire la première ligne du fichier de format '%s'"
-#: libsvn_fs_fs/fs_fs.c:742
+#: ../libsvn_fs_fs/fs_fs.c:868
#, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr "'%s' contient une option invalide '%s' pour le format de stockage"
-#: libsvn_fs_fs/fs_fs.c:803
+#: ../libsvn_fs_fs/fs_fs.c:929
#, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr "Format de stockage attendu entre '1' et '%d' ; format trouvé '%d'"
-#: libsvn_fs_fs/fs_fs.c:1116 libsvn_fs_fs/fs_fs.c:1130
+#: ../libsvn_fs_fs/fs_fs.c:1243 ../libsvn_fs_fs/fs_fs.c:1257
msgid "Found malformed header in revision file"
msgstr "Entête malformée dans le fichier de révision"
-#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1246
-#: libsvn_fs_fs/fs_fs.c:1253 libsvn_fs_fs/fs_fs.c:1260
-#: libsvn_fs_fs/fs_fs.c:1268 libsvn_fs_fs/fs_fs.c:1276
+#: ../libsvn_fs_fs/fs_fs.c:1359 ../libsvn_fs_fs/fs_fs.c:1373
+#: ../libsvn_fs_fs/fs_fs.c:1380 ../libsvn_fs_fs/fs_fs.c:1387
+#: ../libsvn_fs_fs/fs_fs.c:1395 ../libsvn_fs_fs/fs_fs.c:1403
msgid "Malformed text rep offset line in node-rev"
msgstr ""
"Ligne 'offset' d'une représentation textuelle malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1345
+#: ../libsvn_fs_fs/fs_fs.c:1472
msgid "Missing kind field in node-rev"
msgstr "Champs 'kind' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1376
+#: ../libsvn_fs_fs/fs_fs.c:1503
msgid "Missing cpath in node-rev"
msgstr "'cpath' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1403 libsvn_fs_fs/fs_fs.c:1409
+#: ../libsvn_fs_fs/fs_fs.c:1530 ../libsvn_fs_fs/fs_fs.c:1536
msgid "Malformed copyroot line in node-rev"
msgstr "Ligne 'copyroot' malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1427 libsvn_fs_fs/fs_fs.c:1433
+#: ../libsvn_fs_fs/fs_fs.c:1554 ../libsvn_fs_fs/fs_fs.c:1560
msgid "Malformed copyfrom line in node-rev"
msgstr "Ligne 'copyfrom' malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1542 libsvn_fs_fs/fs_fs.c:4148
+#: ../libsvn_fs_fs/fs_fs.c:1669 ../libsvn_fs_fs/fs_fs.c:4294
msgid "Attempted to write to non-transaction"
msgstr "Tentative d'écriture vers une non-transaction"
-#: libsvn_fs_fs/fs_fs.c:1626
+#: ../libsvn_fs_fs/fs_fs.c:1753
msgid "Malformed representation header"
msgstr "Entête de représentation mal formée"
-#: libsvn_fs_fs/fs_fs.c:1650
+#: ../libsvn_fs_fs/fs_fs.c:1777
msgid "Missing node-id in node-rev"
msgstr "'node-id' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1656
+#: ../libsvn_fs_fs/fs_fs.c:1783
msgid "Corrupt node-id in node-rev"
msgstr "'node-id' corrompu dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1701
+#: ../libsvn_fs_fs/fs_fs.c:1828
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Il manque une saut de ligne à la fin du fichier de révision"
-#: libsvn_fs_fs/fs_fs.c:1713
+#: ../libsvn_fs_fs/fs_fs.c:1840
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Dernière ligne du fichier de révision plus longue que 64 caractères"
-#: libsvn_fs_fs/fs_fs.c:1728
+#: ../libsvn_fs_fs/fs_fs.c:1855
msgid "Final line in revision file missing space"
msgstr "Il manque espace à la dernière ligne du fichier de révision"
-#: libsvn_fs_fs/fs_fs.c:1771 libsvn_fs_fs/fs_fs.c:1855 libsvn_repos/log.c:1355
-#: libsvn_repos/log.c:1359
+#: ../libsvn_fs_fs/fs_fs.c:1898 ../libsvn_fs_fs/fs_fs.c:1982
+#: ../libsvn_repos/log.c:1355 ../libsvn_repos/log.c:1359
#, c-format
msgid "No such revision %ld"
msgstr "Pas de révision %ld"
-#: libsvn_fs_fs/fs_fs.c:1928
+#: ../libsvn_fs_fs/fs_fs.c:2055
msgid "Malformed svndiff data in representation"
msgstr "Représentation des données de svndiff mal formées"
-#: libsvn_fs_fs/fs_fs.c:2071 libsvn_fs_fs/fs_fs.c:2084
+#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Lecture d'une fenêtre svndiff au delà de la fin de la représentation"
-#: libsvn_fs_fs/fs_fs.c:2220
+#: ../libsvn_fs_fs/fs_fs.c:2347
msgid "svndiff data requested non-existent source"
msgstr "Données de svndiff ayant requis une source inexistante"
-#: libsvn_fs_fs/fs_fs.c:2226
+#: ../libsvn_fs_fs/fs_fs.c:2353
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff ayant requis une position au delà de la fin du flux"
-#: libsvn_fs_fs/fs_fs.c:2249 libsvn_fs_fs/fs_fs.c:2266
+#: ../libsvn_fs_fs/fs_fs.c:2376 ../libsvn_fs_fs/fs_fs.c:2393
msgid "svndiff window length is corrupt"
msgstr "Taille de fenêtre de svndiff corrompue"
-#: libsvn_fs_fs/fs_fs.c:2314
+#: ../libsvn_fs_fs/fs_fs.c:2441
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2660,220 +2698,220 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_fs/fs_fs.c:2538 libsvn_fs_fs/fs_fs.c:2551
-#: libsvn_fs_fs/fs_fs.c:2557 libsvn_fs_fs/fs_fs.c:5278
-#: libsvn_fs_fs/fs_fs.c:5287 libsvn_fs_fs/fs_fs.c:5293
+#: ../libsvn_fs_fs/fs_fs.c:2665 ../libsvn_fs_fs/fs_fs.c:2678
+#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:5377
+#: ../libsvn_fs_fs/fs_fs.c:5386 ../libsvn_fs_fs/fs_fs.c:5392
msgid "Directory entry corrupt"
msgstr "Entrée du répertoire corrompue"
-#: libsvn_fs_fs/fs_fs.c:2896 libsvn_fs_fs/fs_fs.c:2904
-#: libsvn_fs_fs/fs_fs.c:2936 libsvn_fs_fs/fs_fs.c:2956
-#: libsvn_fs_fs/fs_fs.c:2990 libsvn_fs_fs/fs_fs.c:2995
+#: ../libsvn_fs_fs/fs_fs.c:3023 ../libsvn_fs_fs/fs_fs.c:3031
+#: ../libsvn_fs_fs/fs_fs.c:3063 ../libsvn_fs_fs/fs_fs.c:3083
+#: ../libsvn_fs_fs/fs_fs.c:3117 ../libsvn_fs_fs/fs_fs.c:3122
msgid "Invalid changes line in rev-file"
msgstr "Lignes modifiées invalides dans le fichier révision (rev-file)"
-#: libsvn_fs_fs/fs_fs.c:2929
+#: ../libsvn_fs_fs/fs_fs.c:3056
msgid "Invalid change kind in rev file"
msgstr "Sorte de modification invalide dans le fichier révision (rev-file)"
-#: libsvn_fs_fs/fs_fs.c:2949
+#: ../libsvn_fs_fs/fs_fs.c:3076
msgid "Invalid text-mod flag in rev-file"
msgstr "'text-mod' invalide dans le fichier révision (rev-file)"
-#: libsvn_fs_fs/fs_fs.c:2969
+#: ../libsvn_fs_fs/fs_fs.c:3096
msgid "Invalid prop-mod flag in rev-file"
msgstr "'prop-mod' invalide dans le fichier révision (rev-file)"
-#: libsvn_fs_fs/fs_fs.c:3153
+#: ../libsvn_fs_fs/fs_fs.c:3280
msgid "Copying from transactions not allowed"
msgstr "Copie à partir des transactions impossible"
-#: libsvn_fs_fs/fs_fs.c:3323
+#: ../libsvn_fs_fs/fs_fs.c:3448
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr ""
"Impossible de créer le répertoire de transaction '%s' pour la révision %ld"
-#: libsvn_fs_fs/fs_fs.c:3579 libsvn_fs_fs/fs_fs.c:3586
+#: ../libsvn_fs_fs/fs_fs.c:3725 ../libsvn_fs_fs/fs_fs.c:3732
msgid "next-id file corrupt"
msgstr "Fichier identificateur suivant (next-id) corrompu"
-#: libsvn_fs_fs/fs_fs.c:3674
+#: ../libsvn_fs_fs/fs_fs.c:3820
msgid "Transaction cleanup failed"
msgstr "Échec du nettoyage de la transaction"
-#: libsvn_fs_fs/fs_fs.c:3842
+#: ../libsvn_fs_fs/fs_fs.c:3988
msgid "Invalid change type"
msgstr "Type de modification invalide"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: ../libsvn_fs_fs/fs_fs.c:4313
msgid "Can't set text contents of a directory"
msgstr "Impossible de définir le contenu textuel d'un répertoire"
-#: libsvn_fs_fs/fs_fs.c:4251 libsvn_fs_fs/fs_fs.c:4256
-#: libsvn_fs_fs/fs_fs.c:4263
+#: ../libsvn_fs_fs/fs_fs.c:4397 ../libsvn_fs_fs/fs_fs.c:4402
+#: ../libsvn_fs_fs/fs_fs.c:4409
msgid "Corrupt current file"
msgstr "Fichier courant corrompu"
-#: libsvn_fs_fs/fs_fs.c:4548 libsvn_subr/io.c:2832 svn/util.c:379
-#: svn/util.c:394 svn/util.c:418
+#: ../libsvn_fs_fs/fs_fs.c:4694 ../libsvn_subr/io.c:2832 ../svn/util.c:379
+#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
msgstr "'%s' n'est pas consultable (stat)"
-#: libsvn_fs_fs/fs_fs.c:4552
+#: ../libsvn_fs_fs/fs_fs.c:4698
#, c-format
msgid "Can't chmod '%s'"
msgstr "Impossible de changer les droits (chmod) de '%s'"
-#: libsvn_fs_fs/fs_fs.c:4701
-#, c-format
-msgid "Can't grab FSFS repository mutex"
-msgstr "Impossible d'obtenir l'exclusivité (mutex) du dépôt FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4715
-#, c-format
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "Impossible de rendre l'exclusivité (mutex) du dépôt FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4835
+#: ../libsvn_fs_fs/fs_fs.c:4920
msgid "Transaction out of date"
msgstr "Transaction obsolète"
-#: libsvn_fs_fs/fs_fs.c:5219
+#: ../libsvn_fs_fs/fs_fs.c:5318
msgid "Recovery encountered a non-directory node"
msgstr "La réparation a trouvé un noeud qui n'est pas un répertoire"
-#: libsvn_fs_fs/fs_fs.c:5241
+#: ../libsvn_fs_fs/fs_fs.c:5340
msgid "Recovery encountered a deltified directory representation"
msgstr "La réparation a trouvé une réprésentation différentielle de répertoire"
-#: libsvn_fs_fs/fs_fs.c:5507
+#: ../libsvn_fs_fs/fs_fs.c:5606
msgid "No such transaction"
msgstr "Transaction non trouvée"
-#: libsvn_fs_fs/lock.c:228
+#: ../libsvn_fs_fs/lock.c:228
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Impossible d'écrire dans le fichier-hash de verrouillage '%s'"
-#: libsvn_fs_fs/lock.c:284
+#: ../libsvn_fs_fs/lock.c:284
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Impossible d'analyser le fichier-hash de verrouillage '%s'"
-#: libsvn_fs_fs/lock.c:713 libsvn_fs_fs/lock.c:734
+#: ../libsvn_fs_fs/lock.c:713 ../libsvn_fs_fs/lock.c:734
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Le chemin '%s' n'existe pas à la révision de tête (HEAD)"
-#: libsvn_fs_fs/lock.c:739
+#: ../libsvn_fs_fs/lock.c:739
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Échec du verrouillage : il existe une version plus récente de '%s'"
-#: libsvn_fs_util/fs-util.c:96
+#: ../libsvn_fs_util/fs-util.c:96
msgid "Filesystem object has not been opened yet"
msgstr "L'objet du système de fichier n'a pas encore été ouvert"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:119
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:119
msgid "Merge Tracking schema format not set"
msgstr "Format du schéma de suivi des fusions non défini"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:124
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:124
#, c-format
msgid "Merge Tracking schema format %d not recognized"
msgstr "Format du schéma de suivi des fusions %d non reconnu"
-#: libsvn_ra/compat.c:302 libsvn_ra/compat.c:549
+#: ../libsvn_ra/compat.c:176
+#, c-format
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "Information de modification manquante pour '%s' à la révision %ld"
+
+#: ../libsvn_ra/compat.c:303 ../libsvn_ra/compat.c:550
#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "le chemin '%s' n'existe pas à la révision %ld"
-#: libsvn_ra/compat.c:379
+#: ../libsvn_ra/compat.c:380
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' à la révision %ld est un objet différent"
-#: libsvn_ra/ra_loader.c:227
+#: ../libsvn_ra/ra_loader.c:229
#, c-format
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:403 libsvn_ra_serf/serf.c:137
-#: libsvn_ra_serf/serf.c:218
+#: ../libsvn_ra/ra_loader.c:405 ../libsvn_ra_serf/serf.c:325
+#: ../libsvn_ra_serf/serf.c:408
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "URL de dépôt svn illégale '%s'"
-#: libsvn_ra/ra_loader.c:417
+#: ../libsvn_ra/ra_loader.c:419
msgid "Invalid config: unknown HTTP library"
msgstr "Configuration invalide : librairie HTTP inconnue"
-#: libsvn_ra/ra_loader.c:454
+#: ../libsvn_ra/ra_loader.c:456
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Schéma d'URL non reconnu pour '%s'"
-#: libsvn_ra/ra_loader.c:505
+#: ../libsvn_ra/ra_loader.c:507
#, 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:1112
+#: ../libsvn_ra/ra_loader.c:1178
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - gère le schéma d'URL '%s'\n"
-#: libsvn_ra/ra_loader.c:1198
+#: ../libsvn_ra/ra_loader.c:1264
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Schéma d'URL non reconnu '%s'"
#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:251
+#. ** The RA vtable routines **
+#: ../libsvn_ra_local/ra_plugin.c:394
msgid "Module for accessing a repository on local disk."
msgstr "Module d'accès à un dépôt sur un disque local."
-#: libsvn_ra_local/ra_plugin.c:291
+#: ../libsvn_ra_local/ra_plugin.c:434
msgid "Unable to open an ra_local session to URL"
msgstr "Impossible d'ouvrir une session ra_local pour l'URL"
-#: libsvn_ra_local/ra_plugin.c:1432 libsvn_ra_neon/session.c:1091
-#: libsvn_ra_serf/serf.c:872 libsvn_ra_svn/client.c:2170
+#: ../libsvn_ra_local/ra_plugin.c:466
+#, c-format
+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:1350 ../libsvn_ra_neon/session.c:766
+#: ../libsvn_ra_serf/serf.c:219 ../libsvn_ra_svn/client.c:2174
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Pas d'information à propos de la capacité '%s'"
-#: libsvn_ra_local/ra_plugin.c:1509
+#: ../libsvn_ra_local/ra_plugin.c:1427
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Version %d du chargeur RA (accès dépôt) non supporté pour ra_local"
-#: libsvn_ra_local/split_url.c:44
+#: ../libsvn_ra_local/split_url.c:44
#, c-format
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "L'URL locale '%s' ne commence pas par 'file://'"
-#: libsvn_ra_local/split_url.c:55
+#: ../libsvn_ra_local/split_url.c:55
#, c-format
msgid "Local URL '%s' contains only a hostname, no path"
msgstr "L'URL locale '%s' n'a pas de chemin, seulement un nom d'hôte"
-#: libsvn_ra_local/split_url.c:117
+#: ../libsvn_ra_local/split_url.c:117
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "L'URL locale '%s' contient un nom d'hôte non supporté"
-#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#: ../libsvn_ra_local/split_url.c:127 ../libsvn_ra_local/split_url.c:134
#, c-format
msgid "Unable to open repository '%s'"
msgstr "Le dépôt '%s' n'a pu être ouvert"
-#: libsvn_ra_neon/commit.c:244
+#: ../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)"
@@ -2881,45 +2919,45 @@
"Impossible de récupérer l'URL de la ressource versionnée (utile lors d'un "
"import ou quand manque des propriétés locales en cache)"
-#: libsvn_ra_neon/commit.c:492
+#: ../libsvn_ra_neon/commit.c:492
#, c-format
msgid "File or directory '%s' is out of date; try updating"
msgstr "Fichier ou répertoire '%s' obsolète ; mettre à jour"
-#: libsvn_ra_neon/commit.c:500
+#: ../libsvn_ra_neon/commit.c:500
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "La réponse au CHECKOUT ne contient pas l'entête 'Location:'"
-#: libsvn_ra_neon/commit.c:510 libsvn_ra_neon/props.c:210
-#: libsvn_ra_neon/util.c:518 libsvn_ra_serf/commit.c:1337
-#: libsvn_ra_serf/commit.c:1727 libsvn_ra_serf/update.c:2107
+#: ../libsvn_ra_neon/commit.c:510 ../libsvn_ra_neon/props.c:210
+#: ../libsvn_ra_neon/util.c:518 ../libsvn_ra_serf/commit.c:1337
+#: ../libsvn_ra_serf/commit.c:1727 ../libsvn_ra_serf/update.c:2107
#, c-format
msgid "Unable to parse URL '%s'"
msgstr "Impossible d'analyser l'URL '%s'"
-#: libsvn_ra_neon/commit.c:1035 libsvn_ra_serf/commit.c:1577
+#: ../libsvn_ra_neon/commit.c:1035 ../libsvn_ra_serf/commit.c:1577
#, c-format
msgid "File '%s' already exists"
msgstr "Le fichier '%s' existe déjà"
-#: libsvn_ra_neon/commit.c:1160
+#: ../libsvn_ra_neon/commit.c:1160
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Impossible d'écrire le svndiff vers un fichier temporaire"
-#: libsvn_ra_neon/fetch.c:278
+#: ../libsvn_ra_neon/fetch.c:254
msgid "Could not save the URL of the version resource"
msgstr "Impossible de sauvegarder l'URL de la ressource versionnée"
-#: libsvn_ra_neon/fetch.c:471
+#: ../libsvn_ra_neon/fetch.c:447
msgid "Could not get content-type from response"
msgstr "Impossible d'obtenir de type de contenu (content-type) de la réponse"
-#: libsvn_ra_neon/fetch.c:564
+#: ../libsvn_ra_neon/fetch.c:540
msgid "Could not save file"
msgstr "Impossible de sauvegarder le fichier"
-#: libsvn_ra_neon/fetch.c:785 libsvn_ra_svn/client.c:946
+#: ../libsvn_ra_neon/fetch.c:761 ../libsvn_ra_svn/client.c:949
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2930,53 +2968,11 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_ra_neon/fetch.c:1031
+#: ../libsvn_ra_neon/fetch.c:1007
msgid "Server response missing the expected deadprop-count property"
msgstr "La réponse du serveur ne contient pas la propriété 'deadprop-count'"
-#: libsvn_ra_neon/fetch.c:1225
-msgid "Server does not support date-based operations"
-msgstr "Le serveur n'accepte pas les opérations basées sur des dates"
-
-#: libsvn_ra_neon/fetch.c:1232
-msgid "Invalid server response to dated-rev request"
-msgstr ""
-"Réponse du serveur invalide pour une requête de révisions basées sur des "
-"dates"
-
-#: libsvn_ra_neon/fetch.c:1297
-msgid "Expected a valid revnum and path"
-msgstr "'revum' et 'path' valides attendus"
-
-#: libsvn_ra_neon/fetch.c:1379
-msgid "'get-locations' REPORT not implemented"
-msgstr "REPORT 'get-locations' non implémenté"
-
-#: libsvn_ra_neon/fetch.c:1457 libsvn_ra_serf/getlocationsegments.c:101
-#: libsvn_ra_svn/client.c:1565
-msgid "Expected valid revision range"
-msgstr "Attend un interval de révision valide"
-
-#: libsvn_ra_neon/fetch.c:1544
-msgid "'get-location-segments' REPORT not implemented"
-msgstr "REPORT 'get-location-segments' non implémenté"
-
-#: libsvn_ra_neon/fetch.c:1721
-msgid "Incomplete lock data returned"
-msgstr "Données de verrouillage incomplètes"
-
-#: libsvn_ra_neon/fetch.c:1787 libsvn_ra_serf/property.c:354
-#: libsvn_ra_serf/update.c:1864
-#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "Encodage non reconnu : '%s'"
-
-#: libsvn_ra_neon/fetch.c:1878 libsvn_ra_neon/fetch.c:1882
-#: libsvn_ra_serf/locks.c:545
-msgid "Server does not support locking features"
-msgstr "Le serveur n'accepte pas les verrous"
-
-#: libsvn_ra_neon/fetch.c:1957 libsvn_ra_serf/commit.c:2103
+#: ../libsvn_ra_neon/fetch.c:1174 ../libsvn_ra_serf/commit.c:2103
msgid ""
"DAV request failed; it's possible that the repository's pre-revprop-change "
"hook either failed or is non-existent"
@@ -2984,67 +2980,109 @@
"Échec de la requête DAV ; il est possible que la procédure automatique du "
"dépôt 'pre-revprop-change' ait échouée ou n'existe pas"
-#: libsvn_ra_neon/fetch.c:2688
+#: ../libsvn_ra_neon/fetch.c:1905
#, c-format
msgid "Error writing to '%s': unexpected EOF"
msgstr "Erreur d'écriture sur '%s' : fin de fichier (EOF) inattendue"
-#: libsvn_ra_neon/fetch.c:2835
+#: ../libsvn_ra_neon/fetch.c:2052
#, c-format
msgid "Unknown XML encoding: '%s'"
msgstr "Encodage XML inconnu : '%s'"
-#: libsvn_ra_neon/fetch.c:3122
+#: ../libsvn_ra_neon/fetch.c:2339
#, 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"
-#: libsvn_ra_neon/file_revs.c:285
+#: ../libsvn_ra_neon/file_revs.c:285
msgid "Failed to write full amount to stream"
msgstr "Échec à l'écriture du tout dans le flux"
-#: libsvn_ra_neon/file_revs.c:371
+#: ../libsvn_ra_neon/file_revs.c:371
msgid "'get-file-revs' REPORT not implemented"
msgstr "REPORT 'get-file-revs' non implémenté"
-#: libsvn_ra_neon/file_revs.c:378
+#: ../libsvn_ra_neon/file_revs.c:378
msgid "The file-revs report didn't contain any revisions"
msgstr "REPORT 'file-revs' ne contient aucune révision"
-#: libsvn_ra_neon/lock.c:189
+#: ../libsvn_ra_neon/get_dated_rev.c:147
+msgid "Server does not support date-based operations"
+msgstr "Le serveur n'accepte pas les opérations basées sur des dates"
+
+#: ../libsvn_ra_neon/get_dated_rev.c:154
+msgid "Invalid server response to dated-rev request"
+msgstr ""
+"Réponse du serveur invalide pour une requête de révisions basées sur des "
+"dates"
+
+#: ../libsvn_ra_neon/get_location_segments.c:118
+#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1568
+msgid "Expected valid revision range"
+msgstr "Attend un interval de révision valide"
+
+#: ../libsvn_ra_neon/get_location_segments.c:205
+msgid "'get-location-segments' REPORT not implemented"
+msgstr "REPORT 'get-location-segments' non implémenté"
+
+#: ../libsvn_ra_neon/get_locations.c:108
+msgid "Expected a valid revnum and path"
+msgstr "'revum' et 'path' valides attendus"
+
+#: ../libsvn_ra_neon/get_locations.c:190
+msgid "'get-locations' REPORT not implemented"
+msgstr "REPORT 'get-locations' non implémenté"
+
+#: ../libsvn_ra_neon/get_locks.c:231
+msgid "Incomplete lock data returned"
+msgstr "Données de verrouillage incomplètes"
+
+#: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:354
+#: ../libsvn_ra_serf/update.c:1864
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr "Encodage non reconnu : '%s'"
+
+#: ../libsvn_ra_neon/get_locks.c:388 ../libsvn_ra_neon/get_locks.c:392
+#: ../libsvn_ra_serf/locks.c:545
+msgid "Server does not support locking features"
+msgstr "Le serveur n'accepte pas les verrous"
+
+#: ../libsvn_ra_neon/lock.c:189
msgid "Invalid creation date header value in response."
msgstr "Entête date de création invalide dans la réponse."
-#: libsvn_ra_neon/lock.c:213
+#: ../libsvn_ra_neon/lock.c:213
msgid "Invalid timeout value"
msgstr "Expiration (timeout) invalide"
-#: libsvn_ra_neon/lock.c:252 libsvn_ra_neon/lock.c:382
+#: ../libsvn_ra_neon/lock.c:252 ../libsvn_ra_neon/lock.c:382
#, c-format
msgid "Failed to parse URI '%s'"
msgstr "Échec de l'analyse de l'URI '%s'"
-#: libsvn_ra_neon/lock.c:397 libsvn_ra_serf/locks.c:705
+#: ../libsvn_ra_neon/lock.c:397 ../libsvn_ra_serf/locks.c:705
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "'%s' n'est pas verrouillé dans le dépôt"
-#: libsvn_ra_neon/lock.c:524
+#: ../libsvn_ra_neon/lock.c:524
msgid "Failed to fetch lock information"
msgstr "Échec du chargement des information de verrouillage"
-#: libsvn_ra_neon/log.c:169 libsvn_ra_serf/log.c:210
+#: ../libsvn_ra_neon/log.c:164 ../libsvn_ra_serf/log.c:203
#, c-format
msgid "Missing name attr in revprop element"
msgstr "Attribut nom 'name' manquant dans une propriété de révision"
-#: libsvn_ra_neon/log.c:299 libsvn_ra_serf/log.c:299
-#: libsvn_ra_svn/client.c:1290
+#: ../libsvn_ra_neon/log.c:433 ../libsvn_ra_serf/log.c:533
+#: ../libsvn_ra_svn/client.c:1293
msgid "Server does not support custom revprops via log"
msgstr ""
"Le serveur n'accepte pas les propriétés de révision personnalisées via le log"
-#: libsvn_ra_neon/merge.c:218
+#: ../libsvn_ra_neon/merge.c:218
#, c-format
msgid ""
"Protocol error: we told the server not to auto-merge any resources, but it "
@@ -3053,7 +3091,7 @@
"Erreur du protocole : on dit on serveur de ne fusionner aucune ressource, "
"mais il nous dit que '%s' a été fusionnée"
-#: libsvn_ra_neon/merge.c:227
+#: ../libsvn_ra_neon/merge.c:227
#, c-format
msgid ""
"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
@@ -3062,7 +3100,7 @@
"Erreur interne : parent %d inconnu pour l'élément 'DAV:response' dans la "
"réponse au MERGE"
-#: libsvn_ra_neon/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 "
@@ -3072,17 +3110,17 @@
"renvoyé toutes les propriétés demandées et nécessaires pour finir la "
"propagation (commit)"
-#: libsvn_ra_neon/merge.c:261 libsvn_ra_serf/merge.c:302
+#: ../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 ""
"Une réponse au MERGE de '%s' n'est pas un fils de la destination ('%s')"
-#: libsvn_ra_neon/merge.c:515
+#: ../libsvn_ra_neon/merge.c:515
msgid "The MERGE property response had an error status"
msgstr "Erreur dans la réponse à la fusion (MERGE) de propriété"
-#: libsvn_ra_neon/options.c:144
+#: ../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"
@@ -3090,190 +3128,190 @@
"La réponse à OPTIONS n'inclut pas le 'activity-collection-set' demandé ; "
"Cela signifie souvent que l'URL n'est pas WebDAV"
-#: libsvn_ra_neon/props.c:598
+#: ../libsvn_ra_neon/props.c:598
#, c-format
msgid "Failed to find label '%s' for URL '%s'"
msgstr "Échec de la recherche de l'étiquette '%s' pour l'URL '%s'"
-#: libsvn_ra_neon/props.c:627
+#: ../libsvn_ra_neon/props.c:627
#, c-format
msgid "'%s' was not present on the resource"
msgstr "'%s' n'était pas présent sur la ressource"
-#: libsvn_ra_neon/props.c:670
+#: ../libsvn_ra_neon/props.c:670
#, c-format
msgid "Neon was unable to parse URL '%s'"
msgstr "Neon n'a pu analysé l'URL '%s'"
-#: libsvn_ra_neon/props.c:703
+#: ../libsvn_ra_neon/props.c:703
msgid "The path was not part of a repository"
msgstr "Le chemin ne fait pas partie d'un dépôt"
-#: libsvn_ra_neon/props.c:712 libsvn_ra_serf/property.c:681
+#: ../libsvn_ra_neon/props.c:712 ../libsvn_ra_serf/property.c:681
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
msgstr ""
"Aucune partie du chemin '%s' trouvée dans dernière révision (HEAD) du dépôt"
-#: libsvn_ra_neon/props.c:764 libsvn_ra_neon/props.c:819
+#: ../libsvn_ra_neon/props.c:764 ../libsvn_ra_neon/props.c:819
msgid "The VCC property was not found on the resource"
msgstr "La propriété VCC n'a pas été trouvée sur la ressource"
-#: libsvn_ra_neon/props.c:832
+#: ../libsvn_ra_neon/props.c:832
msgid "The relative-path property was not found on the resource"
msgstr ""
"La propriété chemin relatif (relative-path) n'a pas été trouvée sur la "
"ressource"
-#: libsvn_ra_neon/props.c:953
+#: ../libsvn_ra_neon/props.c:953
msgid "'DAV:baseline-collection' was not present on the baseline resource"
msgstr "'DAV:baseline-collection' non présente dans la ressource initiale"
-#: libsvn_ra_neon/props.c:972
+#: ../libsvn_ra_neon/props.c:972
#, c-format
msgid "'%s' was not present on the baseline resource"
msgstr "'%s' n'était pas présent sur la ressource de base"
-#: libsvn_ra_neon/props.c:1124 libsvn_ra_serf/commit.c:815
+#: ../libsvn_ra_neon/props.c:1124 ../libsvn_ra_serf/commit.c:815
msgid "At least one property change failed; repository is unchanged"
msgstr "Échec d'au moins une modification de propriété ; dépôt inchangé"
-#: libsvn_ra_neon/replay.c:272
+#: ../libsvn_ra_neon/replay.c:272
msgid "Got apply-textdelta element without preceding add-file or open-file"
msgstr "Élément 'apply-textdelta' non précédé d'un 'add-file' ou 'open-file'"
-#: libsvn_ra_neon/replay.c:296
+#: ../libsvn_ra_neon/replay.c:296
msgid "Got close-file element without preceding add-file or open-file"
msgstr "Élément 'close-file' non précédé d'un 'add-file' ou 'open-file'"
-#: libsvn_ra_neon/replay.c:313
+#: ../libsvn_ra_neon/replay.c:313
msgid "Got close-directory element without ever opening a directory"
msgstr "Élément 'close-directory' sans avoir jamais ouvert un répertoire"
-#: libsvn_ra_neon/replay.c:432 libsvn_ra_serf/replay.c:499
+#: ../libsvn_ra_neon/replay.c:432 ../libsvn_ra_serf/replay.c:499
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "Erreur d'écriture de flux : fin de fichier (EOF) inattendue"
-#: libsvn_ra_neon/replay.c:439
+#: ../libsvn_ra_neon/replay.c:439
#, c-format
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:454
+#: ../libsvn_ra_neon/session.c:454
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:458
+#: ../libsvn_ra_neon/session.c:458
msgid "Invalid URL: negative proxy port number"
msgstr "URL invalide : numéro de port du proxy négatif"
-#: libsvn_ra_neon/session.c:461
+#: ../libsvn_ra_neon/session.c:461
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:475
+#: ../libsvn_ra_neon/session.c:475
msgid "Invalid config: illegal character in timeout value"
msgstr "Configuration invalide : caractère illégal dans l'expiration (timeout)"
-#: libsvn_ra_neon/session.c:479
+#: ../libsvn_ra_neon/session.c:479
msgid "Invalid config: negative timeout value"
msgstr "Configuration invalide : expiration (timeout) négative"
-#: libsvn_ra_neon/session.c:492
+#: ../libsvn_ra_neon/session.c:492
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:517
+#: ../libsvn_ra_neon/session.c:517
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr "Configuration invalide : authentification http inconnue '%s'"
-#: libsvn_ra_neon/session.c:578
+#: ../libsvn_ra_neon/session.c:578
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:633 libsvn_ra_serf/locks.c:539
-msgid "Malformed URL for repository"
-msgstr "URL du dépôt malformée."
-
-#: libsvn_ra_neon/session.c:672
-msgid "Network socket initialization failed"
-msgstr "Échec de l'initialisation de la 'socket' réseau"
-
-#: libsvn_ra_neon/session.c:691
-msgid "SSL is not supported"
-msgstr "SSL n'est pas supporté"
-
-#: libsvn_ra_neon/session.c:832
-#, 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:950 libsvn_ra_serf/serf.c:730
-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:958
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "Mettre à jour le serveur à la version 0.19 ou mieux"
-
-#: libsvn_ra_neon/session.c:1051
+#: ../libsvn_ra_neon/session.c:726
#, 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:1098 libsvn_ra_serf/serf.c:879
+#: ../libsvn_ra_neon/session.c:773 ../libsvn_ra_serf/serf.c:226
#, 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'"
+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:1168
+#: ../libsvn_ra_neon/session.c:796 ../libsvn_ra_serf/locks.c:539
+msgid "Malformed URL for repository"
+msgstr "URL du dépôt malformée."
+
+#: ../libsvn_ra_neon/session.c:835
+msgid "Network socket initialization failed"
+msgstr "Échec de l'initialisation de la 'socket' réseau"
+
+#: ../libsvn_ra_neon/session.c:854
+msgid "SSL is not supported"
+msgstr "SSL n'est pas supporté"
+
+#: ../libsvn_ra_neon/session.c:995
+#, 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:1115 ../libsvn_ra_serf/serf.c:920
+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:1123
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "Mettre à jour le serveur à la version 0.19 ou mieux"
+
+#: ../libsvn_ra_neon/session.c:1193
#, 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"
-#: libsvn_ra_neon/util.c:203
+#: ../libsvn_ra_neon/util.c:203
msgid "The request response contained at least one error"
msgstr "La réponse à la requête contenait au moins une erreur"
-#: libsvn_ra_neon/util.c:238
+#: ../libsvn_ra_neon/util.c:238
msgid "The response contains a non-conforming HTTP status line"
msgstr "La réponse contient un état (status) HTTP non conforme"
-#: libsvn_ra_neon/util.c:248
+#: ../libsvn_ra_neon/util.c:248
#, c-format
msgid "Error setting property '%s': "
msgstr "Erreur à la définition de la propriété '%s' :"
-#: libsvn_ra_neon/util.c:532
+#: ../libsvn_ra_neon/util.c:532
#, c-format
msgid "%s of '%s'"
msgstr "%s de '%s'"
-#: libsvn_ra_neon/util.c:544
+#: ../libsvn_ra_neon/util.c:544
#, c-format
msgid "'%s' path not found"
msgstr "Chemin '%s' non trouvé"
-#: libsvn_ra_neon/util.c:553
+#: ../libsvn_ra_neon/util.c:553
#, 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:555
+#: ../libsvn_ra_neon/util.c:555
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr "Dépôt temporairement déplacé en '%s' ; merci de relocaliser"
-#: libsvn_ra_neon/util.c:563
+#: ../libsvn_ra_neon/util.c:563
#, c-format
msgid ""
"Server sent unexpected return value (%d %s) in response to %s request for '%"
@@ -3282,40 +3320,40 @@
"Le serveur a envoyé une valeur inattendue (%d %s) en réponse à la requête %s "
"pour '%s'"
-#: libsvn_ra_neon/util.c:569
+#: ../libsvn_ra_neon/util.c:569
msgid "authorization failed"
msgstr "Échec à l'autorisation"
-#: libsvn_ra_neon/util.c:573
+#: ../libsvn_ra_neon/util.c:573
msgid "could not connect to server"
msgstr "Impossible de se connecter au serveur"
-#: libsvn_ra_neon/util.c:577
+#: ../libsvn_ra_neon/util.c:577
msgid "timed out waiting for server"
msgstr "Temps expiré en attendant le serveur"
-#: libsvn_ra_neon/util.c:910
+#: ../libsvn_ra_neon/util.c:910
#, c-format
msgid "Can't calculate the request body size"
msgstr "Impossible de calculer la taille du corps de la requête"
-#: libsvn_ra_neon/util.c:1237
+#: ../libsvn_ra_neon/util.c:1237
#, c-format
msgid "Error reading spooled %s request response"
msgstr "Erreur en lisant un fichier temporaire de la réponse à la requête %s"
-#: libsvn_ra_neon/util.c:1247
+#: ../libsvn_ra_neon/util.c:1247
#, c-format
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_neon/util.c:1279
+#: ../libsvn_ra_neon/util.c:1279
#, c-format
msgid "%s request failed on '%s'"
msgstr "Échec de la requête %s sur '%s'"
-#: libsvn_ra_serf/blame.c:463 libsvn_ra_serf/serf.c:255
-#: libsvn_ra_serf/update.c:2166 libsvn_ra_serf/util.c:1176
+#: ../libsvn_ra_serf/blame.c:463 ../libsvn_ra_serf/serf.c:445
+#: ../libsvn_ra_serf/update.c:2166 ../libsvn_ra_serf/util.c:1177
msgid ""
"The OPTIONS response did not include the requested version-controlled-"
"configuration value"
@@ -3323,488 +3361,487 @@
"La réponse à OPTIONS n'inclut pas de valeur pour 'version-controlled-"
"configuration'"
-#: libsvn_ra_serf/blame.c:475
+#: ../libsvn_ra_serf/blame.c:475
msgid ""
"The OPTIONS response did not include the requested baseline-relative-path "
"value"
msgstr ""
"La réponse à OPTIONS n'inclut pas de valeur pour 'baseline-relative-path'"
-#: libsvn_ra_serf/blame.c:495 libsvn_ra_serf/commit.c:1128
-#: libsvn_ra_serf/property.c:923 libsvn_ra_serf/serf.c:271
-#: libsvn_ra_serf/update.c:1103 libsvn_ra_serf/update.c:1647
+#: ../libsvn_ra_serf/blame.c:495 ../libsvn_ra_serf/commit.c:1128
+#: ../libsvn_ra_serf/property.c:923 ../libsvn_ra_serf/serf.c:461
+#: ../libsvn_ra_serf/update.c:1103 ../libsvn_ra_serf/update.c:1647
msgid "The OPTIONS response did not include the requested checked-in value"
msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'checked-in'"
-#: libsvn_ra_serf/blame.c:522 libsvn_ra_serf/commit.c:1357
-#: libsvn_ra_serf/commit.c:1747 libsvn_ra_serf/getlocations.c:257
-#: libsvn_ra_serf/property.c:937 libsvn_ra_serf/serf.c:393
-#: libsvn_ra_serf/serf.c:629
+#: ../libsvn_ra_serf/blame.c:522 ../libsvn_ra_serf/commit.c:1357
+#: ../libsvn_ra_serf/commit.c:1747 ../libsvn_ra_serf/property.c:937
+#: ../libsvn_ra_serf/serf.c:583 ../libsvn_ra_serf/serf.c:819
msgid ""
"The OPTIONS response did not include the requested baseline-collection value"
msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'baseline-collection'"
-#: libsvn_ra_serf/commit.c:408 libsvn_ra_serf/commit.c:428
+#: ../libsvn_ra_serf/commit.c:408 ../libsvn_ra_serf/commit.c:428
#, c-format
msgid "Directory '%s' is out of date; try updating"
msgstr "Répertoire '%s' obsolète ; mettre à jour"
-#: libsvn_ra_serf/commit.c:421 libsvn_ra_serf/commit.c:504
-#: libsvn_ra_serf/commit.c:570 libsvn_repos/commit.c:386
+#: ../libsvn_ra_serf/commit.c:421 ../libsvn_ra_serf/commit.c:504
+#: ../libsvn_ra_serf/commit.c:570 ../libsvn_repos/commit.c:388
#, c-format
msgid "Path '%s' not present"
msgstr "Le chemin '%s' n'existe pas"
-#: libsvn_ra_serf/commit.c:557 libsvn_ra_serf/commit.c:577
+#: ../libsvn_ra_serf/commit.c:557 ../libsvn_ra_serf/commit.c:577
#, c-format
msgid "File '%s' is out of date; try updating"
msgstr "Fichier '%s' obsolète ; mettre à jour"
-#: libsvn_ra_serf/commit.c:1020
+#: ../libsvn_ra_serf/commit.c:1020
#, c-format
msgid "Failed writing updated file"
msgstr "Échec en écrivant un fichier modifié"
-#: libsvn_ra_serf/commit.c:1072
+#: ../libsvn_ra_serf/commit.c:1072
msgid ""
"The OPTIONS response did not include the requested activity-collection-set "
"value"
msgstr ""
"La réponse à OPTIONS n'inclut pas de valeur pour 'activity-collection-set'"
-#: libsvn_ra_serf/commit.c:1100
+#: ../libsvn_ra_serf/commit.c:1100
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s de '%s': %d %s (%s://%s)"
-#: libsvn_ra_serf/commit.c:1383
+#: ../libsvn_ra_serf/commit.c:1383
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Échec à l'ajout du répertoire : %s sur %s (%d)"
-#: libsvn_ra_serf/locks.c:408
+#: ../libsvn_ra_serf/locks.c:408
#, c-format
msgid "Lock request failed: %d %s"
msgstr "Échec de la demande de verrouillage: %d %s"
-#: libsvn_ra_serf/locks.c:631
+#: ../libsvn_ra_serf/locks.c:631
msgid "Lock request failed"
msgstr "Échec de la demande de verrou"
-#: libsvn_ra_serf/locks.c:745
+#: ../libsvn_ra_serf/locks.c:745
#, c-format
msgid "Unlock request failed: %d %s"
msgstr "Échec de la demande de déverrouillage: %d %s"
-#: libsvn_ra_serf/replay.c:161 libsvn_ra_serf/update.c:1200
+#: ../libsvn_ra_serf/replay.c:161 ../libsvn_ra_serf/update.c:1200
msgid "Missing revision attr in target-revision element"
msgstr "Attribut révision 'rev' manquant dans un élément 'target-revision'"
-#: libsvn_ra_serf/replay.c:179
+#: ../libsvn_ra_serf/replay.c:179
msgid "Missing revision attr in open-root element"
msgstr "Attribut révision 'rev' manquant dans un élément 'open-root'"
-#: libsvn_ra_serf/replay.c:198 libsvn_ra_serf/update.c:1402
+#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1402
msgid "Missing name attr in delete-entry element"
msgstr "Attribut nom 'name' manquant dans un élément 'delete-entry'"
-#: libsvn_ra_serf/replay.c:204
+#: ../libsvn_ra_serf/replay.c:204
msgid "Missing revision attr in delete-entry element"
msgstr "Attribut de révision manquant dans un élément 'delete-entry'"
-#: libsvn_ra_serf/replay.c:224 libsvn_ra_serf/update.c:1262
+#: ../libsvn_ra_serf/replay.c:224 ../libsvn_ra_serf/update.c:1262
msgid "Missing name attr in open-directory element"
msgstr "Attribut nom 'name' manquant dans un élément 'open-directory'"
-#: libsvn_ra_serf/replay.c:230 libsvn_ra_serf/update.c:1218
-#: libsvn_ra_serf/update.c:1253
+#: ../libsvn_ra_serf/replay.c:230 ../libsvn_ra_serf/update.c:1218
+#: ../libsvn_ra_serf/update.c:1253
msgid "Missing revision attr in open-directory element"
msgstr "Attribut révision 'revision' manquant dans un élément 'open-directory'"
-#: libsvn_ra_serf/replay.c:250 libsvn_ra_serf/update.c:1297
+#: ../libsvn_ra_serf/replay.c:250 ../libsvn_ra_serf/update.c:1297
msgid "Missing name attr in add-directory element"
msgstr "Attribut nom 'name' manquant dans un élément 'add-directory'"
-#: libsvn_ra_serf/replay.c:285 libsvn_ra_serf/update.c:1337
+#: ../libsvn_ra_serf/replay.c:285 ../libsvn_ra_serf/update.c:1337
msgid "Missing name attr in open-file element"
msgstr "Attribut nom 'name' manquant dans un élément 'open-file'"
-#: libsvn_ra_serf/replay.c:291 libsvn_ra_serf/update.c:1346
+#: ../libsvn_ra_serf/replay.c:291 ../libsvn_ra_serf/update.c:1346
msgid "Missing revision attr in open-file element"
msgstr "Attribut révision 'revision' manquant dans un élément 'open-file'"
-#: libsvn_ra_serf/replay.c:311 libsvn_ra_serf/update.c:1372
+#: ../libsvn_ra_serf/replay.c:311 ../libsvn_ra_serf/update.c:1372
msgid "Missing name attr in add-file element"
msgstr "Attribut nom 'name' manquant dans un élément 'add-file'"
-#: libsvn_ra_serf/replay.c:378 libsvn_ra_serf/update.c:1492
-#: libsvn_ra_serf/update.c:1569
+#: ../libsvn_ra_serf/replay.c:378 ../libsvn_ra_serf/update.c:1492
+#: ../libsvn_ra_serf/update.c:1569
#, c-format
msgid "Missing name attr in %s element"
msgstr "Attribut nom 'name' manquant dans un élément %s"
-#: libsvn_ra_serf/serf.c:54
+#: ../libsvn_ra_serf/serf.c:242
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr "Module d'accès à un dépôt via le protocole WebDAV avec serf."
-#: libsvn_ra_serf/serf.c:174
+#: ../libsvn_ra_serf/serf.c:362
#, c-format
msgid "Could not lookup hostname `%s'"
msgstr "Impossible de résoudre le nom d'hôte : `%s'"
-#: libsvn_ra_serf/serf.c:288
+#: ../libsvn_ra_serf/serf.c:478
msgid "The OPTIONS response did not include the requested version-name value"
msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'version-name'"
-#: libsvn_ra_serf/serf.c:452
+#: ../libsvn_ra_serf/serf.c:642
msgid "The OPTIONS response did not include the requested resourcetype value"
msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'resourcetype'"
-#: libsvn_ra_serf/serf.c:943
+#: ../libsvn_ra_serf/serf.c:984
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Version %d du chargeur RA (accès dépôt) non supportée pour ra_serf"
-#: libsvn_ra_serf/update.c:1433
+#: ../libsvn_ra_serf/update.c:1433
msgid "Missing name attr in absent-directory element"
msgstr "Attribut nom 'name' manquant dans un élément 'absent-directory'"
-#: libsvn_ra_serf/update.c:1456
+#: ../libsvn_ra_serf/update.c:1456
msgid "Missing name attr in absent-file element"
msgstr "Attribut nom 'name' manquant dans un élément 'absent-directory'"
-#: libsvn_ra_serf/update.c:2237
+#: ../libsvn_ra_serf/update.c:2237
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Erreur à la récupération du REPORT (%d)"
-#: libsvn_ra_serf/util.c:963
+#: ../libsvn_ra_serf/util.c:964
msgid "Premature EOF seen from server"
msgstr "Fin de fichier (EOF) prématurée rencontrée sur le serveur"
-#: libsvn_ra_serf/util.c:1013
+#: ../libsvn_ra_serf/util.c:1014
msgid "Unspecified error message"
msgstr "Message d'erreur non spécifié"
-#: libsvn_ra_svn/client.c:133
+#: ../libsvn_ra_svn/client.c:133
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Nom d'hôte inconnu '%s'"
-#: libsvn_ra_svn/client.c:145
+#: ../libsvn_ra_svn/client.c:145
#, c-format
msgid "Can't create socket"
msgstr "Impossible de créer un 'socket'"
-#: libsvn_ra_svn/client.c:149
+#: ../libsvn_ra_svn/client.c:149
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Impossible de se connecter à l'hôte '%s'"
-#: libsvn_ra_svn/client.c:172
+#: ../libsvn_ra_svn/client.c:172
msgid "Prop diffs element not a list"
msgstr "L'élément 'prop diffs' n'est pas une liste"
-#: libsvn_ra_svn/client.c:210
+#: ../libsvn_ra_svn/client.c:210
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Type de noeud '%s' non reconnu retourné par le serveur"
-#: libsvn_ra_svn/client.c:374
+#: ../libsvn_ra_svn/client.c:374
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Schéma de tunnel '%s' non définit"
-#: libsvn_ra_svn/client.c:391
+#: ../libsvn_ra_svn/client.c:391
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Le schéma de tunnel '%s' requiert la variable d'environnement %s"
-#: libsvn_ra_svn/client.c:402
+#: ../libsvn_ra_svn/client.c:402
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Impossible de découper la commande '%s'"
-#: libsvn_ra_svn/client.c:433
+#: ../libsvn_ra_svn/client.c:433
#, c-format
msgid "Error in child process: %s"
msgstr "Erreur du processus fils : %s"
-#: libsvn_ra_svn/client.c:457
+#: ../libsvn_ra_svn/client.c:457
#, c-format
msgid "Can't create tunnel"
msgstr "Impossible de créer le tunnel"
-#: libsvn_ra_svn/client.c:495
+#: ../libsvn_ra_svn/client.c:495
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "URL de dépôt svn illégale '%s'"
-#: libsvn_ra_svn/client.c:554
+#: ../libsvn_ra_svn/client.c:554
#, c-format
msgid "Server requires minimum version %d"
msgstr "Le serveur requiert au minimum la version %d"
-#: libsvn_ra_svn/client.c:558
+#: ../libsvn_ra_svn/client.c:558
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Le serveur ne supporte les versions que jusqu'à la %d"
-#: libsvn_ra_svn/client.c:566
+#: ../libsvn_ra_svn/client.c:566
msgid "Server does not support edit pipelining"
msgstr "Le serveur n'accepte pas l'édition en file"
-#: libsvn_ra_svn/client.c:592
+#: ../libsvn_ra_svn/client.c:595
msgid "Impossibly long repository root from server"
msgstr "Racine du dépôt du serveur trop longue"
-#: libsvn_ra_svn/client.c:603
+#: ../libsvn_ra_svn/client.c:606
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Module d'accès à un dépôt avec le protocole réseau propre de svn."
-#: libsvn_ra_svn/client.c:763
+#: ../libsvn_ra_svn/client.c:766
msgid "Server did not send repository root"
msgstr "Le serveur n'a pas envoyé la racine du dépôt"
-#: libsvn_ra_svn/client.c:836
+#: ../libsvn_ra_svn/client.c:839
msgid ""
"Server doesn't support setting arbitrary revision properties during commit"
msgstr ""
"Le serveur ne peut pas définir des propriétés de révision arbitraires lors "
"de la propagation (commit)"
-#: libsvn_ra_svn/client.c:924
+#: ../libsvn_ra_svn/client.c:927
msgid "Non-string as part of file contents"
msgstr "Partie non chaîne comme contenu de fichier"
-#: libsvn_ra_svn/client.c:1025
+#: ../libsvn_ra_svn/client.c:1028
msgid "Dirlist element not a list"
msgstr "L'élément 'dirlist' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1086
+#: ../libsvn_ra_svn/client.c:1089
msgid "Merge info element is not a list"
msgstr "L'élément d'information de fusion n'est pas une liste"
-#: libsvn_ra_svn/client.c:1279
+#: ../libsvn_ra_svn/client.c:1282
msgid "Log entry not a list"
msgstr "L'entrée 'log' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1314
+#: ../libsvn_ra_svn/client.c:1317
msgid "Changed-path entry not a list"
msgstr "L'entrée 'changed-path' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1430
+#: ../libsvn_ra_svn/client.c:1433
msgid "'stat' not implemented"
msgstr "'stat' non implémenté"
-#: libsvn_ra_svn/client.c:1487
+#: ../libsvn_ra_svn/client.c:1490
msgid "'get-locations' not implemented"
msgstr "'get-locations' non implémenté"
-#: libsvn_ra_svn/client.c:1499
+#: ../libsvn_ra_svn/client.c:1502
msgid "Location entry not a list"
msgstr "L'entrée 'location' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1544
+#: ../libsvn_ra_svn/client.c:1547
msgid "'get-location-segments' not implemented"
msgstr "'get-location-segments' non implémenté"
-#: libsvn_ra_svn/client.c:1556
+#: ../libsvn_ra_svn/client.c:1559
msgid "Location segment entry not a list"
msgstr "L'entrée 'location segment' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1618
+#: ../libsvn_ra_svn/client.c:1621
msgid "'get-file-revs' not implemented"
msgstr "'get-file-revs' non implémenté"
-#: libsvn_ra_svn/client.c:1631
+#: ../libsvn_ra_svn/client.c:1634
msgid "Revision entry not a list"
msgstr "L'entrée 'revision' n'est pas une liste"
-#: libsvn_ra_svn/client.c:1648 libsvn_ra_svn/client.c:1673
+#: ../libsvn_ra_svn/client.c:1651 ../libsvn_ra_svn/client.c:1676
msgid "Text delta chunk not a string"
msgstr "La différence de texte n'est pas une chaîne de caractères"
-#: libsvn_ra_svn/client.c:1685
+#: ../libsvn_ra_svn/client.c:1688
msgid "The get-file-revs command didn't return any revisions"
msgstr "La commande 'get-file-revs' n'a retourné aucune révision"
-#: libsvn_ra_svn/client.c:1733
+#: ../libsvn_ra_svn/client.c:1736
msgid "Server doesn't support the lock command"
msgstr "Commande lock non supportée par le serveur"
-#: libsvn_ra_svn/client.c:1797
+#: ../libsvn_ra_svn/client.c:1800
msgid "Server doesn't support the unlock command"
msgstr "Commande unlock non supportée par le serveur"
-#: libsvn_ra_svn/client.c:1894
+#: ../libsvn_ra_svn/client.c:1897
msgid "Lock response not a list"
msgstr "La réponse au verrouillage (lock) n'est pas une liste"
-#: libsvn_ra_svn/client.c:1908
+#: ../libsvn_ra_svn/client.c:1911
msgid "Unknown status for lock command"
msgstr "État inconnu pour la commande de verrouillage (lock)"
-#: libsvn_ra_svn/client.c:1930
+#: ../libsvn_ra_svn/client.c:1933
msgid "Didn't receive end marker for lock responses"
msgstr "Aucun marqueur de fin reçu dans les réponses aux verrouillages"
-#: libsvn_ra_svn/client.c:2017
+#: ../libsvn_ra_svn/client.c:2020
msgid "Unlock response not a list"
msgstr "La réponse au déverrouillage n'est pas une liste"
-#: libsvn_ra_svn/client.c:2031
+#: ../libsvn_ra_svn/client.c:2034
msgid "Unknown status for unlock command"
msgstr "État inconnu pour la commande de déverrouillage (unlock)"
-#: libsvn_ra_svn/client.c:2052
+#: ../libsvn_ra_svn/client.c:2055
msgid "Didn't receive end marker for unlock responses"
msgstr "Aucun marqueur de fin reçu dans les réponses aux déverrouillages"
-#: libsvn_ra_svn/client.c:2076 libsvn_ra_svn/client.c:2104
+#: ../libsvn_ra_svn/client.c:2079 ../libsvn_ra_svn/client.c:2107
msgid "Server doesn't support the get-lock command"
msgstr "Le serveur ne supporte pas la commande 'get-lock'"
-#: libsvn_ra_svn/client.c:2117
+#: ../libsvn_ra_svn/client.c:2120
msgid "Lock element not a list"
msgstr "L'élément 'lock' n'est pas une liste"
-#: libsvn_ra_svn/client.c:2140
+#: ../libsvn_ra_svn/client.c:2143
msgid "Server doesn't support the replay command"
msgstr "Le serveur ne supporte pas la commande 'replay'"
-#: libsvn_ra_svn/client.c:2233
+#: ../libsvn_ra_svn/client.c:2237
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Version %d du chargeur RA (accès dépôt) non supporté pour ra_svn"
-#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/cyrus_auth.c:441 libsvn_ra_svn/cyrus_auth.c:488
-#: 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:441 ../libsvn_ra_svn/cyrus_auth.c:488
+#: ../libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Réponse inattendue du serveur lors de l'authentification"
-#: 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:104
+#: ../svnserve/cyrus_auth.c:114
#, c-format
msgid "Could not initialize the SASL library"
msgstr "Impossible d'initialiser la librairie SASL"
-#: libsvn_ra_svn/cyrus_auth.c:811 libsvn_ra_svn/internal_auth.c:57
-#: libsvn_ra_svn/internal_auth.c:108
+#: ../libsvn_ra_svn/cyrus_auth.c:811 ../libsvn_ra_svn/internal_auth.c:57
+#: ../libsvn_ra_svn/internal_auth.c:108
#, c-format
msgid "Authentication error from server: %s"
msgstr "Erreur d'authentification du serveur : %s"
-#: libsvn_ra_svn/cyrus_auth.c:815
+#: ../libsvn_ra_svn/cyrus_auth.c:815
msgid "Can't get username or password"
msgstr "Impossible d'obtenir le login ou le mot de passe"
-#: libsvn_ra_svn/editorp.c:129
+#: ../libsvn_ra_svn/editorp.c:129
msgid "Successful edit status returned too soon"
msgstr "Retour positif prématuré de l'édition"
-#: libsvn_ra_svn/editorp.c:456
+#: ../libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Élément fichier ou répertoire invalide durant une édition"
-#: libsvn_ra_svn/editorp.c:665
+#: ../libsvn_ra_svn/editorp.c:665
msgid "Apply-textdelta already active"
msgstr "'Apply-textdelta' en cours"
-#: 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' non actif"
-#: libsvn_ra_svn/editorp.c:800
+#: ../libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "La commande 'finish-replay' est invalide hors des rejous (replay)"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:907
+#: ../libsvn_ra_svn/editorp.c:891 ../libsvn_ra_svn/marshal.c:907
#, c-format
msgid "Unknown command '%s'"
msgstr "Commande '%s' inconnue"
-#: libsvn_ra_svn/internal_auth.c:95 libsvn_subr/prompt.c:156
+#: ../libsvn_ra_svn/internal_auth.c:95 ../libsvn_subr/prompt.c:156
#, c-format
msgid "Can't get password"
msgstr "Impossible d'obtenir le mot de passe"
-#: libsvn_ra_svn/marshal.c:86
+#: ../libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "L'entrée 'capability' (capacité) n'est pas un mot"
-#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
-#: libsvn_ra_svn/streams.c:155
+#: ../libsvn_ra_svn/marshal.c:253 ../libsvn_ra_svn/streams.c:80
+#: ../libsvn_ra_svn/streams.c:155
msgid "Connection closed unexpectedly"
msgstr "Connexion fermée de façon inattendue"
-#: libsvn_ra_svn/marshal.c:537
+#: ../libsvn_ra_svn/marshal.c:537
msgid "String length larger than maximum"
msgstr "Longueur de chaîne supérieure au maximum"
-#: libsvn_ra_svn/marshal.c:574
+#: ../libsvn_ra_svn/marshal.c:574
msgid "Too many nested items"
msgstr "Trop d'éléments imbriqués"
-#: libsvn_ra_svn/marshal.c:593
+#: ../libsvn_ra_svn/marshal.c:593
msgid "Number is larger than maximum"
msgstr "Nombre supérieur au maximum"
-#: libsvn_ra_svn/marshal.c:807
+#: ../libsvn_ra_svn/marshal.c:807
msgid "Proplist element not a list"
msgstr "L'élément 'proplist' n'est pas une liste"
-#: libsvn_ra_svn/marshal.c:830
+#: ../libsvn_ra_svn/marshal.c:830
msgid "Empty error list"
msgstr "Liste d'erreurs vide"
-#: libsvn_ra_svn/marshal.c:839
+#: ../libsvn_ra_svn/marshal.c:839
msgid "Malformed error list"
msgstr "Liste d'erreurs malformée"
-#: libsvn_ra_svn/marshal.c:878
+#: ../libsvn_ra_svn/marshal.c:878
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Statut '%s' inconnu dans la réponse"
-#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
+#: ../libsvn_ra_svn/streams.c:77 ../libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
msgstr "Impossible de lire de la connexion"
-#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
+#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:166
#, c-format
msgid "Can't write to connection"
msgstr "Impossible d'écrire sur la connexion"
-#: libsvn_ra_svn/streams.c:144
+#: ../libsvn_ra_svn/streams.c:144
#, c-format
msgid "Can't get socket timeout"
msgstr "Impossible d'obtenir un 'socket timeout'"
-#: libsvn_repos/commit.c:127
+#: ../libsvn_repos/commit.c:127
#, c-format
msgid "Directory '%s' is out of date"
msgstr "Répertoire '%s' obsolète"
-#: libsvn_repos/commit.c:128
+#: ../libsvn_repos/commit.c:128
#, c-format
msgid "File '%s' is out of date"
msgstr "Fichier '%s' obsolète"
-#: libsvn_repos/commit.c:294 libsvn_repos/commit.c:439
+#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Chemin source mais pas de révision source pour '%s'"
-#: libsvn_repos/commit.c:326 libsvn_repos/commit.c:470
+#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "L'URL source '%s' concerne un dépôt différent"
-#: libsvn_repos/commit.c:595
+#: ../libsvn_repos/commit.c:597
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3817,15 +3854,15 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_repos/delta.c:188
+#: ../libsvn_repos/delta.c:188
msgid "Unable to open root of edit"
msgstr "Impossible d'ouvrir la racine de l'édition"
-#: libsvn_repos/delta.c:239
+#: ../libsvn_repos/delta.c:239
msgid "Invalid target path"
msgstr "Chemin cible invalide"
-#: libsvn_repos/delta.c:265
+#: ../libsvn_repos/delta.c:265
msgid ""
"Invalid editor anchoring; at least one of the input paths is not a directory "
"and there was no source entry"
@@ -3833,7 +3870,7 @@
"Ancrage d'éditeur invalide ; au moins un des chemins en entrée n'est pas un "
"répertoire et il y'a a pas d'entrée source"
-#: libsvn_repos/dump.c:415
+#: ../libsvn_repos/dump.c:415
#, c-format
msgid ""
"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
@@ -3844,33 +3881,33 @@
"ATTENTION : plus ancienne révision déchargée (%ld). Charger cette \n"
"ATTENTION : sauvegarde dans un dépôt vide échouera.\n"
-#: libsvn_repos/dump.c:953
+#: ../libsvn_repos/dump.c:953
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
msgstr "La révision de début %ld est plus grande que celle de fin %ld"
-#: libsvn_repos/dump.c:958
+#: ../libsvn_repos/dump.c:958
#, c-format
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "Révision de fin %ld invalide (la révision la plus récente est %ld)"
-#: libsvn_repos/dump.c:1065
+#: ../libsvn_repos/dump.c:1065
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* Révision %ld déchargée.\n"
-#: libsvn_repos/dump.c:1066
+#: ../libsvn_repos/dump.c:1066
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* Révision %ld vérifiée.\n"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1284
+#: ../libsvn_repos/fs-wrap.c:57 ../libsvn_repos/load.c:1284
msgid "Commit succeeded, but post-commit hook failed"
msgstr ""
"Succès de la propagation (commit), mais échec de la procédure d'après "
"propagation (post-commit hook)"
-#: libsvn_repos/fs-wrap.c:183
+#: ../libsvn_repos/fs-wrap.c:157
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3879,41 +3916,41 @@
"La sauvegarde de la propriété irrégulière '%s' est désactivé dans ce dépôt "
"et peut indiquer un bogue de votre client"
-#: libsvn_repos/fs-wrap.c:260
+#: ../libsvn_repos/fs-wrap.c:253
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Écriture refusée : non autorisé à lire toute la révision %ld"
-#: libsvn_repos/fs-wrap.c:464
+#: ../libsvn_repos/fs-wrap.c:457
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"Impossible de déverrouiller le chemin '%s' ; pas de nom d'utilisateur "
"authentifié"
-#: libsvn_repos/fs-wrap.c:478
+#: ../libsvn_repos/fs-wrap.c:471
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr ""
"Succès du déverrouillage (unlock), mais échec de la procédure d'après "
"déverrouillage (post-unlock hook)"
-#: libsvn_repos/hooks.c:87
+#: ../libsvn_repos/hooks.c:87
#, c-format
msgid "'%s' hook succeeded, but error output could not be read"
msgstr ""
"La procédure automatique (hook) '%s' a fonctionné, mais les messages "
"d'erreur n'ont pu être lu"
-#: libsvn_repos/hooks.c:102
+#: ../libsvn_repos/hooks.c:102
msgid "[Error output could not be translated from the native locale to UTF-8.]"
msgstr ""
"[La sortie d'erreur ne peut être convertie de l'encodage local vers UTF-8.]"
-#: libsvn_repos/hooks.c:107
+#: ../libsvn_repos/hooks.c:107
msgid "[Error output could not be read.]"
msgstr "[La sortie d'erreur n'a pu être lue.]"
-#: libsvn_repos/hooks.c:116
+#: ../libsvn_repos/hooks.c:116
#, c-format
msgid ""
"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
@@ -3922,76 +3959,76 @@
"Échec de la procédure automatique (hook) '%s' (sortie pas très propre : "
"apr_exit_why_e %d, état de sortie %d). "
-#: libsvn_repos/hooks.c:123
+#: ../libsvn_repos/hooks.c:123
#, c-format
msgid "'%s' hook failed (exited with a non-zero exitcode of %d). "
msgstr "Échec de la procédure automatique '%s' (code de sortie %d). "
-#: libsvn_repos/hooks.c:130
+#: ../libsvn_repos/hooks.c:130
msgid "The following error output was produced by the hook:\n"
msgstr "Le message d'erreur suivant a été produit par la procédure :\n"
-#: libsvn_repos/hooks.c:137
+#: ../libsvn_repos/hooks.c:137
msgid "No error output was produced by the hook."
msgstr "Aucun message d'erreur n'a été produit par la procédure."
-#: libsvn_repos/hooks.c:170
+#: ../libsvn_repos/hooks.c:170
#, c-format
msgid "Can't create pipe for hook '%s'"
msgstr "Impossible de créer un tuyau (pipe) pour la procédure '%s'"
-#: libsvn_repos/hooks.c:182
+#: ../libsvn_repos/hooks.c:182
#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
msgstr ""
"Impossible de faire un tuyau (pipe) en lecture non hérité pour la procédure "
"'%s'"
-#: libsvn_repos/hooks.c:188
+#: ../libsvn_repos/hooks.c:188
#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
msgstr ""
"Impossible de faire un tuyau (pipe) en écriture non hérité pour la procédure "
"'%s'"
-#: libsvn_repos/hooks.c:197
+#: ../libsvn_repos/hooks.c:197
#, c-format
msgid "Can't create null stdout for hook '%s'"
msgstr ""
"Impossible de créer une sortie standard (stdout) nulle pour la procédure '%s'"
-#: libsvn_repos/hooks.c:209
+#: ../libsvn_repos/hooks.c:209
#, c-format
msgid "Error closing write end of stderr pipe"
msgstr ""
"Erreur à la fermeture du côté écriture du tuyau d'erreur standard (stderr "
"pipe)"
-#: libsvn_repos/hooks.c:214
+#: ../libsvn_repos/hooks.c:214
#, c-format
msgid "Failed to start '%s' hook"
msgstr "Échec au lancement de la procédure automatique (hook) '%s'"
-#: libsvn_repos/hooks.c:227
+#: ../libsvn_repos/hooks.c:227
#, c-format
msgid "Error closing read end of stderr pipe"
msgstr ""
"Erreur à la fermeture du côté lecture du tuyau d'erreur standard (stderr "
"pipe)"
-#: libsvn_repos/hooks.c:231
+#: ../libsvn_repos/hooks.c:231
#, c-format
msgid "Error closing null file"
msgstr "Erreur à la fermeture du fichier 'null'"
-#: libsvn_repos/hooks.c:533
+#: ../libsvn_repos/hooks.c:533
#, c-format
msgid "Failed to run '%s' hook; broken symlink"
msgstr ""
"Échec à l'exécution de la procédure automatique (hook) '%s' ; mauvais liens "
"symboliques"
-#: libsvn_repos/hooks.c:677
+#: ../libsvn_repos/hooks.c:684
msgid ""
"Repository has not been enabled to accept revision propchanges;\n"
"ask the administrator to create a pre-revprop-change hook"
@@ -4000,62 +4037,62 @@
"de révision ; parler à l'administrateur de la procédure automatique (hook) "
"pre-revprop-change"
-#: libsvn_repos/load.c:121
+#: ../libsvn_repos/load.c:121
msgid "Premature end of content data in dumpstream"
msgstr "Fin prématurée des données dans le flux de sauvegarde"
-#: libsvn_repos/load.c:128
+#: ../libsvn_repos/load.c:128
msgid "Dumpstream data appears to be malformed"
msgstr "Donnée du flux de sauvegarde malformée"
-#: libsvn_repos/load.c:177
+#: ../libsvn_repos/load.c:177
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
msgstr ""
"Le flux de sauvegarde contient une entête mal formée (sans ':') à '%.20s'"
-#: libsvn_repos/load.c:190
+#: ../libsvn_repos/load.c:190
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
msgstr ""
"Le flux de sauvegarde contient une entête mal formée (sans valeur) à '%.20s'"
-#: libsvn_repos/load.c:304
+#: ../libsvn_repos/load.c:304
msgid "Incomplete or unterminated property block"
msgstr "Block de propriété incomplet ou pas terminé"
-#: libsvn_repos/load.c:442
+#: ../libsvn_repos/load.c:442
msgid "Unexpected EOF writing contents"
msgstr "Fin de fichier (EOF) inattendue pendant l'écriture"
-#: libsvn_repos/load.c:471
+#: ../libsvn_repos/load.c:471
msgid "Malformed dumpfile header"
msgstr "Entête de fichier de sauvegarde malformée"
-#: libsvn_repos/load.c:477 libsvn_repos/load.c:519
+#: ../libsvn_repos/load.c:477 ../libsvn_repos/load.c:519
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "Version %d du fichier de sauvegarde non supportée"
-#: libsvn_repos/load.c:622
+#: ../libsvn_repos/load.c:622
msgid "Unrecognized record type in stream"
msgstr "Type d'enregistrement inconnu dans le flux"
-#: libsvn_repos/load.c:734
+#: ../libsvn_repos/load.c:734
msgid "Sum of subblock sizes larger than total block content length"
msgstr "Somme des tailles des sous blocs plus grand que la taille totale"
-#: libsvn_repos/load.c:927
+#: ../libsvn_repos/load.c:927
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< Début d'une nouvelle transaction basée sur la révision %ld\n"
-#: libsvn_repos/load.c:972
+#: ../libsvn_repos/load.c:972
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr "Révision de source relative %ld non disponible dans le dépôt courant"
-#: libsvn_repos/load.c:989
+#: ../libsvn_repos/load.c:989
#, c-format
msgid ""
"Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -4068,42 +4105,42 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_repos/load.c:1042
+#: ../libsvn_repos/load.c:1042
msgid "Malformed dumpstream: Revision 0 must not contain node records"
msgstr ""
"Flux de sauvegarde mal formé : la révision 0 ne doit pas contenir "
"d'enregistrements de noeud"
-#: libsvn_repos/load.c:1052
+#: ../libsvn_repos/load.c:1052
#, c-format
msgid " * editing path : %s ..."
msgstr " * édition de : %s ..."
-#: libsvn_repos/load.c:1059
+#: ../libsvn_repos/load.c:1059
#, c-format
msgid " * deleting path : %s ..."
msgstr " * suppression de : %s ..."
-#: libsvn_repos/load.c:1067
+#: ../libsvn_repos/load.c:1067
#, c-format
msgid " * adding path : %s ..."
msgstr " * ajout de : %s ..."
-#: libsvn_repos/load.c:1076
+#: ../libsvn_repos/load.c:1076
#, c-format
msgid " * replacing path : %s ..."
msgstr " * remplacement de : %s ..."
-#: libsvn_repos/load.c:1086
+#: ../libsvn_repos/load.c:1086
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "'node-action' inconnu sur le noeud '%s'"
-#: libsvn_repos/load.c:1231
+#: ../libsvn_repos/load.c:1231
msgid " done.\n"
msgstr " fait.\n"
-#: libsvn_repos/load.c:1308
+#: ../libsvn_repos/load.c:1308
#, c-format
msgid ""
"\n"
@@ -4114,7 +4151,7 @@
"------- Révision %ld propagée (commit) >>>\n"
"\n"
-#: libsvn_repos/load.c:1314
+#: ../libsvn_repos/load.c:1314
#, c-format
msgid ""
"\n"
@@ -4125,477 +4162,477 @@
"------- Nouvelle révision %ld propagée (commit), basée sur révision %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' non trouvé dans le système de fichiers"
-#: libsvn_repos/replay.c:387
+#: ../libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr ""
"Le chemin '%s' n'est ni un fichier ni un répertoire dans le système de "
"fichiers"
-#: libsvn_repos/reporter.c:230
+#: ../libsvn_repos/reporter.c:230
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Profondeur invalide (%s) pour le chemin '%s'"
-#: libsvn_repos/reporter.c:753
+#: ../libsvn_repos/reporter.c:753
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Le chemin de copie de travail '%s' n'existe pas dans le dépôt"
-#: libsvn_repos/reporter.c:1106
+#: ../libsvn_repos/reporter.c:1106
msgid "Not authorized to open root of edit operation"
msgstr "Non autorisé à ouvrir la racine de l'opération d'édition"
-#: libsvn_repos/reporter.c:1125
+#: ../libsvn_repos/reporter.c:1125
msgid "Target path does not exist"
msgstr "Le chemin cible n'existe pas"
-#: libsvn_repos/reporter.c:1132
+#: ../libsvn_repos/reporter.c:1132
msgid "Cannot replace a directory from within"
msgstr "On ne peut remplacer un répertoire de l'intérieur de ce répertoire"
-#: libsvn_repos/reporter.c:1176
+#: ../libsvn_repos/reporter.c:1176
msgid "Invalid report for top level of working copy"
msgstr "Rapport invalide pour le sommet de la copie de travail"
-#: libsvn_repos/reporter.c:1191
+#: ../libsvn_repos/reporter.c:1191
msgid "Two top-level reports with no target"
msgstr "Deux rapports au sommet sans aucune cible"
-#: libsvn_repos/reporter.c:1224
+#: ../libsvn_repos/reporter.c:1224
#, c-format
msgid "Unsupported report depth '%s'"
msgstr "Profondeur de rapport non supportée '%s'"
-#: libsvn_repos/repos.c:178
+#: ../libsvn_repos/repos.c:179
#, c-format
msgid "'%s' exists and is non-empty"
msgstr "'%s' existe et n'est pas vide"
-#: libsvn_repos/repos.c:224
+#: ../libsvn_repos/repos.c:225
msgid "Creating db logs lock file"
msgstr "Création du fichier de verrouillage du journal db"
-#: libsvn_repos/repos.c:242
+#: ../libsvn_repos/repos.c:243
msgid "Creating db lock file"
msgstr "Création du fichier de verrouillage db"
-#: libsvn_repos/repos.c:252
+#: ../libsvn_repos/repos.c:253
msgid "Creating lock dir"
msgstr "Création du répertoire des verrous (locks)"
-#: libsvn_repos/repos.c:283
+#: ../libsvn_repos/repos.c:284
msgid "Creating hook directory"
msgstr "Création du répertoire des procédures automatiques (hooks)"
-#: libsvn_repos/repos.c:346
+#: ../libsvn_repos/repos.c:360
msgid "Creating start-commit hook"
msgstr "Création de la procédure de début de propagation (start-commit)"
-#: libsvn_repos/repos.c:425
+#: ../libsvn_repos/repos.c:439
msgid "Creating pre-commit hook"
msgstr "Création de la procédure d'avant propagation (pre-commit)"
-#: libsvn_repos/repos.c:501
+#: ../libsvn_repos/repos.c:515
msgid "Creating pre-revprop-change hook"
msgstr ""
"Création de la procédure d'avant modification des propriétés de révision "
"(pre-revprop-change)"
-#: libsvn_repos/repos.c:721
+#: ../libsvn_repos/repos.c:735
msgid "Creating post-commit hook"
msgstr "Création de la procédure d'après propagation (post-commit)"
-#: libsvn_repos/repos.c:907
+#: ../libsvn_repos/repos.c:921
msgid "Creating post-revprop-change hook"
msgstr ""
"Création de la procédure d'après modification des propriétés de révision "
"(post-revprop-change)"
-#: libsvn_repos/repos.c:917
+#: ../libsvn_repos/repos.c:931
msgid "Creating conf directory"
msgstr "Création du répertoire de configuration (conf)"
-#: libsvn_repos/repos.c:975
+#: ../libsvn_repos/repos.c:989
msgid "Creating svnserve.conf file"
msgstr "Création du fichier 'svnserve.conf'"
-#: libsvn_repos/repos.c:993
+#: ../libsvn_repos/repos.c:1007
msgid "Creating passwd file"
msgstr "Création du fichier de mot de passe 'passwd'"
-#: libsvn_repos/repos.c:1035
+#: ../libsvn_repos/repos.c:1049
msgid "Creating authz file"
msgstr "Création du fichier d'autorisations 'authz'"
-#: libsvn_repos/repos.c:1068
+#: ../libsvn_repos/repos.c:1082
msgid "Could not create top-level directory"
msgstr "Impossible de créer le répertoire de niveau supérieur"
-#: libsvn_repos/repos.c:1080
+#: ../libsvn_repos/repos.c:1094
msgid "Creating DAV sandbox dir"
msgstr "Création du répertoire d'isolation DAV (dav)"
-#: libsvn_repos/repos.c:1151
+#: ../libsvn_repos/repos.c:1165
msgid "Error opening db lockfile"
msgstr "Erreur à l'ouverture du fichier de verrou db"
-#: libsvn_repos/repos.c:1188
+#: ../libsvn_repos/repos.c:1202
msgid "Repository creation failed"
msgstr "Échec de la création du dépôt"
-#: libsvn_repos/repos.c:1269
+#: ../libsvn_repos/repos.c:1283
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Format de stockage attendu '%d' ou '%d'; format trouvé '%d'"
-#: libsvn_repos/rev_hunt.c:79
+#: ../libsvn_repos/rev_hunt.c:79
#, c-format
msgid "Failed to find time on revision %ld"
msgstr "Impossible de trouver l'heure de la révision %ld"
-#: libsvn_repos/rev_hunt.c:234 libsvn_repos/rev_hunt.c:349
+#: ../libsvn_repos/rev_hunt.c:234 ../libsvn_repos/rev_hunt.c:349
#, c-format
msgid "Invalid start revision %ld"
msgstr "Révision de départ %ld invalide"
-#: libsvn_repos/rev_hunt.c:238 libsvn_repos/rev_hunt.c:353
+#: ../libsvn_repos/rev_hunt.c:238 ../libsvn_repos/rev_hunt.c:353
#, c-format
msgid "Invalid end revision %ld"
msgstr "Révision de fin %ld invalide"
-#: libsvn_repos/rev_hunt.c:542
+#: ../libsvn_repos/rev_hunt.c:542
msgid "Unreadable path encountered; access denied"
msgstr "Chemin illisible rencontré, accès refusé"
-#: libsvn_repos/rev_hunt.c:1144
+#: ../libsvn_repos/rev_hunt.c:1115
#, c-format
msgid "'%s' is not a file in revision %ld"
msgstr "'%s' n'est pas un fichier à la révision %ld"
-#: libsvn_subr/cmdline.c:502
+#: ../libsvn_subr/cmdline.c:502
#, c-format
msgid "Error initializing command line arguments"
msgstr "Erreur à l'initialisation des arguments de la ligne de commande"
-#: libsvn_subr/config.c:633
+#: ../libsvn_subr/config.c:633
#, c-format
msgid "Config error: invalid boolean value '%s'"
msgstr "Erreur de configuration : valeur booléenne invalide '%s'"
-#: libsvn_subr/config.c:883
+#: ../libsvn_subr/config.c:883
#, c-format
msgid "Config error: invalid integer value '%s'"
msgstr "Erreur de configuration : valeur entière invalide '%s'"
-#: libsvn_subr/config_auth.c:94
+#: ../libsvn_subr/config_auth.c:94
msgid "Unable to open auth file for reading"
msgstr "Impossible d'ouvrir le fichier d'authentification en lecture"
-#: libsvn_subr/config_auth.c:99
+#: ../libsvn_subr/config_auth.c:99
#, c-format
msgid "Error parsing '%s'"
msgstr "Erreur de syntaxe '%s'"
-#: libsvn_subr/config_auth.c:123
+#: ../libsvn_subr/config_auth.c:123
msgid "Unable to locate auth file"
msgstr "Impossible de localiser le fichier d'authentification"
-#: libsvn_subr/config_auth.c:134
+#: ../libsvn_subr/config_auth.c:134
msgid "Unable to open auth file for writing"
msgstr "Impossible d'ouvrir le fichier d'authentification en écriture"
-#: libsvn_subr/config_auth.c:137
+#: ../libsvn_subr/config_auth.c:137
#, c-format
msgid "Error writing hash to '%s'"
msgstr "Erreur à l'écriture le hash dans '%s'"
-#: libsvn_subr/date.c:204
+#: ../libsvn_subr/date.c:204
#, c-format
msgid "Can't manipulate current date"
msgstr "Impossible de manipuler la date courante"
-#: 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 "Impossible de calculer la date demandée"
-#: libsvn_subr/date.c:281
+#: ../libsvn_subr/date.c:281
#, c-format
msgid "Can't expand time"
msgstr "Impossible de dilater le temps"
-#: libsvn_subr/dso.c:71
+#: ../libsvn_subr/dso.c:71
#, c-format
msgid "Can't grab DSO mutex"
msgstr "Impossible d'obtenir l'exclusivité (mutex) du 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 "Impossible de rendre l'exclusivité (mutex) du DSO"
-#: libsvn_subr/error.c:346
+#: ../libsvn_subr/error.c:346
msgid "Can't recode error string from APR"
msgstr "Impossible de recoder le message d'erreur de APR"
-#: libsvn_subr/error.c:437
+#: ../libsvn_subr/error.c:437
#, c-format
msgid "%swarning: %s\n"
msgstr "%savertissement : %s\n"
-#: libsvn_subr/io.c:150
+#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
msgstr "Impossible de vérifier le chemin '%s'"
-#: libsvn_subr/io.c:404
+#: ../libsvn_subr/io.c:404
#, c-format
msgid "Can't open '%s'"
msgstr "Impossible d'ouvrir '%s'"
-#: libsvn_subr/io.c:426 libsvn_subr/io.c:549
+#: ../libsvn_subr/io.c:426 ../libsvn_subr/io.c:549
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Impossible de créer un nom pour '%s'"
-#: libsvn_subr/io.c:536
+#: ../libsvn_subr/io.c:536
#, c-format
msgid "Can't create symbolic link '%s'"
msgstr "Impossible de créer le lien symbolique '%s'"
-#: libsvn_subr/io.c:553 libsvn_subr/io.c:607 libsvn_subr/io.c:635
+#: ../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 "Les liens symboliques ne sont pas supportés sur cette plateforme"
-#: libsvn_subr/io.c:586
+#: ../libsvn_subr/io.c:586
#, c-format
msgid "Can't read contents of link"
msgstr "Impossible de lire le contenu du lien"
-#: libsvn_subr/io.c:648
+#: ../libsvn_subr/io.c:648
#, c-format
msgid "Can't find a temporary directory"
msgstr "Impossible de trouver de répertoire temporaire"
-#: libsvn_subr/io.c:742
+#: ../libsvn_subr/io.c:742
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Impossible de copier '%s' vers '%s'"
-#: libsvn_subr/io.c:795
+#: ../libsvn_subr/io.c:795
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Impossible de fixer les permissions sur '%s'"
-#: libsvn_subr/io.c:817
+#: ../libsvn_subr/io.c:817
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Impossible d'ajouter le contenu de '%s' à '%s'"
-#: libsvn_subr/io.c:851
+#: ../libsvn_subr/io.c:851
#, c-format
msgid "Source '%s' is not a directory"
msgstr "La source '%s' n'est pas un répertoire"
-#: libsvn_subr/io.c:857
+#: ../libsvn_subr/io.c:857
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "La destination '%s' n'est pas un répertoire"
-#: libsvn_subr/io.c:863
+#: ../libsvn_subr/io.c:863
#, c-format
msgid "Destination '%s' already exists"
msgstr "La destination '%s' existe déjà"
-#: libsvn_subr/io.c:932 libsvn_subr/io.c:1883 libsvn_subr/io.c:1934
-#: libsvn_subr/io.c:1986
+#: ../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:1888 libsvn_subr/io.c:1939
-#: libsvn_subr/io.c:1991 libsvn_subr/io.c:3154
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3154
#, c-format
msgid "Error closing directory '%s'"
msgstr "Erreur de fermeture du répertoire '%s'"
-#: libsvn_subr/io.c:965
+#: ../libsvn_subr/io.c:965
#, c-format
msgid "Can't make directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: libsvn_subr/io.c:1052
+#: ../libsvn_subr/io.c:1052
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Impossible de changer l'heure du dernier accès à '%s'"
-#: libsvn_subr/io.c:1192
+#: ../libsvn_subr/io.c:1192
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr ""
"Impossible d'obtenir les permissions de fichier par défaut pour le fichier '%"
"s' (erreur de stat sur le fichier)"
-#: libsvn_subr/io.c:1203
+#: ../libsvn_subr/io.c:1203
#, c-format
msgid "Can't open file at '%s'"
msgstr "Le fichier '%s' ne peut être ouvert"
-#: libsvn_subr/io.c:1207
+#: ../libsvn_subr/io.c:1207
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr ""
"Impossible d'obtenir les permissions de fichier pour le fichier '%s' (erreur "
"de stat sur le fichier)"
-#: libsvn_subr/io.c:1246 libsvn_subr/io.c:1344
+#: ../libsvn_subr/io.c:1246 ../libsvn_subr/io.c:1344
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Impossible de changer les permissions du fichier '%s'"
-#: libsvn_subr/io.c:1384
+#: ../libsvn_subr/io.c:1384
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Impossible de mettre le fichier '%s' en lecture seule"
-#: libsvn_subr/io.c:1416
+#: ../libsvn_subr/io.c:1416
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Impossible de mettre le fichier '%s' en lecture-écriture"
-#: libsvn_subr/io.c:1460
+#: ../libsvn_subr/io.c:1460
#, c-format
msgid "Error getting UID of process"
msgstr "Erreur à l'obtention du UID du processus"
-#: libsvn_subr/io.c:1541
+#: ../libsvn_subr/io.c:1541
#, c-format
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:1576
#, 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:1577
#, 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:1589 ../libsvn_subr/io.c:1606
#, 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:97 svnserve/main.c:523
+#: ../libsvn_subr/io.c:1628 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:523
#, 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:1649
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:1663
#, c-format
msgid "Can't get file name"
msgstr "Impossible d'obtenir le nom de fichier"
-#: libsvn_subr/io.c:1731
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "Impossible de supprimer le fichier '%s'"
-#: libsvn_subr/io.c:1810 libsvn_subr/io.c:3005 libsvn_subr/io.c:3091
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3005 ../libsvn_subr/io.c:3091
#, c-format
msgid "Can't open directory '%s'"
msgstr "Impossible d'ouvrir le répertoire '%s'"
-#: libsvn_subr/io.c:1864 libsvn_subr/io.c:1894
+#: ../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:1874
+#: ../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:2055
+#: ../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:2061
+#: ../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:2073
+#: ../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:2086
+#: ../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:2093
+#: ../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:2100
+#: ../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:2107
+#: ../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:2113
+#: ../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:2136
+#: ../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:2160
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Erreur à l'attente du processus '%s'"
-#: libsvn_subr/io.c:2168
+#: ../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:2175
+#: ../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:2286
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' a retourné %d"
-#: libsvn_subr/io.c:2409
+#: ../libsvn_subr/io.c:2409
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4610,175 +4647,175 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2536
+#: ../libsvn_subr/io.c:2536
#, 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:2626
+#: ../libsvn_subr/io.c:2626
#, c-format
msgid "Can't open file '%s'"
msgstr "Impossible d'ouvrir le fichier '%s'"
-#: libsvn_subr/io.c:2662
+#: ../libsvn_subr/io.c:2662
#, c-format
msgid "Can't close file '%s'"
msgstr "Le fichier '%s' ne peut être fermé"
-#: libsvn_subr/io.c:2663
+#: ../libsvn_subr/io.c:2663
#, c-format
msgid "Can't close stream"
msgstr "Impossible de fermer le flux"
-#: libsvn_subr/io.c:2673 libsvn_subr/io.c:2697 libsvn_subr/io.c:2710
+#: ../libsvn_subr/io.c:2673 ../libsvn_subr/io.c:2697 ../libsvn_subr/io.c:2710
#, c-format
msgid "Can't read file '%s'"
msgstr "Impossible de lire le fichier '%s'"
-#: libsvn_subr/io.c:2674 libsvn_subr/io.c:2698 libsvn_subr/io.c:2711
+#: ../libsvn_subr/io.c:2674 ../libsvn_subr/io.c:2698 ../libsvn_subr/io.c:2711
#, c-format
msgid "Can't read stream"
msgstr "Impossible de lire le flux"
-#: libsvn_subr/io.c:2685
+#: ../libsvn_subr/io.c:2685
#, 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:2686
+#: ../libsvn_subr/io.c:2686
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Impossible d'obtenir les informations d'attribut du flux"
-#: libsvn_subr/io.c:2722
+#: ../libsvn_subr/io.c:2722
#, 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:2723
+#: ../libsvn_subr/io.c:2723
#, 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:2734 libsvn_subr/io.c:2768
+#: ../libsvn_subr/io.c:2734 ../libsvn_subr/io.c:2768
#, c-format
msgid "Can't write to file '%s'"
msgstr "Impossible d'écrire dans le fichier '%s'"
-#: libsvn_subr/io.c:2735 libsvn_subr/io.c:2769
+#: ../libsvn_subr/io.c:2735 ../libsvn_subr/io.c:2769
#, c-format
msgid "Can't write to stream"
msgstr "Impossible d'écrire dans le flux"
-#: libsvn_subr/io.c:2809
+#: ../libsvn_subr/io.c:2809
#, 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:2813
+#: ../libsvn_subr/io.c:2813
msgid "Can't read length line in stream"
msgstr "Impossible de lire la longueur de la ligne dans le flux"
-#: libsvn_subr/io.c:2860
+#: ../libsvn_subr/io.c:2860
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Impossible de déplacer '%s' vers '%s'"
-#: libsvn_subr/io.c:2939
+#: ../libsvn_subr/io.c:2939
#, c-format
msgid "Can't create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: libsvn_subr/io.c:2950 libsvn_wc/copy.c:543
+#: ../libsvn_subr/io.c:2950 ../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:3023
+#: ../libsvn_subr/io.c:3023
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Impossible de supprimer le répertoire '%s'"
-#: libsvn_subr/io.c:3041
+#: ../libsvn_subr/io.c:3041
#, c-format
msgid "Can't read directory"
msgstr "Impossible de lire le répertoire"
-#: libsvn_subr/io.c:3110
+#: ../libsvn_subr/io.c:3110
#, 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:3235
+#: ../libsvn_subr/io.c:3235
#, c-format
msgid "Can't check directory '%s'"
msgstr "Impossible de vérifier le répertoire '%s'"
-#: libsvn_subr/io.c:3257
+#: ../libsvn_subr/io.c:3257
#, c-format
msgid "Version %d is not non-negative"
msgstr "La version %d est négative"
-#: libsvn_subr/io.c:3307
+#: ../libsvn_subr/io.c:3307
#, c-format
msgid "Reading '%s'"
msgstr "Lecture de '%s'"
-#: libsvn_subr/io.c:3323
+#: ../libsvn_subr/io.c:3323
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "La première ligne de '%s' contient des caractères non-numériques"
-#: libsvn_subr/kitchensink.c:40
+#: ../libsvn_subr/kitchensink.c:40
#, c-format
msgid "Invalid revision number found parsing '%s'"
msgstr "Numéro de révision invalide dans '%s'"
-#: libsvn_subr/kitchensink.c:52
+#: ../libsvn_subr/kitchensink.c:52
#, c-format
msgid "Negative revision number found parsing '%s'"
msgstr "Numéro de révision négatif en analysant '%s'"
-#: libsvn_subr/mergeinfo.c:143
+#: ../libsvn_subr/mergeinfo.c:143
#, c-format
msgid "Invalid character '%c' found in revision list"
msgstr "Caractère invalide '%c' dans une liste de révisions"
-#: libsvn_subr/mergeinfo.c:192 libsvn_subr/mergeinfo.c:199
+#: ../libsvn_subr/mergeinfo.c:192 ../libsvn_subr/mergeinfo.c:199
#, c-format
msgid "Invalid character '%c' found in range list"
msgstr "Caractère invalide '%c' dans une liste d'étendues de révisions"
-#: libsvn_subr/mergeinfo.c:206
+#: ../libsvn_subr/mergeinfo.c:206
msgid "Range list parsing ended before hitting newline"
msgstr ""
"L'analyse syntaxique de la liste d'étendues de révisions a fini avant la fin "
"de ligne"
-#: libsvn_subr/mergeinfo.c:225
+#: ../libsvn_subr/mergeinfo.c:225
msgid "Pathname not terminated by ':'"
msgstr "Chemin non terminé par ':'"
-#: libsvn_subr/mergeinfo.c:233
+#: ../libsvn_subr/mergeinfo.c:233
#, c-format
msgid "Could not find end of line in range list line in '%s'"
msgstr "Impossible de trouver la fin de ligne dans la ligne de révision '%s'"
-#: libsvn_subr/nls.c:79
+#: ../libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "Impossible de convertir la chaîne vers UCS-2 : '%s'"
-#: libsvn_subr/nls.c:86
+#: ../libsvn_subr/nls.c:86
msgid "Can't get module file name"
msgstr "Impossible d'obtenir le nom de fichier du module"
-#: 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 "Impossible de convertir le chemin de module de UTF-8 vers UCS-2 : '%s'"
-#: libsvn_subr/opt.c:233 libsvn_subr/opt.c:260 libsvn_subr/opt.c:337
+#: ../libsvn_subr/opt.c:233 ../libsvn_subr/opt.c:260 ../libsvn_subr/opt.c:337
msgid ""
"\n"
"Valid options:\n"
@@ -4786,11 +4823,11 @@
"\n"
"Options valides:\n"
-#: libsvn_subr/opt.c:467
+#: ../libsvn_subr/opt.c:467
msgid " ARG"
msgstr " ARG"
-#: libsvn_subr/opt.c:492 libsvn_subr/opt.c:525
+#: ../libsvn_subr/opt.c:492 ../libsvn_subr/opt.c:525
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4799,27 +4836,27 @@
"'%s': Commande inconnue.\n"
"\n"
-#: libsvn_subr/opt.c:850
+#: ../libsvn_subr/opt.c:850
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Erreur de syntaxe sur la révision '%s'"
-#: libsvn_subr/opt.c:926
+#: ../libsvn_subr/opt.c:958
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "L'URL '%s' n'est pas correctement encodée (URI-encoded)"
-#: libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:964
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "L'URL '%s' contient un composant '..'"
-#: libsvn_subr/opt.c:961
+#: ../libsvn_subr/opt.c:993
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Erreur à la résolution de la casse de '%s'"
-#: libsvn_subr/opt.c:1063
+#: ../libsvn_subr/opt.c:1100
#, c-format
msgid ""
"%s, version %s\n"
@@ -4830,7 +4867,7 @@
" compilé %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1066
+#: ../libsvn_subr/opt.c:1103
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4843,56 +4880,56 @@
"Il inclut du logiciel développé par CollabNet (http://www.Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1119 libsvn_subr/opt.c:1186
+#: ../libsvn_subr/opt.c:1156 ../libsvn_subr/opt.c:1223
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Entrer '%s help' pour l'aide.\n"
-#: libsvn_subr/path.c:1169
+#: ../libsvn_subr/path.c:1169
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Impossible de déterminer le chemin absolu de '%s'"
-#: libsvn_subr/path.c:1206
+#: ../libsvn_subr/path.c:1206
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' n'est ni un fichier ni un répertoire"
-#: libsvn_subr/path.c:1319
+#: ../libsvn_subr/path.c:1319
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Impossible de déterminer l'encodage natif du chemin"
-#: libsvn_subr/path.c:1432
+#: ../libsvn_subr/path.c:1432
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Caractère de contrôle invalide '0x%02x' dans le chemin '%s'"
-#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#: ../libsvn_subr/prompt.c:115 ../libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
msgstr "Impossible de lire l'entrée standard (stdin)"
-#: libsvn_subr/prompt.c:178
+#: ../libsvn_subr/prompt.c:178
#, c-format
msgid "Authentication realm: %s\n"
msgstr "Domaine d'authentification : %s\n"
-#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+#: ../libsvn_subr/prompt.c:204 ../libsvn_subr/prompt.c:227
msgid "Username: "
msgstr "Nom d'utilisateur : "
-#: libsvn_subr/prompt.c:206
+#: ../libsvn_subr/prompt.c:206
#, c-format
msgid "Password for '%s': "
msgstr "Mot de passe pour '%s' : "
-#: libsvn_subr/prompt.c:249
+#: ../libsvn_subr/prompt.c:249
#, c-format
msgid "Error validating server certificate for '%s':\n"
msgstr "Erreur de validation du certificat du serveur pour '%s' :\n"
-#: libsvn_subr/prompt.c:255
+#: ../libsvn_subr/prompt.c:255
msgid ""
" - The certificate is not issued by a trusted authority. Use the\n"
" fingerprint to validate the certificate manually!\n"
@@ -4900,23 +4937,23 @@
" - Le certificat n'est pas signé pas une autorité de confiance.\n"
" Valider le certificat manuellement !\n"
-#: libsvn_subr/prompt.c:262
+#: ../libsvn_subr/prompt.c:262
msgid " - The certificate hostname does not match.\n"
msgstr " - Le nom d'hôte du certificat ne correspond pas.\n"
-#: libsvn_subr/prompt.c:268
+#: ../libsvn_subr/prompt.c:268
msgid " - The certificate is not yet valid.\n"
msgstr " - Le certificat n'est pas encore valide.\n"
-#: libsvn_subr/prompt.c:274
+#: ../libsvn_subr/prompt.c:274
msgid " - The certificate has expired.\n"
msgstr " - Le certificat a expiré.\n"
-#: libsvn_subr/prompt.c:280
+#: ../libsvn_subr/prompt.c:280
msgid " - The certificate has an unknown error.\n"
msgstr " - Le certificat conduit à une erreur inconnue.\n"
-#: libsvn_subr/prompt.c:285
+#: ../libsvn_subr/prompt.c:285
#, c-format
msgid ""
"Certificate information:\n"
@@ -4931,91 +4968,91 @@
" - signataire : %s\n"
" - empreinte : %s\n"
-#: libsvn_subr/prompt.c:300
+#: ../libsvn_subr/prompt.c:300
msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
msgstr "(R)ejet, acceptation (t)emporaire ou (p)ermanente ? "
-#: libsvn_subr/prompt.c:304
+#: ../libsvn_subr/prompt.c:304
msgid "(R)eject or accept (t)emporarily? "
msgstr "(R)ejet, ou acceptation (t)emporaire ? "
-#: libsvn_subr/prompt.c:343
+#: ../libsvn_subr/prompt.c:343
msgid "Client certificate filename: "
msgstr "Fichier du certificat client : "
-#: libsvn_subr/prompt.c:366
+#: ../libsvn_subr/prompt.c:366
#, c-format
msgid "Passphrase for '%s': "
msgstr "Phrase de passe pour '%s' : "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:2429
+#: ../libsvn_subr/subst.c:1745 ../libsvn_wc/props.c:2429
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Le fichier '%s' a des sauts de ligne incohérents"
# Hmmm... what about "%x" (preferred date representation in locale) instead?
#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
-#: libsvn_subr/time.c:81
+#: ../libsvn_subr/time.c:81
msgid " (%a, %d %b %Y)"
msgstr " (%a %d %b %Y)"
-#: libsvn_subr/utf.c:195
+#: ../libsvn_subr/utf.c:195
msgid "Can't lock charset translation mutex"
msgstr ""
"Impossible de verrouiller l'exclusivité (mutex) sur la conversion de "
"caractères"
-#: libsvn_subr/utf.c:213 libsvn_subr/utf.c:322
+#: ../libsvn_subr/utf.c:213 ../libsvn_subr/utf.c:322
msgid "Can't unlock charset translation mutex"
msgstr ""
"Impossible de déverrouiller l'exclusivité (mutex) sur la conversion de "
"caractères"
-#: libsvn_subr/utf.c:274
+#: ../libsvn_subr/utf.c:274
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr ""
"Impossible de créer un convertisseur de caractères de l'encodage natif vers "
"'%s'"
-#: libsvn_subr/utf.c:278
+#: ../libsvn_subr/utf.c:278
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr ""
"Impossible de créer un convertisseur de caractères de '%s' vers l'encodage "
"natif"
-#: libsvn_subr/utf.c:282
+#: ../libsvn_subr/utf.c:282
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "Impossible de créer un convertisseur de caractères de '%s' vers '%s'"
-#: libsvn_subr/utf.c:288
+#: ../libsvn_subr/utf.c:288
#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Impossible de créer un convertisseur de caractères de '%i' vers '%i'"
-#: libsvn_subr/utf.c:522
+#: ../libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Impossible de convertir la chaîne de l'encodage natif vers '%s':"
-#: libsvn_subr/utf.c:526
+#: ../libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Impossible de convertir la chaîne de '%s' vers l'encodage natif:"
-#: libsvn_subr/utf.c:530
+#: ../libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Impossible de convertir la chaîne de '%s' à '%s' :"
-#: libsvn_subr/utf.c:536
+#: ../libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Impossible de convertir la chaîne de CCSID '%i' à CCSID '%i' :"
-#: libsvn_subr/utf.c:581
+#: ../libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -5024,14 +5061,14 @@
"Les données sûres '%s' sont suivies de l'octet non ASCII %d: conversion de/"
"vers UTF-8 impossible"
-#: libsvn_subr/utf.c:589
+#: ../libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
msgstr ""
"Caractère non ASCII détecté (code %d), conversion de/vers UTF-8 impossible"
-#: libsvn_subr/utf.c:631
+#: ../libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -5044,54 +5081,54 @@
"suivies par une séquence UTF-8 invalide\n"
"(hex:%s)"
-#: libsvn_subr/validate.c:48
+#: ../libsvn_subr/validate.c:48
#, c-format
msgid "MIME type '%s' has empty media type"
msgstr "Le type MIME '%s' ne contient pas de type de media"
-#: libsvn_subr/validate.c:53
+#: ../libsvn_subr/validate.c:53
#, c-format
msgid "MIME type '%s' does not contain '/'"
msgstr "Le type MIME '%s' ne contient pas '/'"
-#: libsvn_subr/validate.c:58
+#: ../libsvn_subr/validate.c:58
#, c-format
msgid "MIME type '%s' ends with non-alphanumeric character"
msgstr "Le type MIME '%s' ne se termine pas par des caractères alphanumériques"
-#: 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 "Versions incompatibles dans '%s', %d.%d.%d%s contre %d.%d.%d%s attendu"
-#: libsvn_subr/xml.c:400
+#: ../libsvn_subr/xml.c:400
#, c-format
msgid "Malformed XML: %s at line %d"
msgstr "XML malformé: %s à la ligne %d"
-#: libsvn_wc/adm_crawler.c:678
+#: ../libsvn_wc/adm_crawler.c:678
msgid "Error aborting report"
msgstr "Erreur en interrompant un rapport"
-#: libsvn_wc/adm_crawler.c:1103
+#: ../libsvn_wc/adm_crawler.c:1103
#, c-format
msgid "While preparing '%s' for commit"
msgstr "En préparant la propagation (commit) de '%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' n'est pas un nom de répertoire administratif valide"
-#: libsvn_wc/adm_files.c:260
+#: ../libsvn_wc/adm_files.c:260
msgid "Bad type indicator"
msgstr "Mauvais indicateur de type"
-#: libsvn_wc/adm_files.c:493
+#: ../libsvn_wc/adm_files.c:493
msgid "APR_APPEND not supported for adm files"
msgstr "APR_APPEND non supporté pour les fichiers d'administration"
-#: libsvn_wc/adm_files.c:536
+#: ../libsvn_wc/adm_files.c:536
msgid ""
"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
"again"
@@ -5099,46 +5136,47 @@
"Votre répertoire .svn/tmp semble absent ou corrompu ; exécuter 'svn cleanup' "
"et essayer à nouveau"
-#: libsvn_wc/adm_files.c:705 libsvn_wc/lock.c:602 libsvn_wc/lock.c:868
+#: ../libsvn_wc/adm_files.c:705 ../libsvn_wc/lock.c:602
+#: ../libsvn_wc/lock.c:868
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' n'est pas une copie de travail"
-#: libsvn_wc/adm_files.c:712 libsvn_wc/adm_files.c:779
+#: ../libsvn_wc/adm_files.c:712 ../libsvn_wc/adm_files.c:779
msgid "No such thing as 'base' working copy properties!"
msgstr "Il n'existe pas de propriété 'base' dans les copies de travail"
-#: libsvn_wc/adm_files.c:868
+#: ../libsvn_wc/adm_files.c:868
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "La révision %ld ne correspond pas à la révision %ld dans '%s'"
-#: libsvn_wc/adm_files.c:876
+#: ../libsvn_wc/adm_files.c:876
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "L'URL '%s' ne correspond pas à l'URL '%s' dans '%s'"
-#: libsvn_wc/adm_ops.c:277
+#: ../libsvn_wc/adm_ops.c:277
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Type de noeud non reconnu : '%s'"
-#: libsvn_wc/adm_ops.c:1041 libsvn_wc/adm_ops.c:1406
+#: ../libsvn_wc/adm_ops.c:1041 ../libsvn_wc/adm_ops.c:1406
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Type de noeud non supporté pour le chemin '%s'"
-#: libsvn_wc/adm_ops.c:1402
+#: ../libsvn_wc/adm_ops.c:1402
#, c-format
msgid "'%s' not found"
msgstr "'%s' pas trouvé"
-#: libsvn_wc/adm_ops.c:1436
+#: ../libsvn_wc/adm_ops.c:1436
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' est déjà sous gestionnaire de version"
-#: libsvn_wc/adm_ops.c:1448
+#: ../libsvn_wc/adm_ops.c:1448
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -5147,43 +5185,43 @@
"'%s' ne peut être remplacé pas un noeud d'un type différent. Propager la "
"suppression, modifier le parent et ensuite ajouter '%s'"
-#: libsvn_wc/adm_ops.c:1465
+#: ../libsvn_wc/adm_ops.c:1465
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr "Ne trouve pas l'entrée du répertoire parent lors de l'ajout de '%s'"
-#: libsvn_wc/adm_ops.c:1470
+#: ../libsvn_wc/adm_ops.c:1470
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "'%s' ne peut être ajouté à un répertoire parent qui doit être supprimé"
-#: libsvn_wc/adm_ops.c:1486
+#: ../libsvn_wc/adm_ops.c:1486
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "L'URL '%s' a un dépôt racine différent de son parent"
-#: libsvn_wc/adm_ops.c:1816
+#: ../libsvn_wc/adm_ops.c:1816
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Erreur en restaurant le texte pour '%s'"
-#: libsvn_wc/adm_ops.c:1980
+#: ../libsvn_wc/adm_ops.c:1980
msgid "Cannot revert"
msgstr "Impossible de rétablir une donnée (revert)"
-#: libsvn_wc/adm_ops.c:2007
+#: ../libsvn_wc/adm_ops.c:2007
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Rétablissement de '%s' impossible : type de noeud non supporté"
-#: libsvn_wc/adm_ops.c:2018
+#: ../libsvn_wc/adm_ops.c:2018
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"Rétablissement de '%s' impossible : type de noeud non supporté dans la copie "
"de travail"
-#: libsvn_wc/adm_ops.c:2065
+#: ../libsvn_wc/adm_ops.c:2065
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -5191,53 +5229,53 @@
"Rétablissement du répertoire courant impossible ; essayer à partir du "
"répertoire parent"
-#: libsvn_wc/adm_ops.c:2093
+#: ../libsvn_wc/adm_ops.c:2093
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Type inconnu ou inattendu pour le chemin '%s'"
-#: libsvn_wc/adm_ops.c:2315
+#: ../libsvn_wc/adm_ops.c:2315
#, c-format
msgid "File '%s' has local modifications"
msgstr "Le fichier '%s' a été localement modifié"
-#: libsvn_wc/adm_ops.c:2597
+#: ../libsvn_wc/adm_ops.c:2597
msgid "Invalid 'conflict_result' argument"
msgstr "Argument 'conflit_result' invalide"
-#: libsvn_wc/adm_ops.c:2937
+#: ../libsvn_wc/adm_ops.c:2937
#, c-format
msgid "'%s' is a directory, and thus cannot be a member of a changelist"
msgstr ""
"'%s' est un répertoire, et donc ne peut pas être membre d'une liste de "
"changements (changelist)"
-#: libsvn_wc/adm_ops.c:2959
+#: ../libsvn_wc/adm_ops.c:2959
#, c-format
msgid "'%s' is not currently a member of changelist '%s'."
msgstr "Le chemin '%s' ne fait pas partie de la liste de changement '%s'."
-#: libsvn_wc/adm_ops.c:2981
+#: ../libsvn_wc/adm_ops.c:2981
#, c-format
msgid "Removing '%s' from changelist '%s'."
msgstr "Retrait de '%s' de la liste de changements (changelist) '%s'."
-#: libsvn_wc/copy.c:197
+#: ../libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Erreur lors de la copie récursive de '%s'"
-#: libsvn_wc/copy.c:403
+#: ../libsvn_wc/copy.c:403
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' existe déjà et est dans le chemin"
-#: libsvn_wc/copy.c:415
+#: ../libsvn_wc/copy.c:415
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Il y a déjà un objet versionné '%s'"
-#: libsvn_wc/copy.c:430 libsvn_wc/copy.c:692
+#: ../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 "
@@ -5246,111 +5284,111 @@
"Copie ou déplacement de '%s' impossible : il n'est pas encore dans le dépôt ;"
"essayer de propager d'abord"
-#: libsvn_wc/copy.c:799
+#: ../libsvn_wc/copy.c:799
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"Copie vers '%s' impossible : il n'est pas dans le dépôt '%s' ; il est dans "
"le dépôt '%s'"
-#: libsvn_wc/copy.c:806
+#: ../libsvn_wc/copy.c:806
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "Copie de '%s' impossible car il doit être supprimé"
-#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:368 libsvn_wc/entries.c:604
-#: libsvn_wc/entries.c:865
+#: ../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 "L'entrée '%s' a une valeur '%s' invalide"
-#: libsvn_wc/entries.c:114
+#: ../libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Séquence d'échappement invalide"
-#: libsvn_wc/entries.c:121
+#: ../libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Caractère échappé invalide"
-#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:210
-#: libsvn_wc/entries.c:222
+#: ../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 "Fin de l'entrée (entry) inattendue"
-#: libsvn_wc/entries.c:192
+#: ../libsvn_wc/entries.c:192
#, c-format
msgid "Entry contains non-canonical path '%s'"
msgstr "L'entrée contient un chemin non-canonique '%s'"
-#: libsvn_wc/entries.c:244
+#: ../libsvn_wc/entries.c:244
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Valeur invalide pour le champs '%s'"
-#: libsvn_wc/entries.c:326 libsvn_wc/entries.c:579
+#: ../libsvn_wc/entries.c:326 ../libsvn_wc/entries.c:579
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "L'entrée '%s' a un type de noeud invalide"
-#: libsvn_wc/entries.c:347 libsvn_wc/entries.c:556
+#: ../libsvn_wc/entries.c:347 ../libsvn_wc/entries.c:556
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Racine de dépôt invalide pour l'entrée '%s'"
-#: libsvn_wc/entries.c:1011
+#: ../libsvn_wc/entries.c:1011
#, c-format
msgid "XML parser failed in '%s'"
msgstr "Échec de l'analyseur XML dans '%s'"
-#: libsvn_wc/entries.c:1070
+#: ../libsvn_wc/entries.c:1070
msgid "Missing default entry"
msgstr "Entrée par défaut manquante"
-#: libsvn_wc/entries.c:1075
+#: ../libsvn_wc/entries.c:1075
msgid "Default entry has no revision number"
msgstr "L'entrée par défaut n'a pas de numéro de révision"
-#: libsvn_wc/entries.c:1080
+#: ../libsvn_wc/entries.c:1080
msgid "Default entry is missing URL"
msgstr "L'entrée par défaut n'a pas d'URL"
-#: libsvn_wc/entries.c:1156
+#: ../libsvn_wc/entries.c:1156
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Ligne de version invalide dans le fichier d'entrées pour '%s'"
-#: libsvn_wc/entries.c:1173
+#: ../libsvn_wc/entries.c:1173
msgid "Missing entry terminator"
msgstr "Terminaison d'entrée (entry) manquante"
-#: libsvn_wc/entries.c:1176
+#: ../libsvn_wc/entries.c:1176
msgid "Invalid entry terminator"
msgstr "Terminaison d'entrée (entry) invalide"
-#: libsvn_wc/entries.c:1180
+#: ../libsvn_wc/entries.c:1180
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Erreur à l'entrée (entry) %d du fichier d'entrées pour '%s'"
-#: libsvn_wc/entries.c:1303
+#: ../libsvn_wc/entries.c:1303
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Copie de travail corrompue : '%s' n'a pas d'entrée par défaut"
-#: libsvn_wc/entries.c:1320
+#: ../libsvn_wc/entries.c:1320
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr ""
"Copie de travail corrompue : répertoire '%s' à une programmation invalide"
-#: libsvn_wc/entries.c:1354
+#: ../libsvn_wc/entries.c:1354
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Copie de travail corrompue : '%s' dans le répertoire '%s' a une "
"programmation invalide"
-#: libsvn_wc/entries.c:1363
+#: ../libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5359,7 +5397,7 @@
"Copie de travail corrompue : '%s' dans le répertoire ajouté '%s' n'est pas "
"lui-même ajouté"
-#: libsvn_wc/entries.c:1371
+#: ../libsvn_wc/entries.c:1371
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5368,7 +5406,7 @@
"Copie de travail corrompue : '%s' dans le repertoire à effacer '%s' n'est "
"pas lui-même effacé"
-#: libsvn_wc/entries.c:1379
+#: ../libsvn_wc/entries.c:1379
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5377,17 +5415,17 @@
"Copie de travail corrompue : '%s' dans le répertoire remplacé '%s' a une "
"programmation invalide"
-#: libsvn_wc/entries.c:2026
+#: ../libsvn_wc/entries.c:2026
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Aucune entrée par défaut dans le répertoire '%s'"
-#: libsvn_wc/entries.c:2081
+#: ../libsvn_wc/entries.c:2081
#, c-format
msgid "Error writing to '%s'"
msgstr "Erreur d'écriture sur '%s'"
-#: libsvn_wc/entries.c:2410
+#: ../libsvn_wc/entries.c:2410
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -5396,7 +5434,7 @@
"'%s' ne peut être ajouté à un répertoire supprimé ; essayer d'abord de "
"rétablir le répertoire parent"
-#: libsvn_wc/entries.c:2416
+#: ../libsvn_wc/entries.c:2416
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -5405,111 +5443,111 @@
"'%s' ne peut être remplacé dans un répertoire supprimé ; essayer d'abord de "
"rétablir le répertoire parent"
-#: libsvn_wc/entries.c:2425
+#: ../libsvn_wc/entries.c:2425
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr "'%s' est noté comme absent, et ne peut donc être en attente pour ajout"
-#: libsvn_wc/entries.c:2454
+#: ../libsvn_wc/entries.c:2454
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "L'entrée '%s' est déjà sous contrôle de version"
-#: libsvn_wc/entries.c:2551
+#: ../libsvn_wc/entries.c:2551
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "L'entrée '%s' a une programmation invalide"
-#: libsvn_wc/entries.c:2697
+#: ../libsvn_wc/entries.c:2697
#, c-format
msgid "No such entry: '%s'"
msgstr "Pas d'entrée : '%s'"
-#: libsvn_wc/entries.c:2831
+#: ../libsvn_wc/entries.c:2831
#, 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:2874
#, 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:3021
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' possède un type de noeud non reconnu"
-#: libsvn_wc/entries.c:3058
+#: ../libsvn_wc/entries.c:3058
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Découverte inattendue de '%s' : chemin marqué comme manquant"
-#: libsvn_wc/lock.c:366 libsvn_wc/lock.c:572
+#: ../libsvn_wc/lock.c:366 ../libsvn_wc/lock.c:572
#, c-format
msgid "Working copy '%s' locked"
msgstr "La copie de travail '%s' est verrouillée"
-#: libsvn_wc/lock.c:491
+#: ../libsvn_wc/lock.c:491
#, c-format
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr ""
"Le chemin '%s' se termine par '%s' ce qui n'est pas supporté par cette "
"opération"
-#: libsvn_wc/lock.c:940 libsvn_wc/lock.c:979
+#: ../libsvn_wc/lock.c:940 ../libsvn_wc/lock.c:979
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "Impossible de vérifier l'existence du chemin pour '%s'"
-#: libsvn_wc/lock.c:950
+#: ../libsvn_wc/lock.c:950
#, c-format
msgid "Expected '%s' to be a directory but found a file"
msgstr "'%s' est un fichier au lieu d'un répertoire"
-#: libsvn_wc/lock.c:962
+#: ../libsvn_wc/lock.c:962
#, c-format
msgid "Expected '%s' to be a file but found a directory"
msgstr "'%s' attendu comme fichiern et non pas comme répertoire"
-#: libsvn_wc/lock.c:986
+#: ../libsvn_wc/lock.c:986
#, c-format
msgid "Directory '%s' is missing"
msgstr "Le répertoire '%s' est manquant"
-#: libsvn_wc/lock.c:996
+#: ../libsvn_wc/lock.c:996
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
msgstr ""
"Le répertoire '%s' contenant la partie administrative d'une copie de travail "
"est manquant"
-#: libsvn_wc/lock.c:1001
+#: ../libsvn_wc/lock.c:1001
#, c-format
msgid "Unable to lock '%s'"
msgstr "Impossible de verrouiller '%s'"
-#: libsvn_wc/lock.c:1006
+#: ../libsvn_wc/lock.c:1006
#, c-format
msgid "Working copy '%s' is not locked"
msgstr "La copie de travail '%s' n'est pas verrouillée"
-#: libsvn_wc/lock.c:1422
+#: ../libsvn_wc/lock.c:1422
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "Verrou d'écriture volé sous '%s'"
-#: libsvn_wc/lock.c:1430
+#: ../libsvn_wc/lock.c:1430
#, c-format
msgid "No write-lock in '%s'"
msgstr "Pas de verrou d'écriture sous '%s'"
-#: libsvn_wc/lock.c:1452
+#: ../libsvn_wc/lock.c:1452
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr "Le fichier de verrou '%s' n'est pas un fichier normal"
-#: libsvn_wc/log.c:356
+#: ../libsvn_wc/log.c:356
msgid "Can't move source to dest"
msgstr "Impossible de déplacer source vers dest"
@@ -5517,163 +5555,163 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:519
+#: ../libsvn_wc/log.c:519
#, c-format
msgid "In directory '%s'"
msgstr "Dans le répertoire '%s'"
-#: libsvn_wc/log.c:544
+#: ../libsvn_wc/log.c:544
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Attribut 'gauche' manquant dans '%s'"
-#: libsvn_wc/log.c:551
+#: ../libsvn_wc/log.c:551
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Attribut 'droit' manquant dans '%s'"
-#: libsvn_wc/log.c:619
+#: ../libsvn_wc/log.c:619
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Attribut 'dest' manquant dans '%s'"
-#: libsvn_wc/log.c:700
+#: ../libsvn_wc/log.c:700
#, c-format
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:507
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Erreur en récupérant l'heure d'effet sur '%s'"
-#: libsvn_wc/log.c:844
+#: ../libsvn_wc/log.c:844
#, c-format
msgid "Error getting file size on '%s'"
msgstr "Erreur en récupérant la taille du fichier sur '%s'"
-#: libsvn_wc/log.c:862
+#: ../libsvn_wc/log.c:862
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Erreur à la modification de l'entrée pour '%s'"
-#: libsvn_wc/log.c:888
+#: ../libsvn_wc/log.c:888
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Erreur en retirant le verrou de l'entrée pour '%s'"
-#: libsvn_wc/log.c:911
+#: ../libsvn_wc/log.c:911
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Erreur en effaçant la liste de changements de l'entrée '%s'"
-#: libsvn_wc/log.c:1084
+#: ../libsvn_wc/log.c:1084
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Attribut 'revision' manquant pour '%s'"
-#: libsvn_wc/log.c:1108
+#: ../libsvn_wc/log.c:1108
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Commande du journal du répertoire '%s' mal placée"
-#: libsvn_wc/log.c:1276
+#: ../libsvn_wc/log.c:1276
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Erreur au remplacement du texte référence (text-base) de '%s'"
-#: libsvn_wc/log.c:1281
+#: ../libsvn_wc/log.c:1281
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Erreur en récupérant l'heure d'effet de '%s'"
-#: libsvn_wc/log.c:1304
+#: ../libsvn_wc/log.c:1304
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Erreur en récupérant l'heure d'effet pour '%s'"
-#: libsvn_wc/log.c:1324
+#: ../libsvn_wc/log.c:1324
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Erreur en comparant '%s' et '%s'"
-#: libsvn_wc/log.c:1373 libsvn_wc/log.c:1422
+#: ../libsvn_wc/log.c:1373 ../libsvn_wc/log.c:1422
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Erreur en modifiant l'entrée de '%s'"
-#: libsvn_wc/log.c:1477
+#: ../libsvn_wc/log.c:1477
msgid "Invalid 'format' attribute"
msgstr "Attribut 'format' invalide"
-#: libsvn_wc/log.c:1512
+#: ../libsvn_wc/log.c:1512
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Entrée du journal sans attribut nom (entrée '%s' pour le répertoire '%s')"
-#: libsvn_wc/log.c:1583
+#: ../libsvn_wc/log.c:1583
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Élément de journal non reconnu '%s' dans '%s'"
-#: libsvn_wc/log.c:1594
+#: ../libsvn_wc/log.c:1594
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Erreur en exécutant la commande '%s' dans '%s'"
-#: libsvn_wc/log.c:1776
+#: ../libsvn_wc/log.c:1776
msgid "Couldn't open log"
msgstr "Impossible d'ouvrir le journal"
-#: libsvn_wc/log.c:1787
+#: ../libsvn_wc/log.c:1787
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Erreur à la lecture du journal d'administration dans '%s'"
-#: libsvn_wc/log.c:2440
+#: ../libsvn_wc/log.c:2440
#, c-format
msgid "Error writing log for '%s'"
msgstr "Erreur à l'écriture dans le journal pour '%s'"
-#: libsvn_wc/log.c:2489
+#: ../libsvn_wc/log.c:2489
#, c-format
msgid "'%s' is not a working copy directory"
msgstr "'%s' n'est pas un répertoire d'une copie de travail"
-#: libsvn_wc/merge.c:430
+#: ../libsvn_wc/merge.c:430 ../libsvn_wc/merge.c:675
msgid "Conflict callback violated API: returned no results"
msgstr "L'appel pour gestion de conflit viole l'API : aucun résultat retourné"
-#: libsvn_wc/merge.c:726
+#: ../libsvn_wc/merge.c:722
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:111
+#: ../libsvn_wc/props.c:111
#, c-format
msgid "Can't parse '%s'"
msgstr "Impossible d'analyser '%s'"
-#: libsvn_wc/props.c:142
+#: ../libsvn_wc/props.c:142
#, c-format
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:583
#, 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:1399
+#: ../libsvn_wc/props.c:1399
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:1434
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:1528
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5682,7 +5720,7 @@
"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:1543
#, c-format
msgid ""
"Trying to create property '%s' with value '%s',\n"
@@ -5691,7 +5729,7 @@
"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:1617
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5700,7 +5738,7 @@
"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:1638
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5709,7 +5747,7 @@
"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:1725
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5718,7 +5756,7 @@
"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:1733
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5727,7 +5765,7 @@
"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:1754
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5736,7 +5774,7 @@
"Tentative de modification de la propriété '%s' de '%s' en '%s',\n"
"mais elle a été localement effacée."
-#: libsvn_wc/props.c:1788
+#: ../libsvn_wc/props.c:1788
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5745,7 +5783,7 @@
"Tentative de modificat de la propriété '%s' de '%s' en '%s',\n"
"mais elle n'existe pas."
-#: libsvn_wc/props.c:1826
+#: ../libsvn_wc/props.c:1826
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5754,47 +5792,47 @@
"Essai de modifier la propriété '%s' de '%s' à '%s',\n"
"mais elle existe déjà avec la valeur '%s'."
-#: libsvn_wc/props.c:2131 libsvn_wc/props.c:2159 libsvn_wc/props.c:2304
-#: libsvn_wc/props.c:2519
+#: ../libsvn_wc/props.c:2131 ../libsvn_wc/props.c:2159
+#: ../libsvn_wc/props.c:2304 ../libsvn_wc/props.c:2519
msgid "Failed to load properties from disk"
msgstr "Échec au chargement des propriétés à partir du disque"
-#: libsvn_wc/props.c:2187
+#: ../libsvn_wc/props.c:2187
#, 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:2299 libsvn_wc/props.c:2463
+#: ../libsvn_wc/props.c:2299 ../libsvn_wc/props.c:2463
#, 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:2343
+#: ../libsvn_wc/props.c:2343
#, 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:2351
+#: ../libsvn_wc/props.c:2351
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Définition de '%s' sur un fichier ('%s') impossible"
-#: libsvn_wc/props.c:2357
+#: ../libsvn_wc/props.c:2357
#, 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:2438
+#: ../libsvn_wc/props.c:2438
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Le fichier '%s' a un type mime binaire"
-#: libsvn_wc/props.c:3197 libsvn_wc/props.c:3264
+#: ../libsvn_wc/props.c:3197 ../libsvn_wc/props.c:3264
#, 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:3314
+#: ../libsvn_wc/props.c:3314
#, c-format
msgid ""
"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
@@ -5802,7 +5840,7 @@
"Propriété %s invalide sur '%s' : la cible '%s' est un chemin absolu ou "
"utilise '..'"
-#: libsvn_wc/questions.c:122
+#: ../libsvn_wc/questions.c:122
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5811,7 +5849,7 @@
"Le format de la copie de travail '%s' est trop ancien (%d) ; extraire une "
"nouvelle copie de travail"
-#: libsvn_wc/questions.c:133
+#: ../libsvn_wc/questions.c:133
#, c-format
msgid ""
"This client is too old to work with working copy '%s'. You need\n"
@@ -5824,7 +5862,7 @@
"bien de déclasser la copie de travail. Voir pour les détails :\n"
"http://subversion.tigris.org/faq.html#working-copy-format-change."
-#: libsvn_wc/questions.c:344
+#: ../libsvn_wc/questions.c:344
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5836,34 +5874,34 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_wc/relocate.c:78
+#: ../libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr ""
"La relocalisation (relocate) ne peut changer que la partie dépôt d'une URL"
-#: libsvn_wc/update_editor.c:478
+#: ../libsvn_wc/update_editor.c:482
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Pas d'entrée '.' dans : '%s'"
-#: libsvn_wc/update_editor.c:975
+#: ../libsvn_wc/update_editor.c:979
#, 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:1087
+#: ../libsvn_wc/update_editor.c:1091
#, 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:1259
+#: ../libsvn_wc/update_editor.c:1263
#, 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:1292
+#: ../libsvn_wc/update_editor.c:1296
#, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5872,7 +5910,7 @@
"É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:1314
+#: ../libsvn_wc/update_editor.c:1318
#, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5881,7 +5919,7 @@
"Échec de l'ajout du répertoire '%s' : répertoire versionné de même nom "
"existe déjà"
-#: libsvn_wc/update_editor.c:1325
+#: ../libsvn_wc/update_editor.c:1329
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5890,18 +5928,18 @@
"Échec à l'ajout du répertoire '%s' : objet du même nom que le répertoire "
"d'administration"
-#: libsvn_wc/update_editor.c:1339
+#: ../libsvn_wc/update_editor.c:1343
#, 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:1630
+#: ../libsvn_wc/update_editor.c:1637
msgid "Couldn't do property merge"
msgstr "Fusion de propriété impossible"
-#: libsvn_wc/update_editor.c:1699
+#: ../libsvn_wc/update_editor.c:1710
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5910,11 +5948,11 @@
"É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:1772
+#: ../libsvn_wc/update_editor.c:1783
msgid "Bad copyfrom arguments received"
msgstr "Mauvais arguments pour la source d'une copie"
-#: libsvn_wc/update_editor.c:1811
+#: ../libsvn_wc/update_editor.c:1822
#, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5923,111 +5961,139 @@
"É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:1823
+#: ../libsvn_wc/update_editor.c:1834
#, 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:1838
+#: ../libsvn_wc/update_editor.c:1849
#, 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:1896
+#: ../libsvn_wc/update_editor.c:1907
#, 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:2043
+#: ../libsvn_wc/update_editor.c:2054
#, 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:2771
+#: ../libsvn_wc/update_editor.c:2787
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:2786
+#: ../libsvn_wc/update_editor.c:2802
msgid "Destination URLs are broken"
msgstr "Les URLs destination sont incorrectes"
-#: libsvn_wc/update_editor.c:3022
+#: ../libsvn_wc/update_editor.c:3038
msgid "No fetch_func supplied to update_editor"
msgstr "Pas de 'fetch_func' fourni à 'update_editor'"
-#: libsvn_wc/update_editor.c:3623
+#: ../libsvn_wc/update_editor.c:3652
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' n'a pas d'ancêtre"
-#: libsvn_wc/update_editor.c:3777
+#: ../libsvn_wc/update_editor.c:3806
#, 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'"
-#: libsvn_wc/util.c:53
+#: ../libsvn_wc/util.c:53
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' n'est pas un répertoire"
-#: libsvn_wc/util.c:85
+#: ../libsvn_wc/util.c:85
msgid "Unable to make any directories"
msgstr "Impossible de créer des répertoires"
-#: libsvn_wc/util.c:281
+#: ../libsvn_wc/util.c:281
#, c-format
msgid "Cannot find a URL for '%s'"
msgstr "Impossible de trouver une URL pour '%s'"
-#: svn/blame-cmd.c:247 svn/list-cmd.c:233
+#: ../svn/blame-cmd.c:247 ../svn/list-cmd.c:233
msgid "'verbose' option invalid in XML mode"
msgstr "Option 'verbose' invalide en mode XML"
-#: svn/blame-cmd.c:259 svn/info-cmd.c:500 svn/list-cmd.c:245
-#: svn/status-cmd.c:273
+#: ../svn/blame-cmd.c:259 ../svn/info-cmd.c:500 ../svn/list-cmd.c:245
+#: ../svn/status-cmd.c:273
msgid "'incremental' option only valid in XML mode"
msgstr "Option 'incremental' valide seulement en mode XML"
-#: svn/blame-cmd.c:322
+#: ../svn/blame-cmd.c:322
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Omission du fichier binaire : '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
+#: ../svn/checkout-cmd.c:129 ../svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' ne semble pas être une URL"
-#: svn/conflict-callbacks.c:125
+#: ../svn/conflict-callbacks.c:134
+msgid "No editor found."
+msgstr "Aucun éditeur n'a été trouvé."
+
+#: ../svn/conflict-callbacks.c:141
+msgid "Error running editor."
+msgstr "Erreur à l'exécution de l'éditeur."
+
+#: ../svn/conflict-callbacks.c:151
+#, c-format
+msgid ""
+"Invalid option; there's no merged version to edit.\n"
+"\n"
+msgstr ""
+"Option invalide : il n'y a pas de version fusionnée à éditer.\n"
+"\n"
+
+#: ../svn/conflict-callbacks.c:173
+msgid "No merge tool found.\n"
+msgstr "Aucun outil de fusion n'a été trouvé.\n"
+
+#: ../svn/conflict-callbacks.c:180
+msgid "Error running merge tool."
+msgstr "Erreur à l'exécution de l'outil de fusion."
+
+#: ../svn/conflict-callbacks.c:240
msgid "No editor found, leaving all conflicts."
msgstr "Pas d'éditeur, tous les conflits sont laissés en l'état."
-#: svn/conflict-callbacks.c:134
+#: ../svn/conflict-callbacks.c:249
msgid "Error running editor, leaving all conflicts."
msgstr ""
"Erreur à l'exécution de l'éditeur, tous les conflits sont laissés en place."
-#: svn/conflict-callbacks.c:166 svn/conflict-callbacks.c:390
-msgid "No merge tool found.\n"
-msgstr "Aucun outil de fusion n'a été trouvé.\n"
+#: ../svn/conflict-callbacks.c:281
+msgid "No merge tool found, leaving all conflicts."
+msgstr ""
+"Pas d'outils de gestion de conflit, les conflits sont laissés en l'état."
-#: svn/conflict-callbacks.c:174 svn/conflict-callbacks.c:397
-msgid "Error running merge tool."
-msgstr "Erreur à l'exécution de l'outil de fusion."
+#: ../svn/conflict-callbacks.c:290
+msgid "Error running merge tool leaving all conflicts."
+msgstr ""
+"Erreur de l'outils de gestion de conflits, les conflits sont laissés en "
+"l'état."
-#: svn/conflict-callbacks.c:208
+#: ../svn/conflict-callbacks.c:326
#, c-format
msgid "Conflict discovered in '%s'.\n"
msgstr "Conflit découvert dans '%s'.\n"
-#: svn/conflict-callbacks.c:213
+#: ../svn/conflict-callbacks.c:331
#, c-format
msgid "Conflict for property '%s' discovered on '%s'.\n"
msgstr "Conflit sur la propriété '%s' découvert sur '%s'.\n"
-#: svn/conflict-callbacks.c:230
+#: ../svn/conflict-callbacks.c:348
#, c-format
msgid ""
"They want to delete the property, you want to change the value to '%s'.\n"
@@ -6035,7 +6101,7 @@
"Ils veulent effacer la propriété, vous voulez en modifier la valeur en '%"
"s'.\n"
-#: svn/conflict-callbacks.c:239
+#: ../svn/conflict-callbacks.c:357
#, c-format
msgid ""
"They want to change the property value to '%s', you want to delete the "
@@ -6044,27 +6110,27 @@
"Ils veulent modifier la valeur de la propriété en '%s, vous voulez "
"l'effacer.\n"
-#: svn/conflict-callbacks.c:261
+#: ../svn/conflict-callbacks.c:379
msgid "Select: (p)ostpone"
msgstr "Sélectionner : re(p)ort"
-#: svn/conflict-callbacks.c:263
+#: ../svn/conflict-callbacks.c:381
msgid ", (d)iff, (e)dit"
msgstr ", (d)iff, (e)dite"
-#: svn/conflict-callbacks.c:266
+#: ../svn/conflict-callbacks.c:384
msgid ", (m)ine, (t)heirs"
msgstr ", (m)ienne, au(t)res"
-#: svn/conflict-callbacks.c:269
+#: ../svn/conflict-callbacks.c:387
msgid ", (r)esolved"
msgstr ", (r)ésolu"
-#: svn/conflict-callbacks.c:271
+#: ../svn/conflict-callbacks.c:389
msgid ", (h)elp for more options : "
msgstr ", (h) aide pour plus d'options : "
-#: svn/conflict-callbacks.c:278
+#: ../svn/conflict-callbacks.c:400
#, c-format
msgid ""
" (p)ostpone - mark the conflict to be resolved later\n"
@@ -6087,7 +6153,7 @@
" (h) aide - affiche cette liste\n"
"\n"
-#: svn/conflict-callbacks.c:313
+#: ../svn/conflict-callbacks.c:430
#, c-format
msgid ""
"Invalid option; there's no merged version to diff.\n"
@@ -6096,24 +6162,7 @@
"Option invalide ; il n'y a pas de version fusionnée à différentier.\n"
"\n"
-#: svn/conflict-callbacks.c:355
-msgid "No editor found."
-msgstr "Aucun éditeur n'a été trouvé."
-
-#: svn/conflict-callbacks.c:362
-msgid "Error running editor."
-msgstr "Erreur à l'exécution de l'éditeur."
-
-#: svn/conflict-callbacks.c:372
-#, c-format
-msgid ""
-"Invalid option; there's no merged version to edit.\n"
-"\n"
-msgstr ""
-"Option invalide : il n'y a pas de version fusionnée à éditer.\n"
-"\n"
-
-#: svn/conflict-callbacks.c:407 svn/conflict-callbacks.c:421
+#: ../svn/conflict-callbacks.c:448 ../svn/conflict-callbacks.c:462
#, c-format
msgid ""
"Invalid option.\n"
@@ -6122,7 +6171,7 @@
"Option invalide.\n"
"\n"
-#: svn/conflict-callbacks.c:451
+#: ../svn/conflict-callbacks.c:492
#, c-format
msgid ""
"Conflict discovered when trying to add '%s'.\n"
@@ -6131,11 +6180,11 @@
"Conflit découvert en essayant d'ajouter '%s'.\n"
"Un objet de même nom existe déjà.\n"
-#: svn/conflict-callbacks.c:454
+#: ../svn/conflict-callbacks.c:495
msgid "Select: (p)ostpone, (m)ine, (t)heirs, (h)elp :"
msgstr "Sélectionner : re(p)ort, (m)ienne, au(t)res, (h) aide :"
-#: svn/conflict-callbacks.c:465
+#: ../svn/conflict-callbacks.c:506
#, c-format
msgid ""
" (p)ostpone - resolve the conflict later\n"
@@ -6150,36 +6199,40 @@
" (h) aide - affiche cette liste\n"
"\n"
-#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:65 svn/move-cmd.c:76
-#: svn/propedit-cmd.c:202
+#: ../svn/copy-cmd.c:125 ../svn/delete-cmd.c:64 ../svn/mkdir-cmd.c:65
+#: ../svn/move-cmd.c:76 ../svn/propedit-cmd.c:202
msgid ""
"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
"Opération locale sans propagation (commit), pas de message ni de propriété "
"de révision"
-#: svn/diff-cmd.c:119 svnserve/main.c:530
+#: ../svn/diff-cmd.c:171 ../svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "La sortie standard (stdout) ne peut être ouverte"
-#: svn/diff-cmd.c:121
+#: ../svn/diff-cmd.c:173
#, c-format
msgid "Can't open stderr"
msgstr "La sortie d'erreur (stderr) ne peut être ouverte"
-#: svn/diff-cmd.c:210
+#: ../svn/diff-cmd.c:182
+msgid "'--xml' option only valid with '--summarize' option"
+msgstr "Option '--xml' valide seulement avec l'option '--summarize'"
+
+#: ../svn/diff-cmd.c:279
msgid "'--new' option only valid with '--old' option"
msgstr "Option '--new' valide seulement avec l'option '--old'"
-#: svn/diff-cmd.c:240
+#: ../svn/diff-cmd.c:309
#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr ""
"La liste des cibles de 'diff' ne peut contenir à la fois des chemins dans la "
"copie de travail et des URLs"
-#: svn/export-cmd.c:87
+#: ../svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -6187,7 +6240,7 @@
"Le répertoire de destination existe ; Enlever le répertoire ou utiliser --"
"force pour l'écraser"
-#: svn/help-cmd.c:45
+#: ../svn/help-cmd.c:45
#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
@@ -6215,7 +6268,7 @@
"\n"
"Sous-commandes disponibles :\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"
@@ -6223,7 +6276,7 @@
"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:1429
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1429
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -6231,191 +6284,191 @@
"Les modules d'accès à un dépôt (RA) suivants sont disponibles :\n"
"\n"
-#: svn/import-cmd.c:82
+#: ../svn/import-cmd.c:82
msgid "Repository URL required when importing"
msgstr "URL de dépôt requise pour importer"
-#: svn/import-cmd.c:86
+#: ../svn/import-cmd.c:86
msgid "Too many arguments to import command"
msgstr "Trop d'arguments à la commande import"
-#: svn/import-cmd.c:101
+#: ../svn/import-cmd.c:101
#, c-format
msgid "Invalid URL '%s'"
msgstr "URL invalide '%s'"
-#: svn/info-cmd.c:90
+#: ../svn/info-cmd.c:90
#, c-format
msgid "'%s' has invalid revision"
msgstr "'%s' a une révision invalide"
-#: svn/info-cmd.c:239 svn/mergeinfo-cmd.c:111 svnadmin/main.c:1146
+#: ../svn/info-cmd.c:239 ../svn/mergeinfo-cmd.c:111 ../svnadmin/main.c:1146
#, c-format
msgid "Path: %s\n"
msgstr "Chemin : %s\n"
-#: svn/info-cmd.c:245 svnlook/main.c:778
+#: ../svn/info-cmd.c:245
#, c-format
msgid "Name: %s\n"
msgstr "Nom : %s\n"
-#: svn/info-cmd.c:249
+#: ../svn/info-cmd.c:249
#, c-format
msgid "URL: %s\n"
msgstr "URL : %s\n"
-#: svn/info-cmd.c:252
+#: ../svn/info-cmd.c:252
#, c-format
msgid "Repository Root: %s\n"
msgstr "Racine du dépôt : %s\n"
-#: svn/info-cmd.c:256
+#: ../svn/info-cmd.c:256
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID du dépôt : %s\n"
-#: svn/info-cmd.c:260
+#: ../svn/info-cmd.c:260
#, c-format
msgid "Revision: %ld\n"
msgstr "Révision : %ld\n"
-#: svn/info-cmd.c:265
+#: ../svn/info-cmd.c:265
#, c-format
msgid "Node Kind: file\n"
msgstr "Type de noeud : fichier\n"
-#: svn/info-cmd.c:269
+#: ../svn/info-cmd.c:269
#, c-format
msgid "Node Kind: directory\n"
msgstr "Type de noeud : répertoire\n"
-#: svn/info-cmd.c:273
+#: ../svn/info-cmd.c:273
#, c-format
msgid "Node Kind: none\n"
msgstr "Type de noeud : aucun\n"
-#: svn/info-cmd.c:278
+#: ../svn/info-cmd.c:278
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Type de noeud : inconnu\n"
-#: svn/info-cmd.c:287
+#: ../svn/info-cmd.c:287
#, c-format
msgid "Schedule: normal\n"
msgstr "Tâche programmée : normale\n"
-#: svn/info-cmd.c:291
+#: ../svn/info-cmd.c:291
#, c-format
msgid "Schedule: add\n"
msgstr "Tâche programmée : ajout\n"
-#: svn/info-cmd.c:295
+#: ../svn/info-cmd.c:295
#, c-format
msgid "Schedule: delete\n"
msgstr "Tâche programmée : suppression\n"
-#: svn/info-cmd.c:299
+#: ../svn/info-cmd.c:299
#, c-format
msgid "Schedule: replace\n"
msgstr "Tâche programmée : remplacement\n"
-#: svn/info-cmd.c:315
+#: ../svn/info-cmd.c:315
#, c-format
msgid "Depth: empty\n"
msgstr "Profondeur : vide\n"
-#: svn/info-cmd.c:319
+#: ../svn/info-cmd.c:319
#, c-format
msgid "Depth: files\n"
msgstr "Profondeur : fichiers\n"
-#: svn/info-cmd.c:323
+#: ../svn/info-cmd.c:323
#, c-format
msgid "Depth: immediates\n"
msgstr "Profondeur : immédiates\n"
#. Other depths should never happen here.
-#: svn/info-cmd.c:334
+#: ../svn/info-cmd.c:334
#, c-format
msgid "Depth: INVALID\n"
msgstr "Profondeur : INVALIDE\n"
-#: svn/info-cmd.c:338
+#: ../svn/info-cmd.c:338
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Copié à partir de l'URL : %s\n"
-#: svn/info-cmd.c:342
+#: ../svn/info-cmd.c:342
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Copié à partir de la révision : %ld\n"
-#: svn/info-cmd.c:347
+#: ../svn/info-cmd.c:347
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Auteur de la dernière modification : %s\n"
-#: svn/info-cmd.c:351
+#: ../svn/info-cmd.c:351
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Révision de la dernière modification : %ld\n"
-#: svn/info-cmd.c:356
+#: ../svn/info-cmd.c:356
msgid "Last Changed Date"
msgstr "Date de la dernière modification"
-#: svn/info-cmd.c:362
+#: ../svn/info-cmd.c:362
msgid "Text Last Updated"
msgstr "Texte mis à jour"
-#: svn/info-cmd.c:366
+#: ../svn/info-cmd.c:366
msgid "Properties Last Updated"
msgstr "Propriétés mises à jour"
-#: svn/info-cmd.c:369
+#: ../svn/info-cmd.c:369
#, c-format
msgid "Checksum: %s\n"
msgstr "Somme de contrôle : %s\n"
-#: svn/info-cmd.c:374
+#: ../svn/info-cmd.c:374
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Fichier de base précédent du conflit : %s\n"
-#: svn/info-cmd.c:380
+#: ../svn/info-cmd.c:380
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Fichier de travail précédent du conflit : %s\n"
-#: svn/info-cmd.c:385
+#: ../svn/info-cmd.c:385
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Fichier de base courant du conflit : %s\n"
-#: svn/info-cmd.c:390
+#: ../svn/info-cmd.c:390
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Fichier de propriétés du conflit : %s\n"
-#: svn/info-cmd.c:398
+#: ../svn/info-cmd.c:398
#, c-format
msgid "Lock Token: %s\n"
msgstr "Nom de verrou : %s\n"
-#: svn/info-cmd.c:402
+#: ../svn/info-cmd.c:402
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Propriétaire du verrou : %s\n"
-#: svn/info-cmd.c:407
+#: ../svn/info-cmd.c:407
msgid "Lock Created"
msgstr "Verrou créé"
-#: svn/info-cmd.c:411
+#: ../svn/info-cmd.c:411
msgid "Lock Expires"
msgstr "Verrou expire"
-#: svn/info-cmd.c:420
+#: ../svn/info-cmd.c:420
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -6424,7 +6477,7 @@
"Commentaire du verrou (%i lignes) :\n"
"%s\n"
-#: svn/info-cmd.c:421
+#: ../svn/info-cmd.c:421
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -6433,12 +6486,12 @@
"Commentaire du verrou (%i ligne) :\n"
"%s\n"
-#: svn/info-cmd.c:428
+#: ../svn/info-cmd.c:428
#, c-format
msgid "Changelist: %s\n"
msgstr "Liste de changements : %s\n"
-#: svn/info-cmd.c:536
+#: ../svn/info-cmd.c:536
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -6447,7 +6500,7 @@
"%s : (ressource non versionnée)\n"
"\n"
-#: svn/info-cmd.c:545
+#: ../svn/info-cmd.c:545
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -6456,95 +6509,96 @@
"%s : (URL non valide)\n"
"\n"
-#: svn/list-cmd.c:90
+#: ../svn/list-cmd.c:90
msgid "%b %d %H:%M"
msgstr "%d %b, %H:%M"
-#: svn/list-cmd.c:95
+#: ../svn/list-cmd.c:95
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: svn/lock-cmd.c:53
+#: ../svn/lock-cmd.c:53
msgid "Lock comment contains a zero byte"
msgstr "Le commentaire du verrou contient un octet 0"
-#: svn/log-cmd.c:176
+#: ../svn/log-cmd.c:176
msgid "(no author)"
msgstr "(pas d'auteur)"
-#: svn/log-cmd.c:187
+#: ../svn/log-cmd.c:187
msgid "(no date)"
msgstr "(pas de date)"
-#: svn/log-cmd.c:217
+#: ../svn/log-cmd.c:217
#, c-format
msgid "Changed paths:\n"
msgstr "Chemins modifiés :\n"
-#: svn/log-cmd.c:232
+#: ../svn/log-cmd.c:232
#, c-format
msgid " (from %s:%ld)"
msgstr " (de %s:%ld)"
#. Print the result of merge line
-#: svn/log-cmd.c:247
+#: ../svn/log-cmd.c:247
#, c-format
msgid "Result of a merge from:"
msgstr "Résultat d'un merge de :"
-#: svn/log-cmd.c:462
+#: ../svn/log-cmd.c:462
msgid "'with-all-revprops' option only valid in XML mode"
msgstr "Option 'with-all-revprops' valide seulement en mode XML"
-#: svn/log-cmd.c:466
+#: ../svn/log-cmd.c:466
msgid "'with-revprop' option only valid in XML mode"
msgstr "Option 'with-revprop' valide seulement en mode XML"
-#: svn/log-cmd.c:482 svn/propset-cmd.c:106
+#: ../svn/log-cmd.c:482 ../svn/propset-cmd.c:106
#, c-format
msgid "no such changelist '%s'"
msgstr "Pas de liste de changements '%s'"
-#: svn/log-cmd.c:550
+#: ../svn/log-cmd.c:550
msgid "Only relative paths can be specified after a URL"
msgstr "Ne préciser que des chemins relatifs après une URL"
-#: svn/log-cmd.c:590
+#: ../svn/log-cmd.c:590
#, c-format
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "Impossible d'affecter l'option 'with-revprop' ('=' jeté)"
-#: svn/main.c:60
+#: ../svn/main.c:60
msgid "force operation to run"
msgstr "force l'exécution de l'opération"
-#: svn/main.c:62
+#: ../svn/main.c:62
msgid "force validity of log message source"
msgstr "valide la source de l'entrée du journal"
-#: 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:92
-#: svnlook/main.c:104 svnsync/main.c:138 svnsync/main.c:140
+#: ../svn/main.c:63 ../svn/main.c:64 ../svnadmin/main.c:231
+#: ../svnadmin/main.c:234 ../svndumpfilter/main.c:774
+#: ../svndumpfilter/main.c:777 ../svnlook/main.c:92 ../svnlook/main.c:104
+#: ../svnsync/main.c:138 ../svnsync/main.c:140
msgid "show help on a subcommand"
msgstr "affiche l'aide sur une sous-commande"
-#: svn/main.c:65
+#: ../svn/main.c:65
msgid "specify log message ARG"
msgstr "donne le message de propagation ARG"
-#: svn/main.c:66
+#: ../svn/main.c:66
msgid "print nothing, or only summary information"
msgstr "n'affiche rien, ou seulement des informations résumées"
-#: svn/main.c:67
+#: ../svn/main.c:67
msgid "descend recursively, same as --depth=infinity"
msgstr "descent récursivement, comme avec --depth=infinity"
-#: svn/main.c:68
+#: ../svn/main.c:68
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr "obsolète : essayer --depth=files ou --depth=immediates"
-#: svn/main.c:70
+#: ../svn/main.c:70
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -6552,7 +6606,7 @@
"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:74
+#: ../svn/main.c:74
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -6573,41 +6627,41 @@
" 'COMMITTED' dernière propagation à ou avant BASE\n"
" 'PREV' révision juste avant COMMITTED"
-#: svn/main.c:84
+#: ../svn/main.c:84
msgid "read log message from file ARG"
msgstr "lit le message de propagation à partir du fichier ARG"
-#: svn/main.c:86
+#: ../svn/main.c:86
msgid "give output suitable for concatenation"
msgstr "produit une sortie concaténable"
-#: svn/main.c:89
+#: ../svn/main.c:89
msgid "treat value as being in charset encoding ARG"
msgstr "interprète les caractères comme encodés en ARG"
-#: svn/main.c:92 svnadmin/main.c:237 svndumpfilter/main.c:786
-#: svnlook/main.c:134 svnserve/main.c:151 svnsync/main.c:136
-#: svnversion/main.c:126
+#: ../svn/main.c:92 ../svnadmin/main.c:237 ../svndumpfilter/main.c:780
+#: ../svnlook/main.c:134 ../svnserve/main.c:151 ../svnsync/main.c:136
+#: ../svnversion/main.c:126
msgid "show program version information"
msgstr "affiche la version du programme"
-#: svn/main.c:93
+#: ../svn/main.c:93
msgid "print extra information"
msgstr "affiche plus d'informations"
-#: svn/main.c:94
+#: ../svn/main.c:94
msgid "display update information"
msgstr "affiche les mises à jour"
-#: svn/main.c:96
+#: ../svn/main.c:96
msgid "specify a username ARG"
msgstr "précise le nom d'utilisateur ARG"
-#: svn/main.c:98
+#: ../svn/main.c:98
msgid "specify a password ARG"
msgstr "précise le mot de passe ARG"
-#: svn/main.c:101 svnlook/main.c:138
+#: ../svn/main.c:101 ../svnlook/main.c:138
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed "
@@ -6642,11 +6696,11 @@
" --ignore-eol-style : \n"
" ignore les changements de style de fin de ligne (eol)."
-#: svn/main.c:130
+#: ../svn/main.c:130
msgid "pass contents of file ARG as additional args"
msgstr "passe le contenu du fichier ARG comme des arguments"
-#: svn/main.c:132
+#: ../svn/main.c:132
msgid ""
"pass depth ('empty', 'files', 'immediates', or\n"
" 'infinity') as ARG"
@@ -6654,95 +6708,95 @@
"passe la profondeur (depth empty/files/\n"
" immediates/infinity) en argument"
-#: svn/main.c:135
+#: ../svn/main.c:135
msgid "output in XML"
msgstr "sortie XML"
-#: svn/main.c:136
+#: ../svn/main.c:136
msgid "use strict semantics"
msgstr "sémantique stricte"
-#: svn/main.c:138
+#: ../svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "arrête aux copies lors du parcours de l'historique"
-#: svn/main.c:140
+#: ../svn/main.c:140
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:142 svnsync/main.c:116
+#: ../svn/main.c:142 ../svnsync/main.c:116
msgid "do not cache authentication tokens"
msgstr "ne conserve pas les éléments d'authentification"
-#: svn/main.c:144 svnsync/main.c:114
+#: ../svn/main.c:144 ../svnsync/main.c:114
msgid "do no interactive prompting"
msgstr "pas de demande interactive"
-#: svn/main.c:146
+#: ../svn/main.c:146
msgid "try operation but make no changes"
msgstr "essaie l'opération sans l'exécuter réellement"
-#: svn/main.c:148 svnlook/main.c:113
+#: ../svn/main.c:148 ../svnlook/main.c:113
msgid "do not print differences for deleted files"
msgstr "n'affiche pas les différences pour les fichiers supprimés"
-#: svn/main.c:150
+#: ../svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "prend en compte l'héritage pour évaluer les différences"
-#: svn/main.c:152
+#: ../svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "ignore l'héritage lors d'une fusion"
-#: svn/main.c:154
+#: ../svn/main.c:154
msgid "ignore externals definitions"
msgstr "ignore les références externes"
-#: svn/main.c:157
+#: ../svn/main.c:157
msgid "use ARG as diff command"
msgstr "utilise ARG comme commande diff"
-#: svn/main.c:159
+#: ../svn/main.c:159
msgid "use ARG as merge command"
msgstr "utilise ARG comme commande de fusion"
-#: svn/main.c:161
+#: ../svn/main.c:161
msgid "use ARG as external editor"
msgstr "utilise ARG comme éditeur externe"
-#: svn/main.c:164
+#: ../svn/main.c:164
msgid "mark revisions as merged (use with -r)"
msgstr "note la révision comme fusionnée (utiliser avec -r)"
-#: svn/main.c:166
+#: ../svn/main.c:166
msgid "use ARG as the older target"
msgstr "utilise ARG comme ancienne cible"
-#: svn/main.c:168
+#: ../svn/main.c:168
msgid "use ARG as the newer target"
msgstr "utilise ARG comme nouvelle cible"
-#: svn/main.c:170
+#: ../svn/main.c:170
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:172
+#: ../svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "re-localise par réécriture d'URL"
-#: svn/main.c:174 svnadmin/main.c:273 svnsync/main.c:134
+#: ../svn/main.c:174 ../svnadmin/main.c:273 ../svnsync/main.c:134
msgid "read user configuration files from directory ARG"
msgstr "fichiers de configuration dans ce répertoire"
-#: svn/main.c:176
+#: ../svn/main.c:176
msgid "enable automatic properties"
msgstr "active les propriétés automatiques"
-#: svn/main.c:178
+#: ../svn/main.c:178
msgid "disable automatic properties"
msgstr "désactive les propriétés automatiques"
-#: svn/main.c:180
+#: ../svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6753,39 +6807,39 @@
" un svn:eol-style de valeur 'native'.\n"
" ARG peut être 'LF', 'CR', 'CRLF'"
-#: svn/main.c:188
+#: ../svn/main.c:188
msgid "maximum number of log entries"
msgstr "nombre maximum d'entrées dans le journal (log)"
-#: svn/main.c:190
+#: ../svn/main.c:190
msgid "don't unlock the targets"
msgstr "ne pas déverrouiller les cibles"
-#: svn/main.c:192
+#: ../svn/main.c:192
msgid "show a summary of the results"
msgstr "affiche un résumé du résultat"
-#: svn/main.c:194
+#: ../svn/main.c:194
msgid "remove changelist association"
msgstr "efface l'association à une liste de changements"
-#: svn/main.c:196
+#: ../svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "opère seulement sur les membres de la liste de changements ARG"
-#: svn/main.c:198
+#: ../svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "n'efface pas la liste de changements après propagation (commit)"
-#: svn/main.c:200
+#: ../svn/main.c:200
msgid "keep path in working copy"
msgstr "garder le chemin dans la copie de travail"
-#: svn/main.c:202
+#: ../svn/main.c:202
msgid "retrieve all revision properties"
msgstr "Retrouve toutes les propriétés de révision"
-#: svn/main.c:204
+#: ../svn/main.c:204
msgid ""
"set revision property ARG in new revision\n"
" using the name=value format"
@@ -6793,11 +6847,11 @@
"Défini la propriété de révision ARG pour la \n"
" nouvelle révision avec le format nom=valeur"
-#: svn/main.c:208
+#: ../svn/main.c:208
msgid "make intermediate directories"
msgstr "Crée des répertoires intermédiaires"
-#: svn/main.c:210
+#: ../svn/main.c:210
msgid ""
"use/display additional information from merge\n"
" history"
@@ -6805,7 +6859,7 @@
"utilise/affiche des informations supplémentaire de\n"
"l'historique de fusion (merge)"
-#: svn/main.c:214
+#: ../svn/main.c:214
msgid ""
"specify automatic conflict resolution action\n"
" ('"
@@ -6813,7 +6867,7 @@
"précise l'action de la résolution de conflit\n"
" ('"
-#: svn/main.c:261
+#: ../svn/main.c:261
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6823,11 +6877,11 @@
"prévoyant leur ajout au dépôt lors de la prochaine propagation (commit).\n"
"usage : add CHEMIN...\n"
-#: svn/main.c:267
+#: ../svn/main.c:267
msgid "add intermediate parents"
msgstr "ajoute les répertoires intermédiaires"
-#: svn/main.c:270
+#: ../svn/main.c:270
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6842,7 +6896,7 @@
"\n"
" Si précisée, REV détermine quelle révision est d'abord regardée.\n"
-#: svn/main.c:280
+#: ../svn/main.c:280
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6855,7 +6909,7 @@
"\n"
" Si précisée, REV détermine quelle révision est d'abord regardée.\n"
-#: svn/main.c:288
+#: ../svn/main.c:288
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
@@ -6865,7 +6919,7 @@
"usage : 1. changelist CLNOM CIBLE...\n"
" 2. changelist --remove CIBLE...\n"
-#: svn/main.c:294
+#: ../svn/main.c:294
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6911,7 +6965,7 @@
" modification locale à la copie de travail.\n"
" Toutes les propriétés stockées dans le dépôt sont appliquées aux objets.\n"
-#: svn/main.c:319
+#: ../svn/main.c:319
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6921,7 +6975,7 @@
"reprenant les opérations en cours, etc.\n"
"usage : cleanup [CHEMIN...]\n"
-#: svn/main.c:326
+#: ../svn/main.c:326
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6939,7 +6993,7 @@
" 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:334
+#: ../svn/main.c:334
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6958,7 +7012,7 @@
" (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:348
+#: ../svn/main.c:348
msgid ""
"Duplicate something in working copy or repository, remembering\n"
"history.\n"
@@ -6988,7 +7042,7 @@
" URL -> URL : copie côté serveur ; utilisée pour les branches et marques\n"
" Toutes les sources doivent être du même type.\n"
-#: svn/main.c:364
+#: ../svn/main.c:364
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -7018,7 +7072,7 @@
"\n"
" 2. Chaque URL est supprimée du dépôt via une propagation immédiate.\n"
-#: svn/main.c:381
+#: ../svn/main.c:381
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -7083,7 +7137,7 @@
" Utiliser simplement 'svn diff' pour afficher les modifications locales\n"
" dans la copie de travail.\n"
-#: svn/main.c:410
+#: ../svn/main.c:411
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -7121,7 +7175,7 @@
"\n"
" Si spécifiée, PEGREV donne la révision de la cible d'abord regardée.\n"
-#: svn/main.c:432
+#: ../svn/main.c:433
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -7129,7 +7183,7 @@
"Décrit l'usage de ce programme ou de ses sous-commandes.\n"
"usage : help [SOUS_COMMANDE...]\n"
-#: svn/main.c:438
+#: ../svn/main.c:439
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -7153,7 +7207,7 @@
" 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:453
+#: ../svn/main.c:454
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -7169,7 +7223,7 @@
" 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:464
+#: ../svn/main.c:465
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -7206,7 +7260,7 @@
" Taille (en octets)\n"
" Date et heure de la dernière propagation\n"
-#: svn/main.c:486
+#: ../svn/main.c:487
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -7220,15 +7274,19 @@
" Utiliser --force pour voler le verrou d'un autre utilisateur ou d'une\n"
" autre copie de travail.\n"
-#: svn/main.c:493
+#: ../svn/main.c:494
msgid "read lock comment from file ARG"
msgstr "lit les commentaire de verrouillage à partir du fichier ARG"
-#: svn/main.c:494
+#: ../svn/main.c:495
msgid "specify lock comment ARG"
msgstr "précise le commentaire de verrouillage ARG"
-#: svn/main.c:497
+#: ../svn/main.c:496
+msgid "force validity of lock comment source"
+msgstr "force la validité de la source du commentaire de verrouillage"
+
+#: ../svn/main.c:499
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -7283,16 +7341,16 @@
" 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:526
+#: ../svn/main.c:528
msgid "retrieve revision property ARG"
msgstr "Retrouve la propriété de révision ARG"
-#: svn/main.c:529
+#: ../svn/main.c:531
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]... | [-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"
@@ -7311,6 +7369,10 @@
" is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
" does the reverse: '-r M:<M-1>'. If neither N nor M is specified,\n"
" they default to OLDEST_CONTIGUOUS_REV_OF_SOURCE_AT_URL and HEAD.\n"
+" Multiple '-c' and/or '-r' may be specified and mixing of forward\n"
+" and reverse ranges is allowed, however the ranges are compacted\n"
+" to their minimum representation before merging begins (which may\n"
+" result in a no-op).\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"
@@ -7320,7 +7382,7 @@
"Applique les différences entre deux sources à une copie de travail.\n"
"usage : 1. merge URL1[@N] URL2[@M] [CHEMIN]\n"
" 2. merge CHEMIN1@N CHEMIN2@M [CHEMIN]\n"
-" 3. merge [-c M | -r N:M] [SOURCE[@REV] [CHEMIN]]\n"
+" 3. merge [[-c M]... | [-r N:M]...] [SOURCE[@REV] [CHEMIN]]\n"
"\n"
" 1. Les URLs des deux références sont précisées.\n"
" Les révisions peuvent aussi être précisées, si elles ne le\n"
@@ -7339,14 +7401,19 @@
" les révisions N et M. Si REV n'est pas précisée, HEAD est considérée.\n"
" L'option '-c M' est équivalente à '-r N:M' avec N = M-1.\n"
" Utiliser '-c -M' fait l'inverse : '-r M:N' avec N = M-1.\n"
-" Si l'intervalle de révision n'est pas précisé, le défaut est\n"
+" Si l'interval de révision n'est pas précisé, le défaut est\n"
" '-r plus_ancienne_révision_de_l'url_source:HEAD'.\n"
+" Plusieurs options '-c' et/ou '-r' peuvent être spécifiées, de même\n"
+" que le mélange d'intervals avant et arrière, cependant ces intervals\n"
+" sont fusionnés en une représentation mimimale avant l'opération, ce "
+"qui\n"
+" peut résulter en une opération vide.\n"
"\n"
" CHEMIN est l'élément à modifier dans la copie de travail. S'il est omis,\n"
" '.' est utilisé, sauf si les noms des sources ont un dernier composant\n"
" identique à un fichier dans '.', auquel cas ce fichier sera modifié.\n"
-#: svn/main.c:562
+#: ../svn/main.c:568
msgid ""
"Query merge-related information.\n"
"usage: mergeinfo [TARGET[@REV]...]\n"
@@ -7354,7 +7421,7 @@
"Demande les informations liées à la fusion (merge).\n"
"usage : mergeinfo [CIBLE[@REV]...]\n"
-#: svn/main.c:567
+#: ../svn/main.c:573
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -7383,7 +7450,7 @@
" 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:584
+#: ../svn/main.c:590
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -7414,7 +7481,7 @@
" URL -> URL : effectue un renommage côté serveur.\n"
" Toutes les sources doivent être du même type.\n"
-#: svn/main.c:601
+#: ../svn/main.c:607
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -7432,7 +7499,7 @@
" 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:613
+#: ../svn/main.c:619
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -7454,7 +7521,7 @@
"\n"
"Voir 'svn help propset' pour plus d'informations sur les propriétés.\n"
-#: svn/main.c:627
+#: ../svn/main.c:633
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -7487,7 +7554,7 @@
" 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:646
+#: ../svn/main.c:652
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -7507,7 +7574,7 @@
" 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:658
+#: ../svn/main.c:664
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -7628,11 +7695,11 @@
" 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:719
+#: ../svn/main.c:725
msgid "read property value from file ARG"
msgstr "prend la valeur d'une propriété dans le fichier ARG"
-#: svn/main.c:722
+#: ../svn/main.c:728
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -7648,7 +7715,7 @@
" supprime simplement les fichiers relatifs au conflit pour permettre une\n"
" propagation (commit) ultérieure.\n"
-#: svn/main.c:729
+#: ../svn/main.c:735
msgid ""
"specify automatic conflict resolution source\n"
" '"
@@ -7656,7 +7723,7 @@
"précise la source de la résolution automatique de conflit\n"
" '"
-#: svn/main.c:736
+#: ../svn/main.c:742
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -7670,7 +7737,7 @@
" 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:745
+#: ../svn/main.c:751
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -7821,7 +7888,7 @@
" 965 687 suzy wc/zig.c\n"
" État par rapport à la révision 981\n"
-#: svn/main.c:822
+#: ../svn/main.c:828
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -7873,7 +7940,7 @@
" modification locale à la copie de travail.\n"
" Toutes les propriétés stockées dans le dépôt sont appliquées aux objets.\n"
-#: svn/main.c:850
+#: ../svn/main.c:856
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7885,7 +7952,7 @@
"\n"
" Utiliser --force pour casser le verrou.\n"
-#: svn/main.c:857
+#: ../svn/main.c:863
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7951,51 +8018,52 @@
"colonne.\n"
"\n"
-#: svn/main.c:934 svnadmin/main.c:78 svnlook/main.c:329 svnsync/main.c:184
+#: ../svn/main.c:940 ../svnadmin/main.c:78 ../svnlook/main.c:329
+#: ../svnsync/main.c:184
msgid "Caught signal"
msgstr "Signal reçu"
-#: svn/main.c:953
+#: ../svn/main.c:959
msgid "Revision property pair is empty"
msgstr "La paire de la propriété de révision est vide"
-#: svn/main.c:973 svn/propedit-cmd.c:60 svn/propget-cmd.c:181
-#: svn/propset-cmd.c:65
+#: ../svn/main.c:979 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:181
+#: ../svn/propset-cmd.c:65
#, c-format
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' n'est pas un nom de propriété de Subversion valide"
-#: svn/main.c:1094 svnlook/main.c:2076
+#: ../svn/main.c:1100 ../svnlook/main.c:2083
msgid "Non-numeric limit argument given"
msgstr "L'argument de l'option limit doit être numérique"
-#: svn/main.c:1100 svnlook/main.c:2082
+#: ../svn/main.c:1106 ../svnlook/main.c:2089
msgid "Argument to --limit must be positive"
msgstr "L'argument de --limit doit être positif"
-#: svn/main.c:1120 svn/main.c:1327
+#: ../svn/main.c:1126 ../svn/main.c:1333
msgid "Can't specify -c with --old"
msgstr "Option -c incompatible avec --old"
-#: svn/main.c:1127
+#: ../svn/main.c:1133
msgid "Non-numeric change argument given to -c"
msgstr "L'argument de l'option -c doit être numérique"
-#: svn/main.c:1133
+#: ../svn/main.c:1139
msgid "There is no change 0"
msgstr "Il n'y a pas de changement (option -c) 0"
-#: svn/main.c:1168 svnadmin/main.c:1345
+#: ../svn/main.c:1174 ../svnadmin/main.c:1345
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Erreur de syntaxe à l'argument de révision '%s'"
-#: svn/main.c:1241
+#: ../svn/main.c:1247
#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Erreur en convertissant la profondeur de la 'locale' vers UTF8"
-#: svn/main.c:1248
+#: ../svn/main.c:1254
#, c-format
msgid ""
"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
@@ -8003,29 +8071,29 @@
"'%s' n'est pas un profondeur valide ; essayer 'empty' (vide), "
"'files' (fichiers), 'immediates' (immédiat) ou 'infinity' (infini)"
-#: svn/main.c:1355
+#: ../svn/main.c:1361
#, 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:1399
+#: ../svn/main.c:1405
#, c-format
msgid "'%s' is not a valid accept value"
msgstr "'%s' n'est pas une valeur d'acceptation valide"
-#: svn/main.c:1452 svndumpfilter/main.c:1207 svnlook/main.c:2154
+#: ../svn/main.c:1458 ../svndumpfilter/main.c:1201 ../svnlook/main.c:2161
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument de la sous-commande attendu\n"
-#: svn/main.c:1471 svnadmin/main.c:1477 svndumpfilter/main.c:1226
-#: svnlook/main.c:2173
+#: ../svn/main.c:1477 ../svnadmin/main.c:1477 ../svndumpfilter/main.c:1220
+#: ../svnlook/main.c:2180
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Commande inconnue : '%s'\n"
-#: svn/main.c:1505
+#: ../svn/main.c:1511
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8034,7 +8102,7 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svn help %s' pour l'aide.\n"
-#: svn/main.c:1519
+#: ../svn/main.c:1525
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -8042,17 +8110,17 @@
"Arguments de révision multiples : ne pas répéter -c, ou utiliser à la fois -"
"c et -r"
-#: svn/main.c:1572
+#: ../svn/main.c:1579
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:1579
+#: ../svn/main.c:1586
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:1599
+#: ../svn/main.c:1606
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8060,7 +8128,7 @@
"Le message de propagation donné est un chemin (-F était voulu ?) ; forcer "
"avec '--force-log'"
-#: svn/main.c:1606
+#: ../svn/main.c:1613
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8068,44 +8136,44 @@
"Le commentaire du verrou est un chemin de fichier (-F était voulu ?) ; "
"forcer avec '--force-log'"
-#: svn/main.c:1617
+#: ../svn/main.c:1624
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate et --depth sont mutuellement exclusives"
-#: svn/main.c:1674
+#: ../svn/main.c:1691
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props et --no-auto-props sont mutuellement exclusives"
-#: svn/main.c:1786 svn/main.c:1792
+#: ../svn/main.c:1803 ../svn/main.c:1809
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s incompatible avec --non-interactive"
-#: svn/main.c:1819
+#: ../svn/main.c:1836
msgid "Try 'svn help' for more info"
msgstr "Essayer 'svn help' pour plus d'information."
-#: svn/main.c:1829
+#: ../svn/main.c:1846
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"
-#: svn/merge-cmd.c:98
+#: ../svn/merge-cmd.c:98
msgid "Second revision required"
msgstr "Seconde révision attendue"
-#: svn/merge-cmd.c:107 svn/merge-cmd.c:133
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:133
msgid "Too many arguments given"
msgstr "Trop d'arguments donnés"
-#: svn/merge-cmd.c:149
+#: ../svn/merge-cmd.c:149
msgid "A working copy merge source needs an explicit revision"
msgstr ""
"Une fusion à partir de sources locales nécessite une révision explicite"
-#: svn/merge-cmd.c:222
+#: ../svn/merge-cmd.c:222
#, c-format
msgid ""
"Unable to determine merge source for '%s' -- please provide an explicit "
@@ -8114,12 +8182,12 @@
"Impossible de déterminer la source pour la fusion (merge) de '%s', merci de "
"fournir une source explicite"
-#: svn/mergeinfo-cmd.c:134
+#: ../svn/mergeinfo-cmd.c:134
#, c-format
msgid " Source path: %s\n"
msgstr " Chemin de la source : %s\n"
-#: svn/mergeinfo-cmd.c:136
+#: ../svn/mergeinfo-cmd.c:136
#, c-format
msgid " Merged ranges: "
msgstr " Révisions fusionnées : "
@@ -8133,55 +8201,55 @@
#. ### system. It may just mean the system has to work
#. ### harder to provide that information.
#.
-#: svn/mergeinfo-cmd.c:150
+#: ../svn/mergeinfo-cmd.c:150
#, c-format
msgid " Eligible ranges: "
msgstr " Fusions possibles : "
-#: svn/mergeinfo-cmd.c:163
+#: ../svn/mergeinfo-cmd.c:163
#, c-format
msgid "(source no longer available in HEAD)\n"
msgstr "(source non disponible à la révision de tête - HEAD)\n"
-#: svn/mkdir-cmd.c:87
+#: ../svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Essayer plutôt 'svn add' ou 'svn add --non-recursive' ?"
-#: svn/mkdir-cmd.c:93
+#: ../svn/mkdir-cmd.c:93
msgid "Try 'svn mkdir --parents' instead?"
msgstr "Essayer plutôt 'svn mkdir --parents' ?"
-#: svn/notify.c:72
+#: ../svn/notify.c:72
#, c-format
msgid "Skipped missing target: '%s'\n"
msgstr "Cible manquante omise : '%s'\n"
-#: svn/notify.c:79
+#: ../svn/notify.c:79
#, c-format
msgid "Skipped '%s'\n"
msgstr "'%s' omis\n"
-#: svn/notify.c:127
+#: ../svn/notify.c:127
#, c-format
msgid "Restored '%s'\n"
msgstr "'%s' restauré\n"
-#: svn/notify.c:133
+#: ../svn/notify.c:133
#, c-format
msgid "Reverted '%s'\n"
msgstr "'%s' réinitialisé\n"
-#: svn/notify.c:139
+#: ../svn/notify.c:139
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr "Échec à la réinitialisation de '%s' ; essayer une mise à jour.\n"
-#: svn/notify.c:147
+#: ../svn/notify.c:147
#, c-format
msgid "Resolved conflicted state of '%s'\n"
msgstr "Conflit sur '%s' résolu\n"
-#: svn/notify.c:228
+#: ../svn/notify.c:228
#, c-format
msgid ""
"\n"
@@ -8190,77 +8258,77 @@
"\n"
"Récupération de la référence externe dans '%s'\n"
-#: svn/notify.c:243
+#: ../svn/notify.c:243
#, c-format
msgid "Exported external at revision %ld.\n"
msgstr "Référence externe exportée à la révision %ld.\n"
-#: svn/notify.c:244
+#: ../svn/notify.c:244
#, c-format
msgid "Exported revision %ld.\n"
msgstr "Exporté à la révision %ld.\n"
-#: svn/notify.c:252
+#: ../svn/notify.c:252
#, c-format
msgid "Checked out external at revision %ld.\n"
msgstr "Référence externe extraite à la révision %ld.\n"
-#: svn/notify.c:253
+#: ../svn/notify.c:253
#, c-format
msgid "Checked out revision %ld.\n"
msgstr "Révision %ld extraite.\n"
-#: svn/notify.c:263
+#: ../svn/notify.c:263
#, c-format
msgid "Updated external to revision %ld.\n"
msgstr "Référence externe actualisée à la révision %ld.\n"
-#: svn/notify.c:264
+#: ../svn/notify.c:264
#, c-format
msgid "Updated to revision %ld.\n"
msgstr "Actualisé à la révision %ld.\n"
-#: svn/notify.c:272
+#: ../svn/notify.c:272
#, c-format
msgid "External at revision %ld.\n"
msgstr "Référence externe à la révision %ld.\n"
-#: svn/notify.c:273
+#: ../svn/notify.c:273
#, c-format
msgid "At revision %ld.\n"
msgstr "À la révision %ld.\n"
-#: svn/notify.c:285
+#: ../svn/notify.c:285
#, c-format
msgid "External export complete.\n"
msgstr "Fin d'exportation d'une référence externe.\n"
-#: svn/notify.c:286
+#: ../svn/notify.c:286
#, c-format
msgid "Export complete.\n"
msgstr "Fin d'exportation.\n"
-#: svn/notify.c:293
+#: ../svn/notify.c:293
#, c-format
msgid "External checkout complete.\n"
msgstr "Fin d'extraction d'une référence externe.\n"
-#: svn/notify.c:294
+#: ../svn/notify.c:294
#, c-format
msgid "Checkout complete.\n"
msgstr "Fin d'extraction.\n"
-#: svn/notify.c:301
+#: ../svn/notify.c:301
#, c-format
msgid "External update complete.\n"
msgstr "Fin d'actualisation d'une référence externe.\n"
-#: svn/notify.c:302
+#: ../svn/notify.c:302
#, c-format
msgid "Update complete.\n"
msgstr "Fin d'actualisation.\n"
-#: svn/notify.c:318
+#: ../svn/notify.c:318
#, c-format
msgid ""
"\n"
@@ -8269,158 +8337,158 @@
"\n"
"Vérification de l'état sur la référence externe en '%s'\n"
-#: svn/notify.c:326
+#: ../svn/notify.c:326
#, c-format
msgid "Status against revision: %6ld\n"
msgstr "État par rapport à la révision %6ld\n"
# Align the %s's on this and the following 4 messages
-#: svn/notify.c:334
+#: ../svn/notify.c:334
#, c-format
msgid "Sending %s\n"
msgstr "Envoi %s\n"
-#: svn/notify.c:343
+#: ../svn/notify.c:343
#, c-format
msgid "Adding (bin) %s\n"
msgstr "Ajout (bin) %s\n"
-#: svn/notify.c:350
+#: ../svn/notify.c:350
#, c-format
msgid "Adding %s\n"
msgstr "Ajout %s\n"
-#: svn/notify.c:357
+#: ../svn/notify.c:357
#, c-format
msgid "Deleting %s\n"
msgstr "Suppression %s\n"
-#: svn/notify.c:364
+#: ../svn/notify.c:364
#, c-format
msgid "Replacing %s\n"
msgstr "Remplacement %s\n"
-#: svn/notify.c:374 svnsync/main.c:655
+#: ../svn/notify.c:374 ../svnsync/main.c:655
#, c-format
msgid "Transmitting file data "
msgstr "Transmission des données "
-#: svn/notify.c:383
+#: ../svn/notify.c:383
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "'%s' verrouillé par l'utilisateur '%s'.\n"
-#: svn/notify.c:389
+#: ../svn/notify.c:389
#, c-format
msgid "'%s' unlocked.\n"
msgstr "'%s' déverrouillé.\n"
-#: svn/notify.c:400
+#: ../svn/notify.c:400
#, c-format
msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr ""
"Le chemin '%s' fait maintenant partie de la liste de changement '%s'.\n"
-#: svn/notify.c:408
+#: ../svn/notify.c:408
#, c-format
msgid "Path '%s' is no longer a member of a changelist.\n"
msgstr "Le chemin '%s' n'est plus associé à une liste de changements.\n"
-#: svn/notify.c:427
+#: ../svn/notify.c:427
#, c-format
msgid "--- Merging differences between repository URLs into '%s':\n"
msgstr "--- Fusion des différences des URLs du dépôt vers '%s' :\n"
-#: svn/notify.c:432
+#: ../svn/notify.c:432
#, c-format
msgid "--- Merging r%ld into '%s':\n"
msgstr "--- Fusion de r%ld dans '%s':\n"
-#: svn/notify.c:436
+#: ../svn/notify.c:436
#, c-format
msgid "--- Reverse-merging r%ld into '%s':\n"
msgstr "--- Fusion inverse de r%ld dans '%s' :\n"
-#: svn/notify.c:440
+#: ../svn/notify.c:440
#, c-format
msgid "--- Merging r%ld through r%ld into '%s':\n"
msgstr "--- Fusion de r%ld à r%ld dans '%s':\n"
-#: svn/notify.c:446
+#: ../svn/notify.c:446
#, c-format
msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
msgstr "--- Fusion inverse de r%ld à r%ld dans '%s' :\n"
-#: svn/propdel-cmd.c:105
+#: ../svn/propdel-cmd.c:105
#, c-format
msgid "property '%s' deleted from repository revision %ld\n"
msgstr "Propriété '%s' supprimée de la révision %ld du dépôt\n"
-#: svn/propdel-cmd.c:114
+#: ../svn/propdel-cmd.c:114
#, c-format
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr ""
"Ne pas préciser la révision pour supprimer la propriété versionnée '%s'"
-#: svn/propdel-cmd.c:152
+#: ../svn/propdel-cmd.c:152
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "Propriété '%s' supprimée récursivement de '%s'.\n"
-#: svn/propdel-cmd.c:153
+#: ../svn/propdel-cmd.c:153
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "Propriété '%s' supprimée de '%s'.\n"
-#: svn/propedit-cmd.c:106 svn/propedit-cmd.c:245 svn/propset-cmd.c:90
+#: ../svn/propedit-cmd.c:106 ../svn/propedit-cmd.c:245 ../svn/propset-cmd.c:90
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Mauvais encodage : la valeur de la propriété n'est pas stockée en UTF8"
-#: svn/propedit-cmd.c:115
+#: ../svn/propedit-cmd.c:115
#, c-format
msgid "Set new value for property '%s' on revision %ld\n"
msgstr "Nouvelle valeur de la propriété '%s' définie à la révision %ld\n"
-#: svn/propedit-cmd.c:121
+#: ../svn/propedit-cmd.c:121
#, c-format
msgid "No changes to property '%s' on revision %ld\n"
msgstr "Pas de modification de la propriété '%s' à la révision %ld\n"
-#: svn/propedit-cmd.c:129
+#: ../svn/propedit-cmd.c:129
#, c-format
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "Ne pas préciser de révision pour éditer la propriété versionnée '%s'"
-#: svn/propedit-cmd.c:155 svn/propset-cmd.c:191
+#: ../svn/propedit-cmd.c:155 ../svn/propset-cmd.c:191
msgid "Explicit target argument required"
msgstr "Argument cible explicite requis"
-#: svn/propedit-cmd.c:214 svn/switch-cmd.c:148
+#: ../svn/propedit-cmd.c:214 ../svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' ne semble pas être un chemin dans une copie de travail"
-#: svn/propedit-cmd.c:273
+#: ../svn/propedit-cmd.c:273
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Nouvelle valeur définie pour la propriété '%s' sur '%s'\n"
-#: svn/propedit-cmd.c:283
+#: ../svn/propedit-cmd.c:283
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Pas de modification de la propriété '%s' sur '%s'\n"
-#: svn/proplist-cmd.c:96
+#: ../svn/proplist-cmd.c:96
#, c-format
msgid "Properties on '%s':\n"
msgstr "Propriétés sur '%s'\n"
-#: svn/proplist-cmd.c:182
+#: ../svn/proplist-cmd.c:182
#, c-format
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:54
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -8428,15 +8496,15 @@
"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:61
msgid "Wrong number of targets specified"
msgstr "Le nombre de cibles n'est pas bon"
-#: svn/props.c:70
+#: ../svn/props.c:70
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:217
#, c-format
msgid ""
"To turn off the %s property, use 'svn propdel';\n"
@@ -8445,40 +8513,40 @@
"Pour désactiver la propriété %s, utiliser 'svn propdel' ;\n"
"Définir la valeur de la propriété à '%s' de la désactivera pas."
-#: svn/propset-cmd.c:141
+#: ../svn/propset-cmd.c:141
#, c-format
msgid "property '%s' set on repository revision %ld\n"
msgstr "Propriété '%s' définie à la révision du dépôt %ld\n"
-#: svn/propset-cmd.c:149
+#: ../svn/propset-cmd.c:149
#, c-format
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "Ne pas préciser de révision pour définir la propriété versionnée '%s'"
-#: svn/propset-cmd.c:184
+#: ../svn/propset-cmd.c:184
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Cible explicite requise ('%s' interprété comme valeur de propriété)"
-#: svn/propset-cmd.c:224
+#: ../svn/propset-cmd.c:224
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "Propriété '%s' définie récursivement sur '%s'\n"
-#: svn/propset-cmd.c:225
+#: ../svn/propset-cmd.c:225
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "Propriété '%s' définie sur '%s'\n"
-#: svn/resolved-cmd.c:68
+#: ../svn/resolved-cmd.c:68
msgid "invalid 'accept' ARG"
msgstr "Argument 'accept' invalide"
-#: svn/revert-cmd.c:93
+#: ../svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Essayer plutôt 'svn revert --recursive' ?"
-#: svn/status-cmd.c:337
+#: ../svn/status-cmd.c:337
#, c-format
msgid ""
"\n"
@@ -8487,17 +8555,17 @@
"\n"
"--- Liste de changements '%s' :\n"
-#: svn/status.c:254
+#: ../svn/status.c:254
#, c-format
msgid "'%s' has lock token, but no lock owner"
msgstr "'%s' possède un verrou local, mais pas de propriétaire de verrou"
-#: svn/switch-cmd.c:58
+#: ../svn/switch-cmd.c:58
#, c-format
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s' vers '%s' n'est pas une relocalisation valide"
-#: svn/util.c:63
+#: ../svn/util.c:63
#, c-format
msgid ""
"\n"
@@ -8506,7 +8574,7 @@
"\n"
"Révision %ld propagée.\n"
-#: svn/util.c:71
+#: ../svn/util.c:71
#, c-format
msgid ""
"\n"
@@ -8515,7 +8583,7 @@
"\n"
"Attention : %s\n"
-#: svn/util.c:132
+#: ../svn/util.c:132
msgid ""
"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
"time configuration option is empty or consists solely of whitespace. "
@@ -8525,7 +8593,7 @@
"configuration 'editor-cmd' est vide ou consiste seulement en des espaces. "
"Une commande shell est attendue."
-#: svn/util.c:139
+#: ../svn/util.c:139
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -8533,27 +8601,27 @@
"Aucune variable d'environnement (SVN_EDITOR, VISUAL ou EDITOR) ni d'option "
"de configuration 'editor-cmd' n'a été trouvée"
-#: svn/util.c:167 svn/util.c:305
+#: ../svn/util.c:167 ../svn/util.c:305
#, c-format
msgid "Can't get working directory"
msgstr "Répertoire courant inaccessible"
-#: svn/util.c:178 svn/util.c:316 svn/util.c:339
+#: ../svn/util.c:178 ../svn/util.c:316 ../svn/util.c:339
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Répertoire '%s' inaccessible (pas de 'cd')"
-#: svn/util.c:186 svn/util.c:481
+#: ../svn/util.c:186 ../svn/util.c:481
#, c-format
msgid "Can't restore working directory"
msgstr "Le répertoire de travail courant ne peut être rétabli"
-#: svn/util.c:193 svn/util.c:409
+#: ../svn/util.c:193 ../svn/util.c:409
#, c-format
msgid "system('%s') returned %d"
msgstr "system('%s') a retourné %d"
-#: svn/util.c:231
+#: ../svn/util.c:231
msgid ""
"The SVN_MERGE environment variable is empty or consists solely of "
"whitespace. Expected a shell command.\n"
@@ -8561,7 +8629,7 @@
"La variable d'environnement SVN_MERGE est vide ou consiste seulement en des "
"espaces. Une commande shell est attendue.\n"
-#: svn/util.c:237
+#: ../svn/util.c:237
msgid ""
"The environment variable SVN_MERGE and the merge-tool-cmd run-time "
"configuration option were not set.\n"
@@ -8569,32 +8637,32 @@
"Aucune variable d'environnement SVN_MERGE ni d'option de configuration "
"'merge-tool-cmd' n'a été trouvée\n"
-#: svn/util.c:364
+#: ../svn/util.c:364
#, c-format
msgid "Can't write to '%s'"
msgstr "'%s' n'est pas accessible en écriture"
-#: svn/util.c:450
+#: ../svn/util.c:450
msgid "Error normalizing edited contents to internal format"
msgstr "Erreur de normalisation du contenu édité vers le format interne"
-#: svn/util.c:523
+#: ../svn/util.c:523
msgid "Log message contains a zero byte"
msgstr "L'entrée du journal contient un octet 0"
-#: svn/util.c:583
+#: ../svn/util.c:583
msgid "Your commit message was left in a temporary file:"
msgstr "Le message de propagation a été laissé dans un fichier temporaire :"
-#: svn/util.c:635
+#: ../svn/util.c:635
msgid "--This line, and those below, will be ignored--"
msgstr "--Cette ligne, et les suivantes ci-dessous, seront ignorées--"
-#: svn/util.c:660
+#: ../svn/util.c:660
msgid "Error normalizing log message to internal format"
msgstr "Erreur de normalisation de l'entrée du journal vers le format interne"
-#: svn/util.c:675
+#: ../svn/util.c:675
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -8602,11 +8670,11 @@
"Pas d'éditeur externe pour définir l'entrée du journal sous OS400; utiliser "
"les options --message (-m) ou --file (-F)"
-#: svn/util.c:761
+#: ../svn/util.c:761
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "L'éditeur ne peut être invoqué en mode non interactif"
-#: svn/util.c:774
+#: ../svn/util.c:774
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) "
@@ -8615,7 +8683,7 @@
"Pas d'éditeur externe pour définir l'entrée du journal; définir la variable "
"d'environnement SVN_EDITOR ou utiliser --message (-m) ou --file (-F)"
-#: svn/util.c:810
+#: ../svn/util.c:810
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -8625,71 +8693,71 @@
"Entrée du journal non modifié ou non précisé\n"
"a)nnule, c)ontinue, e)dite\n"
-#: svn/util.c:863
+#: ../svn/util.c:863
msgid "Use --force to override this restriction"
msgstr "Utiliser --force pour passer cette restriction"
-#: svnadmin/main.c:95 svndumpfilter/main.c:62
+#: ../svnadmin/main.c:95 ../svndumpfilter/main.c:62
#, c-format
msgid "Can't open stdio file"
msgstr "Le fichier stdio ne peut être ouvert"
-#: svnadmin/main.c:124
+#: ../svnadmin/main.c:124
msgid "Repository argument required"
msgstr "Argument précisant le dépôt obligatoire"
-#: svnadmin/main.c:129
+#: ../svnadmin/main.c:129
#, c-format
msgid "'%s' is an URL when it should be a path"
msgstr "'%s' est une URL, alors qu'un chemin est attendu"
-#: svnadmin/main.c:240
+#: ../svnadmin/main.c:240
msgid "specify revision number ARG (or X:Y range)"
msgstr "précise la révision numéro ARG (ou étendue X:Y)"
-#: svnadmin/main.c:243
+#: ../svnadmin/main.c:243
msgid "dump incrementally"
msgstr "décharge incrémentale"
-#: svnadmin/main.c:246
+#: ../svnadmin/main.c:246
msgid "use deltas in dump output"
msgstr "décharge différentielle (deltas)"
# ??? ancres
-#: svnadmin/main.c:249
+#: ../svnadmin/main.c:249
msgid "bypass the repository hook system"
msgstr "contourne les ancres (hook) du dépôt"
-#: svnadmin/main.c:252
+#: ../svnadmin/main.c:252
msgid "no progress (only errors) to stderr"
msgstr "pas d'avancement mais seulement les erreurs vers stderr"
-#: svnadmin/main.c:255
+#: ../svnadmin/main.c:255
msgid "ignore any repos UUID found in the stream"
msgstr "ignore tout UUID de dépôt trouvé dans le flux"
-#: svnadmin/main.c:258
+#: ../svnadmin/main.c:258
msgid "set repos UUID to that found in stream, if any"
msgstr "utilise l'UUID de dépôt trouvée dans le flux, si il y en a une"
-#: svnadmin/main.c:261
+#: ../svnadmin/main.c:261
msgid "type of repository: 'fsfs' (default) or 'bdb'"
msgstr "type de dépôt : 'fsfs' (défaut) ou 'bdb'"
-#: svnadmin/main.c:264
+#: ../svnadmin/main.c:264
msgid "load at specified directory in repository"
msgstr "charge dans le répertoire précisé du dépôt"
-#: svnadmin/main.c:267
+#: ../svnadmin/main.c:267
msgid "disable fsync at transaction commit [Berkeley DB]"
msgstr "désactive fsync aux propagations de transactions [Berkeley DB]"
-#: svnadmin/main.c:270
+#: ../svnadmin/main.c:270
msgid "disable automatic log file removal [Berkeley DB]"
msgstr ""
"désactive la suppression automatique des fichiers du journal [Berkeley DB]"
-#: svnadmin/main.c:276
+#: ../svnadmin/main.c:276
msgid ""
"remove redundant Berkeley DB log files\n"
" from source repository [Berkeley DB]"
@@ -8697,30 +8765,30 @@
"supprime les fichiers du journal redondants\n"
" dans le dépôt source [Base Berkeley]"
-#: svnadmin/main.c:280
+#: ../svnadmin/main.c:280
msgid "call pre-commit hook before committing revisions"
msgstr ""
"appel la procédure d'avant propagation (pre-commit) avant de propager les "
"révisions"
-#: svnadmin/main.c:283
+#: ../svnadmin/main.c:283
msgid "call post-commit hook after committing revisions"
msgstr ""
"appel la procédure d'après propagation (post-commit) après la propagation "
"des révisions"
-#: svnadmin/main.c:286
+#: ../svnadmin/main.c:286
msgid "call hook before changing revision property"
msgstr ""
"appel de la procédure automatique avant de changer une propriété de révision"
-#: svnadmin/main.c:289
+#: ../svnadmin/main.c:289
msgid "call hook after changing revision property"
msgstr ""
"appel la procédure automatique après le changement d'une propriété de "
"révision"
-#: svnadmin/main.c:292
+#: ../svnadmin/main.c:292
msgid ""
"wait instead of exit if the repository is in\n"
" use by another process"
@@ -8728,7 +8796,7 @@
"attend au lieu de sortir si le dépôt est\n"
" utilisé par un autre processus"
-#: svnadmin/main.c:296
+#: ../svnadmin/main.c:296
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.4"
@@ -8736,7 +8804,7 @@
"utilise un format compatible avec les versions\n"
" de Subversion antérieures à 1.4"
-#: svnadmin/main.c:300
+#: ../svnadmin/main.c:300
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.5"
@@ -8744,7 +8812,7 @@
"utilise un format compatible avec les versions\n"
" de Subversion antérieures à 1.5"
-#: svnadmin/main.c:313
+#: ../svnadmin/main.c:313
msgid ""
"usage: svnadmin crashtest REPOS_PATH\n"
"\n"
@@ -8756,7 +8824,7 @@
"Ouvre le dépôt en CHEMIN_DÉPÔT, puis s'interrompt brusquement (abort),\n"
"simulant ainsi un crash de processus ayant ouvert le dépôt.\n"
-#: svnadmin/main.c:319
+#: ../svnadmin/main.c:319
msgid ""
"usage: svnadmin create REPOS_PATH\n"
"\n"
@@ -8766,7 +8834,7 @@
"\n"
"Crée un nouveau dépôt vide à CHEMIN_DÉPÔT.\n"
-#: svnadmin/main.c:326
+#: ../svnadmin/main.c:326
msgid ""
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
@@ -8783,7 +8851,7 @@
"compresse le dépôt en ne stockant que les différences entre versions\n"
"successives. Elle s'applique par défaut à la révision de tête seule.\n"
-#: svnadmin/main.c:335
+#: ../svnadmin/main.c:335
msgid ""
"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
"\n"
@@ -8803,7 +8871,7 @@
"la première révision déchargée est la différence par rapport à la\n"
"précédente au lieu du texte complet habituel.\n"
-#: svnadmin/main.c:345
+#: ../svnadmin/main.c:345
msgid ""
"usage: svnadmin help [SUBCOMMAND...]\n"
"\n"
@@ -8813,7 +8881,7 @@
"\n"
"Décrit l'utilisation de ce programme ou de ses sous-commandes.\n"
-#: svnadmin/main.c:350
+#: ../svnadmin/main.c:350
msgid ""
"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
"\n"
@@ -8823,7 +8891,7 @@
"\n"
"Effectue une copie à chaud (hotcopy) d'un dépôt.\n"
-#: svnadmin/main.c:355
+#: ../svnadmin/main.c:355
msgid ""
"usage: svnadmin list-dblogs REPOS_PATH\n"
"\n"
@@ -8839,7 +8907,7 @@
"ATTENTION : Modifier ou supprimer les fichiers du journal en cours\n"
"d'utilisation corrompt le dépôt.\n"
-#: svnadmin/main.c:362
+#: ../svnadmin/main.c:362
msgid ""
"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
"\n"
@@ -8850,7 +8918,7 @@
"\n"
"Liste les fichiers inutilisés du journal de la base Berkeley.\n"
-#: svnadmin/main.c:367
+#: ../svnadmin/main.c:367
msgid ""
"usage: svnadmin load REPOS_PATH\n"
"\n"
@@ -8866,7 +8934,7 @@
"est initialement vide, son UUID prend la valeur de celui du flux.\n"
"L'avancement est envoyé sur stdout.\n"
-#: svnadmin/main.c:377
+#: ../svnadmin/main.c:377
msgid ""
"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
"\n"
@@ -8878,7 +8946,7 @@
"Affiche la description de tous les verrous sur ou sous CHEMIN_DANS_LE_DÉPÔT\n"
"(par défaut la racine du dépôt).\n"
-#: svnadmin/main.c:383
+#: ../svnadmin/main.c:383
msgid ""
"usage: svnadmin lstxns REPOS_PATH\n"
"\n"
@@ -8888,7 +8956,7 @@
"\n"
"Affiche les noms de toutes les transactions non propagées.\n"
-#: svnadmin/main.c:388
+#: ../svnadmin/main.c:388
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
@@ -8904,7 +8972,7 @@
"à la base Berkeley DB, elle ne s'exécute pas si le dépôt est en cours \n"
"d'utilisation par un autre processus.\n"
-#: svnadmin/main.c:396
+#: ../svnadmin/main.c:396
msgid ""
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
"\n"
@@ -8914,7 +8982,7 @@
"\n"
"Efface inconditionnellement le verrou de chaque CHEMIN_VERROUILLÉ.\n"
-#: svnadmin/main.c:401
+#: ../svnadmin/main.c:401
msgid ""
"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
"\n"
@@ -8924,7 +8992,7 @@
"\n"
"Supprime les transactions spécifiées.\n"
-#: svnadmin/main.c:406
+#: ../svnadmin/main.c:406
msgid ""
"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
"\n"
@@ -8949,7 +9017,7 @@
"NOTE : l'historique des propriétés de révision n'est pas conservé, cette\n"
"commande écrase définitivement les entrées précédentes du journal.\n"
-#: svnadmin/main.c:418
+#: ../svnadmin/main.c:418
msgid ""
"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
"\n"
@@ -8972,7 +9040,7 @@
"NOTE : l'historique des propriétés de révision n'est pas conservé, cette\n"
"commande écrase définitivement les entrées précédentes du journal.\n"
-#: svnadmin/main.c:429
+#: ../svnadmin/main.c:429
msgid ""
"usage: svnadmin verify REPOS_PATH\n"
"\n"
@@ -8982,30 +9050,30 @@
"\n"
"Vérifie les données stockées dans le dépôt.\n"
-#: svnadmin/main.c:486
+#: ../svnadmin/main.c:486
msgid "Invalid revision specifier"
msgstr "Révision invalide"
-#: svnadmin/main.c:491
+#: ../svnadmin/main.c:491
#, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "Les révisions doivent être antérieures à la plus récente (%ld)"
-#: svnadmin/main.c:569 svnadmin/main.c:669
+#: ../svnadmin/main.c:569 ../svnadmin/main.c:669
msgid "First revision cannot be higher than second"
msgstr "La première révision doit être postérieure à la seconde"
-#: svnadmin/main.c:578
+#: ../svnadmin/main.c:578
#, c-format
msgid "Deltifying revision %ld..."
msgstr "Différentiation de la révision %ld..."
-#: svnadmin/main.c:582
+#: ../svnadmin/main.c:582
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: svnadmin/main.c:706
+#: ../svnadmin/main.c:706
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -9020,7 +9088,7 @@
"\n"
"Sous-commandes disponibles :\n"
-#: svnadmin/main.c:713 svnlook/main.c:1752 svnserve/main.c:207
+#: ../svnadmin/main.c:713 ../svnlook/main.c:1759 ../svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -9028,7 +9096,7 @@
"Les types de stockage de dépôt (FS) suivants sont disponibles :\n"
"\n"
-#: svnadmin/main.c:790
+#: ../svnadmin/main.c:790
#, c-format
msgid ""
"Repository lock acquired.\n"
@@ -9037,7 +9105,7 @@
"Verrou du dépôt acquis.\n"
"Patientez; le rétablissement du dépôt peut être long...\n"
-#: svnadmin/main.c:826
+#: ../svnadmin/main.c:826
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -9045,12 +9113,12 @@
"Échec de l'obtention d'un accès exclusif au dépôt ; peut-être un autre\n"
"processus tel 'httpd', 'svnserve' ou 'svn' a-t-il ouvert le dépôt ?"
-#: svnadmin/main.c:831
+#: ../svnadmin/main.c:831
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "Attente du verrou sur le dépôt ; un autre processus le tient-il ?\n"
-#: svnadmin/main.c:839
+#: ../svnadmin/main.c:839
#, c-format
msgid ""
"\n"
@@ -9059,57 +9127,57 @@
"\n"
"Fin du rétablissement.\n"
-#: svnadmin/main.c:846
+#: ../svnadmin/main.c:846
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "La dernière révision du dépôt est %ld\n"
-#: svnadmin/main.c:956
+#: ../svnadmin/main.c:956
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transaction '%s' supprimée.\n"
-#: svnadmin/main.c:1024 svnadmin/main.c:1051
+#: ../svnadmin/main.c:1024 ../svnadmin/main.c:1051
#, c-format
msgid "Missing revision"
msgstr "Révision absente"
-#: svnadmin/main.c:1027 svnadmin/main.c:1054
+#: ../svnadmin/main.c:1027 ../svnadmin/main.c:1054
#, c-format
msgid "Only one revision allowed"
msgstr "Une seule révision permise"
-#: svnadmin/main.c:1033
+#: ../svnadmin/main.c:1033
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Un seul nom de propriété et argument fichier attendu"
-#: svnadmin/main.c:1060
+#: ../svnadmin/main.c:1060
#, c-format
msgid "Exactly one file argument required"
msgstr "Un seul argument fichier attendu"
-#: svnadmin/main.c:1147 svnlook/main.c:1817
+#: ../svnadmin/main.c:1147 ../svnlook/main.c:1824
#, c-format
msgid "UUID Token: %s\n"
msgstr "Chaîne UUID : %s\n"
-#: svnadmin/main.c:1148 svnlook/main.c:1818
+#: ../svnadmin/main.c:1148 ../svnlook/main.c:1825
#, c-format
msgid "Owner: %s\n"
msgstr "Propriétaire : %s\n"
-#: svnadmin/main.c:1149 svnlook/main.c:1819
+#: ../svnadmin/main.c:1149 ../svnlook/main.c:1826
#, c-format
msgid "Created: %s\n"
msgstr "Créé : %s\n"
-#: svnadmin/main.c:1150 svnlook/main.c:1820
+#: ../svnadmin/main.c:1150 ../svnlook/main.c:1827
#, c-format
msgid "Expires: %s\n"
msgstr "Expire : %s\n"
-#: svnadmin/main.c:1152
+#: ../svnadmin/main.c:1152
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9120,7 +9188,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1153
+#: ../svnadmin/main.c:1153
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9131,28 +9199,28 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1210
+#: ../svnadmin/main.c:1210
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Le chemin '%s' n'est pas verrouillé (locked)\n"
-#: svnadmin/main.c:1222
+#: ../svnadmin/main.c:1222
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "'%s' déverrouillé\n"
-#: svnadmin/main.c:1331
+#: ../svnadmin/main.c:1331
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Option -r rencontrée plusieurs fois ; essayer '-r M:N' au lieu de '-r M -r N'"
-#: svnadmin/main.c:1459
+#: ../svnadmin/main.c:1459
#, c-format
msgid "subcommand argument required\n"
msgstr "Sous-commande attendue\n"
-#: svnadmin/main.c:1533
+#: ../svnadmin/main.c:1533
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9161,55 +9229,55 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnadmin help %s' pour l'aide.\n"
-#: svnadmin/main.c:1566
+#: ../svnadmin/main.c:1566
msgid "Try 'svnadmin help' for more info"
msgstr "Essayer 'svnadmin help' pour plus d'information"
-#: svndumpfilter/main.c:319
+#: ../svndumpfilter/main.c:313
msgid "This is an empty revision for padding."
msgstr "Ceci est une révision vide pour remplissage."
-#: svndumpfilter/main.c:389
+#: ../svndumpfilter/main.c:383
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Révision %ld propagée en %ld\n"
-#: svndumpfilter/main.c:412
+#: ../svndumpfilter/main.c:406
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Révision %ld omise.\n"
-#: svndumpfilter/main.c:514
+#: ../svndumpfilter/main.c:508
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "Chemin de la source d'une copie '%s' invalide"
-#: svndumpfilter/main.c:558
+#: ../svndumpfilter/main.c:552
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Pas de révision source d'une copie dans le flux filtré"
-#: svndumpfilter/main.c:663
+#: ../svndumpfilter/main.c:657
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr "Block de propriété delta détecté - non supporté par svndumpfilter"
-#: svndumpfilter/main.c:788
+#: ../svndumpfilter/main.c:782
msgid "Do not display filtering statistics."
msgstr "Ne pas affichier les statistiques de filtrage."
-#: svndumpfilter/main.c:790
+#: ../svndumpfilter/main.c:784
msgid "Remove revisions emptied by filtering."
msgstr "Effacer les révisions vidées par le filtrage."
-#: svndumpfilter/main.c:792
+#: ../svndumpfilter/main.c:786
msgid "Renumber revisions left after filtering."
msgstr "Renuméroter les révisions laissées par le filtrage."
-#: svndumpfilter/main.c:794
+#: ../svndumpfilter/main.c:788
msgid "Don't filter revision properties."
msgstr "Pas de filtrage des propriétés de révision."
-#: svndumpfilter/main.c:805
+#: ../svndumpfilter/main.c:799
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -9217,7 +9285,7 @@
"Exclure du flux les noeuds ayant un des préfixes donnés.\n"
"usage : svndumpfilter exclude PRÉFIXE...\n"
-#: svndumpfilter/main.c:811
+#: ../svndumpfilter/main.c:805
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -9225,7 +9293,7 @@
"Inclure du flux les noeuds ayant un des préfixes donnés.\n"
"usage : svndumpfilter include PRÉFIXE...\n"
-#: svndumpfilter/main.c:817
+#: ../svndumpfilter/main.c:811
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -9233,7 +9301,7 @@
"Affiche l'aide sur le programme ou ses sous-commandes.\n"
"usage : svndumpfilter help [SOUS_COMMANDES...]\n"
-#: svndumpfilter/main.c:888
+#: ../svndumpfilter/main.c:882
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -9248,27 +9316,27 @@
"\n"
"Sous-commandes disponibles :\n"
-#: svndumpfilter/main.c:943
+#: ../svndumpfilter/main.c:937
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Exclusion (et élimination des révisions vides) des préfixes :\n"
-#: svndumpfilter/main.c:945
+#: ../svndumpfilter/main.c:939
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Exclusion des préfixes : \n"
-#: svndumpfilter/main.c:947
+#: ../svndumpfilter/main.c:941
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Inclusion (et élimination des révisions vides) des préfixes :\n"
-#: svndumpfilter/main.c:949
+#: ../svndumpfilter/main.c:943
#, c-format
msgid "Including prefixes:\n"
msgstr "Inclusion des préfixes :\n"
-#: svndumpfilter/main.c:976
+#: ../svndumpfilter/main.c:970
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -9277,21 +9345,21 @@
"%d révision(s) éliminées\n"
"\n"
-#: svndumpfilter/main.c:982
+#: ../svndumpfilter/main.c:976
msgid "Revisions renumbered as follows:\n"
msgstr "Révisions renumérotées comme suit :\n"
-#: svndumpfilter/main.c:1009
+#: ../svndumpfilter/main.c:1003
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (éliminée)\n"
-#: svndumpfilter/main.c:1024
+#: ../svndumpfilter/main.c:1018
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "%d noeud(s) éliminés :\n"
-#: svndumpfilter/main.c:1245
+#: ../svndumpfilter/main.c:1239
#, c-format
msgid ""
"\n"
@@ -9300,7 +9368,7 @@
"\n"
"Erreur : aucun préfixe fourni.\n"
-#: svndumpfilter/main.c:1289
+#: ../svndumpfilter/main.c:1283
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9309,55 +9377,55 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svndumpfilter help %s' pour l'aide.\n"
-#: svndumpfilter/main.c:1307
+#: ../svndumpfilter/main.c:1301
msgid "Try 'svndumpfilter help' for more info"
msgstr "Essayer 'svndumpfilter help' pour plus d'information"
-#: svnlook/main.c:95
+#: ../svnlook/main.c:95
msgid "show details for copies"
msgstr "affiche les détails concernant les copies"
-#: svnlook/main.c:98
+#: ../svnlook/main.c:98
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:101
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:107
msgid "maximum number of history entries"
msgstr "nombre maximum d'entrées dans l'historique"
-#: svnlook/main.c:110
+#: ../svnlook/main.c:110
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:116
msgid "operate on single directory only"
msgstr "opère sur un seul répertoire"
-#: svnlook/main.c:119
+#: ../svnlook/main.c:119
msgid "specify revision number ARG"
msgstr "précise le numéro de révision ARG"
-#: svnlook/main.c:122
+#: ../svnlook/main.c:122
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:125
msgid "show node revision ids for each path"
msgstr "donne l'identifiant du noeud de révision pour chaque objet"
-#: svnlook/main.c:128
+#: ../svnlook/main.c:128
msgid "specify transaction name ARG"
msgstr "précise le nom de la transaction ARG"
-#: svnlook/main.c:131
+#: ../svnlook/main.c:131
msgid "be verbose"
msgstr "verbeux"
-#: svnlook/main.c:177
+#: ../svnlook/main.c:177
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -9367,7 +9435,7 @@
"\n"
"Affiche l'auteur.\n"
-#: svnlook/main.c:182
+#: ../svnlook/main.c:182
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -9378,7 +9446,7 @@
"Affiche le contenu d'un fichier.\n"
"Le '/' de tête dans le chemin est optionnel.\n"
-#: svnlook/main.c:187
+#: ../svnlook/main.c:187
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -9388,7 +9456,7 @@
"\n"
"Affiche les objets modifiés.\n"
-#: svnlook/main.c:192
+#: ../svnlook/main.c:192
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -9398,7 +9466,7 @@
"\n"
"Affiche la date de dernière modification.\n"
-#: svnlook/main.c:197
+#: ../svnlook/main.c:197
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -9408,7 +9476,7 @@
"\n"
"Affiche les différences des fichiers et propriétés modifiés au style GNU\n"
-#: svnlook/main.c:203
+#: ../svnlook/main.c:203
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -9420,7 +9488,7 @@
"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:209
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -9430,7 +9498,7 @@
"\n"
"Affiche l'aide sur ce programme ou ses sous-commandes.\n"
-#: svnlook/main.c:214
+#: ../svnlook/main.c:214
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9442,7 +9510,7 @@
"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:220
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -9452,7 +9520,7 @@
"\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:225
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -9462,7 +9530,7 @@
"\n"
"Décrit le verrou sur le chemin dans le dépôt, s'il existe.\n"
-#: svnlook/main.c:230
+#: ../svnlook/main.c:230
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -9472,7 +9540,7 @@
"\n"
"Affiche l'entrée du journal (log).\n"
-#: svnlook/main.c:235
+#: ../svnlook/main.c:235
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -9484,7 +9552,7 @@
"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:241
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9497,7 +9565,7 @@
"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"
-#: svnlook/main.c:248
+#: ../svnlook/main.c:248
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9509,7 +9577,7 @@
"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 noeuds de révision.\n"
-#: svnlook/main.c:254
+#: ../svnlook/main.c:254
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -9519,7 +9587,7 @@
"\n"
"Affiche l'UUID (identifiant unique) du dépôt.\n"
-#: svnlook/main.c:259
+#: ../svnlook/main.c:259
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -9529,53 +9597,70 @@
"\n"
"Affiche le numéro de la révision la plus récente.\n"
-#: svnlook/main.c:863
+#: ../svnlook/main.c:780
+#, c-format
+msgid "Added: %s\n"
+msgstr "Ajouté : %s\n"
+
+#: ../svnlook/main.c:782
+#, c-format
+msgid "Deleted: %s\n"
+msgstr "Effacé : %s\n"
+
+#: ../svnlook/main.c:784
+#, c-format
+msgid "Modified: %s\n"
+msgstr "Modifié : %s\n"
+
+#: ../svnlook/main.c:870
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Copié : %s (de révision %ld, %s)\n"
-#: svnlook/main.c:931
+#: ../svnlook/main.c:938
msgid "Added"
msgstr "Ajouté"
-#: svnlook/main.c:932
+#: ../svnlook/main.c:939
msgid "Deleted"
msgstr "Supprimé"
-#: svnlook/main.c:933
+#: ../svnlook/main.c:940
msgid "Modified"
msgstr "Modifié"
-#: svnlook/main.c:934
+#: ../svnlook/main.c:941
msgid "Index"
msgstr "Index"
-#: svnlook/main.c:945
+#: ../svnlook/main.c:952
msgid ""
"(Binary files differ)\n"
"\n"
-msgstr "(les fichiers binaires diffèrent)\n\n"
+msgstr ""
+"(les fichiers binaires diffèrent)\n"
+"\n"
-#: svnlook/main.c:1084
+#: ../svnlook/main.c:1091
msgid "unknown"
msgstr "inconnu"
-#: svnlook/main.c:1231 svnlook/main.c:1324 svnlook/main.c:1353
+#: ../svnlook/main.c:1238 ../svnlook/main.c:1331 ../svnlook/main.c:1360
#, 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:1261
+#: ../svnlook/main.c:1268
#, 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:1288
+#: ../svnlook/main.c:1295
#, c-format
msgid "Path '%s' is not a file"
msgstr "Le chemin '%s' n'est pas un fichier"
-#: svnlook/main.c:1437
+#: ../svnlook/main.c:1444
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -9584,7 +9669,7 @@
"RÉVISION CHEMIN <ID>\n"
"-------- -----------\n"
-#: svnlook/main.c:1442
+#: ../svnlook/main.c:1449
#, c-format
msgid ""
"REVISION PATH\n"
@@ -9593,27 +9678,27 @@
"RÉVISION CHEMIN\n"
"-------- ------\n"
-#: svnlook/main.c:1491
+#: ../svnlook/main.c:1498
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Propriété '%s' absente à la révision %ld"
-#: svnlook/main.c:1498
+#: ../svnlook/main.c:1505
#, 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:1503
+#: ../svnlook/main.c:1510
#, 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:1681 svnlook/main.c:1896
+#: ../svnlook/main.c:1688 ../svnlook/main.c:1903
#, c-format
msgid "Missing repository path argument"
msgstr "Chemin du dépôt manquant"
-#: svnlook/main.c:1742
+#: ../svnlook/main.c:1749
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -9633,11 +9718,11 @@
"\n"
"Sous-commandes disponibles :\n"
-#: svnlook/main.c:1798
+#: ../svnlook/main.c:1805
msgid "Missing path argument"
msgstr "Chemin en argument manquant"
-#: svnlook/main.c:1823
+#: ../svnlook/main.c:1830
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9646,7 +9731,7 @@
"Commentaire (%i lignes) :\n"
"%s\n"
-#: svnlook/main.c:1824
+#: ../svnlook/main.c:1831
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9655,40 +9740,40 @@
"Commentaire (%i ligne) :\n"
"%s\n"
-#: svnlook/main.c:1870
+#: ../svnlook/main.c:1877
#, c-format
msgid "Missing propname argument"
msgstr "Le nom de la propriété manque"
-#: svnlook/main.c:1871
+#: ../svnlook/main.c:1878
#, 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:1877
+#: ../svnlook/main.c:1884
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:2036
+#: ../svnlook/main.c:2043
msgid "Invalid revision number supplied"
msgstr "Numéro de révision invalide"
-#: svnlook/main.c:2124
+#: ../svnlook/main.c:2131
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "'--transaction' (-t) et '--revision' (-r) sont mutuellement exclusifs"
-#: svnlook/main.c:2206
+#: ../svnlook/main.c:2213
#, c-format
msgid "Repository argument required\n"
msgstr "Un dépôt est requis en argument\n"
-#: svnlook/main.c:2215
+#: ../svnlook/main.c:2222
#, 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:2266
+#: ../svnlook/main.c:2273
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9697,89 +9782,89 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnlook help %s' pour l'aide.\n"
-#: svnlook/main.c:2309
+#: ../svnlook/main.c:2316
msgid "Try 'svnlook help' for more info"
msgstr "Essayer 'svnlook help' pour plus d'information"
-#: svnserve/cyrus_auth.c:243
+#: ../svnserve/cyrus_auth.c:243
#, c-format
msgid "Can't get hostname"
msgstr "Impossible d'obtenir le nom d'hôte"
-#: svnserve/cyrus_auth.c:311
+#: ../svnserve/cyrus_auth.c:311
msgid "Could not obtain the list of SASL mechanisms"
msgstr "Impossible d'obtenir la liste des mécanismes SASL"
-#: svnserve/cyrus_auth.c:351
+#: ../svnserve/cyrus_auth.c:351
msgid "Couldn't obtain the authenticated username"
msgstr "Impossible d'obtenir le nom d'utilisateur authentifié"
-#: svnserve/main.c:142
+#: ../svnserve/main.c:142
msgid "daemon mode"
msgstr "mode démon"
-#: svnserve/main.c:144
+#: ../svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "port à écouter (en mode démon)"
-#: svnserve/main.c:146
+#: ../svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "nom ou adresse IP à écouter (en mode démon)"
-#: svnserve/main.c:148
+#: ../svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "lancement en avant-plan (foreground, utile pour le déboguage)"
-#: svnserve/main.c:149 svnversion/main.c:124
+#: ../svnserve/main.c:149 ../svnversion/main.c:124
msgid "display this help"
msgstr "affiche cet aide"
-#: svnserve/main.c:152
+#: ../svnserve/main.c:152
msgid "inetd mode"
msgstr "mode inetd"
-#: svnserve/main.c:153
+#: ../svnserve/main.c:153
msgid "root of directory to serve"
msgstr "racine des répertoires à servir"
-#: svnserve/main.c:155
+#: ../svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr "force en lecture seule, en ignorant la configuration du dépôt"
-#: svnserve/main.c:156
+#: ../svnserve/main.c:156
msgid "tunnel mode"
msgstr "mode tunnel"
-#: svnserve/main.c:158
+#: ../svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "nom d'utilisateur du tunnel (nom d'utilisateur courant par défaut)"
-#: svnserve/main.c:160
+#: ../svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "Utilise des 'threads' au lieu de 'fork'"
-#: svnserve/main.c:162
+#: ../svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "écoute une seule fois (utile pour le déboguage)"
-#: svnserve/main.c:164
+#: ../svnserve/main.c:164
msgid "read configuration from file ARG"
msgstr "lit la configuration à partir du fichier ARG"
-#: svnserve/main.c:166
+#: ../svnserve/main.c:166
msgid "write server process ID to file ARG"
msgstr "écrit l'identifiant du processus serveur dans le fichier en argument"
-#: svnserve/main.c:169
+#: ../svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "exécuté comme un service windows (SCM seulement)"
-#: svnserve/main.c:181
+#: ../svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Entrer '%s --help' pour l'aide.\n"
-#: svnserve/main.c:190
+#: ../svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -9789,22 +9874,22 @@
"\n"
"Options disponibles :\n"
-#: svnserve/main.c:444
+#: ../svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr ""
"svnserve : Le chemin racine '%s' n'existe pas ou n'est pas un répertoire.\n"
-#: svnserve/main.c:493
+#: ../svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Une des options -d, -i, -t ou -X doit être précisée.\n"
-#: svnserve/main.c:511
+#: ../svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "L'option --tunnel-user n'est valide qu'en mode tunnel.\n"
-#: svnserve/main.c:576
+#: ../svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -9813,81 +9898,81 @@
"svnserve : L'option --service n'est valide que si le processus est lancé par "
"le contrôleur de service (SCM)\n"
-#: svnserve/main.c:612
+#: ../svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Impossible d'avoir les informations de l'adresse"
-#: svnserve/main.c:626
+#: ../svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Impossible de créer un 'socket' serveur"
-#: svnserve/main.c:637
+#: ../svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Impossible de lier (bind) le 'socket' serveur"
-#: svnserve/main.c:703
+#: ../svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Impossible d'accepter une connexion d'un client"
-#: svnserve/main.c:755
+#: ../svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Impossible de créer un attribut de thread (threadattr)"
-#: svnserve/main.c:763
+#: ../svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Impossible de détacher la thread"
-#: svnserve/main.c:776
+#: ../svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Impossible de créer une thread"
-#: svnserve/serve.c:1484
+#: ../svnserve/serve.c:1485
msgid "Path is not a string"
msgstr "Le chemin n'est pas une chaîne de caractère"
-#: svnserve/serve.c:1624
+#: ../svnserve/serve.c:1625
msgid "Log revprop entry not a string"
msgstr "L'entrée 'log' n'est pas une chaîne de caractères"
-#: svnserve/serve.c:1631
+#: ../svnserve/serve.c:1632
#, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Mot de propriété de révision '%s' inconnu dans une commande de log"
-#: svnserve/serve.c:1647
+#: ../svnserve/serve.c:1648
msgid "Log path entry not a string"
msgstr "L'entrée 'path' n'est pas une chaîne de caractères"
-#: svnserve/winservice.c:341
+#: ../svnserve/winservice.c:341
#, c-format
msgid "Failed to create winservice_start_event"
msgstr "Échec de la création du 'winservice_start_event'"
-#: svnserve/winservice.c:352
+#: ../svnserve/winservice.c:352
#, c-format
msgid "The service failed to start"
msgstr "Le service n'a pas voulu démarrer"
-#: svnserve/winservice.c:400
+#: ../svnserve/winservice.c:400
#, c-format
msgid "Failed to connect to Service Control Manager"
msgstr "Échec de la connexion au contrôleur de service (SCM)"
-#: svnserve/winservice.c:411
+#: ../svnserve/winservice.c:411
#, c-format
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:65
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -9916,7 +10001,7 @@
"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:80
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
@@ -9928,7 +10013,7 @@
"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:86
msgid ""
"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
@@ -9959,7 +10044,7 @@
"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:102
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -9969,11 +10054,11 @@
"\n"
"Décrit l'utilisation de ce programme ou de ses sous-commandes.\n"
-#: svnsync/main.c:112
+#: ../svnsync/main.c:112
msgid "print as little as possible"
msgstr "essaie de se taire"
-#: svnsync/main.c:118
+#: ../svnsync/main.c:118
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
@@ -9981,7 +10066,7 @@
"donne un login en argument (déprécié, cf --source-username et --sync-"
"username)"
-#: svnsync/main.c:122
+#: ../svnsync/main.c:122
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -9989,77 +10074,77 @@
"donne un mot de passe en argument\n"
" (déprécié ; cf --source-password et --sync-password)"
-#: svnsync/main.c:126
+#: ../svnsync/main.c:126
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:128
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:130
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:132
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:222
#, c-format
msgid "Can't get local hostname"
msgstr "Impossible d'obtenir le nom d'hôte"
-#: svnsync/main.c:245
+#: ../svnsync/main.c:245
#, 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:340
+#: ../svnsync/main.c:340
#, 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:410
+#: ../svnsync/main.c:410
#, 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:415
+#: ../svnsync/main.c:415
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Propriétés copiées pour la révision %ld.\n"
-#: svnsync/main.c:498
+#: ../svnsync/main.c:498
msgid "Cannot initialize a repository with content in it"
msgstr "Impossible d'initialiser un dépôt non vide"
-#: svnsync/main.c:509
+#: ../svnsync/main.c:509
#, 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:574 svnsync/main.c:577 svnsync/main.c:1249
-#: svnsync/main.c:1398
+#: ../svnsync/main.c:574 ../svnsync/main.c:577 ../svnsync/main.c:1249
+#: ../svnsync/main.c:1398
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Le chemin '%s' n'est pas une URL"
-#: svnsync/main.c:959
+#: ../svnsync/main.c:959
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Révision %ld propagée.\n"
-#: svnsync/main.c:1000
+#: ../svnsync/main.c:1000
msgid "Destination repository has not been initialized"
msgstr "Le dépôt destination n'a pas été initialisé"
-#: svnsync/main.c:1015
+#: ../svnsync/main.c:1015
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "UUID du dépôt source (%s) différent de celui attendu (%s)"
-#: svnsync/main.c:1078
+#: ../svnsync/main.c:1078
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -10070,7 +10155,7 @@
"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:1116
+#: ../svnsync/main.c:1116
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -10080,12 +10165,12 @@
"dernière révision fusionnée (%ld). Auriez-vous propagé vers la destination "
"sans utiliser 'svnsync' ?"
-#: svnsync/main.c:1194
+#: ../svnsync/main.c:1194
#, 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:1291 svnsync/main.c:1296
+#: ../svnsync/main.c:1291 ../svnsync/main.c:1296
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -10093,17 +10178,17 @@
"Impossible de copier les propriétés de révision d'une révision (%ld) non "
"encore synchronisée"
-#: svnsync/main.c:1348
+#: ../svnsync/main.c:1348
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' n'est pas un interval de révisions valide"
-#: svnsync/main.c:1362 svnsync/main.c:1382
+#: ../svnsync/main.c:1362 ../svnsync/main.c:1382
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Numéro de révision invalide (%ld)"
-#: svnsync/main.c:1422
+#: ../svnsync/main.c:1422
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -10117,7 +10202,7 @@
"\n"
"Sous-commandes disponibles :\n"
-#: svnsync/main.c:1584
+#: ../svnsync/main.c:1584
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -10125,7 +10210,7 @@
"Impossible d'utiliser --username ou --password pour un des --source-"
"username, --source-password, --sync-username ou --sync-password.\n"
-#: svnsync/main.c:1664
+#: ../svnsync/main.c:1664
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10134,16 +10219,16 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnsync help %s' pour l'aide.\n"
-#: svnsync/main.c:1736
+#: ../svnsync/main.c:1736
msgid "Try 'svnsync help' for more info"
msgstr "Essayer 'svnsync help' pour plus d'information"
-#: svnversion/main.c:40
+#: ../svnversion/main.c:40
#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Entrer 'svnversion --help' pour l'aide.\n"
-#: svnversion/main.c:51
+#: ../svnversion/main.c:51
#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
@@ -10201,20 +10286,20 @@
"\n"
"Options disponibles :\n"
-#: svnversion/main.c:122
+#: ../svnversion/main.c:122
msgid "do not output the trailing newline"
msgstr "pas de fin de ligne"
-#: svnversion/main.c:123
+#: ../svnversion/main.c:123
msgid "last changed rather than current revisions"
msgstr "dernière révision modifiée plutôt que la courante"
-#: svnversion/main.c:222
+#: ../svnversion/main.c:222
#, c-format
msgid "exported%s"
msgstr "exporté%s"
-#: svnversion/main.c:231
+#: ../svnversion/main.c:231
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' non versionné et non exporté\n"
diff --git a/subversion/po/pl.po b/subversion/po/pl.po
index e59ae8b..2156cb4 100644
--- a/subversion/po/pl.po
+++ b/subversion/po/pl.po
@@ -34,8 +34,8 @@
msgstr ""
"Project-Id-Version: subversion 1.5\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-11-04 20:30+0100\n"
-"PO-Revision-Date: 2007-11-04 20:30+0100\n"
+"POT-Creation-Date: 2007-11-11 21:00+0100\n"
+"PO-Revision-Date: 2007-11-11 21:00+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Polish <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -44,1044 +44,1039 @@
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 "
"&& (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: include/svn_error_codes.h:154
+#: ../include/svn_error_codes.h:154
msgid "Bad parent pool passed to svn_make_pool()"
msgstr "Błędna pula macierzysta przekazana do svn_make_pool()"
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:158
msgid "Bogus filename"
msgstr "Niepoprawna nazwa pliku"
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:162
msgid "Bogus URL"
msgstr "Niepoprawny URL"
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:166
msgid "Bogus date"
msgstr "Niepoprawna data"
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:170
msgid "Bogus mime-type"
msgstr "Niepoprawny typ MIME"
-#: include/svn_error_codes.h:180
+#: ../include/svn_error_codes.h:180
msgid "Wrong or unexpected property value"
msgstr "Błędna lub nieoczekiwana wartość atrybutu"
-#: include/svn_error_codes.h:184
+#: ../include/svn_error_codes.h:184
msgid "Version file format not correct"
msgstr "Niepoprawny format pliku wersji"
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:190
msgid "No such XML tag attribute"
msgstr "Brak takiego atrybutu XML"
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:194
msgid "<delta-pkg> is missing ancestry"
msgstr "<delta-pkg> nie zawiera informacji o pochodzeniu"
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:198
msgid "Unrecognized binary data encoding; can't decode"
msgstr "Nierozpoznany format danych binarnych; nie można rozkodować"
-#: include/svn_error_codes.h:202
+#: ../include/svn_error_codes.h:202
msgid "XML data was not well-formed"
msgstr "Niepoprawny składniowo XML"
-#: include/svn_error_codes.h:206
+#: ../include/svn_error_codes.h:206
msgid "Data cannot be safely XML-escaped"
msgstr "Nie można stworzyć poprawnego XML"
-#: include/svn_error_codes.h:212
+#: ../include/svn_error_codes.h:212
msgid "Inconsistent line ending style"
msgstr "Niespójny sposób zapisywania końców wiersza"
-#: include/svn_error_codes.h:216
+#: ../include/svn_error_codes.h:216
msgid "Unrecognized line ending style"
msgstr "Nieznany sposób zapisywania końców wiersza"
-#: include/svn_error_codes.h:221
+#: ../include/svn_error_codes.h:221
msgid "Line endings other than expected"
msgstr "Końce wiersza inne niż oczekiwano"
-#: include/svn_error_codes.h:225
+#: ../include/svn_error_codes.h:225
msgid "Ran out of unique names"
msgstr "Wykorzystano wszystkie unikalne nazwy"
-#: include/svn_error_codes.h:230
+#: ../include/svn_error_codes.h:230
msgid "Framing error in pipe protocol"
msgstr "Błąd ramki w komunikacji IPC"
-#: include/svn_error_codes.h:235
+#: ../include/svn_error_codes.h:235
msgid "Read error in pipe"
msgstr "Błąd odczytu IPC"
-#: include/svn_error_codes.h:239 libsvn_subr/cmdline.c:308
-#: libsvn_subr/cmdline.c:325 svn/util.c:885
+#: ../include/svn_error_codes.h:239 ../libsvn_subr/cmdline.c:308
+#: ../libsvn_subr/cmdline.c:325 ../svn/util.c:885
#, c-format
msgid "Write error"
msgstr "Błąd zapisu"
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:245
msgid "Unexpected EOF on stream"
msgstr "Nieoczekiwany koniec strumienia"
-#: include/svn_error_codes.h:249
+#: ../include/svn_error_codes.h:249
msgid "Malformed stream data"
msgstr "Uszkodzone dane w strumieniu"
-#: include/svn_error_codes.h:253
+#: ../include/svn_error_codes.h:253
msgid "Unrecognized stream data"
msgstr "Nierozpoznane dane w strumieniu"
-#: include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:259
msgid "Unknown svn_node_kind"
msgstr "Nieznany rodzaj obiektu"
-#: include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:263
msgid "Unexpected node kind found"
-msgstr "Nieoczekiwany rodzaj obiektu."
+msgstr "Nieoczekiwany rodzaj obiektu"
-#: include/svn_error_codes.h:269
+#: ../include/svn_error_codes.h:269
msgid "Can't find an entry"
-msgstr "Nie można znależć elementu."
+msgstr "Nie można znależć elementu"
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:275
msgid "Entry already exists"
-msgstr "Element już istnieje."
+msgstr "Element już istnieje"
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:279
msgid "Entry has no revision"
-msgstr "Element nie ma wersji."
+msgstr "Element nie ma wersji"
-#: include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:283
msgid "Entry has no URL"
-msgstr "Element nie ma URL."
+msgstr "Element nie ma URL-u"
-#: include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:287
msgid "Entry has an invalid attribute"
-msgstr "Obiekt ma niepoprawny atrybut."
+msgstr "Obiekt ma niepoprawny atrybut"
-#: include/svn_error_codes.h:293
+#: ../include/svn_error_codes.h:293
msgid "Obstructed update"
msgstr "Przerwana aktualizacja"
-#: include/svn_error_codes.h:298
+#: ../include/svn_error_codes.h:298
msgid "Mismatch popping the WC unwind stack"
msgstr "Niezgodność w trakcie pobierania wartości ze stosu cofania zmian"
-#: include/svn_error_codes.h:303
+#: ../include/svn_error_codes.h:303
msgid "Attempt to pop empty WC unwind stack"
msgstr "Próba pobrania wartości z pustego stosu cofania zmian"
-#: include/svn_error_codes.h:308
+#: ../include/svn_error_codes.h:308
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Próba zdjęcia blokady przy nieopróżnionym stosie cofania zmian"
-#: include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:312
msgid "Attempted to lock an already-locked dir"
msgstr "Próba zablokowania już zablokowanego katalogu"
-#: include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:316
msgid "Working copy not locked; this is probably a bug, please report"
msgstr ""
"Kopia robocza nie została zablokowana; prawdopodobnie jest to błąd, wyślij "
"raport"
-#: include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:321
msgid "Invalid lock"
msgstr "Błędna blokada"
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:325
msgid "Path is not a working copy directory"
msgstr "Ścieżka nie wskazuje na katalog w ramach kopii roboczej"
-#: include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:329
msgid "Path is not a working copy file"
msgstr "Ścieżka nie wskazuje na plik w ramach kopii roboczej"
-#: include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:333
msgid "Problem running log"
msgstr "Nieudane uruchomienie logu"
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:337
msgid "Can't find a working copy path"
msgstr "Nie można odnaleźć ścieżki w ramach kopii roboczej"
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:341
msgid "Working copy is not up-to-date"
msgstr "Kopia robocza jest nieaktualna"
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:345
msgid "Left locally modified or unversioned files"
msgstr ""
"Pozostały pliki zmodyfikowane lokalnie lub niepodlegające kontroli wersji"
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:349
msgid "Unmergeable scheduling requested on an entry"
msgstr "Zlecenie niezgodne z już zarejestrowanymi zleceniami"
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:353
msgid "Found a working copy path"
msgstr "Znaleziono ścieżkę w ramach kopii roboczej"
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:357
msgid "A conflict in the working copy obstructs the current operation"
msgstr "Konflikt w ramach kopii roboczej uniemożliwia wykonanie polecenia"
-#: include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:361
msgid "Working copy is corrupt"
msgstr "Uszkodzona kopia robocza"
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:365
msgid "Working copy text base is corrupt"
msgstr "Uszkodzony plik bazowy"
-#: include/svn_error_codes.h:369
+#: ../include/svn_error_codes.h:369
msgid "Cannot change node kind"
msgstr "Nie można zmienić typu obiektu"
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:373
msgid "Invalid operation on the current working directory"
msgstr "Niepoprawna operacja na katalogu bieżącym"
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:377
msgid "Problem on first log entry in a working copy"
msgstr "Problem z zapisem pierwszego elementy logu w kopii roboczej"
-#: include/svn_error_codes.h:381
+#: ../include/svn_error_codes.h:381
msgid "Unsupported working copy format"
msgstr "Nieznany format kopii roboczej"
-#: include/svn_error_codes.h:385
+#: ../include/svn_error_codes.h:385
msgid "Path syntax not supported in this context"
msgstr "Sposób zapisania ścieżki nieobsługiwany w tej sytuacji"
-#: include/svn_error_codes.h:390
+#: ../include/svn_error_codes.h:390
msgid "Invalid schedule"
msgstr "Niewłaściwe zlecenie"
-#: include/svn_error_codes.h:395
+#: ../include/svn_error_codes.h:395
msgid "Invalid relocation"
msgstr "Błędna relokacja"
-#: include/svn_error_codes.h:400
+#: ../include/svn_error_codes.h:400
msgid "Invalid switch"
msgstr "Niewłaściwy przełącznik"
-#: include/svn_error_codes.h:405
+#: ../include/svn_error_codes.h:405
msgid "Changelist doesn't match"
msgstr "Lista zmian się nie zgadza"
-#: include/svn_error_codes.h:410
+#: ../include/svn_error_codes.h:410
msgid "Conflict resolution failed"
msgstr "Rozwiązanie konfliktu nie powiodło się"
-#: include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:414
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "Nie udało się zlokalizować ścieżki 'copyfrom' w kopii roboczej"
-#: include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:419
msgid "Moving a path from one changelist to another"
msgstr "Przenoszenie ścieżki z jednej listy zmian to innej"
-#: include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:426
msgid "General filesystem error"
msgstr "Błąd systemu plików"
-#: include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:430
msgid "Error closing filesystem"
msgstr "Błąd w trakcie zamykania systemu plików"
-#: include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:434
msgid "Filesystem is already open"
msgstr "System plików jest już otwarty"
-#: include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:438
msgid "Filesystem is not open"
msgstr "System plików nie jest otwarty"
-#: include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:442
msgid "Filesystem is corrupt"
msgstr "Uszkodzony system plików"
-#: include/svn_error_codes.h:446
+#: ../include/svn_error_codes.h:446
msgid "Invalid filesystem path syntax"
msgstr "Błędna składnia ścieżki"
-#: include/svn_error_codes.h:450
+#: ../include/svn_error_codes.h:450
msgid "Invalid filesystem revision number"
msgstr "Błędny numer wersji"
-#: include/svn_error_codes.h:454
+#: ../include/svn_error_codes.h:454
msgid "Invalid filesystem transaction name"
msgstr "Błędna nazwa transakcji"
-#: include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:458
msgid "Filesystem directory has no such entry"
msgstr "Katalog nie zawiera takiego elementu"
-#: include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:462
msgid "Filesystem has no such representation"
msgstr "Katalog nie ma takiej reprezentacji"
-#: include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:466
msgid "Filesystem has no such string"
msgstr "System plików nie zawiera takiego napisu"
-#: include/svn_error_codes.h:470
+#: ../include/svn_error_codes.h:470
msgid "Filesystem has no such copy"
msgstr "System plików nie zawiera takiej kopii"
-#: include/svn_error_codes.h:474
+#: ../include/svn_error_codes.h:474
msgid "The specified transaction is not mutable"
msgstr "Podana transakcja nie może być modyfikowana"
-#: include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:478
msgid "Filesystem has no item"
msgstr "System plików nie zawiera podanego elementu"
-#: include/svn_error_codes.h:482
+#: ../include/svn_error_codes.h:482
msgid "Filesystem has no such node-rev-id"
msgstr "System plików nie zawiera węzła o podanym identyfikatorze wersji"
-#: include/svn_error_codes.h:486
+#: ../include/svn_error_codes.h:486
msgid "String does not represent a node or node-rev-id"
msgstr "Napis nie zawiera identyfikatora węzła lub wersji węzła"
-#: include/svn_error_codes.h:490
+#: ../include/svn_error_codes.h:490
msgid "Name does not refer to a filesystem directory"
msgstr "Nazwa nie odnosi się do katalogu systemu plików"
-#: include/svn_error_codes.h:494
+#: ../include/svn_error_codes.h:494
msgid "Name does not refer to a filesystem file"
msgstr "Nazwa nie odnosi się do pliku systemu plików"
-#: include/svn_error_codes.h:498
+#: ../include/svn_error_codes.h:498
msgid "Name is not a single path component"
msgstr "Nazwa nie jest pojedynczą ścieżką"
-#: include/svn_error_codes.h:502
+#: ../include/svn_error_codes.h:502
msgid "Attempt to change immutable filesystem node"
msgstr "Próba zmiany węzła niemogącego ulegać zmianom"
-#: include/svn_error_codes.h:506
+#: ../include/svn_error_codes.h:506
msgid "Item already exists in filesystem"
msgstr "Element już istnieje"
-#: include/svn_error_codes.h:510
+#: ../include/svn_error_codes.h:510
msgid "Attempt to remove or recreate fs root dir"
msgstr ""
"Próba usunięcia lub ponownego utworzenia głównego katalogu systemu plików"
-#: include/svn_error_codes.h:514
+#: ../include/svn_error_codes.h:514
msgid "Object is not a transaction root"
msgstr "Obiekt nie wskazuje na korzeń transakcji"
-#: include/svn_error_codes.h:518
+#: ../include/svn_error_codes.h:518
msgid "Object is not a revision root"
msgstr "Obiekt nie wskazuje na korzeń wersji"
-#: include/svn_error_codes.h:522
+#: ../include/svn_error_codes.h:522
msgid "Merge conflict during commit"
msgstr "Konflikt łączenia zmian w trakcie zatwierdzania"
-#: include/svn_error_codes.h:526
+#: ../include/svn_error_codes.h:526
msgid "A representation vanished or changed between reads"
msgstr "Reprezentacja zniknęła lub zmieniła się pomiędzy kolejnymi odczytami"
-#: include/svn_error_codes.h:530
+#: ../include/svn_error_codes.h:530
msgid "Tried to change an immutable representation"
msgstr "Próba zmiany reprezentacji niemogącej ulegać zmianom"
-#: include/svn_error_codes.h:534
+#: ../include/svn_error_codes.h:534
msgid "Malformed skeleton data"
msgstr "Błędne dane wzorcowe"
-#: include/svn_error_codes.h:538
+#: ../include/svn_error_codes.h:538
msgid "Transaction is out of date"
msgstr "Transakcja jest nieaktualna"
-#: include/svn_error_codes.h:542
+#: ../include/svn_error_codes.h:542
msgid "Berkeley DB error"
msgstr "Błąd Berkeley DB"
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:546
msgid "Berkeley DB deadlock error"
msgstr "Zakleszczenie Berkeley DB"
-#: include/svn_error_codes.h:550
+#: ../include/svn_error_codes.h:550
msgid "Transaction is dead"
msgstr "Transakcja jest zniszczona"
-#: include/svn_error_codes.h:554
+#: ../include/svn_error_codes.h:554
msgid "Transaction is not dead"
msgstr "Transakcja nie jest zniszczona"
-#: include/svn_error_codes.h:559
+#: ../include/svn_error_codes.h:559
msgid "Unknown FS type"
msgstr "Nieznany typ systemu plików"
-#: include/svn_error_codes.h:564
+#: ../include/svn_error_codes.h:564
msgid "No user associated with filesystem"
msgstr "Brak użytkownika skojarzonego z systemem plików"
-#: include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:569
msgid "Path is already locked"
msgstr "Ścieżka została już zablokowana"
-#: include/svn_error_codes.h:574 include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:574 ../include/svn_error_codes.h:721
msgid "Path is not locked"
msgstr "Ścieżka nie jest zablokowana"
-#: include/svn_error_codes.h:579
+#: ../include/svn_error_codes.h:579
msgid "Lock token is incorrect"
msgstr "Żeton blokady jest niepoprawny"
-#: include/svn_error_codes.h:584
+#: ../include/svn_error_codes.h:584
msgid "No lock token provided"
msgstr "Nie podano żetonu blokady"
-#: include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:589
msgid "Username does not match lock owner"
msgstr "Nazwa użytkownika nie zgadza się z nazwą właściciela blokady"
-#: include/svn_error_codes.h:594
+#: ../include/svn_error_codes.h:594
msgid "Filesystem has no such lock"
msgstr "System plików nie zawiera takiej blokady"
-#: include/svn_error_codes.h:599
+#: ../include/svn_error_codes.h:599
msgid "Lock has expired"
msgstr "Blokada wygasła"
-#: include/svn_error_codes.h:604 include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:604 ../include/svn_error_codes.h:708
msgid "Item is out of date"
msgstr "Element jest nieaktualny"
-#: include/svn_error_codes.h:616
+#: ../include/svn_error_codes.h:616
msgid "Unsupported FS format"
msgstr "Nieznany format systemu plików"
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:621
msgid "Representation is being written"
msgstr "Reprezentacja jest zapisywana"
-#: include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:626
msgid "The generated transaction name is too long"
msgstr "Wygenerowana nazwa transakcji jest zbyt długa"
-#: include/svn_error_codes.h:631
+#: ../include/svn_error_codes.h:631
msgid "SQLite error"
msgstr "Błąd SQLite"
-#: include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:636
+msgid "Filesystem has no such node origin record"
+msgstr "System plików nie zawiera rekordu pochodzenia takiego węzła"
+
+#: ../include/svn_error_codes.h:642
msgid "The repository is locked, perhaps for db recovery"
msgstr ""
"Repozytorium jest zablokowane, być może ze względu na odtwarzanie bazy danych"
-#: include/svn_error_codes.h:641
+#: ../include/svn_error_codes.h:646
msgid "A repository hook failed"
msgstr "Błąd wykonania skryptu (hook) repozytorium"
-#: include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:650
msgid "Incorrect arguments supplied"
msgstr "Błędne parametry"
-#: include/svn_error_codes.h:649
+#: ../include/svn_error_codes.h:654
msgid "A report cannot be generated because no data was supplied"
msgstr "Brak danych do wygenerowania raportu"
-#: include/svn_error_codes.h:653
+#: ../include/svn_error_codes.h:658
msgid "Bogus revision report"
msgstr "Niepoprawny raport o wersji"
-#: include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
msgid "Unsupported repository version"
msgstr "Nieobsługiwana wersja repozytorium"
-#: include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:671
msgid "Disabled repository feature"
msgstr "Wyłączona obsługa funkcji repozytorium"
-#: include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:675
msgid "Error running post-commit hook"
msgstr "Błąd działania skryptu post-commit"
-#: include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:680
msgid "Error running post-lock hook"
msgstr "Błąd podczas działania skryptu post-lock"
-#: include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:685
msgid "Error running post-unlock hook"
msgstr "Błąd podczas działania skryptu post-unlock"
-#: include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:692
msgid "Bad URL passed to RA layer"
msgstr "Błędny URL przekazany do warstwy RA"
-#: include/svn_error_codes.h:691
+#: ../include/svn_error_codes.h:696
msgid "Authorization failed"
msgstr "Nieudana autoryzacja"
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:700
msgid "Unknown authorization method"
msgstr "Nieznana metoda autoryzacji"
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:704
msgid "Repository access method not implemented"
msgstr "Niezaimplementowana metoda dostępu do repozytorium"
-#: include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:712
msgid "Repository has no UUID"
msgstr "Repozytorium nie ma UUID"
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:716
msgid "Unsupported RA plugin ABI version"
msgstr "Nieobsługiwana wersja ABI w pluginie RA"
-#: include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:726
msgid "Inquiry about unknown capability"
msgstr "Dochodzenie w sprawie nieznanej zdolności"
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:732
msgid "RA layer failed to init socket layer"
msgstr "Warstwa RA nie zainicjowała połączenia sieciowego"
-#: include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:736
msgid "RA layer failed to create HTTP request"
msgstr "Warstwa RA nie stworzyła żądania HTTP"
-#: include/svn_error_codes.h:735
+#: ../include/svn_error_codes.h:740
msgid "RA layer request failed"
msgstr "Żądanie warstwy RA nie powiodło się"
-#: include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:744
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "Warstwa RA nie otrzymała wymaganych informacji"
-#: include/svn_error_codes.h:743
+#: ../include/svn_error_codes.h:748
msgid "RA layer failed to fetch properties"
msgstr "Warstwa RA nie zdołała pobrać atrybutów"
-#: include/svn_error_codes.h:747
+#: ../include/svn_error_codes.h:752
msgid "RA layer file already exists"
msgstr "Plik warstwy RA już istnieje"
-#: include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:756
msgid "Invalid configuration value"
msgstr "Błąd konfiguracji"
-#: include/svn_error_codes.h:755
+#: ../include/svn_error_codes.h:760
msgid "HTTP Path Not Found"
msgstr "Nie znaleziono adresu HTTP"
-#: include/svn_error_codes.h:759
+#: ../include/svn_error_codes.h:764
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Błąd wykonania PROPPATCH WebDAV"
-#: include/svn_error_codes.h:764 include/svn_error_codes.h:805
-#: libsvn_ra_svn/marshal.c:640 libsvn_ra_svn/marshal.c:758
-#: libsvn_ra_svn/marshal.c:785
+#: ../include/svn_error_codes.h:769 ../include/svn_error_codes.h:810
+#: ../libsvn_ra_svn/marshal.c:640 ../libsvn_ra_svn/marshal.c:758
+#: ../libsvn_ra_svn/marshal.c:785
msgid "Malformed network data"
msgstr "Błędne dane z sieci"
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:774
msgid "Unable to extract data from response header"
msgstr "Nie udało się zdekodować danych z nagłówka odpowiedzi"
-#: include/svn_error_codes.h:774
+#: ../include/svn_error_codes.h:779
msgid "Repository has been moved"
msgstr "Repozytorium zostało przeniesione"
-#: include/svn_error_codes.h:780 include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:785 ../include/svn_error_codes.h:814
msgid "Couldn't find a repository"
msgstr "Nie znaleziono repozytorium"
-#: include/svn_error_codes.h:784
+#: ../include/svn_error_codes.h:789
msgid "Couldn't open a repository"
msgstr "Nie zdołano otworzyć repozytorium"
-#: include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:794
msgid "Special code for wrapping server errors to report to client"
msgstr "Błąd serwera"
-#: include/svn_error_codes.h:793
+#: ../include/svn_error_codes.h:798
msgid "Unknown svn protocol command"
msgstr "Nieznane polecenie protokołu svn"
-#: include/svn_error_codes.h:797
+#: ../include/svn_error_codes.h:802
msgid "Network connection closed unexpectedly"
msgstr "Nieoczekiwane przerwanie połączenia sieciowego"
-#: include/svn_error_codes.h:801
+#: ../include/svn_error_codes.h:806
msgid "Network read/write error"
msgstr "Błąd odczytu/zapisu sieciowego"
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:818
msgid "Client/server version mismatch"
msgstr "Niezgodność wersji klienta i serwera"
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:823
msgid "Cannot negotiate authentication mechanism"
msgstr "Nie można określić sposobu autoryzacji"
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:832
msgid "Credential data unavailable"
msgstr "Brak danych uwierzytelniających"
-#: include/svn_error_codes.h:831
+#: ../include/svn_error_codes.h:836
msgid "No authentication provider available"
msgstr "Brak mechanizmów uwierzytelniania"
-#: include/svn_error_codes.h:835 include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:840 ../include/svn_error_codes.h:844
msgid "All authentication providers exhausted"
msgstr "Wyczerpano możliwości uwierzytelniania"
-#: include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:849
msgid "Authentication failed"
msgstr "Nieudane uwierzytelnienie"
-#: include/svn_error_codes.h:850
+#: ../include/svn_error_codes.h:855
msgid "Read access denied for root of edit"
msgstr "Brak prawa do odczytu"
-#: include/svn_error_codes.h:855
+#: ../include/svn_error_codes.h:860
msgid "Item is not readable"
msgstr "Nie można odczytać elementu"
-#: include/svn_error_codes.h:860
+#: ../include/svn_error_codes.h:865
msgid "Item is partially readable"
msgstr "Element można tylko częściowo odczytać"
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:869
msgid "Invalid authz configuration"
msgstr "Błędna konfiguracja autoryzacji"
-#: include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:874
msgid "Item is not writable"
msgstr "Elementu nie można zapisywać"
-#: include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:880
msgid "Svndiff data has invalid header"
msgstr "Błędny nagłówek danych svndiff"
-#: include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:884
msgid "Svndiff data contains corrupt window"
msgstr "Błędne okno danych svndiff"
-#: include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:888
msgid "Svndiff data contains backward-sliding source view"
msgstr "Dane svndiff zawierają wsteczny podgląd"
-#: include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:892
msgid "Svndiff data contains invalid instruction"
msgstr "Dane svndiff zawierają nieznaną instrukcję"
-#: include/svn_error_codes.h:891
+#: ../include/svn_error_codes.h:896
msgid "Svndiff data ends unexpectedly"
msgstr "Nieoczekiwany koniec danych svndiff"
-#: include/svn_error_codes.h:895
+#: ../include/svn_error_codes.h:900
msgid "Svndiff compressed data is invalid"
msgstr "Błędny nagłówek skomprymowanych danych svndiff"
-#: include/svn_error_codes.h:901
+#: ../include/svn_error_codes.h:906
msgid "Diff data source modified unexpectedly"
msgstr "Dane diff nieoczekiwanie zostały zmodyfikowane"
-#: include/svn_error_codes.h:907
+#: ../include/svn_error_codes.h:912
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache nie zna ścieżki do systemu plików Subversion"
-#: include/svn_error_codes.h:911
+#: ../include/svn_error_codes.h:916
msgid "Apache got a malformed URI"
msgstr "Apache otrzymał błędny URI"
-#: include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:920
msgid "Activity not found"
msgstr "Nie znaleziono aktywności"
-#: include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:924
msgid "Baseline incorrect"
msgstr "Błędna linia bazowa"
-#: include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:928
msgid "Input/output error"
msgstr "Błąd wejścia/wyjścia"
-#: include/svn_error_codes.h:929
+#: ../include/svn_error_codes.h:934
msgid "A path under version control is needed for this operation"
msgstr "To polecenie wymaga ścieżki podlegającej zarządzaniu wersjami"
-#: include/svn_error_codes.h:933
+#: ../include/svn_error_codes.h:938
msgid "Repository access is needed for this operation"
msgstr "To polecenie wymaga dostępu do repozytorium"
-#: include/svn_error_codes.h:937
+#: ../include/svn_error_codes.h:942
msgid "Bogus revision information given"
msgstr "Błędne informacje o wersji"
-#: include/svn_error_codes.h:941
+#: ../include/svn_error_codes.h:946
msgid "Attempting to commit to a URL more than once"
msgstr "Próba zatwierdzenia URL więcej niż raz"
-#: include/svn_error_codes.h:945
+#: ../include/svn_error_codes.h:950
msgid "Operation does not apply to binary file"
msgstr "Polecenie niedostępne dla plików binarnych"
-#: include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:956
msgid "Format of an svn:externals property was invalid"
msgstr "Błędny format atrybutu svn:externals"
-#: include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:960
msgid "Attempting restricted operation for modified resource"
msgstr "Próba wykonania zastrzeżonej operacji dla zmodyfikowanego zasobu"
-#: include/svn_error_codes.h:959
+#: ../include/svn_error_codes.h:964
msgid "Operation does not apply to directory"
msgstr "Polecenie niedostępne dla katalogów"
-#: include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:968
msgid "Revision range is not allowed"
msgstr "Zakres wersji jest niedozwolony w tym przypadku"
-#: include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:972
msgid "Inter-repository relocation not allowed"
msgstr "Przeniesienie między repozytoriami nie jest dozwolone"
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:976
msgid "Author name cannot contain a newline"
msgstr "Nazwa autora nie może zawierać znaku nowego wiersza"
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:980
msgid "Bad property name"
msgstr "Błędna nazwa atrybutu"
-#: include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:985
msgid "Two versioned resources are unrelated"
msgstr "Podane zasoby nie są ze sobą związane"
-#: include/svn_error_codes.h:985
+#: ../include/svn_error_codes.h:990
msgid "Path has no lock token"
msgstr "Ścieżka nie zawiera żetonu blokady"
-#: include/svn_error_codes.h:990
+#: ../include/svn_error_codes.h:995
msgid "Operation does not support multiple sources"
msgstr "Operacja nie obsługuje wielu źródeł"
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1000
msgid "No versioned parent directories"
msgstr "Niewersjonowane narzędne katalogi"
-#: include/svn_error_codes.h:1001
+#: ../include/svn_error_codes.h:1006
msgid "A problem occurred; see later errors for details"
msgstr "Wystąpił błąd, szczegóły dalej."
-#: include/svn_error_codes.h:1005
+#: ../include/svn_error_codes.h:1010
msgid "Failure loading plugin"
msgstr "Błąd ładowania plugina."
-#: include/svn_error_codes.h:1009
+#: ../include/svn_error_codes.h:1014
msgid "Malformed file"
msgstr "Błędny plik"
-#: include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1018
msgid "Incomplete data"
msgstr "Niepełne dane"
-#: include/svn_error_codes.h:1017
+#: ../include/svn_error_codes.h:1022
msgid "Incorrect parameters given"
msgstr "Błędne parametry"
-#: include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1026
msgid "Tried a versioning operation on an unversioned resource"
msgstr ""
"Polecenie wymaga pliku podlegającego zarządzaniu wersjami, podany parametr "
"tego warunku nie spełnia."
-#: include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1030
msgid "Test failed"
msgstr "Błąd testu"
-#: include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1034
msgid "Trying to use an unsupported feature"
msgstr "Próba użycia nieobsługiwanej funkcji"
-#: include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1038
msgid "Unexpected or unknown property kind"
msgstr "Nieoczekiwany lub nieznany typ atrybutu"
-#: include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1042
msgid "Illegal target for the requested operation"
msgstr "Nielegalny obiekt dla podanej operacji"
-#: include/svn_error_codes.h:1041
+#: ../include/svn_error_codes.h:1046
msgid "MD5 checksum is missing"
msgstr "Niezgodność sumy kontrolnej MD5"
-#: include/svn_error_codes.h:1045
+#: ../include/svn_error_codes.h:1050
msgid "Directory needs to be empty but is not"
msgstr "Katalog powinien być pusty, ale nie jest"
-#: include/svn_error_codes.h:1049
+#: ../include/svn_error_codes.h:1054
msgid "Error calling external program"
msgstr "Błąd uruchamiania zewnętrznego programu"
-#: include/svn_error_codes.h:1053
+#: ../include/svn_error_codes.h:1058
msgid "Python exception has been set with the error"
msgstr "Wyjątek języka Python"
-#: include/svn_error_codes.h:1057
+#: ../include/svn_error_codes.h:1062
msgid "A checksum mismatch occurred"
msgstr "Niezgodność sumy kontrolnej"
-#: include/svn_error_codes.h:1061
+#: ../include/svn_error_codes.h:1066
msgid "The operation was interrupted"
msgstr "Wykonanie polecenia przerwano"
-#: include/svn_error_codes.h:1065
+#: ../include/svn_error_codes.h:1070
msgid "The specified diff option is not supported"
msgstr "Podana opcja diff nie jest obsługiwana"
-#: include/svn_error_codes.h:1069
+#: ../include/svn_error_codes.h:1074
msgid "Property not found"
msgstr "Nie ma takiego atrybutu"
-#: include/svn_error_codes.h:1073
+#: ../include/svn_error_codes.h:1078
msgid "No auth file path available"
msgstr "Brak ścieżki do pliku uwierzytelniającego"
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1083
msgid "Incompatible library version"
msgstr "Niekompatybilna wersja biblioteki"
-#: include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1088
msgid "Merge info parse error"
msgstr "Błąd parsowania informacji łączenia zmian"
-#: include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1093
msgid "Cease invocation of this API"
msgstr "Zaprzestane wywołanie tego API"
-#: include/svn_error_codes.h:1093
+#: ../include/svn_error_codes.h:1098
msgid "Error parsing revision number"
msgstr "Błąd podczas parsowania numeru wersji"
-#: include/svn_error_codes.h:1098
+#: ../include/svn_error_codes.h:1103
msgid "Iteration terminated before completion"
msgstr "Iteracja przerwana przed zakończeniem"
-#: include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1107
msgid "Unknown changelist"
msgstr "Nieznana lista zmian"
-#: include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1113
msgid "Error parsing arguments"
msgstr "Błąd podczas parsowania parametrów"
-#: include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1117
msgid "Not enough arguments provided"
msgstr "Zbyt mało parametrów"
-#: include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1121
msgid "Mutually exclusive arguments specified"
msgstr "Podano sprzeczne parametry"
-#: include/svn_error_codes.h:1120
+#: ../include/svn_error_codes.h:1125
msgid "Attempted command in administrative dir"
msgstr "Próba wykonania polecenia w katalogu administracyjnym"
-#: include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1129
msgid "The log message file is under version control"
msgstr "Plik z opisem zmian podlega zarządzaniu wersjami"
-#: include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1133
msgid "The log message is a pathname"
msgstr "Opis zmian jest ścieżką"
-#: include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1137
msgid "Committing in directory scheduled for addition"
msgstr "Próba zatwierdzania w katalogu oczekującym na dodanie"
-#: include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1141
msgid "No external editor available"
msgstr "Brak zewnętrznego edytora"
-#: include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1145
msgid "Something is wrong with the log message's contents"
msgstr "Opis zmian zawiera jakiś błąd"
-#: include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1149
msgid "A log message was given where none was necessary"
msgstr "Wprowadzono opis zmian mimo, że nie jest wymagany"
-#: include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1153
msgid "No external merge tool available"
msgstr "Nie jest dostępne zewnętrzne narzędzie łączenia zmian"
-#: libsvn_client/add.c:348 libsvn_wc/copy.c:188
+#: ../libsvn_client/add.c:348 ../libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "Nie można zamknąć katalogu '%s'"
-#: libsvn_client/add.c:356
+#: ../libsvn_client/add.c:356
#, c-format
msgid "Error during add of '%s'"
msgstr "Błąd podczas dodawania '%s'"
-#: libsvn_client/blame.c:391 libsvn_client/blame.c:1254
+#: ../libsvn_client/blame.c:391
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Nie można określić odpowiedzialności za plik binarny '%s'"
-#: libsvn_client/blame.c:627
+#: ../libsvn_client/blame.c:621
msgid "blame of the WORKING revision is not supported"
msgstr "odpowiedzialność wersji kopii roboczej nie jest wspierana"
-#: libsvn_client/blame.c:641
+#: ../libsvn_client/blame.c:635
msgid "Start revision must precede end revision"
msgstr "Wersja początkowa musi być mniejsza niż końcowa"
-#: libsvn_client/blame.c:1081 libsvn_ra/compat.c:175
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "Brak informacji o zmianie ścieżki dla '%s' w wersji %ld"
-
-#: libsvn_client/blame.c:1141 libsvn_client/cat.c:206
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "URL '%s' odnosi się do katalogu"
-
-#: libsvn_client/blame.c:1214
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "Polecenie '%c' dla wersji %ld '%s' wymaga podania wersji wcześniejszej"
-
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' odnosi się do katalogu"
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:126 ../libsvn_client/export.c:183
msgid "(local)"
msgstr "(lokalny)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:943
+#: ../libsvn_client/cat.c:206
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "URL '%s' odnosi się do katalogu"
+
+#: ../libsvn_client/checkout.c:91 ../libsvn_client/export.c:943
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s' nie istnieje"
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:95
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' odnosi się do pliku, nie do katalogu"
-#: libsvn_client/checkout.c:167
+#: ../libsvn_client/checkout.c:167
#, c-format
msgid "'%s' is already a working copy for a different URL"
-msgstr "'%s' jest już kopią roboczą innego URL"
+msgstr "'%s' jest już kopią roboczą innego URL-u"
-#: libsvn_client/checkout.c:171
+#: ../libsvn_client/checkout.c:171
msgid "; run 'svn update' to complete it"
msgstr "; uruchom 'svn update' aby zakończyć"
-#: libsvn_client/checkout.c:181
+#: ../libsvn_client/checkout.c:181
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' już istnieje i nie jest katalogiem"
-#: libsvn_client/commit.c:433
+#: ../libsvn_client/commit.c:433
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr ""
"Nieznany lub niepodlegający zarządzaniu wersjami rodzaj obiektu dla '%s'"
-#: libsvn_client/commit.c:538
+#: ../libsvn_client/commit.c:538
msgid "New entry name required when importing a file"
msgstr "Wymagane podanie nazwy obiektu podczas importowania pliku"
-#: libsvn_client/commit.c:573 libsvn_wc/adm_ops.c:1037
-#: libsvn_wc/questions.c:93
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:1037
+#: ../libsvn_wc/questions.c:93
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' nie istnieje"
-#: libsvn_client/commit.c:634 libsvn_client/copy.c:536 svnlook/main.c:1264
+#: ../libsvn_client/commit.c:634 ../libsvn_client/copy.c:562
+#: ../svnlook/main.c:1264
#, c-format
msgid "Path '%s' does not exist"
msgstr "Ścieżka '%s' nie istnieje"
-#: libsvn_client/commit.c:769 libsvn_client/copy.c:545
-#: libsvn_client/copy.c:938 libsvn_client/copy.c:1178
-#: libsvn_client/copy.c:1602
+#: ../libsvn_client/commit.c:769 ../libsvn_client/copy.c:571
+#: ../libsvn_client/copy.c:964 ../libsvn_client/copy.c:1204
+#: ../libsvn_client/copy.c:1626
#, c-format
msgid "Path '%s' already exists"
msgstr "Ścieżka '%s' już istnieje"
-#: libsvn_client/commit.c:784
+#: ../libsvn_client/commit.c:784
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' to nazwa zastrzeżona i nie może zostać zaimportowana"
-#: libsvn_client/commit.c:917 libsvn_client/copy.c:1342
+#: ../libsvn_client/commit.c:917 ../libsvn_client/copy.c:1367
msgid "Commit failed (details follow):"
msgstr "Zatwierdzenie nie powiodło się (szczegóły poniżej):"
-#: libsvn_client/commit.c:925
+#: ../libsvn_client/commit.c:925
msgid "Commit succeeded, but other errors follow:"
msgstr "Zatwierdzenie powiodło się, lecz wystąpiły inne błędy:"
-#: libsvn_client/commit.c:932
+#: ../libsvn_client/commit.c:932
msgid "Error unlocking locked dirs (details follow):"
msgstr "Nie udało się odblokowanie katalogów (szczegóły poniżej):"
-#: libsvn_client/commit.c:943
+#: ../libsvn_client/commit.c:943
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Błąd operacji post-commit (szczegóły poniżej):"
-#: libsvn_client/commit.c:954
+#: ../libsvn_client/commit.c:954
msgid "Error in post-commit clean-up (details follow):"
msgstr "Błąd oczyszczania post-commit (szczegóły poniżej):"
-#: libsvn_client/commit.c:1304
+#: ../libsvn_client/commit.c:1304
msgid "Are all the targets part of the same working copy?"
msgstr "Czy wszystkie obiekty docelowe należą do tej samej kopii roboczej?"
-#: libsvn_client/commit.c:1337
+#: ../libsvn_client/commit.c:1337
msgid "Cannot non-recursively commit a directory deletion"
msgstr "Zatwierdzenie usunięcia katalogu musi być wykonane rekurencyjnie"
-#: libsvn_client/commit.c:1381
+#: ../libsvn_client/commit.c:1381
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' to URL, a URL-e nie mogą być obiektami zatwierdzenia"
-#: libsvn_client/commit_util.c:273 libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:273 ../libsvn_client/commit_util.c:284
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Nieznany rodzaj obiektu dla '%s'"
-#: libsvn_client/commit_util.c:301
+#: ../libsvn_client/commit_util.c:301
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "Obiekt '%s' został zastąpiony plikiem specjalnym"
-#: libsvn_client/commit_util.c:356
+#: ../libsvn_client/commit_util.c:356
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Zatwierdzanie przerwane: konflikt obiektu '%s'"
-#: libsvn_client/commit_util.c:423
+#: ../libsvn_client/commit_util.c:423
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "Niespodziewanie '%s' okazał się głównym katalogiem kopii roboczej"
-#: libsvn_client/commit_util.c:441 libsvn_client/commit_util.c:1120
+#: ../libsvn_client/commit_util.c:441 ../libsvn_client/commit_util.c:1120
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "Element '%s' zaznaczony do skopiowania, lecz nie podano źródłowego URL"
+msgstr "Element '%s' zaznaczony do skopiowania, lecz nie podano źródłowego URL-u"
-#: libsvn_client/commit_util.c:704
+#: ../libsvn_client/commit_util.c:704
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1090,18 +1085,18 @@
"'%s' nie podlega zarządzaniu wersjami i nie podlega zatwierdzaniu, jednak "
"podrzędny obiekt '%s' ma zostać zatwierdzony"
-#: libsvn_client/commit_util.c:786
+#: ../libsvn_client/commit_util.c:786
#, c-format
msgid "Entry for '%s' has no URL"
-msgstr "Element '%s' nie ma URL"
+msgstr "Element '%s' nie ma URL-u"
-#: libsvn_client/commit_util.c:819
+#: ../libsvn_client/commit_util.c:819
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr ""
"'%s' przeznaczony do dodania w katalogu niepodlegającym kontroli wersji"
-#: libsvn_client/commit_util.c:839
+#: ../libsvn_client/commit_util.c:839
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1112,37 +1107,38 @@
"do dodania. Czy próbujesz zatwierdzić obiekt, który jest w katalogu\n"
"niepodlegającym zarządzaniu wersjami?"
-#: libsvn_client/commit_util.c:863 svn/changelist-cmd.c:62 svn/diff-cmd.c:135
-#: svn/info-cmd.c:466 svn/lock-cmd.c:101 svn/propdel-cmd.c:72
-#: svn/propget-cmd.c:196 svn/proplist-cmd.c:128 svn/revert-cmd.c:59
-#: svn/status-cmd.c:231 svn/unlock-cmd.c:60 svn/update-cmd.c:60
+#: ../libsvn_client/commit_util.c:863 ../svn/changelist-cmd.c:62
+#: ../svn/diff-cmd.c:204 ../svn/info-cmd.c:466 ../svn/lock-cmd.c:101
+#: ../svn/propdel-cmd.c:72 ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:128
+#: ../svn/revert-cmd.c:59 ../svn/status-cmd.c:231 ../svn/unlock-cmd.c:60
+#: ../svn/update-cmd.c:60
#, c-format
msgid "Unknown changelist '%s'"
msgstr "Nieznana lista zmian '%s'"
-#: libsvn_client/commit_util.c:976
+#: ../libsvn_client/commit_util.c:976
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"Nie można zatwierdzić '%s' i '%s', ponieważ odnoszą się do tego samego URL-u"
-#: libsvn_client/commit_util.c:1125
+#: ../libsvn_client/commit_util.c:1125
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Element '%s' zaznaczony do skopiowania, lecz wersja jest niewłaściwa"
-#: libsvn_client/commit_util.c:1884
+#: ../libsvn_client/commit_util.c:1884
msgid "Standard properties can't be set explicitly as revision properties"
msgstr ""
"Standardowe atrybuty nie mogą być jawnie ustawione jako atrybuty wersji"
-#: libsvn_client/copy.c:561 libsvn_client/copy.c:1618
-#: libsvn_client/update.c:143
+#: ../libsvn_client/copy.c:587 ../libsvn_client/copy.c:1642
+#: ../libsvn_client/update.c:143
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Ścieżka '%s' nie jest katalogiem"
-#: libsvn_client/copy.c:804
+#: ../libsvn_client/copy.c:830
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1151,142 +1147,142 @@
"Obiekty źródłowy i docelowy nie znajdują się w tym samym repozytorium"
"(źródło: '%s'; cel: '%s')"
-#: libsvn_client/copy.c:919
+#: ../libsvn_client/copy.c:945
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Nie można przenieść URL-u '%s' do samego siebie"
-#: libsvn_client/copy.c:928 libsvn_client/prop_commands.c:228
+#: ../libsvn_client/copy.c:954 ../libsvn_client/prop_commands.c:228
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Ścieżka '%s' nie istnieje w wersji %ld"
-#: libsvn_client/copy.c:1442
+#: ../libsvn_client/copy.c:1466
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"Źródłowy URL '%s' pochodzi z zewnętrznego repozytorium; pozostaje jako kopia "
"rozłączona"
-#: libsvn_client/copy.c:1589
+#: ../libsvn_client/copy.c:1613
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Ścieżka '%s' nie znaleziona w wersji '%ld'"
-#: libsvn_client/copy.c:1594
+#: ../libsvn_client/copy.c:1618
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Ścieżki '%s' nie znaleziono w wersji HEAD"
-#: libsvn_client/copy.c:1644
+#: ../libsvn_client/copy.c:1668
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Element '%s' istnieje, choć nie znaleziono kopii roboczej pliku"
-#: libsvn_client/copy.c:1737 libsvn_client/log.c:342
+#: ../libsvn_client/copy.c:1761 ../libsvn_client/log.c:342
msgid "Revision type requires a working copy path, not a URL"
msgstr "Rodzaj wersji wymaga ścieżkę kopii roboczej, nie URL"
-#: libsvn_client/copy.c:1782
+#: ../libsvn_client/copy.c:1806
msgid "Cannot mix repository and working copy sources"
msgstr "Nie można mieszać źródeł repozytorium i kopii roboczej"
-#: libsvn_client/copy.c:1825
+#: ../libsvn_client/copy.c:1849
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Nie można skopiować ścieżki '%s' do własnej podrzędnej '%s'"
-#: libsvn_client/copy.c:1845
+#: ../libsvn_client/copy.c:1869
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Nie można przenieść ścieżki '%s' do siebie samej"
-#: libsvn_client/copy.c:1854
+#: ../libsvn_client/copy.c:1878
msgid "Moves between the working copy and the repository are not supported"
msgstr "Przeniesienia między kopią roboczą a repozytorium są nieobsługiwane"
-#: libsvn_client/copy.c:1917
+#: ../libsvn_client/copy.c:1941
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "obiekt '%s' nie posiada związanego z nim URL-u"
-#: libsvn_client/copy.c:2284 svn/move-cmd.c:60
+#: ../libsvn_client/copy.c:2317 ../svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"Nie można określić wersji (z wyjątkiem HEAD) dla operacji przeniesienia"
-#: 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' leży w miejscu pliku podlegającego zarządzaniu wersjami"
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2914 libsvn_wc/entries.c:1272
-#: libsvn_wc/entries.c:2383 libsvn_wc/entries.c:3005
-#: libsvn_wc/update_editor.c:2350
+#: ../libsvn_client/delete.c:67 ../libsvn_wc/adm_ops.c:2914
+#: ../libsvn_wc/entries.c:1272 ../libsvn_wc/entries.c:2383
+#: ../libsvn_wc/entries.c:3005 ../libsvn_wc/update_editor.c:2361
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' nie podlega zarządzaniu wersjami"
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' zawiera lokalne modyfikacje"
-#: libsvn_client/diff.c:136
+#: ../libsvn_client/diff.c:136
#, c-format
msgid " Reverted %s:r%s%s"
msgstr "Wycofano zmiany %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: ../libsvn_client/diff.c:154
#, c-format
msgid " Merged %s:r%s%s"
msgstr "Połączono zmiany %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: ../libsvn_client/diff.c:176
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sZmiany atrybutów dla: %s%s"
-#: libsvn_client/diff.c:204
+#: ../libsvn_client/diff.c:204
#, c-format
msgid "Name: %s%s"
msgstr "Nazwa: %s%s"
-#: libsvn_client/diff.c:323
+#: ../libsvn_client/diff.c:323
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(wersja %ld)"
-#: libsvn_client/diff.c:325
+#: ../libsvn_client/diff.c:325
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(kopia robocza)"
-#: libsvn_client/diff.c:468
+#: ../libsvn_client/diff.c:468
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Nie można wyświetlić: plik binarny.%s"
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:1633
+#: ../libsvn_client/diff.c:828 ../libsvn_client/merge.c:1633
msgid "Not all required revisions are specified"
msgstr "Nie wszystkie wymagane wersje zostały podane"
-#: libsvn_client/diff.c:843
+#: ../libsvn_client/diff.c:843
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Przynajmniej jedna wersja musi być zdalna dla wieszakowej różnicy"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: ../libsvn_client/diff.c:955 ../libsvn_client/diff.c:967
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' nie występuje w repozytorium w wersji %ld"
-#: libsvn_client/diff.c:1026
+#: ../libsvn_client/diff.c:1026
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"Przepraszamy, ale svn_client_diff4 uruchomiono w sposób, który nie jest "
"jeszcze obsługiwany"
-#: libsvn_client/diff.c:1082
+#: ../libsvn_client/diff.c:1082
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1294,153 +1290,155 @@
"Jedynie porównania między wersją bazową i jej plikiem roboczym są obecnie "
"obsługiwane"
-#: libsvn_client/diff.c:1227 libsvn_client/switch.c:125
+#: ../libsvn_client/diff.c:1227 ../libsvn_client/switch.c:123
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Katalog '%s' nie ma URL-u"
-#: libsvn_client/diff.c:1437
+#: ../libsvn_client/diff.c:1437
msgid "Summarizing diff can only compare repository to repository"
msgstr ""
"Podsumowująca różnica może tylko porównywać repozytorium do repozytorium"
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' nie jest poprawnym znakiem końca linii"
-#: libsvn_client/export.c:261
+#: ../libsvn_client/export.c:261
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"Katalog docelowy już istnieje i nie zostanie nadpisany, o ile nie zostanie "
"to wymuszone."
-#: libsvn_client/export.c:407 libsvn_client/export.c:550
+#: ../libsvn_client/export.c:407 ../libsvn_client/export.c:550
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' istnieje i nie jest katalogiem"
-#: libsvn_client/export.c:411 libsvn_client/export.c:554
+#: ../libsvn_client/export.c:411 ../libsvn_client/export.c:554
#, c-format
msgid "'%s' already exists"
msgstr "'%s' już istnieje"
-#: libsvn_client/export.c:725 libsvn_wc/adm_crawler.c:1092
-#: libsvn_wc/update_editor.c:2034 libsvn_wc/update_editor.c:2695
+#: ../libsvn_client/export.c:725 ../libsvn_wc/adm_crawler.c:1092
+#: ../libsvn_wc/update_editor.c:2045 ../libsvn_wc/update_editor.c:2711
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Błąd sumy kontrolnej dla '%s'; oczekiwana: '%s', faktyczna: '%s'"
-#: libsvn_client/externals.c:315
+#: ../libsvn_client/externals.c:315
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "URL '%s' nie zaczyna się od schematu"
-#: libsvn_client/externals.c:364
+#: ../libsvn_client/externals.c:364
#, c-format
msgid "Illegal parent directory URL '%s'."
msgstr "Nieprawidłowy URL '%s' katalogu nadrzędnego."
-#: libsvn_client/externals.c:394
+#: ../libsvn_client/externals.c:394
#, c-format
msgid "Illegal repository root URL '%s'."
msgstr "Nieprawidłowy URL '%s' katalogu głównego repozytorium."
-#: libsvn_client/externals.c:436
+#: ../libsvn_client/externals.c:436
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'."
msgstr ""
"Zewnętrzny, względny URL '%s' nie może mieć ścieżek wstecznych, tj. '..'."
-#: libsvn_client/externals.c:468
+#: ../libsvn_client/externals.c:468
#, c-format
msgid "Unrecognized format for the relative external URL '%s'."
msgstr "Nierozpoznany format dla względnego, zewnętrznego URL-u '%s'."
-#: libsvn_client/externals.c:690
+#: ../libsvn_client/externals.c:690
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "Przejście '%s' nie znalazło otaczającej głębokości"
-#: libsvn_client/info.c:410
+#: ../libsvn_client/info.c:410
#, c-format
msgid ""
"Server does not support retrieving information about the repository root"
msgstr ""
"Serwer nie obsługuje uzyskiwania informacji o katalogu głównym repozytorium"
-#: libsvn_client/info.c:417 libsvn_client/info.c:432 libsvn_client/info.c:442
+#: ../libsvn_client/info.c:417 ../libsvn_client/info.c:432
+#: ../libsvn_client/info.c:442
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s' nie istnieje w wersji %ld"
-#: libsvn_client/list.c:235
+#: ../libsvn_client/list.c:235
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s' nie istnieje w tej wersji"
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"Nie znaleziono wspólnego rodzica, nie można użyć rozłącznych argumentów"
-#: libsvn_client/locking_commands.c:261 libsvn_client/merge.c:4155
-#: libsvn_client/merge.c:4161 libsvn_client/merge.c:4390
-#: libsvn_client/ra.c:376 libsvn_client/ra.c:413 libsvn_client/ra.c:581
+#: ../libsvn_client/locking_commands.c:261 ../libsvn_client/merge.c:4155
+#: ../libsvn_client/merge.c:4161 ../libsvn_client/merge.c:4390
+#: ../libsvn_client/mergeinfo.c:457 ../libsvn_client/ra.c:376
+#: ../libsvn_client/ra.c:413 ../libsvn_client/ra.c:581
#, c-format
msgid "'%s' has no URL"
-msgstr "'%s' nie ma URL"
+msgstr "'%s' nie ma URL-u"
-#: libsvn_client/locking_commands.c:285
+#: ../libsvn_client/locking_commands.c:285
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Nie można założyć/zdjąć blokady jednocześnie dla różnych repozytoriów"
-#: libsvn_client/locking_commands.c:326
+#: ../libsvn_client/locking_commands.c:326
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' nie jest zablokowane w danej kopii roboczej"
-#: libsvn_client/locking_commands.c:374
+#: ../libsvn_client/locking_commands.c:374
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' nie jest zablokowane"
-#: libsvn_client/locking_commands.c:407 libsvn_fs/fs-loader.c:1007
-#: libsvn_ra/ra_loader.c:1022
+#: ../libsvn_client/locking_commands.c:407 ../libsvn_fs/fs-loader.c:1021
+#: ../libsvn_ra/ra_loader.c:1077
msgid "Lock comment contains illegal characters"
msgstr "Opis zakładanej blokady zawiera nieprawidłowe znaki"
-#: libsvn_client/log.c:329
+#: ../libsvn_client/log.c:329
msgid "Missing required revision specification"
msgstr "Nie podano wymaganej specyfikacji wersji"
-#: libsvn_client/log.c:378
+#: ../libsvn_client/log.c:378
msgid "When specifying working copy paths, only one target may be given"
msgstr ""
"Przy podawaniu ścieżek kopii roboczych tylko jeden cel może zostać podany"
-#: libsvn_client/log.c:398 libsvn_client/mergeinfo.c:340
-#: libsvn_client/status.c:284 libsvn_client/update.c:157
-#: libsvn_client/util.c:168
+#: ../libsvn_client/log.c:398 ../libsvn_client/mergeinfo.c:340
+#: ../libsvn_client/status.c:284 ../libsvn_client/update.c:157
+#: ../libsvn_client/util.c:169
#, c-format
msgid "Entry '%s' has no URL"
-msgstr "Element '%s' nie ma URL"
+msgstr "Element '%s' nie ma URL-u"
-#: libsvn_client/log.c:652
+#: ../libsvn_client/log.c:650
msgid "No commits in repository"
msgstr "Brak zatwierdzeń w repozytorium"
-#: libsvn_client/merge.c:127
+#: ../libsvn_client/merge.c:127
#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "URL-e nie zawierają schematu ('%s' i '%s')"
-#: libsvn_client/merge.c:133 libsvn_client/merge.c:139
+#: ../libsvn_client/merge.c:133 ../libsvn_client/merge.c:139
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL nie zawiera schematu: '%s'"
-#: libsvn_client/merge.c:146
+#: ../libsvn_client/merge.c:146
#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
msgstr "Łączenie różnych schematów dostępu nie jest obsługiwane ('%s' i '%s')"
@@ -1448,21 +1446,21 @@
#. 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:482
+#: ../libsvn_client/merge.c:482
msgid ".working"
msgstr ".robocza"
-#: libsvn_client/merge.c:484
+#: ../libsvn_client/merge.c:484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".merge-lewo.w%ld"
-#: libsvn_client/merge.c:487
+#: ../libsvn_client/merge.c:487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".merge-prawo.w%ld"
-#: libsvn_client/merge.c:1745
+#: ../libsvn_client/merge.c:1745
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1475,75 +1473,75 @@
"rozwiąż wszystkie konflikty i uruchom merge ponownie, by zastosować\n"
"pozostałe wersje"
-#: libsvn_client/merge.c:4220
+#: ../libsvn_client/merge.c:4220
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr ""
"Użycie dwu URL-i jest niekompatybilne z modyfikacją informacji połączenia"
-#: libsvn_client/prop_commands.c:73
+#: ../libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' jest atryputem wcprop, tak więc nie jest dostępny dla klientów"
-#: libsvn_client/prop_commands.c:215
+#: ../libsvn_client/prop_commands.c:215
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "Atrybut '%s' nie jest regularnym atrybutem"
-#: libsvn_client/prop_commands.c:323
+#: ../libsvn_client/prop_commands.c:323
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Atrybut wersji '%s' jest niedozwolony w tym kontekście"
-#: libsvn_client/prop_commands.c:331 libsvn_client/prop_commands.c:462
+#: ../libsvn_client/prop_commands.c:331 ../libsvn_client/prop_commands.c:462
#, c-format
msgid "Bad property name: '%s'"
msgstr "Niepoprawna nazwa atrybutu: '%s'"
-#: libsvn_client/prop_commands.c:342
+#: ../libsvn_client/prop_commands.c:342
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "Ustawianie atrybutu na zdalnym obiekcie '%s' wymaga wersję podstawową"
-#: libsvn_client/prop_commands.c:348
+#: ../libsvn_client/prop_commands.c:348
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"Ustawianie atrybutu rekurencyjnie na zdalnym obiekcie '%s' nie jest "
"obsługiwane"
-#: libsvn_client/prop_commands.c:365
+#: ../libsvn_client/prop_commands.c:365
#, c-format
msgid "Setting property '%s' on non-local target '%s' is not supported"
msgstr "Ustawianie atrybutu '%s' na zdalnym obiekcie '%s' nie jest obsługiwane"
-#: libsvn_client/prop_commands.c:458
+#: ../libsvn_client/prop_commands.c:458
msgid "Value will not be set unless forced"
msgstr "Wartość nie zostanie ustawiona, o ile nie zostanie to wymuszone"
-#: libsvn_client/prop_commands.c:679
+#: ../libsvn_client/prop_commands.c:679
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' nie istnieje w wersji %ld"
-#: libsvn_client/prop_commands.c:686 libsvn_client/prop_commands.c:1020
+#: ../libsvn_client/prop_commands.c:686 ../libsvn_client/prop_commands.c:1020
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Nieznany rodzaj obiektu dla '%s'"
-#: libsvn_client/ra.c:133
+#: ../libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Próba ustawienia atrybutu kopii roboczej '%s' na '%s' w operacji innej niż "
"zatwierdzanie."
-#: libsvn_client/ra.c:650 libsvn_ra/compat.c:371
+#: ../libsvn_client/ra.c:650 ../libsvn_ra/compat.c:372
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Nie odnaleziono lokalizacji repozytorium dla '%s' w wersji %ld"
-#: libsvn_client/ra.c:657
+#: ../libsvn_client/ra.c:657
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1552,28 +1550,28 @@
"Lokalizacja dla '%s' w wersji %ld nie istnieje w repozytorium lub odnosi się "
"do obiektu niezwiązanego"
-#: libsvn_client/relocate.c:101
+#: ../libsvn_client/relocate.c:101
#, c-format
msgid "'%s' is not the root of the repository"
msgstr "'%s' nie jest katalogiem głównym repozytorium"
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:108
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "Repozytorium '%s' ma uuid '%s', tymczasem kopia robocza ma '%s'"
-#: libsvn_client/revisions.c:99
+#: ../libsvn_client/revisions.c:99
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Ścieżka '%s' nie posiada zatwierdzonej wersji"
-#: libsvn_client/revisions.c:126
+#: ../libsvn_client/revisions.c:126
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Zażądano nieznanego typ wersji dla '%s'"
-#: libsvn_client/switch.c:149 libsvn_ra_local/ra_plugin.c:107
-#: libsvn_ra_local/ra_plugin.c:613 libsvn_wc/update_editor.c:3183
+#: ../libsvn_client/switch.c:141 ../libsvn_ra_local/ra_plugin.c:195
+#: ../libsvn_ra_local/ra_plugin.c:270 ../libsvn_wc/update_editor.c:3199
#, c-format
msgid ""
"'%s'\n"
@@ -1584,55 +1582,50 @@
"nie jest tym samym repozytorium co\n"
"'%s'"
-#: libsvn_client/switch.c:167
-#, c-format
-msgid "Destination does not exist: '%s'"
-msgstr "Ścieżka docelowa nie istnieje: '%s'"
-
-#: libsvn_client/util.c:209
+#: ../libsvn_client/util.c:204
#, c-format
msgid "URL '%s' is not a child of repository root URL '%s'"
msgstr ""
-"URL '%s' nie jest katalogiem podrzędnym URLu '%s' katalogu głównego "
+"URL '%s' nie jest katalogiem podrzędnym URL-u '%s' katalogu głównego "
"repozytorium"
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Kompresja danych svndiff nie powiodła się"
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
msgstr "Dekompresja danych svndiff nie powiodła się"
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
msgstr ""
"Rozmiar rozkomprymowanych danych różni się od oryginalnego, zapisanego "
"rozmiaru"
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:484
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Niewłaściwy strumień diff: instrukcja %d nie może być rozkodowana"
-#: libsvn_delta/svndiff.c:488
+#: ../libsvn_delta/svndiff.c:488
#, c-format
msgid "Invalid diff stream: insn %d has non-positive length"
msgstr "Niewłaściwy strumień diff: instrukcja %d ma niedodatnią długość"
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:492
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła okno obiektu docelowego"
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła okno obiektu źródłowego"
-#: 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"
@@ -1640,79 +1633,79 @@
"Niewłaściwy strumień diff: instrukcja %d zaczyna się poza pozycją okna "
"obiektu docelowego"
-#: 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 ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła nową sekcję danych"
-#: libsvn_delta/svndiff.c:524
+#: ../libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Delta nie wypełnia docelowego okna danych"
-#: libsvn_delta/svndiff.c:527
+#: ../libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Delta nie zawiera nowych danych w wystarczającej ilości"
-#: libsvn_delta/svndiff.c:633
+#: ../libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Błędny nagłówek danych 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 "Okno danych svndiff zawiera uszkodzony nagłówek"
-#: libsvn_delta/svndiff.c:697
+#: ../libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Dane svndiff zawierają wsteczny podgląd"
-#: 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 "Nieoczekiwany koniec danych wejściowych svndiff"
-#: libsvn_diff/diff_file.c:462
+#: ../libsvn_diff/diff_file.c:462
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Plik '%s' został zmieniony podczas wykonywania diff"
-#: libsvn_diff/diff_file.c:585
+#: ../libsvn_diff/diff_file.c:585
#, c-format
msgid "Error parsing diff options"
msgstr "Błąd parsowania opcji diff"
-#: libsvn_diff/diff_file.c:608
+#: ../libsvn_diff/diff_file.c:608
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Niewłaściwy argument '%s' w opcjach diff"
-#: libsvn_diff/diff_file.c:1464
+#: ../libsvn_diff/diff_file.c:1464
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Nie powiodło się usunięcie mmap '%s'"
-#: libsvn_fs/fs-loader.c:104 libsvn_ra/ra_loader.c:172
-#: libsvn_ra/ra_loader.c:185
+#: ../libsvn_fs/fs-loader.c:104 ../libsvn_ra/ra_loader.c:174
+#: ../libsvn_ra/ra_loader.c:187
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "'%s' nie definiuje '%s()'"
-#: libsvn_fs/fs-loader.c:121
+#: ../libsvn_fs/fs-loader.c:121
#, c-format
msgid "Can't grab FS mutex"
msgstr "Nie można zablokować semafora FS"
-#: libsvn_fs/fs-loader.c:133
+#: ../libsvn_fs/fs-loader.c:133
#, c-format
msgid "Can't ungrab FS mutex"
msgstr "Nie można odblokować semafora FS"
-#: libsvn_fs/fs-loader.c:154
+#: ../libsvn_fs/fs-loader.c:154
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Nie udało się załadowanie modułu dla FS typu '%s'"
-#: libsvn_fs/fs-loader.c:187
+#: ../libsvn_fs/fs-loader.c:187
#, c-format
msgid ""
"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -1720,276 +1713,288 @@
"Nieodpowiednia wersja systemu plików dla '%s': znaleziono %d.%d.%d%s, "
"oczekiwana %d.%d.%d%s"
-#: libsvn_fs/fs-loader.c:212
+#: ../libsvn_fs/fs-loader.c:212
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Nieznany typ systemu plików: '%s'"
-#: libsvn_fs/fs-loader.c:303
+#: ../libsvn_fs/fs-loader.c:303
#, c-format
msgid "Can't allocate FS mutex"
msgstr "Nie udało się utworzyć semefora FS"
-#: libsvn_fs/fs-loader.c:1013
+#: ../libsvn_fs/fs-loader.c:1027
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Przekazano ujemna datę wygaśnięcia do svn_fs_lock"
-#: 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 ""
"Wystąpił błąd bazy danych Berkeley DB dla systemu plików '%s' podczas "
"operacji %s:\n"
-#: libsvn_fs_base/bdb/changes-table.c:87
+#: ../libsvn_fs_base/bdb/changes-table.c:87
msgid "creating change"
msgstr "tworzenie zmiany"
-#: libsvn_fs_base/bdb/changes-table.c:113
+#: ../libsvn_fs_base/bdb/changes-table.c:113
msgid "deleting changes"
msgstr "usuwanie zmian"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2730
+#: ../libsvn_fs_base/bdb/changes-table.c:145 ../libsvn_fs_fs/fs_fs.c:2857
msgid "Missing required node revision ID"
msgstr "Brak wymaganego ID wersji obiektu"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2740
+#: ../libsvn_fs_base/bdb/changes-table.c:156 ../libsvn_fs_fs/fs_fs.c:2867
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Niewłaściwy porządek zmian: ID nowego węzła wersji nie jest\n"
"zmianą typu usunięcie ścieżki"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2751
+#: ../libsvn_fs_base/bdb/changes-table.c:166 ../libsvn_fs_fs/fs_fs.c:2878
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Niewłaściwy porządek zmian: zmiana typu non-add poprzedza\n"
"usunięcie ścieżki"
-#: 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 "tworzenie kursora do czytania zmian"
-#: 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 "Błąd czytania zmian dla klucza '%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 "pobieranie zmian"
-#: 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 "zamykanie kursora zmian"
-#: libsvn_fs_base/bdb/copies-table.c:85
+#: ../libsvn_fs_base/bdb/copies-table.c:85
msgid "storing copy record"
msgstr "zachowywanie rekordu kopiowania"
-#: 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 "przydzielanie pamięci dla obiektu copy ID (pobieranie 'next-key')"
-#: libsvn_fs_base/bdb/copies-table.c:128
+#: ../libsvn_fs_base/bdb/copies-table.c:128
msgid "bumping next copy key"
msgstr "zwiększanie klucza dla następnego wiersza tabeli kopii"
-#: libsvn_fs_base/bdb/copies-table.c:167
+#: ../libsvn_fs_base/bdb/copies-table.c:167
msgid "deleting entry from 'copies' table"
msgstr "usuwanie elementu z tablicy 'copies'"
-#: libsvn_fs_base/bdb/copies-table.c:195
+#: ../libsvn_fs_base/bdb/copies-table.c:195
msgid "reading copy"
msgstr "czytanie kopii"
-#: libsvn_fs_base/bdb/nodes-table.c:97
+#: ../libsvn_fs_base/bdb/node-origins-table.c:101
+#, c-format
+msgid "Node origin for '%s' already exists in filesystem '%s'"
+msgstr "Pochodzenie węzła dla '%s' już istnieje w systemie plików '%s'"
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:107
+msgid "storing node-origins record"
+msgstr "zachowywanie rekordu node-origins"
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:97
msgid "allocating new node ID (getting 'next-key')"
msgstr "przydzielanie pamięci dla nowego węzła ID (pobieranie 'next-key')"
-#: libsvn_fs_base/bdb/nodes-table.c:115
+#: ../libsvn_fs_base/bdb/nodes-table.c:115
msgid "bumping next node ID key"
msgstr "zwiększanie klucza dla następnego ID węzła"
-#: libsvn_fs_base/bdb/nodes-table.c:152
+#: ../libsvn_fs_base/bdb/nodes-table.c:152
#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr ""
"Id następnego elementu '%s (dla '%s') już istnieje w systemie plików '%s'"
-#: libsvn_fs_base/bdb/nodes-table.c:178
+#: ../libsvn_fs_base/bdb/nodes-table.c:178
msgid "deleting entry from 'nodes' table"
msgstr "usuwanie elementu z tablicy węzłów"
#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:218
+#: ../libsvn_fs_base/bdb/nodes-table.c:218
msgid "reading node revision"
msgstr "czytanie wersji węzła"
-#: libsvn_fs_base/bdb/nodes-table.c:250
+#: ../libsvn_fs_base/bdb/nodes-table.c:250
msgid "storing node revision"
msgstr "zapis wersji węzła"
-#: 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 "Brak reprezentacji dla: '%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 "czytanie reprezentacji"
-#: libsvn_fs_base/bdb/reps-table.c:124
+#: ../libsvn_fs_base/bdb/reps-table.c:124
msgid "storing representation"
msgstr "zapis reprezentacji"
-#: libsvn_fs_base/bdb/reps-table.c:154
+#: ../libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
msgstr "przydzielanie pamięci dla nowej reprezentacji (pobieranie next-key)"
-#: libsvn_fs_base/bdb/reps-table.c:175
+#: ../libsvn_fs_base/bdb/reps-table.c:175
msgid "bumping next representation key"
msgstr "zwiększanie klucza dla następnego wiersza tabeli reprezentacji"
#. 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 "usuwanie reprezentacji"
#. 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 "czytanie wersji systemu plików"
-#: libsvn_fs_base/bdb/strings-table.c:89
+#: ../libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "tworzenie kursora do czytania łańcucha znaków"
-#: libsvn_fs_base/bdb/txn-table.c:92
+#: ../libsvn_fs_base/bdb/txn-table.c:92
msgid "storing transaction record"
msgstr "Zachowywanie rekordu transakcji"
-#: libsvn_fs_base/bdb/uuids-table.c:114
+#: ../libsvn_fs_base/bdb/uuids-table.c:114
msgid "get repository uuid"
msgstr "pobierz uuid repozytorium"
-#: libsvn_fs_base/bdb/uuids-table.c:142
+#: ../libsvn_fs_base/bdb/uuids-table.c:142
msgid "set repository uuid"
msgstr "ustaw uuid repozytorium"
-#: libsvn_fs_base/dag.c:221
+#: ../libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Uszkodzona DB: identyfikator transakcji nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:229
+#: ../libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "Uszkodzona DB: identyfikator kopii nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:238
+#: ../libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"Uszkodzona DB: początkowy numer wersji nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:324
+#: ../libsvn_fs_base/dag.c:286 ../libsvn_fs_base/dag.c:462
+#: ../libsvn_fs_fs/dag.c:324
msgid "Attempted to create entry in non-directory parent"
msgstr "Próba stworzenia elementu, którego rodzicem nie jest katalog"
-#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:318
+#: ../libsvn_fs_base/dag.c:456 ../libsvn_fs_fs/dag.c:318
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Próba stworzenia węzła o nieprawidłowej nazwie '%s'"
-#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:330
+#: ../libsvn_fs_base/dag.c:468 ../libsvn_fs_base/dag.c:702
+#: ../libsvn_fs_fs/dag.c:330
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr ""
"Próba stworzenia kopii potomnego obiektu węzła niepodlegającego zmianom"
-#: libsvn_fs_base/dag.c:475
+#: ../libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Próba stworzenia obiektu, który już istnieje"
-#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:392
+#: ../libsvn_fs_base/dag.c:526 ../libsvn_fs_fs/dag.c:392
msgid "Attempted to set entry in non-directory node"
msgstr "Próba ustawienia elementu w węźle niebędącym katalogiem"
-#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:398
+#: ../libsvn_fs_base/dag.c:532 ../libsvn_fs_fs/dag.c:398
msgid "Attempted to set entry in immutable node"
msgstr "Próba ustawienia elementu w węźle niemogącym ulegać zmianom"
-#: libsvn_fs_base/dag.c:596
+#: ../libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "Nie można ustawić atrybutu proplist na stałym węźle wersji %s"
-#: libsvn_fs_base/dag.c:708
+#: ../libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr ""
"Próba stworzenia kopii elementu potomnego o następującej nieprawidłowej "
"nazwie: '%s'"
-#: libsvn_fs_base/dag.c:834
+#: ../libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Próba usunięcia elementu '%s' z węzła, który nie jest katalogiem"
-#: libsvn_fs_base/dag.c:840
+#: ../libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Próba usunięcia elementu '%s' z węzła katalogu niepodlegającego zmianom"
-#: libsvn_fs_base/dag.c:847
+#: ../libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Próba usunięcia węzła o nieprawidłowej nazwie '%s'"
-#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
+#: ../libsvn_fs_base/dag.c:862 ../libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Błąd usuwania: katalog nie zawiera elementu '%s'"
-#: libsvn_fs_base/dag.c:944
+#: ../libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Próba usunięcia węzła niemogącego ulegać zmianom"
-#: libsvn_fs_base/dag.c:1064
+#: ../libsvn_fs_base/dag.c:1067
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Próba pobrania zawartości węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1099
+#: ../libsvn_fs_base/dag.c:1102
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Próba pobrania długości węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1125
+#: ../libsvn_fs_base/dag.c:1128
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Próba pobrania sumy kontrolnej węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
+#: ../libsvn_fs_base/dag.c:1159 ../libsvn_fs_base/dag.c:1213
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Próba ustawienia tekstowej zawartości węzła (różny od pliku)"
-#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
+#: ../libsvn_fs_base/dag.c:1165 ../libsvn_fs_base/dag.c:1219
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Próba ustawienia tekstowej zawartości węzła niepodlegającego zmianom"
-#: libsvn_fs_base/dag.c:1239
+#: ../libsvn_fs_base/dag.c:1242
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -2000,116 +2005,121 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_fs_base/dag.c:1294
+#: ../libsvn_fs_base/dag.c:1297
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Próba otwarcia nieistniejącego węzła '%s'"
-#: libsvn_fs_base/dag.c:1300
+#: ../libsvn_fs_base/dag.c:1303
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Próba otwarcia węzła o nieprawidłowej nazwie '%s'"
-#: libsvn_fs_base/err.c:41
+#: ../libsvn_fs_base/err.c:41
#, c-format
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "Uszkodzona wersja systemu plików %ld w systemie plików '%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 "Odnośnik do nieistniejącego obiektu '%s' w systemie plików '%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 "Odnośnik do nieistniejącej wersji %ld w systemie plików '%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 ""
"Uszkodzone dane w tabeli 'transactions' dla '%s' w systemie plików '%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 "Uszkodzone dane w tabeli 'copies' dla '%s' w systemie plików '%s'"
-#: libsvn_fs_base/err.c:96
+#: ../libsvn_fs_base/err.c:96
#, c-format
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "Brak transakcji '%s' w systemie plików '%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 "Nie można zmodyfikować transakcji '%s' w systemie plików '%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 "Brak kopii o id '%s' w systemie plików '%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 ""
"Żeton '%s' nie odpowiada żadnej istniejącej blokadzie w systemie plików '%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 "Brak żetonu dla ścieżki '%s' w systemie plików '%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 "Uszkodzona blokada w tabeli 'locks' dla '%s' w systemie plików '%s'"
-#: libsvn_fs_base/fs.c:81
+#: ../libsvn_fs_base/err.c:157
+#, c-format
+msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
+msgstr "Brak rekordu w tabeli 'node-origins' dla węzła o identyfikatorze '%s' w systemie plików '%s'"
+
+#: ../libsvn_fs_base/fs.c:82
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr ""
"Zła wersja bazy danych: posiadana %d.%d.%d, a powinna być co najmniej w "
"wersji %d.%d.%d"
-#: libsvn_fs_base/fs.c:92
+#: ../libsvn_fs_base/fs.c:93
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Zła wersja bazy danych: skompilowane z %d.%d.%d, działa z %d.%d.%d"
-#: libsvn_fs_base/fs.c:110 libsvn_fs_fs/fs.c:53
+#: ../libsvn_fs_base/fs.c:111 ../libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "System plików jest już otwarty"
-#: libsvn_fs_base/fs.c:191
+#: ../libsvn_fs_base/fs.c:193
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB dla systemu plików '%s' podczas "
"zamykania środowiska:\n"
-#: libsvn_fs_base/fs.c:540
+#: ../libsvn_fs_base/fs.c:542
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB dla systemu plików '%s' podczas "
"tworzenia środowiska:\n"
-#: libsvn_fs_base/fs.c:546
+#: ../libsvn_fs_base/fs.c:548
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB dla systemu plików '%s' podczas "
"otwierania środowiska:\n"
-#: libsvn_fs_base/fs.c:675
+#: ../libsvn_fs_base/fs.c:684
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Oczekiwany format systemu plików '%d'; znaleziony format '%d'"
-#: libsvn_fs_base/fs.c:1114
+#: ../libsvn_fs_base/fs.c:1125
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2121,7 +2131,7 @@
"będzie się powtarzał, spróbuj wyłączyć tę właściwość\n"
"w DB_CONFIG"
-#: libsvn_fs_base/fs.c:1133
+#: ../libsvn_fs_base/fs.c:1144
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -2133,30 +2143,30 @@
"problem będzie się powtarzał, spróbuj wyłączyć tę właściwość\n"
"w DB_CONFIG"
-#: libsvn_fs_base/fs.c:1180
+#: ../libsvn_fs_base/fs.c:1191
msgid "Module for working with a Berkeley DB repository."
msgstr "Moduł do współpracy z repozytorium działającym na bazie Berkeley DB."
-#: libsvn_fs_base/fs.c:1214
+#: ../libsvn_fs_base/fs.c:1225
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla bdb"
-#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:613
+#: ../libsvn_fs_base/lock.c:445 ../libsvn_fs_fs/lock.c:613
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"Nie można zweryfikować blokady założonej na ścieżce '%s'; brak nazwy "
"użytkownika"
-#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:619
+#: ../libsvn_fs_base/lock.c:451 ../libsvn_fs_fs/lock.c:619
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"Użytkownik %s nie jest właścicielem blokady ścieżki '%s' (aktualnie "
"zablokowanej przez %s)"
-#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:626
+#: ../libsvn_fs_base/lock.c:458 ../libsvn_fs_fs/lock.c:626
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2165,25 +2175,25 @@
#. 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 "Nieznany rodzaj węzła dla reprezentacji '%s'"
-#: libsvn_fs_base/reps-strings.c:108
+#: ../libsvn_fs_base/reps-strings.c:108
msgid "Representation is not of type 'delta'"
msgstr "Reprezentacja nie jest typu 'delta'"
-#: libsvn_fs_base/reps-strings.c:378
+#: ../libsvn_fs_base/reps-strings.c:378
msgid "Svndiff source length inconsistency"
msgstr "Nieścisłość długości źródła 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 "Niezgodność w reprezentacji '%s'"
-#: 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 '%"
@@ -2192,18 +2202,18 @@
"Uszkodzenie wykryte podczas czytania łańcucha delty z reprezentacji '%s' do "
"'%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 ""
"Zawartość reprezentacji jest zbyt duża: pobrano %s, natomiast limit wynosi %s"
-#: libsvn_fs_base/reps-strings.c:795
+#: ../libsvn_fs_base/reps-strings.c:795
#, c-format
msgid "Failure reading rep '%s'"
msgstr "Błąd czytania reprezentacji '%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"
@@ -2214,105 +2224,105 @@
" oczekiwano: %s\n"
" aktualna: %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 "Pusta reprezentacja, ale offset jest już za zerem"
-#: 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 "Reprezentacja '%s' nie jest modyfikowalna"
-#: 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 "Reprezentacja '%s' jest zarówno zmienialna jak i niecałotekstowa"
-#: libsvn_fs_base/reps-strings.c:1339
+#: ../libsvn_fs_base/reps-strings.c:1339
msgid "Failed to get new string key"
msgstr "Błąd pobierania nowego klucza"
-#: libsvn_fs_base/reps-strings.c:1415
+#: ../libsvn_fs_base/reps-strings.c:1415
#, c-format
msgid "Attempt to deltify '%s' against itself"
msgstr "Próba wyliczenia różnic obiektu '%s' z samym sobą"
-#: 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 "Obliczenie sumy kontrolnej MD5 dla '%s' nie powiodło się"
-#: libsvn_fs_base/revs-txns.c:68
+#: ../libsvn_fs_base/revs-txns.c:68
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "Transakcja nie jest zniszczona: '%s'"
-#: libsvn_fs_base/revs-txns.c:71
+#: ../libsvn_fs_base/revs-txns.c:71
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transakcja jest zniszczona: '%s'"
-#: libsvn_fs_base/revs-txns.c:1040
+#: ../libsvn_fs_base/revs-txns.c:1064
msgid "Transaction aborted, but cleanup failed"
msgstr "Transakcja przerwana oraz sprzątanie nie powiodło się"
-#: libsvn_fs_base/tree.c:745 libsvn_fs_fs/tree.c:697
+#: ../libsvn_fs_base/tree.c:746 ../libsvn_fs_fs/tree.c:697
#, c-format
msgid "Failure opening '%s'"
msgstr "Nie można otworzyć '%s'"
-#: libsvn_fs_base/tree.c:1378 libsvn_fs_fs/tree.c:1144
+#: ../libsvn_fs_base/tree.c:1379 ../libsvn_fs_fs/tree.c:1145
msgid "Cannot compare property value between two different filesystems"
msgstr "Nie można porównać wartości atrybutów w dwóch różnych systemach plików"
-#: libsvn_fs_base/tree.c:1705
+#: ../libsvn_fs_base/tree.c:1706
msgid "Corrupt DB: faulty predecessor count"
msgstr "Uszkodzona DB: błędny licznik poprzednika"
-#: libsvn_fs_base/tree.c:1760 libsvn_fs_fs/tree.c:1180
+#: ../libsvn_fs_base/tree.c:1761 ../libsvn_fs_fs/tree.c:1181
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Nieoczekiwany, niezmienialny węzeł przy '%s'"
-#: libsvn_fs_base/tree.c:1781 libsvn_fs_fs/tree.c:1203
+#: ../libsvn_fs_base/tree.c:1782 ../libsvn_fs_fs/tree.c:1204
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt z '%s'"
-#: libsvn_fs_base/tree.c:1831 libsvn_fs_base/tree.c:2543
-#: libsvn_fs_fs/tree.c:1252 libsvn_fs_fs/tree.c:1744
+#: ../libsvn_fs_base/tree.c:1832 ../libsvn_fs_base/tree.c:2544
+#: ../libsvn_fs_fs/tree.c:1253 ../libsvn_fs_fs/tree.c:1745
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Złe łączenie; przodek, źródłowy obiekt i docelowy obiekt nie mają tego "
"samego typu systemu plików"
-#: libsvn_fs_base/tree.c:1847 libsvn_fs_fs/tree.c:1268
+#: ../libsvn_fs_base/tree.c:1848 ../libsvn_fs_fs/tree.c:1269
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Złe łączenie: obiekt docelowy '%s' ma identyfikator '%s' identyczny ze swoim "
"przodkiem"
-#: libsvn_fs_base/tree.c:2350
+#: ../libsvn_fs_base/tree.c:2351
#, c-format
msgid "Transaction '%s' out-of-date with respect to revision '%s'"
msgstr "Transakcja '%s' jest nieaktualna względem wersji '%s'"
-#: libsvn_fs_base/tree.c:2726 libsvn_fs_fs/tree.c:1883
+#: ../libsvn_fs_base/tree.c:2727 ../libsvn_fs_fs/tree.c:1884
msgid "The root directory cannot be deleted"
msgstr "Katalog główny nie może zostać usunięty"
-#: libsvn_fs_base/tree.c:2907 libsvn_fs_fs/tree.c:1955
+#: ../libsvn_fs_base/tree.c:2908 ../libsvn_fs_fs/tree.c:1956
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr ""
"Nie można porównać pomiędzy dwoma różnymi systemami plików ('%s' i '%s')"
-#: libsvn_fs_base/tree.c:2916 libsvn_fs_fs/tree.c:1961
+#: ../libsvn_fs_base/tree.c:2917 ../libsvn_fs_fs/tree.c:1962
msgid "Copy from mutable tree not currently supported"
msgstr "Kopiowanie ze zmiennego drzewa nie jest obecnie obsługiwane"
-#: libsvn_fs_base/tree.c:3411 libsvn_fs_fs/tree.c:2388
+#: ../libsvn_fs_base/tree.c:3412 ../libsvn_fs_fs/tree.c:2389
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2323,21 +2333,22 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_fs_base/tree.c:3666 libsvn_fs_fs/tree.c:2624
+#: ../libsvn_fs_base/tree.c:3667 ../libsvn_fs_fs/tree.c:2625
msgid "Cannot compare file contents between two different filesystems"
msgstr "Nie można porównać zawartości pliku w dwóch różnych systemach plików"
-#: libsvn_fs_base/tree.c:3675 libsvn_fs_base/tree.c:3680
-#: libsvn_fs_fs/tree.c:2633 libsvn_fs_fs/tree.c:2638
+#: ../libsvn_fs_base/tree.c:3676 ../libsvn_fs_base/tree.c:3681
+#: ../libsvn_fs_fs/tree.c:2634 ../libsvn_fs_fs/tree.c:2639
+#: ../libsvn_ra/compat.c:677
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' nie jest plikiem"
-#: libsvn_fs_fs/dag.c:374
+#: ../libsvn_fs_fs/dag.c:374
msgid "Can't get entries of non-directory"
msgstr "Nie można pobrać składowych obiektu niebędącego katalogiem"
-#: libsvn_fs_fs/dag.c:904
+#: ../libsvn_fs_fs/dag.c:904
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2348,74 +2359,89 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_fs_fs/err.c:52
+#: ../libsvn_fs_fs/err.c:52
#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "Uszkodzony plik blokady dla ścieżki '%s' w systemie plików '%s'"
-#: libsvn_fs_fs/fs.c:88
+#: ../libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Nie można pobrać danych dzielonych FSFS"
-#: libsvn_fs_fs/fs.c:104
+#: ../libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Nie można utworzyć muteksu blokady zapisu FSFS"
-#: libsvn_fs_fs/fs.c:112
+#: ../libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Nie można utworzyć muteksu listy transakcji FSFS"
-#: libsvn_fs_fs/fs.c:118
+#: ../libsvn_fs_fs/fs.c:119
+#, c-format
+msgid "Can't create FSFS txn-current mutex"
+msgstr "Nie można utworzyć muteksu pliku obecnej transakcji FSFS"
+
+#: ../libsvn_fs_fs/fs.c:125
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Nie można zachować danych dzielonych FSFS"
-#: libsvn_fs_fs/fs.c:298
+#: ../libsvn_fs_fs/fs.c:305
msgid "Module for working with a plain file (FSFS) repository."
msgstr ""
"Moduł do współpracy z repozytorium działającym w systemie plików (FSFS)."
-#: libsvn_fs_fs/fs.c:332
+#: ../libsvn_fs_fs/fs.c:339
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla fsfs"
-#: libsvn_fs_fs/fs_fs.c:382
+#: ../libsvn_fs_fs/fs_fs.c:395
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Nie można schwytać muteksu listy transakcji FSFS"
-#: libsvn_fs_fs/fs_fs.c:390
+#: ../libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Nie można wypuścić muteksu listy transakcji FSFS"
-#: libsvn_fs_fs/fs_fs.c:416
+#: ../libsvn_fs_fs/fs_fs.c:456
+#, c-format
+msgid "Can't grab FSFS mutex for '%s'"
+msgstr "Nie można schwytać muteksu FSFS dla '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:471
+#, c-format
+msgid "Can't ungrab FSFS mutex for '%s'"
+msgstr "Nie można wypuścić muteksu FSFS dla '%s'"
+
+#: ../libsvn_fs_fs/fs_fs.c:542
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Nie można odblokować nieznanej transakcji '%s'"
-#: libsvn_fs_fs/fs_fs.c:420
+#: ../libsvn_fs_fs/fs_fs.c:546
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Nie można odblokować niezablokowanej transakcji '%s'"
-#: libsvn_fs_fs/fs_fs.c:427
+#: ../libsvn_fs_fs/fs_fs.c:553
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"Nie można odblokować pliku blokady wersji prototypowej dla transakcji '%s'"
-#: libsvn_fs_fs/fs_fs.c:433
+#: ../libsvn_fs_fs/fs_fs.c:559
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"Nie można zamknąć pliku blokady wersji prototypowej dla transakcji '%s'"
-#: libsvn_fs_fs/fs_fs.c:495
+#: ../libsvn_fs_fs/fs_fs.c:621
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2424,7 +2450,7 @@
"Nie można pisać do pliku prototypowej wersji transakcji '%s', ponieważ "
"poprzednia reprezentacja jest obecnie zapisywana przez ten proces"
-#: libsvn_fs_fs/fs_fs.c:531
+#: ../libsvn_fs_fs/fs_fs.c:657
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2433,115 +2459,115 @@
"Nie można pisać do pliku prototypowej wersji transakcji '%s', ponieważ "
"poprzednia reprezentacja jest obecnie zapisywana przez inny proces"
-#: libsvn_fs_fs/fs_fs.c:538 libsvn_subr/io.c:1545
+#: ../libsvn_fs_fs/fs_fs.c:664 ../libsvn_subr/io.c:1545
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Nie można założyć blokady na pliku '%s'"
-#: libsvn_fs_fs/fs_fs.c:650
+#: ../libsvn_fs_fs/fs_fs.c:776
#, c-format
msgid "Format file '%s' contains an unexpected non-digit"
msgstr "Formatowy plik '%s' zawiera nieoczekiwaną niecyfrę"
-#: libsvn_fs_fs/fs_fs.c:698
+#: ../libsvn_fs_fs/fs_fs.c:824
#, c-format
msgid "Can't read first line of format file '%s'"
msgstr "Nie można odczytać pierwszej linii z formatowego pliku '%s'"
-#: libsvn_fs_fs/fs_fs.c:742
+#: ../libsvn_fs_fs/fs_fs.c:868
#, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr "'%s' zawiera niepoprawną opcję '%s' formatu systemu plików"
-#: libsvn_fs_fs/fs_fs.c:803
+#: ../libsvn_fs_fs/fs_fs.c:929
#, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr ""
"Oczekiwany format systemu plików pomiędzy '1' a '%d'; znaleziony format '%d'"
-#: libsvn_fs_fs/fs_fs.c:1116 libsvn_fs_fs/fs_fs.c:1130
+#: ../libsvn_fs_fs/fs_fs.c:1243 ../libsvn_fs_fs/fs_fs.c:1257
msgid "Found malformed header in revision file"
msgstr "Błędny nagłówek w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1246
-#: libsvn_fs_fs/fs_fs.c:1253 libsvn_fs_fs/fs_fs.c:1260
-#: libsvn_fs_fs/fs_fs.c:1268 libsvn_fs_fs/fs_fs.c:1276
+#: ../libsvn_fs_fs/fs_fs.c:1359 ../libsvn_fs_fs/fs_fs.c:1373
+#: ../libsvn_fs_fs/fs_fs.c:1380 ../libsvn_fs_fs/fs_fs.c:1387
+#: ../libsvn_fs_fs/fs_fs.c:1395 ../libsvn_fs_fs/fs_fs.c:1403
msgid "Malformed text rep offset line in node-rev"
msgstr "Błędny offset reprezentacji w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1345
+#: ../libsvn_fs_fs/fs_fs.c:1472
msgid "Missing kind field in node-rev"
msgstr "Brak pola kind w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1376
+#: ../libsvn_fs_fs/fs_fs.c:1503
msgid "Missing cpath in node-rev"
msgstr "Brak cpath w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1403 libsvn_fs_fs/fs_fs.c:1409
+#: ../libsvn_fs_fs/fs_fs.c:1530 ../libsvn_fs_fs/fs_fs.c:1536
msgid "Malformed copyroot line in node-rev"
msgstr "Błędna linia copyroot w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1427 libsvn_fs_fs/fs_fs.c:1433
+#: ../libsvn_fs_fs/fs_fs.c:1554 ../libsvn_fs_fs/fs_fs.c:1560
msgid "Malformed copyfrom line in node-rev"
msgstr "Błędna linia copyfrom w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1542 libsvn_fs_fs/fs_fs.c:4148
+#: ../libsvn_fs_fs/fs_fs.c:1669 ../libsvn_fs_fs/fs_fs.c:4294
msgid "Attempted to write to non-transaction"
msgstr "Próba zapisu do nietransakcji"
-#: libsvn_fs_fs/fs_fs.c:1626
+#: ../libsvn_fs_fs/fs_fs.c:1753
msgid "Malformed representation header"
msgstr "Błędny nagłówek reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:1650
+#: ../libsvn_fs_fs/fs_fs.c:1777
msgid "Missing node-id in node-rev"
msgstr "Brak node-id w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1656
+#: ../libsvn_fs_fs/fs_fs.c:1783
msgid "Corrupt node-id in node-rev"
msgstr "Błędny node-id w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1701
+#: ../libsvn_fs_fs/fs_fs.c:1828
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "W pliku wersji brak końcowego znaku końca wiersza"
-#: libsvn_fs_fs/fs_fs.c:1713
+#: ../libsvn_fs_fs/fs_fs.c:1840
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Ostatnia linia w pliku wersji dłuższa niż 64 znaki"
-#: libsvn_fs_fs/fs_fs.c:1728
+#: ../libsvn_fs_fs/fs_fs.c:1855
msgid "Final line in revision file missing space"
msgstr "Brak spacji w ostatniej linii pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:1771 libsvn_fs_fs/fs_fs.c:1855 libsvn_repos/log.c:1355
-#: libsvn_repos/log.c:1359
+#: ../libsvn_fs_fs/fs_fs.c:1898 ../libsvn_fs_fs/fs_fs.c:1982
+#: ../libsvn_repos/log.c:1355 ../libsvn_repos/log.c:1359
#, c-format
msgid "No such revision %ld"
msgstr "Nie ma takiej wersji %ld"
-#: libsvn_fs_fs/fs_fs.c:1928
+#: ../libsvn_fs_fs/fs_fs.c:2055
msgid "Malformed svndiff data in representation"
msgstr "Błędne dane svndiff w reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:2071 libsvn_fs_fs/fs_fs.c:2084
+#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Podczas czytania danych okna svndiff przekroczono koniec reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:2220
+#: ../libsvn_fs_fs/fs_fs.c:2347
msgid "svndiff data requested non-existent source"
msgstr "Żądane dane svndiff wskazują na nieistniejące źródło"
-#: libsvn_fs_fs/fs_fs.c:2226
+#: ../libsvn_fs_fs/fs_fs.c:2353
msgid "svndiff requested position beyond end of stream"
msgstr "Żądana pozycja svndiff jest poza końcem strumienia"
-#: libsvn_fs_fs/fs_fs.c:2249 libsvn_fs_fs/fs_fs.c:2266
+#: ../libsvn_fs_fs/fs_fs.c:2376 ../libsvn_fs_fs/fs_fs.c:2393
msgid "svndiff window length is corrupt"
msgstr "Błędne okno danych svndiff"
-#: libsvn_fs_fs/fs_fs.c:2314
+#: ../libsvn_fs_fs/fs_fs.c:2441
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2552,218 +2578,220 @@
" oczekiwano: %s\n"
" znaleziono: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2538 libsvn_fs_fs/fs_fs.c:2551
-#: libsvn_fs_fs/fs_fs.c:2557 libsvn_fs_fs/fs_fs.c:5278
-#: libsvn_fs_fs/fs_fs.c:5287 libsvn_fs_fs/fs_fs.c:5293
+#: ../libsvn_fs_fs/fs_fs.c:2665 ../libsvn_fs_fs/fs_fs.c:2678
+#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:5377
+#: ../libsvn_fs_fs/fs_fs.c:5386 ../libsvn_fs_fs/fs_fs.c:5392
msgid "Directory entry corrupt"
msgstr "Uszkodzony wpis w katalogu"
-#: libsvn_fs_fs/fs_fs.c:2896 libsvn_fs_fs/fs_fs.c:2904
-#: libsvn_fs_fs/fs_fs.c:2936 libsvn_fs_fs/fs_fs.c:2956
-#: libsvn_fs_fs/fs_fs.c:2990 libsvn_fs_fs/fs_fs.c:2995
+#: ../libsvn_fs_fs/fs_fs.c:3023 ../libsvn_fs_fs/fs_fs.c:3031
+#: ../libsvn_fs_fs/fs_fs.c:3063 ../libsvn_fs_fs/fs_fs.c:3083
+#: ../libsvn_fs_fs/fs_fs.c:3117 ../libsvn_fs_fs/fs_fs.c:3122
msgid "Invalid changes line in rev-file"
msgstr "Niewłaściwa linia zmian w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2929
+#: ../libsvn_fs_fs/fs_fs.c:3056
msgid "Invalid change kind in rev file"
msgstr "Niewłaściwy rodzaj zmiany w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2949
+#: ../libsvn_fs_fs/fs_fs.c:3076
msgid "Invalid text-mod flag in rev-file"
msgstr "Niewłaściwa flaga text-mod w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2969
+#: ../libsvn_fs_fs/fs_fs.c:3096
msgid "Invalid prop-mod flag in rev-file"
msgstr "Niewłaściwa flaga prop-mod w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:3153
+#: ../libsvn_fs_fs/fs_fs.c:3280
msgid "Copying from transactions not allowed"
msgstr "Kopiowanie z transakcji niedozwolone"
-#: libsvn_fs_fs/fs_fs.c:3323
+#: ../libsvn_fs_fs/fs_fs.c:3448
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Nie można utworzyć katalogu transakcji w '%s' dla wersji %ld"
-#: libsvn_fs_fs/fs_fs.c:3579 libsvn_fs_fs/fs_fs.c:3586
+#: ../libsvn_fs_fs/fs_fs.c:3725 ../libsvn_fs_fs/fs_fs.c:3732
msgid "next-id file corrupt"
msgstr "Plik next-id jest uszkodzony"
-#: libsvn_fs_fs/fs_fs.c:3674
+#: ../libsvn_fs_fs/fs_fs.c:3820
msgid "Transaction cleanup failed"
msgstr "Nie powiodło się sprzątanie po transakcji"
-#: libsvn_fs_fs/fs_fs.c:3842
+#: ../libsvn_fs_fs/fs_fs.c:3988
msgid "Invalid change type"
msgstr "Niewłaściwy typ zmiany"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: ../libsvn_fs_fs/fs_fs.c:4313
msgid "Can't set text contents of a directory"
msgstr "Nie można ustawić tekstowej zawartości katalogu"
-#: libsvn_fs_fs/fs_fs.c:4251 libsvn_fs_fs/fs_fs.c:4256
-#: libsvn_fs_fs/fs_fs.c:4263
+#: ../libsvn_fs_fs/fs_fs.c:4397 ../libsvn_fs_fs/fs_fs.c:4402
+#: ../libsvn_fs_fs/fs_fs.c:4409
msgid "Corrupt current file"
msgstr "Bieżący plik jest uszkodzony"
-#: libsvn_fs_fs/fs_fs.c:4548 libsvn_subr/io.c:2832 svn/util.c:379
-#: svn/util.c:394 svn/util.c:418
+#: ../libsvn_fs_fs/fs_fs.c:4694 ../libsvn_subr/io.c:2832 ../svn/util.c:379
+#: ../svn/util.c:394 ../svn/util.c:418
#, c-format
msgid "Can't stat '%s'"
msgstr "Nie można pobrać informacji o '%s'"
-#: libsvn_fs_fs/fs_fs.c:4552
+#: ../libsvn_fs_fs/fs_fs.c:4698
#, c-format
msgid "Can't chmod '%s'"
msgstr "Nie można ustawić uprawnień '%s'"
-#: libsvn_fs_fs/fs_fs.c:4701
-#, c-format
-msgid "Can't grab FSFS repository mutex"
-msgstr "Nie można schwytać muteksu repozytorium FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4715
-#, c-format
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "Nie można wypuścić muteksu repozytorium FSFS"
-
-#: libsvn_fs_fs/fs_fs.c:4835
+#: ../libsvn_fs_fs/fs_fs.c:4920
msgid "Transaction out of date"
msgstr "Transakcja jest nieaktualna"
-#: libsvn_fs_fs/fs_fs.c:5219
+#: ../libsvn_fs_fs/fs_fs.c:5318
msgid "Recovery encountered a non-directory node"
msgstr "Odzyskiwanie spotkało węzeł niekatalogu"
-#: libsvn_fs_fs/fs_fs.c:5241
+#: ../libsvn_fs_fs/fs_fs.c:5340
msgid "Recovery encountered a deltified directory representation"
msgstr "Odzyskiwanie spotkało zróżnicowaną reprezentację katalogu"
-#: libsvn_fs_fs/fs_fs.c:5507
+#: ../libsvn_fs_fs/fs_fs.c:5606
msgid "No such transaction"
msgstr "Brak takiej transakcji"
-#: libsvn_fs_fs/lock.c:228
+#: ../libsvn_fs_fs/lock.c:228
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Nie można zapisać blokady/składowych pliku mieszającego '%s'"
-#: libsvn_fs_fs/lock.c:284
+#: ../libsvn_fs_fs/lock.c:284
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Nie można parsować blokady/składowych pliku mieszającego '%s'"
-#: libsvn_fs_fs/lock.c:713 libsvn_fs_fs/lock.c:734
+#: ../libsvn_fs_fs/lock.c:713 ../libsvn_fs_fs/lock.c:734
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Ścieżka '%s' nie istnieje w najnowszej wersji repozytorium"
-#: libsvn_fs_fs/lock.c:739
+#: ../libsvn_fs_fs/lock.c:739
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Nie udało się założyć blokady: istnieje nowsza wersja '%s'"
-#: libsvn_fs_util/fs-util.c:96
+#: ../libsvn_fs_util/fs-util.c:96
msgid "Filesystem object has not been opened yet"
msgstr "Obiekt systemu plików nie jest otwarty"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:119
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:119
msgid "Merge Tracking schema format not set"
msgstr "Format schematu Śledzenia Połączeń Zmian nieustawiony"
-#: libsvn_fs_util/mergeinfo-sqlite-index.c:124
+#: ../libsvn_fs_util/mergeinfo-sqlite-index.c:124
#, c-format
msgid "Merge Tracking schema format %d not recognized"
msgstr "Format %d schematu Śledzenia Połączeń Zmian nierozpoznany"
-#: libsvn_ra/compat.c:302 libsvn_ra/compat.c:549
+#: ../libsvn_ra/compat.c:176
+#, c-format
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "Brak informacji o zmianie ścieżki dla '%s' w wersji %ld"
+
+#: ../libsvn_ra/compat.c:303 ../libsvn_ra/compat.c:550
#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "Ścieżka '%s' nie istnieje w wersji %ld"
-#: libsvn_ra/compat.c:379
+#: ../libsvn_ra/compat.c:380
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' w wersji %ld jest obiektem niezwiązanym"
-#: libsvn_ra/ra_loader.c:227
+#: ../libsvn_ra/ra_loader.c:229
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr ""
"Niewłaściwa wersja RA dla '%s': znaleziona %d.%d.%d%s, oczekiwana %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:403 libsvn_ra_serf/serf.c:137
-#: libsvn_ra_serf/serf.c:218
+#: ../libsvn_ra/ra_loader.c:405 ../libsvn_ra_serf/serf.c:331
+#: ../libsvn_ra_serf/serf.c:414
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Nieprawidłowy URL '%s' repozytorium"
-#: libsvn_ra/ra_loader.c:417
+#: ../libsvn_ra/ra_loader.c:419
msgid "Invalid config: unknown HTTP library"
msgstr "Błąd konfiguracji: nieznana biblioteka HTTP"
-#: libsvn_ra/ra_loader.c:454
+#: ../libsvn_ra/ra_loader.c:456
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Nierozpoznany schemat URL: '%s'"
-#: libsvn_ra/ra_loader.c:505
+#: ../libsvn_ra/ra_loader.c:507
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' nie jest tym samym repozytorium co '%s'"
-#: libsvn_ra/ra_loader.c:1112
+#: ../libsvn_ra/ra_loader.c:1178
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - obsługuje schemat '%s'\n"
-#: libsvn_ra/ra_loader.c:1198
+#: ../libsvn_ra/ra_loader.c:1264
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Nierozpoznany schemat URL: '%s'"
#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:251
+#. ** The RA vtable routines **
+#: ../libsvn_ra_local/ra_plugin.c:394
msgid "Module for accessing a repository on local disk."
msgstr "Moduł umożliwiający dostęp do repozytorium na lokalnym dysku."
-#: libsvn_ra_local/ra_plugin.c:291
+#: ../libsvn_ra_local/ra_plugin.c:434
msgid "Unable to open an ra_local session to URL"
-msgstr "Nie można utworzyć połączenia w sesji ra_local do URL"
+msgstr "Nie można utworzyć połączenia w sesji ra_local do URL-u"
-#: libsvn_ra_local/ra_plugin.c:1432 libsvn_ra_neon/session.c:1091
-#: libsvn_ra_serf/serf.c:872 libsvn_ra_svn/client.c:2170
+#: ../libsvn_ra_local/ra_plugin.c:466
+#, c-format
+msgid "URL '%s' is not a child of the session's repository root URL '%s'"
+msgstr ""
+"URL '%s' nie jest katalogiem podrzędnym URL-u '%s' katalogu głównego "
+"repozytorium sesji"
+
+#: ../libsvn_ra_local/ra_plugin.c:1350 ../libsvn_ra_neon/session.c:796
+#: ../libsvn_ra_serf/serf.c:225 ../libsvn_ra_svn/client.c:2174
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Nie wiadomo nic o zdolności '%s'"
-#: libsvn_ra_local/ra_plugin.c:1509
+#: ../libsvn_ra_local/ra_plugin.c:1427
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Nieobsługiwana wersja loadera modułu RA (%d) dla ra_local"
-#: libsvn_ra_local/split_url.c:44
+#: ../libsvn_ra_local/split_url.c:45
#, c-format
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "Lokalny URL '%s' nie zawiera przedrostka 'file://'"
-#: libsvn_ra_local/split_url.c:55
+#: ../libsvn_ra_local/split_url.c:56
#, c-format
msgid "Local URL '%s' contains only a hostname, no path"
msgstr "Lokalny URL '%s' zawiera tylko nazwę hosta bez ścieżki"
-#: libsvn_ra_local/split_url.c:117
+#: ../libsvn_ra_local/split_url.c:118
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "Lokalny URL '%s' zawiera nieobsługiwaną nazwę hosta"
-#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#: ../libsvn_ra_local/split_url.c:128 ../libsvn_ra_local/split_url.c:135
#, c-format
msgid "Unable to open repository '%s'"
msgstr "Nie zdołano otworzyć repozytorium '%s'"
-#: libsvn_ra_neon/commit.c:244
+#: ../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)"
@@ -2771,45 +2799,45 @@
"Nie można pobrać URL-a zasobów (potrzebnego podczas importu lub, gdy nie "
"zawierają go lokalne atrybuty ze schowka pamięciowego)"
-#: libsvn_ra_neon/commit.c:492
+#: ../libsvn_ra_neon/commit.c:492
#, c-format
msgid "File or directory '%s' is out of date; try updating"
msgstr "Plik lub katalog '%s' jest nieaktualny. Spróbuj zaktualizować"
-#: libsvn_ra_neon/commit.c:500
+#: ../libsvn_ra_neon/commit.c:500
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "Odpowiedź CHECKOUT nie zawierała nagłówka 'Location:'"
-#: libsvn_ra_neon/commit.c:510 libsvn_ra_neon/props.c:210
-#: libsvn_ra_neon/util.c:518 libsvn_ra_serf/commit.c:1337
-#: libsvn_ra_serf/commit.c:1727 libsvn_ra_serf/update.c:2107
+#: ../libsvn_ra_neon/commit.c:510 ../libsvn_ra_neon/props.c:210
+#: ../libsvn_ra_neon/util.c:518 ../libsvn_ra_serf/commit.c:1337
+#: ../libsvn_ra_serf/commit.c:1727 ../libsvn_ra_serf/update.c:2107
#, c-format
msgid "Unable to parse URL '%s'"
-msgstr "Nie można parsować URL: '%s'"
+msgstr "Nie można parsować URL-u: '%s'"
-#: libsvn_ra_neon/commit.c:1035 libsvn_ra_serf/commit.c:1577
+#: ../libsvn_ra_neon/commit.c:1035 ../libsvn_ra_serf/commit.c:1577
#, c-format
msgid "File '%s' already exists"
msgstr "Plik '%s' już istnieje"
-#: libsvn_ra_neon/commit.c:1160
+#: ../libsvn_ra_neon/commit.c:1160
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Nie udało się zapisać różnic do pliku tymczasowego"
-#: libsvn_ra_neon/fetch.c:278
+#: ../libsvn_ra_neon/fetch.c:254
msgid "Could not save the URL of the version resource"
msgstr "Nie można zapisać URL obiektu wersji"
-#: libsvn_ra_neon/fetch.c:471
+#: ../libsvn_ra_neon/fetch.c:447
msgid "Could not get content-type from response"
msgstr "Nie można uzyskać typu zawartości z odpowiedzi"
-#: libsvn_ra_neon/fetch.c:564
+#: ../libsvn_ra_neon/fetch.c:540
msgid "Could not save file"
msgstr "Błąd w trakcie zapisywania pliku"
-#: libsvn_ra_neon/fetch.c:785 libsvn_ra_svn/client.c:946
+#: ../libsvn_ra_neon/fetch.c:761 ../libsvn_ra_svn/client.c:949
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2820,51 +2848,11 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_ra_neon/fetch.c:1031
+#: ../libsvn_ra_neon/fetch.c:1007
msgid "Server response missing the expected deadprop-count property"
msgstr "Brak oczekiwanego atrybutu deadprop-count w odpowiedzi serwera"
-#: libsvn_ra_neon/fetch.c:1225
-msgid "Server does not support date-based operations"
-msgstr "Serwer nie obsługuje operacji związanych z datami"
-
-#: libsvn_ra_neon/fetch.c:1232
-msgid "Invalid server response to dated-rev request"
-msgstr "Błędna odpowiedź od serwera na żądanie dated-rev"
-
-#: libsvn_ra_neon/fetch.c:1297
-msgid "Expected a valid revnum and path"
-msgstr "Oczekiwano poprawny numer wersji i ścieżka"
-
-#: libsvn_ra_neon/fetch.c:1379
-msgid "'get-locations' REPORT not implemented"
-msgstr "Niezaimplementowany 'get-locations' REPORT"
-
-#: libsvn_ra_neon/fetch.c:1457 libsvn_ra_serf/getlocationsegments.c:101
-#: libsvn_ra_svn/client.c:1565
-msgid "Expected valid revision range"
-msgstr "Oczekiwano poprawny zakres wersji"
-
-#: libsvn_ra_neon/fetch.c:1544
-msgid "'get-location-segments' REPORT not implemented"
-msgstr "Niezaimplementowany 'get-location-segments' REPORT"
-
-#: libsvn_ra_neon/fetch.c:1721
-msgid "Incomplete lock data returned"
-msgstr "Zwrócono niepełne dane blokady"
-
-#: libsvn_ra_neon/fetch.c:1787 libsvn_ra_serf/property.c:354
-#: libsvn_ra_serf/update.c:1864
-#, c-format
-msgid "Got unrecognized encoding '%s'"
-msgstr "Uzyskano nierozpoznane kodowanie: '%s'"
-
-#: libsvn_ra_neon/fetch.c:1878 libsvn_ra_neon/fetch.c:1882
-#: libsvn_ra_serf/locks.c:545
-msgid "Server does not support locking features"
-msgstr "Serwer nie obsługuje blokowania zatwiedzeń"
-
-#: libsvn_ra_neon/fetch.c:1957 libsvn_ra_serf/commit.c:2103
+#: ../libsvn_ra_neon/fetch.c:1174 ../libsvn_ra_serf/commit.c:2103
msgid ""
"DAV request failed; it's possible that the repository's pre-revprop-change "
"hook either failed or is non-existent"
@@ -2872,66 +2860,106 @@
"Żądanie DAV nie powiodło się; prawdopodobnie skrypt pre-revprop-change nie "
"istnieje lub zgłosił błąd w trakcie działania"
-#: libsvn_ra_neon/fetch.c:2688
+#: ../libsvn_ra_neon/fetch.c:1905
#, c-format
msgid "Error writing to '%s': unexpected EOF"
msgstr "Błąd zapisu do '%s': nieoczekiwany koniec pliku"
-#: libsvn_ra_neon/fetch.c:2835
+#: ../libsvn_ra_neon/fetch.c:2052
#, c-format
msgid "Unknown XML encoding: '%s'"
msgstr "Nieznane kodowanie XML: '%s'"
-#: libsvn_ra_neon/fetch.c:3122
+#: ../libsvn_ra_neon/fetch.c:2339
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "Obsługa odpowiedzi REPORT nie zrealizowała cyklu współpracy z edytorem"
-#: libsvn_ra_neon/file_revs.c:285
+#: ../libsvn_ra_neon/file_revs.c:285
msgid "Failed to write full amount to stream"
msgstr "Nie można pisać całej ilości do strumienia"
-#: libsvn_ra_neon/file_revs.c:371
+#: ../libsvn_ra_neon/file_revs.c:371
msgid "'get-file-revs' REPORT not implemented"
msgstr "Niezaimplementowane 'get-file-revs' REPORT"
-#: libsvn_ra_neon/file_revs.c:378
+#: ../libsvn_ra_neon/file_revs.c:378
msgid "The file-revs report didn't contain any revisions"
msgstr "Raport file-revs nie zawierał żadnych wersji"
-#: libsvn_ra_neon/lock.c:189
+#: ../libsvn_ra_neon/get_dated_rev.c:147
+msgid "Server does not support date-based operations"
+msgstr "Serwer nie obsługuje operacji związanych z datami"
+
+#: ../libsvn_ra_neon/get_dated_rev.c:154
+msgid "Invalid server response to dated-rev request"
+msgstr "Błędna odpowiedź od serwera na żądanie dated-rev"
+
+#: ../libsvn_ra_neon/get_location_segments.c:118
+#: ../libsvn_ra_serf/getlocationsegments.c:101 ../libsvn_ra_svn/client.c:1568
+msgid "Expected valid revision range"
+msgstr "Oczekiwano poprawny zakres wersji"
+
+#: ../libsvn_ra_neon/get_location_segments.c:205
+msgid "'get-location-segments' REPORT not implemented"
+msgstr "Niezaimplementowany 'get-location-segments' REPORT"
+
+#: ../libsvn_ra_neon/get_locations.c:108
+msgid "Expected a valid revnum and path"
+msgstr "Oczekiwano poprawny numer wersji i ścieżka"
+
+#: ../libsvn_ra_neon/get_locations.c:190
+msgid "'get-locations' REPORT not implemented"
+msgstr "Niezaimplementowany 'get-locations' REPORT"
+
+#: ../libsvn_ra_neon/get_locks.c:231
+msgid "Incomplete lock data returned"
+msgstr "Zwrócono niepełne dane blokady"
+
+#: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:354
+#: ../libsvn_ra_serf/update.c:1864
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr "Uzyskano nierozpoznane kodowanie: '%s'"
+
+#: ../libsvn_ra_neon/get_locks.c:388 ../libsvn_ra_neon/get_locks.c:392
+#: ../libsvn_ra_serf/locks.c:545
+msgid "Server does not support locking features"
+msgstr "Serwer nie obsługuje blokowania zatwiedzeń"
+
+#: ../libsvn_ra_neon/lock.c:189
msgid "Invalid creation date header value in response."
msgstr "Niewłaściwa wartość nagłówka daty utworzenia w odpowiedzi."
-#: libsvn_ra_neon/lock.c:213
+#: ../libsvn_ra_neon/lock.c:213
msgid "Invalid timeout value"
msgstr "Niepoprawna wartość dozwolonego czasu"
-#: libsvn_ra_neon/lock.c:252 libsvn_ra_neon/lock.c:382
+#: ../libsvn_ra_neon/lock.c:252 ../libsvn_ra_neon/lock.c:382
#, c-format
msgid "Failed to parse URI '%s'"
msgstr "Nie udało się parsować URI '%s'"
-#: libsvn_ra_neon/lock.c:397 libsvn_ra_serf/locks.c:705
+#: ../libsvn_ra_neon/lock.c:397 ../libsvn_ra_serf/locks.c:705
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "'%s' nie jest zablokowane w repozytorium"
-#: libsvn_ra_neon/lock.c:524
+#: ../libsvn_ra_neon/lock.c:524
msgid "Failed to fetch lock information"
msgstr "Nieudało się pobrać informacji o blokadzie"
-#: libsvn_ra_neon/log.c:169 libsvn_ra_serf/log.c:210
+#: ../libsvn_ra_neon/log.c:164 ../libsvn_ra_serf/log.c:203
#, c-format
msgid "Missing name attr in revprop element"
msgstr "Brak atrybutu nazwy w elemencie revprop"
-#: libsvn_ra_neon/log.c:299 libsvn_ra_serf/log.c:299
-#: libsvn_ra_svn/client.c:1290
+#: ../libsvn_ra_neon/log.c:433 ../libsvn_ra_serf/log.c:533
+#: ../libsvn_ra_svn/client.c:1293
msgid "Server does not support custom revprops via log"
msgstr "Serwer nie obsługuje własnych atrybutów wersji via log"
-#: libsvn_ra_neon/merge.c:218
+#: ../libsvn_ra_neon/merge.c:218
#, c-format
msgid ""
"Protocol error: we told the server not to auto-merge any resources, but it "
@@ -2940,7 +2968,7 @@
"Błąd protokołu: serwer miał nie przeprowadzać automatycznego łączenia zmian, "
"tymczasem poinformował, że '%s' zostało połączone"
-#: libsvn_ra_neon/merge.c:227
+#: ../libsvn_ra_neon/merge.c:227
#, c-format
msgid ""
"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
@@ -2949,7 +2977,7 @@
"Błąd wewnętrzny: nieznany rodzic (%d) elementu 'DAV:response' w ramach "
"odpowiedzi MERGE"
-#: libsvn_ra_neon/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 "
@@ -2958,16 +2986,16 @@
"Błąd protokołu: odpowiedź MERGE dla zasobu '%s' nie zwróciła wszystkich "
"atrybutów, których zażądano (i które były wymagane do zatwierdzenia zmian)"
-#: libsvn_ra_neon/merge.c:261 libsvn_ra_serf/merge.c:302
+#: ../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 "Odpowiedź MERGE dla '%s' nie jest dzieckiem celu ('%s')"
-#: libsvn_ra_neon/merge.c:515
+#: ../libsvn_ra_neon/merge.c:515
msgid "The MERGE property response had an error status"
msgstr "Odpowiedź MERGE dla atrybutu zawiera status błędu."
-#: libsvn_ra_neon/options.c:144
+#: ../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"
@@ -2976,193 +3004,193 @@
"set. Problem taki często występuje, gdy URL wskazuje na zasób, który nie "
"jest obsługiwany przez WebDAV"
-#: libsvn_ra_neon/props.c:598
+#: ../libsvn_ra_neon/props.c:598
#, c-format
msgid "Failed to find label '%s' for URL '%s'"
msgstr "Nie znaleziono etykiety '%s' dla URL-u '%s'"
-#: libsvn_ra_neon/props.c:627
+#: ../libsvn_ra_neon/props.c:627
#, c-format
msgid "'%s' was not present on the resource"
msgstr "'%s' nie występuje w obiekcie"
-#: libsvn_ra_neon/props.c:670
+#: ../libsvn_ra_neon/props.c:670
#, c-format
msgid "Neon was unable to parse URL '%s'"
msgstr "Biblioteka neon nie potrafi parsować URL '%s'"
-#: libsvn_ra_neon/props.c:703
+#: ../libsvn_ra_neon/props.c:703
msgid "The path was not part of a repository"
msgstr "Ścieżka nie wskazuje na repozytorium"
-#: libsvn_ra_neon/props.c:712 libsvn_ra_serf/property.c:681
+#: ../libsvn_ra_neon/props.c:712 ../libsvn_ra_serf/property.c:681
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
msgstr ""
"Żaden element ścieżki '%s' nie został znaleziony w wersji HEAD repozytorium"
-#: libsvn_ra_neon/props.c:764 libsvn_ra_neon/props.c:819
+#: ../libsvn_ra_neon/props.c:764 ../libsvn_ra_neon/props.c:819
msgid "The VCC property was not found on the resource"
msgstr "Atrybut VCC nie został znaleziony w obiekcie"
-#: libsvn_ra_neon/props.c:832
+#: ../libsvn_ra_neon/props.c:832
msgid "The relative-path property was not found on the resource"
msgstr "Atrybut relative-path (względna ścieżka) nie został znaleziony"
-#: libsvn_ra_neon/props.c:953
+#: ../libsvn_ra_neon/props.c:953
msgid "'DAV:baseline-collection' was not present on the baseline resource"
msgstr "Brak DAV:baseline-collection w bazowym obiekcie"
-#: libsvn_ra_neon/props.c:972
+#: ../libsvn_ra_neon/props.c:972
#, c-format
msgid "'%s' was not present on the baseline resource"
msgstr "'%s' nie był obecny w zasobie baseline"
-#: libsvn_ra_neon/props.c:1124 libsvn_ra_serf/commit.c:815
+#: ../libsvn_ra_neon/props.c:1124 ../libsvn_ra_serf/commit.c:815
msgid "At least one property change failed; repository is unchanged"
msgstr ""
"Co najmniej jedna zmiana atrybutu nie powiodła się. Repozytorium nie uległo "
"żadnym zmianom"
-#: libsvn_ra_neon/replay.c:272
+#: ../libsvn_ra_neon/replay.c:272
msgid "Got apply-textdelta element without preceding add-file or open-file"
msgstr ""
"Uzyskano element apply-textdelta bez poprzedzającego go add-file lub open-"
"file"
-#: libsvn_ra_neon/replay.c:296
+#: ../libsvn_ra_neon/replay.c:296
msgid "Got close-file element without preceding add-file or open-file"
msgstr ""
"Uzyskano element close-file bez poprzedzającego go add-file lub open-file"
-#: libsvn_ra_neon/replay.c:313
+#: ../libsvn_ra_neon/replay.c:313
msgid "Got close-directory element without ever opening a directory"
msgstr "Uzyskano element close-directory bez otwarcia katalogu kiedykolwiek"
-#: libsvn_ra_neon/replay.c:432 libsvn_ra_serf/replay.c:499
+#: ../libsvn_ra_neon/replay.c:432 ../libsvn_ra_serf/replay.c:499
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "Błąd zapisu strumienia: nieoczekiwany koniec pliku"
-#: libsvn_ra_neon/replay.c:439
+#: ../libsvn_ra_neon/replay.c:439
#, c-format
msgid "Got cdata content for a prop delete"
msgstr "Uzyskano zawartość cdata dla prop delete"
-#: libsvn_ra_neon/session.c:454
+#: ../libsvn_ra_neon/session.c:454
msgid "Invalid URL: illegal character in proxy port number"
msgstr "Błędny URL: niedozwolony znak w ramach numeru portu proxy"
-#: libsvn_ra_neon/session.c:458
+#: ../libsvn_ra_neon/session.c:458
msgid "Invalid URL: negative proxy port number"
msgstr "Błędny URL: ujemny numer portu proxy"
-#: libsvn_ra_neon/session.c:461
+#: ../libsvn_ra_neon/session.c:461
msgid ""
"Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr ""
"Błędny URL: port proxy ma numer większy niż maksymalny dopuszczalny numer "
"portu TCP (65535)"
-#: libsvn_ra_neon/session.c:475
+#: ../libsvn_ra_neon/session.c:475
msgid "Invalid config: illegal character in timeout value"
msgstr "Błąd konfiguracji: niepoprawny znak w specyfikacji dozwolonego czasu"
-#: libsvn_ra_neon/session.c:479
+#: ../libsvn_ra_neon/session.c:479
msgid "Invalid config: negative timeout value"
msgstr "Błąd konfiguracji: ujemna wartość dozwolonego czasu"
-#: libsvn_ra_neon/session.c:492
+#: ../libsvn_ra_neon/session.c:492
msgid "Invalid config: illegal character in debug mask value"
msgstr "Błąd konfiguracji: nie dozwolony znak w masce debugowania"
-#: libsvn_ra_neon/session.c:517
+#: ../libsvn_ra_neon/session.c:517
#, c-format
msgid "Invalid config: unknown http authtype '%s'"
msgstr "Błąd konfiguracji: nieznany typ '%s' uwierzytelniania http"
-#: libsvn_ra_neon/session.c:578
+#: ../libsvn_ra_neon/session.c:578
msgid "Module for accessing a repository via WebDAV protocol using Neon."
msgstr ""
"Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu WebDAV przy "
"użyciu biblioteki Neon."
-#: libsvn_ra_neon/session.c:633 libsvn_ra_serf/locks.c:539
+#: ../libsvn_ra_neon/session.c:756
+#, c-format
+msgid "OPTIONS request (for capabilities) got HTTP response code %d"
+msgstr "Żądanie OPTIONS (dla zdolności) uzyskało kod %d odpowiedzi HTTP"
+
+#: ../libsvn_ra_neon/session.c:803 ../libsvn_ra_serf/serf.c:232
+#, c-format
+msgid "Attempt to fetch capability '%s' resulted in '%s'"
+msgstr "Próba pobrania zdolności '%s' skutkowała w '%s'"
+
+#: ../libsvn_ra_neon/session.c:826 ../libsvn_ra_serf/locks.c:539
msgid "Malformed URL for repository"
msgstr "Niepoprawny URL repozytorium"
-#: libsvn_ra_neon/session.c:672
+#: ../libsvn_ra_neon/session.c:865
msgid "Network socket initialization failed"
msgstr "Nieudana inicjalizacja połączenia sieciowego"
-#: libsvn_ra_neon/session.c:691
+#: ../libsvn_ra_neon/session.c:884
msgid "SSL is not supported"
msgstr "SSL nie jest obsługiwany"
-#: libsvn_ra_neon/session.c:832
+#: ../libsvn_ra_neon/session.c:1025
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Błąd konfiguracji: ładowanie certyfikatu '%s' nie powiodło się"
-#: libsvn_ra_neon/session.c:950 libsvn_ra_serf/serf.c:730
+#: ../libsvn_ra_neon/session.c:1145 ../libsvn_ra_serf/serf.c:926
msgid "The UUID property was not found on the resource or any of its parents"
msgstr ""
"Atrybut UUID nie został znaleziony ani w podanym obiekcie, ani też w\n"
"żadnym z jego katalogów nadrzędnych"
-#: libsvn_ra_neon/session.c:958
+#: ../libsvn_ra_neon/session.c:1153
msgid "Please upgrade the server to 0.19 or later"
msgstr "Zaktualizuj serwer do wersji 0.19 lub nowszej"
-#: libsvn_ra_neon/session.c:1051
-#, c-format
-msgid "OPTIONS request (for capabilities) got HTTP response code %d"
-msgstr "Żądanie OPTIONS (dla zdolności) uzyskało kod %d odpowiedzi HTTP"
-
-#: libsvn_ra_neon/session.c:1098 libsvn_ra_serf/serf.c:879
-#, c-format
-msgid "attempt to fetch capability '%s' resulted in '%s'"
-msgstr "próba pobrania zdolności '%s' rezultowała w '%s'"
-
-#: libsvn_ra_neon/session.c:1168
+#: ../libsvn_ra_neon/session.c:1223
#, c-format
msgid "Unsupported RA loader version (%d) for ra_neon"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_neon"
-#: libsvn_ra_neon/util.c:203
+#: ../libsvn_ra_neon/util.c:203
msgid "The request response contained at least one error"
msgstr "Odpowiedź żądania zawierała przynajmniej jeden błąd"
-#: libsvn_ra_neon/util.c:238
+#: ../libsvn_ra_neon/util.c:238
msgid "The response contains a non-conforming HTTP status line"
msgstr "Odpowiedź zawiera linię statusu niedostosowaną do HTTP"
-#: libsvn_ra_neon/util.c:248
+#: ../libsvn_ra_neon/util.c:248
#, c-format
msgid "Error setting property '%s': "
msgstr "Błąd podczas ustawiania atrybutu '%s': "
-#: libsvn_ra_neon/util.c:532
+#: ../libsvn_ra_neon/util.c:532
#, c-format
msgid "%s of '%s'"
msgstr "%s z '%s'"
-#: libsvn_ra_neon/util.c:544
+#: ../libsvn_ra_neon/util.c:544
#, c-format
msgid "'%s' path not found"
msgstr "Nie znaleziono ścieżki '%s'"
-#: libsvn_ra_neon/util.c:553
+#: ../libsvn_ra_neon/util.c:553
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr "Repozytorium trwale przeniesione do '%s'; proszę relokować"
-#: libsvn_ra_neon/util.c:555
+#: ../libsvn_ra_neon/util.c:555
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr "Repozytorium tymczasowo przeniesione do '%s'; proszę relokować"
-#: libsvn_ra_neon/util.c:563
+#: ../libsvn_ra_neon/util.c:563
#, c-format
msgid ""
"Server sent unexpected return value (%d %s) in response to %s request for '%"
@@ -3171,40 +3199,40 @@
"Serwer wysłał nieoczekiwaną wartość powrotną (%d %s) w odpowiedzi na żądanie "
"%s dla %s"
-#: libsvn_ra_neon/util.c:569
+#: ../libsvn_ra_neon/util.c:569
msgid "authorization failed"
msgstr "błąd autoryzacji"
-#: libsvn_ra_neon/util.c:573
+#: ../libsvn_ra_neon/util.c:573
msgid "could not connect to server"
msgstr "brak połączenia z serwerem"
-#: libsvn_ra_neon/util.c:577
+#: ../libsvn_ra_neon/util.c:577
msgid "timed out waiting for server"
msgstr "przekroczenie czasu oczekiwania na odpowiedź od serwera"
-#: libsvn_ra_neon/util.c:910
+#: ../libsvn_ra_neon/util.c:910
#, c-format
msgid "Can't calculate the request body size"
msgstr "Nie można ustalić rozmiaru żądania"
-#: libsvn_ra_neon/util.c:1237
+#: ../libsvn_ra_neon/util.c:1237
#, c-format
msgid "Error reading spooled %s request response"
msgstr "Błąd podczas czytania zgromadzonych danych żądania %s"
-#: libsvn_ra_neon/util.c:1247
+#: ../libsvn_ra_neon/util.c:1247
#, c-format
msgid "The %s request returned invalid XML in the response: %s (%s)"
msgstr "Dla żądania '%s' otrzymano niepoprawny wynikowy XML: %s (%s)"
-#: libsvn_ra_neon/util.c:1279
+#: ../libsvn_ra_neon/util.c:1279
#, c-format
msgid "%s request failed on '%s'"
msgstr "Żądanie %s nie powiodło się dla '%s'"
-#: libsvn_ra_serf/blame.c:463 libsvn_ra_serf/serf.c:255
-#: libsvn_ra_serf/update.c:2166 libsvn_ra_serf/util.c:1176
+#: ../libsvn_ra_serf/blame.c:463 ../libsvn_ra_serf/serf.c:451
+#: ../libsvn_ra_serf/update.c:2166 ../libsvn_ra_serf/util.c:1177
msgid ""
"The OPTIONS response did not include the requested version-controlled-"
"configuration value"
@@ -3212,490 +3240,489 @@
"Odpowiedź OPTIONS nie zawiera wymaganej wartości version-controlled-"
"configuration"
-#: libsvn_ra_serf/blame.c:475
+#: ../libsvn_ra_serf/blame.c:475
msgid ""
"The OPTIONS response did not include the requested baseline-relative-path "
"value"
msgstr ""
"Odpowiedź OPTIONS nie zawiera wymaganej wartości baseline-relative-path"
-#: libsvn_ra_serf/blame.c:495 libsvn_ra_serf/commit.c:1128
-#: libsvn_ra_serf/property.c:923 libsvn_ra_serf/serf.c:271
-#: libsvn_ra_serf/update.c:1103 libsvn_ra_serf/update.c:1647
+#: ../libsvn_ra_serf/blame.c:495 ../libsvn_ra_serf/commit.c:1128
+#: ../libsvn_ra_serf/property.c:923 ../libsvn_ra_serf/serf.c:467
+#: ../libsvn_ra_serf/update.c:1103 ../libsvn_ra_serf/update.c:1647
msgid "The OPTIONS response did not include the requested checked-in value"
msgstr "Odpowiedź OPTIONS nie zawiera wymaganej wartości checked-in"
-#: libsvn_ra_serf/blame.c:522 libsvn_ra_serf/commit.c:1357
-#: libsvn_ra_serf/commit.c:1747 libsvn_ra_serf/getlocations.c:257
-#: libsvn_ra_serf/property.c:937 libsvn_ra_serf/serf.c:393
-#: libsvn_ra_serf/serf.c:629
+#: ../libsvn_ra_serf/blame.c:522 ../libsvn_ra_serf/commit.c:1357
+#: ../libsvn_ra_serf/commit.c:1747 ../libsvn_ra_serf/property.c:937
+#: ../libsvn_ra_serf/serf.c:589 ../libsvn_ra_serf/serf.c:825
msgid ""
"The OPTIONS response did not include the requested baseline-collection value"
msgstr "Odpowiedź OPTIONS nie zawiera wymaganej wartości baseline-collection"
-#: libsvn_ra_serf/commit.c:408 libsvn_ra_serf/commit.c:428
+#: ../libsvn_ra_serf/commit.c:408 ../libsvn_ra_serf/commit.c:428
#, c-format
msgid "Directory '%s' is out of date; try updating"
msgstr "Katalog '%s' jest nieaktualny. Spróbuj zaktualizować"
-#: libsvn_ra_serf/commit.c:421 libsvn_ra_serf/commit.c:504
-#: libsvn_ra_serf/commit.c:570 libsvn_repos/commit.c:386
+#: ../libsvn_ra_serf/commit.c:421 ../libsvn_ra_serf/commit.c:504
+#: ../libsvn_ra_serf/commit.c:570 ../libsvn_repos/commit.c:388
#, c-format
msgid "Path '%s' not present"
msgstr "Ścieżka '%s' nie istnieje"
-#: libsvn_ra_serf/commit.c:557 libsvn_ra_serf/commit.c:577
+#: ../libsvn_ra_serf/commit.c:557 ../libsvn_ra_serf/commit.c:577
#, c-format
msgid "File '%s' is out of date; try updating"
msgstr "Plik '%s' jest nieaktualny. Spróbuj aktualizować"
-#: libsvn_ra_serf/commit.c:1020
+#: ../libsvn_ra_serf/commit.c:1020
#, c-format
msgid "Failed writing updated file"
msgstr "Zapis zaktualizowanego pliku nie powiódł się"
-#: libsvn_ra_serf/commit.c:1072
+#: ../libsvn_ra_serf/commit.c:1072
msgid ""
"The OPTIONS response did not include the requested activity-collection-set "
"value"
msgstr ""
"Odpowiedź OPTIONS nie zawiera wymaganej wartości activity-collection-set"
-#: libsvn_ra_serf/commit.c:1100
+#: ../libsvn_ra_serf/commit.c:1100
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s z '%s': %d %s (%s://%s)"
-#: libsvn_ra_serf/commit.c:1383
+#: ../libsvn_ra_serf/commit.c:1383
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Dodawanie katalogu nie powiodło się: %s na %s (%d)"
-#: libsvn_ra_serf/locks.c:408
+#: ../libsvn_ra_serf/locks.c:408
#, c-format
msgid "Lock request failed: %d %s"
msgstr "Próba założenia blokady nie powiodła się: %d %s"
-#: libsvn_ra_serf/locks.c:631
+#: ../libsvn_ra_serf/locks.c:631
msgid "Lock request failed"
msgstr "Próba założenia blokady nie powiodła się"
-#: libsvn_ra_serf/locks.c:745
+#: ../libsvn_ra_serf/locks.c:745
#, c-format
msgid "Unlock request failed: %d %s"
msgstr "Żądanie zdjęcia blokady nie powiodło się: %d %s"
-#: libsvn_ra_serf/replay.c:161 libsvn_ra_serf/update.c:1200
+#: ../libsvn_ra_serf/replay.c:161 ../libsvn_ra_serf/update.c:1200
msgid "Missing revision attr in target-revision element"
msgstr "Brak atrybutu wersji w elemencie target-revision"
-#: libsvn_ra_serf/replay.c:179
+#: ../libsvn_ra_serf/replay.c:179
msgid "Missing revision attr in open-root element"
msgstr "Brak atrybutu wersji w elemencie open-root"
-#: libsvn_ra_serf/replay.c:198 libsvn_ra_serf/update.c:1402
+#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1402
msgid "Missing name attr in delete-entry element"
msgstr "Brak atrybutu nazwy w elemencie delete-entry"
-#: libsvn_ra_serf/replay.c:204
+#: ../libsvn_ra_serf/replay.c:204
msgid "Missing revision attr in delete-entry element"
msgstr "Brak atrybutu wersji w elemencie delete-entry"
-#: libsvn_ra_serf/replay.c:224 libsvn_ra_serf/update.c:1262
+#: ../libsvn_ra_serf/replay.c:224 ../libsvn_ra_serf/update.c:1262
msgid "Missing name attr in open-directory element"
msgstr "Brak atrybutu nazwy w elemencie open-directory"
-#: libsvn_ra_serf/replay.c:230 libsvn_ra_serf/update.c:1218
-#: libsvn_ra_serf/update.c:1253
+#: ../libsvn_ra_serf/replay.c:230 ../libsvn_ra_serf/update.c:1218
+#: ../libsvn_ra_serf/update.c:1253
msgid "Missing revision attr in open-directory element"
msgstr "Brak atrybutu wersji w elemencie open-directory"
-#: libsvn_ra_serf/replay.c:250 libsvn_ra_serf/update.c:1297
+#: ../libsvn_ra_serf/replay.c:250 ../libsvn_ra_serf/update.c:1297
msgid "Missing name attr in add-directory element"
msgstr "Brak atrybutu nazwy w elemencie add-directory"
-#: libsvn_ra_serf/replay.c:285 libsvn_ra_serf/update.c:1337
+#: ../libsvn_ra_serf/replay.c:285 ../libsvn_ra_serf/update.c:1337
msgid "Missing name attr in open-file element"
msgstr "Brak atrybutu nazwy w elemencie open-file"
-#: libsvn_ra_serf/replay.c:291 libsvn_ra_serf/update.c:1346
+#: ../libsvn_ra_serf/replay.c:291 ../libsvn_ra_serf/update.c:1346
msgid "Missing revision attr in open-file element"
msgstr "Brak atrybutu wersji w elemencie open-file"
-#: libsvn_ra_serf/replay.c:311 libsvn_ra_serf/update.c:1372
+#: ../libsvn_ra_serf/replay.c:311 ../libsvn_ra_serf/update.c:1372
msgid "Missing name attr in add-file element"
msgstr "Brak atrybutu nazwy w elemencie add-file"
-#: libsvn_ra_serf/replay.c:378 libsvn_ra_serf/update.c:1492
-#: libsvn_ra_serf/update.c:1569
+#: ../libsvn_ra_serf/replay.c:378 ../libsvn_ra_serf/update.c:1492
+#: ../libsvn_ra_serf/update.c:1569
#, c-format
msgid "Missing name attr in %s element"
msgstr "Brak atrybutu nazwy w elemencie %s"
-#: libsvn_ra_serf/serf.c:54
+#: ../libsvn_ra_serf/serf.c:248
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr ""
"Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu WebDAV przy "
"użyciu biblioteki serf"
-#: libsvn_ra_serf/serf.c:174
+#: ../libsvn_ra_serf/serf.c:368
#, c-format
msgid "Could not lookup hostname `%s'"
msgstr "Nie można odszukać hosta: `%s'"
-#: libsvn_ra_serf/serf.c:288
+#: ../libsvn_ra_serf/serf.c:484
msgid "The OPTIONS response did not include the requested version-name value"
msgstr "Odpowiedź OPTIONS nie zawiera wymaganej wartości version-name"
-#: libsvn_ra_serf/serf.c:452
+#: ../libsvn_ra_serf/serf.c:648
msgid "The OPTIONS response did not include the requested resourcetype value"
msgstr "Odpowiedź OPTIONS nie zawiera wymaganej wartości resourcetype"
-#: libsvn_ra_serf/serf.c:943
+#: ../libsvn_ra_serf/serf.c:990
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_serf"
-#: libsvn_ra_serf/update.c:1433
+#: ../libsvn_ra_serf/update.c:1433
msgid "Missing name attr in absent-directory element"
msgstr "Brak atrybutu nazwy w elemencie absent-directory"
-#: libsvn_ra_serf/update.c:1456
+#: ../libsvn_ra_serf/update.c:1456
msgid "Missing name attr in absent-file element"
msgstr "Brak atrybutu nazwy w elemencie absent-file"
-#: libsvn_ra_serf/update.c:2237
+#: ../libsvn_ra_serf/update.c:2237
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Błąd podczas odbierania RAPORTU (%d)"
-#: libsvn_ra_serf/util.c:963
+#: ../libsvn_ra_serf/util.c:964
msgid "Premature EOF seen from server"
msgstr "Serwer za wcześnie wysłał EOF"
-#: libsvn_ra_serf/util.c:1013
+#: ../libsvn_ra_serf/util.c:1014
msgid "Unspecified error message"
msgstr "Nieokreślony komunikat błędu"
-#: libsvn_ra_svn/client.c:133
+#: ../libsvn_ra_svn/client.c:133
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Nieznana nazwa hosta '%s'"
-#: libsvn_ra_svn/client.c:145
+#: ../libsvn_ra_svn/client.c:145
#, c-format
msgid "Can't create socket"
msgstr "Nie udało się utworzyć gniazda"
-#: libsvn_ra_svn/client.c:149
+#: ../libsvn_ra_svn/client.c:149
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Nieudane połączenie z hostem '%s'"
-#: libsvn_ra_svn/client.c:172
+#: ../libsvn_ra_svn/client.c:172
msgid "Prop diffs element not a list"
msgstr "Element zbioru różnic atrybutów nie jest listą"
-#: libsvn_ra_svn/client.c:210
+#: ../libsvn_ra_svn/client.c:210
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Nierozpoznany rodzaj obiektu '%s' z serwera"
-#: libsvn_ra_svn/client.c:374
+#: ../libsvn_ra_svn/client.c:374
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Niezdefiniowany schemat tunelu '%s'"
-#: libsvn_ra_svn/client.c:391
+#: ../libsvn_ra_svn/client.c:391
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Schemat tunelu %s wymaga zdefiniowania zmiennej środowiskowej %s"
-#: libsvn_ra_svn/client.c:402
+#: ../libsvn_ra_svn/client.c:402
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Nieznane polecenie '%s'"
-#: libsvn_ra_svn/client.c:433
+#: ../libsvn_ra_svn/client.c:433
#, c-format
msgid "Error in child process: %s"
msgstr "Błąd procesu potomnego: %s"
-#: libsvn_ra_svn/client.c:457
+#: ../libsvn_ra_svn/client.c:457
#, c-format
msgid "Can't create tunnel"
msgstr "Nie udało się utworzyć tunelu"
-#: libsvn_ra_svn/client.c:495
+#: ../libsvn_ra_svn/client.c:495
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Nieprawidłowy URL '%s' repozytorium svn"
-#: libsvn_ra_svn/client.c:554
+#: ../libsvn_ra_svn/client.c:554
#, c-format
msgid "Server requires minimum version %d"
msgstr "Serwer wymaga co najmniej wersji %d"
-#: libsvn_ra_svn/client.c:558
+#: ../libsvn_ra_svn/client.c:558
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Serwer obsługuje wersje tylko to %d"
-#: libsvn_ra_svn/client.c:566
+#: ../libsvn_ra_svn/client.c:566
msgid "Server does not support edit pipelining"
msgstr "Serwer nie obsługuje edycyjnego pipeliningu"
-#: libsvn_ra_svn/client.c:592
+#: ../libsvn_ra_svn/client.c:595
msgid "Impossibly long repository root from server"
msgstr "Ścieżka katalogu głównego repozytorium jest zbyt długa"
-#: libsvn_ra_svn/client.c:603
+#: ../libsvn_ra_svn/client.c:606
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu svn."
-#: libsvn_ra_svn/client.c:763
+#: ../libsvn_ra_svn/client.c:766
msgid "Server did not send repository root"
msgstr "Serwer nie przesłał głównego katalogu repozytorium"
-#: libsvn_ra_svn/client.c:836
+#: ../libsvn_ra_svn/client.c:839
msgid ""
"Server doesn't support setting arbitrary revision properties during commit"
msgstr ""
"Serwer nie obsługuje ustawiania arbitralnych właściwości wersji podczas "
"zatwierdzania"
-#: libsvn_ra_svn/client.c:924
+#: ../libsvn_ra_svn/client.c:927
msgid "Non-string as part of file contents"
msgstr "Plik zawiera dane niebędące tekstem"
-#: libsvn_ra_svn/client.c:1025
+#: ../libsvn_ra_svn/client.c:1028
msgid "Dirlist element not a list"
msgstr "Element dirlist nie jest listą"
-#: libsvn_ra_svn/client.c:1086
+#: ../libsvn_ra_svn/client.c:1089
msgid "Merge info element is not a list"
msgstr "Element merge info nie jest listą"
-#: libsvn_ra_svn/client.c:1279
+#: ../libsvn_ra_svn/client.c:1282
msgid "Log entry not a list"
msgstr "Element log nie jest listą"
-#: libsvn_ra_svn/client.c:1314
+#: ../libsvn_ra_svn/client.c:1317
msgid "Changed-path entry not a list"
msgstr "Element changed-path nie jest listą"
-#: libsvn_ra_svn/client.c:1430
+#: ../libsvn_ra_svn/client.c:1433
msgid "'stat' not implemented"
msgstr "Niezaimplementowane 'stat'"
-#: libsvn_ra_svn/client.c:1487
+#: ../libsvn_ra_svn/client.c:1490
msgid "'get-locations' not implemented"
msgstr "Niezaimplementowane 'get-locations'"
-#: libsvn_ra_svn/client.c:1499
+#: ../libsvn_ra_svn/client.c:1502
msgid "Location entry not a list"
msgstr "Element location nie jest listą"
-#: libsvn_ra_svn/client.c:1544
+#: ../libsvn_ra_svn/client.c:1547
msgid "'get-location-segments' not implemented"
msgstr "Niezaimplementowane 'get-location-segments'"
-#: libsvn_ra_svn/client.c:1556
+#: ../libsvn_ra_svn/client.c:1559
msgid "Location segment entry not a list"
msgstr "Element location segment nie jest listą"
-#: libsvn_ra_svn/client.c:1618
+#: ../libsvn_ra_svn/client.c:1621
msgid "'get-file-revs' not implemented"
msgstr "Niezaimplementowane 'get-file-revs'"
-#: libsvn_ra_svn/client.c:1631
+#: ../libsvn_ra_svn/client.c:1634
msgid "Revision entry not a list"
msgstr "Element revision nie jest listą"
-#: libsvn_ra_svn/client.c:1648 libsvn_ra_svn/client.c:1673
+#: ../libsvn_ra_svn/client.c:1651 ../libsvn_ra_svn/client.c:1676
msgid "Text delta chunk not a string"
msgstr "Fragment różnic w tekście nie jest tekstem"
-#: libsvn_ra_svn/client.c:1685
+#: ../libsvn_ra_svn/client.c:1688
msgid "The get-file-revs command didn't return any revisions"
msgstr "Polecenie get-file-revs nie zwróciło żadnych wersji"
-#: libsvn_ra_svn/client.c:1733
+#: ../libsvn_ra_svn/client.c:1736
msgid "Server doesn't support the lock command"
msgstr "Serwer nie obsługuje polecenia zakładania blokady"
-#: libsvn_ra_svn/client.c:1797
+#: ../libsvn_ra_svn/client.c:1800
msgid "Server doesn't support the unlock command"
msgstr "Serwer nie obsługuje polecenia zdejmowania blokady"
-#: libsvn_ra_svn/client.c:1894
+#: ../libsvn_ra_svn/client.c:1897
msgid "Lock response not a list"
msgstr "Odpowiedź lock nie jest listą"
-#: libsvn_ra_svn/client.c:1908
+#: ../libsvn_ra_svn/client.c:1911
msgid "Unknown status for lock command"
msgstr "Nieznany status polecenia lock"
-#: libsvn_ra_svn/client.c:1930
+#: ../libsvn_ra_svn/client.c:1933
msgid "Didn't receive end marker for lock responses"
msgstr "Nie otrzymano znacznika końca dla odpowiedzi zablokowania"
-#: libsvn_ra_svn/client.c:2017
+#: ../libsvn_ra_svn/client.c:2020
msgid "Unlock response not a list"
msgstr "Odpowiedź unlock nie jest listą"
-#: libsvn_ra_svn/client.c:2031
+#: ../libsvn_ra_svn/client.c:2034
msgid "Unknown status for unlock command"
msgstr "Nieznany status polecenia unlock"
-#: libsvn_ra_svn/client.c:2052
+#: ../libsvn_ra_svn/client.c:2055
msgid "Didn't receive end marker for unlock responses"
msgstr "Nie otrzymano znacznika końca dla odpowiedzi odblokowania"
-#: libsvn_ra_svn/client.c:2076 libsvn_ra_svn/client.c:2104
+#: ../libsvn_ra_svn/client.c:2079 ../libsvn_ra_svn/client.c:2107
msgid "Server doesn't support the get-lock command"
msgstr "Serwer nie obsługuje polecenia get-lock"
-#: libsvn_ra_svn/client.c:2117
+#: ../libsvn_ra_svn/client.c:2120
msgid "Lock element not a list"
msgstr "Element lock nie jest listą"
-#: libsvn_ra_svn/client.c:2140
+#: ../libsvn_ra_svn/client.c:2143
msgid "Server doesn't support the replay command"
msgstr "Serwer nie obsługuje polecenia powtórzenia"
-#: libsvn_ra_svn/client.c:2233
+#: ../libsvn_ra_svn/client.c:2237
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_svn"
-#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/cyrus_auth.c:441 libsvn_ra_svn/cyrus_auth.c:488
-#: 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:441 ../libsvn_ra_svn/cyrus_auth.c:488
+#: ../libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Nieoczekiwana odpowiedź serwera na uwierzytelnienie"
-#: 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:104
+#: ../svnserve/cyrus_auth.c:114
#, c-format
msgid "Could not initialize the SASL library"
msgstr "Nie udała się inicjalizacja biblioteki SASL"
-#: libsvn_ra_svn/cyrus_auth.c:811 libsvn_ra_svn/internal_auth.c:57
-#: libsvn_ra_svn/internal_auth.c:108
+#: ../libsvn_ra_svn/cyrus_auth.c:811 ../libsvn_ra_svn/internal_auth.c:57
+#: ../libsvn_ra_svn/internal_auth.c:108
#, c-format
msgid "Authentication error from server: %s"
msgstr "Błąd uwierzytelnienia na serwerze: %s"
-#: libsvn_ra_svn/cyrus_auth.c:815
+#: ../libsvn_ra_svn/cyrus_auth.c:815
msgid "Can't get username or password"
msgstr "Nie można pobrać nazwy użytkownika lub hasła"
-#: libsvn_ra_svn/editorp.c:129
+#: ../libsvn_ra_svn/editorp.c:129
msgid "Successful edit status returned too soon"
msgstr "Pomyślny status edycji zwrócony zbyt wcześnie"
-#: libsvn_ra_svn/editorp.c:456
+#: ../libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Niewłaściwy żeton pliku lub katalogu podczas edycji"
-#: libsvn_ra_svn/editorp.c:665
+#: ../libsvn_ra_svn/editorp.c:665
msgid "Apply-textdelta already active"
msgstr "Operacja apply-textdelta już aktywna"
-#: 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 "Operacja apply-textdelta nieaktywna"
-#: libsvn_ra_svn/editorp.c:800
+#: ../libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "Polecenie 'finish-replay' niewłaściwe na zewnątrz powtórzeń"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:907
+#: ../libsvn_ra_svn/editorp.c:891 ../libsvn_ra_svn/marshal.c:907
#, c-format
msgid "Unknown command '%s'"
msgstr "Nieznane polecenie: '%s'"
-#: libsvn_ra_svn/internal_auth.c:95 libsvn_subr/prompt.c:156
+#: ../libsvn_ra_svn/internal_auth.c:95 ../libsvn_subr/prompt.c:156
#, c-format
msgid "Can't get password"
msgstr "Nie można pobrać hasła"
-#: libsvn_ra_svn/marshal.c:86
+#: ../libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Pole określające możliwości serwera bądź klienta musi być typu WORD"
-#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
-#: libsvn_ra_svn/streams.c:155
+#: ../libsvn_ra_svn/marshal.c:253 ../libsvn_ra_svn/streams.c:80
+#: ../libsvn_ra_svn/streams.c:155
msgid "Connection closed unexpectedly"
msgstr "Nieoczekiwane przerwanie połączenia sieciowego"
-#: libsvn_ra_svn/marshal.c:537
+#: ../libsvn_ra_svn/marshal.c:537
msgid "String length larger than maximum"
msgstr "Długość tekstu przekracza dopuszczalne maksimum"
-#: libsvn_ra_svn/marshal.c:574
+#: ../libsvn_ra_svn/marshal.c:574
msgid "Too many nested items"
msgstr "Zbyt wiele zagnieżdżonych elementów"
-#: libsvn_ra_svn/marshal.c:593
+#: ../libsvn_ra_svn/marshal.c:593
msgid "Number is larger than maximum"
msgstr "Wartość liczby przekracza dopuszczalne maksimum"
-#: libsvn_ra_svn/marshal.c:807
+#: ../libsvn_ra_svn/marshal.c:807
msgid "Proplist element not a list"
msgstr "Element proplist nie jest listą"
-#: libsvn_ra_svn/marshal.c:830
+#: ../libsvn_ra_svn/marshal.c:830
msgid "Empty error list"
msgstr "Pusta lista błędów"
-#: libsvn_ra_svn/marshal.c:839
+#: ../libsvn_ra_svn/marshal.c:839
msgid "Malformed error list"
msgstr "Zły format listy błędów"
-#: libsvn_ra_svn/marshal.c:878
+#: ../libsvn_ra_svn/marshal.c:878
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Polecenie zwróciło nieznany status '%s'"
-#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
+#: ../libsvn_ra_svn/streams.c:77 ../libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
msgstr "Nie można czytać z połączenia"
-#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
+#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:166
#, c-format
msgid "Can't write to connection"
msgstr "Nie można pisać do połączenia"
-#: libsvn_ra_svn/streams.c:144
+#: ../libsvn_ra_svn/streams.c:144
#, c-format
msgid "Can't get socket timeout"
msgstr "Nie można uzyskać dozwolonego czasu gniazda"
-#: libsvn_repos/commit.c:127
+#: ../libsvn_repos/commit.c:127
#, c-format
msgid "Directory '%s' is out of date"
msgstr "Katalog '%s' jest nieaktualny"
-#: libsvn_repos/commit.c:128
+#: ../libsvn_repos/commit.c:128
#, c-format
msgid "File '%s' is out of date"
msgstr "Plik '%s' jest nieaktualny"
-#: libsvn_repos/commit.c:294 libsvn_repos/commit.c:439
+#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Otrzymana ścieżka źródłowa nie posiada numeru wersji dla '%s'"
-#: libsvn_repos/commit.c:326 libsvn_repos/commit.c:470
+#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Źródłowy URL '%s' jest z innego repozytorium"
-#: libsvn_repos/commit.c:595
+#: ../libsvn_repos/commit.c:597
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3708,15 +3735,15 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_repos/delta.c:188
+#: ../libsvn_repos/delta.c:188
msgid "Unable to open root of edit"
msgstr "Nie zdołano otworzyć katalogu głównego dla operacji edycji"
-#: libsvn_repos/delta.c:239
+#: ../libsvn_repos/delta.c:239
msgid "Invalid target path"
msgstr "Ścieżka docelowa jest niewłaściwa"
-#: libsvn_repos/delta.c:265
+#: ../libsvn_repos/delta.c:265
msgid ""
"Invalid editor anchoring; at least one of the input paths is not a directory "
"and there was no source entry"
@@ -3724,7 +3751,7 @@
"Błąd edytora; co najmniej jedna z ścieżek wejściowych nie jest katalogiem i "
"brakuje obiektu źródłowego"
-#: libsvn_repos/dump.c:415
+#: ../libsvn_repos/dump.c:415
#, c-format
msgid ""
"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
@@ -3735,33 +3762,33 @@
"OSTRZEŻENIE: najstarsza (%ld) wersja zrzutu. Załadowanie tego zrzutu do\n"
"OSTRZEŻENIE: pustego repozytorium może się nie powieść.\n"
-#: libsvn_repos/dump.c:953
+#: ../libsvn_repos/dump.c:953
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
msgstr "Wersja początkowa %ld jest większa niż wersja końcowa %ld"
-#: libsvn_repos/dump.c:958
+#: ../libsvn_repos/dump.c:958
#, c-format
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "Końcowa wersja %ld jest niewłaściwa (najmłodszą wersją jest %ld)"
-#: libsvn_repos/dump.c:1065
+#: ../libsvn_repos/dump.c:1065
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* Wykonano zrzut wersji %ld.\n"
-#: libsvn_repos/dump.c:1066
+#: ../libsvn_repos/dump.c:1066
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* Zweryfikowano wersję %ld.\n"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1284
+#: ../libsvn_repos/fs-wrap.c:57 ../libsvn_repos/load.c:1284
msgid "Commit succeeded, but post-commit hook failed"
msgstr ""
"Zatwierdzenie powiodło się, lecz nie powiodło się wykonanie skryptu post-"
"commit"
-#: libsvn_repos/fs-wrap.c:183
+#: ../libsvn_repos/fs-wrap.c:157
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3770,38 +3797,38 @@
"Przechowywanie nieregularnego atrybutu '%s' przez repozytorium jest "
"niedozwolone, może to oznaczać występowanie błędu w Twoim kliencie svn"
-#: libsvn_repos/fs-wrap.c:260
+#: ../libsvn_repos/fs-wrap.c:253
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Zapis zabroniony: nieautoryzowana próba odczytu wersji %ld."
-#: libsvn_repos/fs-wrap.c:464
+#: ../libsvn_repos/fs-wrap.c:457
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"Nie można zdjąć blokady ścieżki '%s', brak uwierzytelnionego użytkownika"
-#: libsvn_repos/fs-wrap.c:478
+#: ../libsvn_repos/fs-wrap.c:471
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr ""
"Zdjęcie blokady powiodło się, lecz nie powiodło się wykonanie skryptu post-"
"unlock"
-#: libsvn_repos/hooks.c:87
+#: ../libsvn_repos/hooks.c:87
#, c-format
msgid "'%s' hook succeeded, but error output could not be read"
msgstr "Skrypt '%s' powiódł się, ale nie można odczytać wyjścia błędów"
-#: libsvn_repos/hooks.c:102
+#: ../libsvn_repos/hooks.c:102
msgid "[Error output could not be translated from the native locale to UTF-8.]"
msgstr ""
"[Wyjście błędów nie może być przekształcone z natywnej lokalizacji do UTF-8.]"
-#: libsvn_repos/hooks.c:107
+#: ../libsvn_repos/hooks.c:107
msgid "[Error output could not be read.]"
msgstr "[Wyjście błędów nie może być czytane.]"
-#: libsvn_repos/hooks.c:116
+#: ../libsvn_repos/hooks.c:116
#, c-format
msgid ""
"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
@@ -3810,73 +3837,73 @@
"Skrypt '%s' nie powiódł się (nie zakończył czysto: apr_exit_why_e było %d, "
"kod wyjścia był %d). "
-#: libsvn_repos/hooks.c:123
+#: ../libsvn_repos/hooks.c:123
#, c-format
msgid "'%s' hook failed (exited with a non-zero exitcode of %d). "
msgstr ""
"Skrypt '%s' nie powiódł się (zakończył z niezerowym kodem wyjścia %d). "
-#: libsvn_repos/hooks.c:130
+#: ../libsvn_repos/hooks.c:130
msgid "The following error output was produced by the hook:\n"
msgstr "Następujące wyjście błędów zostało wyprodukowane przez skrypt:\n"
-#: libsvn_repos/hooks.c:137
+#: ../libsvn_repos/hooks.c:137
msgid "No error output was produced by the hook."
msgstr "Brak wyjścia błędów wyprodukowanego przez skrypt."
-#: libsvn_repos/hooks.c:170
+#: ../libsvn_repos/hooks.c:170
#, c-format
msgid "Can't create pipe for hook '%s'"
msgstr "Nie można stworzyć potoku dla skryptu hook '%s'"
-#: libsvn_repos/hooks.c:182
+#: ../libsvn_repos/hooks.c:182
#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
msgstr ""
"Nie można uczynić uchwytu odczytu potoku niedziedziczonym dla skryptu hook '%"
"s'"
-#: libsvn_repos/hooks.c:188
+#: ../libsvn_repos/hooks.c:188
#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
msgstr ""
"Nie można uczynić uchwytu zapisu potoku niedziedziczonym dla skryptu hook '%"
"s'"
-#: libsvn_repos/hooks.c:197
+#: ../libsvn_repos/hooks.c:197
#, c-format
msgid "Can't create null stdout for hook '%s'"
msgstr ""
"Nie można utworzyć pustego strumienia wyjściowego dla skryptu hook '%s'"
-#: libsvn_repos/hooks.c:209
+#: ../libsvn_repos/hooks.c:209
#, c-format
msgid "Error closing write end of stderr pipe"
msgstr "Błąd w trakcie zamykania strumienia błędów potoku otwartego do zapisu"
-#: libsvn_repos/hooks.c:214
+#: ../libsvn_repos/hooks.c:214
#, c-format
msgid "Failed to start '%s' hook"
msgstr "Nie powiodło się uruchomienie skryptu '%s'"
-#: libsvn_repos/hooks.c:227
+#: ../libsvn_repos/hooks.c:227
#, c-format
msgid "Error closing read end of stderr pipe"
msgstr "Błąd podczas zamykania strumienia błędu potoku otwartego do odczytu"
-#: libsvn_repos/hooks.c:231
+#: ../libsvn_repos/hooks.c:231
#, c-format
msgid "Error closing null file"
msgstr "Błąd podczas zamykania pliku null"
-#: libsvn_repos/hooks.c:533
+#: ../libsvn_repos/hooks.c:533
#, c-format
msgid "Failed to run '%s' hook; broken symlink"
msgstr ""
"Niepowiodło się uruchomienie skryptu hook '%s'; uszkodzone dowiązanie "
"symboliczne"
-#: libsvn_repos/hooks.c:677
+#: ../libsvn_repos/hooks.c:682
msgid ""
"Repository has not been enabled to accept revision propchanges;\n"
"ask the administrator to create a pre-revprop-change hook"
@@ -3884,62 +3911,62 @@
"Repozytorium nie ma włączonej możliwości zmieniania atrybutów wersji;\n"
"poproś administratora o utworzenie skryptu hook pre-revprop-change"
-#: libsvn_repos/load.c:121
+#: ../libsvn_repos/load.c:121
msgid "Premature end of content data in dumpstream"
msgstr "Nieoczekiwany koniec danych w strumieniu zrzutu"
-#: libsvn_repos/load.c:128
+#: ../libsvn_repos/load.c:128
msgid "Dumpstream data appears to be malformed"
msgstr "Dane strumienia zrzutu prawdopodobnie są uszkodzone"
-#: libsvn_repos/load.c:177
+#: ../libsvn_repos/load.c:177
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
msgstr "Strumień zrzutu zawiera uszkodzony nagłówek (bez ':') przy '%.20s'"
-#: libsvn_repos/load.c:190
+#: ../libsvn_repos/load.c:190
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
msgstr ""
"Strumień zrzutu zawiera uszkodzony nagłówek (bez wartości) przy '%.20s'"
-#: libsvn_repos/load.c:304
+#: ../libsvn_repos/load.c:304
msgid "Incomplete or unterminated property block"
msgstr "Niekompletny lub niepoprawnie zakończony blok atrybutu"
-#: libsvn_repos/load.c:442
+#: ../libsvn_repos/load.c:442
msgid "Unexpected EOF writing contents"
msgstr "Nieoczekiwany koniec strumienia zapisu"
-#: libsvn_repos/load.c:471
+#: ../libsvn_repos/load.c:471
msgid "Malformed dumpfile header"
msgstr "Błędny nagłówek pliku zrzutu"
-#: libsvn_repos/load.c:477 libsvn_repos/load.c:519
+#: ../libsvn_repos/load.c:477 ../libsvn_repos/load.c:519
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "Nieobsługiwana wersja repozytorium: %d"
-#: libsvn_repos/load.c:622
+#: ../libsvn_repos/load.c:622
msgid "Unrecognized record type in stream"
msgstr "Nierozpoznany typ rekordu w strumieniu"
-#: libsvn_repos/load.c:734
+#: ../libsvn_repos/load.c:734
msgid "Sum of subblock sizes larger than total block content length"
msgstr ""
"Suma rozmiarów poszczególnych podbloków jest większa niż długość całego bloku"
-#: libsvn_repos/load.c:927
+#: ../libsvn_repos/load.c:927
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< Rozpoczęta nowa transakcja, na bazie oryginalnej wersji %ld\n"
-#: libsvn_repos/load.c:972
+#: ../libsvn_repos/load.c:972
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr "Względna źródłowa wersja %ld nie jest dostępna w bieżącym repozytorium"
-#: libsvn_repos/load.c:989
+#: ../libsvn_repos/load.c:989
#, c-format
msgid ""
"Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -3952,40 +3979,40 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_repos/load.c:1042
+#: ../libsvn_repos/load.c:1042
msgid "Malformed dumpstream: Revision 0 must not contain node records"
msgstr "Uszkodzony strumień zrzutu: Wersja 0 nie może zawierać rekordów węzła"
-#: libsvn_repos/load.c:1052
+#: ../libsvn_repos/load.c:1052
#, c-format
msgid " * editing path : %s ..."
msgstr " * edytowanie ścieżki : %s ..."
-#: libsvn_repos/load.c:1059
+#: ../libsvn_repos/load.c:1059
#, c-format
msgid " * deleting path : %s ..."
msgstr " * usuwanie ścieżki : %s ..."
-#: libsvn_repos/load.c:1067
+#: ../libsvn_repos/load.c:1067
#, c-format
msgid " * adding path : %s ..."
msgstr " * dodawanie ścieżki : %s ..."
-#: libsvn_repos/load.c:1076
+#: ../libsvn_repos/load.c:1076
#, c-format
msgid " * replacing path : %s ..."
msgstr " * zastępowanie ścieżki : %s ..."
-#: libsvn_repos/load.c:1086
+#: ../libsvn_repos/load.c:1086
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "Nierozpoznany typ node-action dla obiektu '%s'"
-#: libsvn_repos/load.c:1231
+#: ../libsvn_repos/load.c:1231
msgid " done.\n"
msgstr " zrobione.\n"
-#: libsvn_repos/load.c:1308
+#: ../libsvn_repos/load.c:1308
#, c-format
msgid ""
"\n"
@@ -3996,7 +4023,7 @@
"------- Zatwierdzona wersja %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1314
+#: ../libsvn_repos/load.c:1314
#, c-format
msgid ""
"\n"
@@ -4007,466 +4034,466 @@
"------- Zatwierdzona nowa wersja %ld (z oryginalnej wersji %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' nieznaleziony w systemie plików"
-#: libsvn_repos/replay.c:387
+#: ../libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Ścieżka '%s' systemu plików nie jest ani plikiem ani katalogiem"
-#: libsvn_repos/reporter.c:230
+#: ../libsvn_repos/reporter.c:230
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Niewłaściwa głębokość (%s) dla ścieżki '%s'"
-#: libsvn_repos/reporter.c:753
+#: ../libsvn_repos/reporter.c:753
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Ścieżka kopii roboczej '%s' nie istnieje w repozytorium"
-#: libsvn_repos/reporter.c:1106
+#: ../libsvn_repos/reporter.c:1106
msgid "Not authorized to open root of edit operation"
msgstr "Brak uprawnień do otwarcia katalogu głównego edycji"
-#: libsvn_repos/reporter.c:1125
+#: ../libsvn_repos/reporter.c:1125
msgid "Target path does not exist"
msgstr "Docelowa śieżka nie istnieje"
-#: libsvn_repos/reporter.c:1132
+#: ../libsvn_repos/reporter.c:1132
msgid "Cannot replace a directory from within"
msgstr "Nie można zastąpić katalogu podczas pobytu w tym katalogu"
-#: libsvn_repos/reporter.c:1176
+#: ../libsvn_repos/reporter.c:1176
msgid "Invalid report for top level of working copy"
msgstr "Niepoprawna operacja na katalogu głównym kopii roboczej"
-#: libsvn_repos/reporter.c:1191
+#: ../libsvn_repos/reporter.c:1191
msgid "Two top-level reports with no target"
msgstr "Dwa główne raporty bez obiektu docelowego"
-#: libsvn_repos/reporter.c:1224
+#: ../libsvn_repos/reporter.c:1224
#, c-format
msgid "Unsupported report depth '%s'"
msgstr "Nieobsługiwana głębokość '%s' raportu"
-#: libsvn_repos/repos.c:178
+#: ../libsvn_repos/repos.c:180
#, c-format
msgid "'%s' exists and is non-empty"
msgstr "'%s' istnieje i jest niepusty"
-#: libsvn_repos/repos.c:224
+#: ../libsvn_repos/repos.c:226
msgid "Creating db logs lock file"
msgstr "Tworzenie pliku blokad dla logów bazy danych"
-#: libsvn_repos/repos.c:242
+#: ../libsvn_repos/repos.c:244
msgid "Creating db lock file"
msgstr "Tworzenie pliku blokady bazy danych"
-#: libsvn_repos/repos.c:252
+#: ../libsvn_repos/repos.c:254
msgid "Creating lock dir"
msgstr "Tworzenie katalogu blokady"
-#: libsvn_repos/repos.c:283
+#: ../libsvn_repos/repos.c:285
msgid "Creating hook directory"
msgstr "Tworzenie katalogu skryptów hook"
-#: libsvn_repos/repos.c:346
+#: ../libsvn_repos/repos.c:361
msgid "Creating start-commit hook"
msgstr "Tworzenie skryptu start-commit"
-#: libsvn_repos/repos.c:425
+#: ../libsvn_repos/repos.c:440
msgid "Creating pre-commit hook"
msgstr "Tworzenie skryptu pre-commit"
-#: libsvn_repos/repos.c:501
+#: ../libsvn_repos/repos.c:516
msgid "Creating pre-revprop-change hook"
msgstr "Tworzenie skryptu pre-revprop-change"
-#: libsvn_repos/repos.c:721
+#: ../libsvn_repos/repos.c:736
msgid "Creating post-commit hook"
msgstr "Tworzenie skryptu post-commit"
-#: libsvn_repos/repos.c:907
+#: ../libsvn_repos/repos.c:922
msgid "Creating post-revprop-change hook"
msgstr "Tworzenie skryptu post-revprop-change"
-#: libsvn_repos/repos.c:917
+#: ../libsvn_repos/repos.c:932
msgid "Creating conf directory"
msgstr "Tworzenie katalogu konfiguracji"
-#: libsvn_repos/repos.c:975
+#: ../libsvn_repos/repos.c:990
msgid "Creating svnserve.conf file"
msgstr "Tworzenie pliku svnserve.conf"
-#: libsvn_repos/repos.c:993
+#: ../libsvn_repos/repos.c:1008
msgid "Creating passwd file"
msgstr "Tworzenie pliku passwd"
-#: libsvn_repos/repos.c:1035
+#: ../libsvn_repos/repos.c:1050
msgid "Creating authz file"
msgstr "Tworzenie pliku authz"
-#: libsvn_repos/repos.c:1068
+#: ../libsvn_repos/repos.c:1083
msgid "Could not create top-level directory"
msgstr "Nie można stworzyć katalogu głównego"
-#: libsvn_repos/repos.c:1080
+#: ../libsvn_repos/repos.c:1095
msgid "Creating DAV sandbox dir"
msgstr "Tworzenie katalogu roboczego DAV"
-#: libsvn_repos/repos.c:1151
+#: ../libsvn_repos/repos.c:1166
msgid "Error opening db lockfile"
msgstr "Błąd otwierania pliku blokady bazy danych"
-#: libsvn_repos/repos.c:1188
+#: ../libsvn_repos/repos.c:1203
msgid "Repository creation failed"
msgstr "Tworzenie repozytorium nie powiodło się"
-#: libsvn_repos/repos.c:1269
+#: ../libsvn_repos/repos.c:1284
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Oczekiwany format repozytorium '%d' lub '%d'; znaleziony format '%d'"
-#: libsvn_repos/rev_hunt.c:79
+#: ../libsvn_repos/rev_hunt.c:79
#, c-format
msgid "Failed to find time on revision %ld"
msgstr "Nie znaleziono atrybutu czas dla wersji %ld"
-#: libsvn_repos/rev_hunt.c:234 libsvn_repos/rev_hunt.c:349
+#: ../libsvn_repos/rev_hunt.c:234 ../libsvn_repos/rev_hunt.c:349
#, c-format
msgid "Invalid start revision %ld"
msgstr "Nieprawidłowa początkowa wersja %ld"
-#: libsvn_repos/rev_hunt.c:238 libsvn_repos/rev_hunt.c:353
+#: ../libsvn_repos/rev_hunt.c:238 ../libsvn_repos/rev_hunt.c:353
#, c-format
msgid "Invalid end revision %ld"
msgstr "Nieprawidłowa końcowa wersja %ld"
-#: libsvn_repos/rev_hunt.c:542
+#: ../libsvn_repos/rev_hunt.c:542
msgid "Unreadable path encountered; access denied"
msgstr "Nie można odczytać ścieżki; dostęp zabroniony"
-#: libsvn_repos/rev_hunt.c:1144
+#: ../libsvn_repos/rev_hunt.c:1115
#, c-format
msgid "'%s' is not a file in revision %ld"
msgstr "'%s' nie jest plikiem w wersji %ld"
-#: libsvn_subr/cmdline.c:502
+#: ../libsvn_subr/cmdline.c:502
#, c-format
msgid "Error initializing command line arguments"
msgstr "Błąd podczas inicjalizacji argumentów linii poleceń"
-#: libsvn_subr/config.c:633
+#: ../libsvn_subr/config.c:633
#, c-format
msgid "Config error: invalid boolean value '%s'"
msgstr "Błąd w pliku konfiguracyjnym: niewłaściwa wartość typu boolean '%s'"
-#: libsvn_subr/config.c:883
+#: ../libsvn_subr/config.c:883
#, c-format
msgid "Config error: invalid integer value '%s'"
msgstr "Błąd w pliku konfiguracyjnym: niewłaściwa wartość typu integer '%s'"
-#: libsvn_subr/config_auth.c:94
+#: ../libsvn_subr/config_auth.c:94
msgid "Unable to open auth file for reading"
msgstr "Nie udało się otworzyć pliku uwierzytelniania w trybie odczytu"
-#: libsvn_subr/config_auth.c:99
+#: ../libsvn_subr/config_auth.c:99
#, c-format
msgid "Error parsing '%s'"
msgstr "Błąd parsowania '%s'"
-#: libsvn_subr/config_auth.c:123
+#: ../libsvn_subr/config_auth.c:123
msgid "Unable to locate auth file"
msgstr "Nie udało zlokalizować się pliku uwierzytelniania"
-#: libsvn_subr/config_auth.c:134
+#: ../libsvn_subr/config_auth.c:134
msgid "Unable to open auth file for writing"
msgstr "Nie udało się otworzyć pliku uwierzytelniania w trybie zapisu"
-#: libsvn_subr/config_auth.c:137
+#: ../libsvn_subr/config_auth.c:137
#, c-format
msgid "Error writing hash to '%s'"
msgstr "Błąd zapisu hash do'%s'"
-#: libsvn_subr/date.c:204
+#: ../libsvn_subr/date.c:204
#, c-format
msgid "Can't manipulate current date"
msgstr "Nie można zmodyfikować bieżącej daty"
-#: 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 "Nie można obliczyć żądanej daty"
-#: libsvn_subr/date.c:281
+#: ../libsvn_subr/date.c:281
#, c-format
msgid "Can't expand time"
msgstr "Nie można rozszerzyć czasu do lokalnego formatu"
-#: libsvn_subr/dso.c:71
+#: ../libsvn_subr/dso.c:71
#, c-format
msgid "Can't grab DSO mutex"
msgstr "Nie można schwytać muteksu 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 "Nie można wypuścić muteksu DSO"
-#: libsvn_subr/error.c:346
+#: ../libsvn_subr/error.c:346
msgid "Can't recode error string from APR"
msgstr "Nie można odkodować komunikatu błędu z APR"
-#: libsvn_subr/error.c:437
+#: ../libsvn_subr/error.c:437
#, c-format
msgid "%swarning: %s\n"
msgstr "%sostrzeżenie: %s\n"
-#: libsvn_subr/io.c:150
+#: ../libsvn_subr/io.c:150
#, c-format
msgid "Can't check path '%s'"
msgstr "Nie można sprawdzić ścieżki '%s'"
-#: libsvn_subr/io.c:404
+#: ../libsvn_subr/io.c:404
#, c-format
msgid "Can't open '%s'"
msgstr "Nie mozna otworzyć '%s'"
-#: libsvn_subr/io.c:426 libsvn_subr/io.c:549
+#: ../libsvn_subr/io.c:426 ../libsvn_subr/io.c:549
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Nie zdołano przydzielić nazwy dla '%s'"
-#: libsvn_subr/io.c:536
+#: ../libsvn_subr/io.c:536
#, c-format
msgid "Can't create symbolic link '%s'"
msgstr "Nie można utworzyć dowiązania symbolicznego '%s'"
-#: libsvn_subr/io.c:553 libsvn_subr/io.c:607 libsvn_subr/io.c:635
+#: ../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 "Na tej platformie nie są wspierane dowiązania symboliczne"
-#: libsvn_subr/io.c:586
+#: ../libsvn_subr/io.c:586
#, c-format
msgid "Can't read contents of link"
msgstr "Nie można przeczytać zawartości wskazywanej przez dowiązanie"
-#: libsvn_subr/io.c:648
+#: ../libsvn_subr/io.c:648
#, c-format
msgid "Can't find a temporary directory"
msgstr "Nie można znaleźć katalogu tymczasowego"
-#: libsvn_subr/io.c:742
+#: ../libsvn_subr/io.c:742
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Nie można skopiować '%s' do '%s'"
-#: libsvn_subr/io.c:795
+#: ../libsvn_subr/io.c:795
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Nie można przypisać uprawnień dla '%s'"
-#: libsvn_subr/io.c:817
+#: ../libsvn_subr/io.c:817
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Nie można dodać '%s' do '%s'"
-#: libsvn_subr/io.c:851
+#: ../libsvn_subr/io.c:851
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Źródło '%s' nie jest katalogiem"
-#: libsvn_subr/io.c:857
+#: ../libsvn_subr/io.c:857
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Obiekt docelowy '%s' nie jest katalogiem"
-#: libsvn_subr/io.c:863
+#: ../libsvn_subr/io.c:863
#, c-format
msgid "Destination '%s' already exists"
msgstr "Ścieżka docelowa '%s' już istnieje"
-#: libsvn_subr/io.c:932 libsvn_subr/io.c:1883 libsvn_subr/io.c:1934
-#: libsvn_subr/io.c:1986
+#: ../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 "Nie można odczytać katalogu '%s'"
-#: libsvn_subr/io.c:937 libsvn_subr/io.c:1888 libsvn_subr/io.c:1939
-#: libsvn_subr/io.c:1991 libsvn_subr/io.c:3154
+#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:1888 ../libsvn_subr/io.c:1939
+#: ../libsvn_subr/io.c:1991 ../libsvn_subr/io.c:3154
#, c-format
msgid "Error closing directory '%s'"
msgstr "Błąd zamykania katalogu '%s'"
-#: libsvn_subr/io.c:965
+#: ../libsvn_subr/io.c:965
#, c-format
msgid "Can't make directory '%s'"
msgstr "Nie można stworzyć katalogu '%s'"
-#: libsvn_subr/io.c:1052
+#: ../libsvn_subr/io.c:1052
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Nie można ustawić informacji o czasie dostępu do '%s'"
-#: libsvn_subr/io.c:1192
+#: ../libsvn_subr/io.c:1192
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "Nie można odczytać domyślnych uprawnień dla pliku '%s' (błąd stat)"
-#: libsvn_subr/io.c:1203
+#: ../libsvn_subr/io.c:1203
#, c-format
msgid "Can't open file at '%s'"
msgstr "Nie można otworzyć pliku przy '%s'"
-#: libsvn_subr/io.c:1207
+#: ../libsvn_subr/io.c:1207
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "Nie można odczytać uprawnień dla pliku '%s' (błąd stat)"
-#: libsvn_subr/io.c:1246 libsvn_subr/io.c:1344
+#: ../libsvn_subr/io.c:1246 ../libsvn_subr/io.c:1344
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Nie można zmienić uprawnień pliku '%s'"
-#: libsvn_subr/io.c:1384
+#: ../libsvn_subr/io.c:1384
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Nie można ustawić atrybutu 'tylko do odczytu' dla pliku '%s'"
-#: libsvn_subr/io.c:1416
+#: ../libsvn_subr/io.c:1416
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Nie można ustawić atrybutu 'do zapisu i odczytu' dla pliku '%s'"
-#: libsvn_subr/io.c:1460
+#: ../libsvn_subr/io.c:1460
#, c-format
msgid "Error getting UID of process"
msgstr "Błąd pobierania UID procesu"
-#: libsvn_subr/io.c:1541
+#: ../libsvn_subr/io.c:1541
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Nie można założyć dzielonej blokady na pliku '%s'"
-#: libsvn_subr/io.c:1576
+#: ../libsvn_subr/io.c:1576
#, c-format
msgid "Can't flush file '%s'"
msgstr "Nie można opróżnić pliku '%s'"
-#: libsvn_subr/io.c:1577
+#: ../libsvn_subr/io.c:1577
#, c-format
msgid "Can't flush stream"
msgstr "Nie można opróżnić strumienia"
-#: libsvn_subr/io.c:1589 libsvn_subr/io.c:1606
+#: ../libsvn_subr/io.c:1589 ../libsvn_subr/io.c:1606
#, c-format
msgid "Can't flush file to disk"
msgstr "Nie można opróżnić pliku na dysk"
-#: libsvn_subr/io.c:1628 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#: ../libsvn_subr/io.c:1628 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "Nie można otworzyć standardowego wejścia"
-#: libsvn_subr/io.c:1649
+#: ../libsvn_subr/io.c:1649
msgid "Reading from stdin is disallowed"
msgstr "Czytanie z standardowego wejścia jest zabronione"
-#: libsvn_subr/io.c:1663
+#: ../libsvn_subr/io.c:1663
#, c-format
msgid "Can't get file name"
msgstr "Nie można uzyskać nazwy pliku"
-#: libsvn_subr/io.c:1731
+#: ../libsvn_subr/io.c:1731
#, c-format
msgid "Can't remove file '%s'"
msgstr "Nie można usunąć pliku '%s'"
-#: libsvn_subr/io.c:1810 libsvn_subr/io.c:3005 libsvn_subr/io.c:3091
+#: ../libsvn_subr/io.c:1810 ../libsvn_subr/io.c:3005 ../libsvn_subr/io.c:3091
#, c-format
msgid "Can't open directory '%s'"
msgstr "Nie można otworzyć katalogu '%s'"
-#: libsvn_subr/io.c:1864 libsvn_subr/io.c:1894
+#: ../libsvn_subr/io.c:1864 ../libsvn_subr/io.c:1894
#, c-format
msgid "Can't remove '%s'"
msgstr "Nie można usunąć '%s'"
-#: libsvn_subr/io.c:1874
+#: ../libsvn_subr/io.c:1874
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Nie można przejść do pierwszego elementu katalogu '%s'"
-#: libsvn_subr/io.c:2055
+#: ../libsvn_subr/io.c:2055
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Nie można utworzyć atrybutów procesu '%s'"
-#: libsvn_subr/io.c:2061
+#: ../libsvn_subr/io.c:2061
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Nie można ustalić sposobu wywołania procesu '%s'"
-#: libsvn_subr/io.c:2073
+#: ../libsvn_subr/io.c:2073
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Nie można ustawić katalogu dla procesu '%s'"
-#: libsvn_subr/io.c:2086
+#: ../libsvn_subr/io.c:2086
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Nie można przydzielić procesowi '%s' strumienia wejściowego"
-#: libsvn_subr/io.c:2093
+#: ../libsvn_subr/io.c:2093
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Nie można przydzielić procesowi '%s' strumienia wyjściowego"
-#: libsvn_subr/io.c:2100
+#: ../libsvn_subr/io.c:2100
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Nie można przydzielić procesowi '%s' strumienia błędów"
-#: libsvn_subr/io.c:2107
+#: ../libsvn_subr/io.c:2107
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr ""
"Nie można przydzielić procesowi '%s' strumienia błędów dla uchwytu błędów"
-#: libsvn_subr/io.c:2113
+#: ../libsvn_subr/io.c:2113
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Nie można przydzielić procesowi '%s' uchwytu błędów"
-#: libsvn_subr/io.c:2136
+#: ../libsvn_subr/io.c:2136
#, c-format
msgid "Can't start process '%s'"
msgstr "Nie można uruchomić procesu '%s'"
-#: libsvn_subr/io.c:2160
+#: ../libsvn_subr/io.c:2160
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Błąd podczas czekania na proces '%s'"
-#: libsvn_subr/io.c:2168
+#: ../libsvn_subr/io.c:2168
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Proces '%s' zakończył się niepowodzeniem ( kod błędu: %d )"
-#: libsvn_subr/io.c:2175
+#: ../libsvn_subr/io.c:2175
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Proces '%s' zwrócił kod błędu %d"
-#: libsvn_subr/io.c:2286
+#: ../libsvn_subr/io.c:2286
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' zwrócił kod błędu %d"
-#: libsvn_subr/io.c:2409
+#: ../libsvn_subr/io.c:2409
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4481,175 +4508,175 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2536
+#: ../libsvn_subr/io.c:2536
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Nie można określić typu MIME dla niepliku '%s'"
-#: libsvn_subr/io.c:2626
+#: ../libsvn_subr/io.c:2626
#, c-format
msgid "Can't open file '%s'"
msgstr "Nie można otworzyć pliku '%s'"
-#: libsvn_subr/io.c:2662
+#: ../libsvn_subr/io.c:2662
#, c-format
msgid "Can't close file '%s'"
msgstr "Nie można zamknąć pliku '%s'"
-#: libsvn_subr/io.c:2663
+#: ../libsvn_subr/io.c:2663
#, c-format
msgid "Can't close stream"
msgstr "Nie można zamknąć strumienia"
-#: libsvn_subr/io.c:2673 libsvn_subr/io.c:2697 libsvn_subr/io.c:2710
+#: ../libsvn_subr/io.c:2673 ../libsvn_subr/io.c:2697 ../libsvn_subr/io.c:2710
#, c-format
msgid "Can't read file '%s'"
msgstr "Nie można czytać z pliku '%s'"
-#: libsvn_subr/io.c:2674 libsvn_subr/io.c:2698 libsvn_subr/io.c:2711
+#: ../libsvn_subr/io.c:2674 ../libsvn_subr/io.c:2698 ../libsvn_subr/io.c:2711
#, c-format
msgid "Can't read stream"
msgstr "Nie można czytać ze strumienia"
-#: libsvn_subr/io.c:2685
+#: ../libsvn_subr/io.c:2685
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Nie można uzyskać informacji o atrybutach z pliku '%s'"
-#: libsvn_subr/io.c:2686
+#: ../libsvn_subr/io.c:2686
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Nie można uzyskać informacji o atrybutach ze strumienia"
-#: libsvn_subr/io.c:2722
+#: ../libsvn_subr/io.c:2722
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Nie można ustawić wskaźnika pozycji w pliku '%s'"
-#: libsvn_subr/io.c:2723
+#: ../libsvn_subr/io.c:2723
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Nie można ustawić wskaźnika pozycji w strumieniu"
-#: libsvn_subr/io.c:2734 libsvn_subr/io.c:2768
+#: ../libsvn_subr/io.c:2734 ../libsvn_subr/io.c:2768
#, c-format
msgid "Can't write to file '%s'"
msgstr "Nie można pisać do pliku '%s'"
-#: libsvn_subr/io.c:2735 libsvn_subr/io.c:2769
+#: ../libsvn_subr/io.c:2735 ../libsvn_subr/io.c:2769
#, c-format
msgid "Can't write to stream"
msgstr "Nie można pisać do strumienia"
-#: libsvn_subr/io.c:2809
+#: ../libsvn_subr/io.c:2809
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Nie można odczytać linii długości z pliku '%s'"
-#: libsvn_subr/io.c:2813
+#: ../libsvn_subr/io.c:2813
msgid "Can't read length line in stream"
msgstr "Nie można odczytać linii długości ze strumienia"
-#: libsvn_subr/io.c:2860
+#: ../libsvn_subr/io.c:2860
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Nie można przenieść '%s' do '%s'"
-#: libsvn_subr/io.c:2939
+#: ../libsvn_subr/io.c:2939
#, c-format
msgid "Can't create directory '%s'"
msgstr "Nie można utworzyć katalogu '%s'"
-#: libsvn_subr/io.c:2950 libsvn_wc/copy.c:543
+#: ../libsvn_subr/io.c:2950 ../libsvn_wc/copy.c:543
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Nie można ukryć katalogu '%s'"
-#: libsvn_subr/io.c:3023
+#: ../libsvn_subr/io.c:3023
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Nie można usunąć katalogu '%s'"
-#: libsvn_subr/io.c:3041
+#: ../libsvn_subr/io.c:3041
#, c-format
msgid "Can't read directory"
msgstr "Nie można czytać katalogu"
-#: libsvn_subr/io.c:3110
+#: ../libsvn_subr/io.c:3110
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Nie można czytać elementu katalogu w '%s'"
-#: libsvn_subr/io.c:3235
+#: ../libsvn_subr/io.c:3235
#, c-format
msgid "Can't check directory '%s'"
msgstr "Nie można sprawdzić katalogu '%s'"
-#: libsvn_subr/io.c:3257
+#: ../libsvn_subr/io.c:3257
#, c-format
msgid "Version %d is not non-negative"
msgstr "Numer wersji %d nie jest nieujemny"
-#: libsvn_subr/io.c:3307
+#: ../libsvn_subr/io.c:3307
#, c-format
msgid "Reading '%s'"
msgstr "Czytanie '%s'"
-#: libsvn_subr/io.c:3323
+#: ../libsvn_subr/io.c:3323
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Pierwsza linia '%s' zawiera niecyfrę"
-#: libsvn_subr/kitchensink.c:40
+#: ../libsvn_subr/kitchensink.c:40
#, c-format
msgid "Invalid revision number found parsing '%s'"
msgstr "Znaleziono nieprawidłowy numer wersji podczas parsowania '%s'"
-#: libsvn_subr/kitchensink.c:52
+#: ../libsvn_subr/kitchensink.c:52
#, c-format
msgid "Negative revision number found parsing '%s'"
msgstr "Znaleziono ujemny numer wersji podczas parsowania '%s'"
-#: libsvn_subr/mergeinfo.c:143
+#: ../libsvn_subr/mergeinfo.c:143
#, c-format
msgid "Invalid character '%c' found in revision list"
msgstr "Znaleziono nieprawidłowy znak '%c' w liście wersji"
-#: libsvn_subr/mergeinfo.c:192 libsvn_subr/mergeinfo.c:199
+#: ../libsvn_subr/mergeinfo.c:192 ../libsvn_subr/mergeinfo.c:199
#, c-format
msgid "Invalid character '%c' found in range list"
msgstr "Znaleziono nieprawidłowy znak '%c' w liście zakresu"
-#: libsvn_subr/mergeinfo.c:206
+#: ../libsvn_subr/mergeinfo.c:206
msgid "Range list parsing ended before hitting newline"
msgstr "Skończono parsowanie lisy zakresu przed osiągnięciem znaku nowej linii"
-#: libsvn_subr/mergeinfo.c:225
+#: ../libsvn_subr/mergeinfo.c:225
msgid "Pathname not terminated by ':'"
msgstr "Ścieżka nie zakończona znakiem ':'"
-#: libsvn_subr/mergeinfo.c:233
+#: ../libsvn_subr/mergeinfo.c:233
#, c-format
msgid "Could not find end of line in range list line in '%s'"
msgstr "Nie znaleziono końca linii w linii listy zakresu w '%s'"
-#: libsvn_subr/nls.c:79
+#: ../libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "Nie można dokonać konwersji do UCS-2 następującego ciągu znaków: '%s'"
-#: libsvn_subr/nls.c:86
+#: ../libsvn_subr/nls.c:86
msgid "Can't get module file name"
msgstr "Nie można dostać nazwy pliku modułu"
-#: 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 ""
"Nie można dokonać konwersji następującej ścieżki modułu z kodowania UCS-2 do "
"UTF-8: '%s'"
-#: libsvn_subr/opt.c:233 libsvn_subr/opt.c:260 libsvn_subr/opt.c:337
+#: ../libsvn_subr/opt.c:233 ../libsvn_subr/opt.c:260 ../libsvn_subr/opt.c:337
msgid ""
"\n"
"Valid options:\n"
@@ -4657,11 +4684,11 @@
"\n"
"Poprawne opcje:\n"
-#: libsvn_subr/opt.c:467
+#: ../libsvn_subr/opt.c:467
msgid " ARG"
msgstr " ARG"
-#: libsvn_subr/opt.c:492 libsvn_subr/opt.c:525
+#: ../libsvn_subr/opt.c:492 ../libsvn_subr/opt.c:525
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4670,27 +4697,27 @@
"\"%s\": nieznane polecenie.\n"
"\n"
-#: libsvn_subr/opt.c:850
+#: ../libsvn_subr/opt.c:850
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Błąd składniowy w trakcie parsowania wersji '%s'"
-#: libsvn_subr/opt.c:926
+#: ../libsvn_subr/opt.c:958
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s' nie ma poprawnej składni URI"
-#: libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:964
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s' zawiera element '..'"
-#: libsvn_subr/opt.c:961
+#: ../libsvn_subr/opt.c:993
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Błąd ustalania wielkości liter dla '%s'"
-#: libsvn_subr/opt.c:1063
+#: ../libsvn_subr/opt.c:1100
#, c-format
msgid ""
"%s, version %s\n"
@@ -4701,7 +4728,7 @@
" kompilacja %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1066
+#: ../libsvn_subr/opt.c:1103
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4716,56 +4743,56 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1119 libsvn_subr/opt.c:1186
+#: ../libsvn_subr/opt.c:1156 ../libsvn_subr/opt.c:1223
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Użyj '%s help', by uzyskać instrukcje o użyciu.\n"
-#: libsvn_subr/path.c:1169
+#: ../libsvn_subr/path.c:1169
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Nie można ustalić absolutnej ścieżki '%s'"
-#: libsvn_subr/path.c:1206
+#: ../libsvn_subr/path.c:1206
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' nie jest ani nazwą pliku ani katalogu"
-#: libsvn_subr/path.c:1319
+#: ../libsvn_subr/path.c:1319
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Nie można ustalić natywnego kodowania ścieżki"
-#: libsvn_subr/path.c:1432
+#: ../libsvn_subr/path.c:1432
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Błędny znak kontrolny '0x%02x' w ścieżce '%s'"
-#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#: ../libsvn_subr/prompt.c:115 ../libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
msgstr "Błąd odczytu standardowego wejścia"
-#: libsvn_subr/prompt.c:178
+#: ../libsvn_subr/prompt.c:178
#, c-format
msgid "Authentication realm: %s\n"
msgstr "Obszar uwierzytelniania: %s\n"
-#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+#: ../libsvn_subr/prompt.c:204 ../libsvn_subr/prompt.c:227
msgid "Username: "
msgstr "Użytkownik: "
-#: libsvn_subr/prompt.c:206
+#: ../libsvn_subr/prompt.c:206
#, c-format
msgid "Password for '%s': "
msgstr "Hasło '%s': "
-#: libsvn_subr/prompt.c:249
+#: ../libsvn_subr/prompt.c:249
#, c-format
msgid "Error validating server certificate for '%s':\n"
msgstr "Błąd weryfikacji certyfikatu serwera dla '%s'\n"
-#: libsvn_subr/prompt.c:255
+#: ../libsvn_subr/prompt.c:255
msgid ""
" - The certificate is not issued by a trusted authority. Use the\n"
" fingerprint to validate the certificate manually!\n"
@@ -4773,23 +4800,23 @@
" - Certyfikat nie jest wydany przez zaufanego dostawcę. Skorzystaj\n"
" z odcisku palca by zweryfikować go samodzielnie!\n"
-#: libsvn_subr/prompt.c:262
+#: ../libsvn_subr/prompt.c:262
msgid " - The certificate hostname does not match.\n"
msgstr " - Niezgodność nazwy maszyny w ramach certyfikatu\n"
-#: libsvn_subr/prompt.c:268
+#: ../libsvn_subr/prompt.c:268
msgid " - The certificate is not yet valid.\n"
msgstr " - Certyfikat nie jest jeszcze ważny\n"
-#: libsvn_subr/prompt.c:274
+#: ../libsvn_subr/prompt.c:274
msgid " - The certificate has expired.\n"
msgstr " - Certyfikat jest już nieważny\n"
-#: libsvn_subr/prompt.c:280
+#: ../libsvn_subr/prompt.c:280
msgid " - The certificate has an unknown error.\n"
msgstr " - Nieznany błąd certyfikatu.\n"
-#: libsvn_subr/prompt.c:285
+#: ../libsvn_subr/prompt.c:285
#, c-format
msgid ""
"Certificate information:\n"
@@ -4804,84 +4831,84 @@
" - Wydawca: %s\n"
" - Odcisk palca: %s\n"
-#: libsvn_subr/prompt.c:300
+#: ../libsvn_subr/prompt.c:300
msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
msgstr "Odrzucić (r), zaakceptować chwilowo (t) czy zaakceptować na stałe (p)?"
-#: libsvn_subr/prompt.c:304
+#: ../libsvn_subr/prompt.c:304
msgid "(R)eject or accept (t)emporarily? "
msgstr "Odrzucić (r) czy zaakceptować tymczasowo (t)? "
-#: libsvn_subr/prompt.c:343
+#: ../libsvn_subr/prompt.c:343
msgid "Client certificate filename: "
msgstr "Nazwa pliku certyfikatu klienta: "
-#: libsvn_subr/prompt.c:366
+#: ../libsvn_subr/prompt.c:366
#, c-format
msgid "Passphrase for '%s': "
msgstr "Hasło dla '%s': "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:2429
+#: ../libsvn_subr/subst.c:1745 ../libsvn_wc/props.c:2429
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Plik '%s' ma niejednolite znaki końca wiersza"
#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
-#: libsvn_subr/time.c:81
+#: ../libsvn_subr/time.c:81
msgid " (%a, %d %b %Y)"
msgstr " (%a, %d.%m.%Y)"
-#: libsvn_subr/utf.c:195
+#: ../libsvn_subr/utf.c:195
msgid "Can't lock charset translation mutex"
msgstr "Nie można zablokować muteksu translacji zestawu znaków"
-#: libsvn_subr/utf.c:213 libsvn_subr/utf.c:322
+#: ../libsvn_subr/utf.c:213 ../libsvn_subr/utf.c:322
msgid "Can't unlock charset translation mutex"
msgstr "Nie można odblokować muteksu translacji zestawu znaków"
-#: libsvn_subr/utf.c:274
+#: ../libsvn_subr/utf.c:274
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "Nie można stworzyć konwertera znaków z natywnego kodowania do '%s'"
-#: libsvn_subr/utf.c:278
+#: ../libsvn_subr/utf.c:278
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "Nie można stworzyć konwertera znaków z natywnego kodowania do '%s'"
-#: libsvn_subr/utf.c:282
+#: ../libsvn_subr/utf.c:282
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "Nie można stworzyć konwertera z kodowania znaków '%s' do '%s'"
-#: libsvn_subr/utf.c:288
+#: ../libsvn_subr/utf.c:288
#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Nie można stworzyć konwertera znaków z kodowania znaków '%i' do '%i'"
-#: libsvn_subr/utf.c:522
+#: ../libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr ""
"Nie można dokonać konwersji ciągu znaków z natywnego kodowania do '%s':"
-#: libsvn_subr/utf.c:526
+#: ../libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr ""
"Nie można dokonać konwersji ciągu znaków z '%s' do natywnego kodowania:"
-#: libsvn_subr/utf.c:530
+#: ../libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Nie można dokonać konwersji ciągu znaków z '%s' do '%s'"
-#: libsvn_subr/utf.c:536
+#: ../libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Nie można dokonać konwersji ciągu znaków z CCSID '%i' do CCSID '%i'"
-#: libsvn_subr/utf.c:581
+#: ../libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4890,7 +4917,7 @@
"Bezpieczne dane '%s' następują przed znakiem nie-ASCII %d: nie można "
"przeprowadzić konwersji do/z UTF-8"
-#: libsvn_subr/utf.c:589
+#: ../libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4898,7 +4925,7 @@
"Wykryto znak nie-ASCII o kodzie %d, nie można przeprowadzić konwersji do/z "
"UTF-8"
-#: libsvn_subr/utf.c:631
+#: ../libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4911,54 +4938,54 @@
"poprzedzające nieprawidłową sekwencję znaków UTF-8\n"
"(hex:%s)"
-#: libsvn_subr/validate.c:48
+#: ../libsvn_subr/validate.c:48
#, c-format
msgid "MIME type '%s' has empty media type"
msgstr "Typ MIME '%s' zawiera pusty typ mediów"
-#: libsvn_subr/validate.c:53
+#: ../libsvn_subr/validate.c:53
#, c-format
msgid "MIME type '%s' does not contain '/'"
msgstr "Typ MIME '%s' nie zawiera '/'"
-#: libsvn_subr/validate.c:58
+#: ../libsvn_subr/validate.c:58
#, c-format
msgid "MIME type '%s' ends with non-alphanumeric character"
msgstr "Typ MIME '%s' nie kończy się znakiem alfanumerycznym"
-#: 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 "Konflikt wersji w '%s': znaleziona %d.%d.%d%s, oczekiwana %d.%d.%d%s\""
-#: libsvn_subr/xml.c:400
+#: ../libsvn_subr/xml.c:400
#, c-format
msgid "Malformed XML: %s at line %d"
msgstr "Uszkodzony XML: %s w linii %d"
-#: libsvn_wc/adm_crawler.c:678
+#: ../libsvn_wc/adm_crawler.c:678
msgid "Error aborting report"
msgstr "Błąd w trakcie przerywania generowania raportu"
-#: libsvn_wc/adm_crawler.c:1103
+#: ../libsvn_wc/adm_crawler.c:1103
#, c-format
msgid "While preparing '%s' for commit"
msgstr "Podczas przygotowywania '%s' do zatwierdzenia"
-#: 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' nie jest poprawną nazwą katalogu administracyjnego"
-#: libsvn_wc/adm_files.c:260
+#: ../libsvn_wc/adm_files.c:260
msgid "Bad type indicator"
msgstr "Niepoprawny znacznik typu"
-#: libsvn_wc/adm_files.c:493
+#: ../libsvn_wc/adm_files.c:493
msgid "APR_APPEND not supported for adm files"
msgstr "APR_APPEND nie jest obsługiwane dla plików administracyjnych"
-#: libsvn_wc/adm_files.c:536
+#: ../libsvn_wc/adm_files.c:536
msgid ""
"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
"again"
@@ -4966,46 +4993,47 @@
"Katalog .svn/tmp nie istnieje lub jest uszkodzony, uruchom 'svn cleanup'\n"
"i spróbuj ponownie"
-#: libsvn_wc/adm_files.c:705 libsvn_wc/lock.c:602 libsvn_wc/lock.c:868
+#: ../libsvn_wc/adm_files.c:705 ../libsvn_wc/lock.c:602
+#: ../libsvn_wc/lock.c:868
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' nie jest kopią roboczą"
-#: libsvn_wc/adm_files.c:712 libsvn_wc/adm_files.c:779
+#: ../libsvn_wc/adm_files.c:712 ../libsvn_wc/adm_files.c:779
msgid "No such thing as 'base' working copy properties!"
msgstr "Nie ma czegoś takiego jak 'bazowe' atrybuty kopii roboczej"
-#: libsvn_wc/adm_files.c:868
+#: ../libsvn_wc/adm_files.c:868
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Wersja %ld nie odpowiada istniejącej wersji %ld w '%s'"
-#: libsvn_wc/adm_files.c:876
+#: ../libsvn_wc/adm_files.c:876
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s' nie zgadza się z istniejącym URL '%s' w '%s'"
-#: libsvn_wc/adm_ops.c:277
+#: ../libsvn_wc/adm_ops.c:277
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Nieznany rodzaj obiektu: '%s'"
-#: libsvn_wc/adm_ops.c:1041 libsvn_wc/adm_ops.c:1406
+#: ../libsvn_wc/adm_ops.c:1041 ../libsvn_wc/adm_ops.c:1406
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Nieobsługiwany rodzaj obiektu dla ścieżki '%s'"
-#: libsvn_wc/adm_ops.c:1402
+#: ../libsvn_wc/adm_ops.c:1402
#, c-format
msgid "'%s' not found"
msgstr "Nie znaleziono '%s'"
-#: libsvn_wc/adm_ops.c:1436
+#: ../libsvn_wc/adm_ops.c:1436
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' już podlega zarządzaniu wersjami"
-#: libsvn_wc/adm_ops.c:1448
+#: ../libsvn_wc/adm_ops.c:1448
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -5014,45 +5042,45 @@
"Zastąpienie '%s' przez obiekt innego rodzaju nie jest możliwe.Usunięcie musi "
"być zatwierdzone i kopia robocza zaktualizowana przed dodaniem '%s'"
-#: libsvn_wc/adm_ops.c:1465
+#: ../libsvn_wc/adm_ops.c:1465
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr ""
"W trakcie dodawania '%s' nie znaleziono informacji o katalogu nadrzędnym"
-#: libsvn_wc/adm_ops.c:1470
+#: ../libsvn_wc/adm_ops.c:1470
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "Nie można dodać '%s' - katalog nadrzędny ma zostać skasowany"
-#: libsvn_wc/adm_ops.c:1486
+#: ../libsvn_wc/adm_ops.c:1486
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr ""
"URL '%s' zawiera katalog główny repozytorium inny niż jego katalog nadrzędny"
-#: libsvn_wc/adm_ops.c:1816
+#: ../libsvn_wc/adm_ops.c:1816
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Błąd podczas przywracania zawartości '%s'"
-#: libsvn_wc/adm_ops.c:1980
+#: ../libsvn_wc/adm_ops.c:1980
msgid "Cannot revert"
msgstr "Nie można wycofać zmian"
-#: libsvn_wc/adm_ops.c:2007
+#: ../libsvn_wc/adm_ops.c:2007
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Nie można wycofać zmian w '%s': nieobsługiwany rodzaj obiektu wpisu"
-#: libsvn_wc/adm_ops.c:2018
+#: ../libsvn_wc/adm_ops.c:2018
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"Nie można wycofać zmian w '%s': nieobsługiwany rodzaj obiektu w kopii "
"roboczej"
-#: libsvn_wc/adm_ops.c:2065
+#: ../libsvn_wc/adm_ops.c:2065
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -5060,51 +5088,51 @@
"Nie można wycofać operacji dodania bieżącego katalogu, spróbuj ponownie "
"wykonać to polecenie, znajdując się w katalogu nadrzędnym"
-#: libsvn_wc/adm_ops.c:2093
+#: ../libsvn_wc/adm_ops.c:2093
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Nieznany lub niespodziewany rodzaj obiektu dla ścieżki '%s'"
-#: libsvn_wc/adm_ops.c:2315
+#: ../libsvn_wc/adm_ops.c:2315
#, c-format
msgid "File '%s' has local modifications"
msgstr "Plik '%s' zawiera lokalne zmiany"
-#: libsvn_wc/adm_ops.c:2597
+#: ../libsvn_wc/adm_ops.c:2597
msgid "Invalid 'conflict_result' argument"
msgstr "Błądny argument 'conflict_result'"
-#: libsvn_wc/adm_ops.c:2937
+#: ../libsvn_wc/adm_ops.c:2937
#, c-format
msgid "'%s' is a directory, and thus cannot be a member of a changelist"
msgstr "%s' jest katalogiem i dlatego nie może być członkiem listy zmian"
-#: libsvn_wc/adm_ops.c:2959
+#: ../libsvn_wc/adm_ops.c:2959
#, c-format
msgid "'%s' is not currently a member of changelist '%s'."
msgstr "'%s' nie jest obecnie członkiem listy zmian '%s'."
-#: libsvn_wc/adm_ops.c:2981
+#: ../libsvn_wc/adm_ops.c:2981
#, c-format
msgid "Removing '%s' from changelist '%s'."
msgstr "Usuwanie '%s' z listy zmian '%s'."
-#: libsvn_wc/copy.c:197
+#: ../libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Błąd podczas rekurencyjnego kopiowania '%s'"
-#: libsvn_wc/copy.c:403
+#: ../libsvn_wc/copy.c:403
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' już istnieje i znajduje się w wskazanym miejscu"
-#: libsvn_wc/copy.c:415
+#: ../libsvn_wc/copy.c:415
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Już istnieje podlegający zarządzaniu wersjami element '%s'"
-#: libsvn_wc/copy.c:430 libsvn_wc/copy.c:692
+#: ../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 "
@@ -5114,113 +5142,113 @@
"repozytorium; zatwierdź transakcję dodającą go do repozytorium i spróbuj "
"ponownie"
-#: libsvn_wc/copy.c:799
+#: ../libsvn_wc/copy.c:799
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"Nie można skopiować obiektu do '%s', gdyż nie pochodzi on z repozytorium '%"
"s', ale z repozytorium '%s'"
-#: libsvn_wc/copy.c:806
+#: ../libsvn_wc/copy.c:806
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr ""
"Nie można kopiować do '%s', ponieważ zlecono wcześniej skasowanie obiektu"
-#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:368 libsvn_wc/entries.c:604
-#: libsvn_wc/entries.c:865
+#: ../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 "Obiekt '%s' ma niepoprawną wartość '%s'"
-#: libsvn_wc/entries.c:114
+#: ../libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Niewłaściwa sekwencja ucieczki"
-#: libsvn_wc/entries.c:121
+#: ../libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Niewłaściwy znak poprzedzany przez znak ucieczki"
-#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:210
-#: libsvn_wc/entries.c:222
+#: ../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 "Nieoczekiwany koniec wpisu"
-#: libsvn_wc/entries.c:192
+#: ../libsvn_wc/entries.c:192
#, c-format
msgid "Entry contains non-canonical path '%s'"
msgstr "Wpis zawiera niekanoniczną ścieżkę '%s'"
-#: libsvn_wc/entries.c:244
+#: ../libsvn_wc/entries.c:244
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Niewłaściwa wartość dla pola '%s'"
-#: libsvn_wc/entries.c:326 libsvn_wc/entries.c:579
+#: ../libsvn_wc/entries.c:326 ../libsvn_wc/entries.c:579
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Obiekt '%s' ma nieprawidłowy rodzaj"
-#: libsvn_wc/entries.c:347 libsvn_wc/entries.c:556
+#: ../libsvn_wc/entries.c:347 ../libsvn_wc/entries.c:556
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Obiekt '%s' zawiera nieprawidłowy katalog główny repozytorium"
-#: libsvn_wc/entries.c:1011
+#: ../libsvn_wc/entries.c:1011
#, c-format
msgid "XML parser failed in '%s'"
msgstr "Błąd parsera XML w '%s'"
-#: libsvn_wc/entries.c:1070
+#: ../libsvn_wc/entries.c:1070
msgid "Missing default entry"
msgstr "Brak domyślnej wartości"
-#: libsvn_wc/entries.c:1075
+#: ../libsvn_wc/entries.c:1075
msgid "Default entry has no revision number"
msgstr "Domyślna wartość nie ma numeru wersji"
-#: libsvn_wc/entries.c:1080
+#: ../libsvn_wc/entries.c:1080
msgid "Default entry is missing URL"
msgstr "Domyślna wartość nie ma URL-u"
-#: libsvn_wc/entries.c:1156
+#: ../libsvn_wc/entries.c:1156
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Błędna linia wersji w pliku entries dla '%s'"
-#: libsvn_wc/entries.c:1173
+#: ../libsvn_wc/entries.c:1173
msgid "Missing entry terminator"
msgstr "Brak terminatora wpisu"
-#: libsvn_wc/entries.c:1176
+#: ../libsvn_wc/entries.c:1176
msgid "Invalid entry terminator"
msgstr "Błędny terminator wpisu"
-#: libsvn_wc/entries.c:1180
+#: ../libsvn_wc/entries.c:1180
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Błąd we wpisie %d w pliku entries dla '%s':"
-#: libsvn_wc/entries.c:1303
+#: ../libsvn_wc/entries.c:1303
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Uszkodzona kopia robocza: obiekt '%s' nie ma domyślnego elementu"
-#: libsvn_wc/entries.c:1320
+#: ../libsvn_wc/entries.c:1320
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr ""
"Uszkodzona kopia robocza: katalog '%s' ma niepoprawne operacje oczekujące na "
"zatwierdzenie"
-#: libsvn_wc/entries.c:1354
+#: ../libsvn_wc/entries.c:1354
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Uszkodzona kopia robocza: '%s' w katalogu '%s' ma niepoprawne operacje "
"oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:1363
+#: ../libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5229,7 +5257,7 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekującym na dodanie do "
"repozytorium) nie jest zarejestrowany do dodania"
-#: libsvn_wc/entries.c:1371
+#: ../libsvn_wc/entries.c:1371
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5238,7 +5266,7 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekującym na skasowanie) "
"nie jest zarejestrowany do skasowania"
-#: libsvn_wc/entries.c:1379
+#: ../libsvn_wc/entries.c:1379
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5247,17 +5275,17 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekuje na zastąpienie) ma "
"niepoprawne operacje oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:2026
+#: ../libsvn_wc/entries.c:2026
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Brak domyślnego wpisu w katalogu '%s'"
-#: libsvn_wc/entries.c:2081
+#: ../libsvn_wc/entries.c:2081
#, c-format
msgid "Error writing to '%s'"
msgstr "Błąd zapisu do '%s'"
-#: libsvn_wc/entries.c:2410
+#: ../libsvn_wc/entries.c:2410
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -5266,7 +5294,7 @@
"Nie można dodać '%s' do kasowanego katalogu, spróbuj cofnąć kasowanie "
"katalogu nadrzędnego"
-#: libsvn_wc/entries.c:2416
+#: ../libsvn_wc/entries.c:2416
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -5275,109 +5303,109 @@
"Nie można zastąpić '%s' w kasowanym katalogu, spróbuj cofnąć kasowanie "
"katalogu nadrzędnego"
-#: libsvn_wc/entries.c:2425
+#: ../libsvn_wc/entries.c:2425
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr ""
"'%s' jest oznaczony jako nieobecny, więc nie może zostać zlecone jego "
"skasowanie"
-#: libsvn_wc/entries.c:2454
+#: ../libsvn_wc/entries.c:2454
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "Obiekt '%s' już podlega zarządzaniu wersjami"
-#: libsvn_wc/entries.c:2551
+#: ../libsvn_wc/entries.c:2551
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "Obiekt '%s' ma niepoprawne operacje oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:2697
+#: ../libsvn_wc/entries.c:2697
#, c-format
msgid "No such entry: '%s'"
msgstr "Nie ma takiego obiektu: '%s'"
-#: libsvn_wc/entries.c:2831
+#: ../libsvn_wc/entries.c:2831
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Błąd zapisu pliku entries dla '%s'"
-#: libsvn_wc/entries.c:2874
+#: ../libsvn_wc/entries.c:2874
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Katalog '%s' nie zawiera elementu THIS_DIR"
-#: libsvn_wc/entries.c:3021
+#: ../libsvn_wc/entries.c:3021
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' ma nierozpoznany rodzaj"
-#: libsvn_wc/entries.c:3058
+#: ../libsvn_wc/entries.c:3058
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Nieoczekiwanie znaleziono '%s': ścieżka jest oznaczona jako brakująca"
-#: libsvn_wc/lock.c:366 libsvn_wc/lock.c:572
+#: ../libsvn_wc/lock.c:366 ../libsvn_wc/lock.c:572
#, c-format
msgid "Working copy '%s' locked"
msgstr "Kopia robocza '%s' jest zablokowana"
-#: libsvn_wc/lock.c:491
+#: ../libsvn_wc/lock.c:491
#, c-format
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "Ścieżka '%s' kończy się '%s', co jest nieobsługiwane dla tej operacji"
-#: libsvn_wc/lock.c:940 libsvn_wc/lock.c:979
+#: ../libsvn_wc/lock.c:940 ../libsvn_wc/lock.c:979
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "Nie zdołano sprawdzić istnienia ścieżki dla '%s'"
-#: libsvn_wc/lock.c:950
+#: ../libsvn_wc/lock.c:950
#, c-format
msgid "Expected '%s' to be a directory but found a file"
msgstr "'%s' jest plikiem, a oczekiwano katalogu"
-#: libsvn_wc/lock.c:962
+#: ../libsvn_wc/lock.c:962
#, c-format
msgid "Expected '%s' to be a file but found a directory"
msgstr "'%s' jest katalogiem, a oczekiwano pliku"
-#: libsvn_wc/lock.c:986
+#: ../libsvn_wc/lock.c:986
#, c-format
msgid "Directory '%s' is missing"
msgstr "Brak katalogu '%s'"
-#: libsvn_wc/lock.c:996
+#: ../libsvn_wc/lock.c:996
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
msgstr "Brak katalogu '%s' zawierającego obszar administracyjny kopii roboczej"
-#: libsvn_wc/lock.c:1001
+#: ../libsvn_wc/lock.c:1001
#, c-format
msgid "Unable to lock '%s'"
msgstr "Nie udało się zablokować '%s'"
-#: libsvn_wc/lock.c:1006
+#: ../libsvn_wc/lock.c:1006
#, c-format
msgid "Working copy '%s' is not locked"
msgstr "Kopia robocza '%s' nie jest zablokowana"
-#: libsvn_wc/lock.c:1422
+#: ../libsvn_wc/lock.c:1422
#, c-format
msgid "Write-lock stolen in '%s'"
msgstr "Blokada zapisu w '%s' została przejęta"
-#: libsvn_wc/lock.c:1430
+#: ../libsvn_wc/lock.c:1430
#, c-format
msgid "No write-lock in '%s'"
msgstr "Brak blokady zapisu w '%s'"
-#: libsvn_wc/lock.c:1452
+#: ../libsvn_wc/lock.c:1452
#, c-format
msgid "Lock file '%s' is not a regular file"
msgstr "Plik blokady '%s' nie jest plikiem zwykłym"
-#: libsvn_wc/log.c:356
+#: ../libsvn_wc/log.c:356
msgid "Can't move source to dest"
msgstr "Przeniesienie nie udało się"
@@ -5385,164 +5413,164 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:519
+#: ../libsvn_wc/log.c:519
#, c-format
msgid "In directory '%s'"
msgstr "W katalogu '%s'"
-#: libsvn_wc/log.c:544
+#: ../libsvn_wc/log.c:544
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Brak 'lewego' atrybutu w '%s'"
-#: libsvn_wc/log.c:551
+#: ../libsvn_wc/log.c:551
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Brak 'prawego' atrybutu w '%s'"
-#: libsvn_wc/log.c:619
+#: ../libsvn_wc/log.c:619
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Brak atrybutu 'cel' w '%s'"
-#: libsvn_wc/log.c:700
+#: ../libsvn_wc/log.c:700
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Brak atrybutu 'timestamp' w '%s'"
-#: libsvn_wc/log.c:796 libsvn_wc/props.c:507
+#: ../libsvn_wc/log.c:796 ../libsvn_wc/props.c:507
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Błąd uzyskiwania czasu modyfikacji '%s'"
-#: libsvn_wc/log.c:844
+#: ../libsvn_wc/log.c:844
#, c-format
msgid "Error getting file size on '%s'"
msgstr "Błąd uzyskiwania rozmiaru pliku '%s'"
-#: libsvn_wc/log.c:862
+#: ../libsvn_wc/log.c:862
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Błąd przy modyfikacji informacji o '%s'"
-#: libsvn_wc/log.c:888
+#: ../libsvn_wc/log.c:888
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Błąd podczas usuwania blokady dla '%s'"
-#: libsvn_wc/log.c:911
+#: ../libsvn_wc/log.c:911
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Błąd podczas usuwania listy zmian z wpisu '%s'"
-#: libsvn_wc/log.c:1084
+#: ../libsvn_wc/log.c:1084
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Brak atrybutu 'revision' dla '%s'"
-#: libsvn_wc/log.c:1108
+#: ../libsvn_wc/log.c:1108
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Polecenie log dla katalogu '%s' jest niepoprawnie umieszczone"
-#: libsvn_wc/log.c:1276
+#: ../libsvn_wc/log.c:1276
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Błąd zastępowania wersji bazowej '%s'"
-#: libsvn_wc/log.c:1281
+#: ../libsvn_wc/log.c:1281
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Błąd uzyskiwania czasu modyfikacji '%s'"
-#: libsvn_wc/log.c:1304
+#: ../libsvn_wc/log.c:1304
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Błąd uzyskiwania czasu modyfikacji dla '%s'"
-#: libsvn_wc/log.c:1324
+#: ../libsvn_wc/log.c:1324
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Błąd porównywania '%s' i '%s'"
-#: libsvn_wc/log.c:1373 libsvn_wc/log.c:1422
+#: ../libsvn_wc/log.c:1373 ../libsvn_wc/log.c:1422
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Błąd modyfikacji wpisu '%s'"
-#: libsvn_wc/log.c:1477
+#: ../libsvn_wc/log.c:1477
msgid "Invalid 'format' attribute"
msgstr "Błędny atrybut 'format'"
-#: libsvn_wc/log.c:1512
+#: ../libsvn_wc/log.c:1512
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Zapis w logu nie zawiera atrybutu 'name' (element '%s' w katalogu '%s')"
-#: libsvn_wc/log.c:1583
+#: ../libsvn_wc/log.c:1583
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Nierozpoznany element '%s' w logu '%s'"
-#: libsvn_wc/log.c:1594
+#: ../libsvn_wc/log.c:1594
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Błąd podczas wykonywania polecenia '%s' w '%s'"
-#: libsvn_wc/log.c:1776
+#: ../libsvn_wc/log.c:1776
msgid "Couldn't open log"
msgstr "Błąd otwarcia logu"
-#: libsvn_wc/log.c:1787
+#: ../libsvn_wc/log.c:1787
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Błąd odczytu logu administracyjnego '%s'"
-#: libsvn_wc/log.c:2440
+#: ../libsvn_wc/log.c:2440
#, c-format
msgid "Error writing log for '%s'"
msgstr "Błąd zapisu logu dla '%s'"
-#: libsvn_wc/log.c:2489
+#: ../libsvn_wc/log.c:2489
#, c-format
msgid "'%s' is not a working copy directory"
msgstr "'%s' nie jest katalogiem kopii roboczej"
-#: libsvn_wc/merge.c:430
+#: ../libsvn_wc/merge.c:430 ../libsvn_wc/merge.c:675
msgid "Conflict callback violated API: returned no results"
msgstr "Konfliktowe wywołanie zwrotne naruszyło API: nie zwróciło wyników"
-#: libsvn_wc/merge.c:726
+#: ../libsvn_wc/merge.c:722
msgid "Conflict callback violated API: returned no merged file"
msgstr ""
"Konfliktowe wywołanie zwrotne naruszyło API: nie zwróciło połączonego pliku"
-#: libsvn_wc/props.c:111
+#: ../libsvn_wc/props.c:111
#, c-format
msgid "Can't parse '%s'"
msgstr "Nie można parsować '%s'"
-#: libsvn_wc/props.c:142
+#: ../libsvn_wc/props.c:142
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "Nie można zapisać mieszanki atrybutów do '%s'"
-#: libsvn_wc/props.c:583
+#: ../libsvn_wc/props.c:583
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Brak znaku końca linii w pliku wcprops dla '%s'"
-#: libsvn_wc/props.c:1399
+#: ../libsvn_wc/props.c:1399
msgid "Conflict callback violated API: returned no results."
msgstr "Konfliktowe wywołanie zwrotne naruszyło API: nie zwróciło wyników."
-#: libsvn_wc/props.c:1434
+#: ../libsvn_wc/props.c:1434
msgid "Conflict callback violated API: returned no merged file."
msgstr ""
"Konfliktowe wywołanie zwrotne naruszyło API: nie zwróciło połączonego pliku."
-#: libsvn_wc/props.c:1528
+#: ../libsvn_wc/props.c:1528
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5551,7 +5579,7 @@
"Nie można dodać nowego atrybutu '%s' o wartości '%s',\n"
"ponieważ ten atrybut już istnieje i ma wartość '%s'."
-#: libsvn_wc/props.c:1543
+#: ../libsvn_wc/props.c:1543
#, c-format
msgid ""
"Trying to create property '%s' with value '%s',\n"
@@ -5560,7 +5588,7 @@
"Nie można utworzyć atrybutu '%s' o wartości '%s',\n"
"ponieważ on został lokalnie usunięty."
-#: libsvn_wc/props.c:1617
+#: ../libsvn_wc/props.c:1617
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5569,7 +5597,7 @@
"Nie można usunąć atrybutu '%s' o wartości '%s',\n"
"ponieważ został on zmieniony z '%s' do '%s'."
-#: libsvn_wc/props.c:1638
+#: ../libsvn_wc/props.c:1638
#, c-format
msgid ""
"Trying to delete property '%s' with value '%s'\n"
@@ -5578,7 +5606,7 @@
"Nie można usunąć atrybutu '%s' o wartości '%s',\n"
"ponieważ lokalna wartość jest '%s'."
-#: libsvn_wc/props.c:1725
+#: ../libsvn_wc/props.c:1725
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5587,7 +5615,7 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ został on lokalnie zmieniony z '%s' do '%s'."
-#: libsvn_wc/props.c:1733
+#: ../libsvn_wc/props.c:1733
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5596,7 +5624,7 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ został on lokalnie dodany z wartością '%s'."
-#: libsvn_wc/props.c:1754
+#: ../libsvn_wc/props.c:1754
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5605,7 +5633,7 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ został on lokalnie usunięty."
-#: libsvn_wc/props.c:1788
+#: ../libsvn_wc/props.c:1788
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5614,7 +5642,7 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ ten atrybut nie istnieje."
-#: libsvn_wc/props.c:1826
+#: ../libsvn_wc/props.c:1826
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5623,47 +5651,47 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ ten atrybut już istnieje z wartością '%s'."
-#: libsvn_wc/props.c:2131 libsvn_wc/props.c:2159 libsvn_wc/props.c:2304
-#: libsvn_wc/props.c:2519
+#: ../libsvn_wc/props.c:2131 ../libsvn_wc/props.c:2159
+#: ../libsvn_wc/props.c:2304 ../libsvn_wc/props.c:2519
msgid "Failed to load properties from disk"
msgstr "Nieudane pobieranie atrybutów z dysku"
-#: libsvn_wc/props.c:2187
+#: ../libsvn_wc/props.c:2187
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Nie można zapisać mieszanki atrybutów dla '%s'"
-#: libsvn_wc/props.c:2299 libsvn_wc/props.c:2463
+#: ../libsvn_wc/props.c:2299 ../libsvn_wc/props.c:2463
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Atrybut '%s' jest atrybutem pliku/katalogu"
-#: libsvn_wc/props.c:2343
+#: ../libsvn_wc/props.c:2343
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Nie można ustawić '%s' dla katalogu ('%s')"
-#: libsvn_wc/props.c:2351
+#: ../libsvn_wc/props.c:2351
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Nie można ustawić '%s' dla pliku ('%s')"
-#: libsvn_wc/props.c:2357
+#: ../libsvn_wc/props.c:2357
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' nie jest plikiem ani katalogiem"
-#: libsvn_wc/props.c:2438
+#: ../libsvn_wc/props.c:2438
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Plik '%s' ma binarny typ MIME"
-#: libsvn_wc/props.c:3197 libsvn_wc/props.c:3264
+#: ../libsvn_wc/props.c:3197 ../libsvn_wc/props.c:3264
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Błąd podczas parsowania atrybutu %s dla '%s': '%s'"
-#: libsvn_wc/props.c:3314
+#: ../libsvn_wc/props.c:3314
#, c-format
msgid ""
"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
@@ -5671,7 +5699,7 @@
"Błędny atrybut %s dla '%s': cel '%s' jest ścieżką bezwględną albo "
"wykorzystuje '..'"
-#: libsvn_wc/questions.c:122
+#: ../libsvn_wc/questions.c:122
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5680,7 +5708,7 @@
"Format kopii roboczej '%s' jest zbyt stary (%d); pobierz kopię roboczą "
"ponownie"
-#: libsvn_wc/questions.c:133
+#: ../libsvn_wc/questions.c:133
#, c-format
msgid ""
"This client is too old to work with working copy '%s'. You need\n"
@@ -5694,7 +5722,7 @@
"Zobacz szczegóły na stronie:\n"
"http://subversion.tigris.org/faq.html#working-copy-format-change"
-#: libsvn_wc/questions.c:344
+#: ../libsvn_wc/questions.c:344
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5705,26 +5733,26 @@
" oczekiwano: %s\n"
" znaleziono: %s\n"
-#: libsvn_wc/relocate.c:78
+#: ../libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "Polecenie relocate może tylko zmienić repozytorialną część URL-u"
-#: libsvn_wc/update_editor.c:478
+#: ../libsvn_wc/update_editor.c:482
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Brak elementu '.' w: '%s'"
-#: libsvn_wc/update_editor.c:975
+#: ../libsvn_wc/update_editor.c:979
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Ścieżka '%s' nie jest w kopii roboczej"
-#: libsvn_wc/update_editor.c:1087
+#: ../libsvn_wc/update_editor.c:1091
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Nie można skasować lokalnie zmodyfikowanego katalogu '%s'"
-#: libsvn_wc/update_editor.c:1259
+#: ../libsvn_wc/update_editor.c:1263
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -5733,7 +5761,7 @@
"Błąd dodawania katalogu '%s': niekatalogowy obiekt o tej samej nazwie już "
"istnieje"
-#: libsvn_wc/update_editor.c:1292
+#: ../libsvn_wc/update_editor.c:1296
#, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5742,7 +5770,7 @@
"Błąd dodawania katalogu '%s': niewersjonowany katalog o tej samej nazwie już "
"istnieje"
-#: libsvn_wc/update_editor.c:1314
+#: ../libsvn_wc/update_editor.c:1318
#, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5751,7 +5779,7 @@
"Błąd dodawania katalogu '%s': wersjonowany katalog o tej samej nazwie już "
"istnieje"
-#: libsvn_wc/update_editor.c:1325
+#: ../libsvn_wc/update_editor.c:1329
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5760,17 +5788,17 @@
"Błąd dodawania katalogu '%s': obiekt o tej samej nazwie jak katalog "
"administracyjny"
-#: libsvn_wc/update_editor.c:1339
+#: ../libsvn_wc/update_editor.c:1343
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
"Błąd dodawania katalogu '%s': argumenty copyfrom nie są jeszcze obsługiwane"
-#: libsvn_wc/update_editor.c:1630
+#: ../libsvn_wc/update_editor.c:1637
msgid "Couldn't do property merge"
msgstr "Nie udało się łączenie zmian atrybutu"
-#: libsvn_wc/update_editor.c:1699
+#: ../libsvn_wc/update_editor.c:1710
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5779,11 +5807,11 @@
"Nie udało się oznaczanie '%s' jako brakującego: element o tej samej nazwie "
"oczekuje na dodanie"
-#: libsvn_wc/update_editor.c:1772
+#: ../libsvn_wc/update_editor.c:1783
msgid "Bad copyfrom arguments received"
msgstr "Otrzymano złe argumenty copyfrom"
-#: libsvn_wc/update_editor.c:1811
+#: ../libsvn_wc/update_editor.c:1822
#, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5791,130 +5819,138 @@
msgstr ""
"Błąd dodawania pliku '%s': plik o tej samej nazwie już oczekuje na dodanie"
-#: libsvn_wc/update_editor.c:1823
+#: ../libsvn_wc/update_editor.c:1834
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
msgstr "Błąd dodawania pliku '%s': nieplik o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1838
+#: ../libsvn_wc/update_editor.c:1849
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "Błąd dodawania pliku '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1896
+#: ../libsvn_wc/update_editor.c:1907
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Plik '%s' w katalogu '%s' nie podlega zarządzaniu wersjami"
-#: libsvn_wc/update_editor.c:2043
+#: ../libsvn_wc/update_editor.c:2054
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Błąd sumy kontrolnej dla '%s'; zapisana: '%s', faktyczna: '%s'"
-#: libsvn_wc/update_editor.c:2771
+#: ../libsvn_wc/update_editor.c:2787
msgid "Destination directory of add-with-history is missing a URL"
msgstr "Katalog docelowy add-with-history nie posiada URL-u"
-#: libsvn_wc/update_editor.c:2786
+#: ../libsvn_wc/update_editor.c:2802
msgid "Destination URLs are broken"
msgstr "Docelowe URL-e są uszkodzone"
-#: libsvn_wc/update_editor.c:3022
+#: ../libsvn_wc/update_editor.c:3038
msgid "No fetch_func supplied to update_editor"
msgstr "fetch_func niedostarczone do update_editor"
-#: libsvn_wc/update_editor.c:3623
+#: ../libsvn_wc/update_editor.c:3652
#, c-format
msgid "'%s' has no ancestry information"
msgstr "Brak informacji o pochodzeniu '%s'"
-#: libsvn_wc/update_editor.c:3777
+#: ../libsvn_wc/update_editor.c:3806
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Źródłowy URL '%s' jest z innego repozytorium niż '%s'"
-#: libsvn_wc/util.c:53
+#: ../libsvn_wc/util.c:53
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' nie jest katalogiem"
-#: libsvn_wc/util.c:85
+#: ../libsvn_wc/util.c:85
msgid "Unable to make any directories"
msgstr "Nieudane tworzenie jakichkolwiek katalogów"
-#: libsvn_wc/util.c:281
+#: ../libsvn_wc/util.c:281
#, c-format
msgid "Cannot find a URL for '%s'"
msgstr "Nie można znaleźć URL-u dla '%s'"
-#: svn/blame-cmd.c:247 svn/list-cmd.c:233
+#: ../svn/blame-cmd.c:247 ../svn/list-cmd.c:233
msgid "'verbose' option invalid in XML mode"
msgstr "Opcja 'verbose' nie jest prawidłową opcją dla trybu XML"
-#: svn/blame-cmd.c:259 svn/info-cmd.c:500 svn/list-cmd.c:245
-#: svn/status-cmd.c:273
+#: ../svn/blame-cmd.c:259 ../svn/info-cmd.c:500 ../svn/list-cmd.c:245
+#: ../svn/status-cmd.c:273
msgid "'incremental' option only valid in XML mode"
msgstr "Opcja 'incremental' jest prawidłowa tylko w trybie XML"
-#: svn/blame-cmd.c:322
+#: ../svn/blame-cmd.c:322
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Pomijanie binarnego pliku: '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
+#: ../svn/checkout-cmd.c:129 ../svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' nie wygląda na URL"
-#: svn/conflict-callbacks.c:134
+#: ../svn/conflict-callbacks.c:134
msgid "No editor found."
msgstr "Nie znaleziono edytora."
-#: svn/conflict-callbacks.c:141
+#: ../svn/conflict-callbacks.c:141
msgid "Error running editor."
msgstr "Błąd podczas uruchamiania edytora."
-#: svn/conflict-callbacks.c:151
+#: ../svn/conflict-callbacks.c:151
#, c-format
msgid ""
"Invalid option; there's no merged version to edit.\n"
"\n"
msgstr "Niepoprawna opcja. Nie ma połączonej wersji do edytowania.\n"
-#: svn/conflict-callbacks.c:173
+#: ../svn/conflict-callbacks.c:173
msgid "No merge tool found.\n"
msgstr "Nie znaleziono narzędzia łączenia zmian.\n"
-#: svn/conflict-callbacks.c:180
+#: ../svn/conflict-callbacks.c:180
msgid "Error running merge tool."
msgstr "Błąd podczas uruchamiania narzędzia łączenia zmian."
-#: svn/conflict-callbacks.c:240
+#: ../svn/conflict-callbacks.c:240
msgid "No editor found, leaving all conflicts."
msgstr "Nie znaleziono edytora. Pozostawiono wszystkie konflikty."
-#: svn/conflict-callbacks.c:249
+#: ../svn/conflict-callbacks.c:249
msgid "Error running editor, leaving all conflicts."
msgstr "Błąd podczas uruchamiania edytora. Pozostawiono wszystkie konflikty."
-#: svn/conflict-callbacks.c:301
+#: ../svn/conflict-callbacks.c:281
+msgid "No merge tool found, leaving all conflicts."
+msgstr "Nie znaleziono narzędzia łączenia zmian. Pozostawiono wszystkie konflikty."
+
+#: ../svn/conflict-callbacks.c:290
+msgid "Error running merge tool leaving all conflicts."
+msgstr "Błąd podczas uruchamiania narzędzia łączenia zmian. Pozostawiono wszystkie konflikty."
+
+#: ../svn/conflict-callbacks.c:326
#, c-format
msgid "Conflict discovered in '%s'.\n"
msgstr "Odkryto konflikt w '%s'.\n"
-#: svn/conflict-callbacks.c:306
+#: ../svn/conflict-callbacks.c:331
#, c-format
msgid "Conflict for property '%s' discovered on '%s'.\n"
msgstr "Konflikt atrybutu dla '%s' odkryty na '%s'.\n"
-#: svn/conflict-callbacks.c:323
+#: ../svn/conflict-callbacks.c:348
#, c-format
msgid ""
"They want to delete the property, you want to change the value to '%s'.\n"
msgstr "Oni chcą usunąć atrybut, a ty chcesz zmienić jego wartość na '%s'.\n"
-#: svn/conflict-callbacks.c:332
+#: ../svn/conflict-callbacks.c:357
#, c-format
msgid ""
"They want to change the property value to '%s', you want to delete the "
@@ -5922,27 +5958,27 @@
msgstr ""
"Oni chcą zmienić wartości atrybutu na '%s', a ty chcesz usunąć ten atrybut.\n"
-#: svn/conflict-callbacks.c:354
+#: ../svn/conflict-callbacks.c:379
msgid "Select: (p)ostpone"
msgstr "Wybierz: odłóż (p)"
-#: svn/conflict-callbacks.c:356
+#: ../svn/conflict-callbacks.c:381
msgid ", (d)iff, (e)dit"
msgstr ", pokaż różnice (d), zmień (e)"
-#: svn/conflict-callbacks.c:359
+#: ../svn/conflict-callbacks.c:384
msgid ", (m)ine, (t)heirs"
msgstr ", moje (m), ich (t)"
-#: svn/conflict-callbacks.c:362
+#: ../svn/conflict-callbacks.c:387
msgid ", (r)esolved"
msgstr ", oznacz jako rozwiązane (r)"
-#: svn/conflict-callbacks.c:364
+#: ../svn/conflict-callbacks.c:389
msgid ", (h)elp for more options : "
msgstr ", pomoc (h) opisująca więcej opcji: "
-#: svn/conflict-callbacks.c:375
+#: ../svn/conflict-callbacks.c:400
#, c-format
msgid ""
" (p)ostpone - mark the conflict to be resolved later\n"
@@ -5967,14 +6003,14 @@
" pomoc (h) - pokaż tę listę\n"
"\n"
-#: svn/conflict-callbacks.c:405
+#: ../svn/conflict-callbacks.c:430
#, c-format
msgid ""
"Invalid option; there's no merged version to diff.\n"
"\n"
msgstr "Niepoprawna opcja. Nie ma połączonej wersji do obliczenia różnicy.\n"
-#: svn/conflict-callbacks.c:423 svn/conflict-callbacks.c:437
+#: ../svn/conflict-callbacks.c:448 ../svn/conflict-callbacks.c:462
#, c-format
msgid ""
"Invalid option.\n"
@@ -5983,7 +6019,7 @@
"Błędna opcja.\n"
"\n"
-#: svn/conflict-callbacks.c:467
+#: ../svn/conflict-callbacks.c:492
#, c-format
msgid ""
"Conflict discovered when trying to add '%s'.\n"
@@ -5992,11 +6028,11 @@
"Odkryto konflikt podczas próbowania dodawania '%s'.\n"
"Obiekt o tej samej nazwie już istnieje.\n"
-#: svn/conflict-callbacks.c:470
+#: ../svn/conflict-callbacks.c:495
msgid "Select: (p)ostpone, (m)ine, (t)heirs, (h)elp :"
msgstr "Wybierz: odłóż (p), moja wersja (m), ich wersja (t), pomoc (h):"
-#: svn/conflict-callbacks.c:481
+#: ../svn/conflict-callbacks.c:506
#, c-format
msgid ""
" (p)ostpone - resolve the conflict later\n"
@@ -6010,36 +6046,40 @@
" ich wersja (t) - zaakceptuj repozytorialną wersję pliku\n"
" pomoc (h) - pokaż tę listę\n"
-#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:65 svn/move-cmd.c:76
-#: svn/propedit-cmd.c:202
+#: ../svn/copy-cmd.c:125 ../svn/delete-cmd.c:64 ../svn/mkdir-cmd.c:65
+#: ../svn/move-cmd.c:76 ../svn/propedit-cmd.c:202
msgid ""
"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
"Lokalne, niezatwierdzające operacje nie wymagają podawania opisu lub "
"atrybutów wersji"
-#: svn/diff-cmd.c:119 svnserve/main.c:530
+#: ../svn/diff-cmd.c:171 ../svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Błąd otwarcia standardowego wyjścia"
-#: svn/diff-cmd.c:121
+#: ../svn/diff-cmd.c:173
#, c-format
msgid "Can't open stderr"
msgstr "Błąd otwarcia standardowego wyjścia błędów"
-#: svn/diff-cmd.c:210
+#: ../svn/diff-cmd.c:182
+msgid "'--xml' option only valid with '--summarize' option"
+msgstr "Opcja '--xml' jest prawidłowa tylko z opcją '--summarize'"
+
+#: ../svn/diff-cmd.c:279
msgid "'--new' option only valid with '--old' option"
msgstr "Opcja '--new' jest prawidłowa tylko z opcją '--old'"
-#: svn/diff-cmd.c:240
+#: ../svn/diff-cmd.c:309
#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr ""
"Listy plików do porównania nie mogą zawierać jednocześnie ścieżek z kopii "
"roboczej i URL-i"
-#: svn/export-cmd.c:87
+#: ../svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -6047,7 +6087,7 @@
"Docelowy katalog już istnieje; usuń go lub użyj opcję --force, by został "
"nadpisany"
-#: svn/help-cmd.c:45
+#: ../svn/help-cmd.c:45
#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
@@ -6077,7 +6117,7 @@
"\n"
"Dostępne podpolecenia:\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"
@@ -6085,7 +6125,7 @@
"Subversion jest narzędziem zarządzania wersjami.\n"
"Dla dodatkowych informacji zobacz http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: ../svn/help-cmd.c:65 ../svnsync/main.c:1429
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -6093,192 +6133,192 @@
"Są dostępne następujące moduły dostępu do repozytorium (RA):\n"
"\n"
-#: svn/import-cmd.c:82
+#: ../svn/import-cmd.c:82
msgid "Repository URL required when importing"
msgstr "Parametr podający URL repozytorium jest wymagany podczas importowania"
-#: svn/import-cmd.c:86
+#: ../svn/import-cmd.c:86
msgid "Too many arguments to import command"
msgstr "Zbyt dużo argumentów dla polecenia import"
-#: svn/import-cmd.c:101
+#: ../svn/import-cmd.c:101
#, c-format
msgid "Invalid URL '%s'"
msgstr "Niewłaściwy URL '%s'"
-#: svn/info-cmd.c:90
+#: ../svn/info-cmd.c:90
#, c-format
msgid "'%s' has invalid revision"
msgstr "'%s' ma niewłaściwą wersję"
-#: svn/info-cmd.c:239 svn/mergeinfo-cmd.c:111 svnadmin/main.c:1146
+#: ../svn/info-cmd.c:239 ../svn/mergeinfo-cmd.c:111 ../svnadmin/main.c:1146
#, c-format
msgid "Path: %s\n"
msgstr "Ścieżka: %s\n"
-#: svn/info-cmd.c:245 svnlook/main.c:778
+#: ../svn/info-cmd.c:245 ../svnlook/main.c:778
#, c-format
msgid "Name: %s\n"
msgstr "Nazwa: %s\n"
-#: svn/info-cmd.c:249
+#: ../svn/info-cmd.c:249
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:252
+#: ../svn/info-cmd.c:252
#, c-format
msgid "Repository Root: %s\n"
msgstr "Katalog główny repozytorium: %s\n"
-#: svn/info-cmd.c:256
+#: ../svn/info-cmd.c:256
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID repozytorium: %s\n"
-#: svn/info-cmd.c:260
+#: ../svn/info-cmd.c:260
#, c-format
msgid "Revision: %ld\n"
msgstr "Wersja: %ld\n"
-#: svn/info-cmd.c:265
+#: ../svn/info-cmd.c:265
#, c-format
msgid "Node Kind: file\n"
msgstr "Rodzaj obiektu: plik\n"
-#: svn/info-cmd.c:269
+#: ../svn/info-cmd.c:269
#, c-format
msgid "Node Kind: directory\n"
msgstr "Rodzaj obiektu: katalog\n"
-#: svn/info-cmd.c:273
+#: ../svn/info-cmd.c:273
#, c-format
msgid "Node Kind: none\n"
msgstr "Rodzaj obiektu: brak\n"
-#: svn/info-cmd.c:278
+#: ../svn/info-cmd.c:278
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Rodzaj obiektu: nieznany\n"
-#: svn/info-cmd.c:287
+#: ../svn/info-cmd.c:287
#, c-format
msgid "Schedule: normal\n"
msgstr "Zlecenie: normalne\n"
-#: svn/info-cmd.c:291
+#: ../svn/info-cmd.c:291
#, c-format
msgid "Schedule: add\n"
msgstr "Zlecenie: dodaj\n"
-#: svn/info-cmd.c:295
+#: ../svn/info-cmd.c:295
#, c-format
msgid "Schedule: delete\n"
msgstr "Zlecenie: skasuj\n"
-#: svn/info-cmd.c:299
+#: ../svn/info-cmd.c:299
#, c-format
msgid "Schedule: replace\n"
msgstr "Zlecenie: zastąp\n"
-#: svn/info-cmd.c:315
+#: ../svn/info-cmd.c:315
#, c-format
msgid "Depth: empty\n"
msgstr "Głębokość: pusta\n"
-#: svn/info-cmd.c:319
+#: ../svn/info-cmd.c:319
#, c-format
msgid "Depth: files\n"
msgstr "Głębokość: pliki\n"
-#: svn/info-cmd.c:323
+#: ../svn/info-cmd.c:323
#, c-format
msgid "Depth: immediates\n"
msgstr "Głębokość: bezpośrednie\n"
#. Other depths should never happen here.
-#: svn/info-cmd.c:334
+#: ../svn/info-cmd.c:334
#, c-format
msgid "Depth: INVALID\n"
msgstr "Głębokość: NIEWŁAŚCIWA\n"
-#: svn/info-cmd.c:338
+#: ../svn/info-cmd.c:338
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Skopiowane z URL-u: %s\n"
-#: svn/info-cmd.c:342
+#: ../svn/info-cmd.c:342
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Skopiowane z wersji: %ld\n"
-#: svn/info-cmd.c:347
+#: ../svn/info-cmd.c:347
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Autor ostatniej zmiany: %s\n"
-#: svn/info-cmd.c:351
+#: ../svn/info-cmd.c:351
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Ostatnio zmieniona wersja: %ld\n"
-#: svn/info-cmd.c:356
+#: ../svn/info-cmd.c:356
msgid "Last Changed Date"
msgstr "Data ostatniej zmiany"
-#: svn/info-cmd.c:362
+#: ../svn/info-cmd.c:362
msgid "Text Last Updated"
msgstr "Treść ostatnio aktualizowana"
-#: svn/info-cmd.c:366
+#: ../svn/info-cmd.c:366
msgid "Properties Last Updated"
msgstr "Atrybuty ostatnio aktualizowane"
-#: svn/info-cmd.c:369
+#: ../svn/info-cmd.c:369
#, c-format
msgid "Checksum: %s\n"
msgstr "Suma kontrolna: %s\n"
-#: svn/info-cmd.c:374
+#: ../svn/info-cmd.c:374
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Wersja bazowa pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:380
+#: ../svn/info-cmd.c:380
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Wersja robocza pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:385
+#: ../svn/info-cmd.c:385
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr ""
"Wersja bieżąca (repozytorialna) pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:390
+#: ../svn/info-cmd.c:390
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Plik z opisem konfliktu atrybutów: %s\n"
-#: svn/info-cmd.c:398
+#: ../svn/info-cmd.c:398
#, c-format
msgid "Lock Token: %s\n"
msgstr "Żeton blokady: %s\n"
-#: svn/info-cmd.c:402
+#: ../svn/info-cmd.c:402
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Właściciel blokady: %s\n"
-#: svn/info-cmd.c:407
+#: ../svn/info-cmd.c:407
msgid "Lock Created"
msgstr "Blokada została utworzona"
-#: svn/info-cmd.c:411
+#: ../svn/info-cmd.c:411
msgid "Lock Expires"
msgstr "Blokada wygasła"
-#: svn/info-cmd.c:420
+#: ../svn/info-cmd.c:420
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -6287,7 +6327,7 @@
"Opis blokady (%i linii):\n"
"%s\n"
-#: svn/info-cmd.c:421
+#: ../svn/info-cmd.c:421
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -6296,12 +6336,12 @@
"Opis blokady (%i linia):\n"
"%s\n"
-#: svn/info-cmd.c:428
+#: ../svn/info-cmd.c:428
#, c-format
msgid "Changelist: %s\n"
msgstr "Lista zmian: %s\n"
-#: svn/info-cmd.c:536
+#: ../svn/info-cmd.c:536
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -6310,7 +6350,7 @@
"%s: (Obiekt niepodlegający zarządzaniu wersjami)\n"
"\n"
-#: svn/info-cmd.c:545
+#: ../svn/info-cmd.c:545
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -6319,95 +6359,96 @@
"%s: (Niewłaściwy URL)\n"
"\n"
-#: svn/list-cmd.c:90
+#: ../svn/list-cmd.c:90
msgid "%b %d %H:%M"
msgstr "%d.%m %H:%M"
-#: svn/list-cmd.c:95
+#: ../svn/list-cmd.c:95
msgid "%b %d %Y"
msgstr "%d.%m.%Y "
-#: svn/lock-cmd.c:53
+#: ../svn/lock-cmd.c:53
msgid "Lock comment contains a zero byte"
msgstr "Opis dla zakładanej blokady zawiera bajt zerowy"
-#: svn/log-cmd.c:176
+#: ../svn/log-cmd.c:176
msgid "(no author)"
msgstr "(brak autora)"
-#: svn/log-cmd.c:187
+#: ../svn/log-cmd.c:187
msgid "(no date)"
msgstr "(brak daty)"
-#: svn/log-cmd.c:217
+#: ../svn/log-cmd.c:217
#, c-format
msgid "Changed paths:\n"
msgstr "Zmodyfikowane ścieżki:\n"
-#: svn/log-cmd.c:232
+#: ../svn/log-cmd.c:232
#, c-format
msgid " (from %s:%ld)"
msgstr " (z %s:%ld)"
#. Print the result of merge line
-#: svn/log-cmd.c:247
+#: ../svn/log-cmd.c:247
#, c-format
msgid "Result of a merge from:"
msgstr "Wynik połączenia z:"
-#: svn/log-cmd.c:462
+#: ../svn/log-cmd.c:462
msgid "'with-all-revprops' option only valid in XML mode"
msgstr "Opcja 'with-all-revprops' jest prawidłowa tylko w trybie XML"
-#: svn/log-cmd.c:466
+#: ../svn/log-cmd.c:466
msgid "'with-revprop' option only valid in XML mode"
msgstr "Opcja 'with-revprop' jest prawidłowa tylko w trybie XML"
-#: svn/log-cmd.c:482 svn/propset-cmd.c:106
+#: ../svn/log-cmd.c:482 ../svn/propset-cmd.c:106
#, c-format
msgid "no such changelist '%s'"
msgstr "brak takiej listy zmian '%s'"
-#: svn/log-cmd.c:550
+#: ../svn/log-cmd.c:550
msgid "Only relative paths can be specified after a URL"
msgstr "Po podaniu URL-u mogą występować tylko względne ścieżki"
-#: svn/log-cmd.c:590
+#: ../svn/log-cmd.c:590
#, c-format
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "nie można przypisać opcji 'with-revprop' (pomiń '=')"
-#: svn/main.c:60
+#: ../svn/main.c:60
msgid "force operation to run"
msgstr "wymuś wykonanie operacji"
-#: svn/main.c:62
+#: ../svn/main.c:62
msgid "force validity of log message source"
msgstr "wymuś uznanie opisu zmian za poprawny"
-#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:231 svnadmin/main.c:234
-#: svndumpfilter/main.c:774 svndumpfilter/main.c:777 svnlook/main.c:92
-#: svnlook/main.c:104 svnsync/main.c:138 svnsync/main.c:140
+#: ../svn/main.c:63 ../svn/main.c:64 ../svnadmin/main.c:231
+#: ../svnadmin/main.c:234 ../svndumpfilter/main.c:774
+#: ../svndumpfilter/main.c:777 ../svnlook/main.c:92 ../svnlook/main.c:104
+#: ../svnsync/main.c:138 ../svnsync/main.c:140
msgid "show help on a subcommand"
msgstr "wyświetl tekst pomocy dla podpolecenia"
-#: svn/main.c:65
+#: ../svn/main.c:65
msgid "specify log message ARG"
msgstr "podaj argument określający opis zmian"
-#: svn/main.c:66
+#: ../svn/main.c:66
msgid "print nothing, or only summary information"
msgstr "wypisz nic lub tylko podsumowanie"
-#: svn/main.c:67
+#: ../svn/main.c:67
msgid "descend recursively, same as --depth=infinity"
msgstr "schodź rekurencyjnie, to samo, co --depth=infinity"
-#: svn/main.c:68
+#: ../svn/main.c:68
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr "przestarzałe; spróbuj --depth=files lub --depth=immediates"
-#: svn/main.c:70
+#: ../svn/main.c:70
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
@@ -6416,7 +6457,7 @@
" Jeśli ARG jest ujemne, wtedy ta opcja działa "
"jak -r ARG:ARG-1"
-#: svn/main.c:74
+#: ../svn/main.c:74
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -6441,41 +6482,41 @@
"późniejsza niż BASE\n"
" 'PREV' wersja poprzedzająca COMMITTED"
-#: svn/main.c:84
+#: ../svn/main.c:84
msgid "read log message from file ARG"
msgstr "czytaj opis zmian z pliku ARG"
-#: svn/main.c:86
+#: ../svn/main.c:86
msgid "give output suitable for concatenation"
msgstr "generuj wynik w sposób umożliwiający konkatenację"
-#: svn/main.c:89
+#: ../svn/main.c:89
msgid "treat value as being in charset encoding ARG"
msgstr "zakładaj, iż parametry są podane w kodowaniu ARG"
-#: svn/main.c:92 svnadmin/main.c:237 svndumpfilter/main.c:780
-#: svnlook/main.c:134 svnserve/main.c:151 svnsync/main.c:136
-#: svnversion/main.c:126
+#: ../svn/main.c:92 ../svnadmin/main.c:237 ../svndumpfilter/main.c:780
+#: ../svnlook/main.c:134 ../svnserve/main.c:151 ../svnsync/main.c:136
+#: ../svnversion/main.c:126
msgid "show program version information"
msgstr "pokaż informację o wersji programu"
-#: svn/main.c:93
+#: ../svn/main.c:93
msgid "print extra information"
msgstr "podaj dodatkowe informacje"
-#: svn/main.c:94
+#: ../svn/main.c:94
msgid "display update information"
msgstr "podaj informacje o możliwych aktualizacjach"
-#: svn/main.c:96
+#: ../svn/main.c:96
msgid "specify a username ARG"
msgstr "użyj ARG jako nazwy użytkownika"
-#: svn/main.c:98
+#: ../svn/main.c:98
msgid "specify a password ARG"
msgstr "użyj ARG jako hasła"
-#: svn/main.c:101 svnlook/main.c:138
+#: ../svn/main.c:101 ../svnlook/main.c:138
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
" external diff program, ARG is simply passed "
@@ -6515,11 +6556,11 @@
" --ignore-eol-style:\n"
" Ignoruj zmianu w stylu znaku końca linii."
-#: svn/main.c:130
+#: ../svn/main.c:130
msgid "pass contents of file ARG as additional args"
msgstr "potraktuj zawartość pliku ARG jako dodatkowe argumenty"
-#: svn/main.c:132
+#: ../svn/main.c:132
msgid ""
"pass depth ('empty', 'files', 'immediates', or\n"
" 'infinity') as ARG"
@@ -6527,97 +6568,97 @@
"potraktuj głębokość ('empty', 'files',\n"
" 'immediates' lub 'infinity') jako ARG"
-#: svn/main.c:135
+#: ../svn/main.c:135
msgid "output in XML"
msgstr "generuj wynik w formacie XML"
-#: svn/main.c:136
+#: ../svn/main.c:136
msgid "use strict semantics"
msgstr "używaj ścisłej semantyki"
-#: svn/main.c:138
+#: ../svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "prezentuj tylko historię od ostatniego kopiowania"
-#: svn/main.c:140
+#: ../svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr ""
"nie pomijaj plików zwykle ignorowanych (ze względu na domyślne\n"
"ustawienia lub atrybut svn:ignore)"
-#: svn/main.c:142 svnsync/main.c:116
+#: ../svn/main.c:142 ../svnsync/main.c:116
msgid "do not cache authentication tokens"
msgstr "nie zapamiętuj danych uwierzytelniających"
-#: svn/main.c:144 svnsync/main.c:114
+#: ../svn/main.c:144 ../svnsync/main.c:114
msgid "do no interactive prompting"
msgstr "nie zadawaj żadnych interaktywnych pytań"
-#: svn/main.c:146
+#: ../svn/main.c:146
msgid "try operation but make no changes"
msgstr "spróbuj wykonanie operacji, ale nie rób żadnych zmian"
-#: svn/main.c:148 svnlook/main.c:113
+#: ../svn/main.c:148 ../svnlook/main.c:113
msgid "do not print differences for deleted files"
msgstr "nie wypisuj zmian w plikach, które zostały skasowane"
-#: svn/main.c:150
+#: ../svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "uwzględniaj pochodzenie przy wyliczaniu różnic"
-#: svn/main.c:152
+#: ../svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "nie uwzględniaj pochodzenia przy wyliczaniu zmian połączeń"
-#: svn/main.c:154
+#: ../svn/main.c:154
msgid "ignore externals definitions"
msgstr "nie uwzględniaj zewnętrznych definicji"
-#: svn/main.c:157
+#: ../svn/main.c:157
msgid "use ARG as diff command"
msgstr "użyj ARG jako polecenia diff (porównującego)"
-#: svn/main.c:159
+#: ../svn/main.c:159
msgid "use ARG as merge command"
msgstr "użyj ARG jako polecenia merge (łączącego)"
-#: svn/main.c:161
+#: ../svn/main.c:161
msgid "use ARG as external editor"
msgstr "użyj ARG jako polecenia uruchamiającego edytor tekstu"
-#: svn/main.c:164
+#: ../svn/main.c:164
msgid "mark revisions as merged (use with -r)"
msgstr "oznacz wersje jako połączone (do użycia wraz z -r)"
-#: svn/main.c:166
+#: ../svn/main.c:166
msgid "use ARG as the older target"
msgstr "użyj ARG jako starszego obiektu"
-#: svn/main.c:168
+#: ../svn/main.c:168
msgid "use ARG as the newer target"
msgstr "użyj ARG jako nowszego obiektu"
-#: svn/main.c:170
+#: ../svn/main.c:170
msgid "operate on a revision property (use with -r)"
msgstr "działaj na atrybucie wersji (do użycia wraz z -r)"
-#: svn/main.c:172
+#: ../svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "zmień URL repozytorium"
-#: svn/main.c:174 svnadmin/main.c:273 svnsync/main.c:134
+#: ../svn/main.c:174 ../svnadmin/main.c:273 ../svnsync/main.c:134
msgid "read user configuration files from directory ARG"
msgstr "pobierz konfigurację użytkownika z katalogu ARG"
-#: svn/main.c:176
+#: ../svn/main.c:176
msgid "enable automatic properties"
msgstr "używaj automatycznych atrybutów"
-#: svn/main.c:178
+#: ../svn/main.c:178
msgid "disable automatic properties"
msgstr "nie używaj automatycznych atrybutów"
-#: svn/main.c:180
+#: ../svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6628,39 +6669,39 @@
" dla plików z natywnym atrybutem svn:eol-style.\n"
" ARG może być jednym z 'LF', 'CR', 'CRLF'"
-#: svn/main.c:188
+#: ../svn/main.c:188
msgid "maximum number of log entries"
msgstr "maksymalna liczba wspisów log"
-#: svn/main.c:190
+#: ../svn/main.c:190
msgid "don't unlock the targets"
msgstr "nie usuwaj blokad dla obiektów"
-#: svn/main.c:192
+#: ../svn/main.c:192
msgid "show a summary of the results"
msgstr "podkaż podsumowanie wyników"
-#: svn/main.c:194
+#: ../svn/main.c:194
msgid "remove changelist association"
msgstr "usuń stowarzyszenie listy zmian"
-#: svn/main.c:196
+#: ../svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "działaj tylko na członkach listy zmian ARG"
-#: svn/main.c:198
+#: ../svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "nie usuwaj listy zmian po zatwierdzeniu zmian"
-#: svn/main.c:200
+#: ../svn/main.c:200
msgid "keep path in working copy"
msgstr "zostaw ścieżkę w kopii roboczej"
-#: svn/main.c:202
+#: ../svn/main.c:202
msgid "retrieve all revision properties"
msgstr "pobierz wszystkie atrybuty wersji"
-#: svn/main.c:204
+#: ../svn/main.c:204
msgid ""
"set revision property ARG in new revision\n"
" using the name=value format"
@@ -6668,11 +6709,11 @@
"określ atrybut ARG wersji w nowej wersji\n"
" przy użyciu formatu nazwa=wartość"
-#: svn/main.c:208
+#: ../svn/main.c:208
msgid "make intermediate directories"
msgstr "twórz pośrednie katalogi"
-#: svn/main.c:210
+#: ../svn/main.c:210
msgid ""
"use/display additional information from merge\n"
" history"
@@ -6680,7 +6721,7 @@
"używaj/wyświetlaj dodatkowe informacje\n"
" z historii połączeń"
-#: svn/main.c:214
+#: ../svn/main.c:214
msgid ""
"specify automatic conflict resolution action\n"
" ('"
@@ -6688,7 +6729,7 @@
"określ akcję automatycznego rozwiązywania konfliktów\n"
" ('"
-#: svn/main.c:261
+#: ../svn/main.c:261
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6699,11 +6740,11 @@
"następnym zatwierdzaniu.\n"
"Użycie: add ŚCIEŻKA...\n"
-#: svn/main.c:267
+#: ../svn/main.c:267
msgid "add intermediate parents"
msgstr "dodaj pośrednie katalogi nadrzędne"
-#: svn/main.c:270
+#: ../svn/main.c:270
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6720,7 +6761,7 @@
" Argument WERSJA określa, w której wersji OBIEKT będzie najpierw "
"sprawdzany.\n"
-#: svn/main.c:280
+#: ../svn/main.c:280
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6734,7 +6775,7 @@
" Argument WERSJA określa, w której wersji OBIEKT będzie najpierw\n"
"sprawdzany.\n"
-#: svn/main.c:288
+#: ../svn/main.c:288
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
@@ -6744,7 +6785,7 @@
"Użycie: 1. changelist NAZWALZ CEL...\n"
" 2. changelist --remove CEL...\n"
-#: svn/main.c:294
+#: ../svn/main.c:294
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6793,7 +6834,7 @@
" modyfikacje w kopii roboczej. Wszystkie atrybuty z repozytorium są\n"
" zastosowywane do zagradzających ścieżek.\n"
-#: svn/main.c:319
+#: ../svn/main.c:319
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6803,7 +6844,7 @@
"przerwane operacje itp.\n"
"Użycie: cleanup [ŚCIEŻKA...]\n"
-#: svn/main.c:326
+#: ../svn/main.c:326
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6823,7 +6864,7 @@
" polecenia zawiera zablokowane obiekty, to po udanej operacji\n"
" zatwierdzania blokady na tych obiektach będą zdjęte.\n"
-#: svn/main.c:334
+#: ../svn/main.c:334
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6844,7 +6885,7 @@
" polecenia zawiera zablokowane obiekty, to po udanej operacji\n"
" zatwierdzania blokady na tych obiektach będą zdjęte.\n"
-#: svn/main.c:348
+#: ../svn/main.c:348
msgid ""
"Duplicate something in working copy or repository, remembering\n"
"history.\n"
@@ -6884,7 +6925,7 @@
" odgałęzień i tagów.\n"
" Wszystkie ŹRÓDŁA muszą być tego samego typu.\n"
-#: svn/main.c:364
+#: ../svn/main.c:364
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -6916,7 +6957,7 @@
" repozytorium, przy czym operacja ta jest natychmiastowo\n"
" zatwierdzana.\n"
-#: svn/main.c:381
+#: ../svn/main.c:381
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6974,7 +7015,7 @@
" wprowadzone w kopii roboczej w stosunku do wersji pobranej z\n"
" repozytorium (zmiany do zatwierdzenia).\n"
-#: svn/main.c:410
+#: ../svn/main.c:411
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -7016,7 +7057,7 @@
"Argument WERSJA, jeśli został podany, określa numer wersji, która będzie\n"
"rozpatrywana jako pierwsza.\n"
-#: svn/main.c:432
+#: ../svn/main.c:433
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -7024,7 +7065,7 @@
"Opisz użycie tego programu lub jego podpoleceń.\n"
"Użycie: help [PODPOLECENIE...]\n"
-#: svn/main.c:438
+#: ../svn/main.c:439
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -7041,14 +7082,14 @@
"zarządzaniu wersjami.\n"
"Użycie: import [ŚCIEŻKA] URL\n"
"\n"
-" Rekurencyjnie zatwierdź kopiowanie ŚCIEŻKI do URL. Jeśli ŚCIEŻKA nie jest\n"
+" Rekurencyjnie zatwierdź kopiowanie ŚCIEŻKI do URL-u. Jeśli ŚCIEŻKA nie jest\n"
" podana, domyślną wartością jest '.'. W repozytorium są w razie potrzeby\n"
" tworzone brakujące katalogi nadrzędne. Jeśli argument ŚCIEŻKA jest\n"
" katalogiem, to zawartość katalogu jest dodawana bezpośrednio do URL-u.\n"
" Niewersjonowalne obiekty takie jak pliki urządzeń i potoki są ignorowane,\n"
" gdy użyto --force.\n"
-#: svn/main.c:453
+#: ../svn/main.c:454
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -7065,7 +7106,7 @@
"ją\n"
" podano, określa, w której wersji cel jest najpierw sprawdzany.\n"
-#: svn/main.c:464
+#: ../svn/main.c:465
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -7109,7 +7150,7 @@
" Rozmiar (w bajtach)\n"
" Data i czas ostatniej zmiany\n"
-#: svn/main.c:486
+#: ../svn/main.c:487
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -7125,19 +7166,19 @@
"Użyj opcję --force, aby odebrać blokadę innemu użytkownikowi lub\n"
"ścieżce innej kopii roboczej.\n"
-#: svn/main.c:493
+#: ../svn/main.c:494
msgid "read lock comment from file ARG"
msgstr "odczytaj opis blokady z pliku ARG"
-#: svn/main.c:494
+#: ../svn/main.c:495
msgid "specify lock comment ARG"
msgstr "określ opis blokady jako argument ARG"
-#: svn/main.c:495
+#: ../svn/main.c:496
msgid "force validity of lock comment source"
msgstr "wymuś uznanie komentarza blokady za poprawny"
-#: svn/main.c:498
+#: ../svn/main.c:499
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -7173,7 +7214,7 @@
" (domyślnie: '.'). Domyślnym zakresem wersji jest BASE:1.\n"
"\n"
" 2. Wypisz opisy zmian dla pliku lub katalogu w repozytorium, gdzie\n"
-" ŚCIEŻKi (domyślnie: '.') są podane względem URL. WERSJA, jeśli ją\n"
+" ŚCIEŻKI (domyślnie: '.') są podane względem URL-u. WERSJA, jeśli ją\n"
" podano, określa, w której wersji URL będzie najpierw sprawdzany.\n"
" Domyślnym zakresem wersji jest HEAD:1.\n"
"\n"
@@ -7196,16 +7237,16 @@
" 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:527
+#: ../svn/main.c:528
msgid "retrieve revision property ARG"
msgstr "pobierz atrybut wersji podany jako ARG"
-#: svn/main.c:530
+#: ../svn/main.c:531
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]... | [-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"
@@ -7224,6 +7265,10 @@
" is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'\n"
" does the reverse: '-r M:<M-1>'. If neither N nor M is specified,\n"
" they default to OLDEST_CONTIGUOUS_REV_OF_SOURCE_AT_URL and HEAD.\n"
+" Multiple '-c' and/or '-r' may be specified and mixing of forward\n"
+" and reverse ranges is allowed, however the ranges are compacted\n"
+" to their minimum representation before merging begins (which may\n"
+" result in a no-op).\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"
@@ -7234,7 +7279,7 @@
"roboczym.\n"
"Użycie: 1. merge URL1[@N] URL2[@M] [KATALOG_ROBOCZY]\n"
" 2. merge ŚCIEŻKA1@N ŚCIEŻKA2@M [KATALOG_ROBOCZY]\n"
-" 3. merge [-c M | -r N:M] [ŹRÓDŁO[@WERSJA] [KATALOG_ROBOCZY]]\n"
+" 3. merge [[-c M]... | [-r N:M]...] [ŹRÓDŁO[@WERSJA] [KATALOG_ROBOCZY]]\n"
"\n"
" 1. Dane do porównania podane bezpośrednio przez URL-e repozytorium\n"
" są analizowane w podanych wersjach. Jeśli wersje są pominięte, "
@@ -7257,6 +7302,10 @@
" '-r <M-1>:M', a '-c -M' działa odwrotnie: '-r M:<M-1>'.\n"
" Jeśli nie podano ani N, ani M, domyślnymi wartościami są\n"
" NAJSTARSZA_PRZYLEGAJĄCA_WERSJA_ŹRÓDŁA_W_URL-U i HEAD.\n"
+" Wiele opcji '-c' i/lub '-r' może być podanych i mieszanie postępujących\n"
+" i odwróconych zakresów jest dozwolone, jednakże zakresy są ściskane do\n"
+" ich minimalnej reprezentacji przed rozpoczęciem łączenia zmian (co może\n"
+" skutkować w niewykonaniu jakiejkolwiek operacji).\n"
"\n"
" KATALOG_ROBOCZY jest ścieżką w ramach kopii roboczej, w której zostaną\n"
" naniesione zmiany. Jeśli go pominięto, domyślną wartością będzie '.',\n"
@@ -7264,7 +7313,7 @@
" który zgadza się też z nazwą pliku w katalogu '.' - w tym wypadku\n"
" zmiany zostaną naniesione w tym pliku.\n"
-#: svn/main.c:563
+#: ../svn/main.c:568
msgid ""
"Query merge-related information.\n"
"usage: mergeinfo [TARGET[@REV]...]\n"
@@ -7272,7 +7321,7 @@
"Sprawdź informacje dotyczące połączeń zmian.\n"
"Użycie: mergeinfo [CEL[@WERSJA]...]\n"
-#: svn/main.c:568
+#: ../svn/main.c:573
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -7304,7 +7353,7 @@
" W obydwu wypadkach wszelkie nadrzędne katalogi muszą już istnieć,\n"
" jeśli nie podano opcji --parents.\n"
-#: svn/main.c:585
+#: ../svn/main.c:590
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -7338,7 +7387,7 @@
" kopii roboczej.\n"
" Wszystkie ŹRÓDŁA muszą być takiego samego typu.\n"
-#: svn/main.c:602
+#: ../svn/main.c:607
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -7357,7 +7406,7 @@
" 2. Usuwa niewersjonowane, zdalne atrybuty wersji w repozytorium.\n"
" CEL tylko określa, do którego repozytorium uzyskać dostęp.\n"
-#: svn/main.c:614
+#: ../svn/main.c:619
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -7381,7 +7430,7 @@
"Zobacz 'svn help propset' w celu uzyskania dodatkowych informacji o\n"
"ustawianiu atrybutów.\n"
-#: svn/main.c:628
+#: ../svn/main.c:633
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -7414,7 +7463,7 @@
" dana wartość. Opcja --strict powoduje pominięcie tych ozdobników (jest to\n"
" (użyteczne np. podczas kopiowania binarnej wartości atrybutu do pliku).\n"
-#: svn/main.c:647
+#: ../svn/main.c:652
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -7434,7 +7483,7 @@
" 2. Wypisuje niewersjonowane, zdalne atrybuty wersji w repozytorium.\n"
" CEL tylko określa, do którego repozytorium uzyskać dostęp.\n"
-#: svn/main.c:659
+#: ../svn/main.c:664
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -7534,7 +7583,7 @@
" svn:externals - Lista (oddzielanych znakiem nowego wiersza) odsyłaczy\n"
" do modułów, z których każdy składa się z ścieżki w ramach "
"repozytorium,\n"
-" opcjonalnie wersji oraz URL. Kolejność tych trzech elementów "
+" opcjonalnie wersji oraz URL-u. Kolejność tych trzech elementów "
"determinuje\n"
" różne zachowanie. Subversion 1.4 i wcześniejsze wersje obsługują "
"tylko\n"
@@ -7570,11 +7619,11 @@
" a uruchomienie z opcją --recursive spowoduje ustawienie atrybutu dla\n"
" wszystkich plików w tym katalogu.\n"
-#: svn/main.c:720
+#: ../svn/main.c:725
msgid "read property value from file ARG"
msgstr "odczytaj wartość atrybutu z pliku ARG"
-#: svn/main.c:723
+#: ../svn/main.c:728
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -7592,7 +7641,7 @@
" możliwość zatwierdzenia zmian. Powinno być używane po ręcznym\n"
" rozwiązaniu konfliktu.\n"
-#: svn/main.c:730
+#: ../svn/main.c:735
msgid ""
"specify automatic conflict resolution source\n"
" '"
@@ -7600,7 +7649,7 @@
"określ źródło automatycznego rozwiązywania konfliktów\n"
" '"
-#: svn/main.c:737
+#: ../svn/main.c:742
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -7616,7 +7665,7 @@
" rozwiązuje wszelkie konflikty. Jednak nie może ono odtworzyć skasowanych\n"
" katalogów.\n"
-#: svn/main.c:746
+#: ../svn/main.c:751
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -7770,7 +7819,7 @@
" 965 687 joe wc/zig.c\n"
" Status względem wersji: 981\n"
-#: svn/main.c:823
+#: ../svn/main.c:828
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -7796,7 +7845,7 @@
" modification to the working copy. All properties from the repository\n"
" are applied to the obstructing path.\n"
msgstr ""
-"Zaktualizuj kopię roboczą do innego URL.\n"
+"Zaktualizuj kopię roboczą do innego URL-u.\n"
"Użycie: 1. switch URL [ŚCIEŻKA]\n"
" 2. switch --relocate STARY_URL NOWY_URL [ŚCIEŻKA...]\n"
"\n"
@@ -7825,7 +7874,7 @@
" roboczej. Wszystkie atrybuty z repozytorium są zastosowywane do\n"
" zagradzających ścieżek.\n"
-#: svn/main.c:851
+#: ../svn/main.c:856
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7837,7 +7886,7 @@
"\n"
" Użyj opcję --force, aby zerwać blokadę.\n"
-#: svn/main.c:858
+#: ../svn/main.c:863
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7910,51 +7959,52 @@
" zagradzających ścieżek. Zagradzające ścieżki są zgłaszane w pierwszej\n"
" kolumnie przy użyciu litery 'E'.\n"
-#: svn/main.c:935 svnadmin/main.c:78 svnlook/main.c:329 svnsync/main.c:184
+#: ../svn/main.c:940 ../svnadmin/main.c:78 ../svnlook/main.c:329
+#: ../svnsync/main.c:184
msgid "Caught signal"
msgstr "Złapano sygnał"
-#: svn/main.c:954
+#: ../svn/main.c:959
msgid "Revision property pair is empty"
msgstr "Para atrybutów wersji jest pusta"
-#: svn/main.c:974 svn/propedit-cmd.c:60 svn/propget-cmd.c:181
-#: svn/propset-cmd.c:65
+#: ../svn/main.c:979 ../svn/propedit-cmd.c:60 ../svn/propget-cmd.c:181
+#: ../svn/propset-cmd.c:65
#, c-format
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' nie jest poprawną nazwą atrybutu Subversion"
-#: svn/main.c:1095 svnlook/main.c:2076
+#: ../svn/main.c:1100 ../svnlook/main.c:2076
msgid "Non-numeric limit argument given"
msgstr "Nienumeryczny argument określający limit podany"
-#: svn/main.c:1101 svnlook/main.c:2082
+#: ../svn/main.c:1106 ../svnlook/main.c:2082
msgid "Argument to --limit must be positive"
msgstr "Argument dla --limit musi być dodatni"
-#: svn/main.c:1121 svn/main.c:1328
+#: ../svn/main.c:1126 ../svn/main.c:1333
msgid "Can't specify -c with --old"
msgstr "Nie można użyć opcji -c wraz z opcją --old"
-#: svn/main.c:1128
+#: ../svn/main.c:1133
msgid "Non-numeric change argument given to -c"
msgstr "Nienumeryczny argument określający zmianę podany do -c"
-#: svn/main.c:1134
+#: ../svn/main.c:1139
msgid "There is no change 0"
msgstr "Nie ma zmiany 0"
-#: svn/main.c:1169 svnadmin/main.c:1345
+#: ../svn/main.c:1174 ../svnadmin/main.c:1345
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Błąd składniowy w numerze wersji '%s'"
-#: svn/main.c:1242
+#: ../svn/main.c:1247
#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Błąd podczas konwersji głębokości z lokalnego kodowania do UTF8"
-#: svn/main.c:1249
+#: ../svn/main.c:1254
#, c-format
msgid ""
"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
@@ -7962,28 +8012,28 @@
"'%s' nie jest właściwą głębokością; spróbuj 'empty', 'files', 'immediates' "
"lub 'infinity'"
-#: svn/main.c:1356
+#: ../svn/main.c:1361
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Błąd składniowy w argumencie native-eol '%s'"
-#: svn/main.c:1400
+#: ../svn/main.c:1405
#, c-format
msgid "'%s' is not a valid accept value"
msgstr "'%s' nie jest poprawną, akceptowaną wartością"
-#: svn/main.c:1453 svndumpfilter/main.c:1201 svnlook/main.c:2154
+#: ../svn/main.c:1458 ../svndumpfilter/main.c:1201 ../svnlook/main.c:2154
#, c-format
msgid "Subcommand argument required\n"
msgstr "Podpolecenie wymaga podania argumentu\n"
-#: svn/main.c:1472 svnadmin/main.c:1477 svndumpfilter/main.c:1220
-#: svnlook/main.c:2173
+#: ../svn/main.c:1477 ../svnadmin/main.c:1477 ../svndumpfilter/main.c:1220
+#: ../svnlook/main.c:2173
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Nieznane polecenie: '%s'\n"
-#: svn/main.c:1506
+#: ../svn/main.c:1511
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7992,7 +8042,7 @@
"Podpolecenie '%s' nie obsługuje opcji '%s'.\n"
"Użyj 'svn help %s', by uzyskać informacje o użyciu.\n"
-#: svn/main.c:1520
+#: ../svn/main.c:1525
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -8000,19 +8050,19 @@
"Wielokrotnie podano opcję numeru wersji; nie można określić -c dwa razy, lub "
"obydwu -c i -r"
-#: svn/main.c:1574
+#: ../svn/main.c:1579
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Plik z opisem zmian jest plikiem podlegającym zarządzaniu wersjami; użyj '--"
"force-log', by wymusić jego użycie."
-#: svn/main.c:1581
+#: ../svn/main.c:1586
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Plik z opisem blokady jest plikiem podlegającym zarządzaniu wersjami; użyj "
"'--force-log', by wymusić jego użycie."
-#: svn/main.c:1601
+#: ../svn/main.c:1606
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8020,7 +8070,7 @@
"Opis zmian jest ścieżką (chciano użyć -F?); użyj --force-log, by wymusić "
"użycie takiego opisu"
-#: svn/main.c:1608
+#: ../svn/main.c:1613
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -8028,24 +8078,24 @@
"Opis blokady jest ścieżką (chciano użyć -F?); użyj --force-log, bywymusić "
"użycie takiego opisu"
-#: svn/main.c:1619
+#: ../svn/main.c:1624
msgid "--relocate and --depth are mutually exclusive"
msgstr "Opcje --relocate i --depth nie mogą występować równocześnie"
-#: svn/main.c:1676
+#: ../svn/main.c:1691
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "Opcje --auto-props i --no-auto-props nie mogą występować równocześnie"
-#: svn/main.c:1788 svn/main.c:1794
+#: ../svn/main.c:1803 ../svn/main.c:1809
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s jest niekompatybilne z --non-interactive"
-#: svn/main.c:1821
+#: ../svn/main.c:1836
msgid "Try 'svn help' for more info"
msgstr "Użyj 'svn help', by otrzymać dodatkowe instrukcje"
-#: svn/main.c:1831
+#: ../svn/main.c:1846
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8053,20 +8103,20 @@
"svn: uruchom 'svn cleanup', by usunąć blokady (więcej informacji -\n"
"zobacz 'svn help cleanup')\n"
-#: svn/merge-cmd.c:98
+#: ../svn/merge-cmd.c:98
msgid "Second revision required"
msgstr "Wymagane jest podanie drugiego numeru wersji"
-#: svn/merge-cmd.c:107 svn/merge-cmd.c:133
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:133
msgid "Too many arguments given"
msgstr "Podano zbyt dużo argumentów"
-#: svn/merge-cmd.c:149
+#: ../svn/merge-cmd.c:149
msgid "A working copy merge source needs an explicit revision"
msgstr ""
"Użycie kopii roboczej jako źródła dla dołączania wymaga podania jawnej wersji"
-#: svn/merge-cmd.c:222
+#: ../svn/merge-cmd.c:222
#, c-format
msgid ""
"Unable to determine merge source for '%s' -- please provide an explicit "
@@ -8074,12 +8124,12 @@
msgstr ""
"Nie można określić źródła połączenia dla '%s' -- proszę zapewnić jawne źródło"
-#: svn/mergeinfo-cmd.c:134
+#: ../svn/mergeinfo-cmd.c:134
#, c-format
msgid " Source path: %s\n"
msgstr " Ścieżka źródłowa: %s\n"
-#: svn/mergeinfo-cmd.c:136
+#: ../svn/mergeinfo-cmd.c:136
#, c-format
msgid " Merged ranges: "
msgstr " Zakres połączonych zmian: "
@@ -8093,55 +8143,55 @@
#. ### system. It may just mean the system has to work
#. ### harder to provide that information.
#.
-#: svn/mergeinfo-cmd.c:150
+#: ../svn/mergeinfo-cmd.c:150
#, c-format
msgid " Eligible ranges: "
msgstr " Wybieralne zakresy: "
-#: svn/mergeinfo-cmd.c:163
+#: ../svn/mergeinfo-cmd.c:163
#, c-format
msgid "(source no longer available in HEAD)\n"
msgstr "(źródło nie jest już dłużej dostępne w wersji HEAD)\n"
-#: svn/mkdir-cmd.c:87
+#: ../svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Zamiast tego spróbuj wykonać 'svn add' lub 'svn add --non-recursive'."
-#: svn/mkdir-cmd.c:93
+#: ../svn/mkdir-cmd.c:93
msgid "Try 'svn mkdir --parents' instead?"
msgstr "Zamiast tego spróbuj wykonać 'svn mkdir --parents'."
-#: svn/notify.c:72
+#: ../svn/notify.c:72
#, c-format
msgid "Skipped missing target: '%s'\n"
msgstr "Pominięto brakujący obiekt: '%s'\n"
-#: svn/notify.c:79
+#: ../svn/notify.c:79
#, c-format
msgid "Skipped '%s'\n"
msgstr "Pominięto '%s'\n"
-#: svn/notify.c:127
+#: ../svn/notify.c:127
#, c-format
msgid "Restored '%s'\n"
msgstr "Odtworzono '%s'\n"
-#: svn/notify.c:133
+#: ../svn/notify.c:133
#, c-format
msgid "Reverted '%s'\n"
msgstr "Wycofano zmiany w '%s'\n"
-#: svn/notify.c:139
+#: ../svn/notify.c:139
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr "Błąd wycofania zmian w '%s' -- spróbuj aktualizacji.\n"
-#: svn/notify.c:147
+#: ../svn/notify.c:147
#, c-format
msgid "Resolved conflicted state of '%s'\n"
msgstr "Rozwiązano konflikt w '%s'\n"
-#: svn/notify.c:228
+#: ../svn/notify.c:228
#, c-format
msgid ""
"\n"
@@ -8150,77 +8200,77 @@
"\n"
"Pobieranie zewnętrznego obiektu do '%s'\n"
-#: svn/notify.c:243
+#: ../svn/notify.c:243
#, c-format
msgid "Exported external at revision %ld.\n"
msgstr "Wyeksportowano obiekt zewnętrzny w wersji %ld.\n"
-#: svn/notify.c:244
+#: ../svn/notify.c:244
#, c-format
msgid "Exported revision %ld.\n"
msgstr "Wyeksportowano wersję %ld.\n"
-#: svn/notify.c:252
+#: ../svn/notify.c:252
#, c-format
msgid "Checked out external at revision %ld.\n"
msgstr "Pobrano do kopii roboczej obiekt zewnętrzny w wersji %ld.\n"
-#: svn/notify.c:253
+#: ../svn/notify.c:253
#, c-format
msgid "Checked out revision %ld.\n"
msgstr "Pobrano wersję %ld.\n"
-#: svn/notify.c:263
+#: ../svn/notify.c:263
#, c-format
msgid "Updated external to revision %ld.\n"
msgstr "Uaktualniono obiekt zewnętrzny do wersji %ld.\n"
-#: svn/notify.c:264
+#: ../svn/notify.c:264
#, c-format
msgid "Updated to revision %ld.\n"
msgstr "Uaktualniono do wersji %ld.\n"
-#: svn/notify.c:272
+#: ../svn/notify.c:272
#, c-format
msgid "External at revision %ld.\n"
msgstr "Obiekt zewnętrzny w wersji %ld.\n"
-#: svn/notify.c:273
+#: ../svn/notify.c:273
#, c-format
msgid "At revision %ld.\n"
msgstr "W wersji %ld.\n"
-#: svn/notify.c:285
+#: ../svn/notify.c:285
#, c-format
msgid "External export complete.\n"
msgstr "Eksport obiektów zewnętrznych wykonany.\n"
-#: svn/notify.c:286
+#: ../svn/notify.c:286
#, c-format
msgid "Export complete.\n"
msgstr "Eksport wykonany.\n"
-#: svn/notify.c:293
+#: ../svn/notify.c:293
#, c-format
msgid "External checkout complete.\n"
msgstr "Pobieranie obiektów zewnętrznych do kopii roboczej wykonane.\n"
-#: svn/notify.c:294
+#: ../svn/notify.c:294
#, c-format
msgid "Checkout complete.\n"
msgstr "Pobieranie kopii roboczej wykonane.\n"
-#: svn/notify.c:301
+#: ../svn/notify.c:301
#, c-format
msgid "External update complete.\n"
msgstr "Uaktualnienie obiektów zewnętrznych wykonane.\n"
-#: svn/notify.c:302
+#: ../svn/notify.c:302
#, c-format
msgid "Update complete.\n"
msgstr "Uaktualnienie wykonane.\n"
-#: svn/notify.c:318
+#: ../svn/notify.c:318
#, c-format
msgid ""
"\n"
@@ -8229,157 +8279,157 @@
"\n"
"Pobieranie statusu obiektu zewnętrznego '%s'\n"
-#: svn/notify.c:326
+#: ../svn/notify.c:326
#, c-format
msgid "Status against revision: %6ld\n"
msgstr "Status względem wersji: %6ld\n"
-#: svn/notify.c:334
+#: ../svn/notify.c:334
#, c-format
msgid "Sending %s\n"
msgstr "Wysyłanie %s\n"
-#: svn/notify.c:343
+#: ../svn/notify.c:343
#, c-format
msgid "Adding (bin) %s\n"
msgstr "Dodawanie (bin) %s\n"
-#: svn/notify.c:350
+#: ../svn/notify.c:350
#, c-format
msgid "Adding %s\n"
msgstr "Dodawanie %s\n"
-#: svn/notify.c:357
+#: ../svn/notify.c:357
#, c-format
msgid "Deleting %s\n"
msgstr "Usuwanie %s\n"
-#: svn/notify.c:364
+#: ../svn/notify.c:364
#, c-format
msgid "Replacing %s\n"
msgstr "Zastępowanie %s\n"
-#: svn/notify.c:374 svnsync/main.c:655
+#: ../svn/notify.c:374 ../svnsync/main.c:655
#, c-format
msgid "Transmitting file data "
msgstr "Przesyłanie treści pliku"
-#: svn/notify.c:383
+#: ../svn/notify.c:383
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "'%s' zablokowane przez użytkownika '%s'.\n"
-#: svn/notify.c:389
+#: ../svn/notify.c:389
#, c-format
msgid "'%s' unlocked.\n"
msgstr "'%s' odblokowane.\n"
-#: svn/notify.c:400
+#: ../svn/notify.c:400
#, c-format
msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "Ścieżka '%s' jest teraz członkiem listy zmian '%s'.\n"
-#: svn/notify.c:408
+#: ../svn/notify.c:408
#, c-format
msgid "Path '%s' is no longer a member of a changelist.\n"
msgstr "Ścieżka '%s' już nie jest członkiem listy zmian.\n"
-#: svn/notify.c:427
+#: ../svn/notify.c:427
#, c-format
msgid "--- Merging differences between repository URLs into '%s':\n"
msgstr ""
"--- Łączenie zmian nastąpiłych pomiędzy URL-ami repozytorium do '%s':\n"
-#: svn/notify.c:432
+#: ../svn/notify.c:432
#, c-format
msgid "--- Merging r%ld into '%s':\n"
msgstr "--- Łączenie zmian nastąpiłych w r%ld do '%s':\n"
-#: svn/notify.c:436
+#: ../svn/notify.c:436
#, c-format
msgid "--- Reverse-merging r%ld into '%s':\n"
msgstr "--- Łączenie odwróconych zmian nastąpiłych w r%ld do '%s':\n"
-#: svn/notify.c:440
+#: ../svn/notify.c:440
#, c-format
msgid "--- Merging r%ld through r%ld into '%s':\n"
msgstr "--- Łączenie zmian nastąpiłych między r%ld a r%ld do '%s':\n"
-#: svn/notify.c:446
+#: ../svn/notify.c:446
#, c-format
msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
msgstr ""
"--- Łączenie odwróconych zmian nastąpiłych między r%ld a r%ld do '%s':\n"
-#: svn/propdel-cmd.c:105
+#: ../svn/propdel-cmd.c:105
#, c-format
msgid "property '%s' deleted from repository revision %ld\n"
msgstr "atrybut '%s' usunięty z repozytorium w wersji %ld\n"
-#: svn/propdel-cmd.c:114
+#: ../svn/propdel-cmd.c:114
#, c-format
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr "Nie można określić wersji dla usunięcia atrybutu '%s'"
-#: svn/propdel-cmd.c:152
+#: ../svn/propdel-cmd.c:152
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "atrybut '%s' usunięty (rekurencyjnie) z '%s'.\n"
-#: svn/propdel-cmd.c:153
+#: ../svn/propdel-cmd.c:153
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "atrybut '%s' usunięty z '%s'.\n"
-#: svn/propedit-cmd.c:106 svn/propedit-cmd.c:245 svn/propset-cmd.c:90
+#: ../svn/propedit-cmd.c:106 ../svn/propedit-cmd.c:245 ../svn/propset-cmd.c:90
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Nieprawidłowe kodowanie: wartość atrybutu nie jest w UTF8"
-#: svn/propedit-cmd.c:115
+#: ../svn/propedit-cmd.c:115
#, c-format
msgid "Set new value for property '%s' on revision %ld\n"
msgstr "Ustawiono nową wartość dla atrybutu '%s' w wersji %ld\n"
-#: svn/propedit-cmd.c:121
+#: ../svn/propedit-cmd.c:121
#, c-format
msgid "No changes to property '%s' on revision %ld\n"
msgstr "Atrybut '%s' bez zmian w wersji %ld\n"
-#: svn/propedit-cmd.c:129
+#: ../svn/propedit-cmd.c:129
#, c-format
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "Nie można określić wersji dla edycji atrybutu '%s'"
-#: svn/propedit-cmd.c:155 svn/propset-cmd.c:191
+#: ../svn/propedit-cmd.c:155 ../svn/propset-cmd.c:191
msgid "Explicit target argument required"
msgstr "Argument podający obiekt docelowy jest wymagany"
-#: svn/propedit-cmd.c:214 svn/switch-cmd.c:148
+#: ../svn/propedit-cmd.c:214 ../svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' nie wygląda na ścieżkę kopii roboczej"
-#: svn/propedit-cmd.c:273
+#: ../svn/propedit-cmd.c:273
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Ustaw nową wartość atrybutu '%s' dla '%s'\n"
-#: svn/propedit-cmd.c:283
+#: ../svn/propedit-cmd.c:283
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Bez zmian atrybutu %s dla '%s'\n"
-#: svn/proplist-cmd.c:96
+#: ../svn/proplist-cmd.c:96
#, c-format
msgid "Properties on '%s':\n"
msgstr "Atrybuty dla '%s':\n"
-#: svn/proplist-cmd.c:182
+#: ../svn/proplist-cmd.c:182
#, c-format
msgid "Unversioned properties on revision %ld:\n"
msgstr "Atrybuty niepodlegające zarządzaniu wersjami w wersji %ld:\n"
-#: svn/props.c:54
+#: ../svn/props.c:54
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -8387,15 +8437,15 @@
"Należy określić wersję jako numer, datę lub 'HEAD' podczas operowania na "
"atrybucie wersji"
-#: svn/props.c:61
+#: ../svn/props.c:61
msgid "Wrong number of targets specified"
msgstr "Podano niewłaściwą ilość celów"
-#: svn/props.c:70
+#: ../svn/props.c:70
msgid "Either a URL or versioned item is required"
msgstr "Wymagane podanie URL lub obiektu"
-#: svn/props.c:217
+#: ../svn/props.c:217
#, c-format
msgid ""
"To turn off the %s property, use 'svn propdel';\n"
@@ -8404,42 +8454,42 @@
"By wyłączyć atrybut %s, użyj 'svn propdel';\n"
"ustawienie atrybutu do '%s' nie wyłączy go."
-#: svn/propset-cmd.c:141
+#: ../svn/propset-cmd.c:141
#, c-format
msgid "property '%s' set on repository revision %ld\n"
msgstr "atrybut '%s' ustawiony dla wersji %ld\n"
-#: svn/propset-cmd.c:149
+#: ../svn/propset-cmd.c:149
#, c-format
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "Nie można określić wersji dla ustawienia atrybutu '%s'"
-#: svn/propset-cmd.c:184
+#: ../svn/propset-cmd.c:184
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr ""
"Wymagane podanie obiektu docelowego ('%s' interpretowane jako wartość "
"atrybutu)"
-#: svn/propset-cmd.c:224
+#: ../svn/propset-cmd.c:224
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "atrybut '%s' ustawiony (rekurencyjnie) dla '%s'\n"
-#: svn/propset-cmd.c:225
+#: ../svn/propset-cmd.c:225
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "atrybut '%s' ustawiony dla '%s'\n"
-#: svn/resolved-cmd.c:68
+#: ../svn/resolved-cmd.c:68
msgid "invalid 'accept' ARG"
msgstr "błędny argument 'accept'"
-#: svn/revert-cmd.c:93
+#: ../svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Zamiast tego spróbuj wykonać 'svn revert --recursive'."
-#: svn/status-cmd.c:337
+#: ../svn/status-cmd.c:337
#, c-format
msgid ""
"\n"
@@ -8448,17 +8498,17 @@
"\n"
"--- Lista zmian '%s':\n"
-#: svn/status.c:254
+#: ../svn/status.c:254
#, c-format
msgid "'%s' has lock token, but no lock owner"
msgstr "'%s' posiada żeton blokady, ale brakuje właściciela blokady"
-#: svn/switch-cmd.c:58
+#: ../svn/switch-cmd.c:58
#, c-format
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s' do '%s' nie jest prawidłowym przeniesieniem"
-#: svn/util.c:63
+#: ../svn/util.c:63
#, c-format
msgid ""
"\n"
@@ -8467,7 +8517,7 @@
"\n"
"Zatwierdzona wersja %ld.\n"
-#: svn/util.c:71
+#: ../svn/util.c:71
#, c-format
msgid ""
"\n"
@@ -8476,7 +8526,7 @@
"\n"
"Ostrzeżenie: %s\n"
-#: svn/util.c:132
+#: ../svn/util.c:132
msgid ""
"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
"time configuration option is empty or consists solely of whitespace. "
@@ -8486,7 +8536,7 @@
"konfiguracji czasu uruchamiania jest pusta lub składa się tylko z białych "
"znaków. Oczekiwano polecenie powłoki."
-#: svn/util.c:139
+#: ../svn/util.c:139
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -8494,27 +8544,27 @@
"Nie zdefiniowano żadnej spośród zmiennych środowiskowych SVN_EDITOR, VISUAL "
"lub EDITOR, nie zdefiniowano też opcji konfiguracyjnej 'editor-cmd'"
-#: svn/util.c:167 svn/util.c:305
+#: ../svn/util.c:167 ../svn/util.c:305
#, c-format
msgid "Can't get working directory"
msgstr "Nie można ustalić katalogu bieżącego"
-#: svn/util.c:178 svn/util.c:316 svn/util.c:339
+#: ../svn/util.c:178 ../svn/util.c:316 ../svn/util.c:339
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Nie można zmienić katalogu bieżącego na '%s'"
-#: svn/util.c:186 svn/util.c:481
+#: ../svn/util.c:186 ../svn/util.c:481
#, c-format
msgid "Can't restore working directory"
msgstr "Nie można odtworzyć katalogu bieżącego"
-#: svn/util.c:193 svn/util.c:409
+#: ../svn/util.c:193 ../svn/util.c:409
#, c-format
msgid "system('%s') returned %d"
msgstr "Polecenie system('%s') zwróciło %d"
-#: svn/util.c:231
+#: ../svn/util.c:231
msgid ""
"The SVN_MERGE environment variable is empty or consists solely of "
"whitespace. Expected a shell command.\n"
@@ -8522,7 +8572,7 @@
"Zmienna środowiskowa SVN_MERGE jest pusta lub składa się tylko z białych "
"znaków. Oczekiwano polecenie powłoki.\n"
-#: svn/util.c:237
+#: ../svn/util.c:237
msgid ""
"The environment variable SVN_MERGE and the merge-tool-cmd run-time "
"configuration option were not set.\n"
@@ -8530,33 +8580,33 @@
"Zmienna środowiskowa SVN_MERGE i opcja konfiguracji merge-tool-cmd nie są "
"ustawione.\n"
-#: svn/util.c:364
+#: ../svn/util.c:364
#, c-format
msgid "Can't write to '%s'"
msgstr "Nie można pisać do '%s'"
-#: svn/util.c:450
+#: ../svn/util.c:450
msgid "Error normalizing edited contents to internal format"
msgstr ""
"Błąd podczas normalizowania zmienionej zawartości do wewnętrznego formatu"
-#: svn/util.c:523
+#: ../svn/util.c:523
msgid "Log message contains a zero byte"
msgstr "Opis zmian zawiera bajt zerowy"
-#: svn/util.c:583
+#: ../svn/util.c:583
msgid "Your commit message was left in a temporary file:"
msgstr "Opis zmian pozostawiono w pliku tymczasowym:"
-#: svn/util.c:635
+#: ../svn/util.c:635
msgid "--This line, and those below, will be ignored--"
msgstr "--Ta linia i następne zostaną zignorowane--"
-#: svn/util.c:660
+#: ../svn/util.c:660
msgid "Error normalizing log message to internal format"
msgstr "Błąd podczas normalizowania opisu zmian do wewnętrznego formatu"
-#: svn/util.c:675
+#: ../svn/util.c:675
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -8564,13 +8614,13 @@
"Użycie zewnętrznego edytora w celu opisania zmian jest nieobsługiwane na "
"OS400; rozważ użycie opcji --message (-m) bądź --file (-F)"
-#: svn/util.c:761
+#: ../svn/util.c:761
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr ""
"Nie można wywołać edytora do wyświetlenia opisu zmian w trybie "
"nieinteraktywnym."
-#: svn/util.c:774
+#: ../svn/util.c:774
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) "
@@ -8580,7 +8630,7 @@
"odpowiednio zmienną środowiskową $SVN_EDITOR albo skorzystaj z odpowiedniej "
"spośród opcji: --message (-m) bądź --file (-F)"
-#: svn/util.c:810
+#: ../svn/util.c:810
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -8590,71 +8640,71 @@
"Nie podano opisu zmian.\n"
"Przerwij (a), kontynuuj (c), edytuj (e):\n"
-#: svn/util.c:863
+#: ../svn/util.c:863
msgid "Use --force to override this restriction"
msgstr "Użyj opcję --force, aby obejść to ograniczenie"
-#: svnadmin/main.c:95 svndumpfilter/main.c:62
+#: ../svnadmin/main.c:95 ../svndumpfilter/main.c:62
#, c-format
msgid "Can't open stdio file"
msgstr "Błąd otwierania pliku"
-#: svnadmin/main.c:124
+#: ../svnadmin/main.c:124
msgid "Repository argument required"
msgstr "Argument podający repozytorium jest wymagany"
-#: svnadmin/main.c:129
+#: ../svnadmin/main.c:129
#, c-format
msgid "'%s' is an URL when it should be a path"
msgstr "'%s' jest URL-em, a powinien być ścieżką"
-#: svnadmin/main.c:240
+#: ../svnadmin/main.c:240
msgid "specify revision number ARG (or X:Y range)"
msgstr "podaj informację o wersji (lub zakres X:Y)"
-#: svnadmin/main.c:243
+#: ../svnadmin/main.c:243
msgid "dump incrementally"
msgstr "zrzut inkrementalny"
-#: svnadmin/main.c:246
+#: ../svnadmin/main.c:246
msgid "use deltas in dump output"
msgstr "używaj delt w wyniku zrzutu"
-#: svnadmin/main.c:249
+#: ../svnadmin/main.c:249
msgid "bypass the repository hook system"
msgstr "pomiń skrypty repozytorium"
-#: svnadmin/main.c:252
+#: ../svnadmin/main.c:252
msgid "no progress (only errors) to stderr"
msgstr "nie informuj o postępie prac, podawaj jedynie informacje o błędach"
-#: svnadmin/main.c:255
+#: ../svnadmin/main.c:255
msgid "ignore any repos UUID found in the stream"
msgstr "ignoruj jakiekolwiek UUID-y repozytorium w strumieniu"
-#: svnadmin/main.c:258
+#: ../svnadmin/main.c:258
msgid "set repos UUID to that found in stream, if any"
msgstr "ustal UUID repozytorium na znaleziony w strumieniu, jeśli jest obecny"
-#: svnadmin/main.c:261
+#: ../svnadmin/main.c:261
msgid "type of repository: 'fsfs' (default) or 'bdb'"
msgstr "rodzaj repozytorium: 'fsfs' (domyślny) lub 'bdb'"
-#: svnadmin/main.c:264
+#: ../svnadmin/main.c:264
msgid "load at specified directory in repository"
msgstr "ładuj w podanym katalogu repozytorium"
-#: svnadmin/main.c:267
+#: ../svnadmin/main.c:267
msgid "disable fsync at transaction commit [Berkeley DB]"
msgstr ""
"wyłącz synchronizację zapisu na dysk przy zatwierdzaniu transakcji\n"
"[Berkeley DB]"
-#: svnadmin/main.c:270
+#: ../svnadmin/main.c:270
msgid "disable automatic log file removal [Berkeley DB]"
msgstr "wyłącz automatyczne usuwanie zbędnych logów [Berkeley DB]"
-#: svnadmin/main.c:276
+#: ../svnadmin/main.c:276
msgid ""
"remove redundant Berkeley DB log files\n"
" from source repository [Berkeley DB]"
@@ -8662,23 +8712,23 @@
"usuń zbędne logi Berkeley DB\n"
" ze źródłowego repozytorium [Berkeley DB]"
-#: svnadmin/main.c:280
+#: ../svnadmin/main.c:280
msgid "call pre-commit hook before committing revisions"
msgstr "wywołuje skrypt pre-commit przed zatwierdzaniem wersji"
-#: svnadmin/main.c:283
+#: ../svnadmin/main.c:283
msgid "call post-commit hook after committing revisions"
msgstr "wywołuje skrypt post-commit po zatwierdzaniu wersji"
-#: svnadmin/main.c:286
+#: ../svnadmin/main.c:286
msgid "call hook before changing revision property"
msgstr "wywołuje skrypt przed zmienieniem atrybutu wersji"
-#: svnadmin/main.c:289
+#: ../svnadmin/main.c:289
msgid "call hook after changing revision property"
msgstr "wywołuje skrypt po zmienieniu atrybutu wersji"
-#: svnadmin/main.c:292
+#: ../svnadmin/main.c:292
msgid ""
"wait instead of exit if the repository is in\n"
" use by another process"
@@ -8686,7 +8736,7 @@
"zamiast wyjść, czekaj, jeśli repozytorium jest w\n"
" użyciu przez inny proces"
-#: svnadmin/main.c:296
+#: ../svnadmin/main.c:296
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.4"
@@ -8694,7 +8744,7 @@
"użyj format kompatybilny z wersjami\n"
" Subversion starszymi niż 1.4"
-#: svnadmin/main.c:300
+#: ../svnadmin/main.c:300
msgid ""
"use format compatible with Subversion versions\n"
" earlier than 1.5"
@@ -8702,7 +8752,7 @@
"użyj format kompatybilny z wersjami\n"
" Subversion starszymi niż 1.5"
-#: svnadmin/main.c:313
+#: ../svnadmin/main.c:313
msgid ""
"usage: svnadmin crashtest REPOS_PATH\n"
"\n"
@@ -8714,7 +8764,7 @@
"Otwórz repozytorium w ŚCIEŻCE_REPOZYTORIUM, następnie przerwij, symulując\n"
"proces, który rozbija się podczas trzymania otwartego uchwytu repozytorium.\n"
-#: svnadmin/main.c:319
+#: ../svnadmin/main.c:319
msgid ""
"usage: svnadmin create REPOS_PATH\n"
"\n"
@@ -8724,7 +8774,7 @@
"\n"
"Stwórz nowe, puste repozytorium w podanym katalogu\n"
-#: svnadmin/main.c:326
+#: ../svnadmin/main.c:326
msgid ""
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
@@ -8742,7 +8792,7 @@
"wersjami. W razie braku parametru -r polecenie domyślnie działa na\n"
"wersji HEAD (najnowszej).\n"
-#: svnadmin/main.c:335
+#: ../svnadmin/main.c:335
msgid ""
"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
"\n"
@@ -8764,7 +8814,7 @@
"obejmował różnicę między nią a wersją wcześniejszą a nie pełny zrzut\n"
"tej wersji.\n"
-#: svnadmin/main.c:345
+#: ../svnadmin/main.c:345
msgid ""
"usage: svnadmin help [SUBCOMMAND...]\n"
"\n"
@@ -8774,7 +8824,7 @@
"\n"
"Opisz użycie tego programu lub jego podpoleceń.\n"
-#: svnadmin/main.c:350
+#: ../svnadmin/main.c:350
msgid ""
"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
"\n"
@@ -8785,7 +8835,7 @@
"Utwórz kopię repozytorium w nowym katalogu - bez konieczności\n"
"zatrzymywania repozytorium lub wstrzymywania obsługi klientów.\n"
-#: svnadmin/main.c:355
+#: ../svnadmin/main.c:355
msgid ""
"usage: svnadmin list-dblogs REPOS_PATH\n"
"\n"
@@ -8801,7 +8851,7 @@
"UWAGA: Zmodyfikowanie lub skasowanie logów będących jeszcze w użyciu\n"
"spowoduje uszkodzenie repozytorium.\n"
-#: svnadmin/main.c:362
+#: ../svnadmin/main.c:362
msgid ""
"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
"\n"
@@ -8813,7 +8863,7 @@
"Wypisz listę logów Berkeley DB, które nie są już używane.\n"
"\n"
-#: svnadmin/main.c:367
+#: ../svnadmin/main.c:367
msgid ""
"usage: svnadmin load REPOS_PATH\n"
"\n"
@@ -8830,7 +8880,7 @@
"na podane we wczytywanym zrzucie. Informacja o postępie prac jest\n"
"wypisywana na wyjściu błędów.\n"
-#: svnadmin/main.c:377
+#: ../svnadmin/main.c:377
msgid ""
"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
"\n"
@@ -8843,7 +8893,7 @@
"poniżej niej (jeśli ŚCIEŻKA_W_REPOZYTORIUM nie została jawnie podana, to\n"
"jest ona katalogiem głównym repozytorium).\n"
-#: svnadmin/main.c:383
+#: ../svnadmin/main.c:383
msgid ""
"usage: svnadmin lstxns REPOS_PATH\n"
"\n"
@@ -8853,7 +8903,7 @@
"\n"
"Wypisz nazwy wszystkich niezatwierdzonych transakcji.\n"
-#: svnadmin/main.c:388
+#: ../svnadmin/main.c:388
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
@@ -8869,7 +8919,7 @@
"wymagany jest wyłączny dostęp do repozytorium. Naprawa nie zostanie\n"
"rozpoczęta w przypadku, gdy repozytorium jest zajęte przez inny proces.\n"
-#: svnadmin/main.c:396
+#: ../svnadmin/main.c:396
msgid ""
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
"\n"
@@ -8879,7 +8929,7 @@
"\n"
"Bezwarunkowo usuń blokady z każdej ZABLOKOWANEJ_ŚCIEŻKI.\n"
-#: svnadmin/main.c:401
+#: ../svnadmin/main.c:401
msgid ""
"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
"\n"
@@ -8889,7 +8939,7 @@
"\n"
"Usuń podaną(/-e) transakcję(/-e).\n"
-#: svnadmin/main.c:406
+#: ../svnadmin/main.c:406
msgid ""
"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
"\n"
@@ -8916,7 +8966,7 @@
"UWAGA: Historia zmian atrybutów wersji nie jest przechowywana, więc to\n"
"polecenie spowoduje nieodwracalne zastąpienie starego opisu nowym.\n"
-#: svnadmin/main.c:418
+#: ../svnadmin/main.c:418
msgid ""
"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
"\n"
@@ -8939,7 +8989,7 @@
"UWAGA: Historia zmian atrybutów wersji nie jest przechowywana, więc to\n"
"polecenie spowoduje nieodwracalne zastąpienie starego wartości nową.\n"
-#: svnadmin/main.c:429
+#: ../svnadmin/main.c:429
msgid ""
"usage: svnadmin verify REPOS_PATH\n"
"\n"
@@ -8949,30 +8999,30 @@
"\n"
"Zweryfikuj poprawność danych znajdujących się w repozytorium.\n"
-#: svnadmin/main.c:486
+#: ../svnadmin/main.c:486
msgid "Invalid revision specifier"
msgstr "Podano błędny numer wersji"
-#: svnadmin/main.c:491
+#: ../svnadmin/main.c:491
#, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "Wersje nie mogą być większe od najmłodszej wersji (%ld)"
-#: svnadmin/main.c:569 svnadmin/main.c:669
+#: ../svnadmin/main.c:569 ../svnadmin/main.c:669
msgid "First revision cannot be higher than second"
msgstr "Pierwsza wersja nie może być wyższa niż druga"
-#: svnadmin/main.c:578
+#: ../svnadmin/main.c:578
#, c-format
msgid "Deltifying revision %ld..."
msgstr "Wyliczanie różnic dla wersji %ld..."
-#: svnadmin/main.c:582
+#: ../svnadmin/main.c:582
#, c-format
msgid "done.\n"
msgstr "zrobione.\n"
-#: svnadmin/main.c:706
+#: ../svnadmin/main.c:706
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -8989,13 +9039,13 @@
"\n"
"Dostępne podpolecenia:\n"
-#: svnadmin/main.c:713 svnlook/main.c:1752 svnserve/main.c:207
+#: ../svnadmin/main.c:713 ../svnlook/main.c:1752 ../svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
msgstr "Są dostępne następujące moduły dostępu do repozytorium (FS):\n"
-#: svnadmin/main.c:790
+#: ../svnadmin/main.c:790
#, c-format
msgid ""
"Repository lock acquired.\n"
@@ -9004,7 +9054,7 @@
"Uzyskano blokadę repozytorium.\n"
"Proszę czekać; odtwarzanie repozytorium może trwać długo...\n"
-#: svnadmin/main.c:826
+#: ../svnadmin/main.c:826
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -9012,13 +9062,13 @@
"Nie powiodło się założenie blokady na repozytorium. Możliwe, że\n"
"procesy takie jak httpd, svnserve lub svn blokują dostęp."
-#: svnadmin/main.c:831
+#: ../svnadmin/main.c:831
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"Oczekiwanie na blokadę repozytorium; możliwe, że inny proces blokuje dostęp\n"
-#: svnadmin/main.c:839
+#: ../svnadmin/main.c:839
#, c-format
msgid ""
"\n"
@@ -9027,57 +9077,57 @@
"\n"
"Odtwarzanie zakończone.\n"
-#: svnadmin/main.c:846
+#: ../svnadmin/main.c:846
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Najnowsza wersja repozytorium to %ld.\n"
-#: svnadmin/main.c:956
+#: ../svnadmin/main.c:956
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Usunięto transakcję '%s'.\n"
-#: svnadmin/main.c:1024 svnadmin/main.c:1051
+#: ../svnadmin/main.c:1024 ../svnadmin/main.c:1051
#, c-format
msgid "Missing revision"
msgstr "Brak wersji"
-#: svnadmin/main.c:1027 svnadmin/main.c:1054
+#: ../svnadmin/main.c:1027 ../svnadmin/main.c:1054
#, c-format
msgid "Only one revision allowed"
msgstr "Tylko jedna wersja jest dozwolona"
-#: svnadmin/main.c:1033
+#: ../svnadmin/main.c:1033
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Wymagany dokładnie jeden argument - atrybut i jeden argument - plik"
-#: svnadmin/main.c:1060
+#: ../svnadmin/main.c:1060
#, c-format
msgid "Exactly one file argument required"
msgstr "Wymagany dokładnie jeden argument - plik"
-#: svnadmin/main.c:1147 svnlook/main.c:1817
+#: ../svnadmin/main.c:1147 ../svnlook/main.c:1817
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID Żetonu: %s\n"
-#: svnadmin/main.c:1148 svnlook/main.c:1818
+#: ../svnadmin/main.c:1148 ../svnlook/main.c:1818
#, c-format
msgid "Owner: %s\n"
msgstr "Właściciel: %s\n"
-#: svnadmin/main.c:1149 svnlook/main.c:1819
+#: ../svnadmin/main.c:1149 ../svnlook/main.c:1819
#, c-format
msgid "Created: %s\n"
msgstr "Utworzone: %s\n"
-#: svnadmin/main.c:1150 svnlook/main.c:1820
+#: ../svnadmin/main.c:1150 ../svnlook/main.c:1820
#, c-format
msgid "Expires: %s\n"
msgstr "Wygasa: %s\n"
-#: svnadmin/main.c:1152
+#: ../svnadmin/main.c:1152
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9088,7 +9138,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1153
+#: ../svnadmin/main.c:1153
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9099,28 +9149,28 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1210
+#: ../svnadmin/main.c:1210
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Ścieżka '%s' nie jest zablokowana.\n"
-#: svnadmin/main.c:1222
+#: ../svnadmin/main.c:1222
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Zdjęto blokadę z '%s'.\n"
-#: svnadmin/main.c:1331
+#: ../svnadmin/main.c:1331
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Wielokrotnie podano opcję numeru wersji; spróbuj '-r N:M' zamiast '-r N -r M'"
-#: svnadmin/main.c:1459
+#: ../svnadmin/main.c:1459
#, c-format
msgid "subcommand argument required\n"
msgstr "podpolecenie wymaga argumenty\n"
-#: svnadmin/main.c:1533
+#: ../svnadmin/main.c:1533
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9129,55 +9179,55 @@
"Podpolecenie '%s' nie obsługuje opcji '%s'\n"
"Użyj 'svnadmin help %s', by uzyskać informacje o użyciu.\n"
-#: svnadmin/main.c:1566
+#: ../svnadmin/main.c:1566
msgid "Try 'svnadmin help' for more info"
msgstr "Użyj 'svnadmin help', by uzyskać więcej informacji"
-#: svndumpfilter/main.c:313
+#: ../svndumpfilter/main.c:313
msgid "This is an empty revision for padding."
msgstr "To jest pusta wersja tylko dla uzupełnienia."
-#: svndumpfilter/main.c:383
+#: ../svndumpfilter/main.c:383
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Wersja %ld zatwierdzona jako %ld.\n"
-#: svndumpfilter/main.c:406
+#: ../svndumpfilter/main.c:406
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Pominięto wersję %ld.\n"
-#: svndumpfilter/main.c:508
+#: ../svndumpfilter/main.c:508
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "Błędna składnia ścieżki '%s'"
-#: svndumpfilter/main.c:552
+#: ../svndumpfilter/main.c:552
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Brak właściwej wersji copyfrom w filtrowanym strumieniu"
-#: svndumpfilter/main.c:657
+#: ../svndumpfilter/main.c:657
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr "Wykryto blok delty atrybutu - nieobsługiwane przez svndumpfilter"
-#: svndumpfilter/main.c:782
+#: ../svndumpfilter/main.c:782
msgid "Do not display filtering statistics."
msgstr "Nie wyświetlaj statystyki filtrowania"
-#: svndumpfilter/main.c:784
+#: ../svndumpfilter/main.c:784
msgid "Remove revisions emptied by filtering."
msgstr "Usuń puste wersje wyczyszczone podczas filtrowania"
-#: svndumpfilter/main.c:786
+#: ../svndumpfilter/main.c:786
msgid "Renumber revisions left after filtering."
msgstr "Przenumeruj wersje pozostawione po filtracji"
-#: svndumpfilter/main.c:788
+#: ../svndumpfilter/main.c:788
msgid "Don't filter revision properties."
msgstr "Nie filtruj atrybutów wersji."
-#: svndumpfilter/main.c:799
+#: ../svndumpfilter/main.c:799
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -9185,7 +9235,7 @@
"Wyfiltruj ze strumienia zrzutu węzły posiadające podane prefiksy.\n"
"Użycie: svndumpfilter exclude PREFIKS_ŚCIEŻKI...\n"
-#: svndumpfilter/main.c:805
+#: ../svndumpfilter/main.c:805
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -9193,7 +9243,7 @@
"Wyfiltruj ze strumienia zrzutu węzły nieposiadające podanych prefiksów.\n"
"Użycie: svndumpfilter include PREFIKS_ŚCIEŻKI...\n"
-#: svndumpfilter/main.c:811
+#: ../svndumpfilter/main.c:811
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -9201,7 +9251,7 @@
"Opisz użycie tego programu lub jego podpoleceń.\n"
"Użycie: svndumpfilter help [POLECENIE...]\n"
-#: svndumpfilter/main.c:882
+#: ../svndumpfilter/main.c:882
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -9216,27 +9266,27 @@
"\n"
"Dostępne podpolecenia:\n"
-#: svndumpfilter/main.c:937
+#: ../svndumpfilter/main.c:937
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Wykluczając prefiksy (i opuszczając puste wersje):\n"
-#: svndumpfilter/main.c:939
+#: ../svndumpfilter/main.c:939
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Wykluczając prefiksy:\n"
-#: svndumpfilter/main.c:941
+#: ../svndumpfilter/main.c:941
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Włączając prefiksy (i opuszczając puste wersje):\n"
-#: svndumpfilter/main.c:943
+#: ../svndumpfilter/main.c:943
#, c-format
msgid "Including prefixes:\n"
msgstr "Włączając prefiksy:\n"
-#: svndumpfilter/main.c:970
+#: ../svndumpfilter/main.c:970
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -9245,21 +9295,21 @@
"Opuszczono %d wersji.\n"
"\n"
-#: svndumpfilter/main.c:976
+#: ../svndumpfilter/main.c:976
msgid "Revisions renumbered as follows:\n"
msgstr "Wersje przenumerowano następująco:\n"
-#: svndumpfilter/main.c:1003
+#: ../svndumpfilter/main.c:1003
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (opuszczone)\n"
-#: svndumpfilter/main.c:1018
+#: ../svndumpfilter/main.c:1018
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "Opuszczono %d obiekt(y):\n"
-#: svndumpfilter/main.c:1239
+#: ../svndumpfilter/main.c:1239
#, c-format
msgid ""
"\n"
@@ -9268,7 +9318,7 @@
"\n"
"Błąd: nie dostarczono prefiksów.\n"
-#: svndumpfilter/main.c:1283
+#: ../svndumpfilter/main.c:1283
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9277,55 +9327,55 @@
"Podpolecenie '%s' nie obsługuje opcji '%s'\n"
"Użyj 'svndumpfilter help %s', by uzyskać informacje o użyciu.\n"
-#: svndumpfilter/main.c:1301
+#: ../svndumpfilter/main.c:1301
msgid "Try 'svndumpfilter help' for more info"
msgstr "Użyj 'svndumpfilter help', by uzyskać więcej informacji"
-#: svnlook/main.c:95
+#: ../svnlook/main.c:95
msgid "show details for copies"
msgstr "pokaż szczegóły dla kopii"
-#: svnlook/main.c:98
+#: ../svnlook/main.c:98
msgid "print differences against the copy source"
msgstr "wypisz zmiany wobec kopii źródłowej"
-#: svnlook/main.c:101
+#: ../svnlook/main.c:101
msgid "show full paths instead of indenting them"
msgstr "pokaż pełne ścieżki zamiast stosowania wcięć"
-#: svnlook/main.c:107
+#: ../svnlook/main.c:107
msgid "maximum number of history entries"
msgstr "maksymalna liczba wpisów historii"
-#: svnlook/main.c:110
+#: ../svnlook/main.c:110
msgid "do not print differences for added files"
msgstr "nie wypisuj zmian dla dodanych plików"
-#: svnlook/main.c:116
+#: ../svnlook/main.c:116
msgid "operate on single directory only"
msgstr "działaj tylko w pojedyńczym katalogu"
-#: svnlook/main.c:119
+#: ../svnlook/main.c:119
msgid "specify revision number ARG"
msgstr "podaj numer wersji"
-#: svnlook/main.c:122
+#: ../svnlook/main.c:122
msgid "operate on a revision property (use with -r or -t)"
msgstr "działaj na atrybucie wersji (do użycia wraz z -r lub -t)"
-#: svnlook/main.c:125
+#: ../svnlook/main.c:125
msgid "show node revision ids for each path"
msgstr "podawaj identyfikator wersji węzła dla każdej ścieżki"
-#: svnlook/main.c:128
+#: ../svnlook/main.c:128
msgid "specify transaction name ARG"
msgstr "podaj nazwę transakcji"
-#: svnlook/main.c:131
+#: ../svnlook/main.c:131
msgid "be verbose"
msgstr "podawaj informacje pomocnicze"
-#: svnlook/main.c:177
+#: ../svnlook/main.c:177
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -9335,7 +9385,7 @@
"\n"
"Podaj autora.\n"
-#: svnlook/main.c:182
+#: ../svnlook/main.c:182
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -9345,7 +9395,7 @@
"\n"
"Wypisz treść podanego pliku. Wiodący '/' w ŚCIEŻCE_PLIKU jest opcjonalny.\n"
-#: svnlook/main.c:187
+#: ../svnlook/main.c:187
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -9355,7 +9405,7 @@
"\n"
"Wypisz ścieżki do obiektów, które zostały zmienione.\n"
-#: svnlook/main.c:192
+#: ../svnlook/main.c:192
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -9365,7 +9415,7 @@
"\n"
"Wypisz datę.\n"
-#: svnlook/main.c:197
+#: ../svnlook/main.c:197
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -9375,7 +9425,7 @@
"\n"
"Wypisz (w stylu GNU diff) informację o zmienionych plikach i atrybutach.\n"
-#: svnlook/main.c:203
+#: ../svnlook/main.c:203
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -9388,7 +9438,7 @@
"(zmiany atrybutów) bądź pośrednia (zmiany plików znajdujących się w\n"
"katalogu).\n"
-#: svnlook/main.c:209
+#: ../svnlook/main.c:209
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -9398,7 +9448,7 @@
"\n"
"Opisz użycie tego programu lub jego podpoleceń.\n"
-#: svnlook/main.c:214
+#: ../svnlook/main.c:214
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9410,7 +9460,7 @@
"Wypisz informacje o historii podanej ścieżki w repozytorium (lub\n"
"katalogu głównego repozytorium, jeśli nie podano ścieżki).\n"
-#: svnlook/main.c:220
+#: ../svnlook/main.c:220
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -9420,7 +9470,7 @@
"\n"
"Wypisz autora, datę/czas, rozmiar opisu zmiany oraz opis zmiany.\n"
-#: svnlook/main.c:225
+#: ../svnlook/main.c:225
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -9431,7 +9481,7 @@
"Jeżeli blokada jest założona, podaj informacje o blokadzie\n"
"obiektu o podanej ścieżce w repozytorium.\n"
-#: svnlook/main.c:230
+#: ../svnlook/main.c:230
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -9441,7 +9491,7 @@
"\n"
"Wypisz opis zmiany.\n"
-#: svnlook/main.c:235
+#: ../svnlook/main.c:235
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -9454,7 +9504,7 @@
"Wypisz wartość podanego atrybutu obiektu o podanej ścieżce w repozytorium.\n"
"Jeśli podano opcję --revprop, wyświetla wartość atrybutu wersji.\n"
-#: svnlook/main.c:241
+#: ../svnlook/main.c:241
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9468,7 +9518,7 @@
"jeśli podano opcję --revprop, wyświetl atrybuty wersji.\n"
"Gdy podano opcję -v, wypisz także wartości atrybutów.\n"
-#: svnlook/main.c:248
+#: ../svnlook/main.c:248
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -9481,7 +9531,7 @@
"ścieżki (gdy jej nie podano, zawartość całego repozytorium od głównego\n"
"katalogu począwszy), opcjonalnie podając także identyfikatory wersji.\n"
-#: svnlook/main.c:254
+#: ../svnlook/main.c:254
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -9491,7 +9541,7 @@
"\n"
"Wypisz UUID repozytorium.\n"
-#: svnlook/main.c:259
+#: ../svnlook/main.c:259
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -9501,28 +9551,28 @@
"\n"
"Wypisz numer najnowszej wersji obecnej w repozytorium.\n"
-#: svnlook/main.c:863
+#: ../svnlook/main.c:863
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Skopiowane: %s (z wersji %ld, %s)\n"
-#: svnlook/main.c:931
+#: ../svnlook/main.c:931
msgid "Added"
msgstr "Dodano"
-#: svnlook/main.c:932
+#: ../svnlook/main.c:932
msgid "Deleted"
msgstr "Usunięto"
-#: svnlook/main.c:933
+#: ../svnlook/main.c:933
msgid "Modified"
msgstr "Zmieniono"
-#: svnlook/main.c:934
+#: ../svnlook/main.c:934
msgid "Index"
msgstr "Indeks"
-#: svnlook/main.c:945
+#: ../svnlook/main.c:945
msgid ""
"(Binary files differ)\n"
"\n"
@@ -9530,26 +9580,26 @@
"(Binarne pliki różnią się)\n"
"\n"
-#: svnlook/main.c:1084
+#: ../svnlook/main.c:1084
msgid "unknown"
msgstr "nieznany"
-#: svnlook/main.c:1231 svnlook/main.c:1324 svnlook/main.c:1353
+#: ../svnlook/main.c:1231 ../svnlook/main.c:1324 ../svnlook/main.c:1353
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transakcja '%s' nie jest oparta na wersji; dziwne"
-#: svnlook/main.c:1261
+#: ../svnlook/main.c:1261
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' jest URL-em, a prawdopodobnie powinien być ścieżką"
-#: svnlook/main.c:1288
+#: ../svnlook/main.c:1288
#, c-format
msgid "Path '%s' is not a file"
msgstr "Ścieżka '%s' nie jest plikiem"
-#: svnlook/main.c:1437
+#: ../svnlook/main.c:1437
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -9558,7 +9608,7 @@
" WERSJA ŚCIEŻKA <ID>\n"
"-------- ------------\n"
-#: svnlook/main.c:1442
+#: ../svnlook/main.c:1442
#, c-format
msgid ""
"REVISION PATH\n"
@@ -9567,27 +9617,27 @@
" WERSJA ŚCIEŻKA\n"
"-------- -------\n"
-#: svnlook/main.c:1491
+#: ../svnlook/main.c:1491
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Atrybutu '%s' nie znaleziono w wersji '%ld'"
-#: svnlook/main.c:1498
+#: ../svnlook/main.c:1498
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Atrybutu '%s' nie znaleziono w ścieżce '%s' w wersji %ld"
-#: svnlook/main.c:1503
+#: ../svnlook/main.c:1503
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Atrybutu '%s' nie znaleziono w ścieżce '%s' w transakcji %s"
-#: svnlook/main.c:1681 svnlook/main.c:1896
+#: ../svnlook/main.c:1681 ../svnlook/main.c:1896
#, c-format
msgid "Missing repository path argument"
msgstr "Brak argumentu podającego ścieżkę w repozytorium"
-#: svnlook/main.c:1742
+#: ../svnlook/main.c:1742
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -9611,11 +9661,11 @@
"\n"
"Dostępne podpolecenia:\n"
-#: svnlook/main.c:1798
+#: ../svnlook/main.c:1798
msgid "Missing path argument"
msgstr "Brak argumentu podającego ścieżkę"
-#: svnlook/main.c:1823
+#: ../svnlook/main.c:1823
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -9624,7 +9674,7 @@
"Komentarz (%i linie):\n"
"%s\n"
-#: svnlook/main.c:1824
+#: ../svnlook/main.c:1824
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -9633,42 +9683,42 @@
"Komentarz (%i linia):\n"
"%s\n"
-#: svnlook/main.c:1870
+#: ../svnlook/main.c:1870
#, c-format
msgid "Missing propname argument"
msgstr "Brak argumentu podającego nazwę atrybutu"
-#: svnlook/main.c:1871
+#: ../svnlook/main.c:1871
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Brak nazwy atrybutu i ścieżki obiektu w repozytorium."
-#: svnlook/main.c:1877
+#: ../svnlook/main.c:1877
msgid "Missing propname or repository path argument"
msgstr "Brak nazwy atrybutu lub ścieżki obiektu w repozytorium."
-#: svnlook/main.c:2036
+#: ../svnlook/main.c:2036
msgid "Invalid revision number supplied"
msgstr "Podano błędny numer wersji"
-#: svnlook/main.c:2124
+#: ../svnlook/main.c:2124
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Opcje '--transaction' (-t) i '--revision' (-r) nie mogą występować "
"równocześnie"
-#: svnlook/main.c:2206
+#: ../svnlook/main.c:2206
#, c-format
msgid "Repository argument required\n"
msgstr "Argument podający repozytorium jest wymagany\n"
-#: svnlook/main.c:2215
+#: ../svnlook/main.c:2215
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' jest URL-em, a powinien być ścieżką\n"
-#: svnlook/main.c:2266
+#: ../svnlook/main.c:2266
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9677,91 +9727,91 @@
"Podpolecenie '%s' nie obsługuje opcji '%s'\n"
"Użyj 'svnlook help %s', by uzyskać informacje o użyciu.\n"
-#: svnlook/main.c:2309
+#: ../svnlook/main.c:2309
msgid "Try 'svnlook help' for more info"
msgstr "Użyj 'svnlook help', by uzyskać więcej informacji"
-#: svnserve/cyrus_auth.c:243
+#: ../svnserve/cyrus_auth.c:243
#, c-format
msgid "Can't get hostname"
msgstr "Nie można uzyskać nazwy hosta"
-#: svnserve/cyrus_auth.c:311
+#: ../svnserve/cyrus_auth.c:311
msgid "Could not obtain the list of SASL mechanisms"
msgstr "Nie można otrzymać listy mechanizmów SASL"
-#: svnserve/cyrus_auth.c:351
+#: ../svnserve/cyrus_auth.c:351
msgid "Couldn't obtain the authenticated username"
msgstr "Nie można otrzymać zautentyfikowanej nazwy użytkownika"
-#: svnserve/main.c:142
+#: ../svnserve/main.c:142
msgid "daemon mode"
msgstr "tryb demon"
-#: svnserve/main.c:144
+#: ../svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "port nasłuchu (dla pracy w trybie demon)"
-#: svnserve/main.c:146
+#: ../svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "nazwa hosta nasłuchu lub jego adres IP (dla trybu demon)"
-#: svnserve/main.c:148
+#: ../svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr ""
"uruchom jako zadanie pierwszoplanowe (użyteczne przy poszukiwaniu błędów)"
-#: svnserve/main.c:149 svnversion/main.c:124
+#: ../svnserve/main.c:149 ../svnversion/main.c:124
msgid "display this help"
msgstr "wyświetl tekst pomocy"
-#: svnserve/main.c:152
+#: ../svnserve/main.c:152
msgid "inetd mode"
msgstr "tryb inetd"
-#: svnserve/main.c:153
+#: ../svnserve/main.c:153
msgid "root of directory to serve"
msgstr "katalog, w którym ma być uruchomiony serwer"
-#: svnserve/main.c:155
+#: ../svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr "wymuś tylko do odczytu, pomijając plik konfiguracyjny repozytorium"
-#: svnserve/main.c:156
+#: ../svnserve/main.c:156
msgid "tunnel mode"
msgstr "tryb tunnel"
-#: svnserve/main.c:158
+#: ../svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr ""
"nazwa użytkownika dla trybu tunnel (domyślnie jest to bieżąca nazwa uid)"
-#: svnserve/main.c:160
+#: ../svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "użyj wątków zamiast tworzenia procesów za pomocą fork"
-#: svnserve/main.c:162
+#: ../svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "nasłuchuj tylko raz (użyteczne przy poszukiwaniu błędów)"
-#: svnserve/main.c:164
+#: ../svnserve/main.c:164
msgid "read configuration from file ARG"
msgstr "odczytaj konfigurację z pliku ARG"
-#: svnserve/main.c:166
+#: ../svnserve/main.c:166
msgid "write server process ID to file ARG"
msgstr "zapisz ID procesu serwera do pliku ARG"
-#: svnserve/main.c:169
+#: ../svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "uruchom jako serwis Windows (tylko SCM)"
-#: svnserve/main.c:181
+#: ../svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Użyj '%s --help', by uzyskać informacje o użyciu.\n"
-#: svnserve/main.c:190
+#: ../svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -9771,23 +9821,23 @@
"\n"
"Poprawne opcje:\n"
-#: svnserve/main.c:444
+#: ../svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr ""
"svnserve: Ścieżka katalogu głównego '%s' nie istnieje lub nie jest "
"katalogiem.\n"
-#: svnserve/main.c:493
+#: ../svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Musisz podać dokładnie jedną z opcji -d, -i, -t lub -X.\n"
-#: svnserve/main.c:511
+#: ../svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Opcja --tunnel-user jest poprawna jedynie w trybie tunnel.\n"
-#: svnserve/main.c:576
+#: ../svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -9796,81 +9846,81 @@
"svnserve: Opcja --service jest poprawna tylko wtedy, gdy proces jest "
"uruchamiany przez Service Control Manager.\n"
-#: svnserve/main.c:612
+#: ../svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Nie można uzyskać informacji o adresie"
-#: svnserve/main.c:626
+#: ../svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Nie można utworzyć gniazda serwera"
-#: svnserve/main.c:637
+#: ../svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Nie można związać gniazda serwera"
-#: svnserve/main.c:703
+#: ../svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Nie można zezwolić na połączenia klienta"
-#: svnserve/main.c:755
+#: ../svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Nie można utworzyć atrybutów wątku"
-#: svnserve/main.c:763
+#: ../svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Nie można ustawić odłączonego stanu"
-#: svnserve/main.c:776
+#: ../svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Nie można utworzyć wątku"
-#: svnserve/serve.c:1484
+#: ../svnserve/serve.c:1486
msgid "Path is not a string"
msgstr "Ścieżka nie jest ciągiem znaków"
-#: svnserve/serve.c:1624
+#: ../svnserve/serve.c:1626
msgid "Log revprop entry not a string"
msgstr "Element log revprop nie jest ciągiem znaków"
-#: svnserve/serve.c:1631
+#: ../svnserve/serve.c:1633
#, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Nieznany wyraz '%s' atrybutu wersji w poleceniu log"
-#: svnserve/serve.c:1647
+#: ../svnserve/serve.c:1649
msgid "Log path entry not a string"
msgstr "Element log path nie jest ciągiem znaków"
-#: svnserve/winservice.c:341
+#: ../svnserve/winservice.c:341
#, c-format
msgid "Failed to create winservice_start_event"
msgstr "Nie powiodło się utworzenie winservice_start_event"
-#: svnserve/winservice.c:352
+#: ../svnserve/winservice.c:352
#, c-format
msgid "The service failed to start"
msgstr "Nie powiodło się uruchomienie usługi"
-#: svnserve/winservice.c:400
+#: ../svnserve/winservice.c:400
#, c-format
msgid "Failed to connect to Service Control Manager"
msgstr "Nie powiodła się próba podłączenia do Menadżera Usług"
-#: svnserve/winservice.c:411
+#: ../svnserve/winservice.c:411
#, c-format
msgid ""
"The service failed to start; an internal error occurred while starting the "
"service"
msgstr "Uruchomienie usługi nie powiodło się; wystąpił błąd wewnętrzny"
-#: svnsync/main.c:65
+#: ../svnsync/main.c:65
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -9900,7 +9950,7 @@
"docelowym inaczej niż za pomocą 'svnsync'. Innymi słowy, docelowe\n"
"repozytorium musi być lustrem tylko do odczytu repozytorium źródłowego.\n"
-#: svnsync/main.c:80
+#: ../svnsync/main.c:80
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
@@ -9913,7 +9963,7 @@
"źródłowego\n"
"repozytorium, którym to repozytorium docelowe zostało zainicjalizowane.\n"
-#: svnsync/main.c:86
+#: ../svnsync/main.c:86
msgid ""
"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
@@ -9947,7 +9997,7 @@
"do docelowego repozytorium. Możesz użyć \"HEAD\" dla każdej wersji, co\n"
"zostanie zinterpretowane jako \"najnowsza przeniesiona wersja\".\n"
-#: svnsync/main.c:102
+#: ../svnsync/main.c:102
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -9957,11 +10007,11 @@
"\n"
"Opisz użycie tego programu lub jego podpoleceń.\n"
-#: svnsync/main.c:112
+#: ../svnsync/main.c:112
msgid "print as little as possible"
msgstr "wypisuj jak najmniej informacji"
-#: svnsync/main.c:118
+#: ../svnsync/main.c:118
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
@@ -9969,7 +10019,7 @@
"określ nazwę użytkownika jako ARGUMENT (przestarzałe;\n"
" zobacz --source-username i --sync-username)"
-#: svnsync/main.c:122
+#: ../svnsync/main.c:122
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -9977,82 +10027,82 @@
"określ hasło jako ARGUMENT (przestarzałe;\n"
" zobacz --source-password i --sync-password)"
-#: svnsync/main.c:126
+#: ../svnsync/main.c:126
msgid "connect to source repository with username ARG"
msgstr "połącz z repozytorium źródłowym przy użyciu nazwy użytkownika ARGUMENT"
-#: svnsync/main.c:128
+#: ../svnsync/main.c:128
msgid "connect to source repository with password ARG"
msgstr "połącz z repozytorium źródłowym przy użyciu hasła ARGUMENT"
-#: svnsync/main.c:130
+#: ../svnsync/main.c:130
msgid "connect to sync repository with username ARG"
msgstr ""
"połącz z repozytorium synchronizacyjnym przy użyciu nazwy użytkownika "
"ARGUMENT"
-#: svnsync/main.c:132
+#: ../svnsync/main.c:132
msgid "connect to sync repository with password ARG"
msgstr "połącz z repozytorium synchronizacyjnym przy użyciu hasła ARGUMENT"
-#: svnsync/main.c:222
+#: ../svnsync/main.c:222
#, c-format
msgid "Can't get local hostname"
msgstr "Nie można uzyskać lokalnej nazwy hosta"
-#: svnsync/main.c:245
+#: ../svnsync/main.c:245
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
"Nie udało się uzyskać blokady na docelowym repozytorium, obecnie\n"
"trzymanym przez '%s'\n"
-#: svnsync/main.c:340
+#: ../svnsync/main.c:340
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Katalog główny sesji to '%s', ale katalog główny repozytorium to '%s'"
-#: svnsync/main.c:410
+#: ../svnsync/main.c:410
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Skopiowano atrybuty dla wersji %ld (%s* atrybutów pominięto).\n"
-#: svnsync/main.c:415
+#: ../svnsync/main.c:415
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Skopiowano atrybuty dla wersji %ld.\n"
-#: svnsync/main.c:498
+#: ../svnsync/main.c:498
msgid "Cannot initialize a repository with content in it"
msgstr "Nie można zainicjalizować repozytorium posiadającego zawartość"
-#: svnsync/main.c:509
+#: ../svnsync/main.c:509
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Repozytorium docelowe jest już synchronizujące z '%s'"
-#: svnsync/main.c:574 svnsync/main.c:577 svnsync/main.c:1249
-#: svnsync/main.c:1398
+#: ../svnsync/main.c:574 ../svnsync/main.c:577 ../svnsync/main.c:1249
+#: ../svnsync/main.c:1398
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Ścieżka '%s' nie jest URL-em"
-#: svnsync/main.c:959
+#: ../svnsync/main.c:959
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Zatwierdzona wersja %ld.\n"
-#: svnsync/main.c:1000
+#: ../svnsync/main.c:1000
msgid "Destination repository has not been initialized"
msgstr "Docelowe repozytorium nie zostało zainicjalizowane"
-#: svnsync/main.c:1015
+#: ../svnsync/main.c:1015
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr ""
"UUID źródłowego repozytorium (%s) nie zgadza się z oczekiwanym UUID (%s)"
-#: svnsync/main.c:1078
+#: ../svnsync/main.c:1078
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -10063,7 +10113,7 @@
"wersja HEAD (%ld) są niespójne; czy przeprowadziłeś zatwierdzenie do "
"docelowego repozytorium bez użycia svnsync?"
-#: svnsync/main.c:1116
+#: ../svnsync/main.c:1116
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -10072,13 +10122,13 @@
"Docelowa wersja HEAD (%ld) nie jest ostatnio połączoną wersją (%ld); czy "
"przeprowadziłeś zatwierdzenie do docelowego repozytorium bez użycia svnsync?"
-#: svnsync/main.c:1194
+#: ../svnsync/main.c:1194
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr ""
"Zatwierdzanie zmian stworzyło wersję o numerze %ld, a powinno stworzyć %ld"
-#: svnsync/main.c:1291 svnsync/main.c:1296
+#: ../svnsync/main.c:1291 ../svnsync/main.c:1296
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -10086,17 +10136,17 @@
"Nie można skopiować atrybutów wersji (%ld), która jeszcze nie była "
"synchronizowana"
-#: svnsync/main.c:1348
+#: ../svnsync/main.c:1348
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' nie jest poprawnym zakresem wersji"
-#: svnsync/main.c:1362 svnsync/main.c:1382
+#: ../svnsync/main.c:1362 ../svnsync/main.c:1382
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Błędny numer wersji (%ld)"
-#: svnsync/main.c:1422
+#: ../svnsync/main.c:1422
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -10112,7 +10162,7 @@
"\n"
"Dostępne podpolecenia:\n"
-#: svnsync/main.c:1584
+#: ../svnsync/main.c:1584
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -10121,7 +10171,7 @@
"opcji --source-username, --source-password, --sync-username lub --sync-"
"password.\n"
-#: svnsync/main.c:1664
+#: ../svnsync/main.c:1664
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10130,16 +10180,16 @@
"Podpolecenie '%s' nie obsługuje opcji '%s'.\n"
"Użyj 'svnsync help %s', by uzyskać informacje o użyciu.\n"
-#: svnsync/main.c:1736
+#: ../svnsync/main.c:1736
msgid "Try 'svnsync help' for more info"
msgstr "Użyj 'svnsync help', aby uzyskać więcej informacji"
-#: svnversion/main.c:40
+#: ../svnversion/main.c:40
#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Użyj 'svnversion --help', by uzyskać informacje o użyciu.\n"
-#: svnversion/main.c:51
+#: ../svnversion/main.c:51
#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
@@ -10200,20 +10250,20 @@
"\n"
"Poprawne opcje:\n"
-#: svnversion/main.c:122
+#: ../svnversion/main.c:122
msgid "do not output the trailing newline"
msgstr "nie wypisuj końcowego znaku nowego wiersza"
-#: svnversion/main.c:123
+#: ../svnversion/main.c:123
msgid "last changed rather than current revisions"
msgstr "ostatnio zmieniona a nie aktualna wersja"
-#: svnversion/main.c:222
+#: ../svnversion/main.c:222
#, c-format
msgid "exported%s"
msgstr "wyeksportowane%s"
-#: svnversion/main.c:231
+#: ../svnversion/main.c:231
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "%s' niepodlegające zarządzaniu wersjami i niewyeksportowane\n"
diff --git a/subversion/svnadmin/main.c b/subversion/svnadmin/main.c
index 15623d9..4f2f131 100644
--- a/subversion/svnadmin/main.c
+++ b/subversion/svnadmin/main.c
@@ -84,7 +84,8 @@
/* Helper to open stdio streams */
static svn_error_t *
create_stdio_stream(svn_stream_t **stream,
- apr_status_t open_fn(apr_file_t **, apr_pool_t *),
+ APR_DECLARE(apr_status_t) open_fn(apr_file_t **,
+ apr_pool_t *),
apr_pool_t *pool)
{
apr_file_t *stdio_file;
diff --git a/subversion/svndumpfilter/main.c b/subversion/svndumpfilter/main.c
index 39b2545..6c1a055 100644
--- a/subversion/svndumpfilter/main.c
+++ b/subversion/svndumpfilter/main.c
@@ -51,7 +51,8 @@
*/
static svn_error_t *
create_stdio_stream(svn_stream_t **stream,
- apr_status_t open_fn(apr_file_t **, apr_pool_t *),
+ APR_DECLARE(apr_status_t) open_fn(apr_file_t **,
+ apr_pool_t *),
apr_pool_t *pool)
{
apr_file_t *stdio_file;
diff --git a/subversion/svnlook/main.c b/subversion/svnlook/main.c
index 5a0e3ed..aa54018 100644
--- a/subversion/svnlook/main.c
+++ b/subversion/svnlook/main.c
@@ -765,6 +765,7 @@
for (i = 0; i < prop_diffs->nelts; i++)
{
+ const char *header_fmt;
const svn_string_t *orig_value;
const svn_prop_t *pc = &APR_ARRAY_IDX(prop_diffs, i, svn_prop_t);
@@ -775,7 +776,13 @@
else
orig_value = NULL;
- SVN_ERR(svn_cmdline_printf(pool, _("Name: %s\n"), pc->name));
+ if (! orig_value)
+ header_fmt = _("Added: %s\n");
+ else if (! pc->value)
+ header_fmt = _("Deleted: %s\n");
+ else
+ header_fmt = _("Modified: %s\n");
+ SVN_ERR(svn_cmdline_printf(pool, header_fmt, pc->name));
/* For now, we have a rather simple heuristic: if this is an
"svn:" property, then assume the value is UTF-8 and must
diff --git a/subversion/svnserve/serve.c b/subversion/svnserve/serve.c
index 77802fe..894ea5f 100644
--- a/subversion/svnserve/serve.c
+++ b/subversion/svnserve/serve.c
@@ -43,7 +43,6 @@
#include "svn_props.h"
#include "svn_mergeinfo.h"
#include "svn_user.h"
-#include "private/svn_repos_private.h"
#include "server.h"
@@ -2502,7 +2501,7 @@
/* Open the repository and fill in b with the resulting information. */
SVN_ERR(svn_repos_open(&b->repos, repos_root, pool));
- svn_repos__set_capabilities(b->repos, capabilities);
+ SVN_ERR(svn_repos_remember_client_capabilities(b->repos, capabilities));
b->fs = svn_repos_fs(b->repos);
b->fs_path = svn_stringbuf_create(full_path + strlen(repos_root),
pool);
diff --git a/subversion/tests/cmdline/authz_tests.py b/subversion/tests/cmdline/authz_tests.py
index 804673d..249f5d3 100755
--- a/subversion/tests/cmdline/authz_tests.py
+++ b/subversion/tests/cmdline/authz_tests.py
@@ -126,9 +126,9 @@
sbox.repo_url + "/A",
"-m", "a log message");
if out:
- raise svntest.actions.SVNUnexpectedStdout(out)
+ raise svntest.verify.SVNUnexpectedStdout(out)
if not err:
- raise svntest.actions.SVNUnexpectedStderr("Missing stderr")
+ raise svntest.verify.SVNUnexpectedStderr("Missing stderr")
# test whether read access is correctly granted and denied
def authz_read_access(sbox):
diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py
index 8ffc507..9a3da7b 100755
--- a/subversion/tests/cmdline/basic_tests.py
+++ b/subversion/tests/cmdline/basic_tests.py
@@ -1448,7 +1448,7 @@
for line in output:
# If we see foo.o in the add output, fail the test.
if re.match(r'^A\s+.*foo.o$', line):
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
# Else never matched the unwanted output, so the test passed.
@@ -1500,7 +1500,7 @@
for line in output:
# If we don't see ignores in the add output, fail the test.
if not re.match(r'^A\s+.*(foo.(o|rej|lo|c)|dir)$', line):
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
#----------------------------------------------------------------------
def basic_add_parents(sbox):
@@ -2162,7 +2162,7 @@
def info_nonexisting_file(sbox):
"get info on a file not in the repo"
- sbox.build()
+ sbox.build(create_wc = False)
idonotexist_url = sbox.repo_url + '/IdoNotExist'
output, errput = svntest.main.run_svn(1, 'info', idonotexist_url)
diff --git a/subversion/tests/cmdline/commit_tests.py b/subversion/tests/cmdline/commit_tests.py
index 4717d08..8133178 100755
--- a/subversion/tests/cmdline/commit_tests.py
+++ b/subversion/tests/cmdline/commit_tests.py
@@ -854,7 +854,7 @@
if os.path.exists(logfilename):
fp = open(logfilename)
else:
- raise svntest.actions.SVNUnexpectedOutput("hook logfile %s not found")\
+ raise svntest.verify.SVNUnexpectedOutput("hook logfile %s not found")\
% logfilename
actual_data = fp.readlines()
@@ -2511,7 +2511,7 @@
# Create a start-commit hook that detects the "mergeinfo" capability.
hook_text = "import sys\n" + \
"fp = open(sys.argv[1] + '/hooks.log', 'w')\n" + \
- "caps = sys.argv[3].split(',')\n" + \
+ "caps = sys.argv[3].split(':')\n" + \
"if 'mergeinfo' in caps:\n" + \
" fp.write('yes')\n" + \
"else:\n" + \
@@ -2533,7 +2533,7 @@
data = open(log_path).read()
os.unlink(log_path)
else:
- raise svntest.actions.SVNUnexpectedOutput("'%s' not found") % log_path
+ raise svntest.verify.SVNUnexpectedOutput("'%s' not found") % log_path
if data != 'yes':
raise svntest.Failure
diff --git a/subversion/tests/cmdline/copy_tests.py b/subversion/tests/cmdline/copy_tests.py
index d6d4314..1fa2cd0 100755
--- a/subversion/tests/cmdline/copy_tests.py
+++ b/subversion/tests/cmdline/copy_tests.py
@@ -31,22 +31,6 @@
Item = svntest.wc.StateItem
-######################################################################
-# Utilities
-#
-
-def get_repos_rev(sbox):
- wc_dir = sbox.wc_dir;
-
- out, err = svntest.actions.run_and_verify_svn("Getting Repository Revision",
- None, [], "up", wc_dir)
-
- mo=re.match("(?:At|Updated to) revision (\\d+)\\.", out[-1])
- if mo:
- return int(mo.group(1))
- else:
- raise svntest.Failure
-
#
#----------------------------------------------------------------------
# Helper for wc_copy_replacement and repos_to_wc_copy_replacement
@@ -485,7 +469,7 @@
None, None,
wc_dir)
- # Use 'svn cp -r 1 URL URL' to resurrect the deleted directory, where
+ # Use 'svn cp URL@1 URL' to resurrect the deleted directory, where
# the two URLs are identical. This used to trigger a failure.
url = sbox.repo_url + '/A/D/G'
svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -1479,24 +1463,25 @@
def double_uri_escaping_1814(sbox):
"check for double URI escaping in svn ls -R"
- sbox.build()
+ sbox.build(create_wc = False)
base_url = sbox.repo_url + '/base'
+ # rev. 2
svntest.actions.run_and_verify_svn(None, None, [],
'mkdir', '-m', 'mybase',
base_url)
orig_url = base_url + '/foo%20bar'
+ # rev. 3
svntest.actions.run_and_verify_svn(None, None, [],
'mkdir', '-m', 'r1',
orig_url)
+ orig_rev = 3
- orig_rev = get_repos_rev(sbox);
-
+ # rev. 4
new_url = base_url + '/foo_bar'
-
svntest.actions.run_and_verify_svn(None, None, [],
'mv', '-m', 'r2',
orig_url, new_url)
diff --git a/subversion/tests/cmdline/depth_tests.py b/subversion/tests/cmdline/depth_tests.py
index 28ad716..5ae6404 100755
--- a/subversion/tests/cmdline/depth_tests.py
+++ b/subversion/tests/cmdline/depth_tests.py
@@ -1024,7 +1024,7 @@
"\n",
"Property changes on: .\n",
"___________________________________________________________________\n",
- "Name: foo\n",
+ "Deleted: foo\n",
" - foo-val\n",
"\n",
"Index: iota\n",
@@ -1036,7 +1036,7 @@
"+This is the file 'iota'.\n",
"Property changes on: A\n",
"___________________________________________________________________\n",
- "Name: bar\n",
+ "Deleted: bar\n",
" - bar-val\n",
"\n",
"\n",
diff --git a/subversion/tests/cmdline/diff_tests.py b/subversion/tests/cmdline/diff_tests.py
index b1964c5..16130fd 100755
--- a/subversion/tests/cmdline/diff_tests.py
+++ b/subversion/tests/cmdline/diff_tests.py
@@ -617,11 +617,13 @@
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
- "Name: svn:eol-style\n",
+ "Added: svn:eol-style\n",
" + native\n",
"\n" ]
expected_reverse_output = list(expected_output)
+ expected_reverse_output[3] = expected_reverse_output[3].replace("Added",
+ "Deleted")
expected_reverse_output[4] = " - native\n"
@@ -1837,18 +1839,22 @@
"\n",
"Property changes on: A\n",
"___________________________________________________________________\n",
- "Name: dirprop\n",
+ "Added: dirprop\n",
" + r2value\n",
"\n",
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
- "Name: fileprop\n",
+ "Added: fileprop\n",
" + r2value\n",
"\n" ]
expected_output_r2_r1 = list(expected_output_r1_r2)
+ expected_output_r2_r1[3] = expected_output_r2_r1[3].replace("Added",
+ "Deleted")
expected_output_r2_r1[4] = " - r2value\n"
+ expected_output_r2_r1[9] = expected_output_r2_r1[9].replace("Added",
+ "Deleted")
expected_output_r2_r1[10] = " - r2value\n"
@@ -2084,19 +2090,19 @@
"\n",
"Property changes on: A\n",
"___________________________________________________________________\n",
- "Name: dirprop\n",
+ "Modified: dirprop\n",
" - r2value\n",
" + workingvalue\n",
- "Name: newdirprop\n",
+ "Added: newdirprop\n",
" + newworkingvalue\n",
"\n",
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
- "Name: fileprop\n",
+ "Modified: fileprop\n",
" - r2value\n",
" + workingvalue\n",
- "Name: newfileprop\n",
+ "Added: newfileprop\n",
" + newworkingvalue\n",
"\n" ]
@@ -2168,13 +2174,13 @@
"\n",
"Property changes on: foo\n",
"___________________________________________________________________\n",
- "Name: propname\n",
+ "Added: propname\n",
" + propvalue\n",
"\n",
"\n",
"Property changes on: X\n",
"___________________________________________________________________\n",
- "Name: propname\n",
+ "Added: propname\n",
" + propvalue\n",
"\n",
"Index: X/bar\n",
@@ -2186,7 +2192,7 @@
"\n",
"Property changes on: " + os.path.join('X', 'bar') + "\n",
"___________________________________________________________________\n",
- "Name: propname\n",
+ "Added: propname\n",
" + propvalue\n",
"\n" ]
# The output from the BASE->repos diff is the same content, but in a
@@ -2632,25 +2638,25 @@
"\n",
"Property changes on: .\n",
"___________________________________________________________________\n",
- "Name: foo1\n",
+ "Added: foo1\n",
" + bar1\n",
"\n",
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
- "Name: foo2\n",
+ "Added: foo2\n",
" + bar2\n",
"\n",
"\n",
"Property changes on: A\n",
"___________________________________________________________________\n",
- "Name: foo3\n",
+ "Added: foo3\n",
" + bar3\n",
"\n",
"\n",
"Property changes on: " + os.path.join('A', 'B') + "\n",
"___________________________________________________________________\n",
- "Name: foo4\n",
+ "Added: foo4\n",
" + bar4\n",
"\n" ]
@@ -2702,14 +2708,14 @@
"\n",
"Property changes on: .\n",
"___________________________________________________________________\n",
- "Name: foo1\n",
+ "Modified: foo1\n",
" - bar1\n",
" + baz1\n",
"\n",
"\n",
"Property changes on: iota\n",
"___________________________________________________________________\n",
- "Name: foo2\n",
+ "Modified: foo2\n",
" - bar2\n",
" + baz2\n",
"\n",
@@ -2723,14 +2729,14 @@
"+new text\n",
"Property changes on: A\n",
"___________________________________________________________________\n",
- "Name: foo3\n",
+ "Modified: foo3\n",
" - bar3\n",
" + baz3\n",
"\n",
"\n",
"Property changes on: " + os.path.join('A', 'B') + "\n",
"___________________________________________________________________\n",
- "Name: foo4\n",
+ "Modified: foo4\n",
" - bar4\n",
" + baz4\n",
"\n",
diff --git a/subversion/tests/cmdline/import_tests.py b/subversion/tests/cmdline/import_tests.py
index 42b931b..fb754a2 100755
--- a/subversion/tests/cmdline/import_tests.py
+++ b/subversion/tests/cmdline/import_tests.py
@@ -152,7 +152,7 @@
match = cm.search (lastline)
if not match:
### we should raise a less generic error here. which?
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
# remove (uncontrolled) local dir
svntest.main.safe_rmtree(dir_path)
diff --git a/subversion/tests/cmdline/merge_tests.py b/subversion/tests/cmdline/merge_tests.py
index 96bde5e..d43615e 100755
--- a/subversion/tests/cmdline/merge_tests.py
+++ b/subversion/tests/cmdline/merge_tests.py
@@ -1700,7 +1700,7 @@
"\n",
"Property changes on: " + branch_path + "\n",
"___________________________________________________________________\n",
- "Name: " + SVN_PROP_MERGE_INFO + "\n",
+ "Modified: " + SVN_PROP_MERGE_INFO + "\n",
" Merged /A/B/E:r2-3\n",
"\n", ]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
diff --git a/subversion/tests/cmdline/prop_tests.py b/subversion/tests/cmdline/prop_tests.py
index b7151c3..558e524 100755
--- a/subversion/tests/cmdline/prop_tests.py
+++ b/subversion/tests/cmdline/prop_tests.py
@@ -353,7 +353,7 @@
if len(extra_files) != 0:
print "didn't get expected conflict files"
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
# Resolve the conflicts
svntest.main.run_svn(None, 'resolved', mu_path)
@@ -722,7 +722,7 @@
print "svn pg svn:mime-type output does not match expected."
print "Expected standard output: ", expected_stdout, "\n"
print "Actual standard output: ", actual_stdout, "\n"
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
# Check the svn:executable value.
# The value of the svn:executable property is now always forced to '*'
@@ -736,7 +736,7 @@
print "svn pg svn:executable output does not match expected."
print "Expected standard output: ", expected_stdout, "\n"
print "Actual standard output: ", actual_stdout, "\n"
- raise svntest.actions.SVNUnexpectedOutput
+ raise svntest.verify.SVNUnexpectedOutput
#----------------------------------------------------------------------
diff --git a/subversion/tests/cmdline/special_tests.py b/subversion/tests/cmdline/special_tests.py
index ec8925d..b97a16b 100755
--- a/subversion/tests/cmdline/special_tests.py
+++ b/subversion/tests/cmdline/special_tests.py
@@ -524,7 +524,7 @@
"\n",
"Property changes on: svn-test-work/working_copies/special_tests-10/link\n",
"___________________________________________________________________\n",
- "Name: svn:special\n",
+ "Added: svn:special\n",
" + *\n",
"\n" ]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
diff --git a/subversion/tests/cmdline/svntest/actions.py b/subversion/tests/cmdline/svntest/actions.py
index 2b8d156..13e06e7 100644
--- a/subversion/tests/cmdline/svntest/actions.py
+++ b/subversion/tests/cmdline/svntest/actions.py
@@ -895,7 +895,7 @@
contain all arguments beyond for your 'diff --summarize --xml' omitting
said arguments. EXPECTED_PREFIX will store a "common" path prefix
expected to be at the beginning of each summarized path. If
- EXPECTED_PREFIX is None, the EXPECTED_PATHS will need to be exactly
+ EXPECTED_PREFIX is None, then EXPECTED_PATHS will need to be exactly
as 'svn diff --summarize --xml' will output. If ERROR_RE_STRING, the
command must exit with error, and the error message must match regular
expression ERROR_RE_STRING.
@@ -915,10 +915,8 @@
doc = parseString(''.join(output))
paths = doc.getElementsByTagName("path")
- modified_paths = expected_paths
items = expected_items
kinds = expected_kinds
- modified_props = expected_props
for path in paths:
modified_path = path.childNodes[0].data
@@ -929,19 +927,23 @@
# Workaround single-object diff
if len(modified_path) == 0:
- modified_path = path.childNodes[0].data.split("/")[-1]
+ modified_path = path.childNodes[0].data.split(os.sep)[-1]
- if modified_path not in modified_paths:
+ # From here on, we use '/' as path separator.
+ if os.sep != "/":
+ modified_path = modified_path.replace(os.sep, "/")
+
+ if modified_path not in expected_paths:
print "ERROR: %s not expected in the changed paths." % modified_path
raise Failure
- index = modified_paths.index(modified_path)
+ index = expected_paths.index(modified_path)
expected_item = items[index]
expected_kind = kinds[index]
- expected_props = modified_props[index]
+ expected_prop = expected_props[index]
actual_item = path.getAttribute('item')
actual_kind = path.getAttribute('kind')
- actual_props = path.getAttribute('props')
+ actual_prop = path.getAttribute('props')
if expected_item != actual_item:
print "ERROR: expected:", expected_item, "actual:", actual_item
@@ -951,8 +953,8 @@
print "ERROR: expected:", expected_kind, "actual:", actual_kind
raise Failure
- if expected_props != actual_props:
- print "ERROR: expected:", expected_props, "actual:", actual_props
+ if expected_prop != actual_prop:
+ print "ERROR: expected:", expected_prop, "actual:", actual_prop
raise Failure
def run_and_verify_diff_summarize(output_tree, error_re_string = None,
diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py
index 19363fe..9f44208 100644
--- a/subversion/tests/cmdline/svntest/main.py
+++ b/subversion/tests/cmdline/svntest/main.py
@@ -1121,7 +1121,8 @@
def usage():
prog_name = os.path.basename(sys.argv[0])
- print "%s [--url] [--fs-type] [--verbose|--quiet] \\" % prog_name
+ print "%s [--url] [--fs-type] [--verbose|--quiet] [--parallel] \\" % \
+ prog_name
print "%s [--enable-sasl] [--cleanup] [--bin] [<test> ...]" \
% (" " * len(prog_name))
print "%s " % (" " * len(prog_name))
diff --git a/subversion/tests/cmdline/svntest/wc.py b/subversion/tests/cmdline/svntest/wc.py
index 5a6f6c7..6b05b5d 100644
--- a/subversion/tests/cmdline/svntest/wc.py
+++ b/subversion/tests/cmdline/svntest/wc.py
@@ -44,6 +44,16 @@
self.desc.update(more_desc)
+ def add_state(self, parent, state):
+ "Import state items from a State object, reparent the items to PARENT."
+ assert isinstance(state, State)
+
+ if parent and parent[-1] != '/':
+ parent += '/'
+ for path, item in state.desc.items():
+ path = parent + path
+ self.desc[path] = item
+
def remove(self, *paths):
"Remove a path from the state (the path must exist)."
for path in paths:
diff --git a/subversion/tests/cmdline/switch_tests.py b/subversion/tests/cmdline/switch_tests.py
index 0f72173..96303be 100755
--- a/subversion/tests/cmdline/switch_tests.py
+++ b/subversion/tests/cmdline/switch_tests.py
@@ -2074,6 +2074,56 @@
None, None, None, None, 0,
'-r', '2')
+def switch_to_root(sbox):
+ "switch a folder to the root of its repository"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ repo_url = sbox.repo_url
+
+ ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
+
+ # Test switch /A/D/G to /
+ AD_url = sbox.repo_url + '/A/D'
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/D/G/pi' : Item(status='D '),
+ 'A/D/G/rho' : Item(status='D '),
+ 'A/D/G/tau' : Item(status='D '),
+ 'A/D/G/A' : Item(status='A '),
+ 'A/D/G/A/B' : Item(status='A '),
+ 'A/D/G/A/B/lambda' : Item(status='A '),
+ 'A/D/G/A/B/E' : Item(status='A '),
+ 'A/D/G/A/B/E/alpha' : Item(status='A '),
+ 'A/D/G/A/B/E/beta' : Item(status='A '),
+ 'A/D/G/A/B/F' : Item(status='A '),
+ 'A/D/G/A/mu' : Item(status='A '),
+ 'A/D/G/A/C' : Item(status='A '),
+ 'A/D/G/A/D' : Item(status='A '),
+ 'A/D/G/A/D/gamma' : Item(status='A '),
+ 'A/D/G/A/D/G' : Item(status='A '),
+ 'A/D/G/A/D/G/pi' : Item(status='A '),
+ 'A/D/G/A/D/G/rho' : Item(status='A '),
+ 'A/D/G/A/D/G/tau' : Item(status='A '),
+ 'A/D/G/A/D/H' : Item(status='A '),
+ 'A/D/G/A/D/H/chi' : Item(status='A '),
+ 'A/D/G/A/D/H/omega' : Item(status='A '),
+ 'A/D/G/A/D/H/psi' : Item(status='A '),
+ 'A/D/G/iota' : Item(status='A '),
+ })
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
+ expected_disk.add_state('A/D/G', svntest.main.greek_state.copy())
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.remove('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
+ expected_status.add_state('A/D/G',
+ svntest.actions.get_virginal_state(wc_dir, 1))
+ expected_status.tweak('A/D/G', switched = 'S')
+ svntest.actions.run_and_verify_switch(wc_dir, ADG_path, sbox.repo_url,
+ expected_output,
+ expected_disk,
+ expected_status)
+
########################################################################
# Run the tests
@@ -2107,6 +2157,7 @@
switch_to_dir_with_peg_rev,
switch_urls_with_spaces,
switch_to_dir_with_peg_rev2,
+ switch_to_root,
]
if __name__ == '__main__':
diff --git a/subversion/tests/libsvn_fs/fs-test.c b/subversion/tests/libsvn_fs/fs-test.c
index d484e32..cf2f74c 100644
--- a/subversion/tests/libsvn_fs/fs-test.c
+++ b/subversion/tests/libsvn_fs/fs-test.c
@@ -4822,6 +4822,144 @@
return SVN_NO_ERROR;
}
+static svn_error_t *
+node_origin_rev(const char **msg,
+ svn_boolean_t msg_only,
+ svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ apr_pool_t *subpool = svn_pool_create(pool);
+ svn_fs_t *fs;
+ svn_fs_txn_t *txn;
+ svn_fs_root_t *txn_root, *root;
+ svn_revnum_t youngest_rev = 0;
+ int i;
+
+ struct path_rev_t {
+ const char *path;
+ svn_revnum_t rev;
+ };
+
+ *msg = "test svn_fs_node_origin_rev";
+ if (msg_only)
+ return SVN_NO_ERROR;
+
+ /* Create the repository. */
+ SVN_ERR(svn_test__create_fs(&fs, "test-repo-node-origin-rev",
+ opts->fs_type, pool));
+
+ /* Revision 1: Create the Greek tree. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, 0, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 2: Modify A/D/H/chi and A/B/E/alpha. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "2", subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/alpha", "2", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 3: Copy A/D to A/D2, and create A/D2/floop new. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_fs_revision_root(&root, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_copy(root, "A/D", txn_root, "A/D2", subpool));
+ SVN_ERR(svn_fs_make_file(txn_root, "A/D2/floop", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 4: Modify A/D/H/chi and A/D2/H/chi. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "4", subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "A/D2/H/chi", "4", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 5: Delete A/D2/G, add A/B/E/alfalfa. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_fs_delete(txn_root, "A/D2/G", subpool));
+ SVN_ERR(svn_fs_make_file(txn_root, "A/B/E/alfalfa", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 6: Restore A/D2/G (from version 4). */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_fs_revision_root(&root, fs, 4, subpool));
+ SVN_ERR(svn_fs_copy(root, "A/D2/G", txn_root, "A/D2/G", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Revision 7: Move A/D2 to A/D (replacing it), and tweak A/D/floop. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_fs_revision_root(&root, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_delete(txn_root, "A/D", subpool));
+ SVN_ERR(svn_fs_copy(root, "A/D2", txn_root, "A/D", subpool));
+ SVN_ERR(svn_fs_delete(txn_root, "A/D2", subpool));
+ SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/floop", "7", subpool));
+ SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ svn_pool_clear(subpool);
+
+ /* Now test some origin revisions. */
+ {
+ struct path_rev_t pathrevs[4] = { { "A/D", 1 },
+ { "A/D/floop", 3 },
+ { "iota", 1 },
+ { "A/B/E/alfalfa", 5 } };
+
+ SVN_ERR(svn_fs_revision_root(&root, fs, youngest_rev, pool));
+ for (i = 0; i < (sizeof(pathrevs) / sizeof(struct path_rev_t)); i++)
+ {
+ struct path_rev_t path_rev = pathrevs[i];
+ svn_revnum_t revision;
+ SVN_ERR(svn_fs_node_origin_rev(&revision, root, path_rev.path, pool));
+ if (path_rev.rev != revision)
+ return svn_error_createf
+ (SVN_ERR_TEST_FAILED, NULL,
+ "expected origin revision of '%ld' for '%s'; got '%ld'",
+ path_rev.rev, path_rev.path, revision);
+ }
+ }
+
+ /* Also, we'll check a couple of queries into a transaction root. */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
+ SVN_ERR(svn_fs_make_file(txn_root, "bloop", subpool));
+ SVN_ERR(svn_fs_make_dir(txn_root, "A/D/blarp", subpool));
+
+ {
+ struct path_rev_t pathrevs[6] = { { "A/D", 1 },
+ { "A/D/floop", 3 },
+ { "bloop" -1 },
+ { "A/D/blarp", -1 },
+ { "iota", 1 },
+ { "A/B/E/alfalfa", 5 } };
+
+ root = txn_root;
+ for (i = 0; i < (sizeof(pathrevs) / sizeof(struct path_rev_t)); i++)
+ {
+ struct path_rev_t path_rev = pathrevs[i];
+ svn_revnum_t revision;
+ SVN_ERR(svn_fs_node_origin_rev(&revision, root, path_rev.path, pool));
+ if (! SVN_IS_VALID_REVNUM(revision))
+ revision = -1;
+ if (path_rev.rev != revision)
+ return svn_error_createf
+ (SVN_ERR_TEST_FAILED, NULL,
+ "expected origin revision of '%ld' for '%s'; got '%ld'",
+ path_rev.rev, path_rev.path, revision);
+ }
+ }
+
+ return SVN_NO_ERROR;
+}
/* ------------------------------------------------------------------------ */
@@ -4865,5 +5003,6 @@
SVN_TEST_PASS(root_revisions),
SVN_TEST_PASS(unordered_txn_dirprops),
SVN_TEST_PASS(set_uuid),
+ SVN_TEST_PASS(node_origin_rev),
SVN_TEST_NULL
};
diff --git a/subversion/tests/libsvn_repos/repos-test.c b/subversion/tests/libsvn_repos/repos-test.c
index 49d0632..9979af8 100644
--- a/subversion/tests/libsvn_repos/repos-test.c
+++ b/subversion/tests/libsvn_repos/repos-test.c
@@ -1749,7 +1749,7 @@
/* expected_segments->range_end can't be 0, so if we see that, it's
our end-of-the-list sentry. */
- if (! b->expected_segments->range_end)
+ if (! expected_segment->range_end)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"Got unexpected location segment: %s",
format_segment(segment, pool));
diff --git a/subversion/tests/libsvn_subr/mergeinfo-test.c b/subversion/tests/libsvn_subr/mergeinfo-test.c
index c008f52..c6b7502 100644
--- a/subversion/tests/libsvn_subr/mergeinfo-test.c
+++ b/subversion/tests/libsvn_subr/mergeinfo-test.c
@@ -41,14 +41,19 @@
return svn_error_create(SVN_ERR_TEST_FAILED, 0, msg);
}
+#define MAX_NBR_RANGES 3
+
/* Verify that INPUT is parsed properly, and returns an error if
parsing fails, or incorret parsing is detected. Assumes that INPUT
- contains only one path -> ranges mapping, and that FIRST_RANGE is
- the first range in the set. */
+ contains only one path -> ranges mapping, and that EXPECTED_RANGES points
+ to the first range in an array whose size is greater than or equal to
+ the number of ranges in INPUTS path -> ranges mapping but less than
+ MAX_NBR_RANGES. If fewer than MAX_NBR_RANGES ranges are present, then the
+ trailing expected_ranges should be have their end revision set to 0. */
static svn_error_t *
verify_mergeinfo_parse(const char *input,
const char *expected_path,
- const svn_merge_range_t *first_range,
+ const svn_merge_range_t *expected_ranges,
apr_pool_t *pool)
{
svn_error_t *err;
@@ -65,24 +70,37 @@
hi = apr_hash_next(hi))
{
const void *path;
- void *ranges;
+ void *val;
+ apr_array_header_t *ranges;
svn_merge_range_t *range;
+ int j;
- apr_hash_this(hi, &path, NULL, &ranges);
+ apr_hash_this(hi, &path, NULL, &val);
+ ranges = val;
if (strcmp((const char *) path, expected_path) != 0)
return fail(pool, "svn_mergeinfo_parse (%s) failed to parse the "
"correct path (%s)", input, expected_path);
- /* Test ranges. For now, assume only 1 range. */
- range = APR_ARRAY_IDX((apr_array_header_t *) ranges, 0,
- svn_merge_range_t *);
- if (range->start != first_range->start
- || range->end != first_range->end
- || range->inheritable != first_range->inheritable)
+ /* Test each parsed range. */
+ for (j = 0; j < ranges->nelts; j++)
+ {
+ range = APR_ARRAY_IDX(ranges, j, svn_merge_range_t *);
+ if (range->start != expected_ranges[j].start
+ || range->end != expected_ranges[j].end
+ || range->inheritable != expected_ranges[j].inheritable)
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "svn_mergeinfo_parse (%s) failed to "
+ "parse the correct range",
+ input);
+ }
+
+ /* Were we expecting any more ranges? */
+ if (j < MAX_NBR_RANGES - 1
+ && !expected_ranges[j].end == 0)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_mergeinfo_parse (%s) failed to "
- "parse the correct range",
- input);
+ "produce the expected number of ranges",
+ input);
}
return SVN_NO_ERROR;
}
@@ -92,27 +110,37 @@
-> merge ranges. */
static apr_hash_t *info1, *info2;
-#define NBR_MERGEINFO_VALS 3
+#define NBR_MERGEINFO_VALS 5
/* Valid mergeinfo values. */
static const char * const mergeinfo_vals[NBR_MERGEINFO_VALS] =
{
"/trunk:1",
"/trunk/foo:1-6",
- "/trunk: 5,7-9,10,11,13,14"
+ "/trunk: 5,7-9,10,11,13,14",
+ "/trunk: 3-10,11*,13,14",
+ "/branch: 1,2-18*,33*"
+ /* ### Should svn_mergeinfo_parse() handle unordered
+ ### but otherwise valid input strings like this?
+ ### Currently this fails.
+ "/trunk: 7-9,5,10,14,13,11" */
};
/* Paths corresponding to mergeinfo_vals. */
static const char * const mergeinfo_paths[NBR_MERGEINFO_VALS] =
{
"/trunk",
"/trunk/foo",
- "/trunk"
+ "/trunk",
+ "/trunk",
+ "/branch"
};
/* First ranges from the paths identified by mergeinfo_paths. */
-static svn_merge_range_t mergeinfo_ranges[NBR_MERGEINFO_VALS] =
+static svn_merge_range_t mergeinfo_ranges[NBR_MERGEINFO_VALS][MAX_NBR_RANGES] =
{
- { 0, 1, TRUE },
- { 0, 6, TRUE },
- { 4, 5, TRUE }
+ { {0, 1, TRUE} },
+ { {0, 6, TRUE} },
+ { {4, 5, TRUE}, { 6, 11, TRUE }, {12, 14, TRUE } },
+ { {2, 10, TRUE}, {10, 11, FALSE}, {12, 14, TRUE } },
+ { {0, 1, TRUE}, { 1, 18, FALSE}, {32, 33, FALSE} }
};
static svn_error_t *
@@ -130,7 +158,7 @@
for (i = 0; i < NBR_MERGEINFO_VALS; i++)
SVN_ERR(verify_mergeinfo_parse(mergeinfo_vals[i], mergeinfo_paths[i],
- &mergeinfo_ranges[i], pool));
+ mergeinfo_ranges[i], pool));
return SVN_NO_ERROR;
}
@@ -502,7 +530,7 @@
SVN_ERR(svn_mergeinfo_parse(&info1, mergeinfo1, pool));
SVN_ERR(svn_mergeinfo_parse(&info2, mergeinfo2, pool));
- SVN_ERR(svn_mergeinfo_merge(&info1, info2, svn_rangelist_ignore_inheritance,
+ SVN_ERR(svn_mergeinfo_merge(info1, info2, svn_rangelist_ignore_inheritance,
pool));
if (apr_hash_count(info1) != 2)
diff --git a/tools/client-side/change-svn-wc-format.py b/tools/client-side/change-svn-wc-format.py
index ac562a8..78f0670 100755
--- a/tools/client-side/change-svn-wc-format.py
+++ b/tools/client-side/change-svn-wc-format.py
@@ -51,6 +51,13 @@
""" % (progname, progname)
sys.exit(error_msg and 1 or 0)
+def get_adm_dir():
+ """Return the name of Subversion's administrative directory,
+ adjusted for the SVN_ASP_DOT_NET_HACK environment variable. See
+ <http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt>
+ for details."""
+ return os.environ.has_key("SVN_ASP_DOT_NET_HACK") and "_svn" or ".svn"
+
class WCFormatConverter:
"Performs WC format conversions."
root_path = None
@@ -63,13 +70,13 @@
mode, and unconvertable WC data is encountered."""
# Avoid iterating in unversioned directories.
- if not ".svn" in paths and not "_svn" in paths:
+ if not get_adm_dir() in paths:
paths = []
return
for path in paths:
# Process the entries file for this versioned directory.
- if path in (".svn", "_svn"):
+ if path == get_adm_dir():
if self.verbosity:
print "Processing directory '%s'" % dirname
entries = Entries(os.path.join(dirname, path, "entries"))
diff --git a/www/bitmover-svn.html b/www/bitmover-svn.html
index 7bf8bfe..b8caf02 100644
--- a/www/bitmover-svn.html
+++ b/www/bitmover-svn.html
@@ -32,7 +32,7 @@
BitMover's page and set the record straight about Subversion. The
entire relevant content of the BitMover page is quoted below, as it
looked on 2 July 2004. We've omitted only extraneous things like
-navigation links and the endorsement quote at the the top of the
+navigation links and the endorsement quote at the top of the
page.</p>
<p>Please note that this response is strictly about Subversion. We
diff --git a/www/faq.html b/www/faq.html
index 83cc32f..c9a7e48 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -138,6 +138,8 @@
<li>
<a href="#sorry-no-globbing">How can I use wildcards or globbing to move many files at once?</a>
</li>
+<li><a href="#vendor-branch">How can I maintain a modified version (a
+ "vendor branch") of third-party software using Subversion?</a></li>
</ul>
<h4>Troubleshooting:</h4>
@@ -2194,6 +2196,36 @@
</p>
</div>
+<div class="h3" id="vendor-branch" title="vendor-branch">
+<h3>How can I maintain a modified version (a "vendor branch") of
+third-party software using Subversion?</h3>
+
+<p>People frequently want to use Subversion to track their local
+changes to third-party code, even across upgrades from the
+third-party — that is, they want to maintain their own
+divergent branch, while still incorporating new releases from the
+upstream source. This is commonly called a <em>vendor branch</em>
+(the term long predates Subversion), and the techniques for
+maintaining one in Subversion are <a
+href="http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.advanced.vendorbr"
+>described here</a>.</p>
+
+<p>If the vendor code is hosted in a remote Subversion repository,
+then you can use <a href="http://piston.rubyforge.org/">Piston</a> to
+manage your copy of the vendor's code.</p>
+
+<p>As a last resort, if using <tt>svn_load_dirs.pl</tt> is taking too
+much time or you're looking for the lazy solution, see also Jon
+Stevens' step-by-step explanation at <a
+href="http://lookfirst.com/2007/11/subversion-vendor-branches-howto.html"
+>Subversion Vendor Branches Howto</a>. This solution does not make
+use of the space saving features in the Subversion backend when you
+copy new code over old code; in this solution, each import of a vendor
+code gets an entire new copy and there is no space savings for
+identical files.</p>
+
+</div>
+
</div>
<div class="h2" id="troubleshooting" title="troubleshooting">
@@ -3031,7 +3063,7 @@
</li>
<li>
Invoke the script with an empty environment by using the
- the "env" program. Here's an
+ "env" program. Here's an
example for the post-commit hook:
<blockquote><pre>
$ env - ./post-commit /var/lib/svn-repos 1234
@@ -3112,7 +3144,7 @@
in the .cvspass file. It may look like the passwords in .cvspass are
encrypted, but in fact they're only lightly scrambled with an
algorithm that's the moral equivalent to rot13. They can be cracked
-instantly. The only utility of the the scrambling is to prevent users
+instantly. The only utility of the scrambling is to prevent users
(like root) from accidentally seeing the password. Nobody's cared
enough to do this for Subversion yet; if you're interested, send
patches to the dev@ list.</p>
diff --git a/www/hacking.html b/www/hacking.html
index b0829a2..183167b 100644
--- a/www/hacking.html
+++ b/www/hacking.html
@@ -524,7 +524,7 @@
<p>For structure types, document each individual member of the structure as
well as the structure itself.</p>
-<p>For actual souce code, internally document chunks of each function, so
+<p>For actual source code, internally document chunks of each function, so
that an someone familiar with Subversion can understand the algorithm being
implemented. Do not include obvious or overly verbose documentation; the
comments should help understanding of the code, not hinder it.</p>
@@ -761,7 +761,7 @@
</pre>
<p>Pre-Subversion 1.5, private symbols which needed to be used
- outside of a library were put into into public header files,
+ outside of a library were put into public header files,
using the double underscore notation. This practice has been
abandoned, and any such symbols are legacy, maintained for <a
href="#release-numbering">backwards compatibility</a>.</p>
diff --git a/www/license-for-python-bindings.html b/www/license-for-python-bindings.html
index ca6869a..f0eda22 100644
--- a/www/license-for-python-bindings.html
+++ b/www/license-for-python-bindings.html
@@ -77,7 +77,7 @@
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
+ notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The name of the author may not be used to endorse or promote
diff --git a/www/links.html b/www/links.html
index ba995bf..a9f1c9b 100644
--- a/www/links.html
+++ b/www/links.html
@@ -701,6 +701,16 @@
and open source or non profit projects..."</em></p>
</li>
+ <li><p><strong>Beanstalk</strong>:
+ hosted Subversion management and integration service<br/>
+ <a href="http://www.beanstalkapp.com/"
+ >http://www.beanstalkapp.com/</a></p>
+ <p><em>"Beanstalk is a hosted Subversion system, making it easy
+ for anyone to set up, browse, track, and manage Subversion
+ repositories. Beanstalk has built-in integration with [...]
+ tools such as Basecamp, FogBugz, and Lighthouse."</em></p>
+ </li>
+
</ul>
</div>
diff --git a/www/poole-response.html b/www/poole-response.html
index ed15f62..fd49086 100644
--- a/www/poole-response.html
+++ b/www/poole-response.html
@@ -156,7 +156,7 @@
<p>Furthermore, Subversion's road map (which extends far beyond the
1.0 goals we reached in 2004) has long included many of the features
Damon Poole claims the project is ignoring. There are even issues
-filed in in our public issue tracker about some of these features,
+filed in our public issue tracker about some of these features,
with links to design discussions and patches.</p>
<p>But there's a deeper sense in which he is mistaken. Subversion by
diff --git a/www/project_packages.html b/www/project_packages.html
index b4c30e0..1b148a8 100644
--- a/www/project_packages.html
+++ b/www/project_packages.html
@@ -284,7 +284,7 @@
<p>If you plan to install the <tt>mod_dav_svn</tt> Apache module, note
that Apache 2.0 and Apache 2.2 are not binary-compatible. Thus there
-are two types of Subverison command-line binary/library packages for
+are two types of Subversion command-line binary/library packages for
Windows -- ones built to use with Apache 2.0, and ones built to use
Apache 2.2. If you're using Apache as your Subversion server, be sure
to download the correct package.</p>
diff --git a/www/tools_contrib.html b/www/tools_contrib.html
index e468cbe..c8417e9 100644
--- a/www/tools_contrib.html
+++ b/www/tools_contrib.html
@@ -444,7 +444,7 @@
(<a href="http://svn.collab.net/repos/svn/trunk/contrib/client-side">contrib/client-side</a>)</h3>
<p>Perl script that gets the revisions that modified a specified
file or directory and prints the output of `svn diff' on between
- all revisions that that modified the file or directory. Good for
+ all revisions that modified the file or directory. Good for
seeing what changed over time and for tracking down when a
particular line in a file changed.
</p>
