subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1034411 [3/13] - in /subversion/trunk/subversion/po: de.po es.po fr.po it.po ja.po ko.po nb.po pl.po pt_BR.po sv.po zh_CN.po zh_TW.po
Date Fri, 12 Nov 2010 14:53:47 GMT
Modified: subversion/trunk/subversion/po/es.po
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/es.po?rev=1034411&r1=1034410&r2=1034411&view=diff
==============================================================================
--- subversion/trunk/subversion/po/es.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/es.po [UTF-8] Fri Nov 12 14:53:46 2010
@@ -54,11 +54,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.7\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2009-02-19 14:20-0200\n"
+"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
+"POT-Creation-Date: 2010-11-12 08:49-0600\n"
 "PO-Revision-Date: 2009-02-19 14:22-0200\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Spanish <dev@subversion.tigris.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,72 +68,72 @@ msgstr ""
 #. Constructing nice error messages for roots.
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:61
+#: ../include/private/svn_fs_util.h:68
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "Archivo no encontrado: transacción '%s', ruta '%s'"
 
-#: ../include/private/svn_fs_util.h:66
+#: ../include/private/svn_fs_util.h:73
 #, c-format
 msgid "File not found: revision %ld, path '%s'"
 msgstr "Archivo no encontrado: revisión %ld, ruta '%s'"
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:77
+#: ../include/private/svn_fs_util.h:84
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "El archivo ya existe: sistema de archivos '%s', transacción '%s', ruta '%s'"
 
-#: ../include/private/svn_fs_util.h:82
+#: ../include/private/svn_fs_util.h:89
 #, c-format
 msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
 msgstr "El archivo ya existe: sistema de archivos '%s', revisión %ld, ruta '%s'"
 
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:90
+#: ../include/private/svn_fs_util.h:97
 msgid "Root object must be a transaction root"
 msgstr "El objeto raíz debe ser una raíz de transacción"
 
 #. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
 #. outside of a transaction. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:97
+#: ../include/private/svn_fs_util.h:104
 #, c-format
 msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
 msgstr "El archivo no es mutable: sistema de archivos '%s', revisión %ld, ruta '%s'"
 
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:104
+#: ../include/private/svn_fs_util.h:111
 #, c-format
 msgid "'%s' is not a directory in filesystem '%s'"
 msgstr "'%s' no es un directorio en el sistema de archivos '%s'"
 
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:111
+#: ../include/private/svn_fs_util.h:118
 #, c-format
 msgid "'%s' is not a file in filesystem '%s'"
 msgstr "'%s' no es un archivo en el sistema de archivos '%s'"
 
 #. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:118
+#: ../include/private/svn_fs_util.h:126
 #, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "La ruta '%s' ya está bloqueada por el usuario '%s' en el sistema de archivos '%s'"
 
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:125
+#: ../include/private/svn_fs_util.h:133
 #, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "No hay un bloqueo en la ruta '%s' en el sistema de archivos '%s'"
 
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:132
+#: ../include/private/svn_fs_util.h:140
 #, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "El bloqueo expiró:  token de bloqueo '%s' en el sistema de archivos '%s'"
 
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:139
+#: ../include/private/svn_fs_util.h:147
 #, c-format
 msgid "No username is currently associated with filesystem '%s'"
 msgstr "No hay ningún usuario asociado actualmente con el sistema de archivos '%s'"
@@ -140,1579 +141,1701 @@ msgstr "No hay ningún usuario asociado 
 #. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
 #. LOCK_OWNER doesn't match the USERNAME associated with FS.
 #. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:148
+#: ../include/private/svn_fs_util.h:156
 #, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
 msgstr "El usuario '%s' está intentando usar un bloqueo cuyo dueño es '%s' en el sistema de archivos '%s'"
 
-#: ../include/svn_error_codes.h:155
+#: ../include/svn_error_codes.h:160
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "'Pool' padre pasado a svn_make_pool() inválido"
 
-#: ../include/svn_error_codes.h:159
+#: ../include/svn_error_codes.h:164
 msgid "Bogus filename"
 msgstr "Nombre de archivo sin sentido"
 
-#: ../include/svn_error_codes.h:163
+#: ../include/svn_error_codes.h:168
 msgid "Bogus URL"
 msgstr "URL sin sentido"
 
-#: ../include/svn_error_codes.h:167
+#: ../include/svn_error_codes.h:172
 msgid "Bogus date"
 msgstr "(Fecha sin sentido)"
 
-#: ../include/svn_error_codes.h:171
+#: ../include/svn_error_codes.h:176
 msgid "Bogus mime-type"
 msgstr "Tipo-mime sin sentido"
 
-#: ../include/svn_error_codes.h:181
+#: ../include/svn_error_codes.h:186
 msgid "Wrong or unexpected property value"
 msgstr "Valor de propiedad erróneo o inesperado"
 
-#: ../include/svn_error_codes.h:185
+#: ../include/svn_error_codes.h:190
 msgid "Version file format not correct"
 msgstr "Formato del archivo de versión incorrecto"
 
-#: ../include/svn_error_codes.h:189
+#: ../include/svn_error_codes.h:194
 msgid "Path is not an immediate child of the specified directory"
 msgstr "La ruta no es un descendiente inmediato del directorio especificado"
 
-#: ../include/svn_error_codes.h:193
+#: ../include/svn_error_codes.h:198
 msgid "Bogus UUID"
 msgstr "UUID sin sentido"
 
-#: ../include/svn_error_codes.h:198 ../include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
 msgid "Invalid configuration value"
 msgstr "Valor de configuración inválido"
 
-#: ../include/svn_error_codes.h:202
+#: ../include/svn_error_codes.h:207
 msgid "Bogus server specification"
 msgstr "Especificación del servidor sin sentido"
 
-#: ../include/svn_error_codes.h:206
+#: ../include/svn_error_codes.h:211
 msgid "Unsupported checksum type"
 msgstr "Tipo de suma de verificación no manejado"
 
-#: ../include/svn_error_codes.h:210
+#: ../include/svn_error_codes.h:215
 msgid "Invalid character in hex checksum"
 msgstr "Caracter inválido en suma de verificación hexadecimal"
 
-#: ../include/svn_error_codes.h:216
+#: ../include/svn_error_codes.h:220
+#, fuzzy
+msgid "Unknown string value of token"
+msgstr "Se recibió un estado desconocido para el comando 'lock'"
+
+#: ../include/svn_error_codes.h:226
 msgid "No such XML tag attribute"
 msgstr "No existe tal atributo de etiqueta XML"
 
-#: ../include/svn_error_codes.h:220
+#: ../include/svn_error_codes.h:230
 msgid "<delta-pkg> is missing ancestry"
 msgstr "A <delta-pkg> le falta información de ancestros"
 
-#: ../include/svn_error_codes.h:224
+#: ../include/svn_error_codes.h:234
 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:228
+#: ../include/svn_error_codes.h:238
 msgid "XML data was not well-formed"
 msgstr "Los datos XML no están bien formados"
 
-#: ../include/svn_error_codes.h:232
+#: ../include/svn_error_codes.h:242
 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:238
+#: ../include/svn_error_codes.h:248
 msgid "Inconsistent line ending style"
 msgstr "Estilo de finales de línea inconsistente"
 
-#: ../include/svn_error_codes.h:242
+#: ../include/svn_error_codes.h:252
 msgid "Unrecognized line ending style"
 msgstr "Estilo de finales de línea no reconocido"
 
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:257
 msgid "Line endings other than expected"
 msgstr "Los finales de línea no son los esperados"
 
-#: ../include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:261
 msgid "Ran out of unique names"
 msgstr "Se acabaron los nombres únicos"
 
-#: ../include/svn_error_codes.h:256
+#: ../include/svn_error_codes.h:266
 msgid "Framing error in pipe protocol"
 msgstr "Error de enmarcado en protocolo de pipe"
 
-#: ../include/svn_error_codes.h:261
+#: ../include/svn_error_codes.h:271
 msgid "Read error in pipe"
 msgstr "Error de lectura en pipe"
 
-#: ../include/svn_error_codes.h:265 ../libsvn_subr/cmdline.c:313
-#: ../libsvn_subr/cmdline.c:330 ../svn/util.c:887 ../svnlook/main.c:1694
+#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
+#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
 #, c-format
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:281
 msgid "Unexpected EOF on stream"
 msgstr "Final de archivo inesperado"
 
-#: ../include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:285
 msgid "Malformed stream data"
 msgstr "Datos de flujo malformados"
 
-#: ../include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:289
 msgid "Unrecognized stream data"
 msgstr "Datos del flujo no reconocidos"
 
-#: ../include/svn_error_codes.h:285
+# ¡Traducción hecha viendo el código!
+#: ../include/svn_error_codes.h:294
+#, fuzzy
+msgid "Stream doesn't support seeking"
+msgstr "El servidor es viejo y no tiene la capacidad 'edit-pipeline'"
+
+#: ../include/svn_error_codes.h:300
 msgid "Unknown svn_node_kind"
 msgstr "svn_node_kind desconocido"
 
-#: ../include/svn_error_codes.h:289
+#: ../include/svn_error_codes.h:304
 msgid "Unexpected node kind found"
 msgstr "Se encontró un tipo de nodo inesperado"
 
-#: ../include/svn_error_codes.h:295
+#: ../include/svn_error_codes.h:310
 msgid "Can't find an entry"
 msgstr "No se pudo encontrar una entrada"
 
-#: ../include/svn_error_codes.h:301
+#: ../include/svn_error_codes.h:316
 msgid "Entry already exists"
 msgstr "La entrada ya existe"
 
