|
|
474.
|
|
|
.merge-right.r%ld%s%s
|
|
|
|
|
.merge-right.r%ld%s%s
|
|
Translated by
Adam Conrad
|
|
|
|
Located in
../libsvn_client/merge.c:2101
|
|
|
475.
|
|
|
Cannot reverse-merge a range from a path's own future history; try updating first
|
|
|
|
|
不能从路径的未来历史中反向合并范围；请先更新
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:3567
|
|
|
476.
|
|
|
One or more conflicts were produced while merging r %ld: %ld into 
' %s' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
当合并 r %ld: %ld 到 “ %s” 时出现了一个或更多的冲突
请解决所有冲突后，再次运行合并，处理剩余的未合并版本 |
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:4295
|
|
|
477.
|
|
|
Invalid mergeinfo detected on '%s', merge tracking not possible
|
|
|
|
|
在“%s”发现了非法的合并信息；合并跟踪是不可能的
|
|
Translated by
Adam Conrad
|
|
|
|
Located in
../libsvn_client/merge.c:6354
|
|
|
478.
|
|
|
Merge tracking not allowed with missing subtrees; try restoring these items first:
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
合并跟踪不允许丢失子树; 请先恢复这些项目:
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:6503
|
|
|
479.
|
|
|
Invalid mergeinfo detected on merge target '%s', merge tracking not possible
|
|
|
|
|
在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的
|
|
Translated by
Adam Conrad
|
|
|
|
Located in
../libsvn_client/merge.c:7505
|
|
|
480.
|
|
|
Use of two URLs is not compatible with mergeinfo modification
|
|
|
|
|
使用两个 URL 与合并信息修改不兼容
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7361
|
|
|
481.
|
|
|
Merge from foreign repository is not compatible with mergeinfo modification
|
|
|
|
|
从外部版本库合并与合并信息修改不兼容
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7368 ../libsvn_client/merge.c:7613
|
|
|
482.
|
|
|
Merge target '%s' does not exist in the working copy
|
|
|
|
|
合并目标 “%s” 不在工作副本中
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10258 ../libsvn_client/merge.c:10401
|
|
|
483.
|
|
|
Cannot determine revision of working copy
|
|
|
|
|
不能确定工作副本的版本
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7974
|
