subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r890658 [21/27] - in /subversion/branches/issue-3242-dev: ./ build/ build/ac-macros/ build/generator/ build/generator/swig/ build/generator/templates/ build/generator/util/ build/hudson/ build/hudson/jobs/ build/hudson/jobs/subversion-1.6.x...
Date Tue, 15 Dec 2009 06:15:17 GMT
Modified: subversion/branches/issue-3242-dev/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/po/zh_CN.po?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/issue-3242-dev/subversion/po/zh_CN.po [UTF-8] Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
 #
 # Simplified Chinese translation for subversion package
 #
-#    Licensed to the Subversion Corporation (SVN Corp.) under one
+#    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
-#    regarding copyright ownership.  The SVN Corp. licenses this file
+#    regarding copyright ownership.  The ASF licenses this file
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: subversion 1.7\n"
 "Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2009-10-16 11:25+0800\n"
-"PO-Revision-Date: 2009-10-16 12:25+0800\n"
+"POT-Creation-Date: 2009-12-07 10:09+0800\n"
+"PO-Revision-Date: 2009-12-07 11:22+0800\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
@@ -630,7 +630,7 @@
 msgstr "无法协商认证机制"
 
 msgid "Editor drive was aborted"
-msgstr ""
+msgstr "编辑器中止"
 
 msgid "Initialization of SSPI library failed"
 msgstr "初始化 SSPI 库失败"
@@ -1128,9 +1128,6 @@
 msgid "Entry for '%s' exists (though the working file is missing)"
 msgstr "“%s” 的入口存在(尽管丢失了工作文件)"
 
-msgid "Revision type requires a working copy path, not a URL"
-msgstr "版本类型需要工作目录,不是 URL"
-
 msgid "Cannot mix repository and working copy sources"
 msgstr "不能在源中混合版本库和工作副本"
 
@@ -1192,17 +1189,14 @@
 msgid "%sProperty changes on: %s%s"
 msgstr "%s 属性改变: %s%s"
 
-#, c-format
-msgid "Added: %s%s"
-msgstr "已增加: %s%s"
+msgid "Added"
+msgstr "已增加"
 
-#, c-format
-msgid "Deleted: %s%s"
-msgstr "已删除: %s%s"
+msgid "Deleted"
+msgstr "已删除"
 
-#, c-format
-msgid "Modified: %s%s"
-msgstr "已修改: %s%s"
+msgid "Modified"
+msgstr "已修改"
 
 #, c-format
 msgid "%s\t(revision %ld)"
@@ -1262,6 +1256,9 @@
 "   expected:  %s\n"
 "     actual:  %s\n"
 msgstr ""
+"'%s' 的校验和不匹配:\n"
+"      期望:  %s\n"
+"      实际:  %s\n"
 
 #, c-format
 msgid ""
@@ -1455,7 +1452,7 @@
 "%s"
 
 msgid "Only depths 'infinity' and 'empty' are currently supported"
-msgstr ""
+msgstr "当前仅支持深度 'infinity' 和 'empty'"
 
 #, c-format
 msgid "Cannot strip %u components from '%s'"
@@ -1465,15 +1462,6 @@
 msgid "Error writing to '%s'"
 msgstr "写入“%s”出错"
 
-msgid ".svnpatch.original"
-msgstr ".svnpatch.original"
-
-msgid ".svnpatch.modified"
-msgstr ".svnpatch.modified"
-
-msgid ".svnpatch.working"
-msgstr ".svnpatch.working"
-
 msgid "strip count must be positive"
 msgstr "修剪计数取值必须为正"
 
@@ -1565,6 +1553,9 @@
 msgid "Unrecognized revision type requested for '%s'"
 msgstr "“%s” 的请求版本类型无法识别"
 
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr "对于 URL,版本关键字 PREV,BASE,或 COMMITTED 非法"
+
 #, c-format
 msgid "'%s' is not a working copy"
 msgstr "“%s”不是工作副本"
@@ -1661,6 +1652,9 @@
 msgid "Invalid argument '%s' in diff options"
 msgstr "diff 选项中参数'%s'无效"
 
+msgid "No newline at end of file"
+msgstr "文件没有以空行结尾"
+
 #. Order of date components can be different in different languages
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
@@ -2060,6 +2054,10 @@
 msgstr "不支持的BDB之FS加载器版本 (%d)"
 
 #, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr "HEAD中没有路径“%s”"
+
+#, c-format
 msgid "Cannot verify lock on path '%s'; no username available"
 msgstr "不能校验路径“%s”上的锁;没有用户名"
 
@@ -2506,10 +2504,6 @@
 msgstr "不能解析锁/条目的哈希文件“%s“"
 
 #, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "HEAD中没有路径“%s”"
-
-#, c-format
 msgid "Lock failed: newer version of '%s' exists"
 msgstr "加锁失败: “%s”的新版本已经存在"
 
@@ -2585,6 +2579,14 @@
 msgstr "版本库的 UUID“%s”与期望的 UUID“%s”不匹配"
 
 #, c-format
+msgid "'%s' isn't a child of session URL '%s'"
+msgstr "“%s” 不是会话 URL “%s” 的子节点"
+
+#, c-format
+msgid "'%s' isn't a child of repository root URL '%s'"
+msgstr "“%s” 不是版本库根 URL “%s” 的子节点"
+
+#, c-format
 msgid "  - handles '%s' scheme\n"
 msgstr "  - 处理“%s”方案\n"
 
@@ -2788,6 +2790,10 @@
 msgstr "解析 URI “%s” 失败"
 
 #, c-format
+msgid "Lock request failed: %d %s"
+msgstr "加锁请求失败: %d %s"
+
+#, c-format
 msgid "'%s' is not locked in the repository"
 msgstr "版本库中的“%s”没有被锁定"
 
@@ -3026,6 +3032,9 @@
 " %s\n"
 " %s\n"
 