-#: ../include/svn_error_codes.h:305
+#: ../include/svn_error_codes.h:320
 msgid "Entry has no revision"
 msgstr "La entrada no tiene revisión"
 
-#: ../include/svn_error_codes.h:309
+#: ../include/svn_error_codes.h:324
 msgid "Entry has no URL"
 msgstr "La entrada no tiene URL"
 
-#: ../include/svn_error_codes.h:313
+#: ../include/svn_error_codes.h:328
 msgid "Entry has an invalid attribute"
 msgstr "La entrada tiene un atributo inválido"
 
-#: ../include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:332
 msgid "Can't create an entry for a forbidden name"
 msgstr "No se puede crear una entrada para un nombre prohibido"
 
-#: ../include/svn_error_codes.h:323
+#: ../include/svn_error_codes.h:338
 msgid "Obstructed update"
 msgstr "Actualización obstruida"
 
-#: ../include/svn_error_codes.h:328
+#: ../include/svn_error_codes.h:343
 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:333
+#: ../include/svn_error_codes.h:348
 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:338
+#: ../include/svn_error_codes.h:353
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "Intento de desbloquear con una pila no vacía"
 
-#: ../include/svn_error_codes.h:342
+#: ../include/svn_error_codes.h:357
 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:346
+#: ../include/svn_error_codes.h:361
 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:351
+#: ../include/svn_error_codes.h:366
 msgid "Invalid lock"
 msgstr "Lock inválido"
 
-#: ../include/svn_error_codes.h:355
+#: ../include/svn_error_codes.h:373
 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:359
+#: ../include/svn_error_codes.h:381
 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:363
+#: ../include/svn_error_codes.h:385
 msgid "Problem running log"
 msgstr "Problema ejecutando log"
 
-#: ../include/svn_error_codes.h:367
+#: ../include/svn_error_codes.h:389
 msgid "Can't find a working copy path"
 msgstr "No se encontró una ruta con una copia de trabajo"
 
-#: ../include/svn_error_codes.h:371
+#: ../include/svn_error_codes.h:393
 msgid "Working copy is not up-to-date"
 msgstr "La copia de trabajo no está al día"
 
-#: ../include/svn_error_codes.h:375
+#: ../include/svn_error_codes.h:397
 msgid "Left locally modified or unversioned files"
 msgstr "Se dejaron archivos localmente modificados o no versionados"
 
-#: ../include/svn_error_codes.h:379
+#: ../include/svn_error_codes.h:401
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "Se solicitó en una entrada un 'agendado' no fusionable"
 
-#: ../include/svn_error_codes.h:383
+#: ../include/svn_error_codes.h:405
 msgid "Found a working copy path"
 msgstr "Se encontró una ruta con una copia de trabajo"
 
-#: ../include/svn_error_codes.h:387
+#: ../include/svn_error_codes.h:409
 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:391
+#: ../include/svn_error_codes.h:413
 msgid "Working copy is corrupt"
 msgstr "La copia de trabajo está corrupta"
 
-#: ../include/svn_error_codes.h:395
+#: ../include/svn_error_codes.h:417
 msgid "Working copy text base is corrupt"
 msgstr "Un archivo base de la copia de trabajo está corrupto"
 
-#: ../include/svn_error_codes.h:399
+#: ../include/svn_error_codes.h:421
 msgid "Cannot change node kind"
 msgstr "No se pudo cambiar el tipo de nodo"
 
-#: ../include/svn_error_codes.h:403
+#: ../include/svn_error_codes.h:425
 msgid "Invalid operation on the current working directory"
 msgstr "Operación inválida en el directorio de trabajo actual"
 
-#: ../include/svn_error_codes.h:407
+#: ../include/svn_error_codes.h:429
 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:411
+#: ../include/svn_error_codes.h:433
 msgid "Unsupported working copy format"
 msgstr "Formato de copia de trabajo no admitido"
 
-#: ../include/svn_error_codes.h:415
+#: ../include/svn_error_codes.h:437
 msgid "Path syntax not supported in this context"
 msgstr "Sintaxis de la ruta no admitida en este contexto"
 
-#: ../include/svn_error_codes.h:420
+#: ../include/svn_error_codes.h:442
 msgid "Invalid schedule"
 msgstr "Agendado inválido"
 
-#: ../include/svn_error_codes.h:425
+#: ../include/svn_error_codes.h:447
 msgid "Invalid relocation"
 msgstr "Reubicación inválida"
 
-#: ../include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:452
 msgid "Invalid switch"
 msgstr "Conmutado (switch) inválido"
 
-#: ../include/svn_error_codes.h:435
+#: ../include/svn_error_codes.h:457
 msgid "Changelist doesn't match"
 msgstr "La lista de cambios no coincide"
 
-#: ../include/svn_error_codes.h:440
+#: ../include/svn_error_codes.h:462
 msgid "Conflict resolution failed"
 msgstr "Falló la resolución del conflicto"
 
-#: ../include/svn_error_codes.h:444
+#: ../include/svn_error_codes.h:466
 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:449
+#: ../include/svn_error_codes.h:473
 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:454
+#: ../include/svn_error_codes.h:478
 #, fuzzy
 msgid "Cannot delete a file external"
 msgstr "No se pudo obtener el nombre de archivo"
 
-#: ../include/svn_error_codes.h:459
+#: ../include/svn_error_codes.h:483
 #, fuzzy
 msgid "Cannot move a file external"
 msgstr "No se puede mover la ruta '%s' a sí misma"
 
-#: ../include/svn_error_codes.h:464
+#: ../include/svn_error_codes.h:488
 msgid "Something's amiss with the wc sqlite database"
 msgstr ""
 
-#: ../include/svn_error_codes.h:469
+#: ../include/svn_error_codes.h:493
 msgid "The working copy is missing"
 msgstr "Falta la copia de trabajo"
 
-#: ../include/svn_error_codes.h:475
+#: ../include/svn_error_codes.h:498
+#, fuzzy
+msgid "The specified node is not a symlink"
+msgstr "La transacción especificada no es mutable"
+
+#: ../include/svn_error_codes.h:503
+#, fuzzy
+msgid "The specified path has an unexpected status"
+msgstr "No se soporta la opción de diff especificada"
+
+#: ../include/svn_error_codes.h:508
+#, fuzzy
+msgid "The working copy needs to be upgraded"
+msgstr "Falta la copia de trabajo"
+
+#: ../include/svn_error_codes.h:513
+#, fuzzy
+msgid "Previous operation was interrupted; run 'svn cleanup'"
+msgstr "La operación fue interrumpida"
+
+#: ../include/svn_error_codes.h:518
+msgid "This operation can not be performed with just this depth."
+msgstr ""
+
+#: ../include/svn_error_codes.h:524
 msgid "General filesystem error"
 msgstr "Error general del sistema de archivos"
 
-#: ../include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:528
 msgid "Error closing filesystem"
 msgstr "Error cerrando el sistema de archivos"
 
-#: ../include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:532
 msgid "Filesystem is already open"
 msgstr "El sistema de archivos ya está abierto"
 
-#: ../include/svn_error_codes.h:487
+#: ../include/svn_error_codes.h:536
 msgid "Filesystem is not open"
 msgstr "El sistema de archivos no está abierto"
 
-#: ../include/svn_error_codes.h:491
+#: ../include/svn_error_codes.h:540
 msgid "Filesystem is corrupt"
 msgstr "El sistema de archivos está corrupto"
 
-#: ../include/svn_error_codes.h:495
+#: ../include/svn_error_codes.h:544
 msgid "Invalid filesystem path syntax"
 msgstr "Sintaxis de ruta de sistema de archivos inválida"
 
-#: ../include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:548
 msgid "Invalid filesystem revision number"
 msgstr "Número de revisión del sistema de archivos inválido"
 
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:552
 msgid "Invalid filesystem transaction name"
 msgstr "Nombre de transacción del sistema de archivos inválido"
 
-#: ../include/svn_error_codes.h:507
+#: ../include/svn_error_codes.h:556
 msgid "Filesystem directory has no such entry"
 msgstr "El directorio del sistema de archivos no tiene esa entrada"
 
-#: ../include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:560
 msgid "Filesystem has no such representation"
 msgstr "El sistema de archivos no tiene esa representación"
 
-#: ../include/svn_error_codes.h:515
+#: ../include/svn_error_codes.h:564
 msgid "Filesystem has no such string"
 msgstr "El sistema de archivos no tiene esa cadena"
 
-#: ../include/svn_error_codes.h:519
+#: ../include/svn_error_codes.h:568
 msgid "Filesystem has no such copy"
 msgstr "El sistema de archivos no tiene esa copia"
 
-#: ../include/svn_error_codes.h:523
+#: ../include/svn_error_codes.h:572
 msgid "The specified transaction is not mutable"
 msgstr "La transacción especificada no es mutable"
 
-#: ../include/svn_error_codes.h:527
+#: ../include/svn_error_codes.h:576
 msgid "Filesystem has no item"
 msgstr "El sistema de archivos no tiene el ítem"
 
-#: ../include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:580
 msgid "Filesystem has no such node-rev-id"
 msgstr "El sistema de archivos no tiene ese node-rev-id"
 
-#: ../include/svn_error_codes.h:535
+#: ../include/svn_error_codes.h:584
 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:539
+#: ../include/svn_error_codes.h:588
 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:543
+#: ../include/svn_error_codes.h:592
 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:547
+#: ../include/svn_error_codes.h:596
 msgid "Name is not a single path component"
 msgstr "El nombre no es una ruta de un solo componente"
 
-#: ../include/svn_error_codes.h:551
+#: ../include/svn_error_codes.h:600
 msgid "Attempt to change immutable filesystem node"
 msgstr "Se intentó cambiar un nodo inmutable del sistema de archivos"
 
