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 2010/09/28 19:35:26 UTC
svn commit: r1002283 [7/10] - in /subversion/branches/javahl-ra: ./ build/
notes/ notes/http-and-webdav/ notes/wc-ng/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/tig...
Modified: subversion/branches/javahl-ra/subversion/po/fr.po
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/po/fr.po?rev=1002283&r1=1002282&r2=1002283&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/po/fr.po [UTF-8] (original)
+++ subversion/branches/javahl-ra/subversion/po/fr.po [UTF-8] Tue Sep 28 17:35:22 2010
@@ -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: 2010-08-12 07:38+0200\n"
-"PO-Revision-Date: 2010-08-12 08:28+0200\n"
+"POT-Creation-Date: 2010-09-25 23:37+0200\n"
+"PO-Revision-Date: 2010-09-26 00:02+0200\n"
"Last-Translator: Subversion Developers <de...@subversion.tigris.org>\n"
"Language-Team: French <de...@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -260,7 +260,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:876
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
msgid "Invalid configuration value"
msgstr "Valeur de configuration invalide"
@@ -539,746 +539,754 @@ msgstr "La copie de travail doit être r
msgid "Previous operation was interrupted; run 'svn cleanup'"
msgstr "Opération précédente interrompue : lancer 'svn cleanup'"
-#: ../include/svn_error_codes.h:519
+#: ../include/svn_error_codes.h:518
+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:524
msgid "General filesystem error"
msgstr "Erreur générale du système de fichiers"
-#: ../include/svn_error_codes.h:523
+#: ../include/svn_error_codes.h:528
msgid "Error closing filesystem"
msgstr "Erreur à la fermeture du système de fichiers"
-#: ../include/svn_error_codes.h:527
+#: ../include/svn_error_codes.h:532
msgid "Filesystem is already open"
msgstr "Système de fichiers déjà ouvert"
-#: ../include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:536
msgid "Filesystem is not open"
msgstr "Système de fichiers non ouvert"
-#: ../include/svn_error_codes.h:535
+#: ../include/svn_error_codes.h:540
msgid "Filesystem is corrupt"
msgstr "Système de fichiers corrompu"
-#: ../include/svn_error_codes.h:539
+#: ../include/svn_error_codes.h:544
msgid "Invalid filesystem path syntax"
msgstr "Syntaxe du chemin dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:543
+#: ../include/svn_error_codes.h:548
msgid "Invalid filesystem revision number"
msgstr "Numéro de révision dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:547
+#: ../include/svn_error_codes.h:552
msgid "Invalid filesystem transaction name"
msgstr "Nom de transaction dans le système de fichiers invalide"
-#: ../include/svn_error_codes.h:551
+#: ../include/svn_error_codes.h:556
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:555
+#: ../include/svn_error_codes.h:560
msgid "Filesystem has no such representation"
msgstr "Le système de fichiers ne contient pas cette représentation"
-#: ../include/svn_error_codes.h:559
+#: ../include/svn_error_codes.h:564
msgid "Filesystem has no such string"
msgstr "Le système de fichiers n'a pas cette chaîne (string)"
-#: ../include/svn_error_codes.h:563
+#: ../include/svn_error_codes.h:568
msgid "Filesystem has no such copy"
msgstr "Le système de fichiers n'a pas cette copie"
-#: ../include/svn_error_codes.h:567
+#: ../include/svn_error_codes.h:572
msgid "The specified transaction is not mutable"
msgstr "La transaction spécifiée n'est pas modifiable"
-#: ../include/svn_error_codes.h:571
+#: ../include/svn_error_codes.h:576
msgid "Filesystem has no item"
msgstr "Le système de fichiers ne contient pas cet élément"
-#: ../include/svn_error_codes.h:575
+#: ../include/svn_error_codes.h:580
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:579
+#: ../include/svn_error_codes.h:584
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:583
+#: ../include/svn_error_codes.h:588
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:587
+#: ../include/svn_error_codes.h:592
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:591
+#: ../include/svn_error_codes.h:596
msgid "Name is not a single path component"
msgstr "Le nom n'est pas un composant simple de chemin"
-#: ../include/svn_error_codes.h:595
+#: ../include/svn_error_codes.h:600
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:599
+#: ../include/svn_error_codes.h:604
msgid "Item already exists in filesystem"
msgstr "L'élément exite déjà dans le système de fichiers"
-#: ../include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:608
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:607
+#: ../include/svn_error_codes.h:612
msgid "Object is not a transaction root"
msgstr "L'objet n'est pas une racine de transaction"
-#: ../include/svn_error_codes.h:611
+#: ../include/svn_error_codes.h:616
msgid "Object is not a revision root"
msgstr "L'objet n'est pas une racine de révision"
-#: ../include/svn_error_codes.h:615
+#: ../include/svn_error_codes.h:620
msgid "Merge conflict during commit"
msgstr "Fusion conflictuelle lors d'une propagation (commit)"
-#: ../include/svn_error_codes.h:619
+#: ../include/svn_error_codes.h:624
msgid "A representation vanished or changed between reads"
msgstr "Une représentation a disparu ou changé entre deux lectures"
-#: ../include/svn_error_codes.h:623
+#: ../include/svn_error_codes.h:628
msgid "Tried to change an immutable representation"
msgstr "Tentative de changement d'une représentation non-modifiable"
-#: ../include/svn_error_codes.h:627
+#: ../include/svn_error_codes.h:632
msgid "Malformed skeleton data"
msgstr "Données de squelette mal formées"
-#: ../include/svn_error_codes.h:631
+#: ../include/svn_error_codes.h:636
msgid "Transaction is out of date"
msgstr "La transaction est obsolète"
-#: ../include/svn_error_codes.h:635
+#: ../include/svn_error_codes.h:640
msgid "Berkeley DB error"
msgstr "Erreur de la base Berkeley"
-#: ../include/svn_error_codes.h:639
+#: ../include/svn_error_codes.h:644
msgid "Berkeley DB deadlock error"
msgstr "Erreur (étreinte fatale - deadlock) dans la base Berkeley"
-#: ../include/svn_error_codes.h:643
+#: ../include/svn_error_codes.h:648
msgid "Transaction is dead"
msgstr "Transaction morte"
-#: ../include/svn_error_codes.h:647
+#: ../include/svn_error_codes.h:652
msgid "Transaction is not dead"
msgstr "La transaction n'est pas morte"
-#: ../include/svn_error_codes.h:652
+#: ../include/svn_error_codes.h:657
msgid "Unknown FS type"
msgstr "Type de stockage de dépôt (FS) inconnu"
-#: ../include/svn_error_codes.h:657
+#: ../include/svn_error_codes.h:662
msgid "No user associated with filesystem"
msgstr "Aucun utilisateur associé au système de fichiers"
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
msgid "Path is already locked"
msgstr "Chemin déjà verrouillé"
-#: ../include/svn_error_codes.h:667 ../include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
msgid "Path is not locked"
msgstr "Le chemin n'est pas verrouillé"
-#: ../include/svn_error_codes.h:672
+#: ../include/svn_error_codes.h:677
msgid "Lock token is incorrect"
msgstr "Nom de verrou incorrect"
-#: ../include/svn_error_codes.h:677
+#: ../include/svn_error_codes.h:682
msgid "No lock token provided"
msgstr "Aucun nom de verrou fourni"
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:687
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:687
+#: ../include/svn_error_codes.h:692
msgid "Filesystem has no such lock"
msgstr "Le système de fichiers n'a pas ce verrou"
-#: ../include/svn_error_codes.h:692
+#: ../include/svn_error_codes.h:697
msgid "Lock has expired"
msgstr "Verrou expiré"
-#: ../include/svn_error_codes.h:697 ../include/svn_error_codes.h:810
+#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
msgid "Item is out of date"
msgstr "Élément obsolète"
-#: ../include/svn_error_codes.h:709
+#: ../include/svn_error_codes.h:714
msgid "Unsupported FS format"
msgstr "Format de stockage de dépôt (FS) non supporté"
-#: ../include/svn_error_codes.h:714
+#: ../include/svn_error_codes.h:719
msgid "Representation is being written"
msgstr "La représentation est en cours d'écriture"
-#: ../include/svn_error_codes.h:719
+#: ../include/svn_error_codes.h:724
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:724
+#: ../include/svn_error_codes.h:729
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:729
+#: ../include/svn_error_codes.h:734
msgid "Filesystem upgrade is not supported"
msgstr "Mise à jour (upgrade) du système de fichiers non supportée"
-#: ../include/svn_error_codes.h:734
+#: ../include/svn_error_codes.h:739
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:740
+#: ../include/svn_error_codes.h:744
+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:751
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:744
+#: ../include/svn_error_codes.h:755
msgid "A repository hook failed"
msgstr "Échec d'une procédure automatique du dépôt"
-#: ../include/svn_error_codes.h:748
+#: ../include/svn_error_codes.h:759
msgid "Incorrect arguments supplied"
msgstr "Arguments fournis incorrects"
-#: ../include/svn_error_codes.h:752
+#: ../include/svn_error_codes.h:763
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:756
+#: ../include/svn_error_codes.h:767
msgid "Bogus revision report"
msgstr "Rapport de révision invalide"
-#: ../include/svn_error_codes.h:765
+#: ../include/svn_error_codes.h:776
msgid "Unsupported repository version"
msgstr "Version de dépot non supportée"
-#: ../include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:780
msgid "Disabled repository feature"
msgstr "Fonction du dépôt désactivée"
-#: ../include/svn_error_codes.h:773
+#: ../include/svn_error_codes.h:784
msgid "Error running post-commit hook"
msgstr "Erreur de la procédure d'après propagation (post-commit hook)"
-#: ../include/svn_error_codes.h:778
+#: ../include/svn_error_codes.h:789
msgid "Error running post-lock hook"
msgstr "Erreur de la procédure d'après verrouillage (post-lock hook)"
-#: ../include/svn_error_codes.h:783
+#: ../include/svn_error_codes.h:794
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:788
+#: ../include/svn_error_codes.h:799
msgid "Repository upgrade is not supported"
msgstr "Mise à jour du dépôt (upgrade) non supportée"
-#: ../include/svn_error_codes.h:794
+#: ../include/svn_error_codes.h:805
msgid "Bad URL passed to RA layer"
msgstr "Mauvaise URL fournie à la couche RA"
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:809
msgid "Authorization failed"
msgstr "Autorisation refusée"
-#: ../include/svn_error_codes.h:802
+#: ../include/svn_error_codes.h:813
msgid "Unknown authorization method"
msgstr "Méthode d'autorisation inconnue"
-#: ../include/svn_error_codes.h:806
+#: ../include/svn_error_codes.h:817
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:814
+#: ../include/svn_error_codes.h:825
msgid "Repository has no UUID"
msgstr "Le dépôt n'a pas d'identifiant unique (UUID)"
-#: ../include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:829
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:828
+#: ../include/svn_error_codes.h:839
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:833
+#: ../include/svn_error_codes.h:844
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:838
+#: ../include/svn_error_codes.h:849
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:843
+#: ../include/svn_error_codes.h:854
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:849
+#: ../include/svn_error_codes.h:860
msgid "RA layer failed to init socket layer"
msgstr "La couche RA n'a pu initialiser la couche socket"
-#: ../include/svn_error_codes.h:853
+#: ../include/svn_error_codes.h:864
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:857
+#: ../include/svn_error_codes.h:868
msgid "RA layer request failed"
msgstr "La requête de la couche RA a échoué"
-#: ../include/svn_error_codes.h:861
+#: ../include/svn_error_codes.h:872
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:865
+#: ../include/svn_error_codes.h:876
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:869
+#: ../include/svn_error_codes.h:880
msgid "RA layer file already exists"
msgstr "Le fichier existe (couche RA)"
-#: ../include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:894
msgid "HTTP Path Not Found"
msgstr "Chemin HTTP non trouvé"
-#: ../include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:898
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Échec lors de l'exécution de WebDAV PROPPATCH"
-#: ../include/svn_error_codes.h:892 ../include/svn_error_codes.h:943
-#: ../libsvn_ra_svn/marshal.c:656 ../libsvn_ra_svn/marshal.c:774
-#: ../libsvn_ra_svn/marshal.c:801
+#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
+#: ../libsvn_ra_svn/marshal.c:657 ../libsvn_ra_svn/marshal.c:775
+#: ../libsvn_ra_svn/marshal.c:802
msgid "Malformed network data"
msgstr "Donnée du réseau malformée"
-#: ../include/svn_error_codes.h:897
+#: ../include/svn_error_codes.h:908
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:902
+#: ../include/svn_error_codes.h:913
msgid "Repository has been moved"
msgstr "Le dépôt a été déplacé"
-#: ../include/svn_error_codes.h:907 ../libsvn_ra_serf/replay.c:816
-#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:688
+#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
+#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
msgid "Connection timed out"
msgstr "Connection expirée"
-#: ../include/svn_error_codes.h:912
+#: ../include/svn_error_codes.h:923
msgid "URL access forbidden for unknown reason"
msgstr "Accès URL interdit pour une raison inconnue"
-#: ../include/svn_error_codes.h:918 ../include/svn_error_codes.h:947
+#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
msgid "Couldn't find a repository"
msgstr "Impossible de trouver le dépôt"
-#: ../include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:933
msgid "Couldn't open a repository"
msgstr "Impossible d'ouvrir le dépôt"
-#: ../include/svn_error_codes.h:927
+#: ../include/svn_error_codes.h:938
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:931
+#: ../include/svn_error_codes.h:942
msgid "Unknown svn protocol command"
msgstr "Commande du protocole svn inconnue"
-#: ../include/svn_error_codes.h:935
+#: ../include/svn_error_codes.h:946
msgid "Network connection closed unexpectedly"
msgstr "La connexion réseau a été fermée de façon inattendue"
-#: ../include/svn_error_codes.h:939
+#: ../include/svn_error_codes.h:950
msgid "Network read/write error"
msgstr "Erreur d'écriture/lecture réseau"
-#: ../include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:962
msgid "Client/server version mismatch"
msgstr "Versions client/serveur incompatibles"
-#: ../include/svn_error_codes.h:956
+#: ../include/svn_error_codes.h:967
msgid "Cannot negotiate authentication mechanism"
msgstr "Impossible de négocier de mécanisme d'authentification"
-#: ../include/svn_error_codes.h:961
+#: ../include/svn_error_codes.h:972
msgid "Editor drive was aborted"
msgstr "Baton d'édition interrompu"
-#: ../include/svn_error_codes.h:967
+#: ../include/svn_error_codes.h:978
msgid "Initialization of SSPI library failed"
msgstr "Échec à l'initialisation de la librairie SSPI"
-#: ../include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:982
msgid "Server SSL certificate untrusted"
msgstr "Certificat SSL du serveur non reconnu"
-#: ../include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:986
msgid "Initialization of the GSSAPI context failed"
msgstr "Échec à l'initialisation du contexte GSSAPI"
-#: ../include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:991
msgid "While handling serf response:"
msgstr "En gérant la réponse 'serf' (librairie HTTP) :"
-#: ../include/svn_error_codes.h:988
+#: ../include/svn_error_codes.h:999
msgid "Credential data unavailable"
msgstr "Données d'identité (credentials) non disponibles"
-#: ../include/svn_error_codes.h:992
+#: ../include/svn_error_codes.h:1003
msgid "No authentication provider available"
msgstr "Aucun fournisseur d'authentification disponible"
-#: ../include/svn_error_codes.h:996
+#: ../include/svn_error_codes.h:1007
msgid "All authentication providers exhausted"
msgstr "Tous les fournisseurs d'authentifications sont épuisés"
-#: ../include/svn_error_codes.h:1000
+#: ../include/svn_error_codes.h:1011
msgid "Credentials not saved"
msgstr "Identité (credentials) non sauvegardée"
-#: ../include/svn_error_codes.h:1005
+#: ../include/svn_error_codes.h:1016
msgid "Authentication failed"
msgstr "Échec de l'authentification"
-#: ../include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1022
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:1016
+#: ../include/svn_error_codes.h:1027
msgid "Item is not readable"
msgstr "Éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1032
msgid "Item is partially readable"
msgstr "Certains éléments non accessibles en lecture"
-#: ../include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1036
msgid "Invalid authz configuration"
msgstr "Configuration de authz invalide"
-#: ../include/svn_error_codes.h:1030
+#: ../include/svn_error_codes.h:1041
msgid "Item is not writable"
msgstr "Éléments non accessibles en écriture"
-#: ../include/svn_error_codes.h:1036
+#: ../include/svn_error_codes.h:1047
msgid "Svndiff data has invalid header"
msgstr "Les données de svndiff contiennent un en-tête invalide"
-#: ../include/svn_error_codes.h:1040
+#: ../include/svn_error_codes.h:1051
msgid "Svndiff data contains corrupt window"
msgstr "Les données de svndiff contiennent une fenêtre corrompue"
-#: ../include/svn_error_codes.h:1044
+#: ../include/svn_error_codes.h:1055
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:1048
+#: ../include/svn_error_codes.h:1059
msgid "Svndiff data contains invalid instruction"
msgstr "Les données de svndiff contiennent une instruction invalide"
-#: ../include/svn_error_codes.h:1052
+#: ../include/svn_error_codes.h:1063
msgid "Svndiff data ends unexpectedly"
msgstr "Les données de svndiff se terminent de façon inattendue"
-#: ../include/svn_error_codes.h:1056
+#: ../include/svn_error_codes.h:1067
msgid "Svndiff compressed data is invalid"
msgstr "Les données compressées de svndiff sont invalides"
-#: ../include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1073
msgid "Diff data source modified unexpectedly"
msgstr "Modification des données sources de diff inattendue"
-#: ../include/svn_error_codes.h:1068
+#: ../include/svn_error_codes.h:1079
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:1072
+#: ../include/svn_error_codes.h:1083
msgid "Apache got a malformed URI"
msgstr "Apache a reçu une URI malformé"
-#: ../include/svn_error_codes.h:1076
+#: ../include/svn_error_codes.h:1087
msgid "Activity not found"
msgstr "Activité non trouvée"
-#: ../include/svn_error_codes.h:1080
+#: ../include/svn_error_codes.h:1091
msgid "Baseline incorrect"
msgstr "Ligne de base (baseline) incorrecte"
-#: ../include/svn_error_codes.h:1084
+#: ../include/svn_error_codes.h:1095
msgid "Input/output error"
msgstr "Erreur d'entrée/sortie"
-#: ../include/svn_error_codes.h:1090
+#: ../include/svn_error_codes.h:1101
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:1094
+#: ../include/svn_error_codes.h:1105
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:1098
+#: ../include/svn_error_codes.h:1109
msgid "Bogus revision information given"
msgstr "Fausse information de révision donnée"
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1113
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:1106
+#: ../include/svn_error_codes.h:1117
msgid "Operation does not apply to binary file"
msgstr "Opération non applicable à un fichier binaire"
-#: ../include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1123
msgid "Format of an svn:externals property was invalid"
msgstr "Format de la propriété svn:externals invalide"
-#: ../include/svn_error_codes.h:1116
+#: ../include/svn_error_codes.h:1127
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:1120
+#: ../include/svn_error_codes.h:1131
msgid "Operation does not apply to directory"
msgstr "Opération non applicable sur un répertoire"
-#: ../include/svn_error_codes.h:1124
+#: ../include/svn_error_codes.h:1135
msgid "Revision range is not allowed"
msgstr "Intervalle de révision non permise"
-#: ../include/svn_error_codes.h:1128
+#: ../include/svn_error_codes.h:1139
msgid "Inter-repository relocation not allowed"
msgstr "Relocalisation entre dépôts différents non permise"
-#: ../include/svn_error_codes.h:1132
+#: ../include/svn_error_codes.h:1143
msgid "Author name cannot contain a newline"
msgstr "Le nom d'auteur ne peut contenir un saut de ligne"
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1147
msgid "Bad property name"
msgstr "Mauvais nom de propriété"
-#: ../include/svn_error_codes.h:1141
+#: ../include/svn_error_codes.h:1152
msgid "Two versioned resources are unrelated"
msgstr "Les deux ressources versionnées ne sont pas apparentées"
-#: ../include/svn_error_codes.h:1146
+#: ../include/svn_error_codes.h:1157
msgid "Path has no lock token"
msgstr "Chemin sans verrou"
-#: ../include/svn_error_codes.h:1151
+#: ../include/svn_error_codes.h:1162
msgid "Operation does not support multiple sources"
msgstr "Opération ne supportant pas des sources multiples"
-#: ../include/svn_error_codes.h:1156
+#: ../include/svn_error_codes.h:1167
msgid "No versioned parent directories"
msgstr "Pas de répertoire parent versionné"
-#: ../include/svn_error_codes.h:1161
+#: ../include/svn_error_codes.h:1172
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:1166
+#: ../include/svn_error_codes.h:1177
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:1171
+#: ../include/svn_error_codes.h:1182
msgid "Invalid path component strip count specified"
msgstr "Nombre de composant du chemin à enlever invalide"
-#: ../include/svn_error_codes.h:1176
+#: ../include/svn_error_codes.h:1187
msgid "Detected a cycle while processing the operation"
msgstr "Cycle détecté lors d'une opération"
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1193
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:1186
+#: ../include/svn_error_codes.h:1197
msgid "Failure loading plugin"
msgstr "Erreur lors du chargement du plugin"
-#: ../include/svn_error_codes.h:1190
+#: ../include/svn_error_codes.h:1201
msgid "Malformed file"
msgstr "Fichier malformé"
-#: ../include/svn_error_codes.h:1194
+#: ../include/svn_error_codes.h:1205
msgid "Incomplete data"
msgstr "Données incomplètes"
-#: ../include/svn_error_codes.h:1198
+#: ../include/svn_error_codes.h:1209
msgid "Incorrect parameters given"
msgstr "Paramètres fournis incorrects"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1213
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:1206
+#: ../include/svn_error_codes.h:1217
msgid "Test failed"
msgstr "Test échoué"
-#: ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1221
msgid "Trying to use an unsupported feature"
msgstr "Tentative d'utilisation d'une fonction non supportée"
-#: ../include/svn_error_codes.h:1214
+#: ../include/svn_error_codes.h:1225
msgid "Unexpected or unknown property kind"
msgstr "Type de propriété inattendu ou inconnu"
-#: ../include/svn_error_codes.h:1218
+#: ../include/svn_error_codes.h:1229
msgid "Illegal target for the requested operation"
msgstr "Cible illégale pour l'opération demandée"
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1233
msgid "MD5 checksum is missing"
msgstr "Somme de contrôle MD5 manquante"
-#: ../include/svn_error_codes.h:1226
+#: ../include/svn_error_codes.h:1237
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:1230
+#: ../include/svn_error_codes.h:1241
msgid "Error calling external program"
msgstr "Erreur lors de l'appel d'un programme externe"
-#: ../include/svn_error_codes.h:1234
+#: ../include/svn_error_codes.h:1245
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:1238
+#: ../include/svn_error_codes.h:1249
msgid "A checksum mismatch occurred"
msgstr "Sommes de contrôle différentes"
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1253
msgid "The operation was interrupted"
msgstr "Opération interrompue"
-#: ../include/svn_error_codes.h:1246
+#: ../include/svn_error_codes.h:1257
msgid "The specified diff option is not supported"
msgstr "L'option fournie à diff n'est pas supportée"
-#: ../include/svn_error_codes.h:1250
+#: ../include/svn_error_codes.h:1261
msgid "Property not found"
msgstr "Propriété non trouvée"
-#: ../include/svn_error_codes.h:1254
+#: ../include/svn_error_codes.h:1265
msgid "No auth file path available"
msgstr "Pas de chemin de fichier d'authentification (auth file) disponible"
-#: ../include/svn_error_codes.h:1259
+#: ../include/svn_error_codes.h:1270
msgid "Incompatible library version"
msgstr "Version de librairie incompatible"
-#: ../include/svn_error_codes.h:1264
+#: ../include/svn_error_codes.h:1275
msgid "Mergeinfo parse error"
msgstr "Mergeinfo : erreur de syntaxe"
-#: ../include/svn_error_codes.h:1269
+#: ../include/svn_error_codes.h:1280
msgid "Cease invocation of this API"
msgstr "Cesse l'invocation de cette API"
-#: ../include/svn_error_codes.h:1274
+#: ../include/svn_error_codes.h:1285
msgid "Error parsing revision number"
msgstr "Erreur de syntaxe sur le numéro révision"
-#: ../include/svn_error_codes.h:1279
+#: ../include/svn_error_codes.h:1290
msgid "Iteration terminated before completion"
msgstr "Itérations arrêtées avant la fin"
-#: ../include/svn_error_codes.h:1284
+#: ../include/svn_error_codes.h:1295
msgid "Unknown changelist"
msgstr "Liste de changements inconnue"
-#: ../include/svn_error_codes.h:1289
+#: ../include/svn_error_codes.h:1300
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:1294
+#: ../include/svn_error_codes.h:1305
msgid "Inquiry about unknown capability"
msgstr "Demande concernant une capacité inconnue"
-#: ../include/svn_error_codes.h:1299
+#: ../include/svn_error_codes.h:1310
msgid "Test skipped"
msgstr "Test ignoré"
-#: ../include/svn_error_codes.h:1304
+#: ../include/svn_error_codes.h:1315
msgid "apr memcache library not available"
msgstr "La librairie APR memcache non disponible"
-#: ../include/svn_error_codes.h:1309
+#: ../include/svn_error_codes.h:1320
msgid "Couldn't perform atomic initialization"
msgstr "Impossible d'exécuter l'initialisation atomique"
-#: ../include/svn_error_codes.h:1314
+#: ../include/svn_error_codes.h:1325
msgid "SQLite error"
msgstr "Erreur SQLite"
-#: ../include/svn_error_codes.h:1319
+#: ../include/svn_error_codes.h:1330
msgid "Attempted to write to readonly SQLite db"
msgstr "Tentative d'écriture vers base SQLite en lecture seule"
-#: ../include/svn_error_codes.h:1324
+#: ../include/svn_error_codes.h:1335
msgid "Unsupported schema found in SQLite db"
msgstr "Schema non supporté dans une base SQLite"
-#: ../include/svn_error_codes.h:1329
+#: ../include/svn_error_codes.h:1340
msgid "The SQLite db is busy"
msgstr "La base SQLite est occupée"
-#: ../include/svn_error_codes.h:1334
+#: ../include/svn_error_codes.h:1345
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:1341
+#: ../include/svn_error_codes.h:1352
msgid "Error parsing arguments"
msgstr "Erreur lors de l'analyse des arguments"
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1356
msgid "Not enough arguments provided"
msgstr "Nombre d'arguments insuffisant"
-#: ../include/svn_error_codes.h:1349
+#: ../include/svn_error_codes.h:1360
msgid "Mutually exclusive arguments specified"
msgstr "Arguments mutuellement exclusifs fournis"
-#: ../include/svn_error_codes.h:1353
+#: ../include/svn_error_codes.h:1364
msgid "Attempted command in administrative dir"
msgstr "Commande essayée sur un répertoire d'administration"
-#: ../include/svn_error_codes.h:1357
+#: ../include/svn_error_codes.h:1368
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:1361
+#: ../include/svn_error_codes.h:1372
msgid "The log message is a pathname"
msgstr "L'entrée du journal est un chemin de fichier"
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1376
msgid "Committing in directory scheduled for addition"
msgstr "Propagation dans un répertoire qui doit être ajouté"
-#: ../include/svn_error_codes.h:1369
+#: ../include/svn_error_codes.h:1380
msgid "No external editor available"
msgstr "Pas d'éditeur externe disponible"
-#: ../include/svn_error_codes.h:1373
+#: ../include/svn_error_codes.h:1384
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:1377
+#: ../include/svn_error_codes.h:1388
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:1381
+#: ../include/svn_error_codes.h:1392
msgid "No external merge tool available"
msgstr "Aucun éditeur externe de fusion disponible"
-#: ../include/svn_error_codes.h:1387
+#: ../include/svn_error_codes.h:1398
msgid "Assertion failure"
msgstr "Échec de la vérification"
@@ -1289,34 +1297,35 @@ msgstr "Échec de la vérification"
msgid "GNOME Keyring is locked and we are non-interactive"
msgstr "Porte-clef GNOME verrouillé, et nous sommes non interactif"
-#: ../libsvn_client/add.c:487 ../libsvn_wc/adm_ops.c:921
-#: ../libsvn_wc/workqueue.c:1864 ../libsvn_wc/workqueue.c:1946
+#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:780
+#: ../libsvn_wc/workqueue.c:1729 ../libsvn_wc/workqueue.c:1811
#, c-format
msgid "'%s' not found"
msgstr "'%s' pas trouvé"
-#: ../libsvn_client/add.c:492 ../libsvn_wc/adm_ops.c:574
-#: ../libsvn_wc/adm_ops.c:926
+#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
+#: ../libsvn_wc/adm_ops.c:785
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Type de nœud non supporté pour le chemin '%s'"
-#: ../libsvn_client/add.c:533 ../libsvn_client/cmdline.c:264
-#: ../libsvn_subr/opt.c:829
+#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:267
+#: ../libsvn_subr/opt.c:830
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "'%s' fini comme un mot réservé"
-#: ../libsvn_client/add.c:578 ../libsvn_client/changelist.c:116
+#: ../libsvn_client/add.c:579 ../libsvn_client/changelist.c:116
#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
-#: ../libsvn_client/commit.c:699 ../libsvn_client/export.c:947
-#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
-#: ../svn/export-cmd.c:93 ../svn/import-cmd.c:106
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
+#: ../libsvn_client/export.c:952 ../svn/add-cmd.c:76
+#: ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69 ../svn/export-cmd.c:93
+#: ../svn/import-cmd.c:106 ../svn/upgrade-cmd.c:72
#, c-format
msgid "'%s' is not a local path"
msgstr "'%s' n'est pas chemin local"
-#: ../libsvn_client/add.c:679 ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_client/add.c:682 ../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'"
@@ -1331,14 +1340,14 @@ msgstr "Blame non calculable sur le fich
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:1080
-#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:424
-#: ../libsvn_client/prop_commands.c:905 ../libsvn_client/prop_commands.c:1222
-#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2223
-#: ../libsvn_wc/adm_ops.c:2257 ../libsvn_wc/copy.c:547
-#: ../libsvn_wc/entries.c:1493 ../libsvn_wc/entries.c:2545
-#: ../libsvn_wc/entries.c:2576 ../libsvn_wc/node.c:1296
-#: ../libsvn_wc/update_editor.c:4892
+#: ../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:2000
+#: ../libsvn_wc/adm_ops.c:2034 ../libsvn_wc/copy.c:472
+#: ../libsvn_wc/entries.c:1421 ../libsvn_wc/entries.c:2623
+#: ../libsvn_wc/entries.c:2654 ../libsvn_wc/node.c:1239
+#: ../libsvn_wc/update_editor.c:4211
#, c-format
msgid "'%s' is not under version control"
msgstr "'%s' n'est pas versionné"
@@ -1362,22 +1371,22 @@ msgstr "(local)"
msgid "URL '%s' refers to a directory"
msgstr "L'URL '%s' référence un répertoire"
-#: ../libsvn_client/checkout.c:175 ../libsvn_client/export.c:1103
+#: ../libsvn_client/checkout.c:176 ../libsvn_client/export.c:1108
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "L'URL '%s' n'existe pas"
-#: ../libsvn_client/checkout.c:179
+#: ../libsvn_client/checkout.c:180
#, 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:228
+#: ../libsvn_client/checkout.c:229
#, 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"
-#: ../libsvn_client/checkout.c:236
+#: ../libsvn_client/checkout.c:237
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' existe déjà et n'est pas un répertoire"
@@ -1387,7 +1396,7 @@ msgstr "'%s' existe déjà et n'est pas
msgid "Improper relative URL '%s'"
msgstr "URL relative invalide '%s'"
-#: ../libsvn_client/cmdline.c:145
+#: ../libsvn_client/cmdline.c:148
#, c-format
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"
@@ -1401,55 +1410,56 @@ msgstr "Type non versionnable ou inconnu
msgid "New entry name required when importing a file"
msgstr "Nouveau nom d'entrée requis lors de l'importation d'un fichier"
-#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:569
+#: ../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' n'existe pas"
-#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:473
-#: ../svnlook/main.c:1405
+#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
+#: ../libsvn_client/merge.c:8859 ../libsvn_client/merge.c:10144
+#: ../libsvn_client/merge.c:10415 ../svnlook/main.c:1405
#, c-format
msgid "Path '%s' does not exist"
msgstr "Le chemin '%s' n'existe pas"
-#: ../libsvn_client/commit.c:794 ../libsvn_client/copy.c:484
-#: ../libsvn_client/copy.c:1024 ../libsvn_client/copy.c:1246
-#: ../libsvn_client/copy.c:1828
+#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
+#: ../libsvn_client/copy.c:1020 ../libsvn_client/copy.c:1244
+#: ../libsvn_client/copy.c:1826
#, c-format
msgid "Path '%s' already exists"
msgstr "Le chemin '%s' existe déjà"
-#: ../libsvn_client/commit.c:809
+#: ../libsvn_client/commit.c:810
#, 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:847 ../libsvn_client/copy.c:1403
+#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1401
msgid "Commit failed (details follow):"
msgstr "Échec de la propagation (commit), détails : "
-#: ../libsvn_client/commit.c:855
+#: ../libsvn_client/commit.c:856
msgid "Commit succeeded, but other errors follow:"
msgstr "Succès de la propagation (commit), mais erreurs : "
-#: ../libsvn_client/commit.c:862
+#: ../libsvn_client/commit.c:863
msgid "Error unlocking locked dirs (details follow):"
msgstr "Erreur en déverrouillant des répertoires verrouillés, détails :"
-#: ../libsvn_client/commit.c:873
+#: ../libsvn_client/commit.c:874
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:984
+#: ../libsvn_client/commit.c:968
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:1023
+#: ../libsvn_client/commit.c:1007
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:1071 ../svn/commit-cmd.c:71
+#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
#, 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)"
@@ -1464,8 +1474,8 @@ msgstr "Répertoire '%s' obsolète"
msgid "File '%s' is out of date"
msgstr "Fichier '%s' obsolète"
-#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:480
-#: ../libsvn_client/commit_util.c:1074
+#: ../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 "Arrêt de la propagation : '%s' demeure en conflit"
@@ -1475,101 +1485,101 @@ msgstr "Arrêt de la propagation : '%s'
msgid "Aborting commit: '%s' remains in tree-conflict"
msgstr "Arrêt de la propagation : '%s' demeure en conflit arborescent"
-#: ../libsvn_client/commit_util.c:425 ../libsvn_client/commit_util.c:441
+#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Type d'entrée inconnu pour '%s'"
-#: ../libsvn_client/commit_util.c:458
+#: ../libsvn_client/commit_util.c:457
#, 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:658
+#: ../libsvn_client/commit_util.c:654
#, 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:977
+#: ../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' 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:1094 ../libsvn_client/url.c:198
+#: ../libsvn_client/commit_util.c:1052 ../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:1111
+#: ../libsvn_client/commit_util.c:1069
#, 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:1252
+#: ../libsvn_client/commit_util.c:1210
#, 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:1409
+#: ../libsvn_client/commit_util.c:1367
#, 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:1414
+#: ../libsvn_client/commit_util.c:1372
#, 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:2122
+#: ../libsvn_client/commit_util.c:2080
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:502 ../libsvn_client/copy.c:1844
+#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1842
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Le chemin '%s' n'est pas un répertoire"
-#: ../libsvn_client/copy.c:675 ../libsvn_client/copy.c:716
+#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
#, 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:779
+#: ../libsvn_client/copy.c:775
msgid "Source and destination URLs appear not to all 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:988
+#: ../libsvn_client/copy.c:984
#, 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:1010 ../libsvn_client/prop_commands.c:227
+#: ../libsvn_client/copy.c:1006 ../libsvn_client/prop_commands.c:229
#, 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:1497
+#: ../libsvn_client/copy.c:1495
#, 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:1604 ../libsvn_client/copy.c:1616
-#: ../libsvn_wc/adm_ops.c:981 ../libsvn_wc/copy.c:641
+#: ../libsvn_client/copy.c:1602 ../libsvn_client/copy.c:1614
+#: ../libsvn_wc/adm_ops.c:834 ../libsvn_wc/copy.c:567
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' est déjà sous gestionnaire de version"
-#: ../libsvn_client/copy.c:1637
+#: ../libsvn_client/copy.c:1635
#, 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:1812
+#: ../libsvn_client/copy.c:1810
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Chemin '%s' non trouvé à la révision %ld"
-#: ../libsvn_client/copy.c:1817
+#: ../libsvn_client/copy.c:1815
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Chemin '%s' non trouvé à la révision de tête"
@@ -1617,19 +1627,23 @@ msgstr "'%s' a des modifications locales
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:335 ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288
+#: ../libsvn_client/delete.c:339 ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288
#, c-format
msgid "Cannot mix repository and working copy targets"
msgstr "Impossible de mélanger des cibles de dépôt et de copie de travail"
-#: ../libsvn_client/deprecated.c:755 ../svn/move-cmd.c:65
+#: ../libsvn_client/deprecated.c:713 ../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:1379
+#: ../libsvn_client/deprecated.c:1330
msgid "No commits in repository"
msgstr "Pas de propagation dans le dépôt"
+#: ../libsvn_client/deprecated.c:2054 ../libsvn_wc/deprecated.c:3369
+msgid "Non-recursive relocation not supported"
+msgstr "Relocalisation non récursive pas permise"
+
#: ../libsvn_client/diff.c:136
#, c-format
msgid " Reverse-merged %s:r%s%s"
@@ -1646,59 +1660,59 @@ msgstr " Fusionné %s:r%s%s"
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:295
+#: ../libsvn_client/diff.c:359
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(révision %ld)"
-#: ../libsvn_client/diff.c:297
+#: ../libsvn_client/diff.c:361
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copie de travail)"
-#: ../libsvn_client/diff.c:358
+#: ../libsvn_client/diff.c:637
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sModification de propriétés sur %s%s"
-#: ../libsvn_client/diff.c:715
+#: ../libsvn_client/diff.c:921
#, 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:1202
+#: ../libsvn_client/diff.c:1326
#, c-format
msgid "Path '%s' has no URL"
msgstr "Le chemin '%s' n'a pas d'URL associée"
-#: ../libsvn_client/diff.c:1266 ../libsvn_client/merge.c:6152
-#: ../libsvn_client/merge.c:8701
+#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6303
+#: ../libsvn_client/merge.c:8868
msgid "Not all required revisions are specified"
msgstr "Toutes les révisions requises ne sont pas précisées"
-#: ../libsvn_client/diff.c:1281
+#: ../libsvn_client/diff.c:1410
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:1409 ../libsvn_client/diff.c:1421
+#: ../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' n'existe pas dans le dépôt à la révision %ld"
-#: ../libsvn_client/diff.c:1480
+#: ../libsvn_client/diff.c:1588
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:1521
+#: ../libsvn_client/diff.c:1630
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:1686 ../libsvn_client/switch.c:132
+#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Le répertoire '%s' n'a pas d'URL associée"
-#: ../libsvn_client/diff.c:1896
+#: ../libsvn_client/diff.c:2064
msgid "Summarizing diff can only compare repository to repository"
msgstr "Le diff résumé compare seulement un dépôt à un autre"
@@ -1721,7 +1735,7 @@ msgstr "'%s' existe et n'est pas un rép
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: ../libsvn_client/export.c:861 ../libsvn_wc/update_editor.c:4882
+#: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4201
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -1792,14 +1806,14 @@ msgstr "Traversée de '%s' sans profonde
msgid "'%s' is not a URL"
msgstr "'%s' n'est pas une URL"
-#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:356
-#: ../libsvn_wc/props.c:320 ../libsvn_wc/update_editor.c:6201
-#: ../libsvn_wc/wc_db.c:435 ../libsvn_wc/wc_db.c:2139
-#: ../libsvn_wc/wc_db.c:2241 ../libsvn_wc/wc_db.c:2295
-#: ../libsvn_wc/wc_db.c:2342 ../libsvn_wc/wc_db.c:2366
-#: ../libsvn_wc/wc_db.c:5311 ../libsvn_wc/wc_db.c:6474
-#: ../libsvn_wc/wc_db.c:6669 ../libsvn_wc/wc_db.c:8023
-#: ../libsvn_wc/wc_db.c:8426
+#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/props.c:292 ../libsvn_wc/update_editor.c:5409
+#: ../libsvn_wc/wc_db.c:647 ../libsvn_wc/wc_db.c:2520
+#: ../libsvn_wc/wc_db.c:2599 ../libsvn_wc/wc_db.c:2647
+#: ../libsvn_wc/wc_db.c:2661 ../libsvn_wc/wc_db.c:2686
+#: ../libsvn_wc/wc_db.c:5496 ../libsvn_wc/wc_db.c:6736
+#: ../libsvn_wc/wc_db.c:6943 ../libsvn_wc/wc_db.c:8158
+#: ../libsvn_wc/wc_db.c:8499
#, c-format
msgid "The node '%s' was not found."
msgstr "Nœud '%s' non trouvé."
@@ -1815,7 +1829,7 @@ msgstr "Le serveur ne supporte pas la r� msgid "URL '%s' non-existent in revision %ld"
msgstr "L'URL '%s' n'existe pas à la révision %ld"
-#: ../libsvn_client/list.c:240
+#: ../libsvn_client/list.c:249
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "L'URL '%s' n'existe pas à cette révision"
@@ -1824,10 +1838,10 @@ msgstr "L'URL '%s' n'existe pas à cette
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:265 ../libsvn_client/merge.c:8719
-#: ../libsvn_client/merge.c:8726 ../libsvn_client/merge.c:9965
-#: ../libsvn_client/merge.c:10227 ../libsvn_client/ra.c:484
-#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:144
+#: ../libsvn_client/locking_commands.c:265 ../libsvn_client/merge.c:8890
+#: ../libsvn_client/merge.c:8897 ../libsvn_client/merge.c:10153
+#: ../libsvn_client/merge.c:10424 ../libsvn_client/ra.c:484
+#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' n'a pas d'URL associée"
@@ -1847,7 +1861,7 @@ msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
#: ../libsvn_client/locking_commands.c:408 ../libsvn_fs/fs-loader.c:1269
-#: ../libsvn_ra/ra_loader.c:1000
+#: ../libsvn_ra/ra_loader.c:1056
msgid "Lock comment contains illegal characters"
msgstr "Le commentaire du verrou (lock) contient des caractères incorrects"
@@ -1864,7 +1878,7 @@ msgstr "'%s' n'est pas un chemin relatif
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:448 ../libsvn_client/status.c:381
+#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:382
#, c-format
msgid "Entry '%s' has no URL"
msgstr "L'entrée '%s' n'a pas d'URL associée"
@@ -1887,25 +1901,25 @@ msgstr "Schémas d'accession mixtes non
#. 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:1502
+#: ../libsvn_client/merge.c:1482
msgid ".working"
msgstr ".courant"
-#: ../libsvn_client/merge.c:1504
+#: ../libsvn_client/merge.c:1484
#, c-format
msgid ".merge-left.r%ld"
msgstr ".fusion-gauche.r%ld"
-#: ../libsvn_client/merge.c:1507
+#: ../libsvn_client/merge.c:1487
#, c-format
msgid ".merge-right.r%ld"
msgstr ".fusion-droit.r%ld"
-#: ../libsvn_client/merge.c:3958
+#: ../libsvn_client/merge.c:3956
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:4662
+#: ../libsvn_client/merge.c:4660
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1918,51 +1932,65 @@ 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:8302
+#: ../libsvn_client/merge.c:5819
+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:8454
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:8309 ../libsvn_client/merge.c:8588
+#: ../libsvn_client/merge.c:8461 ../libsvn_client/merge.c:8745
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:8758 ../libsvn_ra/ra_loader.c:539
+#: ../libsvn_client/merge.c:8474 ../libsvn_client/merge.c:8905
+#: ../libsvn_client/merge.c:10432
+#, 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:8871 ../svn/merge-cmd.c:343
+msgid "Merge sources must both be either paths or URLs"
+msgstr "Les sources fusionnés doivent être tous deux ou des chemins ou des URLs"
+
+#: ../libsvn_client/merge.c:8937 ../libsvn_ra/ra_loader.c:539
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' n'est pas dans le même dépôt que '%s'"
-#: ../libsvn_client/merge.c:9030
+#: ../libsvn_client/merge.c:9209
msgid "Cannot reintegrate into a working copy with a switched subtree"
msgstr "Impossible de réintégrer dans une copie de travail avec un sous-arbre ré-aiguillé (switch)"
-#: ../libsvn_client/merge.c:9035
+#: ../libsvn_client/merge.c:9214
msgid "Cannot reintegrate into a working copy that has local modifications"
msgstr "Impossible de réintégrer dans une copie de travail avec des modifications locales"
-#: ../libsvn_client/merge.c:9041
+#: ../libsvn_client/merge.c:9220
msgid "Cannot determine revision of working copy"
msgstr "Impossible de déterminer la révision de la copie de travail"
-#: ../libsvn_client/merge.c:9045
+#: ../libsvn_client/merge.c:9224
msgid "Cannot reintegrate into mixed-revision working copy; try updating first"
msgstr "Impossible de reintégrer dans un copie de travail avec des révisions multiples ; Faire une mise à jour (update) d'abord"
-#: ../libsvn_client/merge.c:9791 ../libsvn_client/merge.c:10070
+#: ../libsvn_client/merge.c:9970 ../libsvn_client/merge.c:10258
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "'%s@%ld' doit un ancêtre de '%s@%ld'"
-#: ../libsvn_client/merge.c:9983
+#: ../libsvn_client/merge.c:10171
#, c-format
msgid "'%s' must be from the same repository as '%s'"
msgstr "'%s' doit être dans le même dépôt que '%s'"
-#: ../libsvn_client/merge.c:10012
+#: ../libsvn_client/merge.c:10200
#, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "Ni la source de la réintégration, ni sa cible, ne peuvent être la racine du dépôt"
-#: ../libsvn_client/merge.c:10098
+#: ../libsvn_client/merge.c:10286
#, 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"
@@ -1980,12 +2008,12 @@ msgstr "Seules les profondeur 'infinity'
msgid "Cannot strip %u components from '%s'"
msgstr "Impossible d'enlever %u composants du chemin '%s'"
-#: ../libsvn_client/patch.c:1256
+#: ../libsvn_client/patch.c:1251
#, c-format
msgid "Error writing to '%s'"
msgstr "Erreur à l'écriture de '%s'"
-#: ../libsvn_client/patch.c:2647
+#: ../libsvn_client/patch.c:2692
msgid "strip count must be positive"
msgstr "Le nombre de composant à enlever doit être positif"
@@ -1994,61 +2022,61 @@ msgstr "Le nombre de composant à enleve
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' est une propriété de copie de travail donc inaccessible aux clients"
-#: ../libsvn_client/prop_commands.c:214
+#: ../libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "La propriété de révision '%s' n'est pas une propriété connue"
-#: ../libsvn_client/prop_commands.c:359
+#: ../libsvn_client/prop_commands.c:363
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Propriéte de révision '%s' non permise dans ce contexte"
-#: ../libsvn_client/prop_commands.c:366 ../libsvn_client/prop_commands.c:471
+#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
#, c-format
msgid "Bad property name: '%s'"
msgstr "Nom de propriété invalide : '%s'"
-#: ../libsvn_client/prop_commands.c:376
+#: ../libsvn_client/prop_commands.c:380
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "Définir une propriété sur une cible non locale '%s' nécessite une révision de base"
-#: ../libsvn_client/prop_commands.c:381
+#: ../libsvn_client/prop_commands.c:385
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "Impossible de définir récursivement une propriété pour une cible non locale '%s'"
-#: ../libsvn_client/prop_commands.c:396
+#: ../libsvn_client/prop_commands.c:400
#, c-format
msgid "Setting property '%s' on non-local target '%s' is not supported"
msgstr "Impossible de définir la propriété '%s' pour une cible non locale '%s'"
-#: ../libsvn_client/prop_commands.c:466
-msgid "Author name should not contain a newline; value will not be set unless forced"
-msgstr "Le nom de l'auteur ne devrait pas contenir de retour chariot ; la valeur ne sera pas utilisée sauf en forçant"
-
-#: ../libsvn_client/prop_commands.c:493
+#: ../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 "La propriété de révision '%s' de r%ld n'existe plus dans le dépôt (peut-être a-t-elle été effacée par ailleurs ?)"
-#: ../libsvn_client/prop_commands.c:502
+#: ../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 "La propriété de révision '%s' de r%ld a une valeur inattendue dans le dépôt (peut-être a-t-elle été modifiée par ailleurs ?)"
-#: ../libsvn_client/prop_commands.c:510
+#: ../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 "La propriété de révision '%s' de r%ld existe déjà dans le dépôt (peut-être a-t-elle été définie par ailleurs ?)"
-#: ../libsvn_client/prop_commands.c:722
+#: ../libsvn_client/prop_commands.c:519
+msgid "Author name should not contain a newline; value will not be set unless forced"
+msgstr "Le nom de l'auteur ne devrait pas contenir de retour chariot ; la valeur ne sera pas utilisée sauf en forçant"
+
+#: ../libsvn_client/prop_commands.c:764
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' n'existe pas à la révision %ld"
-#: ../libsvn_client/prop_commands.c:729 ../libsvn_client/prop_commands.c:1047
+#: ../libsvn_client/prop_commands.c:771 ../libsvn_client/prop_commands.c:1089
#: ../libsvn_wc/crop.c:183
#, c-format
msgid "Unknown node kind for '%s'"
@@ -2098,10 +2126,10 @@ msgstr "Type de révision demandé incon
msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
msgstr "les identifiants de révision PREV, BASE et COMMITTED sont invalides pour une URL"
-#: ../libsvn_client/status.c:295 ../libsvn_client/status.c:324
-#: ../libsvn_client/status.c:333 ../libsvn_client/status.c:520
-#: ../libsvn_wc/lock.c:542 ../libsvn_wc/lock.c:921 ../libsvn_wc/lock.c:1716
-#: ../libsvn_wc/wc_db.c:7275 ../libsvn_wc/wc_db_pdh.c:542
+#: ../libsvn_client/status.c:296 ../libsvn_client/status.c:325
+#: ../libsvn_client/status.c:334 ../libsvn_client/status.c:527
+#: ../libsvn_wc/lock.c:539 ../libsvn_wc/lock.c:899 ../libsvn_wc/lock.c:1598
+#: ../libsvn_wc/wc_db.c:7521 ../libsvn_wc/wc_db_pdh.c:485
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' n'est pas une copie de travail"
@@ -2112,7 +2140,7 @@ msgid "Cannot both exclude and switch a
msgstr "Impossible d'exclure (exclude) et de réaiguiller (switch) en même temps un chemin"
#: ../libsvn_client/switch.c:175 ../libsvn_ra_local/ra_plugin.c:199
-#: ../libsvn_ra_local/ra_plugin.c:274 ../libsvn_wc/update_editor.c:5866
+#: ../libsvn_ra_local/ra_plugin.c:274 ../libsvn_wc/update_editor.c:5083
#, c-format
msgid ""
"'%s'\n"
@@ -2128,82 +2156,82 @@ msgstr ""
msgid "URL '%s' is not a child of repository root URL '%s'"
msgstr "l'URL '%s' n'est pas descendante de l'URL du dépôt racine '%s'"
-#: ../libsvn_delta/svndiff.c:163
+#: ../libsvn_delta/svndiff.c:165
msgid "Compression of svndiff data failed"
msgstr "Échec de la compression des données de svndiff"
-#: ../libsvn_delta/svndiff.c:429
+#: ../libsvn_delta/svndiff.c:431
msgid "Decompression of svndiff data failed: no size"
msgstr "Échec de la décompression des données de svndiff : pas de taille"
-#: ../libsvn_delta/svndiff.c:432
+#: ../libsvn_delta/svndiff.c:434
msgid "Decompression of svndiff data failed: size too large"
msgstr "Échec de la décompression des données de svndiff : taille trop grande"
-#: ../libsvn_delta/svndiff.c:453
+#: ../libsvn_delta/svndiff.c:455
msgid "Decompression of svndiff data failed"
msgstr "Échec de la décompression des données de svndiff"
-#: ../libsvn_delta/svndiff.c:460
+#: ../libsvn_delta/svndiff.c:462
msgid "Size of uncompressed data does not match stored original length"
msgstr "La taille des données décompressées ne correspond pas à la taille initiale"
-#: ../libsvn_delta/svndiff.c:535
+#: ../libsvn_delta/svndiff.c:537
#, c-format
msgid "Invalid diff stream: insn %d cannot be decoded"
msgstr "Flux diff invalide : insn %d ne peut être décodé"
-#: ../libsvn_delta/svndiff.c:539
+#: ../libsvn_delta/svndiff.c:541
#, c-format
msgid "Invalid diff stream: insn %d has length zero"
msgstr "Flux diff invalide : insn %d de longueur nulle"
-#: ../libsvn_delta/svndiff.c:543
+#: ../libsvn_delta/svndiff.c:545
#, c-format
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Flux diff invalide : insn %d déborde la vue cible"
-#: ../libsvn_delta/svndiff.c:552
+#: ../libsvn_delta/svndiff.c:554
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Flux diff invalide : [src] insn %d déborde la vue source"
-#: ../libsvn_delta/svndiff.c:559
+#: ../libsvn_delta/svndiff.c:561
#, c-format
msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "Flux diff invalide : [tgt] insn %d démarre au delà de la position de la vue cible"
-#: ../libsvn_delta/svndiff.c:566
+#: ../libsvn_delta/svndiff.c:568
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "Flux diff invalide : [new] insn %d déborde la nouvelle section de données"
-#: ../libsvn_delta/svndiff.c:576
+#: ../libsvn_delta/svndiff.c:578
msgid "Delta does not fill the target window"
msgstr "Le delta ne comble pas la fenêtre cible"
-#: ../libsvn_delta/svndiff.c:579
+#: ../libsvn_delta/svndiff.c:581
msgid "Delta does not contain enough new data"
msgstr "Le delta ne contient pas assez de nouvelles données"
-#: ../libsvn_delta/svndiff.c:685
+#: ../libsvn_delta/svndiff.c:687
msgid "Svndiff has invalid header"
msgstr "Entête de svndiff invalide"
-#: ../libsvn_delta/svndiff.c:741 ../libsvn_delta/svndiff.c:905
+#: ../libsvn_delta/svndiff.c:743 ../libsvn_delta/svndiff.c:907
msgid "Svndiff contains a too-large window"
msgstr "Les données de svndiff contiennent une fenêtre trop grande"
-#: ../libsvn_delta/svndiff.c:748 ../libsvn_delta/svndiff.c:912
+#: ../libsvn_delta/svndiff.c:750 ../libsvn_delta/svndiff.c:914
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff contient une entête de fenêtre corrompue"
-#: ../libsvn_delta/svndiff.c:757
+#: ../libsvn_delta/svndiff.c:759
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff a des vues sources glissant en arrière"
-#: ../libsvn_delta/svndiff.c:806 ../libsvn_delta/svndiff.c:853
-#: ../libsvn_delta/svndiff.c:934
+#: ../libsvn_delta/svndiff.c:808 ../libsvn_delta/svndiff.c:855
+#: ../libsvn_delta/svndiff.c:936
msgid "Unexpected end of svndiff input"
msgstr "Fin de l'entrée inattendue pour svndiff"
@@ -2304,19 +2332,19 @@ msgstr "créant une modification"
msgid "deleting changes"
msgstr "effaçant des modifications"
-#: ../libsvn_fs_base/bdb/changes-table.c:148 ../libsvn_fs_fs/fs_fs.c:3935
+#: ../libsvn_fs_base/bdb/changes-table.c:148 ../libsvn_fs_fs/fs_fs.c:3987
msgid "Missing required node revision ID"
msgstr "Absence de l'ID requise de la révision du nœud"
-#: ../libsvn_fs_base/bdb/changes-table.c:159 ../libsvn_fs_fs/fs_fs.c:3945
+#: ../libsvn_fs_base/bdb/changes-table.c:159 ../libsvn_fs_fs/fs_fs.c:3997
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ordre de modificaiton invalide : nouvel ID de révision de nœud sans effacement"
-#: ../libsvn_fs_base/bdb/changes-table.c:169 ../libsvn_fs_fs/fs_fs.c:3956
+#: ../libsvn_fs_base/bdb/changes-table.c:169 ../libsvn_fs_fs/fs_fs.c:4008
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ordre de modification invalide : modification autre qu'un ajout sur un chemin effacé"
-#: ../libsvn_fs_base/bdb/changes-table.c:178 ../libsvn_fs_fs/fs_fs.c:3965
+#: ../libsvn_fs_base/bdb/changes-table.c:178 ../libsvn_fs_fs/fs_fs.c:4017
msgid "Invalid change ordering: add change on preexisting path"
msgstr "Ordre de modification invalide : ajout sur un chemin pré-existant"
@@ -2583,9 +2611,9 @@ msgstr "Somme de contrôle différentes
#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:830
#: ../libsvn_fs_base/reps-strings.c:926 ../libsvn_fs_base/reps-strings.c:941
#: ../libsvn_fs_base/tree.c:3880 ../libsvn_fs_fs/dag.c:1028
-#: ../libsvn_fs_fs/fs_fs.c:3417 ../libsvn_fs_fs/tree.c:2464
-#: ../libsvn_ra_neon/fetch.c:763 ../libsvn_ra_svn/client.c:1039
-#: ../libsvn_repos/commit.c:607 ../libsvn_repos/load.c:1156
+#: ../libsvn_fs_fs/fs_fs.c:3469 ../libsvn_fs_fs/tree.c:2464
+#: ../libsvn_ra_neon/fetch.c:763 ../libsvn_ra_svn/client.c:1073
+#: ../libsvn_repos/commit.c:607 ../libsvn_repos/load.c:1164
#, c-format
msgid " expected: %s"
msgstr " attendu : %s"
@@ -2593,9 +2621,9 @@ msgstr " attendu : %s"
#: ../libsvn_fs_base/dag.c:1282 ../libsvn_fs_base/reps-strings.c:831
#: ../libsvn_fs_base/reps-strings.c:927 ../libsvn_fs_base/reps-strings.c:942
#: ../libsvn_fs_base/tree.c:3881 ../libsvn_fs_fs/dag.c:1029
-#: ../libsvn_fs_fs/fs_fs.c:3418 ../libsvn_fs_fs/tree.c:2465
-#: ../libsvn_ra_neon/fetch.c:764 ../libsvn_ra_svn/client.c:1040
-#: ../libsvn_repos/commit.c:608 ../libsvn_repos/load.c:1157
+#: ../libsvn_fs_fs/fs_fs.c:3470 ../libsvn_fs_fs/tree.c:2465
+#: ../libsvn_ra_neon/fetch.c:764 ../libsvn_ra_svn/client.c:1074
+#: ../libsvn_repos/commit.c:608 ../libsvn_repos/load.c:1165
#, c-format
msgid " actual: %s"
msgstr " obtenu : %s"
@@ -2866,7 +2894,7 @@ msgstr "La transaction n'est pas morte
msgid "Transaction is dead: '%s'"
msgstr "Transaction morte : '%s'"
-#: ../libsvn_fs_base/revs-txns.c:274 ../libsvn_fs_fs/fs_fs.c:7264
+#: ../libsvn_fs_base/revs-txns.c:274 ../libsvn_fs_fs/fs_fs.c:7316
#, c-format
msgid "revprop '%s' has unexpected value in filesystem"
msgstr "la propriété de révision '%s' a une valeur inattendue le système de fichiers"
@@ -2982,7 +3010,7 @@ msgid "Can't increment mergeinfo count o
msgstr "Impossible d'incrémenter le compteur d'informations du fusion sur le *fichier* de la révision de nœud %%s à %%%s (> 1)"
#: ../libsvn_fs_fs/dag.c:1027 ../libsvn_ra_neon/fetch.c:762
-#: ../libsvn_ra_svn/client.c:1038
+#: ../libsvn_ra_svn/client.c:1072
#, c-format
msgid "Checksum mismatch for '%s'"
msgstr "Sommes de contrôle différentes pour '%s'"
@@ -3057,289 +3085,297 @@ msgstr "Module de stockage de dépôt à
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Version %d du chargeur FS non supportée pour fsfs"
-#: ../libsvn_fs_fs/fs_fs.c:284
+#: ../libsvn_fs_fs/fs_fs.c:289
#, c-format
msgid "Revision file '%s' does not exist, and r%ld is not packed"
msgstr "Le fichier de révision '%s' n'existe pas, et r%ld n'est pas compacté"
-#: ../libsvn_fs_fs/fs_fs.c:529
+#: ../libsvn_fs_fs/fs_fs.c:534
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Impossible d'obtenir l'exclusivité (txn list mutex) de FSFS"
-#: ../libsvn_fs_fs/fs_fs.c:537
+#: ../libsvn_fs_fs/fs_fs.c:542
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Impossible de rendre l'exclusivité (txn list mutex) de FSFS"
-#: ../libsvn_fs_fs/fs_fs.c:590
+#: ../libsvn_fs_fs/fs_fs.c:596
#, c-format
msgid "Can't grab FSFS mutex for '%s'"
msgstr "Impossible d'obtenir l'exclusivité (mutex) sur FSFS pour '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:605
+#: ../libsvn_fs_fs/fs_fs.c:618
#, c-format
msgid "Can't ungrab FSFS mutex for '%s'"
msgstr "Impossible de rendre l'exclusivité (mutex) sur FSFS pour '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:676
+#: ../libsvn_fs_fs/fs_fs.c:689
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Impossible de déverrouiller la transaction inconnue '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:680
+#: ../libsvn_fs_fs/fs_fs.c:693
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Impossible de déverrouiller la transaction non verrouillée '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:687
+#: ../libsvn_fs_fs/fs_fs.c:700
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "Impossible de déverrouiller le fichier verrou du prototype de révision pour la transaction '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:693
+#: ../libsvn_fs_fs/fs_fs.c:706
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "Impossible de fermer le fichier verrou du prototype de révision pour la transaction '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:755
+#: ../libsvn_fs_fs/fs_fs.c:768
#, c-format
msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process"
msgstr "Impossible d'écrire dans le fichier du prototype de révision de la transaction '%s' parce qu'une représentation précédente est en cours d'écriture par ce processus."
-#: ../libsvn_fs_fs/fs_fs.c:791
+#: ../libsvn_fs_fs/fs_fs.c:804
#, c-format
msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process"
msgstr "Impossible d'écrire dans le fichier de prototype de révision de la transaction '%s' parce qu'une représentation précédente est en cours d'écriture par un autre processus"
-#: ../libsvn_fs_fs/fs_fs.c:798 ../libsvn_subr/io.c:1639
+#: ../libsvn_fs_fs/fs_fs.c:811 ../libsvn_subr/io.c:1645
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Impossible d'obtenir le verrou exclusif sur le fichier '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:910
+#: ../libsvn_fs_fs/fs_fs.c:923
#, c-format
-msgid "Format file '%s' contains an unexpected non-digit"
-msgstr "Le fichier de format '%s' contient un caractère non-numérique"
+msgid "Format file '%s' contains unexpected non-digit '%c' within '%s'"
+msgstr "Le fichier de format '%s' contient un caractère non-numérique inattendu '%c' dans '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:959
+#: ../libsvn_fs_fs/fs_fs.c:972
#, c-format
msgid "Can't read first line of format file '%s'"
msgstr "Impossible de lire la première ligne du fichier de format '%s'"
-#: ../libsvn_fs_fs/fs_fs.c:1003
+#: ../libsvn_fs_fs/fs_fs.c:1016
#, c-format
msgid "'%s' contains invalid filesystem format option '%s'"
msgstr "'%s' contient une option invalide '%s' pour le format de stockage"
-#: ../libsvn_fs_fs/fs_fs.c:1073
+#: ../libsvn_fs_fs/fs_fs.c:1086
#, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr "Format de stockage attendu entre '1' et '%d' ; format trouvé '%d'"
-#: ../libsvn_fs_fs/fs_fs.c:1295
+#: ../libsvn_fs_fs/fs_fs.c:1308
#, c-format
msgid "'%s' is not a regular file. Please move it out of the way and try again"
msgstr "'%s' n'est pas un vrai ifichier. Merci de le déplacer et de recommencer"
-#: ../libsvn_fs_fs/fs_fs.c:1565
+#: ../libsvn_fs_fs/fs_fs.c:1578
#, c-format
msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'"
msgstr "Échec à la création une copie à chaud (hotcopy) vers '%s'. Le fichier '%s' manque du dépôt source. Merci de créer ce fichier, par exemple en lançant 'svnadmin upgrade %s'"
-#: ../libsvn_fs_fs/fs_fs.c:1802 ../libsvn_fs_fs/fs_fs.c:1816
+#: ../libsvn_fs_fs/fs_fs.c:1815 ../libsvn_fs_fs/fs_fs.c:1829
msgid "Found malformed header in revision file"
msgstr "Entête malformée dans le fichier de révision"
-#: ../libsvn_fs_fs/fs_fs.c:1850
+#: ../libsvn_fs_fs/fs_fs.c:1863
#, c-format
msgid "Invalid revision number '%ld'"
msgstr "Numéro de révision invalide '%ld'"
-#: ../libsvn_fs_fs/fs_fs.c:1865 ../libsvn_fs_fs/fs_fs.c:1891
-#: ../libsvn_fs_fs/fs_fs.c:2856 ../libsvn_fs_fs/fs_fs.c:2894
+#: ../libsvn_fs_fs/fs_fs.c:1878 ../libsvn_fs_fs/fs_fs.c:1904
+#: ../libsvn_fs_fs/fs_fs.c:2908 ../libsvn_fs_fs/fs_fs.c:2946
#: ../libsvn_repos/log.c:1633 ../libsvn_repos/log.c:1637
#, c-format
msgid "No such revision %ld"
msgstr "Pas de révision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:2055 ../libsvn_fs_fs/fs_fs.c:2069
-#: ../libsvn_fs_fs/fs_fs.c:2076 ../libsvn_fs_fs/fs_fs.c:2083
-#: ../libsvn_fs_fs/fs_fs.c:2091 ../libsvn_fs_fs/fs_fs.c:2104
-#: ../libsvn_fs_fs/fs_fs.c:2113
+#: ../libsvn_fs_fs/fs_fs.c:1961
+msgid "Manifest offset too large"
+msgstr "Décallage de l'annonce (Manifest) trop grand"
+
+#: ../libsvn_fs_fs/fs_fs.c:2071 ../libsvn_fs_fs/fs_fs.c:2085
+#: ../libsvn_fs_fs/fs_fs.c:2093 ../libsvn_fs_fs/fs_fs.c:2101
+#: ../libsvn_fs_fs/fs_fs.c:2110 ../libsvn_fs_fs/fs_fs.c:2123
+#: ../libsvn_fs_fs/fs_fs.c:2132
msgid "Malformed text representation offset line in node-rev"
msgstr "Ligne 'offset' d'une représentation textuelle malformée dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2182
+#: ../libsvn_fs_fs/fs_fs.c:2201
msgid "Missing id field in node-rev"
msgstr "Champs 'id' manquant dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2194
+#: ../libsvn_fs_fs/fs_fs.c:2213
msgid "Missing kind field in node-rev"
msgstr "Champs 'kind' manquant dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2225
+#: ../libsvn_fs_fs/fs_fs.c:2247
msgid "Missing cpath in node-rev"
msgstr "'cpath' manquant dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2252 ../libsvn_fs_fs/fs_fs.c:2258
+#: ../libsvn_fs_fs/fs_fs.c:2274 ../libsvn_fs_fs/fs_fs.c:2280
msgid "Malformed copyroot line in node-rev"
msgstr "Ligne 'copyroot' malformée dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2276 ../libsvn_fs_fs/fs_fs.c:2282
+#: ../libsvn_fs_fs/fs_fs.c:2298 ../libsvn_fs_fs/fs_fs.c:2304
msgid "Malformed copyfrom line in node-rev"
msgstr "Ligne 'copyfrom' malformée dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2439 ../libsvn_fs_fs/fs_fs.c:5394
+#: ../libsvn_fs_fs/fs_fs.c:2464 ../libsvn_fs_fs/fs_fs.c:5446
msgid "Attempted to write to non-transaction"
msgstr "Tentative d'écriture vers une non-transaction"
-#: ../libsvn_fs_fs/fs_fs.c:2525
+#: ../libsvn_fs_fs/fs_fs.c:2557
msgid "Malformed representation header"
msgstr "Entête de représentation mal formée"
-#: ../libsvn_fs_fs/fs_fs.c:2553
+#: ../libsvn_fs_fs/fs_fs.c:2585
msgid "Missing node-id in node-rev"
msgstr "'node-id' manquant dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2559
+#: ../libsvn_fs_fs/fs_fs.c:2591
msgid "Corrupt node-id in node-rev"
msgstr "'node-id' corrompu dans 'node-rev'"
-#: ../libsvn_fs_fs/fs_fs.c:2634
+#: ../libsvn_fs_fs/fs_fs.c:2667
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Il manque une saut de ligne à la fin du fichier de révision"
-#: ../libsvn_fs_fs/fs_fs.c:2646
+#: ../libsvn_fs_fs/fs_fs.c:2680
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Dernière ligne du fichier de révision plus longue que 64 caractères"
-#: ../libsvn_fs_fs/fs_fs.c:2661
+#: ../libsvn_fs_fs/fs_fs.c:2694
msgid "Final line in revision file missing space"
msgstr "Il manque espace à la dernière ligne du fichier de révision"
-#: ../libsvn_fs_fs/fs_fs.c:2973
+#: ../libsvn_fs_fs/fs_fs.c:3025
msgid "Malformed svndiff data in representation"
msgstr "Représentation des données de svndiff mal formées"
-#: ../libsvn_fs_fs/fs_fs.c:3165 ../libsvn_fs_fs/fs_fs.c:3178
+#: ../libsvn_fs_fs/fs_fs.c:3217 ../libsvn_fs_fs/fs_fs.c:3230
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Lecture d'une fenêtre svndiff au delà de la fin de la représentation"
-#: ../libsvn_fs_fs/fs_fs.c:3318
+#: ../libsvn_fs_fs/fs_fs.c:3370
msgid "svndiff data requested non-existent source"
msgstr "Données de svndiff ayant requis une source inexistante"
-#: ../libsvn_fs_fs/fs_fs.c:3324
+#: ../libsvn_fs_fs/fs_fs.c:3376
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff ayant requis une position au delà de la fin du flux"
-#: ../libsvn_fs_fs/fs_fs.c:3347 ../libsvn_fs_fs/fs_fs.c:3364
+#: ../libsvn_fs_fs/fs_fs.c:3399 ../libsvn_fs_fs/fs_fs.c:3416
msgid "svndiff window length is corrupt"
msgstr "Taille de fenêtre de svndiff corrompue"
-#: ../libsvn_fs_fs/fs_fs.c:3416
+#: ../libsvn_fs_fs/fs_fs.c:3468
msgid "Checksum mismatch while reading representation"
msgstr "Sommes de contrôle différentes en lisant la représentation"
-#: ../libsvn_fs_fs/fs_fs.c:3713 ../libsvn_fs_fs/fs_fs.c:3726
-#: ../libsvn_fs_fs/fs_fs.c:3732 ../libsvn_fs_fs/fs_fs.c:6704
-#: ../libsvn_fs_fs/fs_fs.c:6713 ../libsvn_fs_fs/fs_fs.c:6719
+#: ../libsvn_fs_fs/fs_fs.c:3765 ../libsvn_fs_fs/fs_fs.c:3778
+#: ../libsvn_fs_fs/fs_fs.c:3784 ../libsvn_fs_fs/fs_fs.c:6756
+#: ../libsvn_fs_fs/fs_fs.c:6765 ../libsvn_fs_fs/fs_fs.c:6771
msgid "Directory entry corrupt"
msgstr "Entrée du répertoire corrompue"
-#: ../libsvn_fs_fs/fs_fs.c:4134 ../libsvn_fs_fs/fs_fs.c:4139
-#: ../libsvn_fs_fs/fs_fs.c:4145 ../libsvn_fs_fs/fs_fs.c:4162
-#: ../libsvn_fs_fs/fs_fs.c:4195 ../libsvn_fs_fs/fs_fs.c:4215
-#: ../libsvn_fs_fs/fs_fs.c:4249 ../libsvn_fs_fs/fs_fs.c:4254
+#: ../libsvn_fs_fs/fs_fs.c:4186 ../libsvn_fs_fs/fs_fs.c:4191
+#: ../libsvn_fs_fs/fs_fs.c:4197 ../libsvn_fs_fs/fs_fs.c:4214
+#: ../libsvn_fs_fs/fs_fs.c:4247 ../libsvn_fs_fs/fs_fs.c:4267
+#: ../libsvn_fs_fs/fs_fs.c:4301 ../libsvn_fs_fs/fs_fs.c:4306
msgid "Invalid changes line in rev-file"
msgstr "Lignes modifiées invalides dans le fichier révision (rev-file)"
-#: ../libsvn_fs_fs/fs_fs.c:4188
+#: ../libsvn_fs_fs/fs_fs.c:4240
msgid "Invalid change kind in rev file"
msgstr "Sorte de modification invalide dans le fichier révision (rev-file)"
-#: ../libsvn_fs_fs/fs_fs.c:4208
+#: ../libsvn_fs_fs/fs_fs.c:4260
msgid "Invalid text-mod flag in rev-file"
msgstr "'text-mod' invalide dans le fichier révision (rev-file)"
-#: ../libsvn_fs_fs/fs_fs.c:4228
+#: ../libsvn_fs_fs/fs_fs.c:4280
msgid "Invalid prop-mod flag in rev-file"
msgstr "'prop-mod' invalide dans le fichier révision (rev-file)"
-#: ../libsvn_fs_fs/fs_fs.c:4405
+#: ../libsvn_fs_fs/fs_fs.c:4457
msgid "Copying from transactions not allowed"
msgstr "Copie à partir des transactions impossible"
-#: ../libsvn_fs_fs/fs_fs.c:4560
+#: ../libsvn_fs_fs/fs_fs.c:4612
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Impossible de créer le répertoire de transaction '%s' pour la révision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:4842 ../libsvn_fs_fs/fs_fs.c:4849
+#: ../libsvn_fs_fs/fs_fs.c:4735
+msgid "Internal error: a null transaction id was passed to get_txn_proplist()"
+msgstr "Erreur interne : un identifiant de transaction 'null' a été passé à get_txn_proplist()"
+
+#: ../libsvn_fs_fs/fs_fs.c:4894 ../libsvn_fs_fs/fs_fs.c:4901
msgid "next-id file corrupt"
msgstr "Fichier identificateur suivant (next-id) corrompu"
-#: ../libsvn_fs_fs/fs_fs.c:4945
+#: ../libsvn_fs_fs/fs_fs.c:4997
msgid "Transaction cleanup failed"
msgstr "Échec du nettoyage de la transaction"
-#: ../libsvn_fs_fs/fs_fs.c:5058
+#: ../libsvn_fs_fs/fs_fs.c:5110
msgid "Invalid change type"
msgstr "Type de modification invalide"
-#: ../libsvn_fs_fs/fs_fs.c:5413
+#: ../libsvn_fs_fs/fs_fs.c:5465
msgid "Can't set text contents of a directory"
msgstr "Impossible de définir le contenu textuel d'un répertoire"
-#: ../libsvn_fs_fs/fs_fs.c:5497 ../libsvn_fs_fs/fs_fs.c:5502
-#: ../libsvn_fs_fs/fs_fs.c:5509
+#: ../libsvn_fs_fs/fs_fs.c:5549 ../libsvn_fs_fs/fs_fs.c:5554
+#: ../libsvn_fs_fs/fs_fs.c:5561
msgid "Corrupt 'current' file"
msgstr "Fichier courant corrompu"
-#: ../libsvn_fs_fs/fs_fs.c:5980
+#: ../libsvn_fs_fs/fs_fs.c:6032
msgid "Transaction out of date"
msgstr "Transaction obsolète"
-#: ../libsvn_fs_fs/fs_fs.c:6156
+#: ../libsvn_fs_fs/fs_fs.c:6208
msgid "Obliteration of already-packed revision is not supported"
msgstr "L'oblitération d'une révision déjà enpaquetée n'est pas supportée"
-#: ../libsvn_fs_fs/fs_fs.c:6646
+#: ../libsvn_fs_fs/fs_fs.c:6698
msgid "Recovery encountered a non-directory node"
msgstr "La réparation a trouvé un nœud qui n'est pas un répertoire"
-#: ../libsvn_fs_fs/fs_fs.c:6668
+#: ../libsvn_fs_fs/fs_fs.c:6720
msgid "Recovery encountered a deltified directory representation"
msgstr "La réparation a trouvé une réprésentation différentielle de répertoire"
-#: ../libsvn_fs_fs/fs_fs.c:6818
+#: ../libsvn_fs_fs/fs_fs.c:6870
#, c-format
msgid "Expected current rev to be <= %ld but found %ld"
msgstr "Révision courante attendue inférieure à %ld, mais %ld trouvée"
-#: ../libsvn_fs_fs/fs_fs.c:6869
+#: ../libsvn_fs_fs/fs_fs.c:6921
#, c-format
msgid "Revision %ld has a revs file but no revprops file"
msgstr "La révision %ld a un fichier 'revs' mais pas de fichier 'revprops'"
-#: ../libsvn_fs_fs/fs_fs.c:6874
+#: ../libsvn_fs_fs/fs_fs.c:6926
#, c-format
msgid "Revision %ld has a non-file where its revprops file should be"
msgstr "La révision %ld a quelque chose d'autre qu'un fichier à la place du 'revprops'"
-#: ../libsvn_fs_fs/fs_fs.c:7051
+#: ../libsvn_fs_fs/fs_fs.c:7103
#, c-format
msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)"
msgstr "Le nœud origine pour '%s' existe avec une valeur différente (%s) de ce que nous allions stocker (%s)"
-#: ../libsvn_fs_fs/fs_fs.c:7157
+#: ../libsvn_fs_fs/fs_fs.c:7209
msgid "No such transaction"
msgstr "Transaction non trouvée"
-#: ../libsvn_fs_fs/fs_fs.c:7617
+#: ../libsvn_fs_fs/fs_fs.c:7669
msgid "FS format too old to pack, please upgrade."
msgstr "Format de FS trop vieux pour tasser, mettre à jour svp."
@@ -3405,18 +3441,18 @@ msgstr "le chemin '%s' n'existe pas à l
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' à la révision %ld est un objet différent"
-#: ../libsvn_ra/compat.c:844 ../libsvn_ra/ra_loader.c:1145
+#: ../libsvn_ra/compat.c:844 ../libsvn_ra/ra_loader.c:1201
#, c-format
msgid "Invalid peg revision %ld"
msgstr "Révision fixée %ld invalide"
-#: ../libsvn_ra/compat.c:847 ../libsvn_ra/ra_loader.c:1148
+#: ../libsvn_ra/compat.c:847 ../libsvn_ra/ra_loader.c:1204
#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:323
#, c-format
msgid "Invalid end revision %ld"
msgstr "Révision de fin %ld invalide"
-#: ../libsvn_ra/compat.c:850 ../libsvn_ra/ra_loader.c:1151
+#: ../libsvn_ra/compat.c:850 ../libsvn_ra/ra_loader.c:1207
msgid "Peg revision must precede end revision"
msgstr "La révision fixée doit précéder la révision de fin"
@@ -3446,21 +3482,26 @@ msgid "'%s' isn't a child of session URL
msgstr "'%s' ne descend pas l'URL de session '%s'"
#: ../libsvn_ra/ra_loader.c:591 ../libsvn_ra_neon/session.c:1154
-#: ../libsvn_ra_svn/client.c:2237
+#: ../libsvn_ra_svn/client.c:2271
#, c-format
msgid "'%s' isn't a child of repository root URL '%s'"
msgstr "'%s' ne descend pas de l'URL racine du dépôt '%s'"
-#: ../libsvn_ra/ra_loader.c:1182
+#: ../libsvn_ra/ra_loader.c:638
+#, c-format
+msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client"
[... 4797 lines stripped ...]