+msgid "No Location header received"
+msgstr "没有收到位置头"
+
 #, c-format
 msgid "Directory '%s' is out of date; try updating"
 msgstr "目录 “%s” 已经过时;请先更新"
@@ -3066,10 +3075,6 @@
 msgid "Location segment report failed on '%s'@'%ld'"
 msgstr "位置分段报告失败于“%s”@“%ld”"
 
-#, c-format
-msgid "Lock request failed: %d %s"
-msgstr "加锁请求失败: %d %s"
-
 msgid "Malformed URL for repository"
 msgstr "版本库的 URL 非法"
 
@@ -3140,8 +3145,8 @@
 msgstr "执行上下文错误"
 
 #, c-format
-msgid "Premature EOF seen from server"
-msgstr "从服务器发现 EOF 太早"
+msgid "Premature EOF seen from server (http status=%d)"
+msgstr "从服务器发现 EOF 太早 (http status=%d)"
 
 #, c-format
 msgid "Unspecified error message: %d %s"
@@ -3501,6 +3506,9 @@
 msgid "Revprop change"
 msgstr "版本属性改变"
 
+msgid "Obliteration"
+msgstr "灭迹"
+
 msgid "Lock"
 msgstr "加锁"
 
@@ -3562,6 +3570,9 @@
 "ask the administrator to create a pre-revprop-change hook"
 msgstr "此版本库不允许修改版本属性;请管理员创建 pre-revprop-change 钩子"
 
+msgid "Repository has not been enabled to accept obliteration"
+msgstr "版本库还没有启用灭迹"
+
 msgid "Premature end of content data in dumpstream"
 msgstr "转存流中内容数据过早结束"
 
@@ -3730,12 +3741,18 @@
 msgid "Creating pre-revprop-change hook"
 msgstr "正在创建 pre-revprop-change 钩子"
 
+msgid "Creating pre-obliterate hook"
+msgstr "正在创建 pre-obliterate 钩子"
+
 msgid "Creating post-commit hook"
 msgstr "正在创建 post-commit 钩子"
 
 msgid "Creating post-revprop-change hook"
 msgstr "正在创建 post-revprop-change 钩子"
 
+msgid "Creating post-obliterate hook"
+msgstr "正在创建 post-obliterate 钩子"
+
 msgid "Creating conf directory"
 msgstr "正在创建 conf 目录"
 
@@ -4016,18 +4033,6 @@
 msgstr "不能设置 “%s” 的存取时间"
 
 #, c-format
-msgid "Can't get default file perms for file at '%s' (file stat error)"
-msgstr "不能获取 “%s” 文件的缺省权限(文件 stat 错误)"
-
-#, c-format
-msgid "Can't open file at '%s'"
-msgstr "不能打开文件 “%s”"
-
-#, c-format
-msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "不能获取 “%s” 文件的权限(文件 stat 错误)"
-
-#, c-format
 msgid "Can't change perms of file '%s'"
 msgstr "不能改变文件 “%s” 的权限"
 
@@ -4378,12 +4383,16 @@
 "\n"
 
 msgid ""
-"Copyright (C) 2009 The Subversion Corporation.\n"
+"Copyright (C) 2009 The Apache Software Foundation.\n"
 "This software consists of contributions made by many people;\n"
 "see the NOTICE file for more information.\n"
-"Subversion is open source software, see http://subversion.tigris.org/\n"
+"Subversion is open source software, see http://subversion.apache.org/\n"
 "\n"
 msgstr ""
+"版权所有 (C) 2009 Apache 软件基金会。\n"
+"此软件包含了许多人的贡献;请查看文件 NOTICE 以获得更多信息。\n"
+"Subversion 是开放源代码软件,请参阅 http://subversion.apache.org/ 站点。\n"
+"\n"
 
 #, c-format
 msgid "Can't determine the native path encoding"
@@ -4567,7 +4576,7 @@
 
 #, c-format
 msgid "Expected SQLite database not found: %s"
-msgstr "未发现期望的 SQLite 数据库:%s"
+msgstr "未发现期待的 SQLite 数据库:%s"
 
 #, c-format
 msgid "File '%s' has inconsistent newlines"
@@ -4654,9 +4663,9 @@
 msgid "Malformed XML: %s at line %ld"
 msgstr "非法 XML: %s 在第 %ld 行"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Can't retrieve base revision for %s"
-msgstr "获取所有版本属性"
+msgstr "不能获取 %s 的基础版本"
 
 msgid "Error aborting report"
 msgstr "取消报告出错"
@@ -4691,8 +4700,8 @@
 msgstr "路径 “%s” 有不支持的节点种类"
 
 #, c-format
-msgid "'%s' can not be deleted"
-msgstr "“%s” 不能被删除"
+msgid "'%s' cannot be deleted"
+msgstr "'%s' 不能被删除"
 
 #, c-format
 msgid "Can't create an entry with a reserved name while trying to add '%s'"
@@ -4760,11 +4769,7 @@
 #, c-format
 msgid ""
 "Tree conflicts can only be resolved to 'working' state; '%s' not resolved"
-msgstr ""
-
-#, c-format
-msgid "no parent with copyfrom information found above '%s'"
-msgstr "没有在“%s”上找到具有 copyfrom 信息的父对象"
+msgstr "树冲突只能解决为 “working” 状态;“%s” 还没有解决"
 
 #, c-format
 msgid "'%s' already exists and is in the way"