-#: ../include/svn_error_codes.h:555
+#: ../include/svn_error_codes.h:604
 msgid "Item already exists in filesystem"
 msgstr "El ítem ya existe en el sistema de archivos"
 
-#: ../include/svn_error_codes.h:559
+#: ../include/svn_error_codes.h:608
 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:563
+#: ../include/svn_error_codes.h:612
 msgid "Object is not a transaction root"
 msgstr "El objeto no es una raíz de transacción"
 
-#: ../include/svn_error_codes.h:567
+#: ../include/svn_error_codes.h:616
 msgid "Object is not a revision root"
 msgstr "El objeto no es una raíz de revisión"
 
-#: ../include/svn_error_codes.h:571
+#: ../include/svn_error_codes.h:620
 msgid "Merge conflict during commit"
 msgstr "Conflicto en la fusión durante un commit"
 
-#: ../include/svn_error_codes.h:575
+#: ../include/svn_error_codes.h:624
 msgid "A representation vanished or changed between reads"
 msgstr "Una representación desapareció o cambió entre lecturas"
 
-#: ../include/svn_error_codes.h:579
+#: ../include/svn_error_codes.h:628
 msgid "Tried to change an immutable representation"
 msgstr "Se intentó cambiar una representación inmutable"
 
-#: ../include/svn_error_codes.h:583
+#: ../include/svn_error_codes.h:632
 msgid "Malformed skeleton data"
 msgstr "Datos esqueleto malformados"
 
-#: ../include/svn_error_codes.h:587
+#: ../include/svn_error_codes.h:636
 msgid "Transaction is out of date"
 msgstr "La transacción está obsoleta"
 
-#: ../include/svn_error_codes.h:591
+#: ../include/svn_error_codes.h:640
 msgid "Berkeley DB error"
 msgstr "Error de la base Berkeley"
 
-#: ../include/svn_error_codes.h:595
+#: ../include/svn_error_codes.h:644
 msgid "Berkeley DB deadlock error"
 msgstr "Error de 'deadlock' en Berkeley DB"
 
-#: ../include/svn_error_codes.h:599
+#: ../include/svn_error_codes.h:648
 msgid "Transaction is dead"
 msgstr "La transacción está muerta"
 
-#: ../include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:652
 msgid "Transaction is not dead"
 msgstr "La transacción no está muerta"
 
-#: ../include/svn_error_codes.h:608
+#: ../include/svn_error_codes.h:657
 msgid "Unknown FS type"
 msgstr "Tipo de sistema de archivos desconocido"
 
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:662
 msgid "No user associated with filesystem"
 msgstr "No hay un usuario asociado con el sistema de archivos"
 
-#: ../include/svn_error_codes.h:618
+#: ../include/svn_error_codes.h:667
 msgid "Path is already locked"
 msgstr "La ruta ya está bloqueada"
 
-#: ../include/svn_error_codes.h:623 ../include/svn_error_codes.h:779
+#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
 msgid "Path is not locked"
 msgstr "La ruta no está bloqueada"
 
-#: ../include/svn_error_codes.h:628
+#: ../include/svn_error_codes.h:677
 msgid "Lock token is incorrect"
 msgstr "El token de bloqueo es incorrecto"
 
-#: ../include/svn_error_codes.h:633
+#: ../include/svn_error_codes.h:682
 msgid "No lock token provided"
 msgstr "No se proveyó un token de bloqueo"
 
-#: ../include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:687
 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:643
+#: ../include/svn_error_codes.h:692
 msgid "Filesystem has no such lock"
 msgstr "El sistema de archivos no tiene ese bloqueo"
 
-#: ../include/svn_error_codes.h:648
+#: ../include/svn_error_codes.h:697
 msgid "Lock has expired"
 msgstr "El bloqueo expiró"
 
-#: ../include/svn_error_codes.h:653 ../include/svn_error_codes.h:766
+#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
 msgid "Item is out of date"
 msgstr "El ítem está desactualizado"
 
-#: ../include/svn_error_codes.h:665
+#: ../include/svn_error_codes.h:714
 msgid "Unsupported FS format"
 msgstr "Formato de FS no edmitido"
 
-#: ../include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:719
 msgid "Representation is being written"
 msgstr "La representación se está escribiendo"
 
-#: ../include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:724
 msgid "The generated transaction name is too long"
 msgstr "El nombre de transacción generado es demasiado largo"
 
-#: ../include/svn_error_codes.h:680
+#: ../include/svn_error_codes.h:729
 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:685
+#: ../include/svn_error_codes.h:734
 msgid "Filesystem upgrade is not supported"
 msgstr "La actualización del sistema de archivos no está admitida"
 
-#: ../include/svn_error_codes.h:690
+#: ../include/svn_error_codes.h:739
 #, fuzzy
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "El sistema de archivos no tiene esa representación"
 
-#: ../include/svn_error_codes.h:696
+#: ../include/svn_error_codes.h:744
+msgid "Property value in filesystem differs from the provided base value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:751
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "El repositorio tiene un lock, quizá se está recuperando la bd"
 
-#: ../include/svn_error_codes.h:700
+#: ../include/svn_error_codes.h:755
 msgid "A repository hook failed"
 msgstr "Un 'hook' del repositorio falló"
 
-#: ../include/svn_error_codes.h:704
+#: ../include/svn_error_codes.h:759
 msgid "Incorrect arguments supplied"
 msgstr "Se proveyeron parámetros incorrectos"
 
-#: ../include/svn_error_codes.h:708
+#: ../include/svn_error_codes.h:763
 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:712
+#: ../include/svn_error_codes.h:767
 msgid "Bogus revision report"
 msgstr "Reporte sin sentido de revisión"
 
-#: ../include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:776
 msgid "Unsupported repository version"
 msgstr "Versión de repositorio no admitida"
 
-#: ../include/svn_error_codes.h:725
+#: ../include/svn_error_codes.h:780
 msgid "Disabled repository feature"
 msgstr "Característica del repositorio desactivada"
 
-#: ../include/svn_error_codes.h:729
+#: ../include/svn_error_codes.h:784
 msgid "Error running post-commit hook"
 msgstr "Error ejecutando 'hook' post-commit"
 
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:789
 msgid "Error running post-lock hook"
 msgstr "Error ejecutando 'hook' post-lock"
 
-#: ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:794
 msgid "Error running post-unlock hook"
 msgstr "Error ejecutando 'hook' post-unlock"
 
-#: ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:799
 msgid "Repository upgrade is not supported"
 msgstr "No se admite la actualización del repositorio"
 
-#: ../include/svn_error_codes.h:750
+#: ../include/svn_error_codes.h:805
 msgid "Bad URL passed to RA layer"
 msgstr "Mal URL pasado a la capa RA"
 
-#: ../include/svn_error_codes.h:754
+#: ../include/svn_error_codes.h:809
 msgid "Authorization failed"
 msgstr "falló la autorización"
 
-#: ../include/svn_error_codes.h:758
+#: ../include/svn_error_codes.h:813
 msgid "Unknown authorization method"
 msgstr "Método de autorización desconocido"
 
-#: ../include/svn_error_codes.h:762
+#: ../include/svn_error_codes.h:817
 msgid "Repository access method not implemented"
 msgstr "Método de acceso al repositorio no implementado"
 
-#: ../include/svn_error_codes.h:770
+#: ../include/svn_error_codes.h:825
 msgid "Repository has no UUID"
 msgstr "El repositorio no tiene UUID"
 
-#: ../include/svn_error_codes.h:774
+#: ../include/svn_error_codes.h:829
 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:784
+#: ../include/svn_error_codes.h:839
 msgid "Server can only replay from the root of a repository"
 msgstr "El servidor sólo puede reproducir desde la raíz de un repositorio"
 
-#: ../include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:844
 msgid "Repository UUID does not match expected UUID"
 msgstr "El UUID del repsitorio no coincide con el esperado"
 
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:849
 msgid "Repository root URL does not match expected root URL"
 msgstr "El URL raíz del repsitorio no coincide con el esperado"
 
-#: ../include/svn_error_codes.h:800
+#: ../include/svn_error_codes.h:854
+#, fuzzy
+msgid "Session URL does not match expected session URL"
+msgstr "El URL raíz del repsitorio no coincide con el esperado"
+
+#: ../include/svn_error_codes.h:860
 msgid "RA layer failed to init socket layer"
 msgstr "La capa RA no pudo inicializar la capa de socket"
 
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:864
 msgid "RA layer failed to create HTTP request"
 msgstr "La capa RA no pudo crear el requerimiento HTTP"
 
-#: ../include/svn_error_codes.h:808
+#: ../include/svn_error_codes.h:868
 msgid "RA layer request failed"
 msgstr "Falló un requerimiento a la capa RA"
 
-#: ../include/svn_error_codes.h:812
+#: ../include/svn_error_codes.h:872
 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:816
+#: ../include/svn_error_codes.h:876
 msgid "RA layer failed to fetch properties"
 msgstr "La capa RA no pudo obtener propiedades"
 
-#: ../include/svn_error_codes.h:820
+#: ../include/svn_error_codes.h:880
 msgid "RA layer file already exists"
 msgstr "El archivo de capa RA ya existe"
 
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:894
 msgid "HTTP Path Not Found"
 msgstr "Ruta HTTP no encontrada"
 
-#: ../include/svn_error_codes.h:838
+#: ../include/svn_error_codes.h:898
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "Falló la ejecución de PROPPATCH de WebDAV"
 
