You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/01/13 22:40:38 UTC
svn commit: r1231318 [25/35] - in /subversion/branches/revprop-packing: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/server-side/mod_dontdothat/
notes/ notes/http-and-webdav/ not...
Modified: subversion/branches/revprop-packing/subversion/po/fr.po
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/po/fr.po?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/po/fr.po [UTF-8] (original)
+++ subversion/branches/revprop-packing/subversion/po/fr.po [UTF-8] Fri Jan 13 21:40:26 2012
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2011-01-29 08:20-0400\n"
-"PO-Revision-Date: 2011-01-29 08:21-0400\n"
+"POT-Creation-Date: 2012-01-01 10:54+0100\n"
+"PO-Revision-Date: 2012-01-01 13:45+0100\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: French <de...@subversion.tigris.org>\n"
"Language: fr\n"
@@ -114,7 +114,7 @@ msgstr ""
# to delete: supprimer
# to dump: décharger (préféré à sauvegarder, qui implique d'écrire qqpart)
# to store: sauvegarder
-# to switch: aiguiller, ré-aiguiller, permuter? changer?
+# to switch: basculer
# to drop: éliminer, ignorer
# to checkout: extraire, rapatrier, récupérer ?
# to lock: verrouiller
@@ -147,72 +147,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:68
+#: ../include/private/svn_fs_util.h:70
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Fichier non trouvé : transaction '%s', chemin '%s'"
-#: ../include/private/svn_fs_util.h:73
+#: ../include/private/svn_fs_util.h:75
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Fichier non trouvé : révision %ld, chemin '%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:84
+#: ../include/private/svn_fs_util.h:86
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Fichier existe déjà : système de fichiers '%s', transaction '%s', chemin '%s'"
-#: ../include/private/svn_fs_util.h:89
+#: ../include/private/svn_fs_util.h:91
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Ficher existe déjà : système de fichiers '%s', révision %ld, chemin '%s'"
#. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:97
+#: ../include/private/svn_fs_util.h:99
msgid "Root object must be a transaction root"
msgstr "L'objet racine doit être une racine de transaction"
#. 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:104
+#: ../include/private/svn_fs_util.h:106
#, c-format
msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
msgstr "Fichier non altérable : système de fichiers '%s', révision %ld, chemin '%s'"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:111
+#: ../include/private/svn_fs_util.h:113
#, c-format
msgid "'%s' is not a directory in filesystem '%s'"
msgstr "'%s' n'est pas un répertoire dans le système de fichiers '%s'"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:118
+#: ../include/private/svn_fs_util.h:120
#, c-format
msgid "'%s' is not a file in filesystem '%s'"
msgstr "'%s' n'est pas un fichier dans le système de fichiers '%s'"
#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:126
+#: ../include/private/svn_fs_util.h:128
#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "Chemin '%s' déjà verrouillé par l'utilisateur '%s' dans le système de fichiers '%s'"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:133
+#: ../include/private/svn_fs_util.h:135
#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "Pas de verrou sur '%s' dans le système de fichiers '%s'"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:140
+#: ../include/private/svn_fs_util.h:142
#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "Verrou (lock) expiré : identifiant '%s' dans le système de fichiers '%s'"
#. FS is of type "svn fs_t *".
-#: ../include/private/svn_fs_util.h:147
+#: ../include/private/svn_fs_util.h:149
#, c-format
msgid "No username is currently associated with filesystem '%s'"
msgstr "Aucun utilisateur actuellement associé au système de fichiers '%s'"
@@ -220,7 +220,7 @@ msgstr "Aucun utilisateur actuellement a
#. 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:156
+#: ../include/private/svn_fs_util.h:158
#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
msgstr "L'utilisateur '%s' essaie d'utiliser un verrou posé par '%s' dans le système de fichiers '%s'"
@@ -261,7 +261,7 @@ msgstr "Le chemin n'est pas un descendan
msgid "Bogus UUID"
msgstr "UUID invalide"
-#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:905
msgid "Invalid configuration value"
msgstr "Valeur de configuration invalide"
@@ -329,977 +329,1001 @@ msgstr "Erreur de fenêtrage (framing) d
msgid "Read error in pipe"
msgstr "Erreur de lecture sur un pipeline (pipe)"
-#: ../include/svn_error_codes.h:280 ../libsvn_subr/cmdline.c:341
-#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:926 ../svnlook/main.c:1807
+#: ../include/svn_error_codes.h:280 ../libsvn_subr/cmdline.c:352
+#: ../libsvn_subr/cmdline.c:375 ../svn/util.c:929 ../svnlook/main.c:1833
#, c-format
msgid "Write error"
msgstr "Erreur d'écriture"
-#: ../include/svn_error_codes.h:286
+#: ../include/svn_error_codes.h:285
+msgid "Write error in pipe"
+msgstr "Erreur en écriture sur un pipeline (pipe)"
+
+#: ../include/svn_error_codes.h:291
msgid "Unexpected EOF on stream"
msgstr "Fin de fichier (EOF) inattendue sur le flux"
-#: ../include/svn_error_codes.h:290
+#: ../include/svn_error_codes.h:295
msgid "Malformed stream data"
msgstr "Flux de données malformé"
-#: ../include/svn_error_codes.h:294
+#: ../include/svn_error_codes.h:299
msgid "Unrecognized stream data"
msgstr "Flux de données non reconnu"
-#: ../include/svn_error_codes.h:299
+#: ../include/svn_error_codes.h:304
msgid "Stream doesn't support seeking"
msgstr "Le flux n'accepte pas de déplacements arbitraires (seeking)"
-#: ../include/svn_error_codes.h:305
+#: ../include/svn_error_codes.h:310
msgid "Unknown svn_node_kind"
msgstr "svn_node_kind inconnu"
-#: ../include/svn_error_codes.h:309
+#: ../include/svn_error_codes.h:314
msgid "Unexpected node kind found"
msgstr "Type de nœud inattendu"
-#: ../include/svn_error_codes.h:315
+#: ../include/svn_error_codes.h:320
msgid "Can't find an entry"
msgstr "Entrée non trouvée"
-#: ../include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:326
msgid "Entry already exists"
msgstr "L'entrée existe déjà"
-#: ../include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:330
msgid "Entry has no revision"
msgstr "L'entrée n'a pas de révision"
-#: ../include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:334
msgid "Entry has no URL"
msgstr "L'entrée n'a pas d'URL"
-#: ../include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:338
msgid "Entry has an invalid attribute"
msgstr "L'entrée a un attribut invalide"
-#: ../include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:342
msgid "Can't create an entry for a forbidden name"
msgstr "Impossible de créer une entrée pour un nom interdit"
-#: ../include/svn_error_codes.h:343
+#: ../include/svn_error_codes.h:348
msgid "Obstructed update"
msgstr "Actualisation bloquée"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:348
+#: ../include/svn_error_codes.h:353
msgid "Mismatch popping the WC unwind stack"
msgstr "Mismatch popping the WC unwind stack"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:358
msgid "Attempt to pop empty WC unwind stack"
msgstr "Attempt to pop empty WC unwind stack"
# Deprecated and unused, will be removed in the next major release.
# Retranscrit en dessous pour que `msgfmt --check-format` ne dise plus que ce
# n'est pas traduit
-#: ../include/svn_error_codes.h:358
+#: ../include/svn_error_codes.h:363
msgid "Attempt to unlock with non-empty unwind stack"
msgstr "Attempt to unlock with non-empty unwind stack"
-#: ../include/svn_error_codes.h:362
+#: ../include/svn_error_codes.h:367
msgid "Attempted to lock an already-locked dir"
msgstr "Tentative de verrouiller un répertoire déjà verrouillé"
-#: ../include/svn_error_codes.h:366
+#: ../include/svn_error_codes.h:371
msgid "Working copy not locked; this is probably a bug, please report"
msgstr "Copie de travail non verrouillée ; probablement un bug à rapporter"
-#: ../include/svn_error_codes.h:371
+#: ../include/svn_error_codes.h:376
msgid "Invalid lock"
msgstr "Verrou invalide"
-#: ../include/svn_error_codes.h:378
+#: ../include/svn_error_codes.h:382 ../include/svn_error_codes.h:388
msgid "Path is not a working copy directory"
msgstr "Le chemin n'est pas un répertoire d'une copie de travail"
-#: ../include/svn_error_codes.h:386
+#: ../include/svn_error_codes.h:392
msgid "Path is not a working copy file"
msgstr "Le chemin n'est pas un fichier d'une copie de travail"
-#: ../include/svn_error_codes.h:390
+#: ../include/svn_error_codes.h:396
msgid "Problem running log"
msgstr "Problème dans le journal"
-#: ../include/svn_error_codes.h:394
+#: ../include/svn_error_codes.h:400
msgid "Can't find a working copy path"
msgstr "Chemin d'une copie de travail non trouvé"
-#: ../include/svn_error_codes.h:398
+#: ../include/svn_error_codes.h:404
msgid "Working copy is not up-to-date"
msgstr "La copie de travail n'est pas à jour"
-#: ../include/svn_error_codes.h:402
+#: ../include/svn_error_codes.h:408
msgid "Left locally modified or unversioned files"
msgstr "Il reste des fichiers localement modifiés ou non versionnés"
-#: ../include/svn_error_codes.h:406
+#: ../include/svn_error_codes.h:412
msgid "Unmergeable scheduling requested on an entry"
msgstr "Programmation d'opérations conflituelles sur une entrée"
-#: ../include/svn_error_codes.h:410
+#: ../include/svn_error_codes.h:416
msgid "Found a working copy path"
msgstr "Trouvé un chemin dans une copie de travail"
-#: ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:420
msgid "A conflict in the working copy obstructs the current operation"
msgstr "Un conflit dans la copie de travail bloque l'opération courante"
-#: ../include/svn_error_codes.h:418
+#: ../include/svn_error_codes.h:424
msgid "Working copy is corrupt"
msgstr "La copie de travail est corrompue"
-#: ../include/svn_error_codes.h:422
+#: ../include/svn_error_codes.h:428
msgid "Working copy text base is corrupt"
msgstr "Le texte de référence de la copie de travail est corrompu"
-#: ../include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:432
msgid "Cannot change node kind"
msgstr "Type de nœud non modifiable"
-#: ../include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:436
msgid "Invalid operation on the current working directory"
msgstr "Opération invalide sur le répertoire courant"
-#: ../include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:440
msgid "Problem on first log entry in a working copy"
msgstr "Problème rencontré avec la première entrée du journal de la copie de travail"
-#: ../include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:444
msgid "Unsupported working copy format"
msgstr "Format de copie de travail non reconnu"
-#: ../include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:448
msgid "Path syntax not supported in this context"
msgstr "Syntaxe avec chemin non acceptée dans ce contexte"
-#: ../include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:453
msgid "Invalid schedule"
msgstr "Programmation invalide"
-#: ../include/svn_error_codes.h:452
+#: ../include/svn_error_codes.h:458
msgid "Invalid relocation"
msgstr "Relocalisation invalide"
-#: ../include/svn_error_codes.h:457
+#: ../include/svn_error_codes.h:463
msgid "Invalid switch"
-msgstr "Ré-aiguillage (switch) invalide"
+msgstr "Bascule (switch) invalide"
-#: ../include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:468
msgid "Changelist doesn't match"
msgstr "La liste de changements ne correspond pas"
-#: ../include/svn_error_codes.h:467
+#: ../include/svn_error_codes.h:473
msgid "Conflict resolution failed"
msgstr "Échec de la résolution de conflit"
-#: ../include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:477
msgid "Failed to locate 'copyfrom' path in working copy"
msgstr "Échec de la localisatio du chemin source 'copyfrom' dans la copie de travail"
-#: ../include/svn_error_codes.h:478
+#: ../include/svn_error_codes.h:485
msgid "Moving a path from one changelist to another"
msgstr "Déplacement d'un chemin d'une liste de changements (changelist) à une autre"
-#: ../include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:490
msgid "Cannot delete a file external"
msgstr "Impossible d'effacer un fichier externe"
-#: ../include/svn_error_codes.h:488
+#: ../include/svn_error_codes.h:495
msgid "Cannot move a file external"
msgstr "Impossible de déplacer un fichier externe"
-#: ../include/svn_error_codes.h:493
+#: ../include/svn_error_codes.h:500
msgid "Something's amiss with the wc sqlite database"
msgstr "Quelque chose ne va pas avec la base SQLite de la copie de travail"
-#: ../include/svn_error_codes.h:498
+#: ../include/svn_error_codes.h:505
msgid "The working copy is missing"
msgstr "La copie de travail est absente"
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:510
msgid "The specified node is not a symlink"
msgstr "Le nœud spécifiée n'est pas un lien symbolique"
-#: ../include/svn_error_codes.h:508
+#: ../include/svn_error_codes.h:515
msgid "The specified path has an unexpected status"
msgstr "Le chemin spécifié a un état inattendu"
-#: ../include/svn_error_codes.h:513
+#: ../include/svn_error_codes.h:520
msgid "The working copy needs to be upgraded"
msgstr "La copie de travail doit être remise à niveau"
-#: ../include/svn_error_codes.h:518
-msgid "Previous operation was interrupted; run 'svn cleanup'"
-msgstr "Opération précédente interrompue : lancer 'svn cleanup'"
-
-#: ../include/svn_error_codes.h:523
-msgid "This operation can not be performed with just this depth."
-msgstr "Cette opération ne peut être faite avec cette profondeur là."
+#: ../include/svn_error_codes.h:525
+msgid "Previous operation has not finished; run 'cleanup' if it was interrupted"
+msgstr "Opération précédente non finie : lancer 'svn cleanup' si interrompue"
+
+#: ../include/svn_error_codes.h:531
+msgid "The operation cannot be performed with the specified depth"
+msgstr "Cette opération ne peut être faite avec cette profondeur"
+
+#: ../include/svn_error_codes.h:536
+msgid "Couldn't open a working copy file because access was denied"
+msgstr "Permission refusée pour accéder à un fichier d'une copie de travail"
-#: ../include/svn_error_codes.h:529
+#: ../include/svn_error_codes.h:542
msgid "General filesystem error"
msgstr "Erreur générale du système de fichiers"
-#: ../include/svn_error_codes.h:533
+#: ../include/svn_error_codes.h:546
msgid "Error closing filesystem"
msgstr "Erreur à la fermeture du système de fichiers"
-#: ../include/svn_error_codes.h:537
+#: ../include/svn_error_codes.h:550
msgid "Filesystem is already open"
msgstr "Système de fichiers déjà ouvert"
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:554
msgid "Filesystem is not open"
msgstr "Système de fichiers non ouvert"
-#: ../include/svn_error_codes.h:545
+#: ../include/svn_error_codes.h:558
msgid "Filesystem is corrupt"
msgstr "Système de fichiers corrompu"
-#: ../include/svn_error_codes.h:549
+#: ../include/svn_error_codes.h:562
msgid "Invalid filesystem path syntax"
msgstr "Syntaxe du chemin dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:553
+#: ../include/svn_error_codes.h:566
msgid "Invalid filesystem revision number"
msgstr "Numéro de révision dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:570
msgid "Invalid filesystem transaction name"
msgstr "Nom de transaction dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:574
msgid "Filesystem directory has no such entry"
msgstr "Le répertoire dans le système de fichiers ne contient pas cette entrée"
-#: ../include/svn_error_codes.h:565
+#: ../include/svn_error_codes.h:578
msgid "Filesystem has no such representation"
msgstr "Le système de fichiers ne contient pas cette représentation"
-#: ../include/svn_error_codes.h:569
+#: ../include/svn_error_codes.h:582
msgid "Filesystem has no such string"
msgstr "Le système de fichiers n'a pas cette chaîne (string)"
-#: ../include/svn_error_codes.h:573
+#: ../include/svn_error_codes.h:586
msgid "Filesystem has no such copy"
msgstr "Le système de fichiers n'a pas cette copie"
-#: ../include/svn_error_codes.h:577
+#: ../include/svn_error_codes.h:590
msgid "The specified transaction is not mutable"
msgstr "La transaction spécifiée n'est pas modifiable"
-#: ../include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:594
msgid "Filesystem has no item"
msgstr "Le système de fichiers ne contient pas cet élément"
-#: ../include/svn_error_codes.h:585
+#: ../include/svn_error_codes.h:598
msgid "Filesystem has no such node-rev-id"
msgstr "Le système de fichiers ne contient pas cet identificateur de révision de nœud (node-rev-id)"
-#: ../include/svn_error_codes.h:589
+#: ../include/svn_error_codes.h:602
msgid "String does not represent a node or node-rev-id"
msgstr "La chaîne ne représente ni un nœud ni un identificateur de révision de nœud (node-rev-id)"
-#: ../include/svn_error_codes.h:593
+#: ../include/svn_error_codes.h:606
msgid "Name does not refer to a filesystem directory"
msgstr "Le nom ne réfère pas à un répertoire du système de fichiers"
-#: ../include/svn_error_codes.h:597
+#: ../include/svn_error_codes.h:610
msgid "Name does not refer to a filesystem file"
msgstr "Le nom ne réfère pas à un fichier du système de fichiers"
-#: ../include/svn_error_codes.h:601
+#: ../include/svn_error_codes.h:614
msgid "Name is not a single path component"
msgstr "Le nom n'est pas un composant simple de chemin"
-#: ../include/svn_error_codes.h:605
+#: ../include/svn_error_codes.h:618
msgid "Attempt to change immutable filesystem node"
msgstr "Tentative de changement d'un nœud non-modifiable du système de fichiers"
-#: ../include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:622
msgid "Item already exists in filesystem"
msgstr "L'élément exite déjà dans le système de fichiers"
-#: ../include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:626
msgid "Attempt to remove or recreate fs root dir"
msgstr "Tentative de suppression ou de recréation du répertoire racine du système de fichiers"
-#: ../include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:630
msgid "Object is not a transaction root"
msgstr "L'objet n'est pas une racine de transaction"
-#: ../include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:634
msgid "Object is not a revision root"
msgstr "L'objet n'est pas une racine de révision"
-#: ../include/svn_error_codes.h:625
+#: ../include/svn_error_codes.h:638
msgid "Merge conflict during commit"
msgstr "Fusion conflictuelle lors d'une propagation (commit)"
-#: ../include/svn_error_codes.h:629
+#: ../include/svn_error_codes.h:642
msgid "A representation vanished or changed between reads"
msgstr "Une représentation a disparu ou changé entre deux lectures"
-#: ../include/svn_error_codes.h:633
+#: ../include/svn_error_codes.h:646
msgid "Tried to change an immutable representation"
msgstr "Tentative de changement d'une représentation non-modifiable"
-#: ../include/svn_error_codes.h:637
+#: ../include/svn_error_codes.h:650
msgid "Malformed skeleton data"
msgstr "Données de squelette mal formées"
-#: ../include/svn_error_codes.h:641
+#: ../include/svn_error_codes.h:654
msgid "Transaction is out of date"
msgstr "La transaction est obsolète"
-#: ../include/svn_error_codes.h:645
+#: ../include/svn_error_codes.h:658
msgid "Berkeley DB error"
msgstr "Erreur de la base Berkeley"
-#: ../include/svn_error_codes.h:649
+#: ../include/svn_error_codes.h:662
msgid "Berkeley DB deadlock error"
msgstr "Erreur (étreinte fatale - deadlock) dans la base Berkeley"
-#: ../include/svn_error_codes.h:653
+#: ../include/svn_error_codes.h:666
msgid "Transaction is dead"
msgstr "Transaction morte"
-#: ../include/svn_error_codes.h:657
+#: ../include/svn_error_codes.h:670
msgid "Transaction is not dead"
msgstr "La transaction n'est pas morte"
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:675
msgid "Unknown FS type"
msgstr "Type de stockage de dépôt (FS) inconnu"
-#: ../include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:680
msgid "No user associated with filesystem"
msgstr "Aucun utilisateur associé au système de fichiers"
-#: ../include/svn_error_codes.h:672
+#: ../include/svn_error_codes.h:685
msgid "Path is already locked"
msgstr "Chemin déjà verrouillé"
-#: ../include/svn_error_codes.h:677 ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:690 ../include/svn_error_codes.h:852
msgid "Path is not locked"
msgstr "Le chemin n'est pas verrouillé"
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:695
msgid "Lock token is incorrect"
msgstr "Nom de verrou incorrect"
-#: ../include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:700
msgid "No lock token provided"
msgstr "Aucun nom de verrou fourni"
-#: ../include/svn_error_codes.h:692
+#: ../include/svn_error_codes.h:705
msgid "Username does not match lock owner"
msgstr "Le nom d'utilisateur ne correspond pas au propriétaire du verrou"
-#: ../include/svn_error_codes.h:697
+#: ../include/svn_error_codes.h:710
msgid "Filesystem has no such lock"
msgstr "Le système de fichiers n'a pas ce verrou"
-#: ../include/svn_error_codes.h:702
+#: ../include/svn_error_codes.h:715
msgid "Lock has expired"
msgstr "Verrou expiré"
-#: ../include/svn_error_codes.h:707 ../include/svn_error_codes.h:826
+#: ../include/svn_error_codes.h:720 ../include/svn_error_codes.h:839
msgid "Item is out of date"
msgstr "Élément obsolète"
-#: ../include/svn_error_codes.h:719
+#: ../include/svn_error_codes.h:732
msgid "Unsupported FS format"
msgstr "Format de stockage de dépôt (FS) non supporté"
-#: ../include/svn_error_codes.h:724
+#: ../include/svn_error_codes.h:737
msgid "Representation is being written"
msgstr "La représentation est en cours d'écriture"
-#: ../include/svn_error_codes.h:729
+#: ../include/svn_error_codes.h:742
msgid "The generated transaction name is too long"
msgstr "La nom généré pour la transaction est trop long"
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:747
msgid "Filesystem has no such node origin record"
msgstr "Le système de fichiers n'a pas d'enregistrement d'origine du nœud"
-#: ../include/svn_error_codes.h:739
+#: ../include/svn_error_codes.h:752
msgid "Filesystem upgrade is not supported"
msgstr "Mise à jour (upgrade) du système de fichiers non supportée"
-#: ../include/svn_error_codes.h:744
+#: ../include/svn_error_codes.h:757
msgid "Filesystem has no such checksum-representation index record"
msgstr "Le système de fichiers ne contient pas d'entrée d'index 'checksum-representation'"
-#: ../include/svn_error_codes.h:749
+#: ../include/svn_error_codes.h:762
msgid "Property value in filesystem differs from the provided base value"
msgstr "La valeur de la propriété dans le système de fichier diffère de la valeur de base fournie"
-#: ../include/svn_error_codes.h:756
+#: ../include/svn_error_codes.h:769
msgid "The repository is locked, perhaps for db recovery"
msgstr "Dépôt verrouillé, peut-être un rétablissement (recovery) de base"
-#: ../include/svn_error_codes.h:760
+#: ../include/svn_error_codes.h:773
msgid "A repository hook failed"
msgstr "Échec d'une procédure automatique du dépôt"
-#: ../include/svn_error_codes.h:764
+#: ../include/svn_error_codes.h:777
msgid "Incorrect arguments supplied"
msgstr "Arguments fournis incorrects"
-#: ../include/svn_error_codes.h:768
+#: ../include/svn_error_codes.h:781
msgid "A report cannot be generated because no data was supplied"
msgstr "Un rapport ne peut être généré car aucune donnée n'a été fournie"
-#: ../include/svn_error_codes.h:772
+#: ../include/svn_error_codes.h:785
msgid "Bogus revision report"
msgstr "Rapport de révision invalide"
-#: ../include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:794
msgid "Unsupported repository version"
msgstr "Version de dépot non supportée"
-#: ../include/svn_error_codes.h:785
+#: ../include/svn_error_codes.h:798
msgid "Disabled repository feature"
msgstr "Fonction du dépôt désactivée"
-#: ../include/svn_error_codes.h:789
+#: ../include/svn_error_codes.h:802
msgid "Error running post-commit hook"
msgstr "Erreur de la procédure d'après propagation (post-commit hook)"
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:807
msgid "Error running post-lock hook"
msgstr "Erreur de la procédure d'après verrouillage (post-lock hook)"
-#: ../include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:812
msgid "Error running post-unlock hook"
msgstr "Erreur de la procédure de d'après déverrouillage (post-unlock hook)"
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:817
msgid "Repository upgrade is not supported"
msgstr "Mise à jour du dépôt (upgrade) non supportée"
-#: ../include/svn_error_codes.h:810
+#: ../include/svn_error_codes.h:823
msgid "Bad URL passed to RA layer"
msgstr "Mauvaise URL fournie à la couche RA"
-#: ../include/svn_error_codes.h:814
+#: ../include/svn_error_codes.h:827
msgid "Authorization failed"
msgstr "Autorisation refusée"
-#: ../include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:831
msgid "Unknown authorization method"
msgstr "Méthode d'autorisation inconnue"
-#: ../include/svn_error_codes.h:822
+#: ../include/svn_error_codes.h:835
msgid "Repository access method not implemented"
msgstr "Méthode d'accès au dépôt non implémentée"
-#: ../include/svn_error_codes.h:830
+#: ../include/svn_error_codes.h:843
msgid "Repository has no UUID"
msgstr "Le dépôt n'a pas d'identifiant unique (UUID)"
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:847
msgid "Unsupported RA plugin ABI version"
msgstr "Version du plugin RA (accès dépôt) ABI non supportée"
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:857
msgid "Server can only replay from the root of a repository"
msgstr "Le serveur peut seulement rejouer à la racine du dépôt"
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:862
msgid "Repository UUID does not match expected UUID"
msgstr "UUID du dépôt source différent de celui attendu"
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:867
msgid "Repository root URL does not match expected root URL"
msgstr "L'URL racine de dépôt ne correspondont pas à celle attendue"
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:872
msgid "Session URL does not match expected session URL"
msgstr "L'URL de la session ne correspond pas à celle attendue"
-#: ../include/svn_error_codes.h:865
+#: ../include/svn_error_codes.h:878
msgid "RA layer failed to init socket layer"
msgstr "La couche RA n'a pu initialiser la couche socket"
-#: ../include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:882
msgid "RA layer failed to create HTTP request"
msgstr "La couche RA n'a pu créer l'en-tête HTTP"
-#: ../include/svn_error_codes.h:873
+#: ../include/svn_error_codes.h:886
msgid "RA layer request failed"
msgstr "La requête de la couche RA a échoué"
-#: ../include/svn_error_codes.h:877
+#: ../include/svn_error_codes.h:890
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "La couche RA n'a pas reçu les informations d'OPTIONS demandées"
-#: ../include/svn_error_codes.h:881
+#: ../include/svn_error_codes.h:894
msgid "RA layer failed to fetch properties"
msgstr "La couche RA n'a pu aller chercher les propriétés"
-#: ../include/svn_error_codes.h:885
+#: ../include/svn_error_codes.h:898
msgid "RA layer file already exists"
msgstr "Le fichier existe (couche RA)"
-#: ../include/svn_error_codes.h:899
+#: ../include/svn_error_codes.h:912
msgid "HTTP Path Not Found"
msgstr "Chemin HTTP non trouvé"
-#: ../include/svn_error_codes.h:903
+#: ../include/svn_error_codes.h:916
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Échec lors de l'exécution de WebDAV PROPPATCH"
-#: ../include/svn_error_codes.h:908 ../include/svn_error_codes.h:959
-#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
-#: ../libsvn_ra_svn/marshal.c:859
+#: ../include/svn_error_codes.h:921 ../include/svn_error_codes.h:972
+#: ../libsvn_ra_svn/marshal.c:713 ../libsvn_ra_svn/marshal.c:831
+#: ../libsvn_ra_svn/marshal.c:858
msgid "Malformed network data"
msgstr "Donnée du réseau malformée"
-#: ../include/svn_error_codes.h:913
+#: ../include/svn_error_codes.h:926
msgid "Unable to extract data from response header"
msgstr "Impossible d'extraire les données de l'en-tête de réponse"
-#: ../include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:931
msgid "Repository has been moved"
msgstr "Le dépôt a été déplacé"
-#: ../include/svn_error_codes.h:923 ../libsvn_ra_serf/replay.c:844
-#: ../libsvn_ra_serf/update.c:2335 ../libsvn_ra_serf/util.c:690
+#: ../include/svn_error_codes.h:936 ../libsvn_ra_serf/replay.c:860
+#: ../libsvn_ra_serf/update.c:2393 ../libsvn_ra_serf/util.c:765
msgid "Connection timed out"
msgstr "Connection expirée"
-#: ../include/svn_error_codes.h:928
+#: ../include/svn_error_codes.h:941
msgid "URL access forbidden for unknown reason"
msgstr "Accès URL interdit pour une raison inconnue"
-#: ../include/svn_error_codes.h:934 ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:947 ../include/svn_error_codes.h:976
msgid "Couldn't find a repository"
msgstr "Impossible de trouver le dépôt"
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:951
msgid "Couldn't open a repository"
msgstr "Impossible d'ouvrir le dépôt"
-#: ../include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:956
msgid "Special code for wrapping server errors to report to client"
msgstr "Code spécial pour enpaqueter les erreurs du serveur vers le client"
-#: ../include/svn_error_codes.h:947
+#: ../include/svn_error_codes.h:960
msgid "Unknown svn protocol command"
msgstr "Commande du protocole svn inconnue"
-#: ../include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:964
msgid "Network connection closed unexpectedly"
msgstr "La connexion réseau a été fermée de façon inattendue"
-#: ../include/svn_error_codes.h:955
+#: ../include/svn_error_codes.h:968
msgid "Network read/write error"
msgstr "Erreur d'écriture/lecture réseau"
-#: ../include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:980
msgid "Client/server version mismatch"
msgstr "Versions client/serveur incompatibles"
-#: ../include/svn_error_codes.h:972
+#: ../include/svn_error_codes.h:985
msgid "Cannot negotiate authentication mechanism"
msgstr "Impossible de négocier de mécanisme d'authentification"
-#: ../include/svn_error_codes.h:977
+#: ../include/svn_error_codes.h:990
msgid "Editor drive was aborted"
msgstr "Baton d'édition interrompu"
-#: ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:996
msgid "Initialization of SSPI library failed"
msgstr "Échec à l'initialisation de la librairie SSPI"
-#: ../include/svn_error_codes.h:987
+#: ../include/svn_error_codes.h:1000
msgid "Server SSL certificate untrusted"
msgstr "Certificat SSL du serveur non reconnu"
-#: ../include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1004
msgid "Initialization of the GSSAPI context failed"
msgstr "Échec à l'initialisation du contexte GSSAPI"
-#: ../include/svn_error_codes.h:996
+#: ../include/svn_error_codes.h:1009
msgid "While handling serf response:"
msgstr "En gérant la réponse 'serf' (librairie HTTP) :"
-#: ../include/svn_error_codes.h:1004
+#: ../include/svn_error_codes.h:1017
msgid "Credential data unavailable"
msgstr "Données d'identité (credentials) non disponibles"
-#: ../include/svn_error_codes.h:1008
+#: ../include/svn_error_codes.h:1021
msgid "No authentication provider available"
msgstr "Aucun fournisseur d'authentification disponible"
-#: ../include/svn_error_codes.h:1012
+#: ../include/svn_error_codes.h:1025
msgid "All authentication providers exhausted"
msgstr "Tous les fournisseurs d'authentifications sont épuisés"
-#: ../include/svn_error_codes.h:1016
+#: ../include/svn_error_codes.h:1029
msgid "Credentials not saved"
msgstr "Identité (credentials) non sauvegardée"
-#: ../include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1034
msgid "Authentication failed"
msgstr "Échec de l'authentification"
-#: ../include/svn_error_codes.h:1027
+#: ../include/svn_error_codes.h:1040
msgid "Read access denied for root of edit"
msgstr "Accès en lecture refusé pour la racine de l'édition"
-#: ../include/svn_error_codes.h:1032
+#: ../include/svn_error_codes.h:1045
msgid "Item is not readable"
msgstr "Éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1050
msgid "Item is partially readable"
msgstr "Certains éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:1041
+#: ../include/svn_error_codes.h:1054
msgid "Invalid authz configuration"
msgstr "Configuration de authz invalide"
-#: ../include/svn_error_codes.h:1046
+#: ../include/svn_error_codes.h:1059
msgid "Item is not writable"
msgstr "Éléments non accessibles en écriture"
-#: ../include/svn_error_codes.h:1052
+#: ../include/svn_error_codes.h:1065
msgid "Svndiff data has invalid header"
msgstr "Les données de svndiff contiennent un en-tête invalide"
-#: ../include/svn_error_codes.h:1056
+#: ../include/svn_error_codes.h:1069
msgid "Svndiff data contains corrupt window"
msgstr "Les données de svndiff contiennent une fenêtre corrompue"
-#: ../include/svn_error_codes.h:1060
+#: ../include/svn_error_codes.h:1073
msgid "Svndiff data contains backward-sliding source view"
msgstr "Les données de 'svndiff' contiennent une vue source glissant en arrière"
-#: ../include/svn_error_codes.h:1064
+#: ../include/svn_error_codes.h:1077
msgid "Svndiff data contains invalid instruction"
msgstr "Les données de svndiff contiennent une instruction invalide"
-#: ../include/svn_error_codes.h:1068
+#: ../include/svn_error_codes.h:1081
msgid "Svndiff data ends unexpectedly"
msgstr "Les données de svndiff se terminent de façon inattendue"
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1085
msgid "Svndiff compressed data is invalid"
msgstr "Les données compressées de svndiff sont invalides"
-#: ../include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1091
msgid "Diff data source modified unexpectedly"
msgstr "Modification des données sources de diff inattendue"
-#: ../include/svn_error_codes.h:1084
+#: ../include/svn_error_codes.h:1097
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache n'a pas de chemin vers un système de fichiers SVN"
-#: ../include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1101
msgid "Apache got a malformed URI"
msgstr "Apache a reçu une URI malformé"
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1105
msgid "Activity not found"
msgstr "Activité non trouvée"
-#: ../include/svn_error_codes.h:1096
+#: ../include/svn_error_codes.h:1109
msgid "Baseline incorrect"
msgstr "Ligne de base (baseline) incorrecte"
-#: ../include/svn_error_codes.h:1100
+#: ../include/svn_error_codes.h:1113
msgid "Input/output error"
msgstr "Erreur d'entrée/sortie"
-#: ../include/svn_error_codes.h:1106
+#: ../include/svn_error_codes.h:1119
msgid "A path under version control is needed for this operation"
msgstr "Un objet sous gestionnaire de version est nécessaire à cette opération"
-#: ../include/svn_error_codes.h:1110
+#: ../include/svn_error_codes.h:1123
msgid "Repository access is needed for this operation"
msgstr "L'accès au dépôt est nécessaire pour cette opération"
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1127
msgid "Bogus revision information given"
msgstr "Fausse information de révision donnée"
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1131
msgid "Attempting to commit to a URL more than once"
msgstr "Tentative de propager plus d'une fois à la même URL"
-#: ../include/svn_error_codes.h:1122
+#: ../include/svn_error_codes.h:1135
msgid "Operation does not apply to binary file"
msgstr "Opération non applicable à un fichier binaire"
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1141
msgid "Format of an svn:externals property was invalid"
msgstr "Format de la propriété svn:externals invalide"
-#: ../include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1145
msgid "Attempting restricted operation for modified resource"
msgstr "Tentative d'une opération protégée sur une ressource modifiée"
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1149
msgid "Operation does not apply to directory"
msgstr "Opération non applicable sur un répertoire"
-#: ../include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1153
msgid "Revision range is not allowed"
msgstr "Intervalle de révision non permise"
-#: ../include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1157
msgid "Inter-repository relocation not allowed"
msgstr "Relocalisation entre dépôts différents non permise"
-#: ../include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1161
msgid "Author name cannot contain a newline"
msgstr "Le nom d'auteur ne peut contenir un saut de ligne"
-#: ../include/svn_error_codes.h:1152
+#: ../include/svn_error_codes.h:1165
msgid "Bad property name"
msgstr "Mauvais nom de propriété"
-#: ../include/svn_error_codes.h:1157
+#: ../include/svn_error_codes.h:1170
msgid "Two versioned resources are unrelated"
msgstr "Les deux ressources versionnées ne sont pas apparentées"
-#: ../include/svn_error_codes.h:1162
+#: ../include/svn_error_codes.h:1175
msgid "Path has no lock token"
msgstr "Chemin sans verrou"
-#: ../include/svn_error_codes.h:1167
+#: ../include/svn_error_codes.h:1180
msgid "Operation does not support multiple sources"
msgstr "Opération ne supportant pas des sources multiples"
-#: ../include/svn_error_codes.h:1172
+#: ../include/svn_error_codes.h:1185
msgid "No versioned parent directories"
msgstr "Pas de répertoire parent versionné"
-#: ../include/svn_error_codes.h:1177
+#: ../include/svn_error_codes.h:1190 ../include/svn_error_codes.h:1210
msgid "Working copy and merge source not ready for reintegration"
msgstr "Copie de travail et source du merge non prêt pour une réintégration"
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1195
msgid "A file external cannot overwrite an existing versioned item"
msgstr "Une référence externe ne peut pas écraser un élément versionné existant"
-#: ../include/svn_error_codes.h:1187
+#: ../include/svn_error_codes.h:1200
msgid "Invalid path component strip count specified"
msgstr "Nombre de composant du chemin à enlever invalide"
-#: ../include/svn_error_codes.h:1192
+#: ../include/svn_error_codes.h:1205
msgid "Detected a cycle while processing the operation"
msgstr "Cycle détecté lors d'une opération"
-#: ../include/svn_error_codes.h:1198
+#: ../include/svn_error_codes.h:1215
+msgid "Invalid mergeinfo detected in merge target"
+msgstr "Information de fusion (mergeinfo) invalide détectée pour la cible"
+
+#: ../include/svn_error_codes.h:1220
+msgid "Can't perform this operation without a valid lock token"
+msgstr "Impossible de faire cette opération sans verrou valide"
+
+#: ../include/svn_error_codes.h:1225
+msgid "The operation is forbidden by the server"
+msgstr "Opération interdite par le serveur"
+
+#: ../include/svn_error_codes.h:1231
msgid "A problem occurred; see other errors for details"
msgstr "Une erreur est survenue ; voir les autres erreurs pour plus de détails"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1235
msgid "Failure loading plugin"
msgstr "Erreur lors du chargement du plugin"
-#: ../include/svn_error_codes.h:1206
+#: ../include/svn_error_codes.h:1239
msgid "Malformed file"
msgstr "Fichier malformé"
-#: ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1243
msgid "Incomplete data"
msgstr "Données incomplètes"
-#: ../include/svn_error_codes.h:1214
+#: ../include/svn_error_codes.h:1247
msgid "Incorrect parameters given"
msgstr "Paramètres fournis incorrects"
-#: ../include/svn_error_codes.h:1218
+#: ../include/svn_error_codes.h:1251
msgid "Tried a versioning operation on an unversioned resource"
msgstr "Essai d'une opération sur une ressource non versionnée"
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1255
msgid "Test failed"
msgstr "Test échoué"
-#: ../include/svn_error_codes.h:1226
+#: ../include/svn_error_codes.h:1259
msgid "Trying to use an unsupported feature"
msgstr "Tentative d'utilisation d'une fonction non supportée"
-#: ../include/svn_error_codes.h:1230
+#: ../include/svn_error_codes.h:1263
msgid "Unexpected or unknown property kind"
msgstr "Type de propriété inattendu ou inconnu"
-#: ../include/svn_error_codes.h:1234
+#: ../include/svn_error_codes.h:1267
msgid "Illegal target for the requested operation"
msgstr "Cible illégale pour l'opération demandée"
-#: ../include/svn_error_codes.h:1238
+#: ../include/svn_error_codes.h:1271
msgid "MD5 checksum is missing"
msgstr "Somme de contrôle MD5 manquante"
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1275
msgid "Directory needs to be empty but is not"
msgstr "Un répertoire doit être vide mais ne l'est pas"
-#: ../include/svn_error_codes.h:1246
+#: ../include/svn_error_codes.h:1279
msgid "Error calling external program"
msgstr "Erreur lors de l'appel d'un programme externe"
-#: ../include/svn_error_codes.h:1250
+#: ../include/svn_error_codes.h:1283
msgid "Python exception has been set with the error"
msgstr "L'exception de Python a été levée avec l'erreur"
-#: ../include/svn_error_codes.h:1254
+#: ../include/svn_error_codes.h:1287
msgid "A checksum mismatch occurred"
msgstr "Sommes de contrôle différentes"
-#: ../include/svn_error_codes.h:1258
+#: ../include/svn_error_codes.h:1291
msgid "The operation was interrupted"
msgstr "Opération interrompue"
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1295
msgid "The specified diff option is not supported"
msgstr "L'option fournie à diff n'est pas supportée"
-#: ../include/svn_error_codes.h:1266
+#: ../include/svn_error_codes.h:1299
msgid "Property not found"
msgstr "Propriété non trouvée"
-#: ../include/svn_error_codes.h:1270
+#: ../include/svn_error_codes.h:1303
msgid "No auth file path available"
msgstr "Pas de chemin de fichier d'authentification (auth file) disponible"
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1308
msgid "Incompatible library version"
msgstr "Version de librairie incompatible"
-#: ../include/svn_error_codes.h:1280
+#: ../include/svn_error_codes.h:1313
msgid "Mergeinfo parse error"
msgstr "Mergeinfo : erreur de syntaxe"
-#: ../include/svn_error_codes.h:1285
+#: ../include/svn_error_codes.h:1318
msgid "Cease invocation of this API"
msgstr "Cesse l'invocation de cette API"
-#: ../include/svn_error_codes.h:1290
+#: ../include/svn_error_codes.h:1323
msgid "Error parsing revision number"
msgstr "Erreur de syntaxe sur le numéro révision"
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1328
msgid "Iteration terminated before completion"
msgstr "Itérations arrêtées avant la fin"
-#: ../include/svn_error_codes.h:1300
+#: ../include/svn_error_codes.h:1333
msgid "Unknown changelist"
msgstr "Liste de changements inconnue"
-#: ../include/svn_error_codes.h:1305
+#: ../include/svn_error_codes.h:1338
msgid "Reserved directory name in command line arguments"
msgstr "Nom de répertoire réservé en argument de la ligne de commande"
-#: ../include/svn_error_codes.h:1310
+#: ../include/svn_error_codes.h:1343
msgid "Inquiry about unknown capability"
msgstr "Demande concernant une capacité inconnue"
-#: ../include/svn_error_codes.h:1315
+#: ../include/svn_error_codes.h:1348
msgid "Test skipped"
msgstr "Test ignoré"
-#: ../include/svn_error_codes.h:1320
+#: ../include/svn_error_codes.h:1353
msgid "apr memcache library not available"
msgstr "La librairie APR memcache non disponible"
-#: ../include/svn_error_codes.h:1325
+#: ../include/svn_error_codes.h:1358
msgid "Couldn't perform atomic initialization"
msgstr "Impossible d'exécuter l'initialisation atomique"
-#: ../include/svn_error_codes.h:1330
+#: ../include/svn_error_codes.h:1363
msgid "SQLite error"
msgstr "Erreur SQLite"
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1368
msgid "Attempted to write to readonly SQLite db"
msgstr "Tentative d'écriture vers base SQLite en lecture seule"
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1375
msgid "Unsupported schema found in SQLite db"
msgstr "Schema non supporté dans une base SQLite"
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1380
msgid "The SQLite db is busy"
msgstr "La base SQLite est occupée"
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1385
msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
msgstr "SQLite occupé à annuler une transaction ; remise à zéro des opérations SQLite pour le permettre"
-#: ../include/svn_error_codes.h:1357
+#: ../include/svn_error_codes.h:1391
+msgid "Constraint error in SQLite db"
+msgstr "Violation de contraintes dans une base SQLite"
+
+#: ../include/svn_error_codes.h:1397
msgid "Error parsing arguments"
msgstr "Erreur lors de l'analyse des arguments"
-#: ../include/svn_error_codes.h:1361
+#: ../include/svn_error_codes.h:1401
msgid "Not enough arguments provided"
msgstr "Nombre d'arguments insuffisant"
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1405
msgid "Mutually exclusive arguments specified"
msgstr "Arguments mutuellement exclusifs fournis"
-#: ../include/svn_error_codes.h:1369
+#: ../include/svn_error_codes.h:1409
msgid "Attempted command in administrative dir"
msgstr "Commande essayée sur un répertoire d'administration"
-#: ../include/svn_error_codes.h:1373
+#: ../include/svn_error_codes.h:1413
msgid "The log message file is under version control"
msgstr "Le fichier pour l'entrée du journal est sous gestionnaire de version"
-#: ../include/svn_error_codes.h:1377
+#: ../include/svn_error_codes.h:1417
msgid "The log message is a pathname"
msgstr "L'entrée du journal est un chemin de fichier"
-#: ../include/svn_error_codes.h:1381
+#: ../include/svn_error_codes.h:1421
msgid "Committing in directory scheduled for addition"
msgstr "Propagation dans un répertoire qui doit être ajouté"
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1425
msgid "No external editor available"
msgstr "Pas d'éditeur externe disponible"
-#: ../include/svn_error_codes.h:1389
+#: ../include/svn_error_codes.h:1429
msgid "Something is wrong with the log message's contents"
msgstr "Quelque chose ne va pas dans l'entrée du journal"
-#: ../include/svn_error_codes.h:1393
+#: ../include/svn_error_codes.h:1433
msgid "A log message was given where none was necessary"
msgstr "Message de journal fourni alors qu'aucun n'était nécessaire"
-#: ../include/svn_error_codes.h:1397
+#: ../include/svn_error_codes.h:1437
msgid "No external merge tool available"
msgstr "Aucun éditeur externe de fusion disponible"
-#: ../include/svn_error_codes.h:1401
+#: ../include/svn_error_codes.h:1441
msgid "Failed processing one or more externals definitions"
msgstr "Échec lors du traitement d'une ou plusieurs définitions externes"
-#: ../include/svn_error_codes.h:1407
+#: ../include/svn_error_codes.h:1447
msgid "Assertion failure"
msgstr "Échec de la vérification"
-#: ../include/svn_error_codes.h:1411
+#: ../include/svn_error_codes.h:1451
msgid "No non-tracing links found in the error chain"
msgstr "Aucun liens sans trances trouvés dans la chaîne d'erreurs"
@@ -1310,105 +1334,109 @@ msgstr "Aucun liens sans trances trouvé
msgid "GNOME Keyring is locked and we are non-interactive"
msgstr "Porte-clef GNOME verrouillé, et nous sommes non interactif"
-#: ../libsvn_client/add.c:509
+#: ../libsvn_client/add.c:546
#, c-format
msgid "'%s' prevents creating parent of '%s'"
msgstr "'%s' empêche de créer le parent de '%s'"
-#: ../libsvn_client/add.c:535 ../libsvn_wc/adm_ops.c:874
-#: ../libsvn_wc/workqueue.c:1638 ../libsvn_wc/workqueue.c:1720
+#: ../libsvn_client/add.c:581 ../libsvn_wc/adm_ops.c:1101
+#, c-format
+msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here"
+msgstr "'%s' est en conflit ; résoudre ce conflit avant d'ajouter un nouvel objet"
+
+#: ../libsvn_client/add.c:588 ../libsvn_wc/adm_ops.c:1056
+#: ../libsvn_wc/workqueue.c:960 ../libsvn_wc/workqueue.c:1053
#, c-format
msgid "'%s' not found"
msgstr "'%s' pas trouvé"
-#: ../libsvn_client/add.c:540 ../libsvn_wc/adm_ops.c:567
-#: ../libsvn_wc/adm_ops.c:879
+#: ../libsvn_client/add.c:594 ../libsvn_wc/adm_ops.c:588
+#: ../libsvn_wc/adm_ops.c:1061
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Type de nœud non supporté pour le chemin '%s'"
-#: ../libsvn_client/add.c:582 ../libsvn_client/cmdline.c:268
-#: ../libsvn_subr/opt.c:878
+#: ../libsvn_client/add.c:644 ../libsvn_client/cmdline.c:397
+#: ../libsvn_subr/opt.c:929
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "'%s' fini comme un mot réservé"
-#: ../libsvn_client/add.c:614 ../libsvn_client/changelist.c:118
-#: ../libsvn_client/changelist.c:169 ../libsvn_client/cleanup.c:56
-#: ../libsvn_client/cleanup.c:133 ../libsvn_client/commit.c:701
-#: ../libsvn_client/export.c:993 ../libsvn_client/patch.c:2747
-#: ../libsvn_client/relocate.c:222 ../libsvn_client/resolved.c:54
-#: ../libsvn_client/revert.c:134 ../libsvn_client/status.c:274
-#: ../libsvn_client/switch.c:332 ../libsvn_client/update.c:404
-#: ../svn/add-cmd.c:75 ../svn/changelist-cmd.c:80 ../svn/cleanup-cmd.c:68
-#: ../svn/export-cmd.c:93 ../svn/import-cmd.c:105 ../svn/patch-cmd.c:75
-#: ../svn/patch-cmd.c:87 ../svn/relocate-cmd.c:106 ../svn/resolve-cmd.c:105
-#: ../svn/resolved-cmd.c:75 ../svn/revert-cmd.c:76 ../svn/status-cmd.c:259
-#: ../svn/switch-cmd.c:150 ../svn/update-cmd.c:131 ../svn/upgrade-cmd.c:71
+#: ../libsvn_client/add.c:676 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:712
+#: ../libsvn_client/export.c:1049 ../libsvn_client/patch.c:2953
+#: ../libsvn_client/relocate.c:233 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:280
+#: ../libsvn_client/switch.c:391 ../libsvn_client/update.c:583
+#: ../svn/util.c:1396
#, c-format
msgid "'%s' is not a local path"
msgstr "'%s' n'est pas chemin local"
-#: ../libsvn_client/blame.c:397
+#: ../libsvn_client/add.c:815 ../libsvn_client/add.c:842
+#, c-format
+msgid "There is no valid uri above '%s'"
+msgstr "Il n'y a pas d'URI valide au dessus de '%s'"
+
+#: ../libsvn_client/blame.c:395
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Blame non calculable sur le fichier binaire '%s'"
-#: ../libsvn_client/blame.c:627
+#: ../libsvn_client/blame.c:624
msgid "Start revision must precede end revision"
msgstr "La révision de début doit précéder la révision de fin"
-#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1050
-#: ../libsvn_client/delete.c:65 ../libsvn_client/prop_commands.c:430
-#: ../libsvn_client/prop_commands.c:945 ../libsvn_client/prop_commands.c:1262
-#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2004
-#: ../libsvn_wc/adm_ops.c:2038 ../libsvn_wc/copy.c:487
-#: ../libsvn_wc/entries.c:1289 ../libsvn_wc/entries.c:2488
-#: ../libsvn_wc/entries.c:2519 ../libsvn_wc/node.c:1270
-#: ../libsvn_wc/update_editor.c:4061
+#: ../libsvn_client/cat.c:75 ../libsvn_client/commit_util.c:1098
+#: ../libsvn_client/delete.c:65 ../libsvn_client/prop_commands.c:808
+#: ../libsvn_client/prop_commands.c:1103 ../libsvn_client/revisions.c:104
+#: ../libsvn_wc/adm_ops.c:2504 ../libsvn_wc/adm_ops.c:2539
+#: ../libsvn_wc/copy.c:633 ../libsvn_wc/entries.c:1289
+#: ../libsvn_wc/entries.c:2563 ../libsvn_wc/entries.c:2594 ../svn/notify.c:975
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' n'est pas versionné"
-#: ../libsvn_client/cat.c:79
+#: ../libsvn_client/cat.c:80
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' référence un répertoire"
-#: ../libsvn_client/cat.c:89
+#: ../libsvn_client/cat.c:90
#, c-format
msgid "'%s' has no base revision until it is committed"
msgstr "'%s' n'a pas de révision de base jusqu'à sa propagation (commit)"
-#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:263
+#: ../libsvn_client/cat.c:154 ../libsvn_client/export.c:290
msgid "(local)"
msgstr "(local)"
-#: ../libsvn_client/cat.c:236
+#: ../libsvn_client/cat.c:243
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "L'URL '%s' référence un répertoire"
-#: ../libsvn_client/changelist.c:110
+#: ../libsvn_client/changelist.c:57
msgid "Target changelist name must not be empty"
msgstr "La liste de changements cible ne doit pas être vide"
-#: ../libsvn_client/checkout.c:161 ../libsvn_client/export.c:1164
+#: ../libsvn_client/checkout.c:160 ../libsvn_client/export.c:1239
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "L'URL '%s' n'existe pas"
-#: ../libsvn_client/checkout.c:165
+#: ../libsvn_client/checkout.c:164
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "L'URL '%s' désigne un fichier et non un répertoire"
-#: ../libsvn_client/checkout.c:201
+#: ../libsvn_client/checkout.c:200
#, c-format
-msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
-msgstr "'%s' est déjà une copie de travail pour une autre URL ; utiliser 'svn update' pour la mettre à jour"
+msgid "'%s' is already a working copy for a different URL"
+msgstr "'%s' est déjà une copie de travail pour une autre URL"
-#: ../libsvn_client/checkout.c:209
+#: ../libsvn_client/checkout.c:208
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' existe déjà et n'est pas un répertoire"
@@ -1423,214 +1451,252 @@ msgstr "URL relative invalide '%s'"
msgid "All non-relative targets must have the same root URL"
msgstr "Toutes les cibles non-négatives doivent avoir la même URL racine"
-#: ../libsvn_client/commit.c:433
+#: ../libsvn_client/cmdline.c:357
+msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
+msgstr "Résolution de '^/' : racine du dépôt non trouvée pour les arguments cible ou pour le répertoire courant"
+
+#: ../libsvn_client/commit.c:150
+#, c-format
+msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
+msgstr "La propriété %s sur '%s' contient un style de fin de ligne inconnu '%s' "
+
+#: ../libsvn_client/commit.c:441
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "Type non versionnable ou inconnu pour '%s'"
-#: ../libsvn_client/commit.c:538
+#: ../libsvn_client/commit.c:548
msgid "New entry name required when importing a file"
msgstr "Nouveau nom d'entrée requis lors de l'importation d'un fichier"
-#: ../libsvn_client/commit.c:573 ../libsvn_client/patch.c:2752
-#: ../libsvn_client/patch.c:2760 ../libsvn_wc/adm_ops.c:562
-#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
+#: ../libsvn_client/commit.c:583 ../libsvn_client/patch.c:2960
+#: ../libsvn_client/patch.c:2972 ../libsvn_wc/adm_ops.c:583
+#: ../libsvn_wc/lock.c:119 ../libsvn_wc/wc_db_wcroot.c:74
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:481
-#: ../libsvn_client/merge.c:9119 ../libsvn_client/merge.c:10376
-#: ../libsvn_client/merge.c:10651 ../svnlook/main.c:1412
+#: ../libsvn_client/commit.c:665 ../libsvn_client/copy.c:447
+#: ../libsvn_client/merge.c:9219 ../svnlook/main.c:1434
#, c-format
msgid "Path '%s' does not exist"
msgstr "Le chemin '%s' n'existe pas"
-#: ../libsvn_client/commit.c:793 ../libsvn_client/copy.c:492
-#: ../libsvn_client/copy.c:1022 ../libsvn_client/copy.c:1245
-#: ../libsvn_client/copy.c:1860
+#: ../libsvn_client/commit.c:801 ../libsvn_client/copy.c:498
+#: ../libsvn_client/copy.c:1008 ../libsvn_client/copy.c:1264
+#: ../libsvn_client/copy.c:1850
#, c-format
msgid "Path '%s' already exists"
msgstr "Le chemin '%s' existe déjà"
-#: ../libsvn_client/commit.c:808
+#: ../libsvn_client/commit.c:816
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' est un nom réservé et ne peut être importé"
-#: ../libsvn_client/commit.c:846 ../libsvn_client/copy.c:1402
+#: ../libsvn_client/commit.c:854 ../libsvn_client/copy.c:1425
msgid "Commit failed (details follow):"
msgstr "Échec de la propagation (commit), détails : "
-#: ../libsvn_client/commit.c:854
+#: ../libsvn_client/commit.c:862
msgid "Commit succeeded, but other errors follow:"
msgstr "Succès de la propagation (commit), mais erreurs : "
-#: ../libsvn_client/commit.c:861
+#: ../libsvn_client/commit.c:869
msgid "Error unlocking locked dirs (details follow):"
msgstr "Erreur en déverrouillant des répertoires verrouillés, détails :"
-#: ../libsvn_client/commit.c:872
+#: ../libsvn_client/commit.c:880
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Erreur en incrémentant les révisions après la propagation (post-commit), détails :"
-#: ../libsvn_client/commit.c:966
-msgid "Are all targets part of the same working copy?"
-msgstr "Les cibles font-elles parties de la même copie de travail ?"
-
-#: ../libsvn_client/commit.c:1005
-msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
-msgstr "Propagation non récursive de la suppression d'un répertoire avec des sous répertoires impossible"
+#: ../libsvn_client/commit.c:1006
+#, c-format
+msgid "Cannot delete the directory '%s' in a non-recursive commit because it has children"
+msgstr "Impossible d'effacer le répertoire '%s' avec une propagation (commit) non récursive, parce qu'il a des sous-répertoires"
-#: ../libsvn_client/commit.c:1055 ../svn/commit-cmd.c:72
+#: ../libsvn_client/commit.c:1320
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "Une URL '%s' ne peut être la cible d'une propagation (commit)"
-#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:133
+#: ../libsvn_client/commit.c:1432
+msgid ""
+"Commit can only commit to a single repository at a time.\n"
+"Are all targets part of the same working copy?"
+msgstr ""
+"Une propagation (commit) ne peut affecter qu'un seul dépôt à la fois.\n"
+"Les cibles sont-elles toutes dans la même copie de travail ?"
+
+#: ../libsvn_client/commit.c:1547
+#, c-format
+msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together"
+msgstr "Impossible de propager (commit) '%s' parce qu'il a été déplacé de '%s' qui ne fait pas partie de cette propagation ; Les deux parties du déplacement doivent être propagées (commit) ensembles"
+
+#: ../libsvn_client/commit.c:1577
+#, c-format
+msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together"
+msgstr "Impossible de propager (commit) '%s' parce qu'il a été déplacé en '%s' qui ne fait pas partie de cette propagation ; Les deux parties du déplacement doivent être propagées (commit) ensembles"
+
+#: ../libsvn_client/commit_util.c:93 ../libsvn_repos/commit.c:138
#, c-format
msgid "Directory '%s' is out of date"
msgstr "Répertoire '%s' obsolète"
-#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:135
+#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:140
#, c-format
msgid "File '%s' is out of date"
msgstr "Fichier '%s' obsolète"
-#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:491
-#: ../libsvn_client/commit_util.c:1044
+#: ../libsvn_client/commit_util.c:129
+#, c-format
+msgid "Directory '%s' is locked in another working copy"
+msgstr "'%s' est verrouillé dans une autre copie de travail"
+
+#: ../libsvn_client/commit_util.c:130
+#, c-format
+msgid "File '%s' is locked in another working copy"
+msgstr "Fichier '%s' est verrouillé dans une autre copie de travail"
+
+#: ../libsvn_client/commit_util.c:165
+#, c-format
+msgid "Changing directory '%s' is forbidden by the server"
+msgstr "Modifier le répertoire '%s' est interdit par le serveur"
+
+#: ../libsvn_client/commit_util.c:166
+#, c-format
+msgid "Changing file '%s' is forbidden by the server"
+msgstr "Modifier le fichier '%s' est interdit par le serveur"
+
+#: ../libsvn_client/commit_util.c:331 ../libsvn_client/commit_util.c:596
+#: ../libsvn_client/commit_util.c:1092
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Arrêt de la propagation : '%s' demeure en conflit"
-#: ../libsvn_client/commit_util.c:331
+#: ../libsvn_client/commit_util.c:375
#, c-format
msgid "Aborting commit: '%s' remains in tree-conflict"
msgstr "Arrêt de la propagation : '%s' demeure en conflit arborescent"
-#: ../libsvn_client/commit_util.c:426 ../libsvn_client/commit_util.c:442
+#: ../libsvn_client/commit_util.c:522
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Type d'entrée inconnu pour '%s'"
-#: ../libsvn_client/commit_util.c:470
+#: ../libsvn_client/commit_util.c:549
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "L'entrée '%s' a changé de statut spécial de façon inattendue"
-#: ../libsvn_client/commit_util.c:666
+#: ../libsvn_client/commit_util.c:714
#, c-format
msgid "'%s' is scheduled for addition, but is missing"
msgstr "'%s' doit être ajouté, mais n'existe pas"
-#: ../libsvn_client/commit_util.c:947
-#, 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' n'est pas sous gestionnaire de version et ne fait pas partie de la propagation (commit), alors que son enfant '%s' en fait partie"
-
-#: ../libsvn_client/commit_util.c:1064 ../libsvn_client/url.c:198
-#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "L'entrée pour '%s' n'a pas d'URL associée"
-
-#: ../libsvn_client/commit_util.c:1081
+#: ../libsvn_client/commit_util.c:1119
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s' doit être ajouté dans un répertoire non versionné"
-#: ../libsvn_client/commit_util.c:1222
+#: ../libsvn_client/commit_util.c:1190
+#, 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' n'est pas sous gestionnaire de version et ne fait pas partie de la propagation (commit), alors que son enfant '%s' en fait partie"
+
+#: ../libsvn_client/commit_util.c:1332
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "'%s' et '%s' réfèrent à la même URL et ne peuvent être propagés (commit) ensemble"
-#: ../libsvn_client/commit_util.c:1379
+#: ../libsvn_client/commit_util.c:1484
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "L'élément de propagation '%s' marqué pour copie sans URL d'origine (copyfrom)"
-#: ../libsvn_client/commit_util.c:1384
+#: ../libsvn_client/commit_util.c:1489
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "L'élément de propagation '%s' marqué pour copie avec une révision invalide"
-#: ../libsvn_client/commit_util.c:2092
+#: ../libsvn_client/commit_util.c:2252
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Les propriétés standards ne peuvent être définies explicitement comme des propriétés de révision"
-#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:1876
+#: ../libsvn_client/copy.c:517 ../libsvn_client/copy.c:1866
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Le chemin '%s' n'est pas un répertoire"
-#: ../libsvn_client/copy.c:679 ../libsvn_client/copy.c:720
+#: ../libsvn_client/copy.c:686 ../libsvn_client/copy.c:727
#, c-format
msgid "Path '%s' already exists, but is not a directory"
msgstr "Le chemin '%s' existe déjà, mais n'est pas un répertoire"
-#: ../libsvn_client/copy.c:785
-msgid "Source and destination URLs appear not to all point to the same repository."
+#: ../libsvn_client/copy.c:790
+msgid "Source and destination URLs appear not to point to the same repository."
msgstr "Les URL source et destination ne semblent pas être dans le même dépôt."
-#: ../libsvn_client/copy.c:1010 ../libsvn_client/prop_commands.c:230
+#: ../libsvn_client/copy.c:998 ../libsvn_client/prop_commands.c:186
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Le chemin '%s' n'existe pas à la révision %ld"
-#: ../libsvn_client/copy.c:1536
+#: ../libsvn_client/copy.c:1563
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr "L'URL source '%s' est dans un dépôt distant ; laissée comme une copie disjointe"
-#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
-#: ../libsvn_wc/adm_ops.c:934 ../libsvn_wc/copy.c:582
+#: ../libsvn_client/copy.c:1666 ../libsvn_client/copy.c:1679
+#: ../libsvn_wc/adm_ops.c:1129 ../libsvn_wc/copy.c:749
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' est déjà sous gestionnaire de version"
-#: ../libsvn_client/copy.c:1671
+#: ../libsvn_client/copy.c:1700
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "L'entrée pour '%s' existe (mais la copie locale manque)"
-#: ../libsvn_client/copy.c:1844
+#: ../libsvn_client/copy.c:1834
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Chemin '%s' non trouvé à la révision %ld"
-#: ../libsvn_client/copy.c:1849
+#: ../libsvn_client/copy.c:1839
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Chemin '%s' non trouvé à la révision de tête"
-#: ../libsvn_client/copy.c:1971
+#: ../libsvn_client/copy.c:1956
msgid "Cannot mix repository and working copy sources"
msgstr "Impossible de mélanger des sources du dépôt et de la copie de travail"
-#: ../libsvn_client/copy.c:2023
+#: ../libsvn_client/copy.c:2008
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Le chemin '%s' ne peut être copié dans son propre enfant '%s'"
-#: ../libsvn_client/copy.c:2055
+#: ../libsvn_client/copy.c:2044
#, c-format
-msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
-msgstr "Impossible de déplacer le fichier externe '%s' ; Éditer la propriété svn:externals qui l'a créé."
+msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'."
+msgstr "Impossible de déplacer le fichier externe '%s' ; Éditer la propriété svn:externals sur '%s'."
-#: ../libsvn_client/copy.c:2070
+#: ../libsvn_client/copy.c:2059
msgid "Moves between the working copy and the repository are not supported"
msgstr "Les déplacements (move) entre copie de travail et dépôt ne sont pas supportés"
-#: ../libsvn_client/copy.c:2085
+#: ../libsvn_client/copy.c:2074
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "L'URL '%s' ne peut être déplacée (move) dans elle-même"
-#: ../libsvn_client/copy.c:2086
+#: ../libsvn_client/copy.c:2075
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Le chemin '%s' ne peut être déplacé dans lui-même"
-#: ../libsvn_client/copy.c:2157
+#: ../libsvn_client/copy.c:2142
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "'%s' n'a pas d'URL associée"
@@ -1645,306 +1711,274 @@ msgstr "'%s' obstrue le chemin de la res
msgid "'%s' has local modifications -- commit or revert them first"
msgstr "'%s' a des modifications locales -- les confirmer (commit) ou les annuler (revert) d'abord"
-#: ../libsvn_client/delete.c:105
-#, c-format
-msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
-msgstr "Impossible d'effacer la référence externe '%s' ; Éditer ou effacer la propriété svn:externals qui l'a créé"
-
-#: ../libsvn_client/delete.c:230
+#: ../libsvn_client/delete.c:109
#, c-format
-msgid "URL '%s' does not exist"
-msgstr "L'URL '%s' n'existe pas"
+msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'"
+msgstr "Impossible d'effacer la référence externe '%s' ; Éditer ou effacer la propriété svn:externals sur '%s'"
-#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
+#: ../libsvn_client/deprecated.c:787 ../svn/move-cmd.c:65
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "L'opération 'move' n'accepte d'autre révision que HEAD"
-#: ../libsvn_client/deprecated.c:1331
+#: ../libsvn_client/deprecated.c:1473
msgid "No commits in repository"
msgstr "Pas de propagation dans le dépôt"
-#: ../libsvn_client/deprecated.c:2110 ../libsvn_wc/deprecated.c:3370
+#: ../libsvn_client/deprecated.c:2591 ../libsvn_wc/deprecated.c:3696
msgid "Non-recursive relocation not supported"
msgstr "Relocalisation non récursive pas permise"
-#: ../libsvn_client/diff.c:136
+#: ../libsvn_client/diff.c:114
#, c-format
msgid " Reverse-merged %s:r%s%s"
msgstr " Fusion-arrière %s:r%s%s"
-#: ../libsvn_client/diff.c:151
+#: ../libsvn_client/diff.c:131
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Fusionné %s:r%s%s"
-#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1227
-#: ../libsvn_diff/diff_file.c:1243
+#: ../libsvn_client/diff.c:142 ../libsvn_diff/diff_file.c:1793
+#: ../libsvn_diff/diff_file.c:1809
#, c-format
msgid "Path '%s' must be an immediate child of the directory '%s'"
msgstr "Le chemin '%s' doit être un descendant direct du répertoire '%s'"
-#: ../libsvn_client/diff.c:359
+#: ../libsvn_client/diff.c:349
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(révision %ld)"
-#: ../libsvn_client/diff.c:361
+#: ../libsvn_client/diff.c:351
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copie de travail)"
-#: ../libsvn_client/diff.c:623
+#: ../libsvn_client/diff.c:609
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sModification de propriétés sur %s%s"
-#: ../libsvn_client/diff.c:907
+#: ../libsvn_client/diff.c:942
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Impossible d'afficher : fichier considéré comme binaire.%s"
-#: ../libsvn_client/diff.c:1321
+#: ../libsvn_client/diff.c:1389
#, c-format
msgid "Path '%s' has no URL"
msgstr "Le chemin '%s' n'a pas d'URL associée"
-#: ../libsvn_client/diff.c:1390 ../libsvn_client/merge.c:6448
-#: ../libsvn_client/merge.c:9128
+#: ../libsvn_client/diff.c:1416 ../libsvn_client/merge.c:6517
+#: ../libsvn_client/merge.c:9546
msgid "Not all required revisions are specified"
msgstr "Toutes les révisions requises ne sont pas précisées"
-#: ../libsvn_client/diff.c:1405
+#: ../libsvn_client/diff.c:1431
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Au moins une révision ne doit pas être locale pour un diff avec révision fixée"
-#: ../libsvn_client/diff.c:1513 ../libsvn_client/diff.c:1525
+#: ../libsvn_client/diff.c:1474
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revision '%ld'"
+msgstr "La cible de comparaison '%s' n'existe pas dans le dépôt à la révision '%ld'"
+
+#: ../libsvn_client/diff.c:1479
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
+msgstr "La cible de comparaison '%s' n'existe pas dans le dépôt à la révision '%ld' ou '%ld'"
+
+#: ../libsvn_client/diff.c:1605
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
+msgstr "La cible de comparaison '%s' n'existe pas dans le dépôt aux révisions '%ld' et '%ld'"
+
+#: ../libsvn_client/diff.c:1610
#, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "'%s' n'existe pas dans le dépôt à la révision %ld"
+msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'"
+msgstr "Les cibles de comparaison '%s' et '%s' n'existent pas dans le dépôt aux révisions '%ld' et '%ld'"
-#: ../libsvn_client/diff.c:1581
-msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
-msgstr "Désolé, appel de svn_client_diff5 de manière non encore supportée"
+#: ../libsvn_client/diff.c:1723
+msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
+msgstr "Désolé, appel de svn_client_diff6 de manière non encore supportée"
-#: ../libsvn_client/diff.c:1623
+#: ../libsvn_client/diff.c:1766 ../libsvn_client/diff.c:2163
msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "Seules les différences entre des copies de référence et leurs fichiers de travail sont supportées pour l'instant"
-#: ../libsvn_client/diff.c:1809 ../libsvn_client/switch.c:132
+#: ../libsvn_client/diff.c:1963 ../libsvn_client/switch.c:147
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Le répertoire '%s' n'a pas d'URL associée"
-#: ../libsvn_client/diff.c:2059
-msgid "Summarizing diff can only compare repository to repository"
-msgstr "Le diff résumé compare seulement un dépôt à un autre"
+#: ../libsvn_client/diff.c:2298
+msgid "Summarizing diff cannot compare repository to WC"
+msgstr "Le diff résumé ne peut comparer un dépôt à une copie de travail"
-#: ../libsvn_client/export.c:92
+#: ../libsvn_client/export.c:95
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' n'est pas une valeur de fin de ligne (EOL) valide"
-#: ../libsvn_client/export.c:406
+#: ../libsvn_client/export.c:453
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "Le répertoire de destination existe, et ne sera pas écrasé sans forcer"
-#: ../libsvn_client/export.c:571 ../libsvn_client/export.c:718
+#: ../libsvn_client/export.c:588 ../libsvn_client/export.c:1110
+#, c-format
+msgid "Destination file '%s' exists, and will not be overwritten unless forced"
+msgstr "Le fichier destination '%s' existe, et ne sera pas écrasé sans forcer"
+
+#: ../libsvn_client/export.c:593 ../libsvn_client/export.c:1115
+#, c-format
+msgid "Destination '%s' exists. Cannot overwrite directory with non-directory"
+msgstr "La destination '%s' existe. Impossible d'écraser un répertoire avec autre chose"
+
+#: ../libsvn_client/export.c:631 ../libsvn_client/export.c:778
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' existe et n'est pas un répertoire"
-#: ../libsvn_client/export.c:575 ../libsvn_client/export.c:722
+#: ../libsvn_client/export.c:635 ../libsvn_client/export.c:782
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: ../libsvn_client/export.c:906 ../libsvn_wc/update_editor.c:4050
+#: ../libsvn_client/export.c:968 ../libsvn_client/repos_diff.c:1003
+#: ../libsvn_fs_fs/dag.c:1040 ../libsvn_ra_neon/fetch.c:767
+#: ../libsvn_ra_svn/client.c:1081 ../libsvn_wc/diff_editor.c:1605
+#: ../libsvn_wc/externals.c:588 ../libsvn_wc/update_editor.c:4153
#, c-format
-msgid ""
-"Checksum mismatch for '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"Somme de contrôle pour '%s' :\n"
-" attendu : %s\n"
-" obtenu : %s\n"
+msgid "Checksum mismatch for '%s'"
+msgstr "Sommes de contrôle différentes pour '%s'"
-#: ../libsvn_client/externals.c:364
+#: ../libsvn_client/externals.c:378
#, c-format
-msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
-msgstr "Impossible d'insérer un fichier externe à partir de '%s' dans une copie de travail référençant un dépôt de racine '%s'"
+msgid "Cannot insert a file external defined on '%s' into the working copy '%s'."
+msgstr "Impossible d'insérer un fichier externe définit sur '%s' dans la copie de travail '%s'"
-#: ../libsvn_client/externals.c:401
+#: ../libsvn_client/externals.c:411
#, c-format
msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
msgstr "Le fichier externe '%s' ne peut écraser l'élément versionné '%s'"
-#: ../libsvn_client/externals.c:427
+#: ../libsvn_client/externals.c:428
#, c-format
-msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
-msgstr "Le fichier externe '%s' ne peut être écrit dans '%s' alors que '%s' est en conflit"
+msgid "The file external '%s' can not be created because the node exists."
+msgstr "Le fichier externe '%s' ne peut pas être créé car le nœud existe."
-#: ../libsvn_client/externals.c:536
-#, c-format
-msgid "URL '%s' does not begin with a scheme"
-msgstr "L'URL '%s' ne commence pas par un schéma"
-
-#: ../libsvn_client/externals.c:608
-#, c-format
-msgid "Illegal parent directory URL '%s'"
-msgstr "URL de répertoire parent invalide '%s'"
-
-#: ../libsvn_client/externals.c:645
-#, c-format
-msgid "Illegal repository root URL '%s'"
-msgstr "URL de racine de dépôt invalide '%s'"
-
-#: ../libsvn_client/externals.c:688
-#, c-format
-msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
-msgstr "L'URL relative externe '%s' ne peut avoir de remontée '..'"
-
-#: ../libsvn_client/externals.c:714
-#, c-format
-msgid "Unrecognized format for the relative external URL '%s'"
-msgstr "Format d'URL relative externe non reconnu '%s'"
-
-#: ../libsvn_client/externals.c:806
+#: ../libsvn_client/externals.c:647
#, c-format
msgid "URL '%s' at revision %ld doesn't exist"
msgstr "L'URL '%s' n'existe pas à la révision %ld"
-#: ../libsvn_client/externals.c:812
+#: ../libsvn_client/externals.c:653
#, c-format
msgid "URL '%s' at revision %ld is not a file or a directory"
msgstr "L'URL '%s' à la révision %ld n'est ni un fichier ni un répertoire"
-#: ../libsvn_client/externals.c:1111
-#, c-format
-msgid "Traversal of '%s' found no ambient depth"
-msgstr "Traversée de '%s' sans profondeur dans le contexte"
-
-#: ../libsvn_client/externals.c:1262
+#: ../libsvn_client/externals.c:698
#, c-format
-msgid "'%s' is not a URL"
-msgstr "'%s' n'est pas une URL"
+msgid "Unsupported external: url of file external '%s' is not in repository '%s'"
+msgstr "Référence externe non supportée : l'URL du fichier externe '%s' n'est pas dans le dépôt '%s'."
-#: ../libsvn_client/info.c:104 ../libsvn_wc/crop.c:353
-#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5208
-#: ../libsvn_wc/wc_db.c:528 ../libsvn_wc/wc_db.c:1928
-#: ../libsvn_wc/wc_db.c:2026 ../libsvn_wc/wc_db.c:2085
-#: ../libsvn_wc/wc_db.c:2109 ../libsvn_wc/wc_db.c:4639
-#: ../libsvn_wc/wc_db.c:5080 ../libsvn_wc/wc_db.c:5998
-#: ../libsvn_wc/wc_db.c:6062 ../libsvn_wc/wc_db.c:6293
-#: ../libsvn_wc/wc_db.c:7297 ../libsvn_wc/wc_db.c:7476
-#: ../libsvn_wc/wc_db.c:7849
+#: ../libsvn_client/externals.c:877
#, c-format
-msgid "The node '%s' was not found."
-msgstr "Nœud '%s' non trouvé."
-
-#: ../libsvn_client/info.c:564
-#, c-format
-msgid "Server does not support retrieving information about the repository root"
-msgstr "Le serveur ne supporte pas la récupération d'information sur la racine du dépôt"
+msgid "Traversal of '%s' found no ambient depth"
+msgstr "Traversée de '%s' sans profondeur dans le contexte"
-#: ../libsvn_client/info.c:571 ../libsvn_client/info.c:586
-#: ../libsvn_client/info.c:596
+#: ../libsvn_client/info.c:299 ../libsvn_client/info.c:315
+#: ../libsvn_client/info.c:409 ../libsvn_client/list.c:264
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "L'URL '%s' n'existe pas à la révision %ld"
-#: ../libsvn_client/list.c:245
+#: ../libsvn_client/info.c:399
#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "L'URL '%s' n'existe pas à cette révision"
+msgid "Server does not support retrieving information about the repository root"
+msgstr "Le serveur ne supporte pas la récupération d'information sur la racine du dépôt"
-#: ../libsvn_client/locking_commands.c:258
-#: ../libsvn_client/locking_commands.c:284
+#: ../libsvn_client/locking_commands.c:260
+#: ../libsvn_client/locking_commands.c:286
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "Aucun parent commun trouvé, impossible de travailler avec des arguments disjoints"
-#: ../libsvn_client/locking_commands.c:303 ../libsvn_client/merge.c:9151
-#: ../libsvn_client/merge.c:9158 ../libsvn_client/merge.c:10385
-#: ../libsvn_client/merge.c:10660 ../libsvn_client/ra.c:485
-#: ../libsvn_client/ra.c:679 ../libsvn_client/update.c:111
+#: ../libsvn_client/locking_commands.c:305 ../libsvn_client/merge.c:10461
+#: ../libsvn_client/ra.c:470 ../libsvn_client/ra.c:753
+#: ../libsvn_client/update.c:229
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' n'a pas d'URL associée"
-#: ../libsvn_client/locking_commands.c:317
+#: ../libsvn_client/locking_commands.c:319
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Impossible de verrouiller/déverrouiller sur plusieurs dépôts"
-#: ../libsvn_client/locking_commands.c:365
+#: ../libsvn_client/locking_commands.c:367
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' n'est pas verrouillé dans cette copie de travail"
-#: ../libsvn_client/locking_commands.c:408
+#: ../libsvn_client/locking_commands.c:410
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: ../libsvn_client/locking_commands.c:442 ../libsvn_fs/fs-loader.c:1308
-#: ../libsvn_ra/ra_loader.c:1069
+#: ../libsvn_client/locking_commands.c:444 ../libsvn_fs/fs-loader.c:1240
+#: ../libsvn_ra/ra_loader.c:1074
msgid "Lock comment contains illegal characters"
msgstr "Le commentaire du verrou (lock) contient des caractères incorrects"
-#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
+#: ../libsvn_client/log.c:297 ../libsvn_client/log.c:354
msgid "Missing required revision specification"
msgstr "Précision de la révision obligatoire"
-#: ../libsvn_client/log.c:401
+#: ../libsvn_client/log.c:403
#, c-format
msgid "'%s' is not a relative path"
msgstr "'%s' n'est pas un chemin relatif"
-#: ../libsvn_client/log.c:423
+#: ../libsvn_client/log.c:425
msgid "When specifying working copy paths, only one target may be given"
msgstr "Une seule cible à préciser pour un chemin dans une copie de travail"
-#: ../libsvn_client/log.c:449 ../libsvn_client/status.c:386
+#: ../libsvn_client/log.c:451 ../libsvn_client/status.c:365
#, c-format
msgid "Entry '%s' has no URL"
msgstr "L'entrée '%s' n'a pas d'URL associée"
-#: ../libsvn_client/merge.c:180
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URLs sans schéma ('%s' et '%s')"
-
-#: ../libsvn_client/merge.c:186 ../libsvn_client/merge.c:192
+#: ../libsvn_client/merge.c:318
#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL sans schéma : '%s'"
+msgid "Url '%s' of '%s' is not in repository '%s'"
+msgstr "l'URL '%s' de '%s' n'est pas dans le dépôt '%s'"
-#: ../libsvn_client/merge.c:199
+#: ../libsvn_client/merge.c:355
#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "Schémas d'accession mixtes non encore supportés ('%s' et '%s')"
+msgid "'%s' must be from the same repository as '%s'"
+msgstr "'%s' doit être dans le même dépôt que '%s'"
#. 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:1494
+#: ../libsvn_client/merge.c:1624
msgid ".working"
msgstr ".courant"
-#: ../libsvn_client/merge.c:1496
+#: ../libsvn_client/merge.c:1626
#, c-format
msgid ".merge-left.r%ld"
msgstr ".fusion-gauche.r%ld"
-#: ../libsvn_client/merge.c:1499
+#: ../libsvn_client/merge.c:1629
#, c-format
msgid ".merge-right.r%ld"
msgstr ".fusion-droit.r%ld"
-#: ../libsvn_client/merge.c:4108
+#: ../libsvn_client/merge.c:4099
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "Impossible de fusionner un intervalle inversé à partir du futur du chemin considéré ; essayer une mise à jour d'abord"
-#: ../libsvn_client/merge.c:4812
+#: ../libsvn_client/merge.c:4730
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1957,66 +1991,74 @@ msgstr ""
"résoudre tous les conflits et ré-exécuter la fusion (merge) pour \n"
"appliquer les révisions non-fusionnées restantes"
-#: ../libsvn_client/merge.c:5964
+#: ../libsvn_client/merge.c:5586
+#, c-format
+msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
+msgstr "Information de fusion (mergeinfo) invalide sur '%s', suivi des fusions impossible"
+
+#: ../libsvn_client/merge.c:5730
msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "Le suivi des fusions n'est pas permis si des sous-arbres manquent ; Essayer de les restaurer d'abord :\n"
-#: ../libsvn_client/merge.c:8646
+#: ../libsvn_client/merge.c:6677
+#, c-format
+msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
+msgstr "Information de fusion (mergeinfo) invalide sur la cible '%s', suivi des fusions impossible"
+
+#: ../libsvn_client/merge.c:8888
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "L'utilisation de deux URLs n'est pas compatible avec la modification des informations de fusion 'mergeinfo'"
-#: ../libsvn_client/merge.c:8653 ../libsvn_client/merge.c:8937
+#: ../libsvn_client/merge.c:8895 ../libsvn_client/merge.c:9147
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "La fusion à partir d'un autre dépôt n'est pas compatible avec la modification des informations de fusion 'mergeinfo'"
-#: ../libsvn_client/merge.c:8666 ../libsvn_client/merge.c:9166
-#: ../libsvn_client/merge.c:10668
+#: ../libsvn_client/merge.c:8909 ../libsvn_client/merge.c:9226
#, c-format
msgid "Merge target '%s' does not exist in the working copy"
msgstr "Le chemin cible '%s' n'existe pas dans la copie de travail"
-#: ../libsvn_client/merge.c:9040
-msgid "Cannot merge into a working copy with a switched subtree"
-msgstr "Impossible de fusionner dans une copie de travail avec un sous-arbre ré-aiguillé (switch)"
-
-#: ../libsvn_client/merge.c:9045
-msgid "Cannot merge into a working copy that has local modifications"
-msgstr "Impossible de fusionner dans une copie de travail avec des modifications locales"
-
-#: ../libsvn_client/merge.c:9062
+#: ../libsvn_client/merge.c:9249
msgid "Cannot determine revision of working copy"
msgstr "Impossible de déterminer la révision de la copie de travail"
[... 11587 lines stripped ...]