@@ -4788,28 +4793,28 @@
 msgid "Cannot copy to '%s' as it is scheduled for deletion"
 msgstr "无法复制到“%s”,因为它已调度删除"
 
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is already under version control but is excluded."
-msgstr "“%s”已纳入版本控制"
+msgstr "'%s' 已纳入版本控制,却被排除。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot exclude '%s': it is a working copy root"
-msgstr "不期望 “%s” 是工作副本根目录"
+msgstr "不能排除 '%s': 它是工作副本根目录"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot exclude '%s': it is a switched path"
-msgstr "无法修剪 “%s”:它是已切换的路径"
+msgstr "不能排除 '%s':它是已切换的路径"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Cannot exclude '%s': it is to be added to the repository. Try commit instead"
-msgstr "无法修剪 “%s”: 它将要从版本库中删除;请先提交"
+msgstr "不能排除 '%s': 它将要增加到版本库中。请先提交"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Cannot exclude '%s': it is to be deleted from the repository. Try commit "
 "instead"
-msgstr "无法修剪 “%s”: 它将要从版本库中删除;请先提交"
+msgstr "不能排除 '%s': 它将要从版本库中删除。请先提交"
 
 msgid "Can only crop a working copy with a restrictive depth"
 msgstr "只能修剪工作副本到有限深度"
@@ -4827,10 +4832,10 @@
 "instead"
 msgstr "无法修剪 “%s”: 它将要从版本库中删除;请先提交"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Cannot crop '%s': it is to be added to the repository. Try commit instead"
-msgstr "无法修剪 “%s”: 它将要从版本库中删除;请先提交"
+msgstr "无法修剪 '%s': 它将要增加到版本库中。请先提交"
 
 msgid "No WC table entry"
 msgstr "没有 WC 表入口"
@@ -4886,9 +4891,9 @@
 msgid "Path '%s' ends in '%s', which is unsupported for this operation"
 msgstr "路径“%s”以“%s”结束,此操作不支持"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Working copy format of '%s' is too old (%d); please run 'svn upgrade'"
-msgstr "工作副本格式太旧; 请执行 'svn upgrade'"
+msgstr "'%s' 的工作副本格式太旧 (%d); 请执行 'svn upgrade'"
 
 #, c-format
 msgid "Working copy '%s' locked"
@@ -4902,9 +4907,9 @@
 msgid "Expected '%s' to be a directory but found a file"
 msgstr "期望“%s”是目录,但它是文件"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Can't retrieve an access baton for non-directory '%s'"
-msgstr "不能获取非目录的条目"
+msgstr "不能获取非目录对象 '%s' 的访问权"
 
 #, c-format
 msgid "Directory '%s' is missing"
@@ -4954,40 +4959,8 @@
 msgstr "删除条目“%s”的锁出错"
 
 #, c-format
-msgid "Error removing changelist from entry '%s'"
-msgstr "从入口“%s”删除修改列表出错"
-
-#, c-format
-msgid "Missing 'revision' attribute for '%s'"
-msgstr "“%s”丢失了“revision”属性"
-
-#, c-format
-msgid "Log command for directory '%s' is mislocated"
-msgstr "目录“%s”的日志命令被错置"
-
-#, c-format
-msgid "Error replacing text-base of '%s'"
-msgstr "替换“%s”的文件参考基础出错"
-
-#, c-format
-msgid "Error getting 'affected time' of '%s'"
-msgstr "取得“%s”的“affected time”出错"
-
-#, c-format
-msgid "Error getting 'affected time' for '%s'"
-msgstr "取得“%s”的“affected time”出错"
-
-#, c-format
-msgid "Error comparing '%s' and '%s'"
-msgstr "比较“%s”与“%s”出错"
-
-#, c-format
-msgid "Error modifying entry of '%s'"
-msgstr "修改“%s”的入口出错"
-
-#, fuzzy, c-format
 msgid "Error recording tree conflict on '%s'"
-msgstr "在 “%s” 中记录树冲突出错"
+msgstr "在 '%s' 中记录树冲突出错"
 
 #, c-format
 msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
@@ -5001,9 +4974,9 @@
 msgid "Error processing command '%s' in '%s'"
 msgstr "处理命令 “%s” 于 “%s” 出错"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is not a child of '%s'"
-msgstr "路径“%s”不是文件"
+msgstr "路径 '%s' 不是 '%s' 的孩子"
 
 #, c-format
 msgid "'%s' is not a working copy directory"
@@ -5051,13 +5024,13 @@
 msgid "Entry for '%s' has invalid repository root"
 msgstr "“%s”条目的版本库根目录无效"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Entry '%s' has invalid 'schedule' value"
-msgstr "入口“%s”有无效值“%s”"
+msgstr "入口 '%s' 有无效 'schedule' 值"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Entry '%s' has invalid 'depth' value"
-msgstr "入口“%s”有无效值“%s”"
+msgstr "入口 '%s' 有无效 'depth' 值"
 
 #, c-format
 msgid "Entry '%s' has invalid '%s' value"
@@ -5217,22 +5190,25 @@
 "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
 msgstr "无效属性 %s 位于 “%s”: 目标 “%s” 包含 “..” 或是绝对路径"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch indicates corrupt text base: '%s':\n"
 "   expected:  %s\n"
 "     actual:  %s\n"
-msgstr "校验和不一致,文件参考基础损坏: “%s”"
+msgstr ""
+"校验和不一致,指示文件参考基础损坏: '%s':\n"
+"       期望:  %s\n"
+"       实际:  %s\n"
 
 msgid "Cannot relocate a single file"
 msgstr "无法重新定位单个文件"
 
 msgid "Given source URL invalid"
-msgstr ""
+msgstr "提供的源 URL 非法"
 
 #, c-format
 msgid "Given destination URL invalid: '%s'"
-msgstr ""
+msgstr "提供的目的 URL 非法: '%s'"
 
 msgid "Unknown enumeration value in tree conflict description"
 msgstr "树冲突描述中有未知的枚举值"
@@ -5256,12 +5232,15 @@
 msgid "Attempt to add tree conflict that already exists at '%s'"
 msgstr "试图增加已经位于“%s”的树冲突"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch while updating '%s':\n"
 "   expected:  %s\n"
 "     actual:  %s\n"