-#: ../include/svn_error_codes.h:843 ../include/svn_error_codes.h:884
-#: ../libsvn_ra_svn/marshal.c:651 ../libsvn_ra_svn/marshal.c:769
-#: ../libsvn_ra_svn/marshal.c:796
+#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
+#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
+#: ../libsvn_ra_svn/marshal.c:859
 msgid "Malformed network data"
 msgstr "Datos de red malformados"
 
-#: ../include/svn_error_codes.h:848
+#: ../include/svn_error_codes.h:908
 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:853
+#: ../include/svn_error_codes.h:913
 msgid "Repository has been moved"
 msgstr "El repositorio ha sido movido"
 
-#: ../include/svn_error_codes.h:859 ../include/svn_error_codes.h:888
+#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
+#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
+#, fuzzy
+msgid "Connection timed out"
+msgstr "La conexión de red se cerró inesperadamente"
+
+#: ../include/svn_error_codes.h:923
+msgid "URL access forbidden for unknown reason"
+msgstr ""
+
+#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
 msgid "Couldn't find a repository"
 msgstr "No se pudo encontrar un repositorio"
 
-#: ../include/svn_error_codes.h:863
+#: ../include/svn_error_codes.h:933
 msgid "Couldn't open a repository"
 msgstr "No se pudo abrir un repositorio"
 
-#: ../include/svn_error_codes.h:868
+#: ../include/svn_error_codes.h:938
 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:872
+#: ../include/svn_error_codes.h:942
 msgid "Unknown svn protocol command"
 msgstr "Comando de protocolo svn desconocido"
 
-#: ../include/svn_error_codes.h:876
+#: ../include/svn_error_codes.h:946
 msgid "Network connection closed unexpectedly"
 msgstr "La conexión de red se cerró inesperadamente"
 
-#: ../include/svn_error_codes.h:880
+#: ../include/svn_error_codes.h:950
 msgid "Network read/write error"
 msgstr "Error de lectura/escritura de red"
 
-#: ../include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:962
 msgid "Client/server version mismatch"
 msgstr "No coinciden las versiones del cliente y servidor"
 
-#: ../include/svn_error_codes.h:897
+#: ../include/svn_error_codes.h:967
 msgid "Cannot negotiate authentication mechanism"
 msgstr "No se pudo negociar un mecanismo de autentificación"
 
-#: ../include/svn_error_codes.h:903
+#: ../include/svn_error_codes.h:972
+msgid "Editor drive was aborted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:978
 msgid "Initialization of SSPI library failed"
 msgstr "Falló la inicialización de la biblioteca SSPI"
 
-#: ../include/svn_error_codes.h:907
+#: ../include/svn_error_codes.h:982
 msgid "Server SSL certificate untrusted"
 msgstr "El certificado SSL del servidor no es de confianza"
 
-#: ../include/svn_error_codes.h:915
+#: ../include/svn_error_codes.h:986
+#, fuzzy
+msgid "Initialization of the GSSAPI context failed"
+msgstr "Falló la inicialización de la biblioteca SSPI"
+
+#: ../include/svn_error_codes.h:991
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:999
 msgid "Credential data unavailable"
 msgstr "Credenciales no disponibles"
 
-#: ../include/svn_error_codes.h:919
+#: ../include/svn_error_codes.h:1003
 msgid "No authentication provider available"
 msgstr "No hay proveedores de autentificación disponibles"
 
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:1007
 msgid "All authentication providers exhausted"
 msgstr "Se agotaron los proveedores de autentificación"
 
-#: ../include/svn_error_codes.h:927
+#: ../include/svn_error_codes.h:1011
 msgid "Credentials not saved"
 msgstr "Credenciales no guardadas"
 
-#: ../include/svn_error_codes.h:932
+#: ../include/svn_error_codes.h:1016
 msgid "Authentication failed"
 msgstr "Falló la autentificación"
 
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:1022
 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:943
+#: ../include/svn_error_codes.h:1027
 msgid "Item is not readable"
 msgstr "El ítem no es legible"
 
-#: ../include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:1032
 msgid "Item is partially readable"
 msgstr "El ítem es legible parcialmente"
 
-#: ../include/svn_error_codes.h:952
+#: ../include/svn_error_codes.h:1036
 msgid "Invalid authz configuration"
 msgstr "Valor de configuración del subsistema 'authz' inválido"
 
-#: ../include/svn_error_codes.h:957
+#: ../include/svn_error_codes.h:1041
 msgid "Item is not writable"
 msgstr "El ítem no es escribible"
 
-#: ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:1047
 msgid "Svndiff data has invalid header"
 msgstr "Los datos svndiff tienen una cabecera inválida"
 
-#: ../include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:1051
 msgid "Svndiff data contains corrupt window"
 msgstr "Los datos svndiff tienen una ventana corrupta"
 
-#: ../include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:1055
 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:975
+#: ../include/svn_error_codes.h:1059
 msgid "Svndiff data contains invalid instruction"
 msgstr "Los datos svndiff tienen una instrucción inválida"
 
-#: ../include/svn_error_codes.h:979
+#: ../include/svn_error_codes.h:1063
 msgid "Svndiff data ends unexpectedly"
 msgstr "Los datos svndiff terminan inesperadamente"
 
-#: ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:1067
 msgid "Svndiff compressed data is invalid"
 msgstr "Los datos svndiff comprimidos son inválidos"
 
-#: ../include/svn_error_codes.h:989
+#: ../include/svn_error_codes.h:1073
 msgid "Diff data source modified unexpectedly"
 msgstr "La fuente de datos diff se modificó inesperadamente"
 
-#: ../include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1079
 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:999
+#: ../include/svn_error_codes.h:1083
 msgid "Apache got a malformed URI"
 msgstr "Apache obtuvo un URI malformado"
 
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1087
 msgid "Activity not found"
 msgstr "No se encontró la actividad"
 
-#: ../include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1091
 msgid "Baseline incorrect"
 msgstr "Linea base incorrecta"
 
-#: ../include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1095
 msgid "Input/output error"
 msgstr "Error de entrada/salida"
 
-#: ../include/svn_error_codes.h:1017
+#: ../include/svn_error_codes.h:1101
 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:1021
+#: ../include/svn_error_codes.h:1105
 msgid "Repository access is needed for this operation"
 msgstr "Para esta operación se necesita acceso al repositorio"
 
-#: ../include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1109
 msgid "Bogus revision information given"
 msgstr "Fue dada información de revisión sin sentido"
 
-#: ../include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1113
 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:1033
+#: ../include/svn_error_codes.h:1117
 msgid "Operation does not apply to binary file"
 msgstr "La operación no se aplica a un archivo binario"
 
-#: ../include/svn_error_codes.h:1039
+#: ../include/svn_error_codes.h:1123
 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:1043
+#: ../include/svn_error_codes.h:1127
 msgid "Attempting restricted operation for modified resource"
 msgstr "Intentando operación restringida para un recurso modificado"
 
-#: ../include/svn_error_codes.h:1047
+#: ../include/svn_error_codes.h:1131
 msgid "Operation does not apply to directory"
 msgstr "La operación no se aplica a un directorio"
 
-#: ../include/svn_error_codes.h:1051
+#: ../include/svn_error_codes.h:1135
 msgid "Revision range is not allowed"
 msgstr "No se permite el rango de revisiones"
 
-#: ../include/svn_error_codes.h:1055
+#: ../include/svn_error_codes.h:1139
 msgid "Inter-repository relocation not allowed"
 msgstr "No se permite una reubicación inter-repositorio"
 
-#: ../include/svn_error_codes.h:1059
+#: ../include/svn_error_codes.h:1143
 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:1063
+#: ../include/svn_error_codes.h:1147
 msgid "Bad property name"
 msgstr "Nombre de propiedad inaceptable"
 
-#: ../include/svn_error_codes.h:1068
+#: ../include/svn_error_codes.h:1152
 msgid "Two versioned resources are unrelated"
 msgstr "Dos recursos versionados no están relacionados"
 
-#: ../include/svn_error_codes.h:1073
+#: ../include/svn_error_codes.h:1157
 msgid "Path has no lock token"
 msgstr "La ruta no tiene token de bloqueo"
 
-#: ../include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1162
 msgid "Operation does not support multiple sources"
 msgstr "La operación no admite múltiples fuentes"
 
-#: ../include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1167
 msgid "No versioned parent directories"
 msgstr "No hay directorios padre versionados"
 
-#: ../include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1172
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "La copia de trabajo y la fuente de la fusión no están listas para ser reintegradas"
 
-#: ../include/svn_error_codes.h:1093
+#: ../include/svn_error_codes.h:1177
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1099
+#: ../include/svn_error_codes.h:1182
+#, fuzzy
+msgid "Invalid path component strip count specified"
+msgstr "Especificador de revisión inválido"
+
+#: ../include/svn_error_codes.h:1187
+msgid "Detected a cycle while processing the operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1193
 msgid "A problem occurred; see other errors for details"
 msgstr "Hubo un problema; vea otros informes de errores para más detalles"
 
-#: ../include/svn_error_codes.h:1103
+#: ../include/svn_error_codes.h:1197
 msgid "Failure loading plugin"
 msgstr "Falló la carga del aplique"
 
-#: ../include/svn_error_codes.h:1107
+#: ../include/svn_error_codes.h:1201
 msgid "Malformed file"
 msgstr "Archivo malformado"
 
-#: ../include/svn_error_codes.h:1111
+#: ../include/svn_error_codes.h:1205
 msgid "Incomplete data"
 msgstr "Datos incompletos"
 
-#: ../include/svn_error_codes.h:1115
+#: ../include/svn_error_codes.h:1209
 msgid "Incorrect parameters given"
 msgstr "Se dieron parámetros incorrectos"
 
-#: ../include/svn_error_codes.h:1119
+#: ../include/svn_error_codes.h:1213
 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:1123
+#: ../include/svn_error_codes.h:1217
 msgid "Test failed"
 msgstr "Falló la prueba"
 
-#: ../include/svn_error_codes.h:1127
+#: ../include/svn_error_codes.h:1221
 msgid "Trying to use an unsupported feature"
 msgstr "Intentando usar una característica no admitida"
 
-#: ../include/svn_error_codes.h:1131
+#: ../include/svn_error_codes.h:1225
 msgid "Unexpected or unknown property kind"
 msgstr "Tipo de propiedad no esperado o desconocido"
 
-#: ../include/svn_error_codes.h:1135
+#: ../include/svn_error_codes.h:1229
 msgid "Illegal target for the requested operation"
 msgstr "Objetivo ilegal para la operación pedida"
 
-#: ../include/svn_error_codes.h:1139
+#: ../include/svn_error_codes.h:1233
 msgid "MD5 checksum is missing"
 msgstr "Falta la suma de verificación MD5"
 
-#: ../include/svn_error_codes.h:1143
+#: ../include/svn_error_codes.h:1237
 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:1147
+#: ../include/svn_error_codes.h:1241
 msgid "Error calling external program"
 msgstr "Error invocando programa externo"
 
-#: ../include/svn_error_codes.h:1151
+#: ../include/svn_error_codes.h:1245
 msgid "Python exception has been set with the error"
 msgstr "Se estableció una excepción Python con el error"
 
-#: ../include/svn_error_codes.h:1155
+#: ../include/svn_error_codes.h:1249
 msgid "A checksum mismatch occurred"
 msgstr "La suma de verificación no coincide"
 
-#: ../include/svn_error_codes.h:1159
+#: ../include/svn_error_codes.h:1253
 msgid "The operation was interrupted"
 msgstr "La operación fue interrumpida"
 
-#: ../include/svn_error_codes.h:1163
+#: ../include/svn_error_codes.h:1257
 msgid "The specified diff option is not supported"
 msgstr "No se soporta la opción de diff especificada"
 
-#: ../include/svn_error_codes.h:1167
+#: ../include/svn_error_codes.h:1261
 msgid "Property not found"
 msgstr "Propiedad no encontrada"
 
-#: ../include/svn_error_codes.h:1171
+#: ../include/svn_error_codes.h:1265
 msgid "No auth file path available"
 msgstr "Ruta de archivo de autentificación no disponible"
 
-#: ../include/svn_error_codes.h:1176
+#: ../include/svn_error_codes.h:1270
 msgid "Incompatible library version"
 msgstr "Versión de biblioteca incompatible"
 
-#: ../include/svn_error_codes.h:1181
+#: ../include/svn_error_codes.h:1275
 msgid "Mergeinfo parse error"
 msgstr "Error interpretando la info de fusión"
 
-#: ../include/svn_error_codes.h:1186
+#: ../include/svn_error_codes.h:1280
 msgid "Cease invocation of this API"
 msgstr "Deje de llamar a esta API"
 
-#: ../include/svn_error_codes.h:1191
+#: ../include/svn_error_codes.h:1285
 msgid "Error parsing revision number"
 msgstr "Error analizando el número de revisión"
 
-#: ../include/svn_error_codes.h:1196
+#: ../include/svn_error_codes.h:1290
 msgid "Iteration terminated before completion"
 msgstr "Interacción terminada antes de que termine"
 
-#: ../include/svn_error_codes.h:1201
+#: ../include/svn_error_codes.h:1295
 msgid "Unknown changelist"
 msgstr "Lista de cambios desconocida"
 
-#: ../include/svn_error_codes.h:1206
+#: ../include/svn_error_codes.h:1300
 msgid "Reserved directory name in command line arguments"
 msgstr "Nombre de directorio reservado en los parámetros de la línea de comandos"
 
-#: ../include/svn_error_codes.h:1211
+#: ../include/svn_error_codes.h:1305
 msgid "Inquiry about unknown capability"
 msgstr "Pregunta acerca de una capacidad desconcida"
 
-#: ../include/svn_error_codes.h:1216
+#: ../include/svn_error_codes.h:1310
 msgid "Test skipped"
 msgstr "Prueba omitida"
 
-#: ../include/svn_error_codes.h:1221
+#: ../include/svn_error_codes.h:1315
 msgid "apr memcache library not available"
 msgstr "biblioteca memcache de apr no disponible"
 
-#: ../include/svn_error_codes.h:1226
+#: ../include/svn_error_codes.h:1320
 msgid "Couldn't perform atomic initialization"
 msgstr "No se pudo efectuar inicialización atómica"
 
-#: ../include/svn_error_codes.h:1231
+#: ../include/svn_error_codes.h:1325
 msgid "SQLite error"
 msgstr "Error de SQLite"
 
-#: ../include/svn_error_codes.h:1236
+#: ../include/svn_error_codes.h:1330
 msgid "Attempted to write to readonly SQLite db"
 msgstr "Intento de escribir en una base SQLite de sólo lectura"
 
-#: ../include/svn_error_codes.h:1241
+#: ../include/svn_error_codes.h:1335
 msgid "Unsupported schema found in SQLite db"
 msgstr ""
 
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1340
+msgid "The SQLite db is busy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1345
+msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1352
 msgid "Error parsing arguments"
 msgstr "Error analizando parámetros"
 
-#: ../include/svn_error_codes.h:1251
+#: ../include/svn_error_codes.h:1356
 msgid "Not enough arguments provided"
 msgstr "No se dieron suficientes parámetros"
 
-#: ../include/svn_error_codes.h:1255
+#: ../include/svn_error_codes.h:1360
 msgid "Mutually exclusive arguments specified"
 msgstr "Se especificaron parámetros mutuamente excluyentes"
 
-#: ../include/svn_error_codes.h:1259
+#: ../include/svn_error_codes.h:1364
 msgid "Attempted command in administrative dir"
 msgstr "Se intentó un comando en el directorio administrativo"
 
-#: ../include/svn_error_codes.h:1263
+#: ../include/svn_error_codes.h:1368
 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:1267
+#: ../include/svn_error_codes.h:1372
 msgid "The log message is a pathname"
 msgstr "El mensaje de log es una ruta"
 
-#: ../include/svn_error_codes.h:1271
+#: ../include/svn_error_codes.h:1376
 msgid "Committing in directory scheduled for addition"
 msgstr "Commit en un directorio agendado para ser añadido"
 
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1380
 msgid "No external editor available"
 msgstr "No está disponible un editor externo"
 
-#: ../include/svn_error_codes.h:1279
+#: ../include/svn_error_codes.h:1384
 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:1283
+#: ../include/svn_error_codes.h:1388
 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:1287
+#: ../include/svn_error_codes.h:1392
 msgid "No external merge tool available"
 msgstr "No está disponible una herramienta de fusionado externa"
 
-#: ../include/svn_error_codes.h:1293
+#: ../include/svn_error_codes.h:1396
+#, fuzzy
+msgid "Failed processing one or more externals definitions"
+msgstr "ignorar definiciones de 'externals'"
+
+#: ../include/svn_error_codes.h:1402
 #, fuzzy
 msgid "Assertion failure"
 msgstr "falló la autorización"
 
-#: ../libsvn_client/add.c:345 ../libsvn_wc/copy.c:232
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:392
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:447
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:554
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:610
+msgid "GNOME Keyring is locked and we are non-interactive"
+msgstr ""
+
+#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:881
+#: ../libsvn_wc/workqueue.c:1658 ../libsvn_wc/workqueue.c:1740
 #, c-format
-msgid "Can't close directory '%s'"
-msgstr "No se puede cerrar el directorio '%s'"
+msgid "'%s' not found"
+msgstr "'%s' no encontrado"
 
-#: ../libsvn_client/add.c:353
+#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
+#: ../libsvn_wc/adm_ops.c:886
 #, c-format
-msgid "Error during add of '%s'"
-msgstr "Error durante la adición de '%s'"
+msgid "Unsupported node kind for path '%s'"
+msgstr "Tipo de nodo no admitido para la ruta '%s'"
 
-#: ../libsvn_client/add.c:480 ../libsvn_client/cmdline.c:249
-#: ../libsvn_subr/opt.c:793
+#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
+#: ../libsvn_subr/opt.c:878
 #, c-format
 msgid "'%s' ends in a reserved name"
 msgstr "'%s' termina en un nombre reservado"
 
-#: ../libsvn_client/blame.c:390
+#: ../libsvn_client/add.c:580 ../libsvn_client/changelist.c:116
+#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
+#: ../libsvn_client/export.c:952 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:274
+#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
+#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
+#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
+#: ../svn/upgrade-cmd.c:72
+#, fuzzy, c-format
+msgid "'%s' is not a local path"
+msgstr "'%s' no es un archivo"
+
+#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
+#, c-format
+msgid "Illegal repository URL '%s'"
+msgstr "URL de repositorio ilegal '%s'"
+
+#: ../libsvn_client/blame.c:397
 #, 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: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:635
+#: ../libsvn_client/blame.c:627
 msgid "Start revision must precede end revision"
 msgstr "La revisión del comienzo debe preceder a la del final"
 
-#: ../libsvn_client/cat.c:69
+#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1038
+#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:429
+#: ../libsvn_client/prop_commands.c:947 ../libsvn_client/prop_commands.c:1264
+#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2008
+#: ../libsvn_wc/adm_ops.c:2042 ../libsvn_wc/copy.c:596
+#: ../libsvn_wc/entries.c:1405 ../libsvn_wc/entries.c:2450
+#: ../libsvn_wc/entries.c:2481 ../libsvn_wc/node.c:1247
+#: ../libsvn_wc/update_editor.c:4171
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "'%s' no está bajo control de versiones"
+
+#: ../libsvn_client/cat.c:79
 #, c-format
 msgid "'%s' refers to a directory"
 msgstr "'%s' se refiere a un directorio"
 