-msgstr "更新 “%s” 时,校验和不匹配"
+msgstr ""
+"更新 '%s' 时,校验和不匹配:\n"
+"       期望:  %s\n"
+"       实际:  %s\n"
 
 #, c-format
 msgid "Path '%s' is not in the working copy"
@@ -5285,15 +5264,15 @@
 "already exists"
 msgstr "无法新增目录“%s”: 同名未版本控制目录对象已存在"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to add directory '%s': a separate working copy with the same name "
 "already exists"
-msgstr "增加目录 '%s' 失败: 同名受版本控制的目录已存在"
+msgstr "增加目录 '%s' 失败: 同名且独立的工作副本已存在"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Switched directory '%s' does not match expected URL '%s'"
-msgstr "URL '%s' 对于现有目录 '%s' 不匹配,期望的 URL 是 '%s'"
+msgstr "已经切换的目录 '%s' 与期望的 URL '%s' 不匹配"
 
 #, c-format
 msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
@@ -5313,6 +5292,12 @@
 
 #, c-format
 msgid ""
+"Failed to add file '%s': object of the same name as the administrative "
+"directory"
+msgstr "无法增加文件“%s”: 对象与管理目录同名"
+
+#, c-format
+msgid ""
 "Failed to add file '%s': a non-file object of the same name already exists"
 msgstr "无法新增文件“%s”: 同名非文件对象已存在"
 
@@ -5323,12 +5308,13 @@
 
 #, c-format
 msgid ""
-"UUID mismatch: existing file '%s' was checked out from a different repository"
-msgstr "UUID 不匹配: 现有文件 '%s' 来自其它版本库"
+"Failed to add file '%s': a file from another repository with the same name "
+"already exists"
+msgstr "无法新增文件“%s”: 来自其它版本库的同名文件对象已存在"
 
 #, c-format
-msgid "URL '%s' of existing file '%s' does not match expected URL '%s'"
-msgstr "URL '%s' 对于现有文件 '%s' 不匹配,期望的 URL 是 '%s'"
+msgid "Switched file '%s' does not match expected URL '%s'"
+msgstr "已经切换的文件 '%s' 与期望的 URL '%s' 不匹配"
 
 #, c-format
 msgid ""
@@ -5336,6 +5322,9 @@
 "   expected:  %s\n"
 "   recorded:  %s\n"
 msgstr ""
+"'%s' 的校验和不匹配:\n"
+"       期望:  %s\n"
+"       记录:  %s\n"
 
 #, c-format
 msgid "Copyfrom-url '%s' has different repository root than '%s'"
@@ -5350,9 +5339,8 @@
 "1.6"
 msgstr "有日志存在时无法升级;请使用 Subversion 1.6 执行“svn cleanup”"
 
-#, fuzzy
 msgid "'svn upgrade' can only be run from the root of the working copy."
-msgstr "服务器只能从版本库的根重放"
+msgstr "只能在工作副本的根目录执行 'svn upgrade'"
 
 #, c-format
 msgid "'%s' is not a directory"
@@ -5366,9 +5354,8 @@
 msgstr "不能为“%s”找到 URL"
 
 #. Verify the checksum kind for pristine storage.
-#, fuzzy
 msgid "Only SHA1 checksums can be used as keys in the pristine file storage.\n"
-msgstr "在表 rep_cache 中,只有 SHA1 校验和才能用作键。\n"
+msgstr "在原始的文件存储中,只有 SHA1 校验和才能用作键。\n"
 
 #, c-format
 msgid ""
@@ -5376,17 +5363,17 @@
 "copy again"
 msgstr "“%s”的工作副本格式太旧(%d);请重新取出工作副本"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This client is too old to work with the working copy at\n"
 "'%s' (format %d).\n"
 "You need to get a newer Subversion client. For more details, see\n"
 "  http://subversion.tigris.org/faq.html#working-copy-format-change\n"
 msgstr ""
-"此客户端对于工作副本 “%s” 太旧。你需要取得更新的 Subversion 客户端,或者降级\n"
-"工作副本。参见 http://subversion.tigris.org/faq.html#working-copy-format-"
-"change\n"
-"以获得更详细的信息。"
+"此客户端对于工作副本“%s”太旧(格式 %d)。\n"
+"你需要取得更新的 Subversion 客户端。参见\n"
+"  http://subversion.tigris.org/faq.html#working-copy-format-change\n"
+"以获得更详细的信息。\n"
 
 #, c-format
 msgid "No REPOSITORY table entry for id '%ld'"
@@ -5400,9 +5387,9 @@
 msgid "Parent(s) of '%s' should have repository information."
 msgstr "'%s' 的父亲应该包含版本库的信息。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Missing a row in WCROOT."
-msgstr "WCROOT 中的 '%s' 丢失了一行。"
+msgstr "WCROOT 中丢失了一行。"
 
 #, c-format
 msgid "Missing a row in WCROOT for '%s'."
@@ -5413,6 +5400,10 @@
 msgstr "节点 '%s' 的校验和损坏。"
 
 #, c-format
+msgid "Can't store properties for '%s' in '%s'."
+msgstr "不能存储 '%s' 的属性,在 '%s' 中。"
+
+#, c-format
 msgid "Corrupt data for '%s'"
 msgstr "'%s' 的数据损坏"
 
@@ -5424,15 +5415,39 @@
 msgid "Expected node '%s' to be deleted."
 msgstr "期望节点“%s”被删除。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Repository '%s' not found in the database"
-msgstr "HEAD 版本中找不到路径 “%s”"
+msgstr "在数据库中找不到版本库“%s”"
+
+#, c-format
+msgid "There is no work queue for '%s'."
+msgstr "没有 '%s' 的工作队列。"
 
 #, c-format
 msgid "Error restoring text for '%s'"
 msgstr "还原 “%s” 文本出错"
 
 #, c-format
+msgid "Error replacing text-base of '%s'"
+msgstr "替换“%s”的文件参考基础出错"
+
+#, c-format
+msgid "Error getting 'affected time' of '%s'"
+msgstr "取得“%s”的“affected time”出错"
+
+#, c-format
+msgid "Error getting 'affected time' for '%s'"
+msgstr "取得“%s”的“affected time”出错"
+
+#, c-format
+msgid "Error comparing '%s' and '%s'"
+msgstr "比较“%s”与“%s”出错"
+
+#, c-format
+msgid "Error modifying entry of '%s'"
+msgstr "修改“%s”的入口出错"
+
+#, c-format
 msgid "Unrecognized work item in the queue associated with '%s'"
 msgstr "“%s” 关联的队列中的项目无法识别"
 
@@ -5626,6 +5641,15 @@
 
 #, c-format
 msgid ""
+"Invalid option; cannot resolve property conflicts with an external merge "
+"tool.\n"
+"\n"
+msgstr ""
+"非法选项;不能使用外部合并工具来解决属性冲突。\n"
+"\n"
+
+#, c-format
+msgid ""
 "Invalid option.\n"
 "\n"
 msgstr ""
@@ -6117,13 +6141,12 @@
 msgid "ignore ancestry when calculating merges"
 msgstr "合并时忽略原始信息"
 
-#, fuzzy
 msgid ""
 "ignore externals definitions\n"
 "                             [aliases: --ie]"
 msgstr ""
-"只能对修改列表 ARG 成员操作\n"
-"                             [aliases: --cl]"
+"忽略外部定义\n"
+"                             [aliases: --ie]"
 
 msgid "use ARG as diff command"
 msgstr "使用 ARG 作为比较命令"
@@ -6134,8 +6157,8 @@
 msgid "use ARG as external editor"
 msgstr "使用 ARG 作为外部编辑器"
 
-msgid "mark revisions as merged (use with -r)"
-msgstr "标记版本为已合并(使用 -r 参数)"
+msgid "merge only mergeinfo differences"
+msgstr "只合并 mergeinfo 的差异"
 
 msgid "use ARG as the older target"
 msgstr "使用 ARG 作为旧目标"
@@ -6156,12 +6179,12 @@
 "set user configuration option in the format:\n"
 "                                 FILE:SECTION:OPTION=[VALUE]\n"
 "                             For example:\n"
-"                                 servers:global:http-library=serf\n"
+"                                 servers:global:http-library=serf"
 msgstr ""
 "以下属格式设置用户配置选项:\n"
 "                                 FILE:SECTION:OPTION=[VALUE]\n"
 "                             例如:\n"
-"                                 servers:global:http-library=serf\n"
+"                                 servers:global:http-library=serf"
 
 msgid "enable automatic properties"
 msgstr "启用自动属性"
@@ -6253,11 +6276,15 @@
 "                                 doc/fudge/crunchy.html\n"
 "                             to be interpreted as\n"
 "                                 fudge/crunchy.html\n"
-"                             while -p2 would give just crunchy.html\n"
+"                             while -p2 would give just crunchy.html"
 msgstr ""
+"需要从路径中裁剪的前导路径组件数量。\n"
+"                指定 -p0 不修改路径。指定 -p1 会将路径 doc/fudge/crunchy."
+"html\n"
+"                被转换为 fudge/crunchy.html。指定 -p2 会得到 crunchy.html 。"
 
 msgid "don't diff copied or moved files with their source"
-msgstr ""
+msgstr "请不要将复制或移动的文件与其源文件比较"
 
 msgid ""
 "Put files and directories under version control, scheduling\n"
@@ -6851,6 +6878,8 @@
 "Permanently delete a specific node-revision from the repository.\n"
 "usage: obliterate URL@REV\n"
 msgstr ""
+"从版本库持久删除指定的版本。\n"
+"用法: obliterate URL@REV\n"
 
 msgid ""
 "Apply a patch to a working copy.\n"
@@ -7009,7 +7038,7 @@
 "        foo/bar -r 1234 http://example.com/repos/zag\n"
 "      Subversion 1.5 and greater support the above formats and the\n"
 "      following formats where the URLs may have peg revisions:\n"
-"                http://example.com/repos/zig foo\n"
+"                http://example.com/repos/zig@42 foo\n"
 "        -r 1234 http://example.com/repos/zig foo/bar\n"
 "      Relative URLs are supported in Subversion 1.5 and greater for\n"
 "      all above formats and are indicated by starting the URL with one\n"
@@ -7020,6 +7049,8 @@
 "        /    to the server root\n"
 "      The ambiguous format 'relative_path relative_path' is taken as\n"
 "      'relative_url relative_path' with peg revision support.\n"
+"      Lines in externals definitions starting with the '#' character\n"
+"      are considered comments and are ignored.\n"
 "    svn:needs-lock - If present, indicates that the file should be locked\n"
 "      before it is modified.  Makes the working copy file read-only\n"
 "      when it is not locked.  Use 'svn propdel svn:needs-lock PATH...'\n"
@@ -7064,7 +7095,7 @@
 "        foo/bar -r 1234 http://example.com/repos/zag\n"
 "      Subversion 1.5 和更高的版本支持以上格式,以及下列格式,URL 中可以有\n"
 "      peg 版本:\n"
-"                http://example.com/repos/zig foo\n"
+"                http://example.com/repos/zig@42 foo\n"
 "        -r 1234 http://example.com/repos/zig foo/bar\n"
 "      Subversion 1.5 和更高的版本在上述格式中支持相对 URL,在用 URL 开始用\n"
 "      下述字符串之一来指示:\n"
@@ -7074,6 +7105,7 @@
 "        /    相对于服务器根\n"
 "      相对路径“relative_path relative_path”这种不明确的格式来自\n"
 "      “relative_url relative_path”和 peg 版本支持。\n"
+"      以字符 '#' 开始的外部定义行被认为是注释,并且忽略。\n"
 "    svn:needs-lock - 此属性表明文件在修改前应该加锁。\n"
 "      如果没有加锁,则此文件在工作副本中应被设为只读。使用\n"
 "      “svn propdel svn:needs-lock PATH...” 清除。\n"