-#: ../libsvn_client/cat.c:122 ../libsvn_client/export.c:192
+#: ../libsvn_client/cat.c:89
+#, c-format
+msgid "'%s' has no base revision until it is committed"
+msgstr ""
+
+#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
 msgid "(local)"
 msgstr "(local)"
 
-#: ../libsvn_client/cat.c:206
+#: ../libsvn_client/cat.c:236
 #, c-format
 msgid "URL '%s' refers to a directory"
 msgstr "El URL '%s' se refiere a un directorio"
 
-#: ../libsvn_client/checkout.c:135 ../libsvn_client/export.c:992
+#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "El URL '%s' no existe"
 
-#: ../libsvn_client/checkout.c:139
+#: ../libsvn_client/checkout.c:168
 #, 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:200
-#, 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:204
-msgid "; run 'svn update' to complete it"
-msgstr "; ejecute 'svn update' para completarla"
+#, fuzzy, c-format
+msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
+msgstr "'%s' ya es una copia de trabajo para un URL diferente"
 
-#: ../libsvn_client/checkout.c:214
+#: ../libsvn_client/checkout.c:212
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "'%s' ya existe y no es un directorio"
 
-#: ../libsvn_client/cmdline.c:72
+#: ../libsvn_client/cmdline.c:78
 #, c-format
 msgid "Improper relative URL '%s'"
 msgstr "URL relativo '%s' impropio"
 
-#: ../libsvn_client/cmdline.c:130
+#: ../libsvn_client/cmdline.c:149
 #, c-format
 msgid "All non-relative targets must have the same root URL"
 msgstr "Todos los objetivos no relativos deben tener el mismo URL raíz"
 
-#: ../libsvn_client/commit.c:436
+#: ../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:541
+#: ../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:576 ../libsvn_wc/adm_ops.c:1019
-#: ../libsvn_wc/questions.c:71 ../libsvn_wc/wc_db.c:283
-#: ../libsvn_wc/wc_db.c:299
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:567
+#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' no existe"
 
-#: ../libsvn_client/commit.c:635 ../libsvn_client/copy.c:392
-#: ../svnlook/main.c:1318
+#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
+#: ../libsvn_client/merge.c:8975 ../libsvn_client/merge.c:10231
+#: ../libsvn_client/merge.c:10506 ../svnlook/main.c:1407
 #, c-format
 msgid "Path '%s' does not exist"
 msgstr "La ruta '%s' no existe"
 
-#: ../libsvn_client/commit.c:767 ../libsvn_client/copy.c:401
-#: ../libsvn_client/copy.c:866 ../libsvn_client/copy.c:1100
-#: ../libsvn_client/copy.c:1525
+#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
+#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
+#: ../libsvn_client/copy.c:1860
 #, c-format
 msgid "Path '%s' already exists"
 msgstr "La ruta '%s' ya existe."
 
-#: ../libsvn_client/commit.c:782
+#: ../libsvn_client/commit.c:810
 #, 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:868 ../libsvn_client/copy.c:1264
+#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
 msgid "Commit failed (details follow):"
 msgstr "Falló el commit (detalles a continuación):"
 
-#: ../libsvn_client/commit.c:876
+#: ../libsvn_client/commit.c:856
 msgid "Commit succeeded, but other errors follow:"
 msgstr "Commit exitoso, pero hubo otros errores:"
 
-#: ../libsvn_client/commit.c:883
+#: ../libsvn_client/commit.c:863
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "Error sacando lock a directorios (detalles a continuación):"
 
-#: ../libsvn_client/commit.c:894
+#: ../libsvn_client/commit.c:874
 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:905
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "Error en la limpieza post-commit (detalles a continuación):"
-
-#: ../libsvn_client/commit.c:1253
-msgid "Are all the targets part of the same working copy?"
+#: ../libsvn_client/commit.c:968
+#, fuzzy
+msgid "Are all targets part of the same working copy?"
 msgstr "¿Son todos los objetivos parte de la misma copia de trabajo?"
 
-#: ../libsvn_client/commit.c:1290
+#: ../libsvn_client/commit.c:1007
 msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
 msgstr "No se puede hacer commit no recursivo de una eliminación de un directorio con nodos hijo"
 
-#: ../libsvn_client/commit.c:1341
+#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
 #, c-format
 msgid "'%s' is a URL, but URLs cannot be commit targets"
 msgstr "'%s' es un URL, pero los URLS no pueden ser objetivos de commit"
 
-#: ../libsvn_client/commit_util.c:57 ../libsvn_repos/commit.c:126
+#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:132
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "El directorio '%s' está desactualizado"
 
-#: ../libsvn_client/commit_util.c:58 ../libsvn_repos/commit.c:128
+#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:134
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "El archivo '%s' está desactualizado"
 
-#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:496
-#: ../libsvn_client/commit_util.c:963
+#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
+#: ../libsvn_client/commit_util.c:1032
 #, c-format
 msgid "Aborting commit: '%s' remains in conflict"
 msgstr "Abortando el commit: '%s' queda en conflicto"
 
-#: ../libsvn_client/commit_util.c:344
+#: ../libsvn_client/commit_util.c:330
 #, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "Abortando el commit: '%s' queda en conflicto-de-árbol"
 
-#: ../libsvn_client/commit_util.c:432 ../libsvn_client/commit_util.c:443
-#: ../libsvn_wc/crop.c:170
+#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
 #, c-format
 msgid "Unknown entry kind for '%s'"
 msgstr "Tipo de entrada desconocido para '%s'"
 
-#: ../libsvn_client/commit_util.c:460
+#: ../libsvn_client/commit_util.c:457
 #, 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:566
-#, 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:584 ../libsvn_client/commit_util.c:1300
-#, 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:603
+#: ../libsvn_client/commit_util.c:654
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "'%s' está agendado para ser añadido, pero falta"
 
-#: ../libsvn_client/commit_util.c:863
+#: ../libsvn_client/commit_util.c:935
 #, c-format
 msgid "'%s' is not under version control and is not part of the commit, yet its child '%s' is part of the commit"
 msgstr "'%s' 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:971 ../libsvn_client/url.c:155
+#: ../libsvn_client/commit_util.c:1052 ../libsvn_client/url.c:198
 #, c-format
 msgid "Entry for '%s' has no URL"
 msgstr "La entrada para '%s' no tiene URL"
 
-#: ../libsvn_client/commit_util.c:1003
+#: ../libsvn_client/commit_util.c:1069
 #, 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:1023
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition.  Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"La entrada de '%s' está marcada como 'copiada' pero no esta en sí agendada\n"
-"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:1156
+#: ../libsvn_client/commit_util.c:1210
 #, 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:1305
+#: ../libsvn_client/commit_util.c:1367
+#, 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:1372
 #, 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:2067
+#: ../libsvn_client/commit_util.c:2080
 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:417 ../libsvn_client/copy.c:1541
-#: ../libsvn_client/update.c:142
+#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1876
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "La ruta '%s' no es un directorio"
 
-#: ../libsvn_client/copy.c:590 ../libsvn_client/copy.c:630
+#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
 #, c-format
 msgid "Path '%s' already exists, but is not a directory"
 msgstr "La ruta '%s' ya existe, pero no es un directorio"
 
-#: ../libsvn_client/copy.c:735
-#, c-format
-msgid "Source and dest appear not to be in the same repository (src: '%s'; dst: '%s')"
+#: ../libsvn_client/copy.c:775
+#, fuzzy
+msgid "Source and destination URLs appear not to all point to the same repository."
 msgstr "Origen y destino no parecen estar en el mismo repositorio (orig: '%s'; dest: '%s')"
 
-#: ../libsvn_client/copy.c:847
+#: ../libsvn_client/copy.c:985
 #, c-format
 msgid "Cannot move URL '%s' into itself"
 msgstr "No se puede mover al URL '%s' a sí mismo"
 
-#: ../libsvn_client/copy.c:856 ../libsvn_client/prop_commands.c:238
+#: ../libsvn_client/copy.c:1007 ../libsvn_client/prop_commands.c:229
 #, 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:1361
+#: ../libsvn_client/copy.c:1536
 #, 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:1512
-#, 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:1517
-#, 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:1573 ../libsvn_wc/adm_ops.c:1406
-#: ../libsvn_wc/copy.c:918
+#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
+#: ../libsvn_wc/adm_ops.c:941 ../libsvn_wc/copy.c:691
 #, c-format
 msgid "'%s' is already under version control"
 msgstr "'%s' ya está bajo control de versiones"
 
-#: ../libsvn_client/copy.c:1581
+#: ../libsvn_client/copy.c:1671
 #, 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:1672 ../libsvn_client/diff.c:1691
-#: ../libsvn_client/log.c:331 ../libsvn_client/log.c:391
-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:1844
+#, 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:1849
+#, 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:1717
+#: ../libsvn_client/copy.c:1970
 msgid "Cannot mix repository and working copy sources"
 msgstr "No se pueden mezclar fuentes de repositorio y copia de trabajo"
 
-#: ../libsvn_client/copy.c:1760
+#: ../libsvn_client/copy.c:2022
 #, 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:1796
+#: ../libsvn_client/copy.c:2054
 #, c-format
 msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
 msgstr ""
 
-#: ../libsvn_client/copy.c:1817
+#: ../libsvn_client/copy.c:2069
+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:2083
 #, c-format
 msgid "Cannot move path '%s' into itself"
 msgstr "No se puede mover la ruta '%s' a sí misma"
 