@@ -7326,9 +7358,7 @@
 "     are applied to the obstructing path.\n"
 "\n"
 "     Use the --set-depth option to set a new working copy depth on the\n"
-"     targets of this operation.  Currently, the depth of a working copy\n"
-"     directory can only be increased (telescoped more deeply); you cannot\n"
-"     make a directory more shallow.\n"
+"     targets of this operation.\n"
 "\n"
 "  2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
 "     This is used when repository's root URL changes (such as a scheme\n"
@@ -7364,8 +7394,7 @@
 "同,\n"
 "     将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
 "\n"
-"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。目前工作副本的\n"
-"     深度只能增加(嵌入更深);你不能让目录收缩。\n"
+"     使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。\n"
 "\n"
 "  2、重写工作副本的 URL 元数据,以反映单纯的 URL 改变。当版本库的根 URL 改\n"
 "     变(比如方案或者主机名称变动),但是工作副本仍旧对应同一版本库的同一目录\n"
@@ -7394,7 +7423,6 @@
 "\n"
 "    使用 --force 终止锁定。\n"
 
-#, fuzzy
 msgid ""
 "Bring changes from the repository into the working copy.\n"
 "usage: update [PATH...]\n"
@@ -7432,9 +7460,7 @@
 "  in the first column with code 'E'.\n"
 "\n"
 "  Use the --set-depth option to set a new working copy depth on the\n"
-"  targets of this operation.  Currently, the depth of a working copy\n"
-"  directory can only be increased (telescoped more deeply); you cannot\n"
-"  make a directory more shallow.\n"
+"  targets of this operation.\n"
 msgstr ""
 "将版本库的修改合并到工作副本中。\n"
 "用法: update [PATH...]\n"
@@ -7461,8 +7487,7 @@
 "  不同,将视为工作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n"
 "  用第一列字符 “E” 来报告障碍路径。\n"
 "\n"
-"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。目前工作副本的\n"
-"  深度只能增加(嵌入更深);你不能让目录收缩。\n"
+"  使用“--set-depth”选项设置此操作目标的工作副本之新深度。\n"
 
 msgid ""
 "Upgrade the metadata storage format for a working copy.\n"
@@ -7523,13 +7548,11 @@
 msgid "'%s' is not a valid --show-revs value"
 msgstr "“%s” 是非法 --show-revs 取值"
 
-#, fuzzy
 msgid "Non-numeric strip argument given"
-msgstr "--limit 取值不是数字"
+msgstr "提供的修剪参数不是数字"
 
-#, fuzzy
 msgid "Argument to --strip must be positive"
-msgstr "--limit 取值必须为正"
+msgstr "--strip 参数的取值必须为正"
 
 #, c-format
 msgid "Subcommand argument required\n"
@@ -7867,20 +7890,18 @@
 msgid "property '%s' deleted from repository revision %ld\n"
 msgstr "删除属性 “%s” 于版本库版本 %ld\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Upgraded '%s'.\n"
-msgstr "跳过“%s”\n"
+msgstr "已升级的“%s”。\n"
 
-#, fuzzy
 msgid "Wrong number of arguments"
-msgstr "指定的目标数目错误"
+msgstr "参数数目错误"
 
-#, fuzzy
 msgid "Target must specify the revision as a number"
-msgstr "指定版本编号 ARG"
+msgstr "目标版本必须是数字"
 
 msgid "Target must specify a URL"
-msgstr ""
+msgstr "目标必须是 URL"
 
 #, c-format
 msgid "Cannot specify revision for deleting versioned property '%s'"
@@ -7999,7 +8020,7 @@
 msgstr "增加"
 
 msgid "replace"
-msgstr ""
+msgstr "替换"
 
 msgid "missing"
 msgstr "失踪"
@@ -8696,6 +8717,9 @@
 msgid "Do not display filtering statistics."
 msgstr "不显示过滤的统计数据。"
 
+msgid "Treat the path prefixes as file glob patterns."
+msgstr "将路径前缀视为文件统配模式。"
+
 msgid "Remove revisions emptied by filtering."
 msgstr "删除因过滤而产生的空版本。"
 
@@ -8755,13 +8779,29 @@
 
 #, c-format
 msgid "Including (and dropping empty revisions for) prefixes:\n"
-msgstr "包含 (以及丢弃空版本) 的前缀: \n"
+msgstr "包含(以及丢弃空版本)的前缀: \n"
 
 #, c-format
 msgid "Including prefixes:\n"
 msgstr "包含的前缀: \n"
 
 #, c-format
+msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
+msgstr "排除(以及丢弃空版本)的前缀匹配模式: \n"
+
+#, c-format
+msgid "Excluding prefix patterns:\n"
+msgstr "排除前缀匹配模式: \n"
+
+#, c-format
+msgid "Including (and dropping empty revisions for) prefix patterns:\n"
+msgstr "包含(以及丢弃空版本)的前缀匹配模式: \n"
+
+#, c-format
+msgid "Including prefix patterns:\n"
+msgstr "包含的前缀匹配模式: \n"
+
+#, c-format
 msgid ""
 "Dropped %d revision.\n"
 "\n"
@@ -8922,17 +8962,15 @@
 "\n"
 "显示本身改变 (编辑属性) 的目录,或是其中的文件修改过的目录。\n"
 
-#, fuzzy
 msgid ""
 "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
 "\n"
 "Print the size (in bytes) of the file located at PATH_IN_REPOS as\n"
 "it is represented in the repository.\n"
 msgstr ""
-"用法: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
+"用法: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
 "\n"
-"显示位于 PATH-IN-REPOS 或其子孙上的所有锁的描述(如果没有提供 PATH-IN-REPOS,\n"
-"那么显示版本库根的信息)。\n"
+"显示位于 PATH_IN_REPOS 的文件在版本库中展现的大小(字节)\n"
 
 msgid ""
 "usage: svnlook help [SUBCOMMAND...]\n"
@@ -9053,15 +9091,6 @@
 msgid "Copied: %s (from rev %ld, %s)\n"
 msgstr "已复制: %s (来自版本 %ld,%s)\n"
 
-msgid "Added"
-msgstr "已增加"
-
-msgid "Deleted"
-msgstr "已删除"
-
-msgid "Modified"
-msgstr "已修改"
-
 msgid "Index"
 msgstr "索引"
 
@@ -9493,7 +9522,7 @@
 msgstr "尽可能少打印"
 
 msgid "allow a non-empty destination repository"
-msgstr ""
+msgstr "允许非空目标版本库"
 
 msgid ""
 "specify a username ARG (deprecated;\n"
@@ -9552,14 +9581,15 @@
 "allow-non-empty if the repository's revisions are known to mirror their "
 "respective revisions in the source repository"
 msgstr ""
+"目标版本库已经包含版本历史;如果你确信它们是镜像源版本库的对应版本的话,\n"
+"考虑使用选项 '--allow-non-empty'"
 
 #, c-format
 msgid "Destination repository is already synchronizing from '%s'"
 msgstr "目标版本库已经与“%s”同步"
 
-#, fuzzy
 msgid "Destination repository has more revisions than source repository"
-msgstr "目标版本库没有初始化"
+msgstr "目标版本库的版本数量比源版本库多"
 
 #, c-format
 msgid "Path '%s' is not a URL"

Modified: subversion/branches/issue-3242-dev/subversion/po/zh_TW.po
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/po/zh_TW.po?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/po/zh_TW.po [UTF-8] (original)
+++ subversion/branches/issue-3242-dev/subversion/po/zh_TW.po [UTF-8] Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
 # Tranditional Chinese translation for subversion package
 #
-#    Licensed to the Subversion Corporation (SVN Corp.) under one
+#    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
-#    regarding copyright ownership.  The SVN Corp. licenses this file
+#    regarding copyright ownership.  The ASF licenses this file
 #    to you under the Apache License, Version 2.0 (the
 #    "License"); you may not use this file except in compliance
 #    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/add-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/add-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/add-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/add-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * add-cmd.c -- Subversion add/unadd commands
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/blame-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/blame-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/blame-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/blame-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * blame-cmd.c -- Display blame information
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/cat-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/cat-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/cat-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/cat-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * cat-cmd.c -- Print the content of a file or URL.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/changelist-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/changelist-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/changelist-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/changelist-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * changelist-cmd.c -- Associate (or deassociate) a wc path with a changelist.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/checkout-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/checkout-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/checkout-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/checkout-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * checkout-cmd.c -- Subversion checkout command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at
@@ -94,7 +94,7 @@
           /* Discard the peg-revision, if one was provided. */
           SVN_ERR(svn_opt_parse_path(&pegrev, &local_dir, local_dir, pool));
           if (pegrev.kind != svn_opt_revision_unspecified)
-            local_dir = svn_path_canonicalize(local_dir, pool);
+            local_dir = svn_uri_canonicalize(local_dir, pool);
 
           local_dir = svn_uri_basename(local_dir, pool);
           local_dir = svn_path_uri_decode(local_dir, pool);
@@ -139,7 +139,7 @@
       SVN_ERR(svn_opt_parse_path(&peg_revision, &true_url, repos_url,
                                  subpool));
 
-      true_url = svn_path_canonicalize(true_url, subpool);
+      true_url = svn_uri_canonicalize(true_url, subpool);
 
       /* Use sub-directory of destination if checking-out multiple URLs */
       if (targets->nelts == 2)