-#: ../libsvn_client/copy.c:1826
-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:1890
+#: ../libsvn_client/copy.c:2152
 #, c-format
 msgid "'%s' does not have a URL associated with it"
 msgstr "'%s' no tiene un URL asociado"
 
-#: ../libsvn_client/delete.c:51
+#: ../libsvn_client/delete.c:59
 #, 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:56 ../libsvn_wc/adm_ops.c:3146
-#: ../libsvn_wc/entries.c:1228 ../libsvn_wc/entries.c:2124
-#: ../libsvn_wc/entries.c:2795 ../libsvn_wc/update_editor.c:4098
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' no está bajo control de versiones"
+#: ../libsvn_client/delete.c:74
+#, fuzzy, c-format
+msgid "'%s' has local modifications -- commit or revert them first"
+msgstr "'%s' está modificado localmente"
 
-#: ../libsvn_client/delete.c:66
+#: ../libsvn_client/delete.c:104
 #, c-format
-msgid "'%s' has local modifications"
-msgstr "'%s' está modificado localmente"
+msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
+msgstr ""
+
+#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
+#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
+#, fuzzy, c-format
+msgid "Cannot mix repository and working copy targets"
+msgstr "No se pueden mezclar fuentes de repositorio y copia de trabajo"
 
-#: ../libsvn_client/deprecated.c:509 ../svn/move-cmd.c:61
+#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
 msgid "Cannot specify revisions (except HEAD) with move operations"
 msgstr "No se puede especificar revisiones (excepto HEAD) en operaciones de mover"
 
-#: ../libsvn_client/deprecated.c:1027
+#: ../libsvn_client/deprecated.c:1331
 msgid "No commits in repository"
 msgstr "No hubo commits en el repositorio"
 
-#: ../libsvn_client/diff.c:135
+#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
+#, fuzzy
+msgid "Non-recursive relocation not supported"
+msgstr "No se permite una reubicación inter-repositorio"
+
+#: ../libsvn_client/diff.c:136
 #, c-format
 msgid "   Reverse-merged %s:r%s%s"
 msgstr "   Fusión reversa %s:r%s%s"
 
-#: ../libsvn_client/diff.c:154
+#: ../libsvn_client/diff.c:151
 #, c-format
 msgid "   Merged %s:r%s%s"
 msgstr "   Se fusionó %s:r%s%s"
 
-#: ../libsvn_client/diff.c:164 ../libsvn_diff/diff_file.c:1215
-#: ../libsvn_diff/diff_file.c:1227
+#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1226
+#: ../libsvn_diff/diff_file.c:1242
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr "La ruta '%s' debe ser un descendiente inmediato del directorio '%s'"
 
-#: ../libsvn_client/diff.c:195
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%sCambios de propiedades en %s%s"
-
-#: ../libsvn_client/diff.c:224
-#, c-format
-msgid "Added: %s%s"
-msgstr "Añadido: %s%s"
-
-#: ../libsvn_client/diff.c:226
-#, c-format
-msgid "Deleted: %s%s"
-msgstr "Borrado: %s%s"
-
-#: ../libsvn_client/diff.c:228
-#, c-format
-msgid "Modified: %s%s"
-msgstr "Modificado: %s%s"
-
-#: ../libsvn_client/diff.c:365
+#: ../libsvn_client/diff.c:359
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(revisión: %ld)"
 
-#: ../libsvn_client/diff.c:367
+#: ../libsvn_client/diff.c:361
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(copia de trabajo)"
 
-#: ../libsvn_client/diff.c:523
+#: ../libsvn_client/diff.c:637
 #, 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:924 ../libsvn_client/merge.c:5089
-#: ../libsvn_client/merge.c:6827
+msgid "%sProperty changes on: %s%s"
+msgstr "%sCambios de propiedades en %s%s"
+
+#: ../libsvn_client/diff.c:921
+#, 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:1326
+#, fuzzy, c-format
+msgid "Path '%s' has no URL"
+msgstr "'%s' no tiene URL"
+
+#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
+#: ../libsvn_client/merge.c:8984
 msgid "Not all required revisions are specified"
 msgstr "No se especificaron todas las revisiones requeridas"
 
-#: ../libsvn_client/diff.c:939
+#: ../libsvn_client/diff.c:1410
 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:1051 ../libsvn_client/diff.c:1063
+#: ../libsvn_client/diff.c:1518 ../libsvn_client/diff.c:1530
 #, c-format
 msgid "'%s' was not found in the repository at revision %ld"
 msgstr "'%s' no se encontró en el repositorio en la revisión %ld"
 
-#: ../libsvn_client/diff.c:1122
-msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
+#: ../libsvn_client/diff.c:1588
+#, fuzzy
+msgid "Sorry, svn_client_diff5 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:1161
+#: ../libsvn_client/diff.c:1630
 msgid "Only diffs between a path's text-base and its working files are supported at this time"
 msgstr "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:1302 ../libsvn_client/switch.c:153
+#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
 #, c-format
 msgid "Directory '%s' has no URL"
 msgstr "El directorio '%s' no tiene URL"
 
-#: ../libsvn_client/diff.c:1506
+#: ../libsvn_client/diff.c:2064
 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:86
+#: ../libsvn_client/export.c:92
 #, 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:297
+#: ../libsvn_client/export.c:377
 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:442 ../libsvn_client/export.c:585
+#: ../libsvn_client/export.c:532 ../libsvn_client/export.c:678
 #, c-format
 msgid "'%s' exists and is not a directory"
 msgstr "'%s' existe y no es un directorio"
 
-#: ../libsvn_client/export.c:446 ../libsvn_client/export.c:589
+#: ../libsvn_client/export.c:536 ../libsvn_client/export.c:682
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: ../libsvn_client/export.c:768 ../libsvn_wc/adm_crawler.c:994
-#: ../libsvn_wc/update_editor.c:3784 ../libsvn_wc/update_editor.c:4474
-#, 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/export.c:866 ../libsvn_wc/update_editor.c:4161
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+"   expected:  %s\n"
+"     actual:  %s\n"
+msgstr ""
+"Suma de verificación errónea en rep '%s':\n"
+"   esperada:  %s\n"
+"   presente:  %s\n"
 
-#: ../libsvn_client/externals.c:339
+#: ../libsvn_client/externals.c:364
 #, c-format
 msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
 msgstr ""
 
-#: ../libsvn_client/externals.c:371
+#: ../libsvn_client/externals.c:401
 #, c-format
 msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
 msgstr ""
 
-#: ../libsvn_client/externals.c:397
+#: ../libsvn_client/externals.c:427
 #, c-format
 msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
 msgstr ""
 
-#: ../libsvn_client/externals.c:526
+#: ../libsvn_client/externals.c:536
 #, 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:575
+#: ../libsvn_client/externals.c:603
 #, c-format
 msgid "Illegal parent directory URL '%s'"
 msgstr "URL de directorio padre ilegal '%s'"
 
-#: ../libsvn_client/externals.c:611
+#: ../libsvn_client/externals.c:639
 #, c-format
 msgid "Illegal repository root URL '%s'"
 msgstr "URL de raíz de repositorio ilegal '%s'"
 
-#: ../libsvn_client/externals.c:659
+#: ../libsvn_client/externals.c:686
 #, 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:691
+#: ../libsvn_client/externals.c:714
 #, c-format
 msgid "Unrecognized format for the relative external URL '%s'"
 msgstr "Formato no reconocido para URL externo relativo '%s'"
 
-#: ../libsvn_client/externals.c:782
+#: ../libsvn_client/externals.c:806
 #, c-format
 msgid "URL '%s' at revision %ld doesn't exist"
 msgstr "El URL '%s' en la revisión %ld no existe"
 
-#: ../libsvn_client/externals.c:788
+#: ../libsvn_client/externals.c:812
 #, c-format
 msgid "URL '%s' at revision %ld is not a file or a directory"
 msgstr "El URL '%s' en la revisión %ld no es ni un archivo ni un directorio"
 
-#: ../libsvn_client/externals.c:1092
+#: ../libsvn_client/externals.c:1111
 #, c-format
 msgid "Traversal of '%s' found no ambient depth"
 msgstr ""
 
-#: ../libsvn_client/externals.c:1226
+#: ../libsvn_client/externals.c:1262
 #, c-format
 msgid "'%s' is not a URL"
 msgstr "'%s' no es un URL"
 
-#: ../libsvn_client/info.c:501
+#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5358
+#: ../libsvn_wc/wc_db.c:596 ../libsvn_wc/wc_db.c:2039
+#: ../libsvn_wc/wc_db.c:2132 ../libsvn_wc/wc_db.c:2191
+#: ../libsvn_wc/wc_db.c:2215 ../libsvn_wc/wc_db.c:5456
+#: ../libsvn_wc/wc_db.c:5884 ../libsvn_wc/wc_db.c:6834
+#: ../libsvn_wc/wc_db.c:6952 ../libsvn_wc/wc_db.c:7016
+#: ../libsvn_wc/wc_db.c:7228 ../libsvn_wc/wc_db.c:8277
+#: ../libsvn_wc/wc_db.c:8457 ../libsvn_wc/wc_db.c:8795
+#, fuzzy, c-format
+msgid "The node '%s' was not found."
+msgstr "ruta '%s' no encontrada"
+
+#: ../libsvn_client/info.c:565
 #, 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:508 ../libsvn_client/info.c:523
-#: ../libsvn_client/info.c:533
+#: ../libsvn_client/info.c:572 ../libsvn_client/info.c:587
+#: ../libsvn_client/info.c:597
 #, c-format
 msgid "URL '%s' non-existent in revision %ld"
 msgstr "El URL '%s' no existe en la revisión '%ld'"
 