@@ -150,7 +150,7 @@
         {
           target_dir = svn_uri_basename(true_url, subpool);
           target_dir = svn_path_uri_decode(target_dir, subpool);
-          target_dir = svn_path_join(local_dir, target_dir, subpool);
+          target_dir = svn_dirent_join(local_dir, target_dir, subpool);
         }
 
       /* Checkout doesn't accept an unspecified revision, so default to

Modified: subversion/branches/issue-3242-dev/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/cl.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/cl.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/cl.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * cl.h:  shared stuff in the command line program
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/cleanup-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/cleanup-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/cleanup-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/cleanup-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * cleanup-cmd.c -- Subversion cleanup command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/client_errors.h
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/client_errors.h?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/client_errors.h (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/client_errors.h Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * client_errors.h:  error codes this command line client features
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/commit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/commit-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/commit-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/commit-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * commit-cmd.c -- Check changes into the repository.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/conflict-callbacks.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/conflict-callbacks.c Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
  * commandline client.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/copy-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/copy-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * copy-cmd.c -- Subversion copy command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/delete-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/delete-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/delete-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/delete-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * delete-cmd.c -- Delete/undelete commands
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/diff-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/diff-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/diff-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/diff-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * diff-cmd.c -- Display context diff of a file
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/export-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/export-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/export-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * export-cmd.c -- Subversion export command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/help-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/help-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/help-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * help-cmd.c -- Provide help
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/import-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/import-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/import-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/import-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * import-cmd.c -- Import a file or tree into the repository.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/info-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/info-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/info-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * info-cmd.c -- Display information about a resource
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/list-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/list-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/list-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/list-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * list-cmd.c -- list a URL
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/lock-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/lock-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/lock-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/lock-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * lock-cmd.c -- LOck a working copy path in the repository.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/log-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/log-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/log-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * log-cmd.c -- Display log messages
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/main.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/main.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * main.c:  Subversion command line client.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at
@@ -244,7 +244,7 @@
                        "                             "
                        "For example:\n"
                        "                             "
-                       "    servers:global:http-library=serf\n")},
+                       "    servers:global:http-library=serf")},
   {"auto-props",    opt_autoprops, 0, N_("enable automatic properties")},
   {"no-auto-props", opt_no_autoprops, 0, N_("disable automatic properties")},
   {"native-eol",    opt_native_eol, 1,
@@ -306,7 +306,7 @@
                        "                             "
                        "    fudge/crunchy.html\n"
                        "                             "
-                       "while -p2 would give just crunchy.html\n")},
+                       "while -p2 would give just crunchy.html")},
   {"show-copies-as-adds", opt_show_copies_as_adds, 0,
                     N_("don't diff copied or moved files with their source")},
 
@@ -846,7 +846,7 @@
      "        foo/bar -r 1234 http://example.com/repos/zag\n"
      "      Subversion 1.5 and greater support the above formats and the\n"
      "      following formats where the URLs may have peg revisions:\n"
-     "                http://example.com/repos/zig foo\n"
+     "                http://example.com/repos/zig@42 foo\n"
      "        -r 1234 http://example.com/repos/zig foo/bar\n"
      "      Relative URLs are supported in Subversion 1.5 and greater for\n"
      "      all above formats and are indicated by starting the URL with one\n"
@@ -857,6 +857,8 @@
      "        /    to the server root\n"
      "      The ambiguous format 'relative_path relative_path' is taken as\n"
      "      'relative_url relative_path' with peg revision support.\n"
+     "      Lines in externals definitions starting with the '#' character\n"
+     "      are considered comments and are ignored.\n"
      "    svn:needs-lock - If present, indicates that the file should be locked\n"
      "      before it is modified.  Makes the working copy file read-only\n"
      "      when it is not locked.  Use 'svn propdel svn:needs-lock PATH...'\n"
@@ -1011,9 +1013,7 @@
      "     are applied to the obstructing path.\n"
      "\n"
      "     Use the --set-depth option to set a new working copy depth on the\n"
-     "     targets of this operation.  Currently, the depth of a working copy\n"
-     "     directory can only be increased (telescoped more deeply); you cannot\n"
-     "     make a directory more shallow.\n"
+     "     targets of this operation.\n"
      "\n"
      "  2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
      "     This is used when repository's root URL changes (such as a scheme\n"
@@ -1080,9 +1080,7 @@
      "  in the first column with code 'E'.\n"
      "\n"
      "  Use the --set-depth option to set a new working copy depth on the\n"
-     "  targets of this operation.  Currently, the depth of a working copy\n"
-     "  directory can only be increased (telescoped more deeply); you cannot\n"
-     "  make a directory more shallow.\n"),
+     "  targets of this operation.\n"),
     {'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force,
      opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept} },
 

Modified: subversion/branches/issue-3242-dev/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/merge-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/merge-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * merge-cmd.c -- Merging changes into a working copy.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/mergeinfo-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/mergeinfo-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * mergeinfo-cmd.c -- Query merge-relative info.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/mkdir-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/mkdir-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/mkdir-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/mkdir-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * mkdir-cmd.c -- Subversion mkdir command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/move-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/move-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/move-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/move-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * move-cmd.c -- Subversion move command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/notify.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/notify.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/notify.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * notify.c:  feedback handlers for cmdline client.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/obliterate-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/obliterate-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/obliterate-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/obliterate-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * obliterate-cmd.c -- Subversion command to permanently delete history.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/patch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/patch-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/patch-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/patch-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * patch-cmd.c -- Apply changes to a working copy.
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/propdel-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/propdel-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/propdel-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/propdel-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * propdel-cmd.c -- Remove property from files/dirs
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/propedit-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/propedit-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * propedit-cmd.c -- Edit properties of files/dirs using $EDITOR
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/propget-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/propget-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/propget-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/propget-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * propget-cmd.c -- Print properties and values of files/dirs
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/proplist-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/proplist-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/proplist-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/proplist-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * proplist-cmd.c -- List properties of files/dirs
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/props.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/props.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/props.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * props.c: Utility functions for property handling
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/propset-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/propset-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/propset-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/propset-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * propset-cmd.c -- Set property values on files/dirs
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/resolve-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/resolve-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/resolve-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * resolve-cmd.c -- Subversion resolve subcommand
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/resolved-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/resolved-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/resolved-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/resolved-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * resolved-cmd.c -- Subversion resolved subcommand
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/revert-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/revert-cmd.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/revert-cmd.c (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/revert-cmd.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * revert-cmd.c -- Subversion revert command
  *
  * ====================================================================
- *    Licensed to the Subversion Corporation (SVN Corp.) under one
+ *    Licensed to the Apache Software Foundation (ASF) under one
  *    or more contributor license agreements.  See the NOTICE file
  *    distributed with this work for additional information
- *    regarding copyright ownership.  The SVN Corp. licenses this file
+ *    regarding copyright ownership.  The ASF licenses this file
  *    to you under the Apache License, Version 2.0 (the
  *    "License"); you may not use this file except in compliance
  *    with the License.  You may obtain a copy of the License at

Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/blame.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/blame.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/blame.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/blame.rnc Tue Dec 15 06:14:36 2009
@@ -1,6 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
 # XML RELAX NG schema for Subversion command-line client output
 # For "svn blame"
 
+
 include "common.rnc"
 
 start = blame

Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/common.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/common.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/common.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/common.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
 # XML RELAX NG schema for Subversion command-line client output
 # Common declarations
 

Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/diff.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/diff.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/diff.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/diff.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
 # XML RELAX NG schema for Subversion command-line client output
 # For "svn diff --summarize --xml"
 

Modified: subversion/branches/issue-3242-dev/subversion/svn/schema/info.rnc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/subversion/svn/schema/info.rnc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/subversion/svn/schema/info.rnc (original)
+++ subversion/branches/issue-3242-dev/subversion/svn/schema/info.rnc Tue Dec 15 06:14:36 2009
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
 # XML RELAX NG schema for Subversion command-line client output
 # For "svn info"
 



Mime
View raw message