-#: ../libsvn_client/list.c:233
+#: ../libsvn_client/list.c:249
 #, 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:205
+#: ../libsvn_client/locking_commands.c:237
 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:267 ../libsvn_client/merge.c:6844
-#: ../libsvn_client/merge.c:6850 ../libsvn_client/merge.c:7765
-#: ../libsvn_client/merge.c:7950 ../libsvn_client/ra.c:401
-#: ../libsvn_client/ra.c:433 ../libsvn_client/ra.c:636
+#: ../libsvn_client/locking_commands.c:282 ../libsvn_client/merge.c:9006
+#: ../libsvn_client/merge.c:9013 ../libsvn_client/merge.c:10240
+#: ../libsvn_client/merge.c:10515 ../libsvn_client/ra.c:484
+#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
 #, c-format
 msgid "'%s' has no URL"
 msgstr "'%s' no tiene URL"
 
-#: ../libsvn_client/locking_commands.c:291
+#: ../libsvn_client/locking_commands.c:305
 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:332
+#: ../libsvn_client/locking_commands.c:346
 #, 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:380
+#: ../libsvn_client/locking_commands.c:391
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
-#: ../libsvn_client/locking_commands.c:413 ../libsvn_fs/fs-loader.c:1189
-#: ../libsvn_ra/ra_loader.c:927
+#: ../libsvn_client/locking_commands.c:425 ../libsvn_fs/fs-loader.c:1269
+#: ../libsvn_ra/ra_loader.c:1056
 msgid "Lock comment contains illegal characters"
 msgstr "El comentario de bloqueo tiene caracteres ilegales"
 
-#: ../libsvn_client/log.c:320 ../libsvn_client/log.c:382
+#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
 msgid "Missing required revision specification"
 msgstr "Falta la especificación de la revisión"
 
-#: ../libsvn_client/log.c:448
+#: ../libsvn_client/log.c:401
+#, fuzzy, c-format
+msgid "'%s' is not a relative path"
+msgstr "'%s' no es un archivo"
+
+#: ../libsvn_client/log.c:422
 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:471 ../libsvn_client/status.c:296
-#: ../libsvn_client/update.c:156
+#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:388
 #, c-format
 msgid "Entry '%s' has no URL"
 msgstr "La entrada '%s' no tiene URL"
 
-#: ../libsvn_client/merge.c:167
+#: ../libsvn_client/merge.c:179
 #, c-format
 msgid "URLs have no scheme ('%s' and '%s')"
 msgstr "Los URLs no tienen protocolo ('%s' y '%s')"
 
-#: ../libsvn_client/merge.c:173 ../libsvn_client/merge.c:179
+#: ../libsvn_client/merge.c:185 ../libsvn_client/merge.c:191
 #, c-format
 msgid "URL has no scheme: '%s'"
 msgstr "El URL no tiene protocolo: '%s'"
 
-#: ../libsvn_client/merge.c:186
+#: ../libsvn_client/merge.c:198
 #, 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')"
@@ -1720,27 +1843,27 @@ msgstr "No se soporta todavía mezclar p
 #. 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:1270
+#: ../libsvn_client/merge.c:1482
 msgid ".working"
 msgstr ".copia-de-trabajo"
 
 # Sin acento a propósito!
-#: ../libsvn_client/merge.c:1272
+#: ../libsvn_client/merge.c:1484
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".izquierda-fusion.r%ld"
 
 # Sin acento a propósito!
-#: ../libsvn_client/merge.c:1275
+#: ../libsvn_client/merge.c:1487
 #, c-format
 msgid ".merge-right.r%ld"
 msgstr ".derecha-fusion.r%ld"
 
-#: ../libsvn_client/merge.c:2963
+#: ../libsvn_client/merge.c:3957
 msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
 msgstr "No se puede efectuar la fusión reversa de un rango de la historia futura de la misma ruta; pruebe actualizar primero"
 
-#: ../libsvn_client/merge.c:3502
+#: ../libsvn_client/merge.c:4661
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1752,162 +1875,213 @@ msgstr ""
 "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:6510
+#: ../libsvn_client/merge.c:5820
+msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8502
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr "El uso de dos URLs no es compatible con la modificación de la info de fusión"
 
-#: ../libsvn_client/merge.c:6517 ../libsvn_client/merge.c:6763
+#: ../libsvn_client/merge.c:8509 ../libsvn_client/merge.c:8793
 msgid "Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr "La fusión desde repositorios externos no es compatible con la modificación de la info de fusión"
 
-#: ../libsvn_client/merge.c:7056
-msgid "Cannot reintegrate into a working copy with a switched subtree"
-msgstr "No se puede reintegrar hacia una copia de trabajo con un subárbol conmutado (switch)"
+#: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
+#: ../libsvn_client/merge.c:10523
+#, fuzzy, c-format
+msgid "Merge target '%s' does not exist in the working copy"
+msgstr "La ruta '%s' no está en la copia de trabajo"
 
-#: ../libsvn_client/merge.c:7061
-msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
-msgstr "No se puede reintegrar hacia una copia de trabajo que no tiene en su totalidad una profundidad 'infinita'"
+#: ../libsvn_client/merge.c:8896
+#, fuzzy
+msgid "Cannot merge into a working copy with a switched subtree"
+msgstr "No se puede reintegrar hacia una copia de trabajo con un subárbol conmutado (switch)"
 
-#: ../libsvn_client/merge.c:7066
-msgid "Cannot reintegrate into a working copy that has local modifications"
+#: ../libsvn_client/merge.c:8901
+#, fuzzy
+msgid "Cannot merge into a working copy that has local modifications"
 msgstr "No se puede reintegrar hacia una copia de trabajo que tiene modificaciones locales"
 
-#: ../libsvn_client/merge.c:7072
+#: ../libsvn_client/merge.c:8918
 msgid "Cannot determine revision of working copy"
 msgstr "No se pudo determinar la revisión de la copia de trabajo"
 
-#: ../libsvn_client/merge.c:7076
-msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
+#: ../libsvn_client/merge.c:8924
+#, fuzzy, c-format
+msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
 msgstr "No se puede reintegrar hacia una copia de trabajo con revisiones mezcladas, pruede actualizar antes"
 
-#: ../libsvn_client/merge.c:7155
+#: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
+msgid "Merge sources must both be either paths or URLs"
+msgstr ""
+
+#: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
 #, c-format
-msgid "At least one revision (r%ld) not yet merged from '%s'"
-msgstr "Por lo menos una revisión (r%ld) todavía no fue fusionada desde '%s'"
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "'%s' no está en el mismo repositorio que '%s'"
 
-#: ../libsvn_client/merge.c:7630 ../libsvn_client/merge.c:7836
+#: ../libsvn_client/merge.c:10057 ../libsvn_client/merge.c:10348
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr ""
 
-#: ../libsvn_client/merge.c:7783
+#: ../libsvn_client/merge.c:10258
 #, c-format
 msgid "'%s' must be from the same repository as '%s'"
 msgstr "'%s' debe ser del mismo repositorio que '%s'"
 
-#: ../libsvn_client/merge.c:7860
+#: ../libsvn_client/merge.c:10290
+#, fuzzy, c-format
+msgid "Neither the reintegrate source nor target can be the root of the repository"
+msgstr "'%s' no es la raíz del repositorio"
+
+#: ../libsvn_client/merge.c:10376
 #, c-format
 msgid ""
 "Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
 "%s"
 msgstr ""
 
-#: ../libsvn_client/prop_commands.c:74
+#: ../libsvn_client/mergeinfo.c:1721
+msgid "Only depths 'infinity' and 'empty' are currently supported"
+msgstr ""
+
+#: ../libsvn_client/patch.c:243
+#, fuzzy, c-format
+msgid "Cannot strip %u components from '%s'"
+msgstr "No se pudo partir la línea en componentes: '%s'"
+
+#: ../libsvn_client/patch.c:2754
+#, fuzzy
+msgid "strip count must be positive"
+msgstr "El parámetro de --limit debe ser positivo"
+
+#: ../libsvn_client/prop_commands.c:80
 #, 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:225
+#: ../libsvn_client/prop_commands.c:216
 #, c-format
 msgid "Property '%s' is not a regular property"
 msgstr "La propiedad '%s' no es una propiedad regular"
 
-#: ../libsvn_client/prop_commands.c:325
+#: ../libsvn_client/prop_commands.c:363
 #, 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:332 ../libsvn_client/prop_commands.c:435
+#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
 #, c-format
 msgid "Bad property name: '%s'"
 msgstr "Nombre de propiedad inaceptable: '%s'"
 
-#: ../libsvn_client/prop_commands.c:342
+#: ../libsvn_client/prop_commands.c:380
 #, 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:347
+#: ../libsvn_client/prop_commands.c:385
 #, 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:362
+#: ../libsvn_client/prop_commands.c:400
 #, 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:431
-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:458
+#: ../libsvn_client/prop_commands.c:471
 #, c-format
 msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
 msgstr ""
 
-#: ../libsvn_client/prop_commands.c:467
+#: ../libsvn_client/prop_commands.c:480
 #, c-format
 msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
 msgstr ""
 
-#: ../libsvn_client/prop_commands.c:475
+#: ../libsvn_client/prop_commands.c:488
 #, c-format
 msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
 msgstr ""
 
-#: ../libsvn_client/prop_commands.c:659
+#: ../libsvn_client/prop_commands.c:519
+#, fuzzy
+msgid "Author name should not contain a newline; 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:764
 #, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "'%s' no existe en la revisión %ld"
 
-#: ../libsvn_client/prop_commands.c:666 ../libsvn_client/prop_commands.c:975

[... 13429 lines stripped ...]


Mime
View